Changeset 1599 in josm for trunk/src/org/openstreetmap

Timestamp:

2009-05-19T00:16:01+02:00 (16 years ago)

Author:

framm

Message:

create framework for type-specific relation editors

Location:

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

Files:

• PropertiesDialog.java (modified) (2 diffs)
• RelationListDialog.java (modified) (4 diffs)
• relation (added)
• relation/GenericRelationEditor.java (moved) (moved from trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java ) (9 diffs)
• relation/RelationEditor.java (added)

trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java

@@ -63 +63 @@
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.SideButton;
+import org.openstreetmap.josm.gui.dialogs.relation.GenericRelationEditor;
+import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
 import org.openstreetmap.josm.gui.preferences.TaggingPresetPreference;
 import org.openstreetmap.josm.gui.tagging.TaggingPreset;
@@ -294 +296 @@
      */
     void membershipEdit(int row) {
-        final RelationEditor editor = new RelationEditor((Relation)membershipData.getValueAt(row, 0),
-                (Collection<RelationMember>) membershipData.getValueAt(row, 1) );
-        editor.setVisible(true);
+        RelationEditor.getEditor((Relation)membershipData.getValueAt(row, 0),
+                (Collection<RelationMember>) membershipData.getValueAt(row, 1) ).setVisible(true);
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

@@ -27 +27 @@
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
 import org.openstreetmap.josm.gui.SideButton;
+import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
 import org.openstreetmap.josm.gui.layer.DataChangeListener;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -40 +41 @@
  * We don't have such dialogs for nodes, segments, and ways, because those
  * objects are visible on the map and can be selected there. Relations are not.
- *
- * @author Frederik Ramm <frederik@remote.org>
  */
 public class RelationListDialog extends ToggleDialog implements LayerChangeListener, DataChangeListener {
@@ -60 +59 @@
             if (toEdit == null)
                 return;
-            
-            new RelationEditor(toEdit).setVisible(true);
+            RelationEditor.getEditor(toEdit, null).setVisible(true);
         }
     });
@@ -95 +93 @@
             public void actionPerformed(ActionEvent e) {
                 // call relation editor with null argument to create new relation
-                new RelationEditor(null).setVisible(true);
+                RelationEditor.getEditor(null, null).setVisible(true);
             }
         }), GBC.std());

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

@@ -1 @@
-package org.openstreetmap.josm.gui.dialogs;
+package org.openstreetmap.josm.gui.dialogs.relation;
 
 import static org.openstreetmap.josm.tools.I18n.marktr;
@@ -11 +11 @@
 import java.awt.event.KeyEvent;
 import java.io.IOException;
-import java.text.Collator;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.Map.Entry;
 
@@ -37 +34 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DataSource;
+import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.MergeVisitor;
-import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
 import org.openstreetmap.josm.gui.SideButton;
+import org.openstreetmap.josm.gui.dialogs.ConflictDialog;
 import org.openstreetmap.josm.io.OsmServerObjectReader;
 import org.openstreetmap.josm.tools.GBC;
@@ -60 +59 @@
  *
  */
-public class RelationEditor extends ExtendedDialog {
-
-    /**
-     * The relation that this editor is working on, and the clone made for
-     * editing.
-     */
-    private final Relation relation;
-    private final Relation clone;
+public class GenericRelationEditor extends RelationEditor {
+
     private JLabel status;
 
@@ -111 +104 @@
      * @param relation relation to edit, or null to create a new one.
      */
-    public RelationEditor(Relation relation)
-    {
-        this(relation, null);
-    }
-
-    /**
-     * Creates a new relation editor for the given relation. The relation
-     * will be saved if the user selects "ok" in the editor.
-     *
-     * If no relation is given, will create an editor for a new relation.
-     *
-     * @param relation relation to edit, or null to create a new one.
-     */
-    public RelationEditor(Relation relation, Collection<RelationMember> selectedMembers )
+    public GenericRelationEditor(Relation relation, Collection<RelationMember> selectedMembers )
     {
         // Initalizes ExtendedDialog
-        super(Main.parent,
-                relation == null
-                    ? tr("Create new relation")
-                    : (relation.id == 0
-                            ? tr ("Edit new relation")
-                            : tr("Edit relation #{0}", relation.id)
-                       ),
-                new String[] { applyChangesText, tr("Cancel")},
-                false
-        );
-
-        this.relation = relation;
-
-        if (relation == null) {
-            // create a new relation
-            this.clone = new Relation();
-        } else {
-            // edit an existing relation
-            this.clone = new Relation(relation);
-        }
+        super(relation, selectedMembers);
 
         JPanel bothTables = setupBasicLayout(selectedMembers);
@@ -195 +156 @@
         // setting up the member table
 
-        memberData.setColumnIdentifiers(new String[]{tr("Role"),tr("Occupied By")});
+        memberData.setColumnIdentifiers(new String[]{tr("Role"),tr("Occupied By"), tr("linked")});
         memberTable.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
         memberTable.getColumnModel().getColumn(1).setCellRenderer(new OsmPrimitivRenderer());
@@ -326 +287 @@
      */
     private void applyChanges() {
-        if (RelationEditor.this.relation == null) {
+        if (GenericRelationEditor.this.relation == null) {
             // If the user wanted to create a new relation, but hasn't added any members or
             // tags, don't add an empty relation
@@ -333 +294 @@
             Main.main.undoRedo.add(new AddCommand(clone));
             DataSet.fireSelectionChanged(Main.ds.getSelected());
-        } else if (!RelationEditor.this.relation.realEqual(clone, true)) {
-            Main.main.undoRedo.add(new ChangeCommand(RelationEditor.this.relation, clone));
+        } else if (!GenericRelationEditor.this.relation.realEqual(clone, true)) {
+            Main.main.undoRedo.add(new ChangeCommand(GenericRelationEditor.this.relation, clone));
             DataSet.fireSelectionChanged(Main.ds.getSelected());
         }
@@ -366 +327 @@
 
         memberData.setRowCount(0);
-        for (RelationMember em : clone.members) {
-            memberData.addRow(new Object[]{em.role, em.member});
+        for (int i=0; i<clone.members.size(); i++) {
+            
+            // this whole section is aimed at finding out whether the
+            // relation member is "linked" with the next, i.e. whether
+            // (if both are ways) these ways are connected. It should
+            // really produce a much more beautiful output (with a linkage
+            // symbol somehow places betweeen the two member lines!), and
+            // it should cache results, so... FIXME ;-)
+            
+            RelationMember em = clone.members.get(i);
+            boolean linked = false;
+            Node n1 = null;
+            Node n2 = null;
+            RelationMember m = em;
+            while (m != null) {
+                if (m.member instanceof Way) {
+                    n1 = ((Way) m.member).lastNode();
+                    break;
+                } else if (em.member instanceof Relation) {
+                    m = ((Relation)m.member).lastMember();
+                } else {
+                    break;
+                }
+            }
+            if (i<clone.members.size()-1) {
+                m = clone.members.get(i+1);
+                while (m != null) {
+                    if (m.member instanceof Way) {
+                        n2 = ((Way) (m.member)).firstNode();
+                        break;
+                    } else if (em.member instanceof Relation) {
+                        m = ((Relation)(m.member)).firstMember();
+                    } else {
+                        break;
+                    }
+                }
+            }
+            linked = (n1 != null) && n1.equals(n2);
+            
+            // end of section to determine linkedness. 
+           
+            memberData.addRow(new Object[]{em.role, em.member, linked ? tr("yes") : tr("no")});
         }
         status.setText(tr("Members: {0}", clone.members.size()));