Changeset 3118 in josm for trunk/src/org

Timestamp:

2010-03-11T21:20:58+01:00 (15 years ago)

Author:

jttt

Message:

Handle changes in viewID in MapView instead of OsmDataLayer

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapView.java (modified) (3 diffs)
• layer/OsmDataLayer.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/MapView.java

@@ -182 +182 @@
     // Layers that wasn't changed since last paint
     private final List<Layer> nonChangedLayers = new ArrayList<Layer>();
+    private int lastViewID;
 
     public MapView() {
@@ -471 +472 @@
         }
 
-        boolean canUseBuffer = nonChangedLayers.size() <= nonChangedLayersCount;
+        boolean canUseBuffer = nonChangedLayers.size() <= nonChangedLayersCount && lastViewID == getViewID();
         if (canUseBuffer) {
             for (int i=0; i<nonChangedLayers.size(); i++) {
@@ -509 +510 @@
             nonChangedLayers.add(visibleLayers.get(i));
         }
+        lastViewID = getViewID();
 
         tempG.drawImage(offscreenBuffer, 0, 0, null);

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

@@ -91 +91 @@
     private boolean isChanged = true;
     private int highlightUpdateCount;
-    private int viewId;
 
     protected void setRequiresSaveToFile(boolean newValue) {
@@ -226 +225 @@
         isChanged = false;
         highlightUpdateCount = data.getHighlightUpdateCount();
-        viewId = Main.map.mapView.getViewID();
 
         boolean active = mv.getActiveLayer() == this;
@@ -726 +724 @@
     @Override
     public boolean isChanged() {
-        return isChanged || highlightUpdateCount != data.getHighlightUpdateCount() || viewId != Main.map.mapView.getViewID();
+        return isChanged || highlightUpdateCount != data.getHighlightUpdateCount();
     }