Fix packages (#12)

* Fix packages

pom.xml

@@ -5,21 +5,6 @@
 	<artifactId>Karedi</artifactId>
 	<version>1.2.1</version>
 	<build>
-		<sourceDirectory>src</sourceDirectory>
-		<resources>
-			<resource>
-				<directory>src</directory>
-				<excludes>
-					<exclude>**/*.java</exclude>
-				</excludes>
-			</resource>
-			<resource>
-				<directory>src/main/resources/com/github/nianna/karedi</directory>
-				<excludes>
-					<exclude>**/*.java</exclude>
-				</excludes>
-			</resource>
-		</resources>
 		<plugins>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
@@ -36,7 +21,7 @@
 				<configuration>
 					<archive>
 						<manifest>
-							<mainClass>main.java.com.github.nianna.karedi.KarediApp</mainClass>
+							<mainClass>com.github.nianna.karedi.KarediApp</mainClass>
 						</manifest>
 					</archive>
 				</configuration>
@@ -47,7 +32,7 @@
 				<configuration>
 					<archive>
 						<manifest>
-							<mainClass>main.java.com.github.nianna.karedi.KarediApp</mainClass>
+							<mainClass>com.github.nianna.karedi.KarediApp</mainClass>
 						</manifest>
 					</archive>
 					<descriptorRefs>

src/main/java/com/github/nianna/karedi/I18N.java

@@ -1,4 +1,4 @@
-package main.java.com.github.nianna.karedi;
+package com.github.nianna.karedi;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;

src/main/java/com/github/nianna/karedi/KarediApp.java

@@ -1,4 +1,4 @@
-package main.java.com.github.nianna.karedi;
+package com.github.nianna.karedi;
 
 import java.io.File;
 import java.io.IOException;
@@ -22,10 +22,10 @@
 import javafx.stage.FileChooser;
 import javafx.stage.FileChooser.ExtensionFilter;
 import javafx.stage.Stage;
-import main.java.com.github.nianna.karedi.action.KarediActions;
-import main.java.com.github.nianna.karedi.context.AppContext;
-import main.java.com.github.nianna.karedi.controller.RootController;
-import main.java.com.github.nianna.karedi.dialog.SaveChangesAlert;
+import com.github.nianna.karedi.action.KarediActions;
+import com.github.nianna.karedi.context.AppContext;
+import com.github.nianna.karedi.controller.RootController;
+import com.github.nianna.karedi.dialog.SaveChangesAlert;
 
 public class KarediApp extends Application {
 	private final static String APP_NAME = "Karedi";

src/main/java/com/github/nianna/karedi/Settings.java

@@ -1,7 +1,7 @@
-package main.java.com.github.nianna.karedi;
+package com.github.nianna.karedi;
 
 import javafx.scene.paint.Color;
-import main.java.com.github.nianna.karedi.util.ColorUtils;
+import com.github.nianna.karedi.util.ColorUtils;
 
 import java.util.List;
 import java.util.Locale;

src/main/java/com/github/nianna/karedi/action/ActionMap.java

@@ -1,4 +1,4 @@
-package main.java.com.github.nianna.karedi.action;
+package com.github.nianna.karedi.action;
 
 import java.util.HashMap;
 import java.util.Map;

src/main/java/com/github/nianna/karedi/action/KarediAction.java

@@ -1,4 +1,4 @@
-package main.java.com.github.nianna.karedi.action;
+package com.github.nianna.karedi.action;
 
 import org.controlsfx.control.action.Action;
 

src/main/java/com/github/nianna/karedi/action/KarediActions.java

@@ -1,4 +1,4 @@
-package main.java.com.github.nianna.karedi.action;
+package com.github.nianna.karedi.action;
 
 public enum KarediActions {
 	// File

src/main/java/com/github/nianna/karedi/audio/AudioFileLoader.java

@@ -1,4 +1,4 @@
-package main.java.com.github.nianna.karedi.audio;
+package com.github.nianna.karedi.audio;
 
 import java.io.File;
 import java.util.Optional;

src/main/java/com/github/nianna/karedi/audio/CachedAudioFile.java

@@ -1,4 +1,4 @@
-package main.java.com.github.nianna.karedi.audio;
+package com.github.nianna.karedi.audio;
 
 import java.io.File;
 import java.io.IOException;

src/main/java/com/github/nianna/karedi/audio/ClipPlayer.java

@@ -1,4 +1,4 @@
-package main.java.com.github.nianna.karedi.audio;
+package com.github.nianna.karedi.audio;
 
 import java.net.URL;
 

src/main/java/com/github/nianna/karedi/audio/FileLoader.java

@@ -1,4 +1,4 @@
-package main.java.com.github.nianna.karedi.audio;
+package com.github.nianna.karedi.audio;
 
 import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;

src/main/java/com/github/nianna/karedi/audio/MidiPlayer.java

@@ -1,4 +1,4 @@
-package main.java.com.github.nianna.karedi.audio;
+package com.github.nianna.karedi.audio;
 
 import java.util.List;
 import java.util.logging.Logger;
@@ -13,7 +13,7 @@
 import org.jfugue.midi.MidiParserListener;
 import org.staccato.StaccatoParser;
 
-import main.java.com.github.nianna.karedi.I18N;
+import com.github.nianna.karedi.I18N;
 
 /**
  * Generates requested tones. Uses default sequencer of the {@link MidiSystem}.

src/main/java/com/github/nianna/karedi/audio/Mp3File.java

@@ -1,4 +1,4 @@
-package main.java.com.github.nianna.karedi.audio;
+package com.github.nianna.karedi.audio;
 
 import java.io.File;
 import java.io.IOException;
@@ -9,7 +9,7 @@
 
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.SimpleDoubleProperty;
-import main.java.com.github.nianna.karedi.I18N;
+import com.github.nianna.karedi.I18N;
 
 public class Mp3File implements CachedAudioFile {
 	private static final Logger LOGGER = Logger.getLogger(Mp3File.class.getName());

src/main/java/com/github/nianna/karedi/audio/Mp3Player.java

@@ -1,4 +1,4 @@
-package main.java.com.github.nianna.karedi.audio;
+package com.github.nianna.karedi.audio;
 
 import java.io.ByteArrayInputStream;
 import java.util.logging.Logger;
@@ -7,7 +7,7 @@
 import javazoom.jl.decoder.JavaLayerException;
 import javazoom.jl.player.advanced.AdvancedPlayer;
 import javazoom.jl.player.advanced.PlaybackListener;
-import main.java.com.github.nianna.karedi.I18N;
+import com.github.nianna.karedi.I18N;
 
 /**
  * A player operating on a preloaded mp3 file.

src/main/java/com/github/nianna/karedi/audio/Player.java

@@ -1,4 +1,4 @@
-package main.java.com.github.nianna.karedi.audio;
+package com.github.nianna.karedi.audio;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/com/github/nianna/karedi/audio/Playlist.java

@@ -1,10 +1,10 @@
-package main.java.com.github.nianna.karedi.audio;
+package com.github.nianna.karedi.audio;
 
 import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-import main.java.com.github.nianna.karedi.util.MathUtils;
+import com.github.nianna.karedi.util.MathUtils;
 
 /**
  * A container for {@link CachedAudioFile}s. Only one of them can be currently

src/main/java/com/github/nianna/karedi/audio/SamplesPerFrame.java

@@ -1,4 +1,4 @@
-package main.java.com.github.nianna.karedi.audio;
+package com.github.nianna.karedi.audio;
 
 import com.mpatric.mp3agic.MpegFrame;
 

src/main/java/com/github/nianna/karedi/command/AddLinesCommand.java

@@ -1,10 +1,10 @@
-package main.java.com.github.nianna.karedi.command;
+package com.github.nianna.karedi.command;
 
 import java.util.List;
 
-import main.java.com.github.nianna.karedi.I18N;
-import main.java.com.github.nianna.karedi.song.SongLine;
-import main.java.com.github.nianna.karedi.song.SongTrack;
+import com.github.nianna.karedi.I18N;
+import com.github.nianna.karedi.song.SongLine;
+import com.github.nianna.karedi.song.SongTrack;
 
 public class AddLinesCommand extends Command {
 

src/main/java/com/github/nianna/karedi/command/AddNewSyllableCommand.java

@@ -1,8 +1,8 @@
-package main.java.com.github.nianna.karedi.command;
+package com.github.nianna.karedi.command;
 
-import main.java.com.github.nianna.karedi.I18N;
-import main.java.com.github.nianna.karedi.song.Note;
-import main.java.com.github.nianna.karedi.util.LyricsHelper;
+import com.github.nianna.karedi.I18N;
+import com.github.nianna.karedi.song.Note;
+import com.github.nianna.karedi.util.LyricsHelper;
 
 public class AddNewSyllableCommand extends InsertSeparatorCommand {
 

src/main/java/com/github/nianna/karedi/command/AddNewWordCommand.java

@@ -1,8 +1,8 @@
-package main.java.com.github.nianna.karedi.command;
+package com.github.nianna.karedi.command;
 
-import main.java.com.github.nianna.karedi.I18N;
-import main.java.com.github.nianna.karedi.song.Note;
-import main.java.com.github.nianna.karedi.util.LyricsHelper;
+import com.github.nianna.karedi.I18N;
+import com.github.nianna.karedi.song.Note;
+import com.github.nianna.karedi.util.LyricsHelper;
 
 public class AddNewWordCommand extends InsertSeparatorCommand {
 

src/main/java/com/github/nianna/karedi/command/AddNoteCommand.java

@@ -1,11 +1,11 @@
-package main.java.com.github.nianna.karedi.command;
+package com.github.nianna.karedi.command;
 
 import java.util.Arrays;
 
-import main.java.com.github.nianna.karedi.I18N;
-import main.java.com.github.nianna.karedi.song.Note;
-import main.java.com.github.nianna.karedi.song.SongLine;
-import main.java.com.github.nianna.karedi.song.SongTrack;
+import com.github.nianna.karedi.I18N;
+import com.github.nianna.karedi.song.Note;
+import com.github.nianna.karedi.song.SongLine;
+import com.github.nianna.karedi.song.SongTrack;
 
 public class AddNoteCommand extends Command {
 	private Note note;

src/main/java/com/github/nianna/karedi/command/BackupStateCommandDecorator.java

@@ -1,13 +1,13 @@
-package main.java.com.github.nianna.karedi.command;
+package com.github.nianna.karedi.command;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import main.java.com.github.nianna.karedi.context.AppContext;
-import main.java.com.github.nianna.karedi.context.NoteSelection;
-import main.java.com.github.nianna.karedi.song.Note;
-import main.java.com.github.nianna.karedi.song.SongLine;
-import main.java.com.github.nianna.karedi.song.SongTrack;
+import com.github.nianna.karedi.context.AppContext;
+import com.github.nianna.karedi.context.NoteSelection;
+import com.github.nianna.karedi.song.Note;
+import com.github.nianna.karedi.song.SongLine;
+import com.github.nianna.karedi.song.SongTrack;
 
 public class BackupStateCommandDecorator extends CommandDecorator {
 	private AppContext appContext;

src/main/java/com/github/nianna/karedi/command/ChangeLengthCommand.java

@@ -1,7 +1,7 @@
-package main.java.com.github.nianna.karedi.command;
+package com.github.nianna.karedi.command;
 
-import main.java.com.github.nianna.karedi.I18N;
-import main.java.com.github.nianna.karedi.song.Note;
+import com.github.nianna.karedi.I18N;
+import com.github.nianna.karedi.song.Note;
 
 public class ChangeLengthCommand extends ChangePropertyCommand<Integer> {
 

src/main/java/com/github/nianna/karedi/command/ChangeLyricsCommand.java

@@ -1,7 +1,7 @@
-package main.java.com.github.nianna.karedi.command;
+package com.github.nianna.karedi.command;
 
-import main.java.com.github.nianna.karedi.I18N;
-import main.java.com.github.nianna.karedi.song.Note;
+import com.github.nianna.karedi.I18N;
+import com.github.nianna.karedi.song.Note;
 
 public class ChangeLyricsCommand extends ChangePropertyCommand<String> {
 

src/main/java/com/github/nianna/karedi/command/ChangeNoteTypeCommand.java

@@ -1,8 +1,8 @@
-package main.java.com.github.nianna.karedi.command;
+package com.github.nianna.karedi.command;
 
-import main.java.com.github.nianna.karedi.I18N;
-import main.java.com.github.nianna.karedi.song.Note;
-import main.java.com.github.nianna.karedi.song.Note.Type;
+import com.github.nianna.karedi.I18N;
+import com.github.nianna.karedi.song.Note;
+import com.github.nianna.karedi.song.Note.Type;
 
 public class ChangeNoteTypeCommand extends ChangePropertyCommand<Type> {
 

src/main/java/com/github/nianna/karedi/command/ChangeNotesTypeCommand.java

@@ -1,10 +1,10 @@
-package main.java.com.github.nianna.karedi.command;
+package com.github.nianna.karedi.command;
 
 import java.util.List;
 
-import main.java.com.github.nianna.karedi.I18N;
-import main.java.com.github.nianna.karedi.song.Note;
-import main.java.com.github.nianna.karedi.song.Note.Type;
+import com.github.nianna.karedi.I18N;
+import com.github.nianna.karedi.song.Note;
+import com.github.nianna.karedi.song.Note.Type;
 
 public class ChangeNotesTypeCommand extends CommandComposite {
 	private List<Note> notes;

src/main/java/com/github/nianna/karedi/command/ChangePostStateCommandDecorator.java

@@ -1,4 +1,4 @@
-package main.java.com.github.nianna.karedi.command;
+package com.github.nianna.karedi.command;
 
 import java.util.function.Consumer;
 

src/main/java/com/github/nianna/karedi/command/ChangePreStateCommandDecorator.java

@@ -1,4 +1,4 @@
-package main.java.com.github.nianna.karedi.command;
+package com.github.nianna.karedi.command;
 
 import java.util.function.Consumer;
 

src/main/java/com/github/nianna/karedi/command/ChangePropertyCommand.java

@@ -1,4 +1,4 @@
-package main.java.com.github.nianna.karedi.command;
+package com.github.nianna.karedi.command;
 
 import java.util.function.Consumer;
 import java.util.function.Supplier;