Changeset 1682 in josm for trunk/src

Timestamp:

2009-06-20T09:31:00+02:00 (16 years ago)

Author:

Gubaer

Message:

removed old conflict resolution code
fixed bug in OsmApi (missing changeset initialization)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/downloadtasks/DownloadOsmTaskList.java (modified) (3 diffs)
• command/ConflictResolveCommand.java (deleted)
• data/conflict (deleted)
• gui/ConflictResolver.java (deleted)
• gui/dialogs/ConflictDialog.java (modified) (4 diffs)
• io/OsmApi.java (modified) (1 diff)
• io/OsmServerWriter.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java

@@ -21 +21 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.gui.download.DownloadDialog.DownloadTask;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -136 +135 @@
                 +  "There are {0} primitives in your local dataset which<br>"
                 + "might be deleted on the server. If you later try to delete or<br>"
-                + "update them on the server the server is likely to report a<br>"
+                + "update them the server is likely to report a<br>"
                 + "conflict.<br>"
                 + "<br>"
@@ -177 +176 @@
     }
 
-
     public Set<Long> getDownloadedIds() {
         HashSet<Long> ret = new HashSet<Long>();

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

@@ -29 +29 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.command.ConflictResolveCommand;
 import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -39 +38 @@
 import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
-import org.openstreetmap.josm.gui.ConflictResolver;
-import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.NavigatableComponent;
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
@@ -109 +106 @@
 
     private final void resolve() {
-        String method = Main.pref.get("conflict.resolution", "extended");
-        method = method.trim().toLowerCase();
-        if (method.equals("traditional")) {
-            resolveTraditional();
-        } else if (method.equals("extended")) {
-            resolveExtended();
-        } else {
-            System.out.println(tr("WARNING: unexpected value for preference conflict.resolution, got " + method));
-            resolveTraditional();
-        }
-    }
-
-
-    private final void resolveExtended() {
         if(model.size() == 1) {
             displaylist.setSelectedIndex(0);
@@ -139 +122 @@
         dialog.getConflictResolver().populate(my, their);
         dialog.setVisible(true);
-        Main.map.mapView.repaint();
-    }
-
-
-    private final void resolveTraditional() {
-        if(model.size() == 1) {
-            displaylist.setSelectedIndex(0);
-        }
-
-        if (displaylist.getSelectedIndex() == -1)
-            return;
-        Map<OsmPrimitive, OsmPrimitive> sel = new HashMap<OsmPrimitive, OsmPrimitive>();
-        for (int i : displaylist.getSelectedIndices()) {
-            OsmPrimitive s = (OsmPrimitive)model.get(i);
-            sel.put(s, conflicts.get(s));
-        }
-        ConflictResolver resolver = new ConflictResolver(sel);
-        int answer = new ExtendedDialog(Main.parent,
-                tr("Resolve Conflicts"),
-                resolver,
-                new String[] { tr("Solve Conflict"), tr("Cancel") },
-                new String[] { "dialogs/conflict.png", "cancel.png"}
-        ).getValue();
-
-        if (answer != 1)
-            return;
-        Main.main.undoRedo.add(new ConflictResolveCommand(resolver.conflicts, sel));
         Main.map.mapView.repaint();
     }

trunk/src/org/openstreetmap/josm/io/OsmApi.java

@@ -307 +307 @@
      * @return list of processed primitives
      * @throws OsmTransferException if something is wrong
-     * @throws OsmTransferCancelledException  if the upload was cancelled by the user
      */
     public Collection<OsmPrimitive> uploadDiff(final Collection<OsmPrimitive> list) throws OsmTransferException {

trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java

@@ -84 +84 @@
         processed = new LinkedList<OsmPrimitive>();
 
-        // initialize API. Abort upload in case of configuration or network
-        // errors
-        //
-        try {
-            api.initialize();
-        } catch(Exception e) {
-            throw new OsmApiInitializationException(e);
-        }
+        api.initialize();
 
         Main.pleaseWaitDlg.progress.setMaximum(primitives.size());
@@ -125 +118 @@
             // upload changes individually (90% of code is for the status display...)
             //
+            api.createChangeset(getChangesetComment());
             NameVisitor v = new NameVisitor();
             uploadStartTime = System.currentTimeMillis();
@@ -139 +133 @@
                 Main.pleaseWaitDlg.progress.setValue(progress+1);
             }
+            api.stopChangeset();
         }
     }