Ignore:
Timestamp:
2016-07-02T00:06:05+02:00 (8 years ago)
Author:
donvip
Message:

remove calls to deprecated methods

Location:
applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/actions/GetMissingDataAction.java

    r30724 r32511  
    4646
    4747            if (n == JOptionPane.YES_OPTION) {
    48                 Main.worker.submit(new DownloadSignedOsmDataTask(missingData, Main.main.getEditLayer()));
     48                Main.worker.submit(new DownloadSignedOsmDataTask(missingData, Main.getLayerManager().getEditLayer()));
    4949                return true;
    5050            }
     
    5555
    5656    public void getMissing(Map<String,TrustOsmPrimitive> trustitems, Collection<OsmPrimitive> missingData) {
    57         Collection<OsmPrimitive> presentData = Main.main.getCurrentDataSet().allPrimitives();
     57        Collection<OsmPrimitive> presentData = Main.getLayerManager().getEditDataSet().allPrimitives();
    5858        for (TrustOsmPrimitive t : trustitems.values()) {
    5959            OsmPrimitive osm = t.getOsmPrimitive();
  • applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigImporter.java

    r30724 r32511  
    4343
    4444    protected void importData(InputStream in, File associatedFile) throws IllegalDataException {
    45         if (!Main.main.hasEditLayer()) {
     45        if (Main.getLayerManager().getEditLayer() == null) {
    4646            DataSet dataSet = new DataSet();
    4747            final OsmDataLayer layer = new OsmDataLayer(dataSet, associatedFile.getName(), associatedFile);
    48             Main.main.addLayer(layer);
     48            Main.getLayerManager().addLayer(layer);
    4949        }
    5050        //        Set<OsmPrimitive> missingData = new HashSet<OsmPrimitive>();
  • applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigReader.java

    r30724 r32511  
    106106
    107107                    // search corresponding OsmPrimitive
    108                     OsmPrimitive osm = Main.main.getCurrentDataSet().getPrimitiveById(uid, t);
     108                    OsmPrimitive osm = Main.getLayerManager().getEditDataSet().getPrimitiveById(uid, t);
    109109                    if (osm == null) {
    110110                        switch (t) {
Note: See TracChangeset for help on using the changeset viewer.