Changeset 2471 in josm for trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java

Timestamp:

2009-11-18T18:50:38+01:00 (14 years ago)

Author:

Gubaer

Message:

fixed #3963: Synchronize does not work

File:

• trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java

@@ -10 +10 @@
 import java.util.Collection;
 import java.util.Collections;
+import java.util.logging.Logger;
 
 import javax.swing.JOptionPane;
@@ -138 +139 @@
      */
     static class UpdatePrimitivesTask extends PleaseWaitRunnable {
+        static private final Logger logger = Logger.getLogger(UpdatePrimitivesTask.class.getName());
+
         private DataSet ds;
         private boolean canceled;
@@ -144 +147 @@
         private MultiFetchServerObjectReader reader;
 
+        /**
+         * 
+         * @param toUpdate a collection of primitives to update from the server
+         */
         public UpdatePrimitivesTask(Collection<? extends OsmPrimitive> toUpdate) {
             super(tr("Update objects"), false /* don't ignore exception*/);
@@ -166 +173 @@
                 return;
             }
-            if (ds != null) {
-                Main.map.mapView.getEditLayer().mergeFrom(ds);
-                Main.map.mapView.getEditLayer().onPostDownloadFromServer();
+            if (ds != null && Main.main.getEditLayer() != null) {
+                Main.main.getEditLayer().mergeFrom(ds);
+                Main.main.getEditLayer().onPostDownloadFromServer();
             }
         }
@@ -202 +209 @@
             }
         }
+
 
         @Override