[jetrix-cvs] SF.net SVN: jetrix:[804] jetrix/trunk

[<sm...@us...>]

Revision: 804
          http://jetrix.svn.sourceforge.net/jetrix/?rev=804&view=rev
Author:   smanux
Date:     2009-02-25 21:54:38 +0000 (Wed, 25 Feb 2009)

Log Message:
-----------
Changed the path of the icons in the main jar

Modified Paths:
--------------
    jetrix/trunk/build.xml
    jetrix/trunk/src/java/net/jetrix/SystrayManager.java

Modified: jetrix/trunk/build.xml
===================================================================
--- jetrix/trunk/build.xml	2009-02-25 21:22:12 UTC (rev 803)
+++ jetrix/trunk/build.xml	2009-02-25 21:54:38 UTC (rev 804)
@@ -104,11 +104,9 @@
       <fileset dir="${src}/etc">
         <include name="tetrinet-server.dtd"/>
         <include name="tetrinet-channels.dtd"/>
+        <include name="icons/jetrix-16x16.png"/>
+        <include name="icons/jetrix-32x32.png"/>
       </fileset>
-      <fileset dir="${src}/etc/icons">
-        <include name="jetrix-16x16.png"/>
-        <include name="jetrix-32x32.png"/>
-      </fileset>
     </jar>
 
     <!-- Create the Launcher JAR -->

Modified: jetrix/trunk/src/java/net/jetrix/SystrayManager.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/SystrayManager.java	2009-02-25 21:22:12 UTC (rev 803)
+++ jetrix/trunk/src/java/net/jetrix/SystrayManager.java	2009-02-25 21:54:38 UTC (rev 804)
@@ -105,7 +105,7 @@
             String osname = System.getProperty("os.name");
             String iconname = osname.contains("Linux") ? "jetrix-32x32.png" : "jetrix-16x16.png";
             ClassLoader loader = Thread.currentThread().getContextClassLoader();
-            Image icon = new ImageIcon(loader.getResource(iconname)).getImage();
+            Image icon = new ImageIcon(loader.getResource("icons/" + iconname)).getImage();
 
             trayIcon = new TrayIcon(icon, TITLE, menu);
             trayIcon.setImageAutoSize(true);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.