Changeset 23923 in osm for applications/editors/josm/plugins/AddressEdit/src

Timestamp:

2010-10-30T18:43:15+02:00 (15 years ago)

Author:

oliverw

Message:

• Bugfix: Stack overflow in AbstractAddressEditAction
• Fixed icon locations/ added icons

Location:

applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui

Files:

• AbstractAddressEditAction.java (modified) (2 diffs)
• AddressEditDialog.java (modified) (1 diff)
• ApplyAllGuessesAction.java (modified) (2 diffs)
• GuessAddressDataAction.java (modified) (1 diff)

applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/AbstractAddressEditAction.java

@@ -58 +58 @@
         public void setContainer(AddressEditContainer container) {
                 this.container = container;
-                updateEnabledState(container);
+                updateEnabledState();
         }
 
         /**
-         * Updates 'enabled' state depending on the given selection event.
-         * @param ev
-         * @return
+         * @return the event
          */
-        public void updateEnabledState(AddressEditSelectionEvent ev) {
-                // If the tree selection changes, we will get a new event. So this is safe.
-                super.updateEnabledState();
-                this.event = ev; // save for later use.
-                if (ev != null) {
-                        updateEnabledState(ev);
+        protected AddressEditSelectionEvent getEvent() {
+                return event;
+        }
+
+        /**
+         * @param event the event to set
+         */
+        protected void setEvent(AddressEditSelectionEvent event) {
+                this.event = event;
+        }
+
+        /* (non-Javadoc)
+         * @see org.openstreetmap.josm.actions.JosmAction#updateEnabledState()
+         */
+        @Override
+        protected void updateEnabledState() {
+                if (this.event != null) {
+                        updateEnabledState(this.event);
+                } else {
+                        if (container != null) {
+                                updateEnabledState(container);
+                        } else {
+                                super.updateEnabledState();
+                        }
                 }
         }
@@ -81 +97 @@
          */
         protected abstract void updateEnabledState(AddressEditContainer container);
+        
+        /**
+         * Updates 'enabled' state depending on the given address container object.
+         * @param container The address container (maybe null).
+         * @return
+         */
+        protected abstract void updateEnabledState(AddressEditSelectionEvent event);
 
         /* (non-Javadoc)

applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/AddressEditDialog.java

@@ -126 +126 @@
                         unresolvedPanel.setMinimumSize(new Dimension(350, 200));
                         
-                        JPanel unresolvedButtons = new JPanel(new FlowLayout());
-                        SideButton assign = new SideButton(resolveAction);                                                                                                                         
-                        unresolvedButtons.add(assign);
-                        SideButton guess = new SideButton(guessAddressAction);                                                                                                                     
-                        unresolvedButtons.add(guess);
-                        SideButton applyAllGuesses = new SideButton(applyAllGuessesAction);                                                                                                                        
-                        unresolvedButtons.add(applyAllGuesses);
-                        unresolvedPanel.add(unresolvedButtons, BorderLayout.SOUTH);
+                        
+                        try {
+                                JPanel unresolvedButtons = new JPanel(new FlowLayout());
+                                SideButton assign = new SideButton(resolveAction);                                                                                                                         
+                                unresolvedButtons.add(assign);
+                                SideButton guess = new SideButton(guessAddressAction);                                                                                                                     
+                                unresolvedButtons.add(guess);
+                                SideButton applyAllGuesses = new SideButton(applyAllGuessesAction);                                                                                                                        
+                                unresolvedButtons.add(applyAllGuesses);
+                                unresolvedPanel.add(unresolvedButtons, BorderLayout.SOUTH);
+                        } catch (Exception e) {                         
+                                e.printStackTrace();
+                        }
+                        
                         
                         /* Map Panel */

applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/ApplyAllGuessesAction.java

@@ -28 +28 @@
         public ApplyAllGuessesAction() {
                 //super(tr("Apply all guesses"), "applyguesses_24", "Turns all guesses into the corresponding tag values.");
-                super(tr("Apply all guesses"), null, "Turns all guesses into the corresponding tag values.");
+                super(tr("Apply all guesses"), "applyguesses_24", "Turns all guesses into the corresponding tag values.");
         }
 
@@ -61 +61 @@
                 }
         }
+
+        @Override
+        protected void updateEnabledState(AddressEditSelectionEvent event) {
+                // do nothing here
+        }
 }

applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/GuessAddressDataAction.java

@@ -30 +30 @@
 
         public GuessAddressDataAction() {
-                super(tr("Guess address data"));
+                super(tr("Guess address data"), "guessstreets_24", "Tries to guess the street name by picking the name of the closest way.");
         }