Changeset 11817 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2017-04-01T02:28:03+02:00 (7 years ago)

Author:

Don-vip

Message:

sonar - squid:S1610 - Abstract classes without fields should be converted to interfaces

File:

• trunk/src/org/openstreetmap/josm/gui/draw/MapViewPath.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/gui/draw/MapViewPath.java

@@ -14 +14 @@
 import org.openstreetmap.josm.gui.MapViewState.MapViewPoint;
 import org.openstreetmap.josm.gui.MapViewState.MapViewRectangle;
-
 
 /**
@@ -186 +185 @@
      */
     public void appendFromEastNorth(Path2D.Double path) {
-        new AbstractPathVisitor() {
+        new PathVisitor() {
             @Override
-            void visitMoveTo(double x, double y) {
+            public void visitMoveTo(double x, double y) {
                 moveTo(new EastNorth(x, y));
             }
 
             @Override
-            void visitLineTo(double x, double y) {
+            public void visitLineTo(double x, double y) {
                 lineTo(new EastNorth(x, y));
             }
 
             @Override
-            void visitClose() {
+            public void visitClose() {
                 closePath();
             }
@@ -302 +301 @@
     }
 
-    private abstract static class AbstractPathVisitor {
+    private interface PathVisitor {
         /**
          * Append a path to this one. The path is clipped to the current view.
@@ -308 +307 @@
          * @return true if adding the path was successful.
          */
-        public boolean visit(Path2D.Double path) {
+        default boolean visit(Path2D.Double path) {
             double[] coords = new double[8];
             PathIterator it = path.getPathIterator(null);
@@ -332 +331 @@
         }
 
-        abstract void visitClose();
-
-        abstract void visitMoveTo(double x, double y);
-
-        abstract void visitLineTo(double x, double y);
-    }
-
-    private abstract class AbstractMapPathVisitor extends AbstractPathVisitor {
+        void visitClose();
+
+        void visitMoveTo(double x, double y);
+
+        void visitLineTo(double x, double y);
+    }
+
+    private abstract class AbstractMapPathVisitor implements PathVisitor {
         private MapViewPoint lastMoveTo;
 
         @Override
-        void visitMoveTo(double x, double y) {
+        public void visitMoveTo(double x, double y) {
             MapViewPoint move = state.getForView(x, y);
             lastMoveTo = move;
@@ -352 +351 @@
 
         @Override
-        void visitLineTo(double x, double y) {
+        public void visitLineTo(double x, double y) {
             visitLineTo(state.getForView(x, y));
         }
@@ -359 +358 @@
 
         @Override
-        void visitClose() {
+        public void visitClose() {
             visitLineTo(lastMoveTo);
         }