Changeset 2434 in josm

Timestamp:

2009-11-10T22:05:37+01:00 (14 years ago)

Author:

Gubaer

Message:

Improved detection of modified state in OsmDataLayer.

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/DownloadReferrersAction.java (modified) (3 diffs)
• actions/downloadtasks/DownloadOsmTask.java (modified) (1 diff)
• gui/dialogs/LayerListDialog.java (modified) (2 diffs)
• gui/dialogs/relation/GenericRelationEditor.java (modified) (2 diffs)
• gui/dialogs/relation/ParentRelationLoadingTask.java (modified) (2 diffs)
• gui/layer/OsmDataLayer.java (modified) (3 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.actions;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 
 import java.awt.event.ActionEvent;
@@ -216 +216 @@
                         public void run() {
                             targetLayer.fireDataChange();
+                            targetLayer.onPostDownloadFromServer();
                             Main.map.mapView.repaint();
                         }
@@ -253 +254 @@
                     String msg = "";
                     switch(entry.getValue()) {
-                        case NODE: msg = tr("({0}/{1}) Loading parents of node {2}", i+1,children.size(), entry.getKey()); break;
-                        case WAY: msg = tr("({0}/{1}) Loading parents of way {2}", i+1,children.size(), entry.getKey()); break;
-                        case RELATION: msg = tr("({0}/{1}) Loading parents of relation {2}", i+1,children.size(), entry.getKey()); break;
+                    case NODE: msg = tr("({0}/{1}) Loading parents of node {2}", i+1,children.size(), entry.getKey()); break;
+                    case WAY: msg = tr("({0}/{1}) Loading parents of way {2}", i+1,children.size(), entry.getKey()); break;
+                    case RELATION: msg = tr("({0}/{1}) Loading parents of relation {2}", i+1,children.size(), entry.getKey()); break;
                     }
                     progressMonitor.subTask(msg);

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

@@ -157 +157 @@
                 }
                 target.mergeFrom(dataSet);
+                target.onPostDownloadFromServer();
             }
         }

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

@@ -305 +305 @@
                 }
                 OsmDataLayer odl = (OsmDataLayer)l;
-                if (odl.requiresSaveToFile() || odl.requiresUploadToServer()) {
+                if ((odl.requiresSaveToFile() || odl.requiresUploadToServer()) && odl.data.isModified()) {
                     layersWithUnmodifiedChanges.add(odl);
                 }
@@ -314 +314 @@
                 dialog.setVisible(true);
                 switch(dialog.getUserAction()) {
-                    case CANCEL: return false;
-                    case PROCEED: return true;
-                    default: return false;
+                case CANCEL: return false;
+                case PROCEED: return true;
+                default: return false;
                 }
             }

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

@@ -56 +56 @@
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.DataSetMerger;
 import org.openstreetmap.josm.data.osm.DataSource;
-import org.openstreetmap.josm.data.osm.DataSetMerger;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -1468 +1468 @@
                         public void run() {
                             curLayer.fireDataChange();
+                            curLayer.onPostDownloadFromServer();
                         }
                     });

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

@@ -13 +13 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.DataSetMerger;
 import org.openstreetmap.josm.data.osm.DataSource;
-import org.openstreetmap.josm.data.osm.DataSetMerger;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
@@ -179 +179 @@
                             public void run() {
                                 getLayer().fireDataChange();
+                                getLayer().onPostDownloadFromServer();
                             }
                         }

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -49 +49 @@
 import org.openstreetmap.josm.data.osm.BackreferencedDataSet;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.DataSetMerger;
 import org.openstreetmap.josm.data.osm.DataSource;
-import org.openstreetmap.josm.data.osm.DataSetMerger;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -484 +484 @@
 
     /**
-     * @return The number of not-deleted primitives in the list.
+     * @return The number of not-deleted and visible primitives in the list.
      */
     private int undeletedSize(final Collection<? extends OsmPrimitive> list) {
         int size = 0;
         for (final OsmPrimitive osm : list)
-            if (!osm.isDeleted()) {
+            if (!osm.isDeleted() && osm.isVisible()) {
                 size++;
             }
@@ -692 +692 @@
     }
 
+    public void onPostDownloadFromServer() {
+        setRequiresSaveToFile(true);
+        setRequiresUploadToServer(data.isModified());
+    }
+
     /**
      * Initializes the layer after a successful save of OSM data to a file