Ignore:
Timestamp:
2007-09-24T01:36:24+02:00 (17 years ago)
Author:
framm
Message:

This commit is a manual merge of all changes that have been made to
the intermediate "core_0.5" branch on the main OSM repository,
bevore JOSM was moved to openstreetmap.de.

Changes incorporated here:

r4464@svn.openstreetmap.org
r4466@svn.openstreetmap.org
r4468@svn.openstreetmap.org
r4469@svn.openstreetmap.org
r4479@svn.openstreetmap.org

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branch/0.5/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java

    r298 r329  
    1 // License: GPL. Copyright 2007 by Immanuel Scholz and others
    2 package org.openstreetmap.josm.data.conflict;
    3 
    4 import static org.openstreetmap.josm.tools.I18n.tr;
    5 
    6 import org.openstreetmap.josm.data.osm.OsmPrimitive;
    7 import org.openstreetmap.josm.data.osm.Segment;
    8 import org.openstreetmap.josm.data.osm.Way;
    9 
    10 public class SegmentConflict extends ConflictItem {
    11        
    12         @Override public boolean hasConflict(OsmPrimitive key, OsmPrimitive value) {
    13                 return key instanceof Way && !((Way)key).segments.equals(((Way)value).segments);
    14         }
    15        
    16         @Override protected String str(OsmPrimitive osm) {
    17                 if (!(osm instanceof Way))
    18                         return null;
    19                 String s = "";
    20                 for (Segment ls : ((Way)osm).segments)
    21                         s += ls.id + ",";
    22                 return s.equals("") ? "<html><i>&lt;"+tr("none")+"&gt;</i></html>" : s.substring(0, s.length()-1);
    23         }
    24        
    25         @Override public String key() {
    26                 return "way|"+tr("segments");
    27         }
    28        
    29         @Override public void apply(OsmPrimitive target, OsmPrimitive other) {
    30                 if (!(target instanceof Way))
    31                         return;
    32                 ((Way)target).segments.clear();
    33                 ((Way)target).segments.addAll(((Way)other).segments);
    34     }
    35 }
Note: See TracChangeset for help on using the changeset viewer.