Use an anonymous inner class as listener instead of FileFormatBox its…

…elf.
CaGe-graph · Apr 1, 2015 · a59519c · a59519c
1 parent 2da015a
commit a59519c
Showing 1 changed file with 22 additions and 20 deletions.
diff --git a/cage/FileFormatBox.java b/cage/FileFormatBox.java
@@ -21,14 +21,33 @@
  * with a textfield of which the name is altered based on the selected
  * file format.
  */
-public class FileFormatBox extends JComboBox<String> implements ActionListener {
+public class FileFormatBox extends JComboBox<String> {
 
     private final List<CaGeWriter> writers = new ArrayList<>();
     private final List<WriterConfigurationHandler> handlers = new ArrayList<>();
     private int dimension = 0;
     private JTextComponent filenameField;
     private String oldExtension;
     private boolean addExtension;
+
+    private final ActionListener actionListener = new ActionListener() {
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            String currentName = filenameField.getText();
+            if (currentName.trim().startsWith("|")) {
+                return;
+            }
+            int cut = currentName.length() - oldExtension.length() - 1;
+            if (cut >= 0 &&
+                    currentName.substring(cut).equalsIgnoreCase("." + oldExtension)) {
+                filenameField.setText(currentName.substring(0, cut));
+            }
+            addExtension();
+            if (e.getActionCommand().length() == 0) {
+                filenameField.requestFocus();
+            }
+        }
+    };
 
     public FileFormatBox(String variety, JTextComponent filenameField) {
         this(variety, filenameField, true);
@@ -50,8 +69,8 @@ public FileFormatBox(String variety, JTextComponent filenameField, boolean addEx
             writers.add(writer);
             handlers.add(handler);
         }
-        addActionListener(this);
-        registerKeyboardAction(this, "",
+        addActionListener(actionListener);
+        registerKeyboardAction(actionListener, "",
                 KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0),
                 WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
         // new onActionFocusSwitcher(filenameField, this);
@@ -92,21 +111,4 @@ public void addExtension() {
         filenameField.setText(currentName + "." + extension);
         oldExtension = extension;
     }
-
-    @Override
-    public void actionPerformed(ActionEvent e) {
-        String currentName = filenameField.getText();
-        if (currentName.trim().startsWith("|")) {
-            return;
-        }
-        int cut = currentName.length() - oldExtension.length() - 1;
-        if (cut >= 0 &&
-                currentName.substring(cut).equalsIgnoreCase("." + oldExtension)) {
-            filenameField.setText(currentName.substring(0, cut));
-        }
-        addExtension();
-        if (e.getActionCommand().length() == 0) {
-            filenameField.requestFocus();
-        }
-    }
 }