Changeset 33793 in osm for applications

Timestamp:

2017-11-06T23:07:30+01:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 12881

Location:

applications/editors/josm/plugins/OsmInspectorPlugin

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/osminspector/GeoFabrikWFSClient.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/osminspector/ImportOsmInspectorBugsAction.java (modified) (5 diffs)
• src/org/openstreetmap/josm/plugins/osminspector/OsmInspectorLayer.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/osminspector/OsmInspectorPlugin.java (modified) (8 diffs)
• src/org/openstreetmap/josm/plugins/osminspector/gui/OsmInspectorBugInfoDialog.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/osminspector/gui/OsmInspectorDialog.java (modified) (10 diffs)

applications/editors/josm/plugins/OsmInspectorPlugin/build.xml

@@ -5 +5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="10580"/>
+    <property name="plugin.main.version" value="12881"/>
 
     <property name="plugin.author" value="Nikhil Shirahatti"/>

applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/GeoFabrikWFSClient.java

@@ -24 +24 @@
 import org.opengis.referencing.NoSuchAuthorityCodeException;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.tools.Logging;
 
 public class GeoFabrikWFSClient {
@@ -51 +52 @@
                 FeatureSource<SimpleFeatureType, SimpleFeature> source = data
                                 .getFeatureSource(typeName);
-                Main.info("Source Metadata Bounds:" + source.getBounds());
-                Main.info("Source schema: " + source.getSchema());
+                Logging.info("Source Metadata Bounds:" + source.getBounds());
+                Logging.info("Source schema: " + source.getSchema());
 
                 progressMonitor.setProgress(40);
@@ -61 +62 @@
                 CoordinateReferenceSystem targetCRS = CRS.decode("EPSG:4236");
 
-                Bounds bounds = Main.map.mapView.getLatLonBounds(Main.map.mapView
-                                .getBounds());
+                Bounds bounds = MainApplication.getMap().mapView.getLatLonBounds(
+                        MainApplication.getMap().mapView.getBounds());
 
                 LatLon minLL = bounds.getMin();
@@ -73 +74 @@
                 ReferencedEnvelope bboxRef = new ReferencedEnvelope(minLon, maxLon,
                                 minLat, maxLat, targetCRS);
-                Main.info("Reference Bounds:" + bboxRef);
+                Logging.info("Reference Bounds:" + bboxRef);
 
                 progressMonitor.setProgress(50);

applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/ImportOsmInspectorBugsAction.java

@@ -12 +12 @@
 
 import org.opengis.referencing.FactoryException;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -38 +40 @@
         public void actionPerformed(ActionEvent event) {
                 if (isEnabled()) {
-                        ProgressMonitor monitor = new ProgressMonitor(Main.map.mapView,
+                    MapView mapView = MainApplication.getMap().mapView;
+                        ProgressMonitor monitor = new ProgressMonitor(mapView,
                                         "Querying WFS Geofabrik", "Dowloading features", 0, 100);
 
                         try {
-                                Bounds bounds = Main.map.mapView
-                                                .getLatLonBounds(Main.map.mapView.getBounds());
+                                Bounds bounds = mapView.getLatLonBounds(mapView.getBounds());
 
-                                Main.info("OSMI View bounds" + bounds);
+                                Logging.info("OSMI View bounds" + bounds);
 
                                 monitor.setProgress(10);
@@ -54 +56 @@
                                         wfs.initializeDataStore();
                                         inspector = new OsmInspectorLayer(wfs, monitor);
-                                        Main.getLayerManager().addLayer(inspector);
+                                        MainApplication.getLayerManager().addLayer(inspector);
                                         plugin.setLayer(inspector);
                                 } else {
@@ -63 +65 @@
                                 }
                         } catch (IOException | IndexOutOfBoundsException | NoSuchElementException | FactoryException | ParseException e) {
-                                Main.error(e);
+                                Logging.error(e);
                         } finally {
                                 monitor.close();
@@ -71 +73 @@
                         }
                 } else {
-                    Main.warn("Osm Inspector Action not enabled");
+                    Logging.warn("Osm Inspector Action not enabled");
                 }
         }

applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/OsmInspectorLayer.java

@@ -151 +151 @@
          * 
          */
-        public class BugInfo implements Comparable<BugInfo>{
+        public static class BugInfo implements Comparable<BugInfo>{
 
                 public Geometry getGeom() {
@@ -255 +255 @@
          * 
          */
-        public class BugIndex {
+        public static class BugIndex {
                 private int nextIndex;
                 private int previousIndex;

applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/OsmInspectorPlugin.java

@@ -9 +9 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent;
-import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
-import org.openstreetmap.josm.gui.JosmUserIdentityManager;
+import org.openstreetmap.josm.data.UserIdentityManager;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.NavigatableComponent;
@@ -19 +18 @@
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
+import org.openstreetmap.josm.spi.preferences.PreferenceChangeEvent;
+import org.openstreetmap.josm.spi.preferences.PreferenceChangedListener;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -26 +27 @@
 
         /** The JOSM user identity manager, it is used for obtaining the user name */
-    private final JosmUserIdentityManager userIdentityManager;
+    private final UserIdentityManager userIdentityManager;
    
 
@@ -36 +37 @@
         public OsmInspectorPlugin(PluginInformation info) {
                 super(info);
-                userIdentityManager = JosmUserIdentityManager.getInstance();
+                userIdentityManager = UserIdentityManager.getInstance();
                 initializePlugin();
         }
@@ -53 +54 @@
         /* add default values for static variables */
         Main.pref.put("osmInspector.nickname", "osmi");
-        Main.pref.put("osmInspector.showBugs", true);
+        Main.pref.putBoolean("osmInspector.showBugs", true);
         Main.pref.put("osmInspector.version", getPluginInformation().version);
         Main.pref.put("osmInspector.localVersion",getPluginInformation().localversion);
@@ -60 +61 @@
         @Override
         public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
-                Main.toolbar.register( new ImportOsmInspectorBugsAction( this ) );
+                MainApplication.getToolbar().register( new ImportOsmInspectorBugsAction( this ) );
                 if (newFrame == null) {
             /* if new MapFrame is null, remove listener */
@@ -66 +67 @@
         } else {
             /* add MapDust dialog window */
-            if (Main.map != null && Main.map.mapView != null) {
+            if (MainApplication.getMap() != null && MainApplication.getMap().mapView != null) {
                 /* add MapdustGUI */
-                Main.map.setBounds(newFrame.getBounds());
+                MainApplication.getMap().setBounds(newFrame.getBounds());
                 
                 /* add Listeners */
                 NavigatableComponent.addZoomChangeListener(this);
-                Main.map.mapView.addMouseListener(this);
+                MainApplication.getMap().mapView.addMouseListener(this);
                 Main.pref.addPreferenceChangeListener(this);
                 /* put username to preferences */
                 Main.pref.put("osmInspector.josmUserName",
                         userIdentityManager.getUserName());
-                Main.toolbar.control.add( new ImportOsmInspectorBugsAction( this ) );
+                MainApplication.getToolbar().control.add( new ImportOsmInspectorBugsAction( this ) );
             }
         }
@@ -91 +92 @@
         //  Delegate feature selection to layer
         //
-        public void mouseClicked(MouseEvent arg0) {
+        public void mouseClicked(MouseEvent e) {
             if (inspectorLayer != null) {
-                inspectorLayer.selectFeatures(arg0.getX(), arg0.getY());
+                inspectorLayer.selectFeatures(e.getX(), e.getY());
             }
         }
 
         @Override
-        public void mouseEntered(MouseEvent arg0) {
+        public void mouseEntered(MouseEvent e) {
                 
         }
 
         @Override
-        public void mouseExited(MouseEvent arg0) {
+        public void mouseExited(MouseEvent e) {
                 
         }
 
         @Override
-        public void mousePressed(MouseEvent arg0) {
+        public void mousePressed(MouseEvent e) {
                 
         }
 
         @Override
-        public void mouseReleased(MouseEvent arg0) {
+        public void mouseReleased(MouseEvent e) {
                 
         }

applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/gui/OsmInspectorBugInfoDialog.java

@@ -8 +8 @@
 import javax.swing.JTextPane;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
@@ -23 +23 @@
          */
         protected void buildContentPanel() {
-                Main.map.addToggleDialog(this, true);
+                MainApplication.getMap().addToggleDialog(this, true);
                 
                 bugTextArea = new JTextPane();

applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/gui/OsmInspectorDialog.java

@@ -17 +17 @@
 import javax.swing.event.ListSelectionListener;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
@@ -54 +54 @@
          */
         protected void buildContentPanel() {
-                Main.map.addToggleDialog(this, true);
+                MainApplication.getMap().addToggleDialog(this, true);
 
                 model = new DefaultListModel<>();
@@ -77 +77 @@
                                 Point centroid = geom.getCentroid();
                                 LatLon center = new LatLon(centroid.getY(), centroid.getX());
-                                Main.map.mapView.zoomTo(center);
+                                MainApplication.getMap().mapView.zoomTo(center);
                                 layer.selectFeatures(center);
                                 bugInfoDialog.setBugDescription(next);
@@ -88 +88 @@
                                 actNext = new OsmInspectorNextAction(layer));
                 nextButton.createArrow(new ActionListener() {
+                    @Override
                         public void actionPerformed(ActionEvent e) {
                                 int index = bugsList.getSelectedIndex();
@@ -93 +94 @@
                                 Point centroid = geom.getCentroid();
                                 LatLon center = new LatLon(centroid.getY(), centroid.getX());
-                                Main.map.mapView.zoomTo(center);
+                                MainApplication.getMap().mapView.zoomTo(center);
                                 layer.selectFeatures(center);
                         }
@@ -102 +103 @@
                                 actPrev = new OsmInspectorPrevAction(layer));
                 prevButton.createArrow(new ActionListener() {
+            @Override
                         public void actionPerformed(ActionEvent e) {
                         }
@@ -112 +114 @@
                 Shortcut sprev = Shortcut.registerShortcut("osmi:prev", tr("Prev OSMI bug"),
                                 KeyEvent.VK_J, Shortcut.CTRL_SHIFT);
-                Main.registerActionShortcut(actPrev, sprev);
+                MainApplication.registerActionShortcut(actPrev, sprev);
 
                 Shortcut snext = Shortcut.registerShortcut("osmi:next", tr("Next OSMI bug"),
                                 KeyEvent.VK_K, Shortcut.CTRL_SHIFT);
-                Main.registerActionShortcut(actNext, snext);
+                MainApplication.registerActionShortcut(actNext, snext);
         }
 
@@ -177 +179 @@
                         Point centroid = geom.getCentroid();
                         LatLon center = new LatLon(centroid.getY(), centroid.getX());
-                        Main.map.mapView.zoomTo(center);
+                        MainApplication.getMap().mapView.zoomTo(center);
                         inspectlayer.selectFeatures(center);
                         bugInfoDialog.setBugDescription(next);
@@ -207 +209 @@
                         Point centroid = geom.getCentroid();
                         LatLon center = new LatLon(centroid.getY(), centroid.getX());
-                        Main.map.mapView.zoomTo(center);
+                        MainApplication.getMap().mapView.zoomTo(center);
                         inspectlayer.selectFeatures(center);
                         bugInfoDialog.setBugDescription(prev);
@@ -216 +218 @@
         @Override
         public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
-            Layer newLayer = Main.getLayerManager().getActiveLayer();
+            Layer newLayer = MainApplication.getLayerManager().getActiveLayer();
                 if (newLayer instanceof OsmInspectorLayer) {
                         this.layer = (OsmInspectorLayer) newLayer;