Changeset 1911 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2009-08-05T10:05:50+02:00 (17 years ago)

Author:

Gubaer

Message:

fixed #3193: No layer is left highlighted when the bottom most one is deleted
fixed some references to Way.nodes
clean up of warnings
added documentation in LayerListDialog

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• conflict/Conflict.java (modified) (2 diffs)
• gpx/GpxData.java (modified) (2 diffs)
• osm/Way.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java

@@ -51 +51 @@
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     public boolean equals(Object obj) {
@@ -59 +60 @@
         if (getClass() != obj.getClass())
             return false;
-        Conflict<T> other = (Conflict) obj;
+        Conflict<T> other = (Conflict<T>) obj;
         if (my != other.my)
             return false;

trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java

@@ -40 +40 @@
     public Collection<WayPoint> waypoints = new LinkedList<WayPoint>();
 
+    @SuppressWarnings("unchecked")
     public void mergeFrom(GpxData other) {
         if (storageFile == null && other.storageFile != null) {
@@ -51 +52 @@
             if (k.equals(META_LINKS) && attr.containsKey(META_LINKS)) {
                 ((Collection<GpxLink>) attr.get(META_LINKS)).addAll(
-                    (Collection<GpxLink>) ent.getValue());
+                        (Collection<GpxLink>) ent.getValue());
             } else {
                 attr.put(k, ent.getValue());

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

@@ -71 +71 @@
     public Node getNode(int index) {
         return nodes.get(index);
+    }
+
+    /**
+     * Replies true if this way contains the node <code>node</code>, false
+     * otherwise. Replies false if  <code>node</code> is null.
+     * 
+     * @param node the node. May be null.
+     * @return true if this way contains the node <code>node</code>, false
+     * otherwise
+     * @since 1909
+     */
+    public boolean containsNode(Node node) {
+        if (node == null) return false;
+        return nodes.contains(node);
     }