Frame: Fixed GW2 Icon

leosarra · Dec 8, 2017 · c8f1794 · c8f1794
1 parent cb3bd92
commit c8f1794
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 27 deletions.
diff --git a/.classpath b/.classpath
@@ -16,5 +16,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="lib" path="resources"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ gw2_launcher.cfg
 gw2_launcher_log.txt
 gw2_launcher_log_op.txt
 /target/
+*.cfg
diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
@@ -12,9 +12,9 @@
     <resources>
       <resource>
         <directory>src</directory>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
+      </resource>
+      <resource>
+        <directory>resources</directory>
       </resource>
     </resources>
     <plugins>

diff --git a/pom.xml b/pom.xml
@@ -56,10 +56,10 @@
     <resources>
       <resource>
         <directory>src</directory>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
       </resource>
+      <resource>
+        <directory>resources</directory>
+    </resource>
     </resources>
     <plugins>
       <plugin>

diff --git a/src/img/gw2_64_1-1.png → resources/gw2_64_1-1.png b/src/img/gw2_64_1-1.png → resources/gw2_64_1-1.png
diff --git a/src/chooser/DirChooser.java b/src/chooser/DirChooser.java
@@ -26,23 +26,6 @@ public class DirChooser implements Task {
 
     private static Logger log = Logger.getLogger( CoreUpdater.class.getName() );
 
-    public DirChooser(){
-
-    	//Change to look and feel to make it more similar to the Windows' one
-        try {
-            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        } catch (InstantiationException e) {
-            e.printStackTrace();
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        } catch (UnsupportedLookAndFeelException e) {
-            e.printStackTrace();
-        }
-        SwingUtilities.updateComponentTreeUI(f);
-
-    }
     public void esegui() {
     	//Functor pattern
     	Operations.LogSetup(log,false);
@@ -59,8 +42,7 @@ public void esegui() {
             icon.setLocationRelativeTo(null);
             icon.setUndecorated(true);
             icon.setVisible(true);
-            icon.setIconImage(Toolkit.getDefaultToolkit().
-            	    getImage(JFrame.class.getResource("/img/gw2_64_1-1.png")));
+            icon.setIconImage(Toolkit.getDefaultToolkit().getImage(DirChooser.class.getResource("/gw2_64_1-1.png")));
             icon.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
             //Loop until "Cancel" is pressed or a valid directory is selected
             while (!found) {

diff --git a/src/frame/CoreFrame.java b/src/frame/CoreFrame.java
@@ -39,7 +39,7 @@ public CoreFrame(String dir){
         path_string=dir;
 
         this.setIconImage(Toolkit.getDefaultToolkit().
-        	    getImage(CoreFrame.class.getResource("/img/gw2_64_1-1.png")));
+        	    getImage(CoreFrame.class.getResource("/gw2_64_1-1.png")));
 
 
         //Settings of the CoreFrame object 

diff --git a/src/updater/UpdateNotifier.java b/src/updater/UpdateNotifier.java
@@ -69,7 +69,6 @@ private String getJSONData(){
         WebResource webResource = client.resource(UriBuilder.fromUri("https://api.github.com/repos/"+username+"/"+repoName+"/releases").build());
         ClientResponse response = webResource.accept("application/json").get(ClientResponse.class);
         String output = response.getEntity(String.class);
-        //System.out.println(output);
         return output;
     }
 }