add stigmata icon

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/stigmata/trunk@181 acee48c3-7b26-0410-bdac-b3d0e5314bbc

diff --git a/src/main/java/jp/naist/se/stigmata/Main.java b/src/main/java/jp/naist/se/stigmata/Main.java
index a0b9f9a..055023e 100644 (file)
--- a/src/main/java/jp/naist/se/stigmata/Main.java
+++ b/src/main/java/jp/naist/se/stigmata/Main.java
@@ -242,7 +242,6 @@ public final class Main{
     private void printHelp(Options options){\r
         Package p = getClass().getPackage();\r
         HelpFormatter formatter = new HelpFormatter();\r
-        System.out.println(options.getClass().getName());\r
         formatter.printHelp(\r
             String.format(\r
                 "java -jar stigmata-%s.jar <OPTIONS> <TARGETS>%n" + \r

diff --git a/src/main/java/jp/naist/se/stigmata/ui/swing/StigmataFrame.java b/src/main/java/jp/naist/se/stigmata/ui/swing/StigmataFrame.java
index d08e877..37675b0 100644 (file)
--- a/src/main/java/jp/naist/se/stigmata/ui/swing/StigmataFrame.java
+++ b/src/main/java/jp/naist/se/stigmata/ui/swing/StigmataFrame.java
@@ -5,6 +5,7 @@ package jp.naist.se.stigmata.ui.swing;
  */\r
 \r
 import java.awt.BorderLayout;\r
+import java.awt.Image;\r
 import java.awt.event.ActionEvent;\r
 import java.awt.event.ActionListener;\r
 import java.io.BufferedReader;\r
@@ -38,8 +39,8 @@ import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;\r
 import javax.swing.filechooser.FileFilter;\r
 \r
-import jp.naist.se.stigmata.BirthmarkEnvironment;\r
 import jp.naist.se.stigmata.BirthmarkElementClassNotFoundException;\r
+import jp.naist.se.stigmata.BirthmarkEnvironment;\r
 import jp.naist.se.stigmata.BirthmarkExtractionFailedException;\r
 import jp.naist.se.stigmata.BirthmarkSet;\r
 import jp.naist.se.stigmata.CertainPairComparisonResultSet;\r
@@ -57,7 +58,6 @@ import jp.naist.se.stigmata.ui.swing.graph.SimilarityDistributionGraphPane;
 import jp.naist.se.stigmata.ui.swing.mds.MDSGraphPanel;\r
 import jp.naist.se.stigmata.ui.swing.tab.EditableTabbedPane;\r
 \r
-\r
 /**\r
  *\r
  * @author Haruaki TAMADA\r
@@ -87,6 +87,10 @@ public class StigmataFrame extends JFrame{
         this.stigmata = stigmata;\r
         this.environment = environment;\r
         this.fileio = new FileIOManager(this);\r
+        Image iconImage = Utility.getImage("stigmata.icon");\r
+        if(iconImage != null){\r
+            setIconImage(iconImage);\r
+        }\r
 \r
         stigmata.addBirthmarkEngineListener(new BirthmarkEngineAdapter(){\r
             @Override\r

diff --git a/src/main/java/jp/naist/se/stigmata/ui/swing/Utility.java b/src/main/java/jp/naist/se/stigmata/ui/swing/Utility.java
index 7a32429..3ae34a0 100644 (file)
--- a/src/main/java/jp/naist/se/stigmata/ui/swing/Utility.java
+++ b/src/main/java/jp/naist/se/stigmata/ui/swing/Utility.java
@@ -5,6 +5,7 @@ package jp.naist.se.stigmata.ui.swing;
  */\r
 \r
 import java.awt.Component;\r
+import java.awt.Image;\r
 import java.lang.reflect.InvocationTargetException;\r
 import java.lang.reflect.Method;\r
 import java.text.MessageFormat;\r
@@ -152,6 +153,15 @@ public class Utility{
         return null;\r
     }\r
 \r
+    public static Image getImage(String imageFilePathLabel){\r
+        if(Messages.hasString(imageFilePathLabel)){\r
+            String imageFilePath = Messages.getString(imageFilePathLabel);\r
+            ImageIcon icon = new ImageIcon(Utility.class.getResource(iconPath + imageFilePath));\r
+            return icon.getImage();\r
+        }\r
+        return null;\r
+    }\r
+\r
     public static String array2String(String[] values){\r
         StringBuilder builder = new StringBuilder();\r
         for(int i = 0; i < values.length; i++){\r

diff --git a/src/main/resources/resources/images/splash.png b/src/main/resources/resources/images/splash.png
new file mode 100755 (executable)
index 0000000..50c651d
Binary files /dev/null and b/src/main/resources/resources/images/splash.png differ

diff --git a/src/main/resources/resources/images/splash.psd b/src/main/resources/resources/images/splash.psd
new file mode 100755 (executable)
index 0000000..5ec976e
Binary files /dev/null and b/src/main/resources/resources/images/splash.psd differ

diff --git a/src/main/resources/resources/images/stigmata_icon.png b/src/main/resources/resources/images/stigmata_icon.png
new file mode 100755 (executable)
index 0000000..e6ff1d0
Binary files /dev/null and b/src/main/resources/resources/images/stigmata_icon.png differ

diff --git a/src/main/resources/resources/images/stigmata_icon.psd b/src/main/resources/resources/images/stigmata_icon.psd
new file mode 100755 (executable)
index 0000000..205b98c
Binary files /dev/null and b/src/main/resources/resources/images/stigmata_icon.psd differ

diff --git a/src/main/resources/resources/messages.properties b/src/main/resources/resources/messages.properties
index c09dcec..c676ed6 100755 (executable)
--- a/src/main/resources/resources/messages.properties
+++ b/src/main/resources/resources/messages.properties
@@ -4,6 +4,7 @@
 stigmata.version=${pom.version}\r
 \r
 icon.directory=/resources/images/\r
+stigmata.icon=stigmata_icon.png\r
 \r
 ################################################\r
 # StigmataFrame\r