Revision: 7987
http://languagetool.svn.sourceforge.net/languagetool/?rev=7987&view=rev
Author: dnaber
Date: 2012-09-04 21:30:46 +0000 (Tue, 04 Sep 2012)
Log Message:
-----------
fix tray icon path; tiny code cleanup
Modified Paths:
--------------
trunk/JLanguageTool/build.xml
trunk/JLanguageTool/src/main/java/org/languagetool/gui/Main.java
Modified: trunk/JLanguageTool/build.xml
===================================================================
--- trunk/JLanguageTool/build.xml 2012-09-04 21:29:57 UTC (rev 7986)
+++ trunk/JLanguageTool/build.xml 2012-09-04 21:30:46 UTC (rev 7987)
@@ -487,7 +487,7 @@
</target>
<target name="common" depends="clean,init,build">
- <copy file="${resource.dir}/org/languagetool/resource/TrayIcon.png"
todir="${dist.dir}/resource/" />
+ <copy file="${resource.dir}/org/languagetool/resource/TrayIcon.png"
todir="${dist.dir}/org/languagetool/resource" />
<filter filtersFile="build.properties" />
<copy file="./README.txt" todir="${dist.dir}" />
Modified: trunk/JLanguageTool/src/main/java/org/languagetool/gui/Main.java
===================================================================
--- trunk/JLanguageTool/src/main/java/org/languagetool/gui/Main.java
2012-09-04 21:29:57 UTC (rev 7986)
+++ trunk/JLanguageTool/src/main/java/org/languagetool/gui/Main.java
2012-09-04 21:30:46 UTC (rev 7987)
@@ -40,6 +40,7 @@
import java.io.FileInputStream;
import java.io.IOException;
import java.io.Reader;
+import java.net.URL;
import java.util.*;
import java.util.List;
@@ -100,8 +101,8 @@
frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
frame.addWindowListener(new CloseListener());
- frame.setIconImage(new
ImageIcon(JLanguageTool.getDataBroker().getFromResourceDirAsUrl(
- Main.SYSTEM_TRAY_ICON_NAME)).getImage());
+ final URL iconUrl =
JLanguageTool.getDataBroker().getFromResourceDirAsUrl(SYSTEM_TRAY_ICON_NAME);
+ frame.setIconImage(new ImageIcon(iconUrl).getImage());
frame.setJMenuBar(new MainMenuBar(this, messages));
textArea = new JTextArea(messages.getString("guiDemoText"));
@@ -230,7 +231,7 @@
if (!isInTray) {
final java.awt.SystemTray tray = java.awt.SystemTray.getSystemTray();
final Image img = Toolkit.getDefaultToolkit().getImage(
-
JLanguageTool.getDataBroker().getFromResourceDirAsUrl(Main.SYSTEM_TRAY_ICON_NAME));
+
JLanguageTool.getDataBroker().getFromResourceDirAsUrl(SYSTEM_TRAY_ICON_NAME));
final PopupMenu popup = makePopupMenu();
try {
final java.awt.TrayIcon trayIcon = new java.awt.TrayIcon(img,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Languagetool-cvs mailing list
Languagetool-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/languagetool-cvs
