Changeset 329 in josm for branch/0.5/src/org/openstreetmap/josm/data/osm/DataSet.java

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:

• branch/0.5/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) (8 diffs)

branch/0.5/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -31 +31 @@
 
         /**
-         * All segments goes here, even when they are in a way.
+         * All ways (Streets etc.) in the DataSet.
+         *
+         * The way nodes are stored only in the way list.
          */
-        public Collection<Segment> segments = new LinkedList<Segment>();
+        public Collection<Way> ways = new LinkedList<Way>();
 
         /**
-         * All ways (Streets etc.) in the DataSet.
-         *
-         * The nodes of the way segments of this way must be objects from
-         * the nodes list, however the way segments are stored only in the
-         * way list.
+         * All relations/relationships
          */
-        public Collection<Way> ways = new LinkedList<Way>();
+        public Collection<Relation> relations = new LinkedList<Relation>();
 
         /**
@@ -55 +53 @@
          * selection does only change in the active layer)
          */
-        public static Collection<SelectionChangedListener> listeners = new LinkedList<SelectionChangedListener>();
+        public static Collection<SelectionChangedListener> selListeners = new LinkedList<SelectionChangedListener>();
 
         /**
          * @return A collection containing all primitives of the dataset. The
-         * data is ordered after: first comes nodes, then segments, then ways.
+         * data is ordered after: first come nodes, then ways, then relations.
          * Ordering in between the categories is not guaranteed.
          */
@@ -65 +63 @@
                 List<OsmPrimitive> o = new LinkedList<OsmPrimitive>();
                 o.addAll(nodes);
-                o.addAll(segments);
                 o.addAll(ways);
+                o.addAll(relations);
                 return o;
         }
@@ -88 +86 @@
         public void clearSelection() {
                 clearSelection(nodes);
-                clearSelection(segments);
                 clearSelection(ways);
+                clearSelection(relations);
                 Collection<OsmPrimitive> sel = Collections.emptyList();
                 fireSelectionChanged(sel);
@@ -100 +98 @@
         public Collection<OsmPrimitive> getSelected() {
                 Collection<OsmPrimitive> sel = getSelected(nodes);
-                sel.addAll(getSelected(segments));
                 sel.addAll(getSelected(ways));
+                sel.addAll(getSelected(relations));
                 return sel;
         }
@@ -107 +105 @@
         public void setSelected(Collection<? extends OsmPrimitive> selection) {
                 clearSelection(nodes);
-                clearSelection(segments);
                 clearSelection(ways);
+                clearSelection(relations);
                 for (OsmPrimitive osm : selection)
                         osm.selected = true;
@@ -120 +118 @@
                 }
                 clearSelection(nodes);
-                clearSelection(segments);
                 clearSelection(ways);
+                clearSelection(relations);
                 for (OsmPrimitive o : osm)
                         if (o != null)
@@ -158 +156 @@
          */
         public static void fireSelectionChanged(Collection<? extends OsmPrimitive> sel) {
-                for (SelectionChangedListener l : listeners)
+                for (SelectionChangedListener l : selListeners)
                         l.selectionChanged(sel);
         }
-
+        
         @Override public DataSet clone() {
                 DataSet ds = new DataSet();
                 for (Node n : nodes)
                         ds.nodes.add(new Node(n));
-                for (Segment s : segments)
-                        ds.segments.add(new Segment(s));
                 for (Way w : ways)
                         ds.ways.add(new Way(w));
+                for (Relation e : relations)
+                        ds.relations.add(new Relation(e));
                 for (DataSource source : dataSources)
                         ds.dataSources.add(new DataSource(source.bounds, source.origin));