Changeset 32398 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/TheRing.java

Timestamp:

2016-06-25T11:56:57+02:00 (8 years ago)

Author:

donvip

Message:

checkstyle

File:

• applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/TheRing.java (modified) (34 diffs)

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/TheRing.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package relcontext.actions;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.util.ArrayList;
@@ -45 +47 @@
         List<Way> rings = new ArrayList<>();
         for (Way way : ways) {
-            if (way.isClosed() ) {
+            if (way.isClosed()) {
                 rings.add(way);
             } else
                 return false;
         }
-        if (rings.isEmpty() || ways.size() == 1 )
+        if (rings.isEmpty() || ways.size() == 1)
             return false;
 
@@ -57 +59 @@
             for (int j = i + 1; j < rings.size(); j++) {
                 PolygonIntersection intersection = Geometry.polygonIntersection(rings.get(i).getNodes(), rings.get(j).getNodes());
-                if (intersection == PolygonIntersection.FIRST_INSIDE_SECOND || intersection == PolygonIntersection.SECOND_INSIDE_FIRST )
+                if (intersection == PolygonIntersection.FIRST_INSIDE_SECOND || intersection == PolygonIntersection.SECOND_INSIDE_FIRST)
                     return false;
             }
@@ -72 +74 @@
         log("---------------------------------------");
         List<TheRing> rings = new ArrayList<>(selection.size());
-        for (Way w : selection ) {
+        for (Way w : selection) {
             rings.add(new TheRing(w));
         }
-        for (int i = 0; i < rings.size() - 1; i++ ) {
-            for (int j = i + 1; j < rings.size(); j++ ) {
+        for (int i = 0; i < rings.size() - 1; i++) {
+            for (int j = i + 1; j < rings.size(); j++) {
                 rings.get(i).collide(rings.get(j));
             }
@@ -108 +110 @@
                             RingSegment segment = splitRingAt(i, split[0], split[1]);
                             RingSegment otherSegment = other.splitRingAt(j, split[2], split[3]);
-                            if (!areSegmentsEqual(segment, otherSegment) )
-                                throw new IllegalArgumentException("Error: algorithm gave incorrect segments: " + segment + " and " + otherSegment);
+                            if (!areSegmentsEqual(segment, otherSegment))
+                                throw new IllegalArgumentException(
+                                        "Error: algorithm gave incorrect segments: " + segment + " and " + otherSegment);
                             segment.makeReference(otherSegment);
                         }
                     }
-                    if (segment1.isReference() ) {
+                    if (segment1.isReference()) {
                         break;
                     }
@@ -126 +129 @@
     public static Node[] getSplitNodes(List<Node> nodes1, List<Node> nodes2, boolean isRing1, boolean isRing2) {
         int pos = 0;
-        while(pos < nodes1.size() && !nodes2.contains(nodes1.get(pos)) ) {
+        while (pos < nodes1.size() && !nodes2.contains(nodes1.get(pos))) {
             pos++;
         }
@@ -133 +136 @@
             // rewind a bit
             pos = nodes1.size() - 1;
-            while(pos > 0 && nodes2.contains(nodes1.get(pos)) ) {
+            while (pos > 0 && nodes2.contains(nodes1.get(pos))) {
                 pos--;
             }
             if (pos == 0 && nodes1.size() == nodes2.size()) {
-                JOptionPane.showMessageDialog(Main.parent, "Two rings are equal, and this must not be.", "Multipolygon from rings", JOptionPane.ERROR_MESSAGE);
+                JOptionPane.showMessageDialog(Main.parent,
+                        tr("Two rings are equal, and this must not be."), tr("Multipolygon from rings"), JOptionPane.ERROR_MESSAGE);
                 return null;
             }
@@ -143 +147 @@
         }
         int firstPos = isRing1 ? pos : nodes1.size();
-        while(!collideFound) {
+        while (!collideFound) {
             log("pos=" + pos);
             int start1 = pos;
@@ -152 +156 @@
             if (last1 >= 0) {
                 last2 = incrementBy(start2, -1, nodes2.size(), isRing2);
-                if (last2 >= 0 && nodes1.get(last1).equals(nodes2.get(last2)) ) {
+                if (last2 >= 0 && nodes1.get(last1).equals(nodes2.get(last2))) {
                     increment2 = -1;
                 } else {
                     last2 = incrementBy(start2, 1, nodes2.size(), isRing2);
-                    if (last2 >= 0 && nodes1.get(last1).equals(nodes2.get(last2)) ) {
+                    if (last2 >= 0 && nodes1.get(last1).equals(nodes2.get(last2))) {
                         increment2 = 1;
                     }
@@ -165 +169 @@
                 // find the first nodes
                 boolean reachedEnd = false;
-                while(!reachedEnd) {
+                while (!reachedEnd) {
                     int newLast1 = incrementBy(last1, 1, nodes1.size(), isRing1);
                     int newLast2 = incrementBy(last2, increment2, nodes2.size(), isRing2);
-                    if (newLast1 < 0 || newLast2 < 0 || !nodes1.get(newLast1).equals(nodes2.get(newLast2)) ) {
+                    if (newLast1 < 0 || newLast2 < 0 || !nodes1.get(newLast1).equals(nodes2.get(newLast2))) {
                         reachedEnd = true;
                     } else {
@@ -184 +188 @@
             } else {
                 pos = last1;
-                while(pos != firstPos && pos >= 0 && !nodes2.contains(nodes1.get(pos)) ) {
+                while (pos != firstPos && pos >= 0 && !nodes2.contains(nodes1.get(pos))) {
                     pos = incrementBy(pos, 1, nodes1.size(), isRing1);
                 }
-                if (pos < 0 || pos == firstPos || !nodes2.contains(nodes1.get(pos)) ) {
+                if (pos < 0 || pos == firstPos || !nodes2.contains(nodes1.get(pos))) {
                     collideFound = true;
                 }
@@ -197 +201 @@
     private static int incrementBy(int value, int increment, int limit1, boolean isRing) {
         int result = value + increment;
-        if (result < 0 )
+        if (result < 0)
             return isRing ? result + limit1 : -1;
-        else if (result >= limit1 )
+        else if (result >= limit1)
             return isRing ? result - limit1 : -1;
         else
@@ -209 +213 @@
         List<Node> nodes2 = seg2.getNodes();
         int size = nodes1.size();
-        if (size != nodes2.size() )
+        if (size != nodes2.size())
             return false;
         boolean reverse = size > 1 && !nodes1.get(0).equals(nodes2.get(0));
-        for (int i = 0; i < size; i++ )
-            if (!nodes1.get(i).equals(nodes2.get(reverse ? size-1-i : i)) )
+        for (int i = 0; i < size; i++) {
+            if (!nodes1.get(i).equals(nodes2.get(reverse ? size-1-i : i)))
                 return false;
+        }
         return true;
     }
@@ -223 +228 @@
      */
     private RingSegment splitRingAt(int segmentIndex, Node n1, Node n2) {
-        if (n1.equals(n2) )
+        if (n1.equals(n2))
             throw new IllegalArgumentException("Both nodes are equal, id=" + n1.getUniqueId());
         RingSegment segment = segments.get(segmentIndex);
@@ -242 +247 @@
         // if thirdPart == null, then n2 == lastNode
         int pos = segmentIndex + 1;
-        if (secondPart != null ) {
+        if (secondPart != null) {
             segments.add(pos++, secondPart);
         }
-        if (thirdPart != null ) {
+        if (thirdPart != null) {
             segments.add(pos++, thirdPart);
         }
@@ -260 +265 @@
         // build segments map
         Map<RingSegment, TheRing> segmentMap = new HashMap<>();
-        for (TheRing ring : rings ) {
-            for (RingSegment seg : ring.segments )
-                if (!seg.isReference() ) {
+        for (TheRing ring : rings) {
+            for (RingSegment seg : ring.segments) {
+                if (!seg.isReference()) {
                     segmentMap.put(seg, ring);
                 }
+            }
         }
 
@@ -283 +289 @@
 
         // initializing source way for each ring
-        for (TheRing ring : rings ) {
+        for (TheRing ring : rings) {
             ring.putSourceWayFirst();
         }
@@ -290 +296 @@
     private int countNonReferenceSegments() {
         int count = 0;
-        for (RingSegment seg : segments )
-            if (!seg.isReference() ) {
+        for (RingSegment seg : segments) {
+            if (!seg.isReference()) {
                 count++;
             }
+        }
         return count;
     }
@@ -325 +332 @@
             relation.put("type", "multipolygon");
             for (String key : sourceCopy.keySet()) {
-                if (linearTags.contains(key) ) {
+                if (linearTags.contains(key)) {
                     continue;
                 }
-                if (key.equals("natural") && sourceCopy.get("natural").equals("coastline") ) {
+                if (key.equals("natural") && sourceCopy.get("natural").equals("coastline")) {
                     continue;
                 }
@@ -343 +350 @@
                 Relation rel = null;
                 if (relationChangeMap != null) {
-                    if (relationChangeMap.containsKey(p) ) {
+                    if (relationChangeMap.containsKey(p)) {
                         rel = relationChangeMap.get(p);
                     } else {
-                        rel = new Relation((Relation)p);
-                        relationChangeMap.put((Relation)p, rel);
+                        rel = new Relation((Relation) p);
+                        relationChangeMap.put((Relation) p, rel);
                     }
                 } else {
-                    rel = new Relation((Relation)p);
+                    rel = new Relation((Relation) p);
                     relationCommands.add(new ChangeCommand(p, rel));
                 }
-                for (int i = 0; i < rel.getMembersCount(); i++ )
-                    if (rel.getMember(i).getMember().equals(source) ) {
+                for (int i = 0; i < rel.getMembersCount(); i++) {
+                    if (rel.getMember(i).getMember().equals(source)) {
                         referencingRelations.put(rel, Integer.valueOf(i));
                     }
-            }
-        }
-        // todo: когда два кольца мен�ют одно и то же отношение, в �пи�ок команд добавл�ет��
-        // изменение базового отношени� на новое, а не предыдущего
-        // по�тому �охран�ет�� только первое изменение
+                }
+            }
+        }
 
         List<Command> commands = new ArrayList<>();
@@ -368 +373 @@
             boolean needAdding = !seg.isWayConstructed();
             Way w = seg.constructWay(seg.isReference() ? null : sourceCopy);
-            if (needAdding ) {
+            if (needAdding) {
                 commands.add(new AddCommand(w));
             }
@@ -383 +388 @@
                 }
             }
-            if (createMultipolygon ) {
+            if (createMultipolygon) {
                 relation.addMember(new RelationMember("outer", w));
             }
         }
-        if (!foundOwnWay ) {
+        if (!foundOwnWay) {
             commands.add(new DeleteCommand(source));
         }
         commands.addAll(relationCommands);
-        if (createMultipolygon ) {
+        if (createMultipolygon) {
             commands.add(new AddCommand(relation));
         }
@@ -398 +403 @@
 
     public static void updateCommandsWithRelations(List<Command> commands, Map<Relation, Relation> relationCache) {
-        for (Relation src : relationCache.keySet() ) {
+        for (Relation src : relationCache.keySet()) {
             commands.add(new ChangeCommand(src, relationCache.get(src)));
         }
@@ -414 +419 @@
         StringBuilder sb = new StringBuilder("TheRing@");
         sb.append(this.hashCode()).append('[').append("wayId: ").append(source == null ? "null" : source.getUniqueId()).append("; segments: ");
-        if (segments.isEmpty() ) {
+        if (segments.isEmpty()) {
             sb.append("empty");
         } else {
             sb.append(segments.get(0));
-            for (int i = 1; i < segments.size(); i++ ) {
+            for (int i = 1; i < segments.size(); i++) {
                 sb.append(", ").append(segments.get(i));
             }
@@ -425 +430 @@
     }
 
-    /**
-     * Appends "append" to "base" so the closed polygon forms.
-     */
-    /*private static void closePolygon(List<Node> base, List<Node> append) {
-    if (append.get(0).equals(base.get(0)) && append.get(append.size() - 1).equals(base.get(base.size() - 1))) {
-        List<Node> ap2 = new ArrayList<Node>(append);
-        Collections.reverse(ap2);
-        append = ap2;
-    }
-    base.remove(base.size() - 1);
-    base.addAll(append);
-    }*/
-
-    /**
-     * Checks if a middle point between two nodes is inside a polygon. Useful to check if the way is inside.
-     */
-    /*private static boolean segmentInsidePolygon(Node n1, Node n2, List<Node> polygon) {
-    EastNorth en1 = n1.getEastNorth();
-    EastNorth en2 = n2.getEastNorth();
-    Node testNode = new Node(new EastNorth((en1.east() + en2.east()) / 2.0, (en1.north() + en2.north()) / 2.0));
-    return Geometry.nodeInsidePolygon(testNode, polygon);
-    }*/
-
     private static void log(String s) {
-        //    System.out.println(s);
+        Main.debug(s);
     }
 
@@ -459 +441 @@
         private boolean isRing;
 
-        /*private RingSegment() {
-    }*/
-
-        public RingSegment(Way w) {
+        RingSegment(Way w) {
             this(w.getNodes());
         }
 
-        public RingSegment(List<Node> nodes) {
+        RingSegment(List<Node> nodes) {
             this.nodes = nodes;
             isRing = nodes.size() > 1 && nodes.get(0).equals(nodes.get(nodes.size() - 1));
-            if (isRing ) {
+            if (isRing) {
                 nodes.remove(nodes.size() - 1);
             }
             references = null;
         }
-
-        /*public RingSegment(RingSegment ref) {
-        this.nodes = null;
-        this.references = ref;
-    }*/
 
         /**
@@ -487 +461 @@
          */
         public RingSegment split(Node n) {
-            if (nodes == null )
+            if (nodes == null)
                 throw new IllegalArgumentException("Cannot split segment: it is a reference");
             int pos = nodes.indexOf(n);
-            if (pos <= 0 || pos >= nodes.size() - 1 )
+            if (pos <= 0 || pos >= nodes.size() - 1)
                 return null;
             List<Node> newNodes = new ArrayList<>(nodes.subList(pos, nodes.size()));
@@ -503 +477 @@
          */
         public RingSegment split(Node n1, Node n2) {
-            if (nodes == null )
+            if (nodes == null)
                 throw new IllegalArgumentException("Cannot split segment: it is a reference");
             if (!isRing) {
-                if (n1 == null || nodes.get(0).equals(n1) || nodes.get(nodes.size() - 1).equals(n1) )
+                if (n1 == null || nodes.get(0).equals(n1) || nodes.get(nodes.size() - 1).equals(n1))
                     return split(n2);
-                if (n2 == null || nodes.get(0).equals(n2) || nodes.get(nodes.size() - 1).equals(n2) )
+                if (n2 == null || nodes.get(0).equals(n2) || nodes.get(nodes.size() - 1).equals(n2))
                     return split(n1);
                 throw new IllegalArgumentException("Split for two nodes is called for not-ring: " + this);
@@ -514 +488 @@
             int pos1 = nodes.indexOf(n1);
             int pos2 = nodes.indexOf(n2);
-            if (pos1 == pos2 )
+            if (pos1 == pos2)
                 return null;
 
@@ -521 +495 @@
                 newNodes.addAll(nodes.subList(pos2, nodes.size()));
                 newNodes.addAll(nodes.subList(0, pos1 + 1));
-                if (pos2 + 1 < nodes.size() ) {
+                if (pos2 + 1 < nodes.size()) {
                     nodes.subList(pos2 + 1, nodes.size()).clear();
                 }
-                if (pos1 > 0 ) {
+                if (pos1 > 0) {
                     nodes.subList(0, pos1).clear();
                 }
@@ -541 +515 @@
 
         public List<Node> getWayNodes() {
-            if (nodes == null )
+            if (nodes == null)
                 throw new IllegalArgumentException("Won't give you wayNodes: it is a reference");
             List<Node> wayNodes = new ArrayList<>(nodes);
-            if (isRing ) {
+            if (isRing) {
                 wayNodes.add(wayNodes.get(0));
             }
@@ -576 +550 @@
 
         public Way constructWay(Way template) {
-            if (isReference() )
+            if (isReference())
                 return references.constructWay(template);
             if (resultingWay == null) {
@@ -590 +564 @@
 
         public void overrideWay(Way source) {
-            if (isReference() ) {
+            if (isReference()) {
                 references.overrideWay(source);
             } else {
@@ -598 +572 @@
         }
 
-        /**
-         * Compares two segments with respect to referencing.
-         * @return true if ways are equals, or one references another.
-         */
-        /*public boolean isReferencingEqual(RingSegment other) {
-        return this.equals(other) || (other.isReference() && other.references == this) || (isReference() && references == other);
-    }*/
-
         @Override
         public String toString() {
             StringBuilder sb = new StringBuilder("RingSegment@");
             sb.append(this.hashCode()).append('[');
-            if (isReference() ) {
+            if (isReference()) {
                 sb.append("references ").append(references.hashCode());
-            } else if (nodes.isEmpty() ) {
+            } else if (nodes.isEmpty()) {
                 sb.append("empty");
             } else {
-                if (isRing ) {
+                if (isRing) {
                     sb.append("ring:");
                 }
                 sb.append(nodes.get(0).getUniqueId());
-                for (int i = 1; i < nodes.size(); i++ ) {
+                for (int i = 1; i < nodes.size(); i++) {
                     sb.append(',').append(nodes.get(i).getUniqueId());
                 }