Changeset 1889 in josm

Timestamp:

2009-08-02T22:53:11+02:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3156 : Download members should always download the members
fixed #3155 : Download members should be disabled if editing a new relation

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs/relation

Files:

• ChildRelationBrowser.java (modified) (5 diffs)
• GenericRelationEditor.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java

@@ -34 +34 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.visitor.MergeVisitor;
+import org.openstreetmap.josm.gui.ExceptionDialogUtil;
 import org.openstreetmap.josm.gui.OptionPaneUtil;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
@@ -306 +307 @@
         }
 
-        protected void showLastException() {
-            String msg = lastException.getMessage();
-            if (msg == null) {
-                msg = lastException.toString();
-            }
-            OptionPaneUtil.showMessageDialog(
-                    Main.parent,
-                    msg,
-                    tr("Error"),
-                    JOptionPane.ERROR_MESSAGE
-            );
-        }
-
         protected void refreshView(Relation relation){
             for (int i=0; i < childTree.getRowCount(); i++) {
@@ -333 +321 @@
                 return;
             if (lastException != null) {
-                showLastException();
+                ExceptionDialogUtil.explainException(lastException);
                 return;
             }
@@ -476 +464 @@
         }
 
-        protected void showLastException() {
-            String msg = lastException.getMessage();
-            if (msg == null) {
-                msg = lastException.toString();
-            }
-            OptionPaneUtil.showMessageDialog(
-                    Main.parent,
-                    msg,
-                    tr("Error"),
-                    JOptionPane.ERROR_MESSAGE
-            );
-        }
-
         protected void refreshView(Relation relation){
             for (int i=0; i < childTree.getRowCount(); i++) {
@@ -503 +478 @@
                 return;
             if (lastException != null) {
-                showLastException();
+                ExceptionDialogUtil.explainException(lastException);
                 return;
             }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

@@ -65 +65 @@
 import org.openstreetmap.josm.data.osm.visitor.MergeVisitor;
 import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
+import org.openstreetmap.josm.gui.ExceptionDialogUtil;
 import org.openstreetmap.josm.gui.OptionPaneUtil;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
@@ -620 +621 @@
         // FIXME: Make it remember dialog size
         return new Dimension(700, 500);
-    }
-
-    /**
-     * Asynchronously download the members of the currently edited relation
-     * 
-     */
-    private void downloadRelationMembers() {
-        if (!memberTableModel.hasIncompleteMembers())
-            return;
-        Main.worker.submit(new DownloadTask(this));
     }
 
@@ -1273 +1264 @@
             Shortcut.registerShortcut("relationeditor:downloadincomplete", tr("Relation Editor: Download Members"),
                     KeyEvent.VK_K, Shortcut.GROUP_MNEMONIC);
-            setEnabled(true);
-        }
-
-        public void actionPerformed(ActionEvent e) {
-            downloadRelationMembers();
+            updateEnabledState();
+        }
+
+        public void actionPerformed(ActionEvent e) {
+            if (!isEnabled())
+                return;
+            Main.worker.submit(new DownloadTask(GenericRelationEditor.this));
+        }
+
+        protected void updateEnabledState() {
+            setEnabled(getRelation() != null && getRelation().id > 0);
         }
     }
@@ -1473 +1470 @@
         }
 
-        protected void showLastException() {
-            String msg = lastException.getMessage();
-            if (msg == null) {
-                msg = lastException.toString();
-            }
-            OptionPaneUtil.showMessageDialog(
-                    Main.parent,
-                    msg,
-                    tr("Error"),
-                    JOptionPane.ERROR_MESSAGE
-            );
-        }
-
         @Override
         protected void finish() {
@@ -1492 +1476 @@
             memberTableModel.updateMemberReferences(getLayer().data);
             if (lastException != null) {
-                showLastException();
+                ExceptionDialogUtil.explainException(lastException);
             }