remove Revision tag

[stigmata/stigmata.git] / src / main / java / jp / sourceforge / stigmata / ui / swing / ControlPane.java

diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/ControlPane.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/ControlPane.java
index 0ade5ad..0e231ca 100644 (file)
--- a/src/main/java/jp/sourceforge/stigmata/ui/swing/ControlPane.java
+++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/ControlPane.java
@@ -5,6 +5,8 @@ package jp.sourceforge.stigmata.ui.swing;
  */
 
 import java.awt.BorderLayout;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
@@ -31,15 +33,14 @@ import jp.sourceforge.stigmata.BirthmarkStoreTarget;
 import jp.sourceforge.stigmata.ComparisonMethod;
 import jp.sourceforge.stigmata.ExtractionUnit;
 import jp.sourceforge.stigmata.Stigmata;
+import jp.sourceforge.stigmata.digger.ClasspathContext;
 import jp.sourceforge.stigmata.filter.ComparisonPairFilterManager;
-import jp.sourceforge.stigmata.reader.ClasspathContext;
 import jp.sourceforge.stigmata.utils.ConfigFileExporter;
 import jp.sourceforge.stigmata.utils.WellknownClassManager;
 
 /**
  * 
  * @author Haruaki TAMADA
- * @version $Revision$ $Date$
  */
 public class ControlPane extends JPanel{
     private static final long serialVersionUID = 983547612346543645L;
@@ -61,7 +62,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;
@@ -82,6 +83,8 @@ public class ControlPane extends JPanel{
         GUIUtility.addNewTab(stigmata.getMessages(), "wellknown", controlTab, wellknownClassses);
         GUIUtility.addNewTab(stigmata.getMessages(), "classpath", controlTab, classpath);
         GUIUtility.addNewTab(stigmata.getMessages(), "property", controlTab, properties);
+        controlTab.setSelectedIndex(0);
+
         reset();
     }
 
@@ -94,10 +97,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();
 
@@ -147,15 +150,17 @@ 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);
             GUIUtility.addNewTab(stigmata.getMessages(), "history", controlTab, history);
+            controlTab.setSelectedIndex(index);
         }
         else{
             removeTabByName(stigmata.getMessages().get("definition.tab.label"));
@@ -165,8 +170,8 @@ public class ControlPane extends JPanel{
         updateEnable();
     }
 
-    public boolean isExpertMode(){
-        return expertmode;
+    public boolean isExperimentalMode(){
+        return experimentalMode;
     }
 
     private void removeTabByName(String tabname){
@@ -202,6 +207,7 @@ public class ControlPane extends JPanel{
         mainPane.add(Box.createHorizontalGlue());
 
         DataChangeListener dcl = new DataChangeListener(){
+            @Override
             public void valueChanged(Object source){
                 updateEnable();
             }
@@ -299,7 +305,7 @@ public class ControlPane extends JPanel{
             bst = BirthmarkStoreTarget.MEMORY;
         }
         context.setStoreTarget(bst);
-        
+
         return context;
     }
 
@@ -344,16 +350,18 @@ public class ControlPane extends JPanel{
         comparePopup = new PopupButton(compareButton);
         unitBox = new JComboBox();
 
-        Box south = Box.createHorizontalBox();
-        south.add(Box.createHorizontalGlue());
-        south.add(resetButton);
-        south.add(Box.createHorizontalGlue());
-        south.add(extractButton);
-        south.add(Box.createHorizontalGlue());
-        south.add(comparePopup);
-        south.add(Box.createHorizontalGlue());
-        south.add(unitBox);
-        south.add(Box.createHorizontalGlue());
+        JPanel south = new JPanel(new GridBagLayout());
+        GridBagConstraints gbc = new GridBagConstraints();
+        gbc.fill = GridBagConstraints.NONE;
+        gbc.weightx = 1d;
+        gbc.weighty = 0d;
+        gbc.gridx = 0;
+        gbc.gridy = 0;
+        gbc.anchor = GridBagConstraints.CENTER;
+        south.add(resetButton, gbc);   gbc.gridx++;
+        south.add(extractButton, gbc); gbc.gridx++;
+        south.add(comparePopup, gbc);  gbc.gridx++;
+        south.add(unitBox, gbc);
 
         setLayout(new BorderLayout());
         add(south, BorderLayout.SOUTH);
@@ -363,18 +371,21 @@ public class ControlPane extends JPanel{
         comparePopup.setEnabled(false);
 
         resetButton.addActionListener(new ActionListener(){
+            @Override
             public void actionPerformed(ActionEvent e){
                 reset();
             }
         });
 
         extractButton.addActionListener(new ActionListener(){
+            @Override
             public void actionPerformed(ActionEvent e){
                 extractButtonActionPerformed(e);
             }
         });
 
         ActionListener compareListener = new ActionListener(){
+            @Override
             public void actionPerformed(ActionEvent e){
                 String command = e.getActionCommand();