Ignore:
Timestamp:
2009-11-08T19:55:39+01:00 (14 years ago)
Author:
Gubaer
Message:

Removed methods made @deprecated in r2411.

Location:
trunk/src/org/openstreetmap/josm/command
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/command/DeleteCommand.java

    r2333 r2414  
    5555     */
    5656    public DeleteCommand(Collection<? extends OsmPrimitive> data) throws IllegalArgumentException {
    57         if (data == null) 
     57        if (data == null)
    5858            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be empty"));
    5959        if (data.isEmpty())
    60             throw new IllegalArgumentException(tr("At least one object to delete requird, got empty collection"));           
     60            throw new IllegalArgumentException(tr("At least one object to delete requird, got empty collection"));
    6161        this.toDelete = data;
    6262    }
     
    101101    public DeleteCommand(OsmDataLayer layer, Collection<? extends OsmPrimitive> data) throws IllegalArgumentException{
    102102        super(layer);
    103         if (data == null) 
     103        if (data == null)
    104104            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be empty"));
    105105        if (data.isEmpty())
    106             throw new IllegalArgumentException(tr("At least one object to delete requird, got empty collection"));           
     106            throw new IllegalArgumentException(tr("At least one object to delete requird, got empty collection"));
    107107        this.toDelete = data;
    108108    }
     
    160160            String msg = "";
    161161            switch(OsmPrimitiveType.from(primitive)) {
    162                 case NODE: msg = "Delete node {0}"; break;
    163                 case WAY: msg = "Delete way {0}"; break;
    164                 case RELATION:msg = "Delete relation {0}"; break;
     162            case NODE: msg = "Delete node {0}"; break;
     163            case WAY: msg = "Delete way {0}"; break;
     164            case RELATION:msg = "Delete relation {0}"; break;
    165165            }
    166166
     
    181181            apiname = t.getAPIName();
    182182            switch(t) {
    183                 case NODE: msg = trn("Delete {0} node", "Delete {0} nodes", toDelete.size(), toDelete.size()); break;
    184                 case WAY: msg = trn("Delete {0} way", "Delete {0} ways", toDelete.size(), toDelete.size()); break;
    185                 case RELATION: msg = trn("Delete {0} relation", "Delete {0} relations", toDelete.size(), toDelete.size()); break;
     183            case NODE: msg = trn("Delete {0} node", "Delete {0} nodes", toDelete.size(), toDelete.size()); break;
     184            case WAY: msg = trn("Delete {0} way", "Delete {0} ways", toDelete.size(), toDelete.size()); break;
     185            case RELATION: msg = trn("Delete {0} relation", "Delete {0} relations", toDelete.size(), toDelete.size()); break;
    186186            }
    187187        }
     
    316316            return null;
    317317
    318         BackreferencedDataSet backreferences = new BackreferencedDataSet(layer.data);
    319         backreferences.build();
    320 
     318        BackreferencedDataSet backreferences = new BackreferencedDataSet();
    321319        Set<OsmPrimitive> primitivesToDelete = new HashSet<OsmPrimitive>(selection);
    322320        Collection<Way> waysToBeChanged = new HashSet<Way>();
  • trunk/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java

    r2198 r2414  
    178178    public boolean executeCommand() {
    179179        if (backreferenceDataSet == null) {
    180             backreferenceDataSet = new BackreferencedDataSet(getLayer().data);
    181             backreferenceDataSet.build();
     180            backreferenceDataSet = new BackreferencedDataSet();
    182181        }
    183182        HashSet<OsmPrimitive> hive = new HashSet<OsmPrimitive>();
Note: See TracChangeset for help on using the changeset viewer.