Changeset 1772 in josm

Timestamp:

2009-07-12T13:11:06+02:00 (16 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.

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/dialogs/PropertiesDialog.java (modified) (1 diff)
• gui/dialogs/RelationListDialog.java (modified) (2 diffs)
• gui/dialogs/relation/GenericRelationEditor.java (modified) (7 diffs)
• gui/dialogs/relation/RelationDialogManager.java (modified) (3 diffs)
• gui/dialogs/relation/RelationEditor.java (modified) (7 diffs)
• gui/layer/Layer.java (modified) (1 diff)
• io/BoundingBoxDownloader.java (modified) (1 diff)
• io/MultiFetchServerObjectReader.java (modified) (2 diffs)
• io/OsmImporter.java (modified) (2 diffs)
• io/OsmReader.java (modified) (8 diffs)
• io/OsmServerLocationReader.java (modified) (1 diff)
• io/OsmServerObjectReader.java (modified) (1 diff)

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

@@ -308 +308 @@
         Relation relation = (Relation)membershipData.getValueAt(row, 0);
         Main.main.map.relationListDialog.selectRelation(relation);
-        RelationEditor.getEditor(relation,
+        RelationEditor.getEditor(
+                Main.map.mapView.getEditLayer(),
+                relation,
                 (Collection<RelationMember>) membershipData.getValueAt(row, 1) ).setVisible(true);
     }

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

@@ -59 +59 @@
             if (toEdit == null)
                 return;
-            RelationEditor.getEditor(toEdit, null).setVisible(true);
+            RelationEditor.getEditor(Main.map.mapView.getEditLayer(),toEdit, null).setVisible(true);
         }
     });
@@ -94 +94 @@
             public void actionPerformed(ActionEvent e) {
                 // call relation editor with null argument to create new relation
-                RelationEditor.getEditor(null, null).setVisible(true);
+                RelationEditor.getEditor(Main.map.mapView.getEditLayer(),null, null).setVisible(true);
             }
         }), GBC.std());

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

@@ -53 +53 @@
 import org.openstreetmap.josm.gui.dialogs.relation.ac.AutoCompletionCache;
 import org.openstreetmap.josm.gui.dialogs.relation.ac.AutoCompletionList;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.io.OsmServerObjectReader;
@@ -141 +142 @@
      * @param relation relation to edit, or null to create a new one.
      */
-    public GenericRelationEditor(Relation relation, Collection<RelationMember> selectedMembers )
+    public GenericRelationEditor(OsmDataLayer layer, Relation relation, Collection<RelationMember> selectedMembers )
     {
         // Initalizes ExtendedDialog
-        super(relation, selectedMembers);
+        super(layer, relation, selectedMembers);
+        System.out.println("-- After super  constructor");
+        for (OsmPrimitive primitive : getLayer().data.allNonDeletedPrimitives()) {
+            System.out.println(OsmPrimitiveType.from(primitive) + " " + primitive.id + " incomplete=" + primitive.incomplete);
+        }
+        System.out.println("-------------");
         acCache = AutoCompletionCache.getCacheForLayer(Main.map.mapView.getEditLayer());
         acList = new AutoCompletionList();
@@ -527 +533 @@
             }
         }
-
         refreshTables();
     }
@@ -565 +570 @@
         // FIXME: Make it remember dialog size
         return new Dimension(600, 500);
+    }
+
+    /**
+     * Updates the references from members of the cloned relation (see {@see #getClone())
+     * after an update from the server.
+     *
+     */
+    protected void updateMemberReferencesInClone() {
+        DataSet ds = getLayer().data;
+        for (RelationMember member : getClone().members) {
+            if (member.member.id == 0) {
+                continue;
+            }
+            OsmPrimitive primitive = ds.getPrimitiveById(member.member.id);
+            if (primitive != null) {
+                StringBuffer sb = new StringBuffer();
+                sb.append("updating primitive:")
+                .append("type=" + OsmPrimitiveType.from(primitive))
+                .append(", id=" + primitive.id)
+                .append(", was incomplete=" + member.member.incomplete)
+                .append(", is incomplete=" + primitive.incomplete);
+                System.out.println(sb.toString());
+                member.member = primitive;
+            }
+        }
     }
 
@@ -800 +830 @@
             @Override
             protected void finish() {
+                if (cancelled) return;
+                updateMemberReferencesInClone();
                 refreshTables();
-                if (cancelled) return;
                 if (lastException == null) return;
                 showLastException();
@@ -815 +846 @@
                     DataSet dataSet = reader.parseOsm();
                     if (dataSet != null) {
-                        final MergeVisitor visitor = new MergeVisitor(Main.main.map.mapView.getEditLayer()
-                                .data, dataSet);
+                        for (OsmPrimitive primitive : getLayer().data.allNonDeletedPrimitives()) {
+                            System.out.println(OsmPrimitiveType.from(primitive) + " " + primitive.id + " incomplete=" + primitive.incomplete);
+                        }
+                        System.out.println("-------------");
+                        final MergeVisitor visitor = new MergeVisitor(getLayer().data, dataSet);
                         visitor.merge();
+                        for (OsmPrimitive primitive : getLayer().data.allNonDeletedPrimitives()) {
+                            System.out.println(OsmPrimitiveType.from(primitive) + " " + primitive.id + " incomplete=" + primitive.incomplete);
+                        }
 
                         // copy the merged layer's data source info
                         for (DataSource src : dataSet.dataSources) {
-                            Main.map.mapView.getEditLayer().data.dataSources.add(src);
-                        }
-                        Main.map.mapView.getEditLayer().fireDataChange();
+                            getLayer().data.dataSources.add(src);
+                        }
+                        getLayer().fireDataChange();
 
                         if (visitor.getConflicts().isEmpty())
                             return;
-                        final ConflictDialog dlg = Main.map.conflictDialog;
-                        dlg.getConflicts().add(visitor.getConflicts());
+                        getLayer().getConflicts().add(visitor.getConflicts());
                         JOptionPane op = new JOptionPane(
                                 tr("There were {0} conflicts during import.",
@@ -835 +871 @@
                         );
                         JDialog dialog = op.createDialog(Main.pleaseWaitDlg, tr("Conflicts in data"));
-                        dialog.setAlwaysOnTop(true); //<-- this line
+                        dialog.setAlwaysOnTop(true);
                         dialog.setModal(true);
                         dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);

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

@@ -5 +5 @@
 import java.awt.event.WindowEvent;
 import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map.Entry;
 
 import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.layer.Layer.LayerChangeListener;
 
 /**
@@ -12 +17 @@
  *
  */
-public class RelationDialogManager extends WindowAdapter {
+public class RelationDialogManager extends WindowAdapter implements LayerChangeListener {
+    static private class DialogContext {
+        public Relation relation;
+        public OsmDataLayer layer;
 
-    private HashMap<Relation, RelationEditor> openDialogs;
+        public DialogContext(OsmDataLayer layer, Relation relation) {
+            this.layer = layer;
+            this.relation = relation;
+        }
+
+        @Override
+        public int hashCode() {
+            final int prime = 31;
+            int result = 1;
+            result = prime * result + ((layer == null) ? 0 : layer.hashCode());
+            result = prime * result + ((relation == null) ? 0 : relation.hashCode());
+            return result;
+        }
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj)
+                return true;
+            if (obj == null)
+                return false;
+            if (getClass() != obj.getClass())
+                return false;
+            DialogContext other = (DialogContext) obj;
+            if (layer == null) {
+                if (other.layer != null)
+                    return false;
+            } else if (!layer.equals(other.layer))
+                return false;
+            if (relation == null) {
+                if (other.relation != null)
+                    return false;
+            } else if (!relation.equals(other.relation))
+                return false;
+            return true;
+        }
+
+        public boolean matchesLayer(OsmDataLayer layer) {
+            if (layer == null) return false;
+            return this.layer.equals(layer);
+        }
+    }
+
+    private HashMap<DialogContext, RelationEditor> openDialogs;
 
     public RelationDialogManager(){
-        openDialogs = new HashMap<Relation, RelationEditor>();
+        openDialogs = new HashMap<DialogContext, RelationEditor>();
     }
 
-    public void register(Relation relation, RelationEditor editor) {
-        openDialogs.put(relation, editor);
+    public void register(OsmDataLayer layer, Relation relation, RelationEditor editor) {
+        DialogContext context = new DialogContext(layer, relation);
+        openDialogs.put(context, editor);
         editor.addWindowListener(this);
     }
 
-    public boolean isOpenInEditor(Relation relation) {
-        return openDialogs.keySet().contains(relation);
+    public boolean isOpenInEditor(OsmDataLayer layer, Relation relation) {
+        DialogContext context = new DialogContext(layer, relation);
+        return openDialogs.keySet().contains(context);
     }
 
-    public RelationEditor getEditorForRelation(Relation relation) {
-        return openDialogs.get(relation);
+    public RelationEditor getEditorForRelation(OsmDataLayer layer, Relation relation) {
+        DialogContext context = new DialogContext(layer, relation);
+        return openDialogs.get(context);
     }
 
@@ -36 +88 @@
     public void windowClosed(WindowEvent e) {
         RelationEditor editor = ((RelationEditor)e.getWindow());
-        Relation editedRelation = null;
-        for (Relation r : openDialogs.keySet()) {
-            if (openDialogs.get(r).equals(editor)) {
-                editedRelation = r;
+        DialogContext context = null;
+        for (DialogContext c : openDialogs.keySet()) {
+            if (openDialogs.get(c).equals(editor)) {
+                context = c;
                 break;
             }
         }
-        if (editedRelation != null) {
-            openDialogs.remove(editedRelation);
+        if (context != null) {
+            openDialogs.remove(context);
         }
     }
+
+    public void layerRemoved(Layer oldLayer) {
+        if (oldLayer == null || ! (oldLayer instanceof OsmDataLayer))
+            return;
+        OsmDataLayer dataLayer = (OsmDataLayer)oldLayer;
+
+        Iterator<Entry<DialogContext,RelationEditor>> it = openDialogs.entrySet().iterator();
+        while(it.hasNext()) {
+            Entry<DialogContext,RelationEditor> entry = it.next();
+            if (entry.getKey().matchesLayer(dataLayer)) {
+                RelationEditor editor = entry.getValue();
+                it.remove();
+                editor.setVisible(false);
+                editor.dispose();
+            }
+        }
+    }
+
+    public void activeLayerChange(Layer oldLayer, Layer newLayer) {
+        // do nothing
+    }
+
+    public void layerAdded(Layer newLayer) {
+        // do nothing
+    }
 }

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;
+    }
 }

trunk/src/org/openstreetmap/josm/gui/layer/Layer.java

@@ -123 +123 @@
     public File getAssociatedFile() { return associatedFile; }
     public void setAssociatedFile(File file) { associatedFile = file; }
+
+
+    /**
+     * Replies the name of the layer
+     * 
+     * @return the name of the layer
+     */
+    public String getName() {
+        return name;
+    }
 }

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

@@ -101 +101 @@
                 return null;
             Main.pleaseWaitDlg.currentAction.setText(tr("Downloading OSM data..."));
-            final DataSet data = OsmReader.parseDataSet(in, null, Main.pleaseWaitDlg);
+            final DataSet data = OsmReader.parseDataSet(in,Main.pleaseWaitDlg);
             in.close();
             activeConnection = null;

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

@@ -319 +319 @@
         Main.pleaseWaitDlg.currentAction.setText(tr("Downloading OSM data..."));
         try {
-            final OsmReader osm = OsmReader.parseDataSetOsm(in, outputDataSet, Main.pleaseWaitDlg);
+            final OsmReader osm = OsmReader.parseDataSetOsm(in, Main.pleaseWaitDlg);
             skippedWayIds.addAll(osm.getSkippedWayIds());
             merge(osm.getDs());
@@ -345 +345 @@
         Main.pleaseWaitDlg.currentAction.setText(tr("Downloading OSM data..."));
         try {
-            final OsmReader osm = OsmReader.parseDataSetOsm(in, null, Main.pleaseWaitDlg);
+            final OsmReader osm = OsmReader.parseDataSetOsm(in,Main.pleaseWaitDlg);
             skippedWayIds.addAll(osm.getSkippedWayIds());
             merge(osm.getDs());

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

@@ -46 +46 @@
 
     protected void importData(InputStream in, File associatedFile) throws SAXException, IOException {
-        OsmReader osm = OsmReader.parseDataSetOsm(in, null, Main.pleaseWaitDlg);
+        OsmReader osm = OsmReader.parseDataSetOsm(in,Main.pleaseWaitDlg);
         DataSet dataSet = osm.getDs();
         OsmDataLayer layer = new OsmDataLayer(dataSet, associatedFile.getName(), associatedFile);
@@ -55 +55 @@
             String notes = osm.getParseNotes();
             int j = 0;
-            for (int i = 0; i < 5; i++)
+            for (int i = 0; i < 5; i++) {
                 j = notes.indexOf('\n', j + 1);
+            }
             j = j >= 0 ? j : notes.length();
             JOptionPane.showMessageDialog(Main.parent, notes.substring(0, j));

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

@@ -52 +52 @@
 
     /**
-     * This is used as (readonly) source for finding missing references when not transferred in the
-     * file.
-     */
-    private DataSet references;
-
-    /**
      * The dataset to add parsed objects to.
      */
@@ -88 +82 @@
     private Map<Long, Node> nodes = new HashMap<Long, Node>();
 
+
+    /**
+     * constructor (for private use only)
+     * 
+     * @see #parseDataSet(InputStream, DataSet, PleaseWaitDialog)
+     * @see #parseDataSetOsm(InputStream, DataSet, PleaseWaitDialog)
+     */
+    private OsmReader() {
+    }
 
     private static class OsmPrimitiveData {
@@ -342 +345 @@
         if (n != null)
             return n;
-        for (Node node : references.nodes)
-            if (node.id == id)
-                return node;
-        // TODO: This has to be changed to support multiple layers.
-        for (Node node : Main.ds.nodes)
-            if (node.id == id)
-                return new Node(node);
         return null;
     }
@@ -382 +378 @@
     /**
      * Return the Way object with the given id, or null if it doesn't
-     * exist yet. This method only looks at ways stored in the data set.
+     * exist yet. This method only looks at ways stored in the already parsed
+     * ways.
      *
      * @param id
@@ -388 +385 @@
      */
     private Way findWay(long id) {
-        for (Way wy : Main.ds.ways)
-            if (wy.id == id)
-                return wy;
+        for (Way way : ds.ways)
+            if (way.id == id)
+                return way;
         return null;
     }
@@ -396 +393 @@
     /**
      * Return the Relation object with the given id, or null if it doesn't
-     * exist yet. This method only looks at relations stored in the data set.
+     * exist yet. This method only looks at relations in the already parsed
+     * relations.
      *
      * @param id
@@ -403 +401 @@
     private Relation findRelation(long id) {
         for (Relation e : ds.relations)
-            if (e.id == id)
-                return e;
-        for (Relation e : Main.ds.relations)
             if (e.id == id)
                 return e;
@@ -476 +471 @@
      *  element found there is returned.
      */
-    public static DataSet parseDataSet(InputStream source, DataSet ref, PleaseWaitDialog pleaseWaitDlg) throws SAXException, IOException {
-        return parseDataSetOsm(source, ref, pleaseWaitDlg).ds;
-    }
-
-    public static OsmReader parseDataSetOsm(InputStream source, DataSet ref, PleaseWaitDialog pleaseWaitDlg) throws SAXException, IOException {
+    public static DataSet parseDataSet(InputStream source, PleaseWaitDialog pleaseWaitDlg) throws SAXException, IOException {
+        return parseDataSetOsm(source, pleaseWaitDlg).ds;
+    }
+
+    public static OsmReader parseDataSetOsm(InputStream source,PleaseWaitDialog pleaseWaitDlg) throws SAXException, IOException {
         OsmReader osm = new OsmReader();
-        osm.references = ref == null ? new DataSet() : ref;
 
         // phase 1: Parse nodes and read in raw ways

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

@@ -32 +32 @@
                 return null;
             Main.pleaseWaitDlg.currentAction.setText(tr("Downloading OSM data..."));
-            final DataSet data = OsmReader.parseDataSet(in, null, Main.pleaseWaitDlg);
+            final DataSet data = OsmReader.parseDataSet(in, Main.pleaseWaitDlg);
             in.close();
             activeConnection = null;

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

@@ -48 +48 @@
                 return null;
             Main.pleaseWaitDlg.currentAction.setText(tr("Downloading OSM data..."));
-            final OsmReader osm = OsmReader.parseDataSetOsm(in, null, Main.pleaseWaitDlg);
+            final OsmReader osm = OsmReader.parseDataSetOsm(in,Main.pleaseWaitDlg);
             final DataSet data = osm.getDs();