Changeset 6912 in josm for trunk/src/org/openstreetmap/josm/gui/io

Timestamp:

2014-03-19T01:01:04+01:00 (10 years ago)

Author:

Don-vip

Message:

Refactor duplicated code

Location:

trunk/src/org/openstreetmap/josm/gui/io

Files:

• ActionFlagsTableCell.java (modified) (7 diffs)
• LayerNameAndFilePathTableCell.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/gui/io/ActionFlagsTableCell.java

@@ -10 +10 @@
 import java.awt.event.ActionListener;
 import java.util.EventObject;
-import java.util.concurrent.CopyOnWriteArrayList;
 
 import javax.swing.AbstractAction;
@@ -18 +17 @@
 import javax.swing.JTable;
 import javax.swing.event.CellEditorListener;
-import javax.swing.event.ChangeEvent;
 import javax.swing.table.TableCellEditor;
 import javax.swing.table.TableCellRenderer;
 
+import org.openstreetmap.josm.gui.util.CellEditorSupport;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -30 +29 @@
  *
  * Intended usage is like this:
- * ActionFlagsTableCell aftc = new ActionFlagsTableCell();
- * col = new TableColumn(0);
- * col.setCellRenderer(aftc);
- * col.setCellEditor(aftc);
+ * <code>
+ * <br>ActionFlagsTableCell aftc = new ActionFlagsTableCell();
+ * <br>col = new TableColumn(0);
+ * <br>col.setCellRenderer(aftc);
+ * <br>col.setCellEditor(aftc);
+ * </code>
  */
 class ActionFlagsTableCell extends JPanel implements TableCellRenderer, TableCellEditor {
-    protected final JCheckBox[] checkBoxes = new JCheckBox[2];
-    private CopyOnWriteArrayList<CellEditorListener> listeners;
+    private final JCheckBox[] checkBoxes = new JCheckBox[2];
+    private final CellEditorSupport cellEditorSupport = new CellEditorSupport(this);
 
     private ActionListener al = new ActionListener() {
         @Override
         public void actionPerformed(ActionEvent e) {
-            fireEditingStopped();
+            cellEditorSupport.fireEditingStopped();
         }
     };
 
     public ActionFlagsTableCell() {
-        super();
-        listeners = new CopyOnWriteArrayList<CellEditorListener>();
-
         checkBoxes[0] = new JCheckBox(tr("Upload"));
         checkBoxes[1] = new JCheckBox(tr("Save"));
@@ -63 +61 @@
                 public void actionPerformed(ActionEvent e) {
                     b.setSelected(!b.isSelected());
-                    fireEditingStopped();
+                    cellEditorSupport.fireEditingStopped();
                 }
             });
@@ -94 +92 @@
     @Override
     public void addCellEditorListener(CellEditorListener l) {
-        if (l != null) {
-            listeners.addIfAbsent(l);
-        }
-    }
-
-    protected void fireEditingCanceled() {
-        for (CellEditorListener l: listeners) {
-            l.editingCanceled(new ChangeEvent(this));
-        }
-    }
-
-    protected void fireEditingStopped() {
-        for (CellEditorListener l: listeners) {
-            l.editingStopped(new ChangeEvent(this));
-        }
+        cellEditorSupport.addCellEditorListener(l);
     }
 
     @Override
     public void cancelCellEditing() {
-        fireEditingCanceled();
+        cellEditorSupport.fireEditingCanceled();
     }
 
@@ -131 +115 @@
     @Override
     public void removeCellEditorListener(CellEditorListener l) {
-        listeners.remove(l);
+        cellEditorSupport.removeCellEditorListener(l);
     }
 
@@ -141 +125 @@
     @Override
     public boolean stopCellEditing() {
-        fireEditingStopped();
+        cellEditorSupport.fireEditingStopped();
         return true;
     }

trunk/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java

@@ -14 +14 @@
 import java.io.File;
 import java.util.EventObject;
-import java.util.concurrent.CopyOnWriteArrayList;
 
 import javax.swing.AbstractAction;
@@ -23 +22 @@
 import javax.swing.JTable;
 import javax.swing.event.CellEditorListener;
-import javax.swing.event.ChangeEvent;
 import javax.swing.table.TableCellEditor;
 import javax.swing.table.TableCellRenderer;
 
 import org.openstreetmap.josm.actions.SaveActionBase;
+import org.openstreetmap.josm.gui.util.CellEditorSupport;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.tools.GBC;
-import org.openstreetmap.josm.gui.widgets.JosmTextField;
 
 class LayerNameAndFilePathTableCell extends JPanel implements TableCellRenderer, TableCellEditor {
@@ -43 +42 @@
     private static final GBC defaultCellStyle = GBC.eol().fill(GBC.HORIZONTAL).insets(2, 0, 2, 0);
 
-    private CopyOnWriteArrayList<CellEditorListener> listeners;
+    private final CellEditorSupport cellEditorSupport = new CellEditorSupport(this);
     private File value;
 
@@ -71 +70 @@
         btnFileChooser.setPreferredSize(new Dimension(20, 19));
         btnFileChooser.setOpaque(true);
-
-        listeners = new CopyOnWriteArrayList<CellEditorListener>();
     }
 
@@ -93 +90 @@
     }
 
-    /** renderer used while the file path is being edited **/
-    @Override
-    public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected,
-            int row, int column) {
+    @Override
+    public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
         removeAll();
         SaveLayerInfo info = (SaveLayerInfo)value;
@@ -182 +177 @@
     @Override
     public void addCellEditorListener(CellEditorListener l) {
-        if (l != null) {
-            listeners.addIfAbsent(l);
-        }
-    }
-
-    protected void fireEditingCanceled() {
-        for (CellEditorListener l: listeners) {
-            l.editingCanceled(new ChangeEvent(this));
-        }
-    }
-
-    protected void fireEditingStopped() {
-        for (CellEditorListener l: listeners) {
-            l.editingStopped(new ChangeEvent(this));
-        }
+        cellEditorSupport.addCellEditorListener(l);
     }
 
     @Override
     public void cancelCellEditing() {
-        fireEditingCanceled();
+        cellEditorSupport.fireEditingCanceled();
     }
 
@@ -216 +197 @@
     @Override
     public void removeCellEditorListener(CellEditorListener l) {
-        listeners.remove(l);
+        cellEditorSupport.removeCellEditorListener(l);
     }
 
@@ -231 +212 @@
             value = new File(tfFilename.getText());
         }
-        fireEditingStopped();
+        cellEditorSupport.fireEditingStopped();
         return true;
     }