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

Timestamp:

2006-04-23T19:51:19+02:00 (19 years ago)

Author:

imi

Message:

• changed Add Way mode, so that ways can be modified
• added Command Stack dialog (list the undo buffer)
• fixed Exception in download gps data

Location:

src/org/openstreetmap/josm/data

Files:

• SelectionChangedListener.java (modified) (1 diff)
• osm/DataSet.java (modified) (3 diffs)
• osm/Node.java (modified) (1 diff)
• osm/OsmPrimitive.java (modified) (1 diff)
• osm/Segment.java (modified) (1 diff)
• osm/Way.java (modified) (1 diff)
• osm/visitor/NameVisitor.java (modified) (2 diffs)

src/org/openstreetmap/josm/data/SelectionChangedListener.java

@@ -22 +22 @@
          * @param newSelection The new selection.
          */
-        public void selectionChanged(Collection<OsmPrimitive> newSelection);
+        public void selectionChanged(Collection<? extends OsmPrimitive> newSelection);
 }

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

@@ -1 +1 @@
 package org.openstreetmap.josm.data.osm;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -91 +92 @@
         }
 
-        public void setSelected(Collection<OsmPrimitive> selection) {
+        public void setSelected(Collection<? extends OsmPrimitive> selection) {
                 clearSelection();
                 for (OsmPrimitive osm : selection)
                         osm.selected = true;
                 fireSelectionChanged(selection);
+        }
+
+        public void setSelected(OsmPrimitive osm) {
+                clearSelection();
+                if (osm == null)
+                        return;
+                osm.selected = true;
+                fireSelectionChanged(Arrays.asList(new OsmPrimitive[]{osm}));
         }
         
@@ -127 +136 @@
      * the event immediately. For more, @see SelectionChangedListener
      */
-    private void fireSelectionChanged(Collection<OsmPrimitive> sel) {
+    public void fireSelectionChanged(Collection<? extends OsmPrimitive> sel) {
                 for (SelectionChangedListener l : listeners)
                         l.selectionChanged(sel);

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

@@ -46 +46 @@
                 return osm instanceof Node ? super.realEqual(osm) && coor.equals(((Node)osm).coor) : false;
     }
+
+        public int compareTo(OsmPrimitive o) {
+            return o instanceof Node ? Long.valueOf(id).compareTo(o.id) : -1;
+    }
 }

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

@@ -23 +23 @@
  * @author imi
  */
-abstract public class OsmPrimitive {
+abstract public class OsmPrimitive implements Comparable<OsmPrimitive> {
 
         /**

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

@@ -85 +85 @@
                                 to.equals(((Segment)osm).to) : false;
         }
-}       
+
+        public int compareTo(OsmPrimitive o) {
+                return o instanceof Segment ? Long.valueOf(id).compareTo(o.id) : (o instanceof Node ? 1 : -1);
+        }
+}

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

@@ -46 +46 @@
                 return osm instanceof Way ? super.realEqual(osm) && segments.equals(((Way)osm).segments) : false;
     }
+
+        public int compareTo(OsmPrimitive o) {
+            return o instanceof Way ? Long.valueOf(id).compareTo(o.id) : 1;
+    }
 }

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

@@ -6 +6 @@
 
 import javax.swing.Icon;
+import javax.swing.JLabel;
 
 import org.openstreetmap.josm.data.osm.Segment;
@@ -82 +83 @@
                 className = "way";
         }
+        
+        public JLabel toLabel() {
+                return new JLabel(name, icon, JLabel.HORIZONTAL);
+        }
 }