Changeset 32515 in osm for applications/editors/josm/plugins/pdfimport/src

Timestamp:

2016-07-02T00:16:12+02:00 (8 years ago)

Author:

donvip

Message:

remove calls to deprecated methods

Location:

applications/editors/josm/plugins/pdfimport/src/pdfimport

Files:

• LoadPdfDialog.java (modified) (3 diffs)
• pdfbox/operators/Invoke.java (modified) (1 diff)

applications/editors/josm/plugins/pdfimport/src/pdfimport/LoadPdfDialog.java

@@ -715 +715 @@
 
         private EastNorth getSelectedCoor() {
-                Collection<OsmPrimitive> selected = Main.main.getCurrentDataSet().getSelected();
+                Collection<OsmPrimitive> selected = Main.getLayerManager().getEditDataSet().getSelected();
 
                 if (selected.size() != 1 || !(selected.iterator().next() instanceof Node)){
@@ -1061 +1061 @@
                 this.removeLayer();
                 this.layer = _layer;
-                Main.main.addLayer(this.layer);
+                Main.getLayerManager().addLayer(this.layer);
                 Main.map.mapView.zoomTo(placement.getWorldBounds(this.data));
         }
@@ -1067 +1067 @@
         private void removeLayer() {
                 if (this.layer != null) {
-                        Main.main.removeLayer(this.layer);
+                        Main.getLayerManager().removeLayer(this.layer);
                         this.layer.data.clear(); //saves memory
                         this.layer = null;

applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/operators/Invoke.java

@@ -57 +57 @@
                 PDPage page = drawer.getPage();
                 COSName objectName = (COSName)arguments.get( 0 );
-                Map xobjects = drawer.getResources().getXObjects();
+                Map<?, ?> xobjects = drawer.getResources().getXObjects();
                 PDXObject xobject = (PDXObject)xobjects.get( objectName.getName() );
                 if( xobject instanceof PDXObjectImage )