OSDN Git Service

change mode name experimental mode'
authortama3 <tama3@acee48c3-7b26-0410-bdac-b3d0e5314bbc>
Thu, 28 May 2009 04:07:44 +0000 (04:07 +0000)
committertama3 <tama3@acee48c3-7b26-0410-bdac-b3d0e5314bbc>
Thu, 28 May 2009 04:07:44 +0000 (04:07 +0000)
git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/stigmata/trunk@378 acee48c3-7b26-0410-bdac-b3d0e5314bbc

22 files changed:
src/main/java/jp/sourceforge/stigmata/BirthmarkSpiComparator.java
src/main/java/jp/sourceforge/stigmata/Main.java
src/main/java/jp/sourceforge/stigmata/birthmarks/AbstractBirthmarkService.java
src/main/java/jp/sourceforge/stigmata/birthmarks/cvfv/ConstantValueOfFieldVariableBirthmarkService.java
src/main/java/jp/sourceforge/stigmata/birthmarks/fmc/FrequencyMethodCallBirthmarkService.java
src/main/java/jp/sourceforge/stigmata/birthmarks/fuc/FrequencyUsedClassesBirthmarkService.java
src/main/java/jp/sourceforge/stigmata/birthmarks/is/InheritanceStructureBirthmarkService.java
src/main/java/jp/sourceforge/stigmata/birthmarks/kgram/KGramBasedBirthmarkService.java
src/main/java/jp/sourceforge/stigmata/birthmarks/smc/SequentialMethodCallBirthmarkService.java
src/main/java/jp/sourceforge/stigmata/birthmarks/uc/UsedClassesBirthmarkService.java
src/main/java/jp/sourceforge/stigmata/command/HelpCommand.java
src/main/java/jp/sourceforge/stigmata/spi/BirthmarkSpi.java
src/main/java/jp/sourceforge/stigmata/ui/swing/BirthmarkDefinitionPane.java
src/main/java/jp/sourceforge/stigmata/ui/swing/BirthmarkSelectablePane.java
src/main/java/jp/sourceforge/stigmata/ui/swing/BirthmarkSelection.java
src/main/java/jp/sourceforge/stigmata/ui/swing/BirthmarkSelectionCheckSetPane.java
src/main/java/jp/sourceforge/stigmata/ui/swing/BirthmarkSelectionListPane.java
src/main/java/jp/sourceforge/stigmata/ui/swing/ControlPane.java
src/main/java/jp/sourceforge/stigmata/ui/swing/StigmataFrame.java
src/main/java/jp/sourceforge/stigmata/utils/ConfigFileExporter.java
src/main/resources/resources/messages.properties
src/main/resources/resources/messages_ja.source

index a2b9530..32e8dde 100644 (file)
@@ -24,10 +24,10 @@ class BirthmarkSpiComparator implements Comparator<BirthmarkSpi>{
     }
 
     public int compare(BirthmarkSpi s1, BirthmarkSpi s2){
-        if(s1.isExpert() && !s2.isExpert()){
+        if(s1.isExperimental() && !s2.isExperimental()){
             return 1;
         }
-        else if(!s1.isExpert() && s2.isExpert()){
+        else if(!s1.isExperimental() && s2.isExperimental()){
             return -1;
         }
         else{
index c03c019..85a8ba9 100644 (file)
@@ -127,7 +127,7 @@ public final class Main{
         if(birthmarks == null || birthmarks.length == 0){
             List<String> birthmarkList = new ArrayList<String>();
             for(BirthmarkSpi service: env.getServices()){
-                if(!service.isExpert()){
+                if(!service.isExperimental()){
                     birthmarkList.add(service.getType());
                 }
             }
index 40a9bf8..96235e9 100644 (file)
@@ -76,7 +76,7 @@ public abstract class AbstractBirthmarkService implements BirthmarkSpi{
 
     public abstract String getDefaultDescription();
 
-    public boolean isExpert(){
+    public boolean isExperimental(){
         return true;
     }
 
index 44050fd..a956a5e 100644 (file)
@@ -38,7 +38,7 @@ public class ConstantValueOfFieldVariableBirthmarkService extends AbstractBirthm
         return comparator;
     }
 
-    public boolean isExpert(){
+    public boolean isExperimental(){
         return false;
     }
 
index 16d7444..b15ebd6 100755 (executable)
@@ -39,7 +39,7 @@ public class FrequencyMethodCallBirthmarkService extends AbstractBirthmarkServic
         return comparator;
     }
 
-    public boolean isExpert(){
+    public boolean isExperimental(){
         return false;
     }
 
index 32cb36c..d7721d3 100755 (executable)
@@ -39,7 +39,7 @@ public class FrequencyUsedClassesBirthmarkService extends AbstractBirthmarkServi
         return comparator;
     }
 
-    public boolean isExpert(){
+    public boolean isExperimental(){
         return false;
     }
 
index 70a48b6..18fccfd 100644 (file)
@@ -37,7 +37,7 @@ public class InheritanceStructureBirthmarkService extends AbstractBirthmarkServi
         return comparator;
     }
 
-    public boolean isExpert(){
+    public boolean isExperimental(){
         return false;
     }
 
index f28fe3b..66f172e 100644 (file)
@@ -38,7 +38,7 @@ public class KGramBasedBirthmarkService extends AbstractBirthmarkService impleme
         return comparator;
     }
 
-    public boolean isExpert(){
+    public boolean isExperimental(){
         return false;
     }
 
index 2a7cb25..802a700 100644 (file)
@@ -38,7 +38,7 @@ public class SequentialMethodCallBirthmarkService extends AbstractBirthmarkServi
         return comparator;
     }
 
-    public boolean isExpert(){
+    public boolean isExperimental(){
         return false;
     }
 
index fed14fb..5a834f5 100644 (file)
@@ -37,7 +37,7 @@ public class UsedClassesBirthmarkService extends AbstractBirthmarkService implem
         return comparator;
     }
 
-    public boolean isExpert(){
+    public boolean isExperimental(){
         return false;
     }
 
index f0280bc..bfb642d 100644 (file)
@@ -50,7 +50,7 @@ public class HelpCommand extends AbstractStigmataCommand{
         System.out.println();
         System.out.println(helpResource.getString("cli.interface.birthmarks"));
         for(BirthmarkSpi service: env.getServices()){
-            if(!service.isExpert()){
+            if(!service.isExperimental()){
                 System.out.printf("    %-5s (%s): %s%n", service.getType(),
                         service.getDisplayType(), service.getDescription());
             }
index 5e6fdf7..9af5fe4 100644 (file)
@@ -71,7 +71,7 @@ public interface BirthmarkSpi extends ServiceProvider{
      */
     public BirthmarkComparator getComparator();
 
-    public boolean isExpert();
+    public boolean isExperimental();
 
     public boolean isUserDefined();
 
index 7c58ebc..d76b15a 100644 (file)
@@ -226,7 +226,7 @@ public class BirthmarkDefinitionPane extends JPanel{
         private JTextArea description;
         private JComboBox extractor;
         private JComboBox comparator;
-        private JCheckBox expert;
+        private JCheckBox experimental;
         private JCheckBox userDefined;
 
         public InformationPane(StigmataFrame stigmata, BirthmarkDefinitionPane thisPane){
@@ -268,7 +268,7 @@ public class BirthmarkDefinitionPane extends JPanel{
             extractor.getModel().setSelectedItem(null);
             comparator.getModel().setSelectedItem(null);
             userDefined.setSelected(true);
-            expert.setSelected(true);
+            experimental.setSelected(true);
         }
 
         public boolean isAvailableService(){
@@ -308,7 +308,7 @@ public class BirthmarkDefinitionPane extends JPanel{
             selectComboBoxItem(extractor, service.getExtractorClassName());
             selectComboBoxItem(comparator, service.getComparatorClassName());
             userDefined.setSelected(service.isUserDefined());
-            expert.setSelected(service.isExpert());
+            experimental.setSelected(service.isExperimental());
 
             setEnabled(service.isUserDefined());
         }
@@ -336,7 +336,7 @@ public class BirthmarkDefinitionPane extends JPanel{
             displayType = new JTextField();
             extractor = new JComboBox();
             comparator = new JComboBox();
-            expert = new JCheckBox(messages.get("define.expert.label"));
+            experimental = new JCheckBox(messages.get("define.experimental.label"));
             userDefined = new JCheckBox(messages.get("define.userdef.label"));
             description = new JTextArea();
             JScrollPane scroll = new JScrollPane(description);
@@ -356,7 +356,7 @@ public class BirthmarkDefinitionPane extends JPanel{
 
             Box box2 = Box.createHorizontalBox();
             box2.add(Box.createHorizontalGlue());
-            box2.add(expert);
+            box2.add(experimental);
             box2.add(Box.createHorizontalGlue());
             box2.add(userDefined);
             box2.add(Box.createHorizontalGlue());
@@ -381,13 +381,13 @@ public class BirthmarkDefinitionPane extends JPanel{
             GUIUtility.decorateJComponent(messages, scroll, "define.description");
             GUIUtility.decorateJComponent(messages, extractorPane, "define.extractor");
             GUIUtility.decorateJComponent(messages, comparatorPane, "define.comparator");
-            GUIUtility.decorateJComponent(messages, expert, "define.expert");
+            GUIUtility.decorateJComponent(messages, experimental, "define.experimental");
             GUIUtility.decorateJComponent(messages, userDefined, "define.userdef");
 
             userDefined.setEnabled(false);
-            expert.setEnabled(false);
+            experimental.setEnabled(false);
             userDefined.setSelected(true);
-            expert.setSelected(true);
+            experimental.setSelected(true);
 
             extractor.setEditable(true);
             comparator.setEditable(true);
index 73718de..c21dc1c 100644 (file)
@@ -29,7 +29,7 @@ public abstract class BirthmarkSelectablePane extends JPanel implements Birthmar
     private Set<String> selectedServices = new HashSet<String>();
     private Map<String, BirthmarkSelection> services;
     private List<DataChangeListener> listeners = new ArrayList<DataChangeListener>();
-    private boolean expertmode;
+    private boolean experimentalMode;
 
     public BirthmarkSelectablePane(StigmataFrame stigmata){
         this.stigmata = stigmata;
@@ -44,13 +44,13 @@ public abstract class BirthmarkSelectablePane extends JPanel implements Birthmar
         return stigmata.getMessages();
     }
 
-    public void setExpertMode(boolean expertmode){
-        this.expertmode = expertmode;
+    public void setExperimentalMode(boolean experimentalMode){
+        this.experimentalMode = experimentalMode;
         updateLayouts();
     }
 
-    public boolean isExpertMode(){
-        return expertmode;
+    public boolean isExperimentalMode(){
+        return experimentalMode;
     }
 
     public String[] getSelectedServiceTypes(){
@@ -98,7 +98,7 @@ public abstract class BirthmarkSelectablePane extends JPanel implements Birthmar
     public void reset(){
         selectedServices.clear();
         initServices();
-        expertmode = false;
+        experimentalMode = false;
         updateLayouts();
         fireEvent();
     }
index 8c0382f..97d4efa 100644 (file)
@@ -26,8 +26,8 @@ class BirthmarkSelection implements Serializable{
         return service;
     }
 
-    public boolean isVisible(boolean expertFlag){
-        return expertFlag || (!expertFlag && !service.isExpert());
+    public boolean isVisible(boolean experimentalFlag){
+        return experimentalFlag || (!experimentalFlag && !service.isExperimental());
     }
 
     public boolean isSelected(){
index d2a250d..5f29432 100644 (file)
@@ -72,7 +72,7 @@ public class BirthmarkSelectionCheckSetPane extends BirthmarkSelectablePane{
 
         for(Iterator<BirthmarkSelection> i = birthmarkSelections(); i.hasNext(); ){
             final BirthmarkSelection elem = i.next();
-            if(elem.isVisible(isExpertMode())){
+            if(elem.isVisible(isExperimentalMode())){
                 JCheckBox check = new JCheckBox(elem.getService().getDisplayType());
                 check.setSelected(elem.isSelected());
                 check.addActionListener(new ActionListener(){
@@ -86,7 +86,7 @@ public class BirthmarkSelectionCheckSetPane extends BirthmarkSelectablePane{
                 checks.add(check);
             }
 
-            select(elem.getType(), elem.isVisible(isExpertMode()) && elem.isSelected());
+            select(elem.getType(), elem.isVisible(isExperimentalMode()) && elem.isSelected());
         }
         updateUI();
     }
@@ -96,7 +96,7 @@ public class BirthmarkSelectionCheckSetPane extends BirthmarkSelectablePane{
         int cols = 0;
         for(Iterator<BirthmarkSelection> i = birthmarkSelections(); i.hasNext(); ){
             BirthmarkSelection selection = i.next();
-            if(selection.isVisible(isExpertMode())){
+            if(selection.isVisible(isExperimentalMode())){
                 cols++;
             }
         }
index 586e134..d2f1cd2 100644 (file)
@@ -100,11 +100,11 @@ public class BirthmarkSelectionListPane extends BirthmarkSelectablePane{
 
         for(Iterator<BirthmarkSelection> i = birthmarkSelections(); i.hasNext(); ){
             BirthmarkSelection elem = i.next();
-            if(elem.isVisible(isExpertMode())){
+            if(elem.isVisible(isExperimentalMode())){
                 model.addElement(elem);
             }
 
-            select(elem.getType(), elem.isVisible(isExpertMode()) && elem.isSelected());
+            select(elem.getType(), elem.isVisible(isExperimentalMode()) && elem.isSelected());
         }
         updateUI();
     }
index d024442..72a1e15 100644 (file)
@@ -61,7 +61,7 @@ public class ControlPane extends JPanel{
     private PopupButton comparePopup;
     private JComboBox unitBox;
     private Map<String, String> unitLabels = new HashMap<String, String>();
-    private boolean expertmode = false;
+    private boolean experimentalMode = false;
 
     public ControlPane(StigmataFrame stigmata){
         this.stigmata = stigmata;
@@ -96,10 +96,10 @@ public class ControlPane extends JPanel{
     }
 
     public void reset(){
-        this.expertmode = false;
+        this.experimentalMode = false;
         definition.reset();
         birthmarks.reset();
-        stigmata.setExpertMode(false);
+        stigmata.setExperimentalMode(false);
         targetX.removeAllElements();
         targetY.removeAllElements();
 
@@ -149,12 +149,12 @@ public class ControlPane extends JPanel{
         }
     }
 
-    public void setExpertMode(boolean expertmode){
-        this.expertmode = expertmode;
-        birthmarks.setExpertMode(expertmode);
-        stigmata.setExpertMode(expertmode);
+    public void setExperimentalMode(boolean experimentalModeFlag){
+        this.experimentalMode = experimentalModeFlag;
+        birthmarks.setExperimentalMode(experimentalModeFlag);
+        stigmata.setExperimentalMode(experimentalModeFlag);
 
-        if(expertmode){
+        if(experimentalModeFlag){
             int index = controlTab.getSelectedIndex();
             GUIUtility.addNewTab(stigmata.getMessages(), "definition", controlTab, definition);
             GUIUtility.addNewTab(stigmata.getMessages(), "filter", controlTab, filters);
@@ -169,8 +169,8 @@ public class ControlPane extends JPanel{
         updateEnable();
     }
 
-    public boolean isExpertMode(){
-        return expertmode;
+    public boolean isExperimentalMode(){
+        return experimentalMode;
     }
 
     private void removeTabByName(String tabname){
index 508920d..00fec62 100644 (file)
@@ -84,7 +84,7 @@ public class StigmataFrame extends JFrame{
     private JTabbedPane tabPane;
     private JMenuItem closeTabMenu;
     private JMenuItem saveMenu;
-    private JCheckBoxMenuItem expertmodeMenu;
+    private JCheckBoxMenuItem experimentalMode;
     private Stigmata stigmata;
     private BirthmarkEnvironment environment;
     private ControlPane control;
@@ -629,7 +629,7 @@ public class StigmataFrame extends JFrame{
         JMenuItem about = GUIUtility.createJMenuItem(getMessages(), "about", new AboutAction(this));
         JMenuItem license = GUIUtility.createJMenuItem(getMessages(), "license", new LicenseAction(this));
         JMenuItem help = GUIUtility.createJMenuItem(getMessages(), "helpmenu");
-        expertmodeMenu = GUIUtility.createJCheckBoxMenuItem(getMessages(), "expertmenu");
+        experimentalMode = GUIUtility.createJCheckBoxMenuItem(getMessages(), "experimentalmenu");
 
         menu.add(about);
         menu.add(license);
@@ -637,11 +637,11 @@ public class StigmataFrame extends JFrame{
         menu.add(new JSeparator());
         menu.add(createLookAndFeelMenu());
         menu.add(new JSeparator());
-        menu.add(expertmodeMenu);
+        menu.add(experimentalMode);
 
-        expertmodeMenu.addActionListener(new ActionListener(){
+        experimentalMode.addActionListener(new ActionListener(){
             public void actionPerformed(ActionEvent e){
-                expertMenuActionPerformed(((JCheckBoxMenuItem)e.getSource()).getState());
+                updateExperimentalModeState(((JCheckBoxMenuItem)e.getSource()).getState());
             }
         });
         help.setEnabled(false);
@@ -680,12 +680,12 @@ public class StigmataFrame extends JFrame{
         return laf;
     }
 
-    public void setExpertMode(boolean expertmode){
-        expertmodeMenu.setState(expertmode);
+    public void setExperimentalMode(boolean experimentalModeFlag){
+        experimentalMode.setState(experimentalModeFlag);
     }
 
-    private void expertMenuActionPerformed(boolean status){
-        control.setExpertMode(status);
+    private void updateExperimentalModeState(boolean status){
+        control.setExperimentalMode(status);
     }
 
     private void showExceptionMessage(Throwable e){
index b6d6239..2ab8e76 100644 (file)
@@ -161,7 +161,7 @@ public class ConfigFileExporter{
     private void exportServices(PrintWriter out) throws IOException{
         out.println("  <birthmark-services>");
         for(BirthmarkSpi service: environment.getServices()){
-            if(service.isExpert() && service instanceof BirthmarkService){
+            if(service.isExperimental() && service instanceof BirthmarkService){
                 out.println("    <birthmark-service>");
                 out.printf("      <type>%s</type>%n", service.getType());
                 out.printf("      <display-name>%s</display-name>%n", service.getDisplayType());
index 712b679..14e1cd5 100755 (executable)
@@ -115,9 +115,9 @@ helpmenu.menuitem.label=Help...
 helpmenu.menuitem.tooltip=Show help\r
 helpmenu.menuitem.icon=help.png\r
 \r
-expertmenu.menuitem.label=Experimental mode\r
-expertmenu.menuitem.tooltip=Experimantal mode (show birthmark definition pane and list more birthmarks)\r
-expertmenu.menuitem.icon=star.png\r
+experimentalmenu.menuitem.label=Experimental mode\r
+experimentalmenu.menuitem.tooltip=Experimantal mode (show birthmark definition pane and list more birthmarks)\r
+experimentalmenu.menuitem.icon=star.png\r
 \r
 lookandfeel.menu.label=Look & Feel\r
 lookandfeel.menu.icon=award_star_gold_1.png\r
@@ -474,8 +474,8 @@ define.extractor.tooltip=BirthmarkExtractor class name
 define.extractor.border=Birthmark extractor\r
 define.comparator.tooltip=BirthmarkComparator class name\r
 define.comparator.border=Birthmark comparator\r
-define.expert.label=Birthmark for experimental\r
-define.expert.tooltip=birthmark for experimental\r
+define.experimental.label=Birthmark for experimental\r
+define.experimental.tooltip=birthmark for experimental\r
 define.userdef.label=User defined birthmark\r
 define.userdef.tooltip=User defined birthmark\r
 newservice.definition.label=(New Service)\r
index e89ea44..a20a559 100755 (executable)
@@ -89,8 +89,8 @@ license.dialog.title=
 helpmenu.menuitem.label=\83w\83\8b\83v...\r
 helpmenu.menuitem.tooltip=\83w\83\8b\83v\82ð\95\\8e¦\r
 \r
-expertmenu.menuitem.label=\8eÀ\8c±\93I\8b@\94\\83\82\81[\83h\r
-expertmenu.menuitem.tooltip=\8eÀ\8c±\93I\8b@\94\\83\82\81[\83h\82É\88Ú\8ds (\82æ\82è\91½\82­\82Ì\83o\81[\83X\83}\81[\83N\82Ì\91I\91ð\81C\82Ü\82½\81C\90V\82½\82È\83o\81[\83X\83}\81[\83N\82Ì\92è\8b`\82ª\89Â\94\\82É\82È\82è\82Ü\82·\81D\82½\82¾\82µ\81C\82Ü\82¾\8eÀ\8c±\93I\82È\8b@\94\\82Å\82·)\r
+experimentalmenu.menuitem.label=\8eÀ\8c±\93I\8b@\94\\83\82\81[\83h\r
+experimentalmenu.menuitem.tooltip=\8eÀ\8c±\93I\8b@\94\\83\82\81[\83h\82É\88Ú\8ds (\82æ\82è\91½\82­\82Ì\83o\81[\83X\83}\81[\83N\82Ì\91I\91ð\81C\82Ü\82½\81C\90V\82½\82È\83o\81[\83X\83}\81[\83N\82Ì\92è\8b`\82ª\89Â\94\\82É\82È\82è\82Ü\82·\81D\82½\82¾\82µ\81C\82Ü\82¾\8eÀ\8c±\93I\82È\8b@\94\\82Å\82·)\r
 \r
 lookandfeel.menu.label=\83\8b\83b\83N&\83t\83B\81[\83\8b\r
 \r
@@ -343,8 +343,8 @@ define.extractor.tooltip=
 define.extractor.border=\83o\81[\83X\83}\81[\83N\92\8a\8fo\8aí\r
 define.comparator.tooltip=\93¾\82ç\82ê\82½\83o\81[\83X\83}\81[\83N\82ð\94ä\8ar\82·\82é\83N\83\89\83X\r
 define.comparator.border=\83o\81[\83X\83}\81[\83N\94ä\8ar\8aí\r
-define.expert.label=\8eÀ\8c±\93I\8b@\94\\r
-define.expert.tooltip=\8eÀ\8c±\93I\82È\83o\81[\83X\83}\81[\83N\82Å\82 \82é\82©\r
+define.experimental.label=\8eÀ\8c±\93I\8b@\94\\r
+define.experimental.tooltip=\8eÀ\8c±\93I\82È\83o\81[\83X\83}\81[\83N\82Å\82 \82é\82©\r
 define.userdef.label=\83\86\81[\83U\92è\8b`\r
 define.userdef.tooltip=\83\86\81[\83U\82ª\92è\8b`\82µ\82½\83o\81[\83X\83}\81[\83N\82Å\82 \82é\82©\r
 newservice.definition.label=(\90V\8bK\83o\81[\83X\83}\81[\83N)\r