Changeset 1836 in josm

Timestamp:

Jul 25, 2009 1:12:07 PM (4 years ago)

Author:

Gubaer

Message:

fixed in #3074: "Parent relations" doesn't work without communicating with the server

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs/relation

Files:

• ReferringRelationsBrowser.java (modified) (2 diffs)
• ReferringRelationsBrowserModel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java

@@ -58 +58 @@
     private final GenericRelationEditor relationEditor;
 
-    /** state flag for this browser. Initially initialized is false.
-     * It becomes initialized after the first download of the parent
-     * relations.
-     */
-    private boolean initialized;
-
     /**
      * build the GUI
@@ -97 +91 @@
     }
 
-
-    /**
-     * Replies true this browser has initialized itself by downloading the reference relations
-     * parents.
-     * 
-     * @return true this browser has initialized itself by downloading the reference relations
-     * parents; false, otherwise
-     */
-    public boolean isInitialized() {
-        return initialized;
-    }
-
     public void init() {
-        if (initialized) return;
-        initialized = true;
-        boolean full = cbReadFull.isSelected();
-        ReloadTask task = new ReloadTask(full, relationEditor);
-        Main.worker.submit(task);
+        model.populate(getLayer().data);
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowserModel.java

@@ -6 +6 @@
 import javax.swing.AbstractListModel;
 
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
@@ -66 +67 @@
     }
 
+    /**
+     * Populates the browser with the list of referring relations in the {@see DataSet} ds.
+     * 
+     * @param ds the data set
+     */
+    public void populate(DataSet ds) {
+        referrers.clear();
+        if (ds == null) {
+            fireModelUpdate();
+            return;
+        }
+        for (Relation parent : ds.relations) {
+            if (isReferringRelation(parent)) {
+                referrers.add(parent);
+            }
+        }
+        fireModelUpdate();
+    }
+
+
     public boolean canReload() {
         return relation != null && relation.id > 0;