Changeset 1806 in josm

Timestamp:

Jul 18, 2009 11:31:42 PM (4 years ago)

Author:

Gubaer

Message:

added OsmServerBackreferenceReader - reads primitives referring to a particular primitive (ways including a node, relations referring to a relation)
Extended relation dialog - now supports querying for parent relation(s)

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) (10 diffs)
• src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java (added)
• src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowserModel.java (added)
• src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java (added)
• src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/OsmReader.java (modified) (2 diffs)
• src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java (added)
• test/config/test-functional-env.properties (moved) (moved from trunk/test/functional/test-functional-env.properties) (1 diff)
• test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified) (5 diffs)
• test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (added)
• test/unit/org/openstreetmap/josm/data/osm/RelationTest.java (added)

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

@@ -31 +31 @@
 import javax.swing.JScrollPane;
 import javax.swing.JSplitPane;
+import javax.swing.JTabbedPane;
 import javax.swing.JTable;
 import javax.swing.JTextField;
 import javax.swing.KeyStroke;
 import javax.swing.ListSelectionModel;
+import javax.swing.SwingUtilities;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
@@ -87 +89 @@
     private AutoCompletionCache acCache;
     private AutoCompletionList acList;
+    private ReferringRelationsBrowserModel referrerModel;
 
     /** the member table */
@@ -121 +124 @@
         memberTableModel = new MemberTableModel();
         selectionTableModel = new SelectionTableModel(getLayer());
+        referrerModel = new ReferringRelationsBrowserModel(relation);
 
         // populate the models
@@ -143 +147 @@
 
         getContentPane().setLayout(new BorderLayout());
-        getContentPane().add(pnl,BorderLayout.CENTER);
+        JTabbedPane tabbedPane = new JTabbedPane();
+        tabbedPane.add(tr("Tags and Members"), pnl);
+        if (relation != null && relation.id > 0) {
+            tabbedPane.add(tr("Parent Relations"), new ReferringRelationsBrowser(getLayer(), referrerModel));
+        }
+
+        getContentPane().add(tabbedPane,BorderLayout.CENTER);
         getContentPane().add(buildOkCancelButtonPanel(), BorderLayout.SOUTH);
 
@@ -381 +391 @@
         JPanel pnl = new JPanel();
         pnl.setLayout(new BorderLayout());
-
-        JTable tbl = new JTable(selectionTableModel,new SelectionTableColumnModel());
+        JTable tbl = new JTable(selectionTableModel,new SelectionTableColumnModel(memberTableModel));
         tbl.setEnabled(false);
-
         JScrollPane pane = new JScrollPane(tbl);
         pnl.add(pane, BorderLayout.CENTER);
@@ -533 +541 @@
         //--- copy relation action
         buttonPanel.add(new SideButton(new DuplicateRelationAction()));
+
+        // -- edit action
+        EditAction editAction = new EditAction();
+        memberTableModel.getSelectionModel().addListSelectionListener(editAction);
+        buttonPanel.add(new SideButton(editAction));
         return buttonPanel;
     }
@@ -966 +979 @@
     }
 
+    /**
+     * Action for editing the currently selected relation
+     * 
+     *
+     */
+    class EditAction extends AbstractAction implements ListSelectionListener {
+        public EditAction() {
+            putValue(SHORT_DESCRIPTION, tr("Edit the relation the currently selected relation member refers to"));
+            putValue(SMALL_ICON, ImageProvider.get("dialogs", "edit"));
+            putValue(NAME, tr("Edit"));
+            refreshEnabled();
+        }
+
+        protected void refreshEnabled() {
+            setEnabled(memberTable.getSelectedRowCount() == 1 && memberTableModel.isEditableRelation(memberTable.getSelectedRow()));
+        }
+
+        public void actionPerformed(ActionEvent e) {
+            int idx = memberTable.getSelectedRow();
+            if (idx < 0) return;
+            OsmPrimitive primitive = memberTableModel.getReferredPrimitive(idx);
+            if (! (primitive instanceof Relation)) return;
+            Relation r= (Relation)primitive;
+            if (r.incomplete) return;
+            RelationEditor editor = RelationEditor.getEditor(getLayer(), r, null);
+            editor.setVisible(true);
+        }
+
+        public void valueChanged(ListSelectionEvent e) {
+            refreshEnabled();
+        }
+    }
+
+    /**
+     * The asynchronous task for downloading relation members.
+     * 
+     *
+     */
     class DownloadTask extends PleaseWaitRunnable {
         private boolean cancelled;
         private Exception lastException;
-
-        protected void setIndeterminateEnabled(final boolean enabled) {
-            EventQueue.invokeLater(
-                    new Runnable() {
-                        public void run() {
-                            Main.pleaseWaitDlg.setIndeterminate(enabled);
-                        }
-                    }
-            );
-        }
 
         public DownloadTask() {
@@ -1013 +1054 @@
         protected void realRun() throws SAXException, IOException, OsmTransferException {
             try {
-                Main.pleaseWaitDlg.setAlwaysOnTop(true);
-                Main.pleaseWaitDlg.toFront();
-                setIndeterminateEnabled(true);
+                SwingUtilities.invokeLater(
+                        new Runnable() {
+                            public void run() {
+                                Main.pleaseWaitDlg.setAlwaysOnTop(true);
+                                Main.pleaseWaitDlg.toFront();
+                                Main.pleaseWaitDlg.setIndeterminate(true);
+                            }
+                        }
+                );
                 OsmServerObjectReader reader = new OsmServerObjectReader(getRelation().id, OsmPrimitiveType.RELATION, true);
                 DataSet dataSet = reader.parseOsm();
@@ -1026 +1073 @@
                         getLayer().data.dataSources.add(src);
                     }
-                    getLayer().fireDataChange();
-
+                    // FIXME: this is necessary because there are  dialogs listening
+                    // for DataChangeEvents which manipulate Swing components on this
+                    // thread.
+                    //
+                    SwingUtilities.invokeLater(
+                            new Runnable() {
+                                public void run() {
+                                    getLayer().fireDataChange();
+                                }
+                            }
+                    );
                     if (visitor.getConflicts().isEmpty())
                         return;
@@ -1049 +1105 @@
                 lastException = e;
             } finally {
-                Main.pleaseWaitDlg.setAlwaysOnTop(false);
-                setIndeterminateEnabled(false);
+                SwingUtilities.invokeLater(
+                        new Runnable() {
+                            public void run() {
+                                Main.pleaseWaitDlg.setAlwaysOnTop(false);
+                                Main.pleaseWaitDlg.setIndeterminate(false);
+                            }
+                        }
+                );
             }
         }

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

@@ -379 +379 @@
         }
     }
+
+    public boolean isEditableRelation(int row) {
+        if (row < 0 || row >= members.size()) return false;
+        RelationMember member = members.get(row);
+        if (!(member.member instanceof Relation)) return false;
+        Relation r = (Relation)member.member;
+        return ! r.incomplete;
+    }
 }

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

@@ -7 +7 @@
 import javax.swing.table.TableColumn;
 
-import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
-
 public class SelectionTableColumnModel  extends DefaultTableColumnModel {
-    public SelectionTableColumnModel() {
+    public SelectionTableColumnModel(MemberTableModel model) {
         TableColumn col = null;
-        OsmPrimitivRenderer renderer = new OsmPrimitivRenderer();
+        SelectionTableCellRenderer renderer = new SelectionTableCellRenderer();
+        renderer.setMemberTableModel(model);
 
         // column 0 - the member role

trunk/src/org/openstreetmap/josm/io/OsmReader.java

@@ -11 +11 @@
 import java.util.Date;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.Map;
-import java.util.Set;
 import java.util.Map.Entry;
 import java.util.logging.Logger;
@@ -352 +350 @@
                 w.incomplete = true;
                 w.nodes.clear();
+                adder.visit(w);
             } else {
                 e.getKey().copyTo(w);

trunk/test/config/test-functional-env.properties

@@ -16 +16 @@
 #   temporary results 
 #
-test.functional.tempdir=C:\\data\\projekte\\eclipse-3.4.1-ws\\JOSM-new\\test\\data\\temp
+test.functional.tempdir=C:\\data\\projekte\\eclipse-3.4.1-ws\\JOSM-1769\\test\\data\\temp
 

trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java

@@ -258 +258 @@
         }
         assertTrue(reader.getMissingPrimitives().isEmpty());
-        //assertTrue(reader.getSkippedWays().isEmpty());
     }
 
@@ -279 +278 @@
         }
         assertTrue(reader.getMissingPrimitives().isEmpty());
-        //assertTrue(reader.getSkippedWays().isEmpty());
-
     }
 
@@ -301 +298 @@
         }
         assertTrue(reader.getMissingPrimitives().isEmpty());
-        //assertTrue(reader.getSkippedWays().isEmpty());
-
     }
 
@@ -322 +317 @@
         }
         assertTrue(reader.getMissingPrimitives().isEmpty());
-        //assertTrue(reader.getSkippedWays().isEmpty());
-
-
     }
 
@@ -348 +340 @@
         assertEquals(1, reader.getMissingPrimitives().size());
         assertEquals(9999999, reader.getMissingPrimitives().iterator().next());
-        //assertTrue(reader.getSkippedWays().isEmpty());
     }
 }