[DebianGIS-dev] r2268 - packages/josm-plugins/trunk/debian/patches

[gmascellani-guest at alioth.debian.org]

Author: gmascellani-guest
Date: 2009-06-07 13:40:30 +0000 (Sun, 07 Jun 2009)
New Revision: 2268

Modified:
   packages/josm-plugins/trunk/debian/patches/50_validator.dpatch
Log:
Backporting plugin validator


Modified: packages/josm-plugins/trunk/debian/patches/50_validator.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/50_validator.dpatch	2009-06-07 13:32:22 UTC (rev 2267)
+++ packages/josm-plugins/trunk/debian/patches/50_validator.dpatch	2009-06-07 13:40:30 UTC (rev 2268)
@@ -7,7 +7,7 @@
 @DPATCH@
 diff -urNad trunk~/validator/build.xml trunk/validator/build.xml
 --- trunk~/validator/build.xml	2009-03-08 14:39:18.000000000 +0100
-+++ trunk/validator/build.xml	2009-04-05 01:24:52.000000000 +0200
++++ trunk/validator/build.xml	2009-06-07 15:38:06.000000000 +0200
 @@ -14,7 +14,7 @@
              <compilerarg value="-Xlint:unchecked"/>
          </javac>
@@ -17,3 +17,87 @@
          <copy todir="${plugin.build.dir}/images">
              <fileset dir="images"/>
          </copy>
+diff -urNad trunk~/validator/src/org/openstreetmap/josm/plugins/validator/GridLayer.java trunk/validator/src/org/openstreetmap/josm/plugins/validator/GridLayer.java
+--- trunk~/validator/src/org/openstreetmap/josm/plugins/validator/GridLayer.java	2009-02-01 21:50:42.000000000 +0100
++++ trunk/validator/src/org/openstreetmap/josm/plugins/validator/GridLayer.java	2009-06-07 15:39:26.000000000 +0200
+@@ -12,7 +12,7 @@
+ import org.openstreetmap.josm.data.coor.EastNorth;
+ import org.openstreetmap.josm.data.osm.*;
+ import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+-import org.openstreetmap.josm.data.osm.visitor.Visitor;
++import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
+ import org.openstreetmap.josm.gui.MapView;
+ import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
+ import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
+@@ -129,7 +129,7 @@
+     /**
+      * Visitor that highlights all cells the selected primitives go through
+      */
+-    class HighlightCellVisitor implements Visitor
++    class HighlightCellVisitor extends AbstractVisitor
+     {
+         /** The MapView */
+         private final MapView mv;
+diff -urNad trunk~/validator/src/org/openstreetmap/josm/plugins/validator/Test.java trunk/validator/src/org/openstreetmap/josm/plugins/validator/Test.java
+--- trunk~/validator/src/org/openstreetmap/josm/plugins/validator/Test.java	2009-03-08 14:39:18.000000000 +0100
++++ trunk/validator/src/org/openstreetmap/josm/plugins/validator/Test.java	2009-06-07 15:39:26.000000000 +0200
+@@ -12,7 +12,7 @@
+ import org.openstreetmap.josm.data.osm.OsmPrimitive;
+ import org.openstreetmap.josm.data.osm.Relation;
+ import org.openstreetmap.josm.data.osm.Way;
+-import org.openstreetmap.josm.data.osm.visitor.Visitor;
++import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
+ import org.openstreetmap.josm.tools.GBC;
+ 
+ /**
+@@ -24,7 +24,7 @@
+  *
+  * @author frsantos
+  */
+-public class Test implements Visitor
++public class Test extends AbstractVisitor
+ {
+     /** Name of the test */
+     protected String name;
+diff -urNad trunk~/validator/src/org/openstreetmap/josm/plugins/validator/TestError.java trunk/validator/src/org/openstreetmap/josm/plugins/validator/TestError.java
+--- trunk~/validator/src/org/openstreetmap/josm/plugins/validator/TestError.java	2009-02-01 21:50:42.000000000 +0100
++++ trunk/validator/src/org/openstreetmap/josm/plugins/validator/TestError.java	2009-06-07 15:39:26.000000000 +0200
+@@ -14,7 +14,7 @@
+ import org.openstreetmap.josm.data.osm.Relation;
+ import org.openstreetmap.josm.data.osm.Way;
+ import org.openstreetmap.josm.data.osm.WaySegment;
+-import org.openstreetmap.josm.data.osm.visitor.Visitor;
++import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
+ import org.openstreetmap.josm.gui.MapView;
+ 
+ /**
+@@ -251,7 +251,7 @@
+      * Visitor that highlights the primitives affected by this error
+      * @author frsantos
+      */
+-    class PaintVisitor implements ValidatorVisitor, Visitor {
++    class PaintVisitor extends AbstractVisitor implements ValidatorVisitor {
+         /** The graphics */
+         private final Graphics g;
+         /** The MapView */
+diff -urNad trunk~/validator/src/org/openstreetmap/josm/plugins/validator/util/AgregatePrimitivesVisitor.java trunk/validator/src/org/openstreetmap/josm/plugins/validator/util/AgregatePrimitivesVisitor.java
+--- trunk~/validator/src/org/openstreetmap/josm/plugins/validator/util/AgregatePrimitivesVisitor.java	2009-02-01 21:50:42.000000000 +0100
++++ trunk/validator/src/org/openstreetmap/josm/plugins/validator/util/AgregatePrimitivesVisitor.java	2009-06-07 15:39:46.000000000 +0200
+@@ -5,7 +5,7 @@
+ import java.util.LinkedList;
+ 
+ import org.openstreetmap.josm.data.osm.*;
+-import org.openstreetmap.josm.data.osm.visitor.Visitor;
++import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
+ 
+ /**
+  * A visitor that aggregates all primitives it visits.
+@@ -14,7 +14,7 @@
+  *
+  * @author frsantos
+  */
+-public class AgregatePrimitivesVisitor implements Visitor
++public class AgregatePrimitivesVisitor extends AbstractVisitor
+ {
+     /** Aggregated data */
+     Collection<OsmPrimitive> aggregatedData;