Changeset 1750 in josm for trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

Timestamp:

2009-07-08T21:50:32+02:00 (15 years ago)

Author:

Gubaer

Message:

new: replaced global conflict list by conflict list per layer, similar to datasets

File:

• trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (9 diffs)

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

@@ -19 +19 @@
 import java.awt.event.ActionEvent;
 import java.awt.geom.Area;
-import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 import java.io.File;
@@ -42 +41 @@
 import org.openstreetmap.josm.actions.SaveAction;
 import org.openstreetmap.josm.actions.SaveAsAction;
+import org.openstreetmap.josm.data.conflict.Conflict;
+import org.openstreetmap.josm.data.conflict.ConflictCollection;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -60 +61 @@
 import org.openstreetmap.josm.data.osm.visitor.SimplePaintVisitor;
 import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.gui.dialogs.ConflictDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
@@ -74 +74 @@
  */
 public class OsmDataLayer extends Layer {
+
+    /** the global counter for created data layers */
+    static private int dataLayerCounter = 0;
+
+    /**
+     * Replies a new unique name for a data layer
+     * 
+     * @return a new unique name for a data layer
+     */
+    static public String createNewName() {
+        dataLayerCounter++;
+        return tr("Data Layer {0}", dataLayerCounter);
+    }
 
     public final static class DataCountVisitor extends AbstractVisitor {
@@ -114 +127 @@
      */
     public final DataSet data;
+
+    /**
+     * the collection of conflicts detected in this layer
+     */
+    private ConflictCollection conflicts;
 
     /**
@@ -159 +177 @@
         this.data = data;
         this.setAssociatedFile(associatedFile);
+        conflicts = new ConflictCollection();
     }
 
@@ -177 +196 @@
         boolean active = Main.map.mapView.getActiveLayer() == this;
         boolean inactive = !active && Main.pref.getBoolean("draw.data.inactive_color", true);
-        boolean virtual = !inactive && Main.map.mapView.useVirtualNodes();
+        boolean virtual = !inactive && Main.map.mapView.isVirtualNodesEnabled();
 
         // draw the hatched area for non-downloaded region. only draw if we're the active
@@ -271 +290 @@
         Main.map.mapView.repaint();
 
-        if (visitor.getConflicts().isEmpty())
-            return;
-        final ConflictDialog dlg = Main.map.conflictDialog;
-        dlg.add(visitor.getConflicts());
-        JOptionPane.showMessageDialog(Main.parent,tr("There were {0} conflicts during import.", visitor.getConflicts().size()));
-        if (!dlg.isVisible()) {
-            dlg.action.actionPerformed(new ActionEvent(this, 0, ""));
+        int numNewConflicts = 0;
+        for (Conflict c : visitor.getConflicts()) {
+            if (!conflicts.hasConflict(c)) {
+                numNewConflicts++;
+                conflicts.add(c);
+            }
+        }
+        if (numNewConflicts > 0) {
+            JOptionPane.showMessageDialog(Main.parent,tr("There were {0} conflicts during import.", numNewConflicts));
         }
     }
@@ -510 +531 @@
         return layer_bounds_point;
     }
+
+    /**
+     * replies the set of conflicts currently managed in this layer
+     * 
+     * @return the set of conflicts currently managed in this layer
+     */
+    public ConflictCollection getConflicts() {
+        return conflicts;
+    }
 }