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

Timestamp:

2009-11-08T19:55:39+01:00 (16 years ago)

Author:

Gubaer

Message:

Removed methods made @deprecated in r2411.

Location:

trunk/src/org/openstreetmap/josm/command

Files:

• DeleteCommand.java (modified) (5 diffs)
• PurgePrimitivesCommand.java (modified) (1 diff)

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

@@ -55 +55 @@
      */
     public DeleteCommand(Collection<? extends OsmPrimitive> data) throws IllegalArgumentException {
-        if (data == null) 
+        if (data == null)
             throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be empty"));
         if (data.isEmpty())
-            throw new IllegalArgumentException(tr("At least one object to delete requird, got empty collection"));            
+            throw new IllegalArgumentException(tr("At least one object to delete requird, got empty collection"));
         this.toDelete = data;
     }
@@ -101 +101 @@
     public DeleteCommand(OsmDataLayer layer, Collection<? extends OsmPrimitive> data) throws IllegalArgumentException{
         super(layer);
-        if (data == null) 
+        if (data == null)
             throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be empty"));
         if (data.isEmpty())
-            throw new IllegalArgumentException(tr("At least one object to delete requird, got empty collection"));            
+            throw new IllegalArgumentException(tr("At least one object to delete requird, got empty collection"));
         this.toDelete = data;
     }
@@ -160 +160 @@
             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;
             }
 
@@ -181 +181 @@
             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;
             }
         }
@@ -316 +316 @@
             return null;
 
-        BackreferencedDataSet backreferences = new BackreferencedDataSet(layer.data);
-        backreferences.build();
-
+        BackreferencedDataSet backreferences = new BackreferencedDataSet();
         Set<OsmPrimitive> primitivesToDelete = new HashSet<OsmPrimitive>(selection);
         Collection<Way> waysToBeChanged = new HashSet<Way>();

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

@@ -178 +178 @@
     public boolean executeCommand() {
         if (backreferenceDataSet == null) {
-            backreferenceDataSet = new BackreferencedDataSet(getLayer().data);
-            backreferenceDataSet.build();
+            backreferenceDataSet = new BackreferencedDataSet();
         }
         HashSet<OsmPrimitive> hive = new HashSet<OsmPrimitive>();