Changeset 18593 in osm for applications/editors/josm/plugins/validator

Timestamp:

2009-11-14T19:27:50+01:00 (15 years ago)

Author:

jttt

Message:

Updated to new MapViewPaintable.paint arguments

Location:

applications/editors/josm/plugins/validator

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java (modified) (5 diffs)
• src/org/openstreetmap/josm/plugins/validator/GridLayer.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/validator/Test.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java (modified) (5 diffs)

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

@@ -27 +27 @@
         -->
         <property name="commit.message" value="Updated build.xml" />            
-        <property name="plugin.main.version" value="2414" />
+        <property name="plugin.main.version" value="2450" />
                 
                 

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java

@@ -4 +4 @@
 
 import java.awt.Component;
-import java.awt.Graphics;
+import java.awt.Graphics2D;
 import java.util.Enumeration;
 import java.util.List;
@@ -15 +15 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.RenameLayerAction;
+import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.gui.MapView;
@@ -27 +28 @@
 /**
  * A layer showing error messages.
- * 
+ *
  * @author frsantos
  */
@@ -54 +55 @@
     @SuppressWarnings("unchecked")
     @Override
-    public void paint(final Graphics g, final MapView mv) {
+    public void paint(final Graphics2D g, final MapView mv, Bounds bounds) {
         DefaultMutableTreeNode root = plugin.validationDialog.tree.getRoot();
         if (root == null || root.getChildCount() == 0)
@@ -114 +115 @@
     public Component[] getMenuEntries() {
         return new Component[] { new JMenuItem(LayerListDialog.getInstance().createShowHideLayerAction(this)),
-                new JMenuItem(LayerListDialog.getInstance().createDeleteLayerAction(this)), 
+                new JMenuItem(LayerListDialog.getInstance().createDeleteLayerAction(this)),
                 new JSeparator(),
                 new JMenuItem(new RenameLayerAction(null, this)), new JSeparator(),

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/GridLayer.java

@@ -4 +4 @@
 import java.awt.Component;
 import java.awt.Graphics;
+import java.awt.Graphics2D;
 import java.awt.Point;
 import java.awt.geom.Point2D;
@@ -13 +14 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.RenameLayerAction;
+import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.Node;
@@ -54 +56 @@
      */
     @Override
-    public void paint(final Graphics g, final MapView mv)
+    public void paint(final Graphics2D g, final MapView mv, Bounds bounds)
     {
         if( !Main.pref.hasKey(PreferenceEditor.PREF_DEBUG + ".grid") )

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.validator;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.util.ArrayList;
@@ -8 +10 @@
 import javax.swing.JPanel;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.osm.BackreferencedDataSet;
@@ -19 +20 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.tools.GBC;
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 /**
@@ -95 +95 @@
 
     /**
-     * Start the test using a given progress monitor 
-     * 
-     * @param progressMonitor  the progress monitor 
+     * Start the test using a given progress monitor
+     *
+     * @param progressMonitor  the progress monitor
      */
     public void startTest(ProgressMonitor progressMonitor) {

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java

@@ -5 +5 @@
 import java.awt.geom.Area;
 import java.util.Collection;
+import java.util.LinkedHashSet;
 import java.util.LinkedList;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java

@@ -19 +19 @@
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.BBox;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -24 +25 @@
 import org.openstreetmap.josm.data.osm.QuadBuckets;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.osm.QuadBuckets.BBox;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.plugins.validator.PreferenceEditor;
@@ -75 +75 @@
         this.ds = Main.main.getCurrentDataSet();
         this.ds_area = ds.getDataSourceArea();
-        this.ds.reindexAll();
-        }
+    }
 
     @Override
@@ -196 +195 @@
     private class MyWaySegment
     {
-        private Line2D line;
-        public Way w;
-        public boolean isAbandoned = false;
-        public boolean isBoundary = false;
-        public boolean highway;
-        private double len;
+        private final Line2D line;
+        public final Way w;
+        public final boolean isAbandoned;
+        public final boolean isBoundary;
+        public final boolean highway;
+        private final double len;
         private Set<Node> nearbyNodeCache;
         double nearbyNodeCacheDist = -1.0;
-        Node n1;
-        Node n2;
+        final Node n1;
+        final Node n2;
 
         public MyWaySegment(Way w, Node n1, Node n2)
@@ -368 +367 @@
     private void addNode(Node n, Set<Node> s)
     {
-        Boolean m = middlenodes.contains(n);
-        Boolean e = endnodes.contains(n);
-        Boolean eh = endnodes_highway.contains(n);
-        Boolean o = othernodes.contains(n);
+        boolean m = middlenodes.contains(n);
+        boolean e = endnodes.contains(n);
+        boolean eh = endnodes_highway.contains(n);
+        boolean o = othernodes.contains(n);
         if(!m && !e && !o && !eh)
             s.add(n);