Changeset 4087 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java

Timestamp:

2011-05-15T23:51:25+02:00 (13 years ago)

Author:

bastiK

Message:

PaintVisitor refactoring, includes hook for external MapRenderers (author: Gubaer)

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java (modified) (15 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java

@@ -13 +13 @@
 import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
@@ -28 +27 @@
 
 import javax.swing.AbstractAction;
-import javax.swing.DefaultButtonModel;
 import javax.swing.DefaultListSelectionModel;
 import javax.swing.JCheckBox;
@@ -99 +97 @@
         JLabel wfLabel = new JLabel(tr("Wireframe View"), ImageProvider.get("dialogs/mappaint", "wireframe_small"), JLabel.HORIZONTAL);
         wfLabel.setFont(wfLabel.getFont().deriveFont(Font.PLAIN));
-
-        cbWireframe.setModel(new DefaultButtonModel() {
-            @Override
-            public void setSelected(boolean b) {
-                super.setSelected(b);
-                tblStyles.setEnabled(!b);
-                onoffAction.updateEnabledState();
-                upAction.updateEnabledState();
-                downAction.updateEnabledState();
-            }
-        });
-        cbWireframe.addActionListener(new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
-                Main.main.menu.wireFrameToggleAction.actionPerformed(null);
-            }
-        });
+        cbWireframe.setFont(cbWireframe.getFont().deriveFont(Font.PLAIN));
+        cbWireframe.setAction(Main.main.menu.wireFrameToggleAction);
         cbWireframe.setBorder(new EmptyBorder(new Insets(1,1,1,1)));
-
+        cbWireframe.setText("");
         tblStyles = new StylesTable(model);
         tblStyles.setSelectionModel(selectionModel= new DefaultListSelectionModel());
@@ -130 +114 @@
         tblStyles.setShowGrid(false);
         tblStyles.setIntercellSpacing(new Dimension(0, 0));
+        cbWireframe.addChangeListener(tblStyles);
 
         JPanel p = new JPanel(new GridBagLayout());
@@ -137 +122 @@
 
         pnl.add(new JScrollPane(p), BorderLayout.CENTER);
-
         pnl.add(buildButtonRow(), BorderLayout.SOUTH);
-
         add(pnl, BorderLayout.CENTER);
     }
 
-    protected static class StylesTable extends JTable {
+    protected class StylesTable extends JTable implements ChangeListener{
 
         public StylesTable(TableModel dm) {
@@ -157 +140 @@
             rect.setLocation(rect.x - pt.x, rect.y - pt.y);
             viewport.scrollRectToVisible(rect);
+        }
+
+        @Override
+        public void stateChanged(ChangeEvent e) {
+            setEnabled(!cbWireframe.isSelected());
         }
     }
@@ -170 +158 @@
         selectionModel.addListSelectionListener(upAction);
         selectionModel.addListSelectionListener(downAction);
+        cbWireframe.addChangeListener(onoffAction);
+        cbWireframe.addChangeListener(upAction);
+        cbWireframe.addChangeListener(downAction);
+
         p.add(new SideButton(onoffAction));
         p.add(new SideButton(upAction));
@@ -180 +172 @@
     @Override
     public void showNotify() {
+        cbWireframe.setAction(Main.main.menu.wireFrameToggleAction);
         MapPaintStyles.addMapPaintSylesUpdateListener(model);
-        Main.main.menu.wireFrameToggleAction.addButtonModel(cbWireframe.getModel());
     }
 
     @Override
     public void hideNotify() {
-        Main.main.menu.wireFrameToggleAction.removeButtonModel(cbWireframe.getModel());
+        cbWireframe.setAction(null);
         MapPaintStyles.removeMapPaintSylesUpdateListener(model);
     }
@@ -304 +296 @@
     }
 
-    protected class OnOffAction extends AbstractAction implements ListSelectionListener {
+    protected abstract class EventListeningAction extends AbstractAction implements ListSelectionListener, ChangeListener {
+
+        protected abstract void updateEnabledState();
+
+        @Override
+        public void valueChanged(ListSelectionEvent e) {
+            updateEnabledState();
+        }
+
+        @Override
+        public void stateChanged(ChangeEvent e) {
+            updateEnabledState();
+        }
+    }
+
+    protected class OnOffAction extends EventListeningAction {
         public OnOffAction() {
             putValue(SHORT_DESCRIPTION, tr("Turn selected styles on or off"));
@@ -311 +318 @@
         }
 
+        @Override
         protected void updateEnabledState() {
             setEnabled(!cbWireframe.isSelected() && tblStyles.getSelectedRowCount() > 0);
-        }
-
-        @Override
-        public void valueChanged(ListSelectionEvent e) {
-            updateEnabledState();
         }
 
@@ -334 +337 @@
      * The action to move down the currently selected entries in the list.
      */
-    protected class MoveUpDownAction extends AbstractAction implements ListSelectionListener {
+    protected class MoveUpDownAction extends EventListeningAction {
 
         final int increment;
@@ -345 +348 @@
         }
 
+        @Override
         public void updateEnabledState() {
             int[] sel = tblStyles.getSelectedRows();
@@ -360 +364 @@
             }
             model.ensureSelectedIsVisible();
-        }
-
-        public void valueChanged(ListSelectionEvent e) {
-            updateEnabledState();
         }
     }
@@ -503 +503 @@
                     error = true;
                 } finally {
-                    if (bis != null) {
-                        try {
-                            bis.close();
-                        } catch (IOException e) {
-                            e.printStackTrace();
-                        }
-                    }
-                    if (bos != null) {
-                        try {
-                            bos.close();
-                        } catch (IOException e) {
-                            e.printStackTrace();
-                        }
-                    }
+                    Utils.close(bis);
+                    Utils.close(bos);
                 }
             }
@@ -648 +636 @@
                 txtSource.append("<ERROR: failed to read file!>");
             } finally {
-                try {
-                    is.close();
-                } catch (IOException ex) {
-                }
+                Utils.close(is);
             }
         }