From e41d3cab06adf1d404d89bc44391b5ac665f4581 Mon Sep 17 00:00:00 2001
From: tama3 <tama3@acee48c3-7b26-0410-bdac-b3d0e5314bbc>
Date: Wed, 13 Jun 2007 01:48:50 +0000
Subject: [PATCH] refactoring

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/stigmata/trunk@127 acee48c3-7b26-0410-bdac-b3d0e5314bbc
---
 .../java/jp/naist/se/stigmata/BirthmarkSet.java    |  10 +-
 .../stigmata/CertainPairComparisonResultSet.java   |   4 +-
 .../filter/TargetNameComparisonPairFilter.java     |   6 +-
 .../csv/BirthmarkComparisonResultCsvFormat.java    |  14 +--
 .../csv/BirthmarkExtractionResultCsvFormat.java    |   2 +-
 .../xml/BirthmarkComparisonResultXmlFormat.java    |   2 +-
 .../xml/BirthmarkExtractionListXmlFormat.java      |   2 +-
 .../se/stigmata/ui/swing/BirthmarkTreeNode.java    |   2 +-
 .../se/stigmata/ui/swing/ClassNameObfuscator.java  |   4 +-
 .../ui/swing/PairComparisonResultSetPane.java      |   4 +-
 .../ui/swing/RoundRobinComparisonResultPane.java   |   4 +-
 .../naist/se/stigmata/ui/swing/StigmataFrame.java  | 135 ++++-----------------
 .../jp/naist/se/stigmata/ui/swing/Utility.java     |  13 +-
 .../se/stigmata/ui/swing/mds/MDSGraphPanel.java    |  22 ++--
 14 files changed, 76 insertions(+), 148 deletions(-)

diff --git a/src/main/java/jp/naist/se/stigmata/BirthmarkSet.java b/src/main/java/jp/naist/se/stigmata/BirthmarkSet.java
index 7ff5d1f..4e7b975 100755
--- a/src/main/java/jp/naist/se/stigmata/BirthmarkSet.java
+++ b/src/main/java/jp/naist/se/stigmata/BirthmarkSet.java
@@ -19,7 +19,7 @@ public class BirthmarkSet implements Iterable<Birthmark>{
     /**
      * class name.
      */
-    private String className;
+    private String name;
 
     /**
      * location of class file is loaded from.
@@ -34,8 +34,8 @@ public class BirthmarkSet implements Iterable<Birthmark>{
     /**
      * constructor.
      */
-    public BirthmarkSet(String className, URL location){
-        this.className = className;
+    public BirthmarkSet(String name, URL location){
+        this.name = name;
         this.location = location;
     }
 
@@ -61,8 +61,8 @@ public class BirthmarkSet implements Iterable<Birthmark>{
     /**
      * return the class name.
      */
-    public String getClassName(){
-        return className;
+    public String getName(){
+        return name;
     }
 
     /**
diff --git a/src/main/java/jp/naist/se/stigmata/CertainPairComparisonResultSet.java b/src/main/java/jp/naist/se/stigmata/CertainPairComparisonResultSet.java
index 61dd523..e957c59 100755
--- a/src/main/java/jp/naist/se/stigmata/CertainPairComparisonResultSet.java
+++ b/src/main/java/jp/naist/se/stigmata/CertainPairComparisonResultSet.java
@@ -42,7 +42,7 @@ public class CertainPairComparisonResultSet implements ComparisonResultSet{
     public CertainPairComparisonResultSet(BirthmarkSet[] targetX, BirthmarkSet[] targetY, BirthmarkContext context){
         this.context = context;
         for(int i = 0; i < targetX.length; i++){
-            BirthmarkSet target2 = findTarget(targetX[i].getClassName(), targetY);
+            BirthmarkSet target2 = findTarget(targetX[i].getName(), targetY);
 
             if(target2 != null){
                 pairList.add(new ComparisonPair(targetX[i], target2, context));
@@ -114,7 +114,7 @@ public class CertainPairComparisonResultSet implements ComparisonResultSet{
      */
     private BirthmarkSet findTarget(String className, BirthmarkSet[] target){
         for(int i = 0; i < target.length; i++){
-            if(className.equals(target[i].getClassName())){
+            if(className.equals(target[i].getName())){
                 return target[i];
             }
         }
diff --git a/src/main/java/jp/naist/se/stigmata/filter/TargetNameComparisonPairFilter.java b/src/main/java/jp/naist/se/stigmata/filter/TargetNameComparisonPairFilter.java
index 2999907..5909f8c 100755
--- a/src/main/java/jp/naist/se/stigmata/filter/TargetNameComparisonPairFilter.java
+++ b/src/main/java/jp/naist/se/stigmata/filter/TargetNameComparisonPairFilter.java
@@ -48,13 +48,13 @@ public class TargetNameComparisonPairFilter extends AbstractComparisonPairFilter
         if(v == null) v = "";
         boolean flag;
         if(getTarget() == Target.TARGET_1){
-            flag = checkMatch(pair.getTarget1().getClassName(), v);
+            flag = checkMatch(pair.getTarget1().getName(), v);
         }
         else if(getTarget() == Target.TARGET_2){
-            flag = checkMatch(pair.getTarget2().getClassName(), v);
+            flag = checkMatch(pair.getTarget2().getName(), v);
         }
         else{
-            flag = checkMatch(pair.getTarget1().getClassName(), pair.getTarget2().getClassName(), v);
+            flag = checkMatch(pair.getTarget1().getName(), pair.getTarget2().getName(), v);
         }
         return flag;
     }
diff --git a/src/main/java/jp/naist/se/stigmata/format/csv/BirthmarkComparisonResultCsvFormat.java b/src/main/java/jp/naist/se/stigmata/format/csv/BirthmarkComparisonResultCsvFormat.java
index 12c6b7a..a133dc5 100755
--- a/src/main/java/jp/naist/se/stigmata/format/csv/BirthmarkComparisonResultCsvFormat.java
+++ b/src/main/java/jp/naist/se/stigmata/format/csv/BirthmarkComparisonResultCsvFormat.java
@@ -57,9 +57,9 @@ public class BirthmarkComparisonResultCsvFormat extends AbstractBirthmarkCompari
 
     private void printResultImpl(PrintWriter out, CertainPairComparisonResultSet resultset){
         for(ComparisonPair pair: resultset){
-            out.print(pair.getTarget1().getClassName());
+            out.print(pair.getTarget1().getName());
             out.print(",");
-            out.print(pair.getTarget1().getClassName());
+            out.print(pair.getTarget1().getName());
             out.print(",");
             out.println(pair.calculateSimilarity());
         }
@@ -70,15 +70,15 @@ public class BirthmarkComparisonResultCsvFormat extends AbstractBirthmarkCompari
         List<String> names = new ArrayList<String>();
 
         for(ComparisonPair pair: resultset){
-            Map<String, Double> val = map.get(pair.getTarget1().getClassName());
+            Map<String, Double> val = map.get(pair.getTarget1().getName());
             if(val == null){
                 val = new HashMap<String, Double>();
             }
-            val.put(pair.getTarget2().getClassName(), new Double(pair.calculateSimilarity()));
-            if(!names.contains(pair.getTarget2().getClassName())){
-                names.add(pair.getTarget2().getClassName());
+            val.put(pair.getTarget2().getName(), new Double(pair.calculateSimilarity()));
+            if(!names.contains(pair.getTarget2().getName())){
+                names.add(pair.getTarget2().getName());
             }
-            map.put(pair.getTarget1().getClassName(), val);
+            map.put(pair.getTarget1().getName(), val);
         }
 
         for(String name: names){
diff --git a/src/main/java/jp/naist/se/stigmata/format/csv/BirthmarkExtractionResultCsvFormat.java b/src/main/java/jp/naist/se/stigmata/format/csv/BirthmarkExtractionResultCsvFormat.java
index 6b3313a..56064be 100755
--- a/src/main/java/jp/naist/se/stigmata/format/csv/BirthmarkExtractionResultCsvFormat.java
+++ b/src/main/java/jp/naist/se/stigmata/format/csv/BirthmarkExtractionResultCsvFormat.java
@@ -29,7 +29,7 @@ public class BirthmarkExtractionResultCsvFormat extends AbstractBirthmarkExtract
 
     protected void printBirthmarkHolder(PrintWriter out, BirthmarkSet holder){
         for(String type: holder.getBirthmarkTypes()){
-            out.print(holder.getClassName());
+            out.print(holder.getName());
             out.print(",");
             out.print(holder.getLocation());
 
diff --git a/src/main/java/jp/naist/se/stigmata/format/xml/BirthmarkComparisonResultXmlFormat.java b/src/main/java/jp/naist/se/stigmata/format/xml/BirthmarkComparisonResultXmlFormat.java
index a3a8974..beb5d28 100755
--- a/src/main/java/jp/naist/se/stigmata/format/xml/BirthmarkComparisonResultXmlFormat.java
+++ b/src/main/java/jp/naist/se/stigmata/format/xml/BirthmarkComparisonResultXmlFormat.java
@@ -69,7 +69,7 @@ public class BirthmarkComparisonResultXmlFormat extends AbstractBirthmarkCompari
 
     private void printTarget(PrintWriter out, BirthmarkSet set, int index){
         out.printf("      <target%d>%n", index);
-        out.printf("        <class-name>%s</class-name>%n", list.escapeToXmlString(set.getClassName()));
+        out.printf("        <class-name>%s</class-name>%n", list.escapeToXmlString(set.getName()));
         out.printf("        <location>%s</location>%n", list.escapeToXmlString(set.getLocation()));
         out.printf("      </target%d>%n", index);
 
diff --git a/src/main/java/jp/naist/se/stigmata/format/xml/BirthmarkExtractionListXmlFormat.java b/src/main/java/jp/naist/se/stigmata/format/xml/BirthmarkExtractionListXmlFormat.java
index b9c0327..83d6531 100755
--- a/src/main/java/jp/naist/se/stigmata/format/xml/BirthmarkExtractionListXmlFormat.java
+++ b/src/main/java/jp/naist/se/stigmata/format/xml/BirthmarkExtractionListXmlFormat.java
@@ -33,7 +33,7 @@ public class BirthmarkExtractionListXmlFormat extends AbstractBirthmarkExtractio
 
     protected void printBirthmarkHolder(PrintWriter out, BirthmarkSet set){
         out.println("    <extracted-birthmark>");
-        out.printf("      <class-name>%s</class-name>%n", escapeToXmlString(set.getClassName()));
+        out.printf("      <class-name>%s</class-name>%n", escapeToXmlString(set.getName()));
         out.printf("      <location>%s</location>%n", escapeToXmlString(set.getLocation()));
         for(Iterator<String> i = set.birthmarkTypes(); i.hasNext(); ){
             String type = i.next();
diff --git a/src/main/java/jp/naist/se/stigmata/ui/swing/BirthmarkTreeNode.java b/src/main/java/jp/naist/se/stigmata/ui/swing/BirthmarkTreeNode.java
index b92fd73..e2e01d0 100755
--- a/src/main/java/jp/naist/se/stigmata/ui/swing/BirthmarkTreeNode.java
+++ b/src/main/java/jp/naist/se/stigmata/ui/swing/BirthmarkTreeNode.java
@@ -25,7 +25,7 @@ public class BirthmarkTreeNode extends DefaultMutableTreeNode{
     }
 
     public BirthmarkTreeNode(BirthmarkSet birthmark){
-        super(birthmark.getClassName() + "(" +
+        super(birthmark.getName() + "(" +
                 + birthmark.getSumOfElementCount() + ")");
         setBirthmark(birthmark);
     }
diff --git a/src/main/java/jp/naist/se/stigmata/ui/swing/ClassNameObfuscator.java b/src/main/java/jp/naist/se/stigmata/ui/swing/ClassNameObfuscator.java
index 08fe7ea..6b04c65 100755
--- a/src/main/java/jp/naist/se/stigmata/ui/swing/ClassNameObfuscator.java
+++ b/src/main/java/jp/naist/se/stigmata/ui/swing/ClassNameObfuscator.java
@@ -32,10 +32,10 @@ public class ClassNameObfuscator{
     }
 
     public BirthmarkSet obfuscateClassName(BirthmarkSet orig){
-        String newName = nameMapping.get(orig.getClassName());
+        String newName = nameMapping.get(orig.getName());
         if(newName == null){
             newName = String.format("C%04d", new Object[] { new Integer(nameMapping.size() + 1), });
-            nameMapping.put(orig.getClassName(), newName);
+            nameMapping.put(orig.getName(), newName);
         }
 
         BirthmarkSet newSet = new BirthmarkSet(newName, orig.getLocation());
diff --git a/src/main/java/jp/naist/se/stigmata/ui/swing/PairComparisonResultSetPane.java b/src/main/java/jp/naist/se/stigmata/ui/swing/PairComparisonResultSetPane.java
index 5ff1023..0c5d937 100755
--- a/src/main/java/jp/naist/se/stigmata/ui/swing/PairComparisonResultSetPane.java
+++ b/src/main/java/jp/naist/se/stigmata/ui/swing/PairComparisonResultSetPane.java
@@ -115,8 +115,8 @@ public class PairComparisonResultSetPane extends JPanel implements BirthmarkData
             if(similarity < minimum) minimum = similarity;
             average += similarity;
 
-            model.addRow(new Object[] { pair.getTarget1().getClassName(),
-                         pair.getTarget2().getClassName(), new Double(similarity) });
+            model.addRow(new Object[] { pair.getTarget1().getName(),
+                         pair.getTarget2().getName(), new Double(similarity) });
         }
         average = average / list.size();
         
diff --git a/src/main/java/jp/naist/se/stigmata/ui/swing/RoundRobinComparisonResultPane.java b/src/main/java/jp/naist/se/stigmata/ui/swing/RoundRobinComparisonResultPane.java
index f1ceeee..e01935c 100755
--- a/src/main/java/jp/naist/se/stigmata/ui/swing/RoundRobinComparisonResultPane.java
+++ b/src/main/java/jp/naist/se/stigmata/ui/swing/RoundRobinComparisonResultPane.java
@@ -90,11 +90,11 @@ public class RoundRobinComparisonResultPane extends JPanel implements BirthmarkD
         double min = 100d;
         model.addColumn("");
         for(BirthmarkSet x: birthmarksX){
-            model.addColumn(x.getClassName());
+            model.addColumn(x.getName());
         }
         for(int j = 0; j < birthmarksY.size(); j++){
             Object[] rows = new Object[birthmarksX.size() + 1];
-            rows[0] = birthmarksY.get(j).getClassName();
+            rows[0] = birthmarksY.get(j).getName();
 
             for(int i = 0; i < birthmarksX.size(); i++){
                 double similarity = compare(context, birthmarksX.get(i), birthmarksY.get(j));
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 073267f..866e89a 100755
--- 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,21 +5,15 @@ package jp.naist.se.stigmata.ui.swing;
  */
 
 import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.Font;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import java.net.URL;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -58,6 +52,8 @@ import jp.naist.se.stigmata.Stigmata;
 import jp.naist.se.stigmata.filter.FilteredComparisonResultSet;
 import jp.naist.se.stigmata.format.FormatManager;
 import jp.naist.se.stigmata.spi.ResultFormatSpi;
+import jp.naist.se.stigmata.ui.swing.actions.AboutAction;
+import jp.naist.se.stigmata.ui.swing.actions.LicenseAction;
 import jp.naist.se.stigmata.ui.swing.graph.SimilarityDistributionGraphPane;
 import jp.naist.se.stigmata.ui.swing.mds.MDSGraphPanel;
 
@@ -186,8 +182,8 @@ public class StigmataFrame extends JFrame implements CurrentDirectoryHolder{
             new Object[] { new Integer(compareDetail), },
             new Object[] {
                 Utility.array2String(target1.getBirthmarkTypes()),
-                target1.getClassName(),
-                target2.getClassName(),
+                target1.getName(),
+                target2.getName(),
             }
         );
         tabPane.setSelectedIndex(tabPane.getTabCount() - 1);
@@ -446,11 +442,6 @@ public class StigmataFrame extends JFrame implements CurrentDirectoryHolder{
         setJMenuBar(menubar);
 
         setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
-        addWindowListener(new WindowAdapter(){
-            public void windowClosed(WindowEvent evt){
-                formWindowClosed(evt);
-            }
-        });
     }
 
     private JMenu createFileMenu(){
@@ -504,8 +495,8 @@ public class StigmataFrame extends JFrame implements CurrentDirectoryHolder{
 
     private JMenu createHelpMenu(){
         JMenu menu = Utility.createJMenu("helpmenu");
-        JMenuItem about = Utility.createJMenuItem("about");
-        JMenuItem license = Utility.createJMenuItem("license");
+        JMenuItem about = Utility.createJMenuItem("about", new AboutAction(this));
+        JMenuItem license = Utility.createJMenuItem("license", new LicenseAction(this));
         JMenuItem help = Utility.createJMenuItem("helpmenu");
         JMenu laf = Utility.createJMenu("lookandfeel");
         expertmodeMenu = Utility.createJCheckBoxMenuItem("expertmenu");
@@ -518,17 +509,6 @@ public class StigmataFrame extends JFrame implements CurrentDirectoryHolder{
         menu.add(new JSeparator());
         menu.add(expertmodeMenu);
 
-        about.addActionListener(new ActionListener(){
-            public void actionPerformed(ActionEvent e){
-                aboutMenuActionPerformed();
-            }
-        });
-
-        license.addActionListener(new ActionListener(){
-            public void actionPerformed(ActionEvent e){
-                licenseMenuActionPerformed();
-            }
-        });
         expertmodeMenu.addActionListener(new ActionListener(){
             public void actionPerformed(ActionEvent e){
                 expertMenuActionPerformed(((JCheckBoxMenuItem)e.getSource()).getState());
@@ -563,62 +543,20 @@ public class StigmataFrame extends JFrame implements CurrentDirectoryHolder{
         control.setExpertMode(status);
     }
 
-    private void aboutMenuActionPerformed(){
-        Package p = getClass().getPackage();
-        JPanel panel = new JPanel(new BorderLayout());
-        JLabel logo = new JLabel(Utility.getIcon("stigmata.logo"));
-        panel.add(logo, BorderLayout.NORTH);
-
-        String aboutMessage = loadString("/resources/about.txt");
-        aboutMessage = aboutMessage.replace("${implementation.version}", p.getImplementationVersion());
-        aboutMessage = aboutMessage.replace("${implementation.vendor}",  p.getImplementationVendor());
-        aboutMessage = aboutMessage.replace("${implementation.title}",   p.getImplementationTitle());
-
-        JTextArea text = new JTextArea(aboutMessage);
-        text.setEditable(false);
-        text.setCaretPosition(0);
-        JScrollPane scroll = new JScrollPane();
-        scroll.setViewportView(text);
-        panel.add(scroll, BorderLayout.CENTER);
-
-        JOptionPane.showMessageDialog(
-            this, panel, Messages.getString("about.dialog.title"),
-            JOptionPane.INFORMATION_MESSAGE
-        );
-    }
-
-    private void licenseMenuActionPerformed(){
-        JTextArea area = new JTextArea();
-        area.setText(loadString("/META-INF/license.txt"));
-        Font f = area.getFont();
-        area.setFont(new Font("Monospaced", f.getStyle(), f.getSize()));
-        area.setEditable(false);
-        area.setCaretPosition(0);
-
-        JScrollPane scroll = new JScrollPane();
-        scroll.setViewportView(area);
-        scroll.setPreferredSize(new Dimension(500, 300));
-
-        JOptionPane.showMessageDialog(
-            this, scroll, Messages.getString("license.dialog.title"),
-            JOptionPane.INFORMATION_MESSAGE
-        );
-    }
-
     private void showExceptionMessage(Exception e){
-       if(e instanceof BirthmarkElementClassNotFoundException){
-           showClassNotFoundMessage((BirthmarkElementClassNotFoundException)e);
-           return;
-       }
-       JTextArea area = new JTextArea(20, 60);
+        if(e instanceof BirthmarkElementClassNotFoundException){
+            showClassNotFoundMessage((BirthmarkElementClassNotFoundException)e);
+            return;
+        }
+        JTextArea area = new JTextArea(20, 60);
         StringWriter writer = new StringWriter();
         PrintWriter out = new PrintWriter(writer);
         e.printStackTrace(out);
         if(e instanceof BirthmarkExtractionException){
-               out.println("Causes:");
-               for(Throwable t: ((BirthmarkExtractionException)e).getCauses()){
-                       t.printStackTrace(out);
-               }
+            out.println("Causes:");
+            for(Throwable t: ((BirthmarkExtractionException)e).getCauses()){
+                t.printStackTrace(out);
+            }
         }
         out.close();
         area.setText(writer.toString());
@@ -633,47 +571,20 @@ public class StigmataFrame extends JFrame implements CurrentDirectoryHolder{
     }
 
     private void showClassNotFoundMessage(BirthmarkElementClassNotFoundException e){
-       StringBuffer sb = new StringBuffer();
-       sb.append("<html><body><p>");
-       sb.append(Messages.getString("error.message.classpath"));
-       sb.append("</p><ul>");
-       for(String name: e.getClassNames()){
-               sb.append("<li>").append(name).append("</li>");
-       }
-       sb.append("</ul></body></html>");
+        StringBuffer sb = new StringBuffer();
+        sb.append("<html><body><p>");
+        sb.append(Messages.getString("error.message.classpath"));
+        sb.append("</p><ul>");
+        for(String name: e.getClassNames()){
+            sb.append("<li>").append(name).append("</li>");
+        }
+        sb.append("</ul></body></html>");
         JOptionPane.showMessageDialog(
             this, new String(sb), Messages.getString("error.dialog.title"),
             JOptionPane.WARNING_MESSAGE
         );
     }
 
-    private String loadString(String loadFrom){
-        try{
-            String line;
-            URL url = getClass().getResource(loadFrom);
-            BufferedReader in = new BufferedReader(new InputStreamReader(url.openStream()));
-            StringWriter writer = new StringWriter();
-            PrintWriter out = new PrintWriter(writer);
-            while((line = in.readLine()) != null){
-                out.println(line);
-            }
-            out.close();
-            in.close();
-
-            return writer.toString();
-        }catch(IOException e){
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    private void formWindowClosed(WindowEvent evt){
-        frameList.remove(this);
-        if(frameList.size() == 0){
-            System.exit(1);
-        }
-    }
-
     private void closeTabMenuActionPerformed(){
         int index = tabPane.getSelectedIndex();
         if(index == 0){
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 6af7a06..5752850 100755
--- a/src/main/java/jp/naist/se/stigmata/ui/swing/Utility.java
+++ b/src/main/java/jp/naist/se/stigmata/ui/swing/Utility.java
@@ -35,7 +35,7 @@ public class Utility{
     private Utility(){
     }
 
-    public static Action createAction(String key, final ActionListener listener){
+    public static Action createAction2(String key, final ActionListener listener){
         final Icon icon = getIcon(key + ".icon");
         final String label = Messages.getString(key + ".label");
 
@@ -70,10 +70,16 @@ public class Utility{
 
     public static JButton createButton(String label, Action action){
         JButton button = new JButton(action);
+        button.setText(Messages.getString(label + ".button.label"));
         button.setActionCommand(label);
         if(Messages.hasString(label + ".button.tooltip")){
             button.setToolTipText(Messages.getString(label + ".button.tooltip"));
         }
+        Icon icon = getIcon(label + ".button.icon");
+        if(icon != null){
+            button.setIcon(icon);
+        }
+
         return button;
     }
 
@@ -110,10 +116,15 @@ public class Utility{
 
     public static JMenuItem createJMenuItem(String label, Action action){
         JMenuItem item = new JMenuItem(action);
+        item.setText(Messages.getString(label + ".menuitem.label"));
         item.setActionCommand(label);
         if(Messages.hasString(label + ".menuitem.tooltip")){
             item.setToolTipText(Messages.getString(label + ".menuitem.tooltip"));
         }
+        Icon icon = getIcon(label + ".menuitem.icon");
+        if(icon != null){
+            item.setIcon(icon);
+        }
         return item;
     }
 
diff --git a/src/main/java/jp/naist/se/stigmata/ui/swing/mds/MDSGraphPanel.java b/src/main/java/jp/naist/se/stigmata/ui/swing/mds/MDSGraphPanel.java
index 170976e..c34724d 100755
--- a/src/main/java/jp/naist/se/stigmata/ui/swing/mds/MDSGraphPanel.java
+++ b/src/main/java/jp/naist/se/stigmata/ui/swing/mds/MDSGraphPanel.java
@@ -15,6 +15,7 @@ import java.net.URL;
 import java.util.Iterator;
 
 import javax.imageio.ImageIO;
+import javax.swing.AbstractAction;
 import javax.swing.Action;
 import javax.swing.Box;
 import javax.swing.JCheckBox;
@@ -106,7 +107,7 @@ public class MDSGraphPanel extends JPanel{
                     matrix[j][i] = matrix[i][j];
                 }
             }
-            String className = set[i].getClassName();
+            String className = set[i].getName();
             labels.addLabel(className);
             String groupName = getGroupName(set[i].getLocation());
             labels.setGroup(className, groupName);
@@ -132,16 +133,17 @@ public class MDSGraphPanel extends JPanel{
             public void actionPerformed(ActionEvent e){
                 String c = e.getActionCommand();
                 for(int i = 0; i < set.length; i++){
-                    if(c.equals(set[i].getClassName())){
+                    if(c.equals(set[i].getName())){
                         stigmata.showExtractionResult(new BirthmarkSet[] { set[i], }, stigmata.getContext());
                     }
                 }
             }
         });
-        final JCheckBox check = new JCheckBox(Messages.getString("showlabel.button.label"), true);
+        JCheckBox check = new JCheckBox(Messages.getString("showlabel.button.label"), true);
         check.addActionListener(new ActionListener(){
             public void actionPerformed(ActionEvent e){
-                viewer.setShowLabel(check.isSelected());
+                JCheckBox c = (JCheckBox)e.getSource();
+                viewer.setShowLabel(c.isSelected());
             }
         });
 
@@ -163,16 +165,20 @@ public class MDSGraphPanel extends JPanel{
                 }
             }
         );
-        Action saveMDSAction = Utility.createAction("savemds", new ActionListener(){
+        Action saveMDSAction = new AbstractAction(){
+            private static final long serialVersionUID = 3314135350231965216L;
+
             public void actionPerformed(ActionEvent e){
                 saveMDSImage();
             }
-        });
-        Action saveCoordinate = Utility.createAction("savelocation", new ActionListener(){
+        };
+        Action saveCoordinate = new AbstractAction(){
+            private static final long serialVersionUID = 1956405328339468706L;
+
             public void actionPerformed(ActionEvent e){
                 saveCoordinate();
             }
-        });
+        };
         PopupButton colorButton = new PopupButton(Utility.createButton("updatecolor", pointColorAction));
         colorButton.addMenuItem(Utility.createJMenuItem("updateovercolor", overColorAction));
         PopupButton saveButton = new PopupButton(Utility.createButton("savemds", saveMDSAction));
-- 
2.11.0