Changeset 8925 in josm for trunk

Timestamp:

2015-10-22T00:50:36+02:00 (9 years ago)

Author:

Don-vip

Message:

see #11631 - see #11689 - remove commented code causing javadoc warnings

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/MapRectifierWMSmenuAction.java (modified) (1 diff)
• gui/MapView.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/MapRectifierWMSmenuAction.java

@@ -231 +231 @@
      * @param url URL to the WMS server
      * @throws IllegalStateException if imagery time is neither HTML nor WMS
-     * @see WMSLayer#checkGrabberType
      */
     private static void addWMSLayer(String title, String url) {

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

@@ -225 +225 @@
 
     /**
-     * A list of all layers currently loaded. Locked by {@link #layerLock}.
+     * A list of all layers currently loaded.
      */
     private final transient List<Layer> layers = new ArrayList<>();
 
     /**
-     * This lock manages concurrent access to {@link #layers},
-     * {@link #editLayer} and {@link #activeLayer}.
-     * <p>
-     * The read lock is always held while those fields are read or while layer change listeners are fired.
-     */
-    //private final ReentrantReadWriteLock layerLock = new ReentrantReadWriteLock();
-
-    /**
      * The play head marker: there is only one of these so it isn't in any specific layer
      */
@@ -243 +235 @@
 
     /**
-     * The layer from the layers list that is currently active. Locked by {@link #layerLock}.
+     * The layer from the layers list that is currently active.
      */
     private transient Layer activeLayer;
 
     /**
-     * The edit layer is the current active data layer. Locked by {@link #layerLock}.
+     * The edit layer is the current active data layer.
      */
     private transient OsmDataLayer editLayer;
@@ -876 +868 @@
      * Sets the active edit layer.
      * <p>
-     * You must own a write {@link #layerLock} when calling this method.
      * @param layersList A list to select that layer from.
      * @return A list of change listeners that should be fired using {@link #onActiveEditLayerChanged(Layer, OsmDataLayer, EnumSet)}