Changeset 27322 in osm for applications/editors/josm/plugins/FixAddresses/src/org

Timestamp:

2011-12-27T19:47:45+01:00 (13 years ago)

Author:

oliverw

Message:

Moved all action instance to class AddressActions.

Location:

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses

Files:

• OSMAddress.java (modified) (2 diffs)
• gui/AddressEditDialog.java (modified) (4 diffs)
• gui/IncompleteAddressesDialog.java (modified) (7 diffs)
• gui/actions/AddressActions.java (added)

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMAddress.java

@@ -15 +15 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.util.Collection;
 import java.util.HashMap;
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.AddressActions;
 import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.ApplyAllGuessesAction;
-import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.RemoveAddressTagsAction;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 
@@ -728 +729 @@
                 AddressSolution s = new AddressSolution(
                                                 tr("Remove all address tags"),
-                                                new RemoveAddressTagsAction(),
+                                                AddressActions.getRemoveTagsAction(),
                                                 SolutionType.Remove);
                 problem.addSolution(s);

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java

@@ -57 +57 @@
 import org.openstreetmap.josm.plugins.fixAddresses.StringUtils;
 import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.AbstractAddressEditAction;
-import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.ApplyAllGuessesAction;
-import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.AssignAddressToStreetAction;
-import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.ConvertAllToRelationAction;
-import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.ConvertToRelationAction;
-import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.GuessAddressDataAction;
-import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.RemoveAddressTagsAction;
-import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.SelectAddressesInMapAction;
+import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.AddressActions;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -79 +73 @@
         private JTable streetTable;
 
-        /* Actions */
-        private AssignAddressToStreetAction resolveAction = new AssignAddressToStreetAction();
-        private ApplyAllGuessesAction applyAllGuessesAction = new ApplyAllGuessesAction();
-        private GuessAddressDataAction guessAddressAction = new GuessAddressDataAction();
-        private SelectAddressesInMapAction selectAddressesInMapAction = new SelectAddressesInMapAction();
-        private RemoveAddressTagsAction removeAddressTagsAction = new RemoveAddressTagsAction();
-        private ConvertToRelationAction convertToRelationAction = new ConvertToRelationAction();
-        private ConvertAllToRelationAction convertAllToRelationAction = new ConvertAllToRelationAction();
-
         private AbstractAddressEditAction[] actions = new AbstractAddressEditAction[] {
-                resolveAction,
-                guessAddressAction,
-                applyAllGuessesAction,
-                selectAddressesInMapAction,
-                removeAddressTagsAction,
-                convertToRelationAction,
-                convertAllToRelationAction
+                AddressActions.getResolveAction(),
+                AddressActions.getGuessAddressAction(),
+                AddressActions.getApplyGuessesAction(),
+                AddressActions.getSelectAction(),
+                AddressActions.getRemoveTagsAction(),
+                AddressActions.getConvertToRelationAction(),
+                AddressActions.getConvertAllToRelationAction()
         };
+        
         private JLabel streetLabel;
         private JLabel unresolvedAddressesLabel;
@@ -157 +143 @@
                         unresolvedTable.getSelectionModel().addListSelectionListener(this);
                         unresolvedTable.getSelectionModel().addListSelectionListener(new IncompleteAddressListener());
-                        unresolvedTable.addMouseListener(applyAllGuessesAction);
+                        unresolvedTable.addMouseListener(AddressActions.getApplyGuessesAction());
 
                         JTableHeader header = unresolvedTable.getTableHeader();
@@ -178 +164 @@
                         try {
                                 JPanel unresolvedButtons = new JPanel(new GridLayout(2,5, 5, 5));
-                                SideButton assign = new SideButton(resolveAction);
+                                SideButton assign = new SideButton(AddressActions.getResolveAction());
                                 unresolvedButtons.add(assign);
 
-                                SideButton guess = new SideButton(guessAddressAction);
+                                SideButton guess = new SideButton(AddressActions.getGuessAddressAction());
                                 unresolvedButtons.add(guess);
-                                SideButton applyAllGuesses = new SideButton(applyAllGuessesAction);
+                                SideButton applyAllGuesses = new SideButton(AddressActions.getApplyGuessesAction());
                                 unresolvedButtons.add(applyAllGuesses);
 
-                                SideButton removeAddressTags = new SideButton(removeAddressTagsAction);
+                                SideButton removeAddressTags = new SideButton(AddressActions.getRemoveTagsAction());
                                 unresolvedButtons.add(removeAddressTags);
 
                                 unresolvedButtons.add(new JPanel());
 
-                                SideButton selectInMap = new SideButton(selectAddressesInMapAction);
+                                SideButton selectInMap = new SideButton(AddressActions.getSelectAction());
                                 unresolvedButtons.add(selectInMap);
                                 headerPanel2.setMinimumSize(new Dimension(100, 70));

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java

@@ -21 +21 @@
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
+import javax.swing.SwingUtilities;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
@@ -29 +30 @@
 import org.openstreetmap.josm.data.osm.event.DataSetListener;
 import org.openstreetmap.josm.data.osm.event.DatasetEventManager;
+import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
 import org.openstreetmap.josm.data.osm.event.NodeMovedEvent;
 import org.openstreetmap.josm.data.osm.event.PrimitivesAddedEvent;
@@ -35 +37 @@
 import org.openstreetmap.josm.data.osm.event.TagsChangedEvent;
 import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
-import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
@@ -43 +44 @@
 import org.openstreetmap.josm.plugins.fixAddresses.OsmUtils;
 import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.AbstractAddressEditAction;
-import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.ApplyAllGuessesAction;
-import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.GuessAddressDataAction;
-import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.RemoveAddressTagsAction;
-import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.SelectAddressesInMapAction;
+import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.AddressActions;
 
 @SuppressWarnings("serial")
@@ -54 +52 @@
         private AddressEditContainer container;
 
-        // Create action objects
-        private SelectAddressesInMapAction selectAction = new SelectAddressesInMapAction();
-        private GuessAddressDataAction guessDataAction = new GuessAddressDataAction();
-        private ApplyAllGuessesAction applyGuessesAction = new ApplyAllGuessesAction();
-        private RemoveAddressTagsAction removeTagsAction = new RemoveAddressTagsAction();
 
         // Array containing the available actions
         private AbstractAddressEditAction[] actions = new AbstractAddressEditAction[]{
-                        selectAction,
-                        guessDataAction,
-                        applyGuessesAction,
-                        removeTagsAction
+                        AddressActions.getSelectAction(),
+                        AddressActions.getGuessAddressAction(),
+                        AddressActions.getApplyGuessesAction(),
+                        AddressActions.getRemoveTagsAction(),
         };
 
@@ -215 +208 @@
         @Override
         public void containerChanged(AddressEditContainer container) {
-                if (container != null && container.getNumberOfIncompleteAddresses() > 0) {
-                        setTitle(String.format("%s (%d %s)", FIXED_DIALOG_TITLE, container.getNumberOfIncompleteAddresses(), tr("items")));
-                } else {
-                        setTitle(String.format("%s (%s)", FIXED_DIALOG_TITLE, tr("no items")));
+                if (SwingUtilities.isEventDispatchThread()) {
+                        if (container != null && container.getNumberOfIncompleteAddresses() > 0) {
+                                setTitle(String.format("%s (%d %s)", FIXED_DIALOG_TITLE, container.getNumberOfIncompleteAddresses(), tr("items")));
+                        } else {
+                                setTitle(String.format("%s (%s)", FIXED_DIALOG_TITLE, tr("no items")));
+                        }
                 }
         }
@@ -227 +222 @@
         @Override
         public void entityChanged(IOSMEntity node) {
-                container.invalidate();
+                if (SwingUtilities.isEventDispatchThread()) {
+                        container.invalidate();
+                }
         }
 }