Changeset 2289 in josm

Timestamp:

Oct 15, 2009 4:45:06 AM (4 years ago)

Author:

Gubaer

Message:

fixed #3719: Upload dialog still lists closed changesets after JOSM knows they've been closed
fixed #3668: Upload dialog: comment textbox buggy
Added context sensitive help to upload dialog
Improved error handling for errors due to closing already closed changesets

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/ExceptionDialogUtil.java (modified) (2 diffs)
• gui/help/ContextSensitiveHelpAction.java (added)
• gui/io/DownloadOpenChangesetsTask.java (modified) (1 diff)
• gui/io/UploadDialog.java (modified) (11 diffs)
• tools/ExceptionUtil.java (modified) (2 diffs)

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

@@ -144 +144 @@
 
     /**
+     * Explains a {@see OsmApiException} which was thrown because of a conflict
+     * 
+     * @param e the exception
+     */
+    public static void explainConflict(OsmApiException e) {
+        JOptionPane.showMessageDialog(Main.parent, ExceptionUtil.explainConflict(e), tr("Conflict"),
+                JOptionPane.ERROR_MESSAGE);
+    }
+
+    /**
      * Explains a {@see UnknownHostException} which has caused an {@see OsmTransferException}.
      * This is most likely happening when there is an error in the API URL or when
@@ -231 +241 @@
                 return;
             }
+            if (oae.getResponseCode() == HttpURLConnection.HTTP_CONFLICT) {
+                explainConflict(oae);
+                return;
+            }
 
         }

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

@@ -70 +70 @@
                 new Runnable() {
                     public void run() {
-                        model.addOrUpdate(changesets);
+                        model.setChangesets(changesets);
                     }
                 }

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

@@ -52 +52 @@
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
 import org.openstreetmap.josm.gui.SideButton;
+import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
+import org.openstreetmap.josm.gui.help.HelpBuilder;
 import org.openstreetmap.josm.gui.tagging.TagEditorModel;
 import org.openstreetmap.josm.gui.tagging.TagEditorPanel;
@@ -64 +66 @@
  * This is a dialog for entering upload options like the parameters for
  * the upload changeset and the strategy for opening/closing a changeset.
- * 
- * 
+ *
  */
 public class UploadDialog extends JDialog {
-
 
     public static final String HISTORY_KEY = "upload.comment.history";
@@ -109 +109 @@
 
     private ChangesetSelectionPanel pnlChangesetSelection;
-
     private boolean canceled = false;
 
@@ -152 +151 @@
         southTabbedPane.setComponentAt(0, pnlChangesetSelection = new ChangesetSelectionPanel());
         southTabbedPane.setTitleAt(0, tr("Settings"));
+        southTabbedPane.setToolTipTextAt(0, tr("Decide how to upload the data and which changeset to use"));
         southTabbedPane.setTitleAt(1, tr("Tags of new changeset"));
+        southTabbedPane.setToolTipTextAt(1, tr("Apply tags to the changeset data is uploaded to"));
         southTabbedPane.addChangeListener(new TabbedPaneChangeLister());
         JPanel pnl1 = new JPanel();
@@ -191 +192 @@
                 JComponent.WHEN_IN_FOCUSED_WINDOW
         );
+
+        pnl.add(new SideButton(new ContextSensitiveHelpAction("/Help/Dialogs/UploadDialog")));
+        HelpBuilder.setHelpContext(getRootPane(),"/Help/Dialogs/UploadDialog");
         return pnl;
     }
@@ -562 +566 @@
 
     /**
-     * Listens to window closing events and processes them as cancel events
+     * Listens to window closing events and processes them as cancel events.
+     * Listens to window open events and initializes user input
      *
      */
@@ -572 +577 @@
 
         @Override
-        public void windowActivated(WindowEvent e) {
+        public void windowOpened(WindowEvent e) {
             startUserInput();
         }
@@ -621 +626 @@
             pnl.add(new JLabel(tr("Provide a brief comment for the changes you are uploading:")), GBC.eol().insets(0, 5, 10, 3));
             cmt = new HistoryComboBox();
+            cmt.setToolTipText(tr("Enter an upload comment (min. 3 characters)"));
             List<String> cmtHistory = new LinkedList<String>(Main.pref.getCollection(HISTORY_KEY, new LinkedList<String>()));
             // we have to reverse the history, because ComboBoxHistory will reverse it again
@@ -994 +1000 @@
     }
 
+    /**
+     * A combobox model for the list of open changesets
+     *
+     */
     public class OpenChangesetModel extends DefaultComboBoxModel {
         private List<Changeset> changesets;
@@ -1034 +1044 @@
         }
 
-        /**
-         * Updates the current list of open changesets with the changesets
-         * in <code>changesets</code>
-         * 
-         * @param changesets the collection of changesets. If null, removes
-         * all changesets from the current list of changesets
-         */
-        public void addOrUpdate(Collection<Changeset> changesets) {
-            if (changesets == null){
-                this.changesets.clear();
-                setSelectedItem(null);
-            }
-            for (Changeset cs: changesets) {
-                internalAddOrUpdate(cs);
+        public void setChangesets(Collection<Changeset> changesets) {
+            this.changesets.clear();
+            if (changesets != null) {
+                for (Changeset cs: changesets) {
+                    internalAddOrUpdate(cs);
+                }
             }
             fireContentsChanged(this, 0, getSize());
@@ -1055 +1057 @@
                 if (changesets.contains(getSelectedItem())) {
                     setSelectedItem(getSelectedItem());
+                } else if (!this.changesets.isEmpty()){
+                    setSelectedItem(this.changesets.get(0));
                 } else {
-                    setSelectedItem(this.changesets.get(0));
+                    setSelectedItem(null);
                 }
             } else {

trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java

@@ -10 +10 @@
 import java.net.URL;
 import java.net.UnknownHostException;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.search.SearchCompiler.ParseError;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.io.OsmApi;
@@ -95 +100 @@
                 + "dataset violates a precondition.<br>" + "The error message is:<br>" + "{0}" + "</html>", e
                 .getMessage().replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;"));
+        return msg;
+    }
+
+    /**
+     * Explains an error due to a 409 conflict
+     *
+     * @param e the exception
+     */
+    public static String explainConflict(OsmApiException e) {
+        e.printStackTrace();
+        String msg = e.getErrorHeader();
+        if (msg != null) {
+            String pattern = "The changeset (\\d+) was closed at (.*)";
+            Pattern p = Pattern.compile(pattern);
+            Matcher m = p.matcher(msg);
+            if (m.matches()) {
+                long changesetId = Long.parseLong(m.group(1));
+                // Example: Tue Oct 15 10:00:00 UTC 2009
+                DateFormat formatter = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy");
+                Date closeDate = null;
+                try {
+                    closeDate = formatter.parse(m.group(2));
+                } catch(ParseException ex) {
+                    System.err.println(tr("Failed to parse date ''{0}'' replied by server.", m.group(2)));
+                    ex.printStackTrace();
+                }
+                if (closeDate == null) {
+                    msg = tr(
+                            "<html>Closing of changeset <strong>{0}</strong> failed <br>because it has already been closed.</html>",
+                            changesetId
+                    );
+                } else {
+                    SimpleDateFormat dateFormat = new SimpleDateFormat();
+                    msg = tr(
+                            "<html>Closing of changeset <strong>{0}</strong> failed<br>"
+                            +" because it has already been closed on {1}.</html>",
+                            changesetId,
+                            dateFormat.format(closeDate)
+                    );
+                }
+                return msg;
+            }
+            msg = tr(
+                    "<html>The server reported that it has detected a conflict.<br>" +
+                    "Error message (untranslated):<br>" +
+                    "{0}",
+                    msg
+            );
+        }
+        msg = tr(
+                "<html>The server reported that it has detected a conflict.</html>"
+        );
         return msg;
     }