Changeset 30815 in osm for applications

Timestamp:

2014-11-26T01:40:41+01:00 (10 years ago)

Author:

donvip

Message:

[josm_osminspector] code cleanup

Location:

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

Files:

• GeoFabrikWFSClient.java (modified) (3 diffs)
• ImportOsmInspectorBugsAction.java (modified) (2 diffs)
• OsmInspectorLayer.java (modified) (5 diffs)
• OsmInspectorPlugin.java (modified) (5 diffs)
• gui/OsmInspectorBugInfoDialog.java (modified) (5 diffs)
• gui/OsmInspectorDialog.java (modified) (4 diffs)

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

@@ -51 +51 @@
                 FeatureSource<SimpleFeatureType, SimpleFeature> source = data
                                 .getFeatureSource(typeName);
-                System.out.println("Source Metadata Bounds:" + source.getBounds());
-                System.out.println("Source schema: " + source.getSchema());
+                Main.info("Source Metadata Bounds:" + source.getBounds());
+                Main.info("Source schema: " + source.getSchema());
 
                 progressMonitor.setProgress(40);
@@ -73 +73 @@
                 ReferencedEnvelope bboxRef = new ReferencedEnvelope(minLon, maxLon,
                                 minLat, maxLat, targetCRS);
-                System.out.println("Reference Bounds:" + bboxRef);
+                Main.info("Reference Bounds:" + bboxRef);
 
                 progressMonitor.setProgress(50);
@@ -144 +144 @@
                 // bounds.include(feature.getBounds());
                 // }
-                // System.out.println("Calculated Bounds:" + bounds);
+                // Main.info("Calculated Bounds:" + bounds);
                 // } finally {
                 // features.close(iterator);

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

@@ -36 +36 @@
                                         "Querying WFS Geofabrik", "Dowloading features", 0, 100);
 
-                        System.out.println("enabled event...");
                         try {
                                 Bounds bounds = Main.map.mapView
                                                 .getLatLonBounds(Main.map.mapView.getBounds());
 
-                                System.out.println("OSMI View bounds" + bounds);
+                                Main.info("OSMI View bounds" + bounds);
 
                                 monitor.setProgress(10);
@@ -67 +66 @@
                                 }
                         }
-                }
-                if (!isEnabled()) {
-                        System.out.println("Osm Inspector Action not enanbled");
-
+                } else {
+                    Main.warn("Osm Inspector Action not enabled");
                 }
         }

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

@@ -322 +322 @@
         private enum GeomType {
                 POINT, LINE, POLYGON
-        };
+        }
 
         private static final Color SELECTED_COLOUR = Color.ORANGE;
@@ -366 +366 @@
                         setGeometry(selectGeomType, typeName);
 
-                        System.out.println("Osm Inspector Features size: "
-                                        + features.size());
+                        Main.info("Osm Inspector Features size: " + features.size());
                         Style style = createDefaultStyle(idx, selectedFeatures);
 
@@ -424 +423 @@
                         setGeometry(selectGeomType, typeName);
 
-                        System.out.println("Osm Inspector Features size: "
-                                        + features.size());
+                        Main.info("Osm Inspector Features size: " + features.size());
 
                         OSMIFeatureTracker tracker = arrFeatures.get(idx - layerOffset);
                         tracker.mergeFeatures(features);
 
-                        FeatureIterator<SimpleFeature> it = tracker.getFeatures()
-                                        .features();
+                        FeatureIterator<SimpleFeature> it = tracker.getFeatures().features();
 
                         while (it.hasNext()) {
@@ -516 +513 @@
 
         private void setGeometry(ArrayList<GeomType> selectedTypes, String typename) {
-                System.out.println("Passed type is" + typename);
+            Main.info("Passed type is" + typename);
                 if (typename.compareTo("duplicate_ways") == 0) {
                         geometryType = GeomType.LINE;
@@ -619 +616 @@
                                 selectedFeatures = tempfs.getFeatures(filter);
 
-                                FeatureIterator<SimpleFeature> iter = selectedFeatures
-                                                .features();
+                                FeatureIterator<SimpleFeature> iter = selectedFeatures.features();
                                 Set<FeatureId> IDs = new HashSet<>();
 
-                                System.out.println("Selected features "
-                                                + selectedFeatures.size());
+                                Main.info("Selected features " + selectedFeatures.size());
 
                                 while (iter.hasNext()) {

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

@@ -6 +6 @@
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
-import java.util.List;
 
 import org.openstreetmap.josm.Main;
@@ -21 +20 @@
 import org.openstreetmap.josm.gui.download.DownloadSelection;
 import org.openstreetmap.josm.gui.layer.Layer;
-import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
@@ -51 +49 @@
      */
     private void initializePlugin() {
-        System.out.println("Initialized Plugin...");
         Shortcut.registerShortcut("OsmInspector", tr("Toggle: {0}", tr("Open OsmInspector")),
                 KeyEvent.VK_1, Shortcut.ALT_SHIFT);
@@ -66 +63 @@
         @Override
         public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
-                System.out.println("In map frame initialized");
                 Main.toolbar.register( new ImportOsmInspectorBugsAction( this ) );
                 if (newFrame == null) {
             /* if new MapFrame is null, remove listener */
-                        System.out.println("newFrame is null");
             MapView.removeLayerChangeListener(this);
             NavigatableComponent.removeZoomChangeListener(this);
@@ -88 +83 @@
                         userIdentityManager.getUserName());
                 Main.toolbar.control.add( new ImportOsmInspectorBugsAction( this ) );
-                System.out.println("Action added to control....");
             }
         }
-        }
-        
-        @Override
-        public PreferenceSetting getPreferenceSetting() {
-                // TODO Auto-generated method stub
-                return super.getPreferenceSetting();
-        }
-        
-        @Override
-        public void addDownloadSelection(List<DownloadSelection> list) {
-                // TODO Auto-generated method stub
-                super.addDownloadSelection(list);
         }
 

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

@@ -24 +24 @@
                 ListSelectionListener, LayerChangeListener, MouseListener {
 
-    //private OsmInspectorLayer layer;
         private JTextPane bugTextArea;
 
@@ -48 +47 @@
                                 true // default is "show dialog"
                 );
-                //this.layer = layer;
                 buildContentPanel();
         }
 
         public void updateDialog(OsmInspectorLayer l) {
-                //this.layer = l;
         }
         
@@ -60 +57 @@
         }
         
-        /*@Override
-        public void showNotify() {
-                super.showNotify();
-        }*/
-
         @Override
         public void hideNotify() {
@@ -94 +86 @@
         @Override
         public void activeLayerChange(Layer oldLayer, Layer newLayer) {
-                /*if(newLayer instanceof OsmInspectorLayer) {
-                        this.layer = (OsmInspectorLayer) newLayer;
-                }*/
         }
 
@@ -109 +98 @@
         @Override
         public void valueChanged(ListSelectionEvent e) {
-                //System.out.println(e.getFirstIndex());
         }
 }

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

@@ -72 +72 @@
                                 BugInfo next = layer.getOsmiIndex().getItemPointedByNext();
                                 layer.setOsmiIndex((e.getFirstIndex() + 1) % layer.getOsmiBugInfo().size());
-                                System.out.println(next);
                                 Geometry geom = next.getGeom();
                                 Point centroid = geom.getCentroid();
@@ -103 +102 @@
                 prevButton.createArrow(new ActionListener() {
                         public void actionPerformed(ActionEvent e) {
-                                System.out.println(e);
                         }
                 });
@@ -177 +175 @@
                         layer.getOsmiIndex().next();
                         BugInfo next = layer.getOsmiIndex().getItemPointedByNext();
-                        System.out.println(next);
                         Geometry geom = next.getGeom();
                         Point centroid = geom.getCentroid();
@@ -213 +210 @@
                         layer.getOsmiIndex().prev();
                         BugInfo prev = layer.getOsmiIndex().getItemPointedByPrev();
-                        System.out.println(prev);
                         Geometry geom = prev.getGeom();
                         Point centroid = geom.getCentroid();