Changeset 32511 in osm for applications/editors/josm

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:

• actions/GetMissingDataAction.java (modified) (2 diffs)
• io/SigImporter.java (modified) (1 diff)
• io/SigReader.java (modified) (1 diff)

applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/actions/GetMissingDataAction.java

@@ -46 +46 @@
 
             if (n == JOptionPane.YES_OPTION) {
-                Main.worker.submit(new DownloadSignedOsmDataTask(missingData, Main.main.getEditLayer()));
+                Main.worker.submit(new DownloadSignedOsmDataTask(missingData, Main.getLayerManager().getEditLayer()));
                 return true;
             }
@@ -55 +55 @@
 
     public void getMissing(Map<String,TrustOsmPrimitive> trustitems, Collection<OsmPrimitive> missingData) {
-        Collection<OsmPrimitive> presentData = Main.main.getCurrentDataSet().allPrimitives();
+        Collection<OsmPrimitive> presentData = Main.getLayerManager().getEditDataSet().allPrimitives();
         for (TrustOsmPrimitive t : trustitems.values()) {
             OsmPrimitive osm = t.getOsmPrimitive();

applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigImporter.java

@@ -43 +43 @@
 
     protected void importData(InputStream in, File associatedFile) throws IllegalDataException {
-        if (!Main.main.hasEditLayer()) {
+        if (Main.getLayerManager().getEditLayer() == null) {
             DataSet dataSet = new DataSet();
             final OsmDataLayer layer = new OsmDataLayer(dataSet, associatedFile.getName(), associatedFile);
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
         }
         //        Set<OsmPrimitive> missingData = new HashSet<OsmPrimitive>();

applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigReader.java

@@ -106 +106 @@
 
                     // search corresponding OsmPrimitive
-                    OsmPrimitive osm = Main.main.getCurrentDataSet().getPrimitiveById(uid, t);
+                    OsmPrimitive osm = Main.getLayerManager().getEditDataSet().getPrimitiveById(uid, t);
                     if (osm == null) {
                         switch (t) {