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

Timestamp:

11.03.2010 21:01:49 (2 years ago)

Author:

jttt

Message:

Reuse offscreenBuffer if layers didn't change

File:

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

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

@@ -44 +44 @@
 import org.openstreetmap.josm.command.PurgePrimitivesCommand;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.conflict.ConflictCollection;
@@ -59 +60 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.event.AbstractDatasetChangedEvent;
+import org.openstreetmap.josm.data.osm.event.DataSetListenerAdapter;
+import org.openstreetmap.josm.data.osm.event.DataSetListenerAdapter.Listener;
 import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
@@ -79 +83 @@
  * @author imi
  */
-public class OsmDataLayer extends Layer {
+public class OsmDataLayer extends Layer implements Listener, SelectionChangedListener {
     static public final String REQUIRES_SAVE_TO_DISK_PROP = OsmDataLayer.class.getName() + ".requiresSaveToDisk";
     static public final String REQUIRES_UPLOAD_TO_SERVER_PROP = OsmDataLayer.class.getName() + ".requiresUploadToServer";
@@ -85 +89 @@
     private boolean requiresSaveToFile = false;
     private boolean requiresUploadToServer = false;
+    private boolean isChanged = true;
+    private int highlightUpdateCount;
+    private int viewId;
 
     protected void setRequiresSaveToFile(boolean newValue) {
@@ -199 +206 @@
         this.setAssociatedFile(associatedFile);
         conflicts = new ConflictCollection();
+        data.addDataSetListener(new DataSetListenerAdapter(this));
+        DataSet.selListeners.add(this);
     }
 
@@ -215 +224 @@
      */
     @Override public void paint(final Graphics2D g, final MapView mv, Bounds box) {
+        isChanged = false;
+        highlightUpdateCount = data.getHighlightUpdateCount();
+        viewId = Main.map.mapView.getViewID();
+
         boolean active = mv.getActiveLayer() == this;
         boolean inactive = !active && Main.pref.getBoolean("draw.data.inactive_color", true);
@@ -711 +724 @@
     }
 
+    @Override
+    public boolean isChanged() {
+        return isChanged || highlightUpdateCount != data.getHighlightUpdateCount() || viewId != Main.map.mapView.getViewID();
+    }
+
     /**
      * Initializes the layer after a successful save of OSM data to a file
@@ -752 +770 @@
 
     }
+
+    public void processDatasetEvent(AbstractDatasetChangedEvent event) {
+        isChanged = true;
+    }
+
+    public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
+        isChanged = true;
+    }
 }