Merge branch 'develop'

octaviospain · Aug 3, 2016 · 78cd898 · 78cd898
2 parents 720da9e + ee6271e
commit 78cd898
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 63 deletions.
diff --git a/build.fxbuild b/build.fxbuild
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ASCII"?>
 <anttasks:AntTask xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:anttasks="http://org.eclipse.fx.ide.jdt/1.0" buildDirectory="${project}/build" cssToBin="true">
   <deploy packagingFormat="dmg">
-    <application name="Musicott" mainclass="com.musicott.MusicottApplication" version="0.9-b" toolkit="fx"/>
-    <info title="Musicott" vendor="Musicott"/>
+    <application name="Musicott" mainclass="com.transgressoft.musicott.MusicottApplication" version="0.9-b" toolkit="fx"/>
+    <info title="Musicott" vendor="Transgressoft"/>
   </deploy>
   <signjar/>
 </anttasks:AntTask>
diff --git a/pom.xml b/pom.xml
@@ -13,14 +13,14 @@
         <resources>
 
             <resource>
-            <directory>src</directory>
-            <excludes>
-                <exclude>**/*.java</exclude>
-            </excludes>
+                <directory>src</directory>
+                <excludes>
+                    <exclude>**/*.java</exclude>
+                </excludes>
             </resource>
 
             <resource>
-            	<directory>resources</directory>
+                <directory>resources</directory>
             </resource>
         </resources>
         <plugins>
@@ -42,7 +42,7 @@
                     <archive>
                         <manifest>
                             <addClasspath>true</addClasspath>
-                            <mainClass>com.musicott.MusicottApplication</mainClass>
+                            <mainClass>com.musicott.transgressoft.MusicottApplication</mainClass>
                             <classpathPrefix>dependency-jars/</classpathPrefix>
                         </manifest>
                     </archive>
@@ -55,10 +55,10 @@
                 <version>1.6</version>
                 <executions>
                     <execution>
-                    <phase>package</phase>
-                    <goals>
-                    <goal>shade</goal>
-                    </goals>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
                     </execution>
                 </executions>
             </plugin>
@@ -95,7 +95,7 @@
     </build>
     <dependencies>
 
-    	<dependency>
+        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.12</version>
@@ -110,35 +110,21 @@
         </dependency>
 
         <dependency>
-        	<groupId>org.testfx</groupId>
-        	<artifactId>openjfx-monocle</artifactId>
-        	<version>1.8.0_20</version>
-        	<scope>test</scope>
-        </dependency>
-
-        <dependency>
-        	<groupId>org.testfx</groupId>
-        	<artifactId>testfx-legacy</artifactId>
-        	<version>4.0.1-alpha</version>
-        	<scope>test</scope>
-        </dependency>
-
-        <dependency>
-        	<groupId>org.testfx</groupId>
-        	<artifactId>testfx-junit</artifactId>
-        	<version>4.0.1-alpha</version>
-        	<scope>test</scope>
+            <groupId>org.testfx</groupId>
+            <artifactId>testfx-junit</artifactId>
+            <version>4.0.1-alpha</version>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>com.cedarsoftware</groupId>
             <artifactId>json-io</artifactId>
-            <version>4.5.0</version>
+            <version>4.4.0</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.commons</groupId>
+            <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
             <version>1.3.2</version>
             <scope>compile</scope>
@@ -166,23 +152,23 @@
         </dependency>
 
         <dependency>
-        	<groupId>org.slf4j</groupId>
-        	<artifactId>slf4j-api</artifactId>
-        	<version>1.7.12</version>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.12</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
-    		<groupId>org.slf4j</groupId>
-    		<artifactId>slf4j-jdk14</artifactId>
-    		<version>1.7.11</version>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+            <version>1.7.11</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
-        	<groupId>org.controlsfx</groupId>
-        	<artifactId>controlsfx</artifactId>
-        	<version>8.40.11</version>
+            <groupId>org.controlsfx</groupId>
+            <artifactId>controlsfx</artifactId>
+            <version>8.40.11</version>
             <scope>compile</scope>
         </dependency>
 
@@ -201,19 +187,19 @@
         </dependency>
 
         <dependency>
-        	<groupId>net.jthink</groupId>
-        	<artifactId>jaudiotagger</artifactId>
-        	<scope>system</scope>
-        	<version>2.2.6-SNAPSHOT</version>
-        	<systemPath>${project.basedir}/lib/jaudiotagger-2.2.6-SNAPSHOT.jar</systemPath>
+            <groupId>net.jthink</groupId>
+            <artifactId>jaudiotagger</artifactId>
+            <scope>system</scope>
+            <version>2.2.6-SNAPSHOT</version>
+            <systemPath>${project.basedir}/lib/jaudiotagger-2.2.6-SNAPSHOT.jar</systemPath>
         </dependency>
 
         <dependency>
-        	<groupId>be.tarsos</groupId>
-        	<artifactId>transcoder</artifactId>
-        	<scope>system</scope>
-        	<version>1.2</version>
-        	<systemPath>${project.basedir}/lib/TarsosTranscoder-1.2.jar</systemPath>
+            <groupId>be.tarsos</groupId>
+            <artifactId>transcoder</artifactId>
+            <scope>system</scope>
+            <version>1.2</version>
+            <systemPath>${project.basedir}/lib/TarsosTranscoder-1.2.jar</systemPath>
         </dependency>
 
         <dependency>
@@ -240,12 +226,12 @@
             <url>https://oss.sonatype.org/content/repositories/snapshots</url>
             <snapshots>
                 <enabled>true</enabled>
-           </snapshots>
+            </snapshots>
         </repository>
 
         <repository>
             <id>jitpack.io</id>
             <url>https://jitpack.io</url>
         </repository>
     </repositories>
-</project>
+</project>
diff --git a/resources/images/musicott-about-logo.png b/resources/images/musicott-about-logo.png
diff --git a/resources/images/musicott-app-icon.png b/resources/images/musicott-app-icon.png
diff --git a/resources/images/musicotticon.png b/resources/images/musicotticon.png
diff --git a/src/com/transgressoft/musicott/MainPreloader.java b/src/com/transgressoft/musicott/MainPreloader.java
@@ -50,7 +50,6 @@ public class MainPreloader extends Preloader {
 	private ErrorDemon errorDemon = ErrorDemon.getInstance();
 	private MainPreferences preferences = MainPreferences.getInstance();
 	private Stage preloaderStage;
-	private Image musicottIcon = new Image(getClass().getResourceAsStream(MUSICOTT_ABOUT_LOGO));
 	private Label infoLabel;
 	private ProgressBar preloaderProgressBar;
 
@@ -62,7 +61,7 @@ public void start(Stage primaryStage) throws Exception {
 		preloaderStage = primaryStage;
 		preloaderStage.setOnCloseRequest(Event::consume);
 		preloaderStage.setTitle("Musicott");
-		preloaderStage.getIcons().add(musicottIcon);
+		preloaderStage.getIcons().add(new Image(getClass().getResourceAsStream(MUSICOTT_APP_ICON)));
 		preloaderStage.setScene(new Scene(rootAnchorPane));
 		preloaderStage.setResizable(false);
 		preloaderStage.initStyle(StageStyle.UNDECORATED);

diff --git a/src/com/transgressoft/musicott/MusicottApplication.java b/src/com/transgressoft/musicott/MusicottApplication.java
@@ -185,7 +185,6 @@ private void loadConfigProperties() {
 		}
 		catch (IOException exception) {
 			LOG.warn("Error loading configuration properties", exception);
-			errorDemon.showErrorDialog("Error", "Error when loading configuration properties", exception);
 		}
 	}
 
@@ -272,7 +271,6 @@ private Map<Integer, float[]> parseWaveformsFromJsonFile(File waveformsFile) {
 		catch (IOException exception) {
 			waveformsMap = new HashMap<>();
 			LOG.error("Error loading waveform thumbnails: ", exception.getCause());
-			errorDemon.showErrorDialog("Error", "Error when loading waveform thumbnails: ", exception);
 		}
 		return waveformsMap;
 	}
@@ -306,7 +304,6 @@ private List<Playlist> parsePlaylistFromJsonFile(File playlistsFile) {
 		catch (IOException exception) {
 			playlists = new ArrayList<>();
 			LOG.error("Error loading playlists: ", exception.getCause());
-			errorDemon.showErrorDialog("Error loading playlists: ", "", exception);
 		}
 		return playlists;
 	}
@@ -338,7 +335,6 @@ private ObservableMap<Integer, Track> parseTracksFromJsonFile(File tracksFile) {
 		catch (IOException exception) {
 			tracksMap = FXCollections.observableHashMap();
 			LOG.error("Error loading track library {}", exception.getCause());
-			errorDemon.showErrorDialog("Error loading tracks: ", "", exception);
 		}
 		return tracksMap;
 	}

diff --git a/src/com/transgressoft/musicott/StageDemon.java b/src/com/transgressoft/musicott/StageDemon.java
@@ -147,7 +147,7 @@ void showMusicott(Stage primaryStage) throws IOException {
 		Scene mainScene = new Scene(rootLayout);
 		mainStage.setScene(mainScene);
 		mainStage.setTitle("Musicott");
-		mainStage.getIcons().add(new Image(getClass().getResourceAsStream(MUSICOTT_ICON)));
+		mainStage.getIcons().add(new Image(getClass().getResourceAsStream(MUSICOTT_APP_ICON)));
 		mainStage.setMinWidth(1200);
 		mainStage.setMinHeight(805);
 		mainStage.show();

diff --git a/src/com/transgressoft/musicott/view/MusicottController.java b/src/com/transgressoft/musicott/view/MusicottController.java
@@ -32,10 +32,9 @@ public interface MusicottController {
 
 	String DEFAULT_COVER_IMAGE = IMAGES_PATH + "default-cover-image.png";
 	String LASTFM_LOGO = IMAGES_PATH + "lastfm-logo.png";
-	String MUSICOTT_ICON = IMAGES_PATH + "musicotticon.png";
+	String MUSICOTT_APP_ICON = IMAGES_PATH + "musicott-app-icon.png";
 	String MUSICOTT_ABOUT_LOGO = IMAGES_PATH + "musicott-about-logo.png";
 
-	String BASE_STYLE = STYLES_PATH + "base.css";
 	String DIALOG_STYLE = STYLES_PATH + "dialog.css";
 	String TRACK_TABLE_STYLE = STYLES_PATH + "tracktable.css";