Changeset 10340 in josm for trunk/src/org/openstreetmap/josm/gui/MapView.java

Timestamp:

2016-06-08T09:33:20+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #12927 - Move title management and main frame layout to new class (patch by michael2402) - gsoc-core

File:

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

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

@@ -35 +35 @@
 import javax.swing.InputMap;
 import javax.swing.JComponent;
-import javax.swing.JFrame;
 import javax.swing.JPanel;
 
@@ -91 +90 @@
  */
 public class MapView extends NavigatableComponent
-implements PropertyChangeListener, PreferenceChangedListener, OsmDataLayer.LayerStateChangeListener,
+implements PropertyChangeListener, PreferenceChangedListener,
 LayerManager.LayerChangeListener, MainLayerManager.ActiveLayerChangeListener {
     /**
@@ -587 +586 @@
         }
 
-        boolean isOsmDataLayer = layer instanceof OsmDataLayer;
-        if (isOsmDataLayer) {
-            ((OsmDataLayer) layer).addLayerStateChangeListener(this);
-        }
-
         layer.addPropertyChangeListener(this);
         Main.addProjectionChangeListener(layer);
@@ -674 +668 @@
     public void layerRemoving(LayerRemoveEvent e) {
         Layer layer = e.getRemovedLayer();
-        if (layer instanceof OsmDataLayer) {
-            ((OsmDataLayer) layer).removeLayerPropertyChangeListener(this);
-        }
 
         Main.removeProjectionChangeListener(layer);
@@ -1081 +1072 @@
         }
         AudioPlayer.reset();
-        refreshTitle();
         repaint();
     }
@@ -1164 +1154 @@
                 repaint();
             }
-        } else if (evt.getPropertyName().equals(OsmDataLayer.REQUIRES_SAVE_TO_DISK_PROP)
-                || evt.getPropertyName().equals(OsmDataLayer.REQUIRES_UPLOAD_TO_SERVER_PROP)) {
-            OsmDataLayer layer = (OsmDataLayer) evt.getSource();
-            if (layer == getEditLayer()) {
-                refreshTitle();
-            }
         }
     }
@@ -1176 +1160 @@
      * Sets the title of the JOSM main window, adding a star if there are dirty layers.
      * @see Main#parent
-     */
+     * @deprecated Replaced by {@link MainFrame#refreshTitle()}. The {@link MainFrame} should handle this by itself.
+     */
+    @Deprecated
     protected void refreshTitle() {
         if (Main.parent != null) {
-            OsmDataLayer editLayer = layerManager.getEditLayer();
-            boolean dirty = editLayer != null &&
-                    (editLayer.requiresSaveToFile() || (editLayer.requiresUploadToServer() && !editLayer.isUploadDiscouraged()));
-            ((JFrame) Main.parent).setTitle((dirty ? "* " : "") + tr("Java OpenStreetMap Editor"));
-            ((JFrame) Main.parent).getRootPane().putClientProperty("Window.documentModified", dirty);
+            ((MainFrame) Main.parent).refreshTitle();
         }
     }
@@ -1213 +1195 @@
         synchronized (temporaryLayers) {
             temporaryLayers.clear();
-        }
-    }
-
-    @Override
-    public void uploadDiscouragedChanged(OsmDataLayer layer, boolean newValue) {
-        if (layer == layerManager.getEditLayer()) {
-            refreshTitle();
         }
     }