Index: applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/GeoFabrikWFSClient.java =================================================================== --- applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/GeoFabrikWFSClient.java (revision 30813) +++ applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/GeoFabrikWFSClient.java (revision 30815) @@ -51,6 +51,6 @@ FeatureSource 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,5 +73,5 @@ ReferencedEnvelope bboxRef = new ReferencedEnvelope(minLon, maxLon, minLat, maxLat, targetCRS); - System.out.println("Reference Bounds:" + bboxRef); + Main.info("Reference Bounds:" + bboxRef); progressMonitor.setProgress(50); @@ -144,5 +144,5 @@ // bounds.include(feature.getBounds()); // } - // System.out.println("Calculated Bounds:" + bounds); + // Main.info("Calculated Bounds:" + bounds); // } finally { // features.close(iterator); Index: applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/ImportOsmInspectorBugsAction.java =================================================================== --- applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/ImportOsmInspectorBugsAction.java (revision 30813) +++ applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/ImportOsmInspectorBugsAction.java (revision 30815) @@ -36,10 +36,9 @@ "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,8 +66,6 @@ } } - } - if (!isEnabled()) { - System.out.println("Osm Inspector Action not enanbled"); - + } else { + Main.warn("Osm Inspector Action not enabled"); } } Index: applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/OsmInspectorLayer.java =================================================================== --- applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/OsmInspectorLayer.java (revision 30813) +++ applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/OsmInspectorLayer.java (revision 30815) @@ -322,5 +322,5 @@ private enum GeomType { POINT, LINE, POLYGON - }; + } private static final Color SELECTED_COLOUR = Color.ORANGE; @@ -366,6 +366,5 @@ 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,12 +423,10 @@ 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 it = tracker.getFeatures() - .features(); + FeatureIterator it = tracker.getFeatures().features(); while (it.hasNext()) { @@ -516,5 +513,5 @@ private void setGeometry(ArrayList 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,10 +616,8 @@ selectedFeatures = tempfs.getFeatures(filter); - FeatureIterator iter = selectedFeatures - .features(); + FeatureIterator iter = selectedFeatures.features(); Set IDs = new HashSet<>(); - System.out.println("Selected features " - + selectedFeatures.size()); + Main.info("Selected features " + selectedFeatures.size()); while (iter.hasNext()) { Index: applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/OsmInspectorPlugin.java =================================================================== --- applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/OsmInspectorPlugin.java (revision 30813) +++ applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/OsmInspectorPlugin.java (revision 30815) @@ -6,5 +6,4 @@ import java.awt.event.MouseEvent; import java.awt.event.MouseListener; -import java.util.List; import org.openstreetmap.josm.Main; @@ -21,5 +20,4 @@ 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,5 +49,4 @@ */ private void initializePlugin() { - System.out.println("Initialized Plugin..."); Shortcut.registerShortcut("OsmInspector", tr("Toggle: {0}", tr("Open OsmInspector")), KeyEvent.VK_1, Shortcut.ALT_SHIFT); @@ -66,9 +63,7 @@ @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,19 +83,6 @@ 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 list) { - // TODO Auto-generated method stub - super.addDownloadSelection(list); } Index: applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/gui/OsmInspectorBugInfoDialog.java =================================================================== --- applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/gui/OsmInspectorBugInfoDialog.java (revision 30813) +++ applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/gui/OsmInspectorBugInfoDialog.java (revision 30815) @@ -24,5 +24,4 @@ ListSelectionListener, LayerChangeListener, MouseListener { - //private OsmInspectorLayer layer; private JTextPane bugTextArea; @@ -48,10 +47,8 @@ true // default is "show dialog" ); - //this.layer = layer; buildContentPanel(); } public void updateDialog(OsmInspectorLayer l) { - //this.layer = l; } @@ -60,9 +57,4 @@ } - /*@Override - public void showNotify() { - super.showNotify(); - }*/ - @Override public void hideNotify() { @@ -94,7 +86,4 @@ @Override public void activeLayerChange(Layer oldLayer, Layer newLayer) { - /*if(newLayer instanceof OsmInspectorLayer) { - this.layer = (OsmInspectorLayer) newLayer; - }*/ } @@ -109,5 +98,4 @@ @Override public void valueChanged(ListSelectionEvent e) { - //System.out.println(e.getFirstIndex()); } } Index: applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/gui/OsmInspectorDialog.java =================================================================== --- applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/gui/OsmInspectorDialog.java (revision 30813) +++ applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/gui/OsmInspectorDialog.java (revision 30815) @@ -72,5 +72,4 @@ 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,5 +102,4 @@ prevButton.createArrow(new ActionListener() { public void actionPerformed(ActionEvent e) { - System.out.println(e); } }); @@ -177,5 +175,4 @@ layer.getOsmiIndex().next(); BugInfo next = layer.getOsmiIndex().getItemPointedByNext(); - System.out.println(next); Geometry geom = next.getGeom(); Point centroid = geom.getCentroid(); @@ -213,5 +210,4 @@ layer.getOsmiIndex().prev(); BugInfo prev = layer.getOsmiIndex().getItemPointedByPrev(); - System.out.println(prev); Geometry geom = prev.getGeom(); Point centroid = geom.getCentroid();