Changeset 1828 in josm

Timestamp:

Jul 25, 2009 11:19:33 AM (4 years ago)

Author:

Gubaer

Message:

new: tree-like browser for child relations
new: action/task for recursively downloading all child relations. Use case: download a complete network with cycle routes in one step
applied #2953: patch by cjw - Sorting a relation adds new members or crashes

Location:

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

Files:

• ChildRelationBrowser.java (added)
• GenericRelationEditor.java (modified) (4 diffs)
• MemberTableModel.java (modified) (2 diffs)
• ReferringRelationsBrowser.java (modified) (2 diffs)
• ReferringRelationsBrowserModel.java (modified) (1 diff)
• RelationDialogManager.java (modified) (2 diffs)
• RelationEditor.java (modified) (2 diffs)
• RelationTree.java (added)
• RelationTreeCellRenderer.java (added)
• RelationTreeModel.java (added)

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

@@ -40 +40 @@
 import javax.swing.KeyStroke;
 import javax.swing.SwingUtilities;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
@@ -92 +94 @@
     private AutoCompletionCache acCache;
     private AutoCompletionList acList;
+    private ReferringRelationsBrowser referrerBrowser;
     private ReferringRelationsBrowserModel referrerModel;
 
@@ -152 +155 @@
         tabbedPane.add(tr("Tags and Members"), pnl);
         if (relation != null && relation.id > 0) {
-            tabbedPane.add(tr("Parent Relations"), new ReferringRelationsBrowser(getLayer(), referrerModel, this));
-        }
+            referrerBrowser = new ReferringRelationsBrowser(getLayer(), referrerModel, this);
+            tabbedPane.add(tr("Parent Relations"), referrerBrowser);
+        }
+        tabbedPane.add(tr("Child Relations"), new ChildRelationBrowser(getLayer(), relation));
+        tabbedPane.addChangeListener(
+                new ChangeListener() {
+                    public void stateChanged(ChangeEvent e) {
+                        JTabbedPane sourceTabbedPane = (JTabbedPane) e.getSource();
+                        int index = sourceTabbedPane.getSelectedIndex();
+                        String title = sourceTabbedPane.getTitleAt(index);
+                        if (title.equals(tr("Parent Relations"))) {
+                            referrerBrowser.init();
+                        }
+                    }
+                }
+        );
 
         getContentPane().add(tabbedPane, BorderLayout.CENTER);
@@ -765 +782 @@
             Shortcut.registerShortcut("relationeditor:sort", tr("Relation Editor: Sort"), KeyEvent.VK_T,
                     Shortcut.GROUP_MNEMONIC);
-            setEnabled(false);
+            //setEnabled(false);
         }
 

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

@@ -415 +415 @@
          */
 
-        if (map.isEmpty())
+        if (map.isEmpty()) {
             // empty relation or incomplete members
             return;
+        }
         segments = new Vector<LinkedList<Integer>>();
-        // add first member of relation, not strictly necessary
-        if (map.remove(0, members.get(0))) {
+
+        while (!map.isEmpty()) {
+            // find an element for the next segment
+            // try first element in relation if we just started
+            // otherwise, or if first element is another relation, just fetch some element from the
+            // map
+            Integer next;
+            if ((segments.size() == 0) && map.remove(0, members.get(0))) {
+                next = 0;
+            } else {
+                next = map.pop();
+                if (next == null) {
+                    break;
+                }
+            }
+
             segment = new LinkedList<Integer>();
-            segment.add(Integer.valueOf(0));
+            segment.add(next);
             segments.add(segment);
-        }
-        while (!map.isEmpty()) {
-            segment = segments.lastElement();
 
             do {
@@ -516 +528 @@
             } while (something_done);
 
-            Integer next = map.pop();
-            if (next == null) {
-                break;
-            }
-
+        }
+        if (segments.size() > 0) {
+            // append map.remaining() to segments list (as a single segment)
             segment = new LinkedList<Integer>();
-            segment.add(next);
+            segment.addAll(map.getRemaining());
             segments.add(segment);
-        }
-        // append map.remaining() to segments list (as a single segment)
-        segment = new LinkedList<Integer>();
-        segment.addAll(map.getRemaining());
-        segments.add(segment);
-
-        // now we need to actually re-order the relation members
-        ArrayList<RelationMember> newmembers = new ArrayList<RelationMember>();
-        for (LinkedList<Integer> segment2 : segments) {
-            for (Integer p : segment2) {
-                newmembers.add(members.get(p));
-            }
-        }
-        members.clear();
-        members.addAll(newmembers);
-
-        fireTableDataChanged();
+
+            // now we need to actually re-order the relation members
+            ArrayList<RelationMember> newmembers = new ArrayList<RelationMember>();
+            for (LinkedList<Integer> segment2 : segments) {
+                for (Integer p : segment2) {
+                    newmembers.add(members.get(p));
+                }
+            }
+            members.clear();
+            members.addAll(newmembers);
+
+            fireTableDataChanged();
+        }
     }
 

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
@@ -89 +95 @@
         this.layer = layer;
         build();
+    }
+
+
+    /**
+     * 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);
     }
 

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;

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

@@ -22 +22 @@
  */
 public class RelationDialogManager extends WindowAdapter implements LayerChangeListener{
+
+    /** keeps track of open relation editors */
+    static RelationDialogManager relationDialogManager;
+
+    /**
+     * Replies the singleton {@see RelationDialogManager}
+     * 
+     * @return the singleton {@see RelationDialogManager}
+     */
+    static public RelationDialogManager getRelationDialogManager() {
+        if (RelationDialogManager.relationDialogManager == null) {
+            RelationDialogManager.relationDialogManager = new RelationDialogManager();
+            Layer.listeners.add(RelationDialogManager.relationDialogManager);
+        }
+        return RelationDialogManager.relationDialogManager;
+    }
 
     /**
@@ -251 +267 @@
         }
     }
+
 }

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

@@ -13 +13 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.gui.ExtendedDialog;
-import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 
 public abstract class RelationEditor extends ExtendedDialog {
 
-    /** keeps track of open relation editors */
-    static private RelationDialogManager relationDialogManager;
+    /** the list of registered relation editor classes */
+    private static ArrayList<Class<RelationEditor>> editors = new ArrayList<Class<RelationEditor>>();
 
     /**
-     * Replies the singleton {@see RelationDialogManager}
+     * Registers a relation editor class. Depending on the type of relation to be edited
+     * {@see #getEditor(OsmDataLayer, Relation, Collection)} will create an instance of
+     * this class.
      * 
-     * @return the singleton {@see RelationDialogManager}
+     * @param clazz the class
      */
-    static public RelationDialogManager getRelationDialogManager() {
-        if (relationDialogManager == null) {
-            relationDialogManager = new RelationDialogManager();
-            Layer.listeners.add(relationDialogManager);
+    public void registerRelationEditor(Class<RelationEditor> clazz) {
+        if (clazz == null) return;
+        if (!editors.contains(clazz)) {
+            editors.add(clazz);
         }
-        return relationDialogManager;
     }
-
-    public static ArrayList<Class<RelationEditor>> editors = new ArrayList<Class<RelationEditor>>();
 
     /**
@@ -81 +79 @@
             }
         }
-        if (getRelationDialogManager().isOpenInEditor(layer, r))
-            return getRelationDialogManager().getEditorForRelation(layer, r);
+        if (RelationDialogManager.getRelationDialogManager().isOpenInEditor(layer, r))
+            return RelationDialogManager.getRelationDialogManager().getEditorForRelation(layer, r);
         else {
             RelationEditor editor = new GenericRelationEditor(layer, r, selectedMembers);
-            getRelationDialogManager().positionOnScreen(editor);
-            getRelationDialogManager().register(layer, r, editor);
+            RelationDialogManager.getRelationDialogManager().positionOnScreen(editor);
+            RelationDialogManager.getRelationDialogManager().register(layer, r, editor);
             return editor;
         }