Changeset 290 in josm for src/org/openstreetmap/josm/data

Timestamp:

2007-07-18T23:12:56+02:00 (18 years ago)

Author:

imi

Message:

• added support for multiple data layers

Location:

src/org/openstreetmap/josm/data

Files:

• DataSetChecker.java (added)
• coor/Coordinate.java (modified) (1 diff)
• osm/DataSet.java (modified) (3 diffs)
• osm/DataSource.java (modified) (1 diff)
• osm/Node.java (modified) (1 diff)
• osm/Segment.java (modified) (1 diff)
• osm/Way.java (modified) (1 diff)
• osm/visitor/SimplePaintVisitor.java (modified) (7 diffs)

src/org/openstreetmap/josm/data/coor/Coordinate.java

@@ -20 +20 @@
          * Either easting or latitude
          */
-        double x;
+        final double x;
         /**
          * Either northing or longitude
          */
-        double y;
+        final double y;
 
         /**

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

@@ -20 +20 @@
  * @author imi
  */
-public class DataSet {
+public class DataSet implements Cloneable {
 
         /**
@@ -49 +49 @@
         
         /**
-         * A list of listeners to selection changed events.
+         * A list of listeners to selection changed events. The list is static,
+         * as listeners register themself for any dataset selection changes that 
+         * occour, regardless of the current active dataset. (However, the
+         * selection does only change in the active layer)
          */
-        transient public Collection<SelectionChangedListener> listeners = new LinkedList<SelectionChangedListener>();
+        public static Collection<SelectionChangedListener> listeners = new LinkedList<SelectionChangedListener>();
 
         /**
@@ -144 +147 @@
          * the event immediately. For more, @see SelectionChangedListener
          */
-        public void fireSelectionChanged(Collection<? extends OsmPrimitive> sel) {
+        public static void fireSelectionChanged(Collection<? extends OsmPrimitive> sel) {
                 for (SelectionChangedListener l : listeners)
                         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 (DataSource source : dataSources)
+                        ds.dataSources.add(new DataSource(source.bounds, source.origin));
+            return ds;
+    }
 }

src/org/openstreetmap/josm/data/osm/DataSource.java

@@ -3 +3 @@
 import org.openstreetmap.josm.data.Bounds;
 
-public class DataSource {
-        public Bounds bounds;
-        public String origin;
+public class DataSource implements Cloneable {
+        public final Bounds bounds;
+        public final String origin;
+        
+        public DataSource(Bounds bounds, String origin) {
+            this.bounds = bounds;
+            this.origin = origin;
+    }
+
+        @Override protected Object clone() throws CloneNotSupportedException {
+            return new DataSource(bounds, origin);
+    }
 }

src/org/openstreetmap/josm/data/osm/Node.java

@@ -12 +12 @@
  * @author imi
  */
-public class Node extends OsmPrimitive {
+public final class Node extends OsmPrimitive {
         
         public LatLon coor;

src/org/openstreetmap/josm/data/osm/Segment.java

@@ -9 +9 @@
  * @author imi
  */
-public class Segment extends OsmPrimitive {
+public final class Segment extends OsmPrimitive {
 
         /**

src/org/openstreetmap/josm/data/osm/Way.java

@@ -12 +12 @@
  * @author imi
  */
-public class Way extends OsmPrimitive {
+public final class Way extends OsmPrimitive {
 
         /**

src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java

@@ -36 +36 @@
          */
         protected NavigatableComponent nc;
+        
+        public boolean inactive;
 
         protected static final double PHI = Math.toRadians(20);
@@ -41 +43 @@
         public void visitAll(DataSet data) {
                 for (final OsmPrimitive osm : data.segments)
-                        if (!osm.deleted)
+                        if (!osm.deleted && !osm.selected)
                                 osm.visit(this);
                 for (final OsmPrimitive osm : data.ways)
-                        if (!osm.deleted)
+                        if (!osm.deleted && !osm.selected)
                                 osm.visit(this);
                 for (final OsmPrimitive osm : data.nodes)
-                        if (!osm.deleted)
+                        if (!osm.deleted && !osm.selected)
                                 osm.visit(this);
                 for (final OsmPrimitive osm : data.getSelected())
@@ -61 +63 @@
          */
         public void visit(Node n) {
-                drawNode(n, n.selected ? getPreferencesColor("selected", Color.WHITE)
-                                : getPreferencesColor("node", Color.RED));
+                Color color = null;
+                if (inactive)
+                        color = getPreferencesColor("inactive", Color.DARK_GRAY);
+                else if (n.selected)
+                        color = getPreferencesColor("selected", Color.WHITE);
+                else
+                        color = getPreferencesColor("node", Color.RED);
+                drawNode(n, color);
         }
 
@@ -70 +78 @@
          */
         public void visit(Segment ls) {
-                drawSegment(ls, getPreferencesColor("segment", darkgreen), Main.pref.getBoolean("draw.segment.direction"));
+                Color color;
+                if (inactive)
+                        color = getPreferencesColor("inactive", Color.DARK_GRAY);
+                else if (ls.selected)
+                        color = getPreferencesColor("selected", Color.WHITE);
+                else
+                        color = getPreferencesColor("segment", darkgreen);
+                drawSegment(ls, color, Main.pref.getBoolean("draw.segment.direction"));
         }
 
@@ -78 +93 @@
          */
         public void visit(Way w) {
-                // only to overwrite with blue
-                Color wayColor = getPreferencesColor("way", darkblue);
-                for (Segment ls : w.segments) {
-                        if (ls.incomplete) {
-                                wayColor = getPreferencesColor("incomplete way", darkerblue);
-                                break;
+                Color wayColor;
+                if (inactive)
+                        wayColor = getPreferencesColor("inactive", Color.DARK_GRAY);
+                else {
+                        wayColor = getPreferencesColor("way", darkblue);
+                        for (Segment ls : w.segments) {
+                                if (ls.incomplete) {
+                                        wayColor = getPreferencesColor("incomplete way", darkerblue);
+                                        break;
+                                }
                         }
                 }
@@ -93 +112 @@
                         orderNumber++;
                         if (!ls.selected) // selected already in good color
-                                drawSegment(ls, w.selected ? getPreferencesColor("selected", Color.WHITE) : wayColor, showDirectionArrow);
+                                drawSegment(ls, w.selected && !inactive ? getPreferencesColor("selected", Color.WHITE) : wayColor, showDirectionArrow);
                         if (!ls.incomplete && showOrderNumber)
                                 drawOrderNumber(ls, orderNumber);
@@ -140 +159 @@
                 if (ls.incomplete)
                         return;
-                if (ls.selected)
-                        col = getPreferencesColor("selected", Color.WHITE);
                 g.setColor(col);
                 Point p1 = nc.getPoint(ls.from.eastNorth);