Changeset 29854 in osm for applications/editors/josm/plugins/OsmInspectorPlugin

Timestamp:

2013-08-21T03:47:16+02:00 (11 years ago)

Author:

donvip

Message:

[josm_plugins] fix #8987 - bump min JOSM version of nearly all plugins to r6162 + code update/cleanup, fix warnings

Location:

applications/editors/josm/plugins/OsmInspectorPlugin

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/osminspector/ImportOsmInspectorBugsAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/osminspector/OSMIFeatureTracker.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/osminspector/OsmInspectorLayer.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/osminspector/OsmInspectorPlugin.java (modified) (2 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="4394"/>
+    <property name="plugin.main.version" value="6162"/>
 
     <property name="plugin.author" value="Nikhil Shirahatti"/>

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

@@ -7 +7 @@
 import java.awt.event.KeyEvent;
 
-import javax.swing.JPanel;
-import javax.swing.JProgressBar;
 import javax.swing.ProgressMonitor;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
 
 import org.openstreetmap.josm.Main;

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

@@ -16 +16 @@
         public OSMIFeatureTracker(
                         FeatureCollection<SimpleFeatureType, SimpleFeature> featuresIn) {
-                hashFeatures = new HashMap();
+                hashFeatures = new HashMap<Long, SimpleFeature>();
                 features = new MemoryFeatureCollection(featuresIn.getSchema());
 
-                for (Iterator it = features.iterator(); it.hasNext();) {
+                for (Iterator<?> it = features.iterator(); it.hasNext();) {
                         SimpleFeature element = (SimpleFeature) it.next();
                         try {
@@ -39 +39 @@
         public boolean mergeFeatures(
                         FeatureCollection<SimpleFeatureType, SimpleFeature> newFeatures) {
-                for (Iterator it = newFeatures.iterator(); it.hasNext();) {
+                for (Iterator<SimpleFeature> it = newFeatures.iterator(); it.hasNext();) {
                         SimpleFeature element = (SimpleFeature) it.next();
                         try {

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

@@ -57 +57 @@
 import org.openstreetmap.josm.plugins.osminspector.gui.OsmInspectorDialog;
 import org.openstreetmap.josm.tools.ImageProvider;
+
 import com.vividsolutions.jts.geom.Envelope;
 import com.vividsolutions.jts.geom.Geometry;
@@ -338 +339 @@
          * @throws ParseException
          */
-        @SuppressWarnings("unchecked")
         public OsmInspectorLayer(GeoFabrikWFSClient wfsClient,
                         ProgressMonitor monitor) throws NoSuchAuthorityCodeException,
@@ -403 +403 @@
          * @throws IndexOutOfBoundsException
          */
-        @SuppressWarnings("unchecked")
         public void loadFeatures(GeoFabrikWFSClient wfsClient)
                         throws NoSuchAuthorityCodeException, FactoryException, IOException,

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

@@ -45 +45 @@
         }
         
-        
-        
-        
-         /**
+        /**
      * Initialize the <code>OsmInspectorPlugin</code> object. Creates the
      * <code>OsmInspectorGUI</code> and initializes the following variables with
@@ -55 +52 @@
     private void initializePlugin() {
         System.out.println("Initialized Plugin...");
-        Shortcut shortcut = Shortcut.registerShortcut("OsmInspector", tr("Toggle: {0}", tr("Open OsmInspector")),
+        Shortcut.registerShortcut("OsmInspector", tr("Toggle: {0}", tr("Open OsmInspector")),
                 KeyEvent.VK_1, Shortcut.ALT_SHIFT);
         //String name = "Osm Inspector error reports";