Changeset 1762 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java

Timestamp:

2009-07-11T09:32:42+02:00 (16 years ago)

Author:

Gubaer

Message:

added: improved tag editor grid in relation editor (borrowed code from tag editor plugin)
removed: realEqual() on OsmPrimitive, Node, etc.

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (modified) (4 diffs)

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

@@ -16 +16 @@
 public abstract class RelationEditor extends ExtendedDialog {
 
+    /** keeps track of open relation editors */
+    static private RelationDialogManager relationDialogManager;
+
+    /**
+     * Replies the singleton {@see RelationDialogManager}
+     * 
+     * @return the singleton {@see RelationDialogManager}
+     */
+    static public RelationDialogManager getRelationDialogManager() {
+        if (relationDialogManager == null) {
+            relationDialogManager = new RelationDialogManager();
+        }
+        return relationDialogManager;
+    }
+
     public static ArrayList<Class<RelationEditor>> editors = new ArrayList<Class<RelationEditor>>();
 
@@ -22 +37 @@
      * editing.
      */
-    protected Relation relation;
-    protected Relation clone;
+    private Relation relation;
+    private Relation clone;
 
     /**
@@ -57 +72 @@
             }
         }
-        return new GenericRelationEditor(r, selectedMembers);
+        if (getRelationDialogManager().isOpenInEditor(r))
+            return getRelationDialogManager().getEditorForRelation(r);
+        else {
+            RelationEditor editor = new GenericRelationEditor(r, selectedMembers);
+            getRelationDialogManager().register(r, editor);
+            return editor;
+        }
     }
 
@@ -84 +105 @@
         }
     }
+
+    protected Relation getRelation() {
+        return relation;
+    }
+
+    protected Relation getClone() {
+        return clone;
+    }
 }