property edit pane is changed to beginner mode

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

diff --git a/pom.xml b/pom.xml
index 3c6b83d..8bd0298 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>jp.naist.se</groupId>
   <artifactId>stigmata</artifactId>
-  <version>1.1.0</version>
+  <version>1.1.1</version>
   <name>stigmata</name>
   <description>Java birthmark toolkit</description>
   <url>http://stigmata.sourceforge.jp/</url>
@@ -64,14 +64,12 @@
       <version>1.0.2</version>
       <scope>compile</scope>
     </dependency>
-<!--
     <dependency>
       <groupId>edu.stanford.ejalbert</groupId>
-      <artifactId>browserlauncher</artifactId>
+      <artifactId>BrowserLauncher2</artifactId>
       <version>1.2</version>
       <scope>compile</scope>
     </dependency>
--->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

diff --git a/src/main/java/jp/naist/se/stigmata/BirthmarkEngine.java b/src/main/java/jp/naist/se/stigmata/BirthmarkEngine.java
index 0ba265d..846fa5e 100755 (executable)
--- a/src/main/java/jp/naist/se/stigmata/BirthmarkEngine.java
+++ b/src/main/java/jp/naist/se/stigmata/BirthmarkEngine.java
@@ -260,6 +260,7 @@ public class BirthmarkEngine{
         return list.toArray(new BirthmarkExtractor[list.size()]);\r
     }\r
 \r
+    @SuppressWarnings("unchecked")\r
     private BirthmarkExtractor createExtractor(String birthmarkType, BirthmarkEnvironment environment){\r
         BirthmarkSpi spi = environment.getService(birthmarkType);\r
         BirthmarkExtractor extractor = null;\r

diff --git a/src/main/java/jp/naist/se/stigmata/ui/swing/ControlPane.java b/src/main/java/jp/naist/se/stigmata/ui/swing/ControlPane.java
index d8d208f..2a8ed55 100644 (file)
--- a/src/main/java/jp/naist/se/stigmata/ui/swing/ControlPane.java
+++ b/src/main/java/jp/naist/se/stigmata/ui/swing/ControlPane.java
@@ -77,6 +77,7 @@ public class ControlPane extends JPanel{
         Utility.addNewTab("targets", controlTab, control);\r
         Utility.addNewTab("wellknown", controlTab, wellknownClassses);\r
         Utility.addNewTab("classpath", controlTab, classpath);\r
+        Utility.addNewTab("property", controlTab, properties);\r
         reset();\r
     }\r
 \r
@@ -101,13 +102,13 @@ public class ControlPane extends JPanel{
         filters.reset();\r
         updateEnable();\r
 \r
-        int index1 = controlTab.indexOfTab(Messages.getString("definition.tab.label"));\r
-        if(index1 >= 0){\r
-            controlTab.removeTabAt(index1);\r
+        int definitionTabIndex = controlTab.indexOfTab(Messages.getString("definition.tab.label"));\r
+        if(definitionTabIndex >= 0){\r
+            controlTab.removeTabAt(definitionTabIndex);\r
         }\r
-        int index2 = controlTab.indexOfTab(Messages.getString("property.tab.label"));\r
-        if(index2 >= 0){\r
-            controlTab.removeTabAt(index2);\r
+        int filterTabIndex = controlTab.indexOfTab(Messages.getString("filter.tab.label"));\r
+        if(filterTabIndex >= 0){\r
+            controlTab.removeTabAt(filterTabIndex);\r
         }\r
     }\r
 \r
@@ -146,12 +147,10 @@ public class ControlPane extends JPanel{
 \r
         if(expertmode){\r
             Utility.addNewTab("definition", controlTab, definition);\r
-            Utility.addNewTab("property", controlTab, properties);\r
             Utility.addNewTab("filter", controlTab, filters);\r
         }\r
         else{\r
             removeTabByName(Messages.getString("definition.tab.label"));\r
-            removeTabByName(Messages.getString("property.tab.label"));\r
             removeTabByName(Messages.getString("filter.tab.label"));\r
         }\r
         updateEnable();\r

diff --git a/src/main/java/jp/naist/se/stigmata/ui/swing/FileIOManager.java b/src/main/java/jp/naist/se/stigmata/ui/swing/FileIOManager.java
index 1b70358..cc27c0f 100644 (file)
--- a/src/main/java/jp/naist/se/stigmata/ui/swing/FileIOManager.java
+++ b/src/main/java/jp/naist/se/stigmata/ui/swing/FileIOManager.java
@@ -23,7 +23,12 @@ public class FileIOManager{
 \r
     public FileIOManager(Component parent){\r
         this.parent = parent;\r
-        currentDirectory = new File(".");\r
+        if(System.getProperty("execution.directory") != null){\r
+            currentDirectory = new File(System.getProperty("execution.directory"));\r
+        }\r
+        else{\r
+            currentDirectory = new File(".");\r
+        }\r
     }\r
 \r
     public File getCurrentDirectory(){\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 0d8acd2..d08e877 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
@@ -533,7 +533,7 @@ public class StigmataFrame extends JFrame{
         out.close();\r
         area.setText(writer.toString());\r
         JPanel panel = new JPanel(new BorderLayout());\r
-        panel.add(new JLabel(Messages.getString("error.message.contactus")), BorderLayout.NORTH);\r
+        panel.add(new JLabel("<html><body><p>" + Messages.getString("error.message.contactus") + "</p></body></html>"), BorderLayout.NORTH);\r
         panel.add(new JScrollPane(area), BorderLayout.CENTER);\r
 \r
         JOptionPane.showMessageDialog(\r

diff --git a/src/main/resources/resources/messages.properties b/src/main/resources/resources/messages.properties
index b33efab..c09dcec 100755 (executable)
--- a/src/main/resources/resources/messages.properties
+++ b/src/main/resources/resources/messages.properties
@@ -481,8 +481,8 @@ target.ONE_OF_TARGET=target 1 or target 2
 \r
 warning.dialog.title=Warnings\r
 error.dialog.title=Error\r
-error.message.classpath=<html><body><p>Failed proccessed operation because following classes did not found.<br>Please examine your classpath settings at ``Control'' tab.</p></body></html>\r
-error.message.contactus=<html><body><p>Failed proccessed operation because following exception.<br>Please report to developer with following error messages.</p></body></html>\r
+error.message.classpath=Failed proccessed operation because following classes did not found.<br>Please examine your classpath settings at ``Classpath'' tab in ``Control'' tab.\r
+error.message.contactus=Failed proccessed operation because following exception.<br>Please report to developer with following error messages.\r
 error.empty.threshold=Threshold is empty\r
 error.empty.value=Value is empty\r
 error.invalid.format={0}: Invalid format\r

diff --git a/src/main/resources/resources/messages_ja.source b/src/main/resources/resources/messages_ja.source
index bc1aa75..1e0ddf1 100755 (executable)
--- a/src/main/resources/resources/messages_ja.source
+++ b/src/main/resources/resources/messages_ja.source
@@ -374,8 +374,8 @@ target.BOTH_TARGET=
 target.ONE_OF_TARGET=\82Ç\82¿\82ç\82©\r
 \r
 error.dialog.title=\83G\83\89\81[\r
-error.message.classpath=<html><body><p>\88È\89º\82Ì\83N\83\89\83X\82ª\8c©\82Â\82©\82ç\82È\82©\82Á\82½\82½\82ß\81C\8ew\92è\82³\82ê\82½\8f\88\97\9d\82ð\8a®\97¹\82·\82é\82±\82Æ\82ª\82Å\82«\82Ü\82¹\82ñ\82Å\82µ\82½\81D<br>\81u\83R\83\93\83g\83\8d\81[\83\8b\81v\83^\83u\82Ì\83N\83\89\83X\83p\83X\90Ý\92è\82ð\8c©\92¼\82µ\82Ä\8dÄ\8eÀ\8ds\82µ\82Ä\82­\82¾\82³\82¢\81D</p></body></html>\r
-error.message.contactus=<html><body><p>\88È\89º\82Ì\97á\8aO\82ª\94­\90¶\82µ\82½\82½\82ß\81C\8ew\92è\82³\82ê\82½\8f\88\97\9d\82ð\8a®\97¹\82·\82é\82±\82Æ\82ª\82Å\82«\82Ü\82¹\82ñ\82Å\82µ\82½\81D<br>\83G\83\89\81[\83\81\83b\83Z\81[\83W\82ð\93Y\95t\82µ\82Ä\8aJ\94­\8eÒ\82Ü\82Å\83\8c\83|\81[\83g\82ð\82¨\8aè\82¢\82µ\82Ü\82·\81D</p></body></html>\r
+error.message.classpath=\88È\89º\82Ì\83N\83\89\83X\82ª\8c©\82Â\82©\82ç\82È\82©\82Á\82½\82½\82ß\81C\8ew\92è\82³\82ê\82½\8f\88\97\9d\82ð\8a®\97¹\82·\82é\82±\82Æ\82ª\82Å\82«\82Ü\82¹\82ñ\82Å\82µ\82½\81D<br>\81u\83R\83\93\83g\83\8d\81[\83\8b\81v\83^\83u\82Ì\83N\83\89\83X\83p\83X\90Ý\92è\82ð\8c©\92¼\82µ\82Ä\8dÄ\8eÀ\8ds\82µ\82Ä\82­\82¾\82³\82¢\81D\r
+error.message.contactus=\88È\89º\82Ì\97á\8aO\82ª\94­\90¶\82µ\82½\82½\82ß\81C\8ew\92è\82³\82ê\82½\8f\88\97\9d\82ð\8a®\97¹\82·\82é\82±\82Æ\82ª\82Å\82«\82Ü\82¹\82ñ\82Å\82µ\82½\81D<br>\83G\83\89\81[\83\81\83b\83Z\81[\83W\82ð\93Y\95t\82µ\82Ä\8aJ\94­\8eÒ\82Ü\82Å\83\8c\83|\81[\83g\82ð\82¨\8aè\82¢\82µ\82Ü\82·\81D\r
 error.empty.threshold=è\87\92l\82ª\93ü\97Í\82³\82ê\82Ä\82¢\82Ü\82¹\82ñ\81D\r
 error.empty.value=\92l\82ª\93ü\97Í\82³\82ê\82Ä\82¢\82Ü\82¹\82ñ\81D\r
 error.invalid.format={0}: \83t\83H\81[\83}\83b\83g\88È\8fã\82Å\82·\81D\r