Changeset 2686 in josm

Timestamp:

Dec 28, 2009 12:14:33 AM (3 years ago)

Author:

Gubaer

Message:

Partial commit due to issue described in #4137
Breaks the build

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• Bounds.java (modified) (1 diff)
• osm/Changeset.java (modified) (2 diffs)
• osm/ChangesetCache.java (modified) (5 diffs)
• osm/ChangesetDataSet.java (added)
• osm/NameFormatter.java (modified) (1 diff)
• osm/UserInfo.java (modified) (2 diffs)
• osm/history/HistoryNameFormatter.java (added)
• osm/history/HistoryNode.java (modified) (1 diff)
• osm/history/HistoryOsmPrimitive.java (modified) (2 diffs)
• osm/history/HistoryRelation.java (modified) (1 diff)
• osm/history/HistoryWay.java (modified) (1 diff)
• osm/visitor/BoundingXYVisitor.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/data/Bounds.java

@@ -69 +69 @@
             }
         }
+        if (!LatLon.isValidLat(values[0]))
+            throw new IllegalArgumentException(tr("Illegal latitude value ''{0}''", values[0]));
+        if (!LatLon.isValidLon(values[1]))
+            throw new IllegalArgumentException(tr("Illegal longitude value ''{0}''", values[1]));
+        if (!LatLon.isValidLat(values[2]))
+            throw new IllegalArgumentException(tr("Illegal latitude value ''{0}''", values[2]));
+        if (!LatLon.isValidLon(values[3]))
+            throw new IllegalArgumentException(tr("Illegal latitude value ''{0}''", values[3]));
+
         this.min = new LatLon(values[0], values[1]);
         this.max = new LatLon(values[2], values[3]);

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

@@ -37 +37 @@
      */
     private boolean incomplete;
+    /** the changeset content */
+    private ChangesetDataSet content = null;
 
     /**
@@ -275 +277 @@
         this.tags = new HashMap<String, String>(other.tags);
         this.incomplete = other.incomplete;
+
+        // FIXME: merging of content required?
+        this.content = other.content;
+    }
+
+    public boolean hasContent() {
+        return content != null;
+    }
+
+    public ChangesetDataSet getContent() {
+        return content;
+    }
+
+    public void setContent(ChangesetDataSet content) {
+        this.content = content;
     }
 }

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

@@ -5 +5 @@
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.logging.Logger;
+
+import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.Main;
@@ -13 +18 @@
 import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
 
+/**
+ * ChangesetCache is global in-memory cache for changesets downloaded from
+ * an OSM API server. The unique instance is available as singleton, see
+ * {@see #getInstance()}.
+ *
+ * Clients interested in cache updates can register for {@see ChangesetCacheEvent}s
+ * using {@see #addChangesetCacheListener(ChangesetCacheListener)}. They can use
+ * {@see #removeChangesetCacheListener(ChangesetCacheListener)} to unregister as
+ * cache event listener.
+ * 
+ * The cache itself listens to {@see java.util.prefs.PreferenceChangeEvent}s. It
+ * clears itself if the OSM API URL is changed in the preferences.
+ * 
+ * {@see ChangesetCacheEvent}s are delivered on the EDT.
+ * 
+ */
 public class ChangesetCache implements PreferenceChangedListener{
-    //static private final Logger logger = Logger.getLogger(ChangesetCache.class.getName());
+    static private final Logger logger = Logger.getLogger(ChangesetCache.class.getName());
+
+    /** the unique instance */
     static private final ChangesetCache instance = new ChangesetCache();
 
+    /**
+     * Replies the unique instance of the cache
+     * 
+     * @return the unique instance of the cache
+     */
     public static ChangesetCache getInstance() {
         return instance;
     }
 
+    /** the cached changesets */
     private final Map<Integer, Changeset> cache  = new HashMap<Integer, Changeset>();
 
@@ -31 +60 @@
 
     public void addChangesetCacheListener(ChangesetCacheListener listener) {
-        if (listener != null) {
-            listeners.addIfAbsent(listener);
+        synchronized(listeners) {
+            if (listener != null && ! listeners.contains(listener)) {
+                listeners.add(listener);
+            }
         }
     }
 
     public void removeChangesetCacheListener(ChangesetCacheListener listener) {
-        listeners.remove(listener);
-    }
-
-    protected void fireChangesetCacheEvent(ChangesetCacheEvent e) {
-        for(ChangesetCacheListener l: listeners) {
-            l.changesetCacheUpdated(e);
+        synchronized(listeners) {
+            if (listener != null && listeners.contains(listener)) {
+                listeners.remove(listener);
+            }
+        }
+    }
+
+    protected void fireChangesetCacheEvent(final ChangesetCacheEvent e) {
+        Runnable r = new Runnable() {
+            public void run() {
+                for(ChangesetCacheListener l: listeners) {
+                    l.changesetCacheUpdated(e);
+                }
+            }
+        };
+        if (SwingUtilities.isEventDispatchThread()) {
+            r.run();
+        } else {
+            SwingUtilities.invokeLater(r);
         }
     }
@@ -89 +133 @@
     }
 
+    public Set<Changeset> getChangesets() {
+        return new HashSet<Changeset>(cache.values());
+    }
+
     protected void remove(int id, DefaultChangesetCacheEvent e) {
         if (id <= 0) return;
@@ -111 +159 @@
     }
 
+    /**
+     * Removes the changesets in <code>changesets</code> from the cache. A
+     * {@see ChangesetCacheEvent} is fired.
+     * 
+     * @param changesets the changesets to remove. Ignored if null.
+     */
+    public void remove(Collection<Changeset> changesets) {
+        if (changesets == null) return;
+        DefaultChangesetCacheEvent evt = new DefaultChangesetCacheEvent(this);
+        for (Changeset cs : changesets) {
+            if (cs == null || cs.isNew()) {
+                continue;
+            }
+            remove(cs.getId(), evt);
+        }
+        if (! evt.isEmpty()) {
+            fireChangesetCacheEvent(evt);
+        }
+    }
+
     public int size() {
         return cache.size();

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.osm;
+
 
 public interface NameFormatter {

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

@@ -9 +9 @@
 public class UserInfo {
     /** the user id */
-    private long id;
+    private int id;
     /** the display name */
     private String displayName;
@@ -27 +27 @@
     }
 
-    public long getId() {
+    public int getId() {
         return id;
     }
-    public void setId(long id) {
+    public void setId(int id) {
         this.id = id;
     }

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryNode.java

@@ -34 +34 @@
         this.coords = coords;
     }
+
+    @Override
+    public String getDisplayName(HistoryNameFormatter formatter) {
+        return formatter.format(this);
+    }
 }

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java

@@ -7 +7 @@
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 
@@ -146 +147 @@
     }
 
+    /**
+     * Replies the name of this primitive. The default implementation replies the value
+     * of the tag <tt>name</tt> or null, if this tag is not present.
+     *
+     * @return the name of this primitive
+     */
+    public String getName() {
+        if (get("name") != null)
+            return get("name");
+        return null;
+    }
+
+    /**
+     * Replies the display name of a primitive formatted by <code>formatter</code>
+     *
+     * @return the display name
+     */
+    public abstract String getDisplayName(HistoryNameFormatter formatter);
+
+    /**
+     * Replies the a localized name for this primitive given by the value of the tags (in this order)
+     * <ul>
+     *   <li>name:lang_COUNTRY_Variant  of the current locale</li>
+     *   <li>name:lang_COUNTRY of the current locale</li>
+     *   <li>name:lang of the current locale</li>
+     *   <li>name of the current locale</li>
+     * </ul>
+     *
+     * null, if no such tag exists
+     *
+     * @return the name of this primitive
+     */
+    public String getLocalName() {
+        String key = "name:" + Locale.getDefault().toString();
+        if (get(key) != null)
+            return get(key);
+        key = "name:" + Locale.getDefault().getLanguage() + "_" + Locale.getDefault().getCountry();
+        if (get(key) != null)
+            return get(key);
+        key = "name:" + Locale.getDefault().getLanguage();
+        if (get(key) != null)
+            return get(key);
+        return getName();
+    }
+
+
+
     @Override
     public int hashCode() {

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java

@@ -111 +111 @@
         members.add(member);
     }
+
+    @Override
+    public String getDisplayName(HistoryNameFormatter formatter) {
+        return formatter.format(this);
+    }
 }

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java

@@ -77 +77 @@
         nodeIds.add(ref);
     }
+
+    /**
+     * Replies true if this way is closed.
+     * 
+     * @return true if this way is closed.
+     */
+    public boolean isClosed() {
+        return getNumNodes() >= 3 && nodeIds.get(0) == nodeIds.get(nodeIds.size()-1);
+    }
+
+    @Override
+    public String getDisplayName(HistoryNameFormatter formatter) {
+        return formatter.format(this);
+    }
 }

trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java

@@ -1 +1 @@
 // License: GPL. Copyright 2007 by Immanuel Scholz and others
 package org.openstreetmap.josm.data.osm.visitor;
+
+import java.util.Collection;
 
 import org.openstreetmap.josm.Main;
@@ -29 +31 @@
     public void visit(Way w) {
         if (w.isIncomplete()) return;
-        for (Node n : w.getNodes())
+        for (Node n : w.getNodes()) {
             visit(n);
+        }
     }
 
@@ -61 +64 @@
         if(latlon != null)
         {
-            if(latlon instanceof CachedLatLon)
+            if(latlon instanceof CachedLatLon) {
                 visit(((CachedLatLon)latlon).getEastNorth());
-            else
+            } else {
                 visit(Main.proj.latlon2eastNorth(latlon));
+            }
         }
     }
@@ -70 +74 @@
     public void visit(EastNorth eastNorth) {
         if (eastNorth != null) {
-            if (bounds == null)
+            if (bounds == null) {
                 bounds = new ProjectionBounds(eastNorth);
-            else
+            } else {
                 bounds.extend(eastNorth);
+            }
         }
     }
@@ -111 +116 @@
         LatLon maxLatlon = Main.proj.eastNorth2latlon(bounds.max);
         bounds = new ProjectionBounds(
-        Main.proj.latlon2eastNorth(new LatLon(minLatlon.lat() - enlargeDegree, minLatlon.lon() - enlargeDegree)),
-        Main.proj.latlon2eastNorth(new LatLon(maxLatlon.lat() + enlargeDegree, maxLatlon.lon() + enlargeDegree)));
+                Main.proj.latlon2eastNorth(new LatLon(minLatlon.lat() - enlargeDegree, minLatlon.lon() - enlargeDegree)),
+                Main.proj.latlon2eastNorth(new LatLon(maxLatlon.lat() + enlargeDegree, maxLatlon.lon() + enlargeDegree)));
     }
 
@@ -118 +123 @@
         return "BoundingXYVisitor["+bounds+"]";
     }
+
+    public void computeBoundingBox(Collection<? extends OsmPrimitive> primitives) {
+        if (primitives == null) return;
+        for (OsmPrimitive p: primitives) {
+            if (p == null) {
+                continue;
+            }
+            p.visit(this);
+        }
+    }
 }