change method name setGeekMode -> setExpertMode

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

diff --git a/src/main/java/jp/naist/se/stigmata/ui/swing/BirthmarkSelectionPane.java b/src/main/java/jp/naist/se/stigmata/ui/swing/BirthmarkSelectionPane.java
index 4a38869..a8c2969 100755 (executable)
--- a/src/main/java/jp/naist/se/stigmata/ui/swing/BirthmarkSelectionPane.java
+++ b/src/main/java/jp/naist/se/stigmata/ui/swing/BirthmarkSelectionPane.java
@@ -33,7 +33,7 @@ public class BirthmarkSelectionPane extends JPanel implements BirthmarkServiceHo
     private List<BirthmarkSpi> serviceList;\r
     private Map<BirthmarkSpi, JCheckBox> checks;\r
     private List<DataChangeListener> listeners = new ArrayList<DataChangeListener>();\r
-    private boolean geekmode = false;\r
+    private boolean expertmode = false;\r
 \r
     public BirthmarkSelectionPane(StigmataFrame stigmata) {\r
         this.stigmata = stigmata;\r
@@ -55,19 +55,19 @@ public class BirthmarkSelectionPane extends JPanel implements BirthmarkServiceHo
         updateLayouts();\r
     }\r
 \r
-    public void setGeekMode(boolean geekmode){\r
-        this.geekmode = geekmode;\r
+    public void setExpertMode(boolean expertmode){\r
+        this.expertmode = expertmode;\r
         updateLayouts();\r
     }\r
 \r
-    public boolean isGeekMode(){\r
-        return geekmode;\r
+    public boolean isExpertMode(){\r
+        return expertmode;\r
     }\r
 \r
     public void reset(){\r
         selectedServices.clear();\r
         initServices();\r
-        geekmode = false;\r
+        expertmode = false;\r
         updateLayouts();\r
         fireEvent();\r
     }\r
@@ -148,7 +148,7 @@ public class BirthmarkSelectionPane extends JPanel implements BirthmarkServiceHo
     private Dimension calculateDimension(){\r
         int rows = 1;\r
         int cols = 0;\r
-        if(!isGeekMode()){\r
+        if(!isExpertMode()){\r
             for(BirthmarkSpi service: serviceList){\r
                 if(!service.isExpert()){\r
                     cols++;\r
@@ -179,7 +179,7 @@ public class BirthmarkSelectionPane extends JPanel implements BirthmarkServiceHo
         for(BirthmarkSpi service: serviceList){\r
             JCheckBox check = checks.get(service);\r
             check.setVisible(true);\r
-            if(!service.isExpert() || (isGeekMode() && service.isExpert())){\r
+            if(!service.isExpert() || (isExpertMode() && service.isExpert())){\r
                 add(check);\r
             }\r
             else{\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 597e9c6..ecfde43 100755 (executable)
--- a/src/main/java/jp/naist/se/stigmata/ui/swing/ControlPane.java
+++ b/src/main/java/jp/naist/se/stigmata/ui/swing/ControlPane.java
@@ -48,7 +48,7 @@ public class ControlPane extends JPanel{
     private JButton extractButton;\r
     private JButton resetButton;\r
     private JComboBox comparisonMethods;\r
-    private boolean geekmode = false;\r
+    private boolean expertmode = false;\r
 \r
     public ControlPane(StigmataFrame stigmata){\r
         this.stigmata = stigmata;\r
@@ -65,10 +65,10 @@ public class ControlPane extends JPanel{
     }\r
 \r
     public void reset(){\r
-        this.geekmode = false;\r
+        this.expertmode = false;\r
         definition.reset();\r
         birthmarks.reset();\r
-        stigmata.setGeekMode(false);\r
+        stigmata.setExpertMode(false);\r
         targetX.removeAllElements();\r
         targetY.removeAllElements();\r
 \r
@@ -108,12 +108,12 @@ public class ControlPane extends JPanel{
         }\r
     }\r
 \r
-    public void setGeekMode(boolean geekmode){\r
-        this.geekmode = geekmode;\r
-        birthmarks.setGeekMode(geekmode);\r
-        stigmata.setGeekMode(geekmode);\r
+    public void setExpertMode(boolean expertmode){\r
+        this.expertmode = expertmode;\r
+        birthmarks.setExpertMode(expertmode);\r
+        stigmata.setExpertMode(expertmode);\r
 \r
-        if(geekmode){\r
+        if(expertmode){\r
             Utility.addNewTab("definition", controlTab, definition);\r
             Utility.addNewTab("property", controlTab, properties);\r
         }\r
@@ -130,8 +130,8 @@ public class ControlPane extends JPanel{
         updateEnable();\r
     }\r
 \r
-    public boolean isGeekMode(){\r
-        return geekmode;\r
+    public boolean isExpertMode(){\r
+        return expertmode;\r
     }\r
 \r
     private JComponent createWellknownClassPane(){\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 d388c4c..cfd6cef 100755 (executable)
--- a/src/main/java/jp/naist/se/stigmata/ui/swing/StigmataFrame.java
+++ b/src/main/java/jp/naist/se/stigmata/ui/swing/StigmataFrame.java
@@ -69,7 +69,7 @@ public class StigmataFrame extends JFrame implements CurrentDirectoryHolder{
     private static List<JFrame> frameList = new ArrayList<JFrame>();\r
     private JTabbedPane tabPane;\r
     private JMenuItem closeTabMenu;\r
-    private JCheckBoxMenuItem geekmodeMenu;\r
+    private JCheckBoxMenuItem expertmodeMenu;\r
     private Stigmata stigmata;\r
     private BirthmarkContext context;\r
     private ControlPane control;\r
@@ -177,10 +177,11 @@ public class StigmataFrame extends JFrame implements CurrentDirectoryHolder{
         try{\r
             BirthmarkSet[] x = stigmata.extract(birthmarks, targetX, context);\r
             BirthmarkSet[] y = stigmata.extract(birthmarks, targetY, context);\r
-            compareCount++;\r
 \r
             RoundRobinComparisonResultPane compare = new RoundRobinComparisonResultPane(this, context, x, y);\r
-            Utility.addNewTab("compare", tabPane, compare,\r
+            compareCount++;\r
+            Utility.addNewTab(\r
+                "compare", tabPane, compare,\r
                 new Object[] { new Integer(compareCount), },\r
                 new Object[] {\r
                     Utility.array2String(birthmarks),\r
@@ -250,9 +251,11 @@ public class StigmataFrame extends JFrame implements CurrentDirectoryHolder{
 \r
     public void showComparisonResultSet(ComparisonResultSet resultset){\r
         comparePair++;\r
-        Utility.addNewTab("comparisonresultset", tabPane,\r
-                          new PairComparisonResultSetPane(this, resultset),\r
-                          new Object[] { new Integer(comparePair), }, null);\r
+        Utility.addNewTab(\r
+            "comparisonresultset", tabPane,\r
+            new PairComparisonResultSetPane(this, resultset),\r
+            new Object[] { new Integer(comparePair), }, null\r
+        );\r
         tabPane.setSelectedIndex(tabPane.getTabCount() - 1);\r
     }\r
 \r
@@ -274,9 +277,11 @@ public class StigmataFrame extends JFrame implements CurrentDirectoryHolder{
             extractCount++;\r
 \r
             BirthmarkExtractionResultPane viewer = new BirthmarkExtractionResultPane(this, context, holders);\r
-            Utility.addNewTab("extract", tabPane, viewer,\r
-                    new Object[] { new Integer(extractCount), }, new Object[] {\r
-                            Utility.array2String(birthmarks), Utility.array2String(targets), });\r
+            Utility.addNewTab(\r
+                "extract", tabPane, viewer,\r
+                new Object[] { new Integer(extractCount), },\r
+                new Object[] { Utility.array2String(birthmarks), Utility.array2String(targets), }\r
+            );\r
             tabPane.setSelectedIndex(tabPane.getTabCount() - 1);\r
         }catch(Exception e){\r
             showExceptionMessage(e);\r
@@ -423,7 +428,7 @@ public class StigmataFrame extends JFrame implements CurrentDirectoryHolder{
         JMenuItem license = Utility.createJMenuItem("license");\r
         JMenuItem help = Utility.createJMenuItem("helpmenu");\r
         JMenu laf = Utility.createJMenu("lookandfeel");\r
-        geekmodeMenu = Utility.createJCheckBoxMenuItem("geekmenu");\r
+        expertmodeMenu = Utility.createJCheckBoxMenuItem("expertmenu");\r
 \r
         menu.add(about);\r
         menu.add(license);\r
@@ -431,7 +436,7 @@ public class StigmataFrame extends JFrame implements CurrentDirectoryHolder{
         menu.add(new JSeparator());\r
         menu.add(laf);\r
         menu.add(new JSeparator());\r
-        menu.add(geekmodeMenu);\r
+        menu.add(expertmodeMenu);\r
 \r
         about.addActionListener(new ActionListener(){\r
             public void actionPerformed(ActionEvent e){\r
@@ -444,9 +449,9 @@ public class StigmataFrame extends JFrame implements CurrentDirectoryHolder{
                 licenseMenuActionPerformed();\r
             }\r
         });\r
-        geekmodeMenu.addActionListener(new ActionListener(){\r
+        expertmodeMenu.addActionListener(new ActionListener(){\r
             public void actionPerformed(ActionEvent e){\r
-                geekMenuActionPerformed(((JCheckBoxMenuItem)e.getSource()).getState());\r
+                expertMenuActionPerformed(((JCheckBoxMenuItem)e.getSource()).getState());\r
             }\r
         });\r
 \r
@@ -470,12 +475,12 @@ public class StigmataFrame extends JFrame implements CurrentDirectoryHolder{
         return menu;\r
     }\r
 \r
-    public void setGeekMode(boolean geekmode){\r
-        geekmodeMenu.setState(geekmode);\r
+    public void setExpertMode(boolean expertmode){\r
+        expertmodeMenu.setState(expertmode);\r
     }\r
 \r
-    private void geekMenuActionPerformed(boolean status){\r
-        control.setGeekMode(status);\r
+    private void expertMenuActionPerformed(boolean status){\r
+        control.setExpertMode(status);\r
     }\r
 \r
     private void aboutMenuActionPerformed(){\r

diff --git a/src/main/resources/resources/messages.properties b/src/main/resources/resources/messages.properties
index 9ba7fb4..08ddb02 100755 (executable)
--- a/src/main/resources/resources/messages.properties
+++ b/src/main/resources/resources/messages.properties
@@ -66,9 +66,9 @@ helpmenu.menuitem.label=Help...
 helpmenu.menuitem.tooltip=Show help\r
 helpmenu.menuitem.icon=help.png\r
 \r
-geekmenu.menuitem.label=Geek mode\r
-geekmenu.menuitem.tooltip=Geek mode (show birthmark definition pane and list more birthmarks)\r
-geekmenu.menuitem.icon=star.png\r
+expertmenu.menuitem.label=Expert mode\r
+expertmenu.menuitem.tooltip=Expert mode (show birthmark definition pane and list more birthmarks)\r
+expertmenu.menuitem.icon=star.png\r
 \r
 lookandfeel.menu.label=Look & Feel\r
 lookandfeel.menu.icon=award_star_gold_1.png\r

diff --git a/src/main/resources/resources/messages_ja.source b/src/main/resources/resources/messages_ja.source
index a4905bd..0aef3b8 100755 (executable)
--- a/src/main/resources/resources/messages_ja.source
+++ b/src/main/resources/resources/messages_ja.source
@@ -52,8 +52,8 @@ license.dialog.title=
 helpmenu.menuitem.label=\83w\83\8b\83v...\r
 helpmenu.menuitem.tooltip=\83w\83\8b\83v\82ð\95\\8e¦\r
 \r
-geekmenu.menuitem.label=\8fn\97û\8eÒ\83\82\81[\83h\r
-geekmenu.menuitem.tooltip=\8fn\97û\8eÒ\83\82\81[\83h\82É\88Ú\8ds (\82æ\82è\91½\82­\82Ì\83o\81[\83X\83}\81[\83N\82ª\91I\91ð\89Â\94\\82É\82È\82è\81C\90V\8bK\83o\81[\83X\83}\81[\83N\82Ì\92è\8b`\82à\8ds\82¦\82Ü\82·)\r
+expertmenu.menuitem.label=\8fã\8b\89\8eÒ\83\82\81[\83h\r
+expertmenu.menuitem.tooltip=\8fã\8b\89\8eÒ\83\82\81[\83h\82É\88Ú\8ds (\82æ\82è\91½\82­\82Ì\83o\81[\83X\83}\81[\83N\82ª\91I\91ð\89Â\94\\82É\82È\82è\81C\90V\8bK\83o\81[\83X\83}\81[\83N\82Ì\92è\8b`\82à\8ds\82¦\82Ü\82·)\r
 \r
 lookandfeel.menu.label=\83\8b\83b\83N&\83t\83B\81[\83\8b\r
 \r