Changeset 26919 in osm for applications/editors


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/SplittingMultipolygons.java

    r26888 r26919  
    2727                return false;
    2828            for( Node n : way.getNodes() ) {
    29                 if( n == null )
    30                     System.out.println("Node is null");
    3129                if( n.isIncomplete() || (a != null && !a.contains(n.getCoor())) )
    3230                    return false;
     
    6563   
    6664    public static List<Relation> process( Collection<Way> selectedWays ) {
    67         System.out.println("---------------------------------------");
     65//      System.out.println("---------------------------------------");
    6866        List<Relation> result = new ArrayList<Relation>();
    6967        List<Way> rings = new ArrayList<Way>();
     
    322320            if( touchingWays.get(w) ) {
    323321                otherWays.add(new TheRing(w));
    324                 System.out.println("Touching ring: " + otherWays.get(otherWays.size()-1));
     322//              System.out.println("Touching ring: " + otherWays.get(otherWays.size()-1));
    325323            }
    326324       
  • applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/TheRing.java

    r26888 r26919  
    5757     */
    5858    public static List<Relation> makeManySimpleMultipolygons( Collection<Way> selection, List<Command> commands ) {
    59         System.out.println("---------------------------------------");
     59        log("---------------------------------------");
    6060        List<TheRing> rings = new ArrayList<TheRing>(selection.size());
    6161        for( Way w : selection )
     
    8383                    RingSegment segment2 = other.segments.get(j);
    8484                    if( !segment2.isReference() ) {
    85                         System.out.println("Comparing " + segment1 + " and " + segment2);
     85                        log("Comparing " + segment1 + " and " + segment2);
    8686                        Node[] split = getSplitNodes(segment1.getNodes(), segment2.getNodes(), segment1.isRing(), segment2.isRing());
    8787                        if( split != null ) {
    8888                            if( !collideNoted ) {
    89                                 System.out.println("Rings for ways " + source.getUniqueId() + " and " + other.source.getUniqueId() + " collide.");
     89                                log("Rings for ways " + source.getUniqueId() + " and " + other.source.getUniqueId() + " collide.");
    9090                                collideNoted = true;
    9191                            }
     
    125125        int firstPos = isRing1 ? pos : nodes1.size();
    126126        while( !collideFound ) {
    127             System.out.println("pos=" + pos);
     127            log("pos=" + pos);
    128128            int start1 = pos;
    129129            int start2 = nodes2.indexOf(nodes1.get(start1));
     
    141141                }
    142142            }
    143             System.out.println("last1=" + last1 + " last2=" + last2 + " increment2=" + increment2);
     143            log("last1=" + last1 + " last2=" + last2 + " increment2=" + increment2);
    144144            if( increment2 != 0 ) {
    145145                // find the first nodes
     
    155155                    }
    156156                }
    157                 System.out.println("last1=" + last1 + " last2=" + last2);
     157                log("last1=" + last1 + " last2=" + last2);
    158158                if( increment2 < 0 ) {
    159159                    int tmp = start2;
     
    205205        RingSegment segment = segments.get(segmentIndex);
    206206        boolean isRing = segment.isRing();
    207         System.out.println("Split segment " + segment + " at nodes " + n1.getUniqueId() + " and " + n2.getUniqueId());
     207        log("Split segment " + segment + " at nodes " + n1.getUniqueId() + " and " + n2.getUniqueId());
    208208        boolean reversed = segment.getNodes().indexOf(n2) < segment.getNodes().indexOf(n1);
    209209        if( reversed && !isRing ) {
     
    409409    }
    410410   
     411    private static void log( String s ) {
     412//      System.out.println(s);
     413    }
     414   
    411415    private static class RingSegment {
    412416        private List<Node> nodes;
     
    512516
    513517        public void makeReference( RingSegment segment ) {
    514             System.out.println(this + " was made a reference to " + segment);
     518            log(this + " was made a reference to " + segment);
    515519            this.nodes = null;
    516520            this.references = segment;
Note: See TracChangeset for help on using the changeset viewer.