Changeset 1670 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

Timestamp:

15.06.2009 20:22:46 (3 years ago)

Author:

Gubaer

Message:

fixed: bug in OsmApi.getOsmApi()
cleanup: exception handling in interfacing with OSM API
new: new action for updating individual elements with the their current state on the server (including new menu item in the file menu)
new: improved user feedback in case of conflicts
new: handles 410 Gone conflicts when uploading a changeset
new: undoable command for "purging" a primitive from the current dataset (necessary if the primitive is already deleted on the server and the user wants to remove it from its local dataset)
new: undoable command for "undeleting" an already deleted primitive on the server (kind of "cloning")
new: after a full upload, checks whether there are primitives in the local dataset which might be deleted on the server.
new: data structures for history data
new: history download support in io package

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) (20 diffs)

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

@@ -36 +36 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
@@ -44 +45 @@
 import org.openstreetmap.josm.gui.dialogs.ConflictDialog;
 import org.openstreetmap.josm.io.OsmServerObjectReader;
+import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -145 +147 @@
                             String key = propertyData.getValueAt(i, 0).toString();
                             String value = propertyData.getValueAt(i, 1).toString();
-                            if (key.length() > 0 && value.length() > 0) clone.put(key, value);
+                            if (key.length() > 0 && value.length() > 0) {
+                                clone.put(key, value);
+                            }
                         }
                         refreshTables();
@@ -175 +179 @@
                 {
                     sel = new ArrayList<OsmPrimitive>(cnt);
-                    for (int i : memberTable.getSelectedRows())
+                    for (int i : memberTable.getSelectedRows()) {
                         sel.add((OsmPrimitive)memberTable.getValueAt(i, 1));
+                    }
                 }
                 else
@@ -182 +187 @@
                     cnt = memberTable.getRowCount();
                     sel = new ArrayList<OsmPrimitive>(cnt);
-                    for (int i = 0; i < cnt; ++i)
+                    for (int i = 0; i < cnt; ++i) {
                         sel.add((OsmPrimitive)memberTable.getValueAt(i, 1));
+                    }
                 }
                 Main.ds.setSelected(sel);
@@ -239 +245 @@
 
         buttonPanel.add(createButton(marktr("Add Selected"),"addselected",
-        tr("Add all currently selected objects as members"), KeyEvent.VK_D, new ActionListener() {
+                tr("Add all currently selected objects as members"), KeyEvent.VK_D, new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 addSelected();
@@ -246 +252 @@
 
         buttonPanel.add(createButton(marktr("Remove Selected"),"removeselected",
-        tr("Remove all currently selected objects from relation"), KeyEvent.VK_S, new ActionListener() {
+                tr("Remove all currently selected objects from relation"), KeyEvent.VK_S, new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 deleteSelected();
@@ -259 +265 @@
 
         buttonPanel.add(createButton(marktr("Remove"),"remove",
-        tr("Remove the member in the current table row from this relation"), KeyEvent.VK_M, new ActionListener() {
+                tr("Remove the member in the current table row from this relation"), KeyEvent.VK_M, new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 int[] rows = memberTable.getSelectedRows();
@@ -273 +279 @@
 
         buttonPanel.add(createButton(marktr("Download Members"),"downloadincomplete",
-        tr("Download all incomplete ways and nodes in relation"), KeyEvent.VK_K, new ActionListener() {
+                tr("Download all incomplete ways and nodes in relation"), KeyEvent.VK_K, new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 downloadRelationMembers();
@@ -303 +309 @@
     protected void buttonAction(ActionEvent evt) {
         String a = evt.getActionCommand();
-        if(applyChangesText.equals(a))
+        if(applyChangesText.equals(a)) {
             applyChanges();
+        }
 
         setVisible(false);
@@ -348 +355 @@
                     break;
                 } else if (m.member instanceof Relation) {
-                    if (m.member == this.relation)
+                    if (m.member == this.relation) {
                         break;
+                    }
                     m = ((Relation)m.member).lastMember();
                     depth++;
@@ -366 +374 @@
                             break;
                         } else if (m.member instanceof Relation) {
-                            if (m.member == this.relation)
+                            if (m.member == this.relation) {
                                 break;
+                            }
                             m = ((Relation)(m.member)).firstMember();
                             depth++;
@@ -374 +383 @@
                         }
                     }
-                    if (way2 != null)
+                    if (way2 != null) {
                         break;
+                    }
                 }
             }
@@ -404 +414 @@
                 }
 
-                // end of section to determine linkedness. 
+                // end of section to determine linkedness.
 
                 memberData.addRow(new Object[]{em.role, em.member, linked ? tr("yes") : tr("no")});
@@ -416 +426 @@
     private SideButton createButton(String name, String iconName, String tooltip, int mnemonic, ActionListener actionListener) {
         return
-            new SideButton(name, iconName, "relationEditor",
+        new SideButton(name, iconName, "relationEditor",
                 tooltip,
                 Shortcut.registerShortcut("relationeditor:"+iconName,
@@ -422 +432 @@
                         mnemonic,
                         Shortcut.GROUP_MNEMONIC),
-                actionListener
-            );
+                        actionListener
+        );
     }
 
@@ -483 +493 @@
         for (RelationMember rm : clone.members) {
             if (rm != null) {
-                while (m[i] != null) i++;
+                while (m[i] != null) {
+                    i++;
+                }
                 m[i++] = rm;
             }
@@ -509 +521 @@
         }
         if (download) {
-            OsmServerObjectReader reader = new OsmServerObjectReader(clone.id, OsmServerObjectReader.TYPE_REL, true);
+            OsmServerObjectReader reader = new OsmServerObjectReader(clone.id, OsmPrimitiveType.RELATION, true);
             try {
                 DataSet dataSet = reader.parseOsm();
@@ -515 +527 @@
                     final MergeVisitor visitor = new MergeVisitor(Main.main
                             .editLayer().data, dataSet);
-                    for (final OsmPrimitive osm : dataSet.allPrimitives())
+                    for (final OsmPrimitive osm : dataSet.allPrimitives()) {
                         osm.visit(visitor);
+                    }
                     visitor.fixReferences();
 
                     // copy the merged layer's data source info
-                    for (DataSource src : dataSet.dataSources)
+                    for (DataSource src : dataSet.dataSources) {
                         Main.main.editLayer().data.dataSources.add(src);
+                    }
                     Main.main.editLayer().fireDataChange();
 
@@ -530 +544 @@
                     JOptionPane.showMessageDialog(Main.parent,
                             tr("There were conflicts during import."));
-                    if (!dlg.isVisible())
+                    if (!dlg.isVisible()) {
                         dlg.action
-                                .actionPerformed(new ActionEvent(this, 0, ""));
-                }
-
-            } catch (SAXException e) {
+                        .actionPerformed(new ActionEvent(this, 0, ""));
+                    }
+                }
+            } catch(OsmTransferException e) {
                 e.printStackTrace();
-                JOptionPane.showMessageDialog(this,tr("Error parsing server response.")+": "+e.getMessage(),
-                tr("Error"), JOptionPane.ERROR_MESSAGE);
-            } catch (IOException e) {
-                e.printStackTrace();
-                JOptionPane.showMessageDialog(this,tr("Cannot connect to server.")+": "+e.getMessage(),
-                tr("Error"), JOptionPane.ERROR_MESSAGE);
+                if (e.getCause() != null) {
+                    if (e.getCause() instanceof SAXException) {
+                        JOptionPane.showMessageDialog(this,tr("Error parsing server response.")+": "+e.getCause().getMessage(),
+                                tr("Error"), JOptionPane.ERROR_MESSAGE);
+                    } else if(e.getCause() instanceof IOException) {
+                        JOptionPane.showMessageDialog(this,tr("Cannot connect to server.")+": "+e.getCause().getMessage(),
+                                tr("Error"), JOptionPane.ERROR_MESSAGE);
+                    }
+                } else {
+                    JOptionPane.showMessageDialog(this,tr("Error when communicating with server.")+": "+e.getMessage(),
+                            tr("Error"), JOptionPane.ERROR_MESSAGE);
+                }
             }
         }