Changeset 4864 in josm for trunk

Timestamp:

2012-01-24T12:45:14+01:00 (12 years ago)

Author:

Don-vip

Message:

see #7258 - IllegalStateException when attempting download in Changeset Management Dialog (error message has to be translated after stabilization)

Location:

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

Files:

• ChangesetCacheManager.java (modified) (1 diff)
• query/BasicChangesetQueryPanel.java (modified) (1 diff)
• query/ChangesetQueryDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java

@@ -366 +366 @@
                 return;
 
-            ChangesetQuery query = dialog.getChangesetQuery();
-            if (query == null) return;
-            ChangesetQueryTask task = new ChangesetQueryTask(ChangesetCacheManager.this, query);
-            ChangesetCacheManager.getInstance().runDownloadTask(task);
+            try {
+                ChangesetQuery query = dialog.getChangesetQuery();
+                if (query == null) return;
+                ChangesetQueryTask task = new ChangesetQueryTask(ChangesetCacheManager.this, query);
+                ChangesetCacheManager.getInstance().runDownloadTask(task);
+            } catch (IllegalStateException e) {
+                JOptionPane.showMessageDialog(ChangesetCacheManager.this, e.getMessage(), tr("Error"), JOptionPane.ERROR_MESSAGE);
+            }
         }
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java

@@ -233 +233 @@
                 query = query.forUser(im.getUserId()).beingOpen(true);
             } else
-                // anonymous -- should not happen. Message doesn't have to be translated.
+                // anonymous -- can happen with a fresh config. FIXME: Message have to be translated.
                 throw new IllegalStateException("Cannot create changeset query for open changesets of anonymous user");
         }

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java

@@ -177 +177 @@
 
         public void actionPerformed(ActionEvent arg0) {
-            switch(tpQueryPanels.getSelectedIndex()) {
-            case 0:
-                // currently, query specifications can't be invalid in the basic query panel.
-                // We select from a couple of predefined queries and there is always a query
-                // selected
-                break;
-            case 1:
-                if (getChangesetQuery() == null) {
-                    alertInvalidChangesetQuery();
-                    pnlUrlBasedQueries.startUserInput();
-                    return;
+            try {
+                switch(tpQueryPanels.getSelectedIndex()) {
+                case 0:
+                    // currently, query specifications can't be invalid in the basic query panel.
+                    // We select from a couple of predefined queries and there is always a query
+                    // selected
+                    break;
+                case 1:
+                    if (getChangesetQuery() == null) {
+                        alertInvalidChangesetQuery();
+                        pnlUrlBasedQueries.startUserInput();
+                        return;
+                    }
+                    break;
+    
+                case 2:
+                    if (getChangesetQuery() == null) {
+                        pnlAdvancedQueries.displayMessageIfInvalid();
+                        return;
+                    }
                 }
-                break;
-
-            case 2:
-                if (getChangesetQuery() == null) {
-                    pnlAdvancedQueries.displayMessageIfInvalid();
-                    return;
-                }
+                setCanceled(false);
+                setVisible(false);
+            } catch (IllegalStateException e) {
+                JOptionPane.showMessageDialog(ChangesetQueryDialog.this, e.getMessage(), tr("Error"), JOptionPane.ERROR_MESSAGE);
             }
-            setCanceled(false);
-            setVisible(false);
         }
     }