Changeset 2480 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2009-11-19T13:30:09+01:00 (17 years ago)

Author:

Gubaer

Message:

fixed #3937: Closed changeset (due to timeout) remains in the upload dialog

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• ExceptionDialogUtil.java (modified) (3 diffs)
• io/UploadDialog.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java

@@ -14 +14 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.io.ChangesetClosedException;
 import org.openstreetmap.josm.io.OsmApiException;
 import org.openstreetmap.josm.io.OsmApiInitializationException;
-import org.openstreetmap.josm.io.OsmChangesetCloseException;
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.tools.BugReportExceptionHandler;
@@ -49 +49 @@
 
     /**
-     * handles an exception caught during OSM API initialization
+     * handles a ChangesetClosedException
      *
      * @param e the exception
      */
-    public static void explainOsmChangesetCloseException(OsmChangesetCloseException e) {
-        HelpAwareOptionPane.showOptionDialog(
-                Main.parent,
-                ExceptionUtil.explainOsmChangesetCloseException(e),
+    public static void explainChangesetClosedException(ChangesetClosedException e) {
+        HelpAwareOptionPane.showOptionDialog(
+                Main.parent,
+                ExceptionUtil.explainChangesetClosedException(e),
                 tr("Error"),
                 JOptionPane.ERROR_MESSAGE,
-                ht("/ErrorMessages#OsmChangesetCloseException")
+                ht("/ErrorMessages#ChangesetClosedException")
         );
     }
@@ -294 +294 @@
             return;
         }
-        if (e instanceof OsmChangesetCloseException) {
-            explainOsmChangesetCloseException((OsmChangesetCloseException) e);
+
+        if (e instanceof ChangesetClosedException) {
+            explainChangesetClosedException((ChangesetClosedException)e);
             return;
         }

trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

@@ -334 +334 @@
     public void setOrUpdateChangeset(Changeset cs) {
         pnlChangesetSelection.setOrUpdateChangeset(cs);
+    }
+
+    /**
+     * Removes <code>cs</code> from the list of open changesets in the upload
+     * dialog
+     * 
+     * @param cs the changeset. Ignored if null.
+     */
+    public void removeChangeset(Changeset cs) {
+        if (cs == null) return;
+        pnlChangesetSelection.removeChangeset(cs);
     }
 
@@ -842 +853 @@
         public void setOrUpdateChangeset(Changeset cs) {
             if (cs == null) {
-                tagEditorPanel.getModel().clear();
-                tagEditorPanel.getModel().add("created_by", getDefaultCreatedBy());
+                cs = new Changeset();
+                cs.put("created_by", getDefaultCreatedBy());
+                tagEditorPanel.getModel().initFromPrimitive(cs);
                 tagEditorPanel.getModel().appendNewTag();
+                prepareDialogForNextUpload(cs);
             } else if (cs.getId() == 0) {
                 if (cs.get("created_by") == null) {
@@ -851 +864 @@
                 tagEditorPanel.getModel().initFromPrimitive(cs);
                 tagEditorPanel.getModel().appendNewTag();
+                prepareDialogForNextUpload(cs);
             } else if (cs.getId() > 0 && cs.isOpen()){
                 if (cs.get("created_by") == null) {
@@ -859 +873 @@
                 cs = model.getChangesetById(cs.getId());
                 cbOpenChangesets.setSelectedItem(cs);
+                prepareDialogForNextUpload(cs);
             } else if (cs.getId() > 0 && !cs.isOpen()){
+                removeChangeset(cs);
+            }
+        }
+
+        /**
+         * Remove a changeset from the list of open changeset
+         * 
+         * @param cs the changeset to be removed. Ignored if null.
+         */
+        public void removeChangeset(Changeset cs) {
+            if (cs ==  null) return;
+            Changeset selected = (Changeset)model.getSelectedItem();
+            model.removeChangeset(cs);
+            if (model.getSize() == 0 || selected == cs) {
+                // no more changesets or removed changeset is the currently selected
+                // changeset? Switch to using a new changeset.
+                //
+                rbUseNew.setSelected(true);
+                model.setSelectedItem(null);
+                southTabbedPane.setTitleAt(1, tr("Tags of new changeset"));
+
+                cs = new Changeset();
                 if (cs.get("created_by") == null) {
                     cs.put("created_by", getDefaultCreatedBy());
+                    cs.put("comment", getUploadComment());
                 }
                 tagEditorPanel.getModel().initFromPrimitive(cs);
-                model.removeChangeset(cs);
-                if (model.getSize() == 0) {
-                    rbUseNew.setSelected(true);
-                    model.setSelectedItem(null);
-                    southTabbedPane.setTitleAt(1, tr("Tags of new changeset"));
-                }
             }
             prepareDialogForNextUpload(cs);