Changeset 312 in josm for src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

Timestamp:

2007-08-23T15:59:32+02:00 (17 years ago)

Author:

imi

Message:

• fixed bug to allow move of one node
• removed "new shiny beta" warning
• fixed uploading data marks as modified when saved before

File:

• src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (3 diffs)

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

@@ -108 +108 @@
          */
         public boolean uploadedModified = false;
-        /**
-         * Whether the data (or pieces of the data) was loaded from disk rather than from
-         * the server directly. This affects the modified state.
-         */
-        private boolean fromDisk = false;
 
         public final LinkedList<ModifiedChangedListener> listenerModified = new LinkedList<ModifiedChangedListener>();
@@ -124 +119 @@
                 super(name);
                 this.data = data;
-                this.fromDisk = associatedFile != null;
                 this.associatedFile = associatedFile;
         }
@@ -235 +229 @@
 
                 // update the modified flag
-                if (fromDisk && processed != null && !dataAdded)
+                if (associatedFile != null && processed != null && !dataAdded)
                         return; // do nothing when uploading non-harmful changes.
 
                 // modified if server changed the data (esp. the id).
-                uploadedModified = fromDisk && processed != null && dataAdded;
+                uploadedModified = associatedFile != null && processed != null && dataAdded;
                 setModified(uploadedModified);
         }