Changeset 26919 in osm for applications/editors/josm

Timestamp:

2011-10-21T21:52:18+02:00 (13 years ago)

Author:

zverik

Message:

removed debug code

Location:

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions

Files:

• SplittingMultipolygons.java (modified) (3 diffs)
• TheRing.java (modified) (8 diffs)

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

@@ -27 +27 @@
                 return false;
             for( Node n : way.getNodes() ) {
-                if( n == null )
-                    System.out.println("Node is null");
                 if( n.isIncomplete() || (a != null && !a.contains(n.getCoor())) )
                     return false;
@@ -65 +63 @@
     
     public static List<Relation> process( Collection<Way> selectedWays ) {
-        System.out.println("---------------------------------------");
+//      System.out.println("---------------------------------------");
         List<Relation> result = new ArrayList<Relation>();
         List<Way> rings = new ArrayList<Way>();
@@ -322 +320 @@
             if( touchingWays.get(w) ) {
                 otherWays.add(new TheRing(w));
-                System.out.println("Touching ring: " + otherWays.get(otherWays.size()-1));
+//              System.out.println("Touching ring: " + otherWays.get(otherWays.size()-1));
             }
         

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

@@ -57 +57 @@
      */
     public static List<Relation> makeManySimpleMultipolygons( Collection<Way> selection, List<Command> commands ) {
-        System.out.println("---------------------------------------");
+        log("---------------------------------------");
         List<TheRing> rings = new ArrayList<TheRing>(selection.size());
         for( Way w : selection )
@@ -83 +83 @@
                     RingSegment segment2 = other.segments.get(j);
                     if( !segment2.isReference() ) {
-                        System.out.println("Comparing " + segment1 + " and " + segment2);
+                        log("Comparing " + segment1 + " and " + segment2);
                         Node[] split = getSplitNodes(segment1.getNodes(), segment2.getNodes(), segment1.isRing(), segment2.isRing());
                         if( split != null ) {
                             if( !collideNoted ) {
-                                System.out.println("Rings for ways " + source.getUniqueId() + " and " + other.source.getUniqueId() + " collide.");
+                                log("Rings for ways " + source.getUniqueId() + " and " + other.source.getUniqueId() + " collide.");
                                 collideNoted = true;
                             }
@@ -125 +125 @@
         int firstPos = isRing1 ? pos : nodes1.size();
         while( !collideFound ) {
-            System.out.println("pos=" + pos);
+            log("pos=" + pos);
             int start1 = pos;
             int start2 = nodes2.indexOf(nodes1.get(start1));
@@ -141 +141 @@
                 }
             }
-            System.out.println("last1=" + last1 + " last2=" + last2 + " increment2=" + increment2);
+            log("last1=" + last1 + " last2=" + last2 + " increment2=" + increment2);
             if( increment2 != 0 ) {
                 // find the first nodes
@@ -155 +155 @@
                     }
                 }
-                System.out.println("last1=" + last1 + " last2=" + last2);
+                log("last1=" + last1 + " last2=" + last2);
                 if( increment2 < 0 ) {
                     int tmp = start2;
@@ -205 +205 @@
         RingSegment segment = segments.get(segmentIndex);
         boolean isRing = segment.isRing();
-        System.out.println("Split segment " + segment + " at nodes " + n1.getUniqueId() + " and " + n2.getUniqueId());
+        log("Split segment " + segment + " at nodes " + n1.getUniqueId() + " and " + n2.getUniqueId());
         boolean reversed = segment.getNodes().indexOf(n2) < segment.getNodes().indexOf(n1);
         if( reversed && !isRing ) {
@@ -409 +409 @@
     }
     
+    private static void log( String s ) {
+//      System.out.println(s);
+    }
+    
     private static class RingSegment {
         private List<Node> nodes;
@@ -512 +516 @@
 
         public void makeReference( RingSegment segment ) {
-            System.out.println(this + " was made a reference to " + segment);
+            log(this + " was made a reference to " + segment);
             this.nodes = null;
             this.references = segment;