Changeset 2025 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

2009-09-02T21:17:52+02:00 (15 years ago)

Author:

Gubaer

Message:

new: improved dialog for uploading/saving modified layers on exit
new: improved dialog for uploading/saving modified layers if layers are deleted
new: new progress monitor which can delegate rendering to any Swing component
more setters/getters for properties in OSM data classes (fields are @deprecated); started to update references in the code base

Location:

trunk/src/org/openstreetmap/josm/command

Files:

• ChangeCommand.java (modified) (2 diffs)
• ChangePropertyCommand.java (modified) (1 diff)
• ChangeRelationMemberRoleCommand.java (modified) (2 diffs)
• Command.java (modified) (2 diffs)
• CoordinateConflictResolveCommand.java (modified) (1 diff)
• DeleteCommand.java (modified) (5 diffs)
• DeletedStateConflictResolveCommand.java (modified) (2 diffs)
• MoveCommand.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/command/ChangeCommand.java

@@ -36 +36 @@
         super.executeCommand();
         osm.cloneFrom(newOsm);
-        osm.modified = true;
+        osm.setModified(true);
         return true;
     }
@@ -47 +47 @@
         String msg = "";
         switch(OsmPrimitiveType.from(osm)) {
-        case NODE: msg = marktr("Change node {0}"); break;
-        case WAY: msg = marktr("Change way {0}"); break;
-        case RELATION: msg = marktr("Change relation {0}"); break;
+            case NODE: msg = marktr("Change node {0}"); break;
+            case WAY: msg = marktr("Change way {0}"); break;
+            case RELATION: msg = marktr("Change relation {0}"); break;
         }
         return new DefaultMutableTreeNode(

trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java

@@ -77 +77 @@
         if (value == null) {
             for (OsmPrimitive osm : objects) {
-                osm.modified = true;
+                osm.setModified(true);
                 osm.remove(key);
             }
         } else {
             for (OsmPrimitive osm : objects) {
-                osm.modified = true;
+                osm.setModified(true);
                 osm.put(key, value);
             }

trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java

@@ -51 +51 @@
         relation.getMember(position).role = newRole;
 
-        oldModified = relation.modified;
-        relation.modified = true;
+        oldModified = relation.isModified();
+        relation.setModified(true);
         return true;
     }
@@ -58 +58 @@
     @Override public void undoCommand() {
         relation.getMember(position).role = oldRole;
-        relation.modified = oldModified;
+        relation.setModified(oldModified);
     }
 

trunk/src/org/openstreetmap/josm/command/Command.java

@@ -89 +89 @@
             e.getKey().cloneFrom(e.getValue());
         }
-        getLayer().setModified(true);
     }
 
@@ -114 +113 @@
         if (o != null)
             return o;
-        Main.debug("unable to find osm with id: " + osm.id + " hashCode: " + osm.hashCode());
+        Main.debug("unable to find osm with id: " + osm.getId() + " hashCode: " + osm.hashCode());
         for (OsmPrimitive t : cloneMap.keySet()) {
             OsmPrimitive to = cloneMap.get(t);
-            Main.debug("now: " + t.id + " hashCode: " + t.hashCode());
-            Main.debug("orig: " + to.id + " hashCode: " + to.hashCode());
+            Main.debug("now: " + t.getId() + " hashCode: " + t.hashCode());
+            Main.debug("orig: " + to.getId() + " hashCode: " + to.hashCode());
         }
         return o;

trunk/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java

@@ -45 +45 @@
         return new DefaultMutableTreeNode(
                 new JLabel(
-                        tr("Resolve conflicts in coordinates in {0}",conflict.getMy().id),
+                        tr("Resolve conflicts in coordinates in {0}",conflict.getMy().getId()),
                         ImageProvider.get("data", "object"),
                         JLabel.HORIZONTAL

trunk/src/org/openstreetmap/josm/command/DeleteCommand.java

@@ -110 +110 @@
             String msg = "";
             switch(OsmPrimitiveType.from(primitive)) {
-            case NODE: msg = "Delete node {0}"; break;
-            case WAY: msg = "Delete way {0}"; break;
-            case RELATION:msg = "Delete relation {0}"; break;
+                case NODE: msg = "Delete node {0}"; break;
+                case WAY: msg = "Delete way {0}"; break;
+                case RELATION:msg = "Delete relation {0}"; break;
             }
 
@@ -131 +131 @@
             apiname = t.getAPIName();
             switch(t) {
-            case NODE: msg = trn("Delete {0} node", "Delete {0} nodes", toDelete.size(), toDelete.size()); break;
-            case WAY: msg = trn("Delete {0} way", "Delete {0} ways", toDelete.size(), toDelete.size()); break;
-            case RELATION: msg = trn("Delete {0} relation", "Delete {0} relations", toDelete.size(), toDelete.size()); break;
+                case NODE: msg = trn("Delete {0} node", "Delete {0} nodes", toDelete.size(), toDelete.size()); break;
+                case WAY: msg = trn("Delete {0} way", "Delete {0} ways", toDelete.size(), toDelete.size()); break;
+                case RELATION: msg = trn("Delete {0} relation", "Delete {0} relations", toDelete.size(), toDelete.size()); break;
             }
         }
@@ -355 +355 @@
             }
             Way w = (Way) primitive;
-            if (w.id == 0) { // new ways with id == 0 are fine,
+            if (w.getId() == 0) { // new ways with id == 0 are fine,
                 continue; // process existing ways only
             }
@@ -363 +363 @@
             // nodes ...
             for (Node n : wnew.getNodes()) {
-                if (n.id != 0 || !primitivesToDelete.contains(n)) {
+                if (n.getId() != 0 || !primitivesToDelete.contains(n)) {
                     nodesToKeep.add(n);
                 }
@@ -426 +426 @@
         if (a != null) {
             for (OsmPrimitive osm : primitivesToDelete) {
-                if (osm instanceof Node && osm.id != 0) {
+                if (osm instanceof Node && osm.getId() != 0) {
                     Node n = (Node) osm;
                     if (!a.contains(n.getCoor())) {

trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java

@@ -45 +45 @@
         return new DefaultMutableTreeNode(
                 new JLabel(
-                        tr("Resolve conflicts in deleted state in {0}",conflict.getMy().id),
+                        tr("Resolve conflicts in deleted state in {0}",conflict.getMy().getId()),
                         ImageProvider.get("data", "object"),
                         JLabel.HORIZONTAL
@@ -62 +62 @@
 
         if (decision.equals(MergeDecisionType.KEEP_MINE)) {
-            if (conflict.getMy().deleted) {
+            if (conflict.getMy().isDeleted()) {
                 // because my was involved in a conflict it my still be referred
                 // to from a way or a relation. Fix this now.

trunk/src/org/openstreetmap/josm/command/MoveCommand.java

@@ -69 +69 @@
             OldState os = new OldState();
             os.latlon = new LatLon(n.getCoor());
-            os.modified = n.modified;
+            os.modified = n.isModified();
             oldState.add(os);
         }
@@ -93 +93 @@
         for (Node n : nodes) {
             n.setEastNorth(n.getEastNorth().add(x, y));
-            n.modified = true;
+            n.setModified(true);
         }
         return true;
@@ -103 +103 @@
             OldState os = it.next();
             n.setCoor(os.latlon);
-            n.modified = os.modified;
+            n.setModified(os.modified);
         }
     }