Changeset 10279 in josm for trunk/src/org/openstreetmap

Timestamp:

2016-05-25T08:52:14+02:00 (8 years ago)

Author:

Don-vip

Message:

GSOC core rework - LayerManager, see #12863, rename LayerManagerWithActive to MainLayerManager

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (3 diffs)
• gui/MapView.java (modified) (6 diffs)
• gui/layer/MainLayerManager.java (moved) (moved from trunk/src/org/openstreetmap/josm/gui/layer/LayerManagerWithActive.java ) (3 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -92 +92 @@
 import org.openstreetmap.josm.gui.layer.AbstractModifiableLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
-import org.openstreetmap.josm.gui.layer.LayerManagerWithActive;
+import org.openstreetmap.josm.gui.layer.MainLayerManager;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer.CommandQueueListener;
@@ -199 +199 @@
      * @since 10271
      */
-    private static final LayerManagerWithActive layerManager = new LayerManagerWithActive();
+    private static final MainLayerManager layerManager = new MainLayerManager();
 
     /**
@@ -740 +740 @@
      * Returns the main layer manager that is used by the map view.
      * @return The layer manager. The value returned will never change.
-     * @since 10271
-     */
-    public static LayerManagerWithActive getLayerManager() {
+     * @since 10279
+     */
+    public static MainLayerManager getLayerManager() {
         return layerManager;
     }

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

@@ -61 +61 @@
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerOrderChangeEvent;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerRemoveEvent;
-import org.openstreetmap.josm.gui.layer.LayerManagerWithActive;
-import org.openstreetmap.josm.gui.layer.LayerManagerWithActive.ActiveLayerChangeEvent;
-import org.openstreetmap.josm.gui.layer.LayerManagerWithActive.ActiveLayerChangeListener;
+import org.openstreetmap.josm.gui.layer.MainLayerManager;
+import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
+import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
 import org.openstreetmap.josm.gui.layer.MapViewPaintable;
 import org.openstreetmap.josm.gui.layer.MapViewPaintable.PaintableInvalidationEvent;
@@ -91 +91 @@
 public class MapView extends NavigatableComponent
 implements PropertyChangeListener, PreferenceChangedListener, OsmDataLayer.LayerStateChangeListener,
-LayerManager.LayerChangeListener, LayerManagerWithActive.ActiveLayerChangeListener {
+LayerManager.LayerChangeListener, MainLayerManager.ActiveLayerChangeListener {
     /**
      * Interface to notify listeners of a layer change.
@@ -265 +265 @@
      * This class is an adapter for the old layer change interface.
      * <p>
-     * New implementations should use {@link org.openstreetmap.josm.gui.layer.LayerManagerWithActive.ActiveLayerChangeListener}
+     * New implementations should use {@link org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener}
      * @author Michael Zangl
      * @since 10271
@@ -438 +438 @@
      * A list of all layers currently loaded. If we support multiple map views, this list may be different for each of them.
      */
-    private final LayerManagerWithActive layerManager;
+    private final MainLayerManager layerManager;
 
     /**
@@ -479 +479 @@
      * @param viewportData the initial viewport of the map. Can be null, then
      * the viewport is derived from the layer data.
-     */
-    public MapView(LayerManagerWithActive layerManager, final JPanel contentPane, final ViewportData viewportData) {
+     * @since 10279
+     */
+    public MapView(MainLayerManager layerManager, final JPanel contentPane, final ViewportData viewportData) {
         this.layerManager = layerManager;
         initialViewport = viewportData;
@@ -632 +633 @@
      *
      * @return the next active data layer
-     * @deprecated now handled by {@link LayerManagerWithActive}
+     * @deprecated now handled by {@link MainLayerManager}
      */
     @Deprecated

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

@@ -17 +17 @@
  * The edit layer is an data layer that we currently work with.
  * @author Michael Zangl
- * @since 10271
+ * @since 10279
  */
-public class LayerManagerWithActive extends LayerManager {
+public class MainLayerManager extends LayerManager {
     /**
      * This listener listens to changes of the active or the edit layer.
@@ -53 +53 @@
          * @param previousActiveLayer the previous active layer
          */
-        ActiveLayerChangeEvent(LayerManagerWithActive source, OsmDataLayer previousEditLayer,
+        ActiveLayerChangeEvent(MainLayerManager source, OsmDataLayer previousEditLayer,
                 Layer previousActiveLayer) {
             super(source);
@@ -77 +77 @@
 
         @Override
-        public LayerManagerWithActive getSource() {
-            return (LayerManagerWithActive) super.getSource();
+        public MainLayerManager getSource() {
+            return (MainLayerManager) super.getSource();
         }
     }