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

Timestamp:

2009-07-12T13:11:06+02:00 (17 years ago)

Author:

Gubaer

Message:

fixed #2911: Relation editor doesn't notice all members downloaded via Download members
fixed problems with references to Main.ds in IO subsystem
relation editor is now aware of layers. Deleting a layer will close open editors for relations in this layer.

File:

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

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

@@ -10 +10 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Relation;
 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 {
@@ -27 +31 @@
         if (relationDialogManager == null) {
             relationDialogManager = new RelationDialogManager();
+            Layer.listeners.add(relationDialogManager);
         }
         return relationDialogManager;
@@ -39 +44 @@
     private Relation relation;
     private Relation clone;
+
+    /** the data layer the relation belongs to */
+    private OsmDataLayer layer;
 
     /**
@@ -58 +66 @@
      * @return an instance of RelationEditor suitable for editing that kind of relation
      */
-    public static RelationEditor getEditor(Relation r, Collection<RelationMember> selectedMembers) {
+    public static RelationEditor getEditor(OsmDataLayer layer, Relation r, Collection<RelationMember> selectedMembers) {
         for (Class<RelationEditor> e : editors) {
             try {
@@ -65 +73 @@
                 if (canEdit) {
                     Constructor<RelationEditor> con = e.getConstructor(Relation.class, Collection.class);
-                    RelationEditor editor = con.newInstance(r, selectedMembers);
+                    RelationEditor editor = con.newInstance(layer, r, selectedMembers);
                     return editor;
                 }
@@ -72 +80 @@
             }
         }
-        if (getRelationDialogManager().isOpenInEditor(r))
-            return getRelationDialogManager().getEditorForRelation(r);
+        if (getRelationDialogManager().isOpenInEditor(layer, r))
+            return getRelationDialogManager().getEditorForRelation(layer, r);
         else {
-            RelationEditor editor = new GenericRelationEditor(r, selectedMembers);
-            getRelationDialogManager().register(r, editor);
+            RelationEditor editor = new GenericRelationEditor(layer, r, selectedMembers);
+            getRelationDialogManager().register(layer, r, editor);
             return editor;
         }
     }
 
-    protected RelationEditor(Relation relation, Collection<RelationMember> selectedMembers)
+    protected RelationEditor(OsmDataLayer layer, Relation relation, Collection<RelationMember> selectedMembers)
     {
         // Initalizes ExtendedDialog
         super(Main.parent,
                 relation == null
-                ? tr("Create new relation")
+                ? tr("Create new relation in layer ''{0}''", layer.getName())
                         : (relation.id == 0
-                                ? tr ("Edit new relation")
-                                        : tr("Edit relation #{0}", relation.id)
+                                ? tr ("Edit new relation in layer ''{0}''", layer.getName())
+                                        : tr("Edit relation #{0} in layer ''{1}''", relation.id, layer.getName())
                         ),
                         new String[] { tr("Apply Changes"), tr("Cancel")},
                         false
         );
+        System.out.println("-- in super  constructor");
+        for (OsmPrimitive primitive : layer.data.allNonDeletedPrimitives()) {
+            System.out.println(OsmPrimitiveType.from(primitive) + " " + primitive.id + " incomplete=" + primitive.incomplete);
+        }
+        System.out.println("-------------");
+
 
         this.relation = relation;
+        this.layer = layer;
 
         if (relation == null) {
@@ -113 +128 @@
         return clone;
     }
+
+    protected OsmDataLayer getLayer() {
+        return layer;
+    }
 }