Changeset 2414 in josm for trunk


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
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java

    r2341 r2414  
    7575    /**
    7676     * Find which node to merge into (i.e. which one will be left)
    77      * The last selected node will become the target node the remaining 
     77     * The last selected node will become the target node the remaining
    7878     * nodes are merged to.
    79      *  
     79     *
    8080     * @param candidates the collection of candidate nodes
    8181     * @return the selected target node
    … …  
    109109            return null;
    110110        nodes.remove(null); // just in case
    111         BackreferencedDataSet backreferences = new BackreferencedDataSet(layer.data);
    112         backreferences.build();
     111        BackreferencedDataSet backreferences = new BackreferencedDataSet();
    113112        return mergeNodes(layer,backreferences, nodes, targetNode);
    114113    }
    … …  
    207206            return null;
    208207        if (backreferences == null) {
    209             backreferences = new BackreferencedDataSet(layer.data);
    210             backreferences.build();
     208            backreferences = new BackreferencedDataSet();
    211209        }
    212210

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

    r2343 r2414  
    1010
    1111import org.openstreetmap.josm.Main;
    12 import org.openstreetmap.josm.actions.DownloadAction;
    1312import org.openstreetmap.josm.data.Bounds;
    1413import org.openstreetmap.josm.data.coor.LatLon;
    … …  
    4544
    4645    public Future<?> download(boolean newLayer, Bounds downloadArea, ProgressMonitor progressMonitor) {
    47        
     46
    4847        downloadTask = new DownloadTask(newLayer,
    4948                new BoundingBoxDownloader(downloadArea), progressMonitor);

  • 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>();

  • trunk/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java

    r2411 r2414  
    8585
    8686    /**
    87      * Creates a new backreference data set based on the dataset <code>source</code>.
    88      *
    89      * @param source the source. Ignored
    90      */
    91     public BackreferencedDataSet(DataSet source) {
    92 
    93     }
    94 
    95     /**
    96      * @deprecated It's not necessary to call this method, OsmPrimitive.getReferres() is used to get list of referrers
    97      */
    98     @Deprecated
    99     public void build() {
    100 
    101     }
    102 
    103     /**
    10487     * Replies the set of parent primitives for a given child primitive. Replies
    10588     * an empty set if no parents refer to the child.

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

    r2396 r2414  
    391391     */
    392392    protected PurgePrimitivesCommand buildPurgeCommand() {
    393         BackreferencedDataSet ds = new BackreferencedDataSet(data);
    394         ds.build();
     393        BackreferencedDataSet ds = new BackreferencedDataSet();
    395394        ArrayList<OsmPrimitive> toPurge = new ArrayList<OsmPrimitive>();
    396395        conflictLoop: for (Conflict<?> c: conflicts) {
Note: See TracChangeset for help on using the changeset viewer.