Ticket #11689: 0002-Revert-Move-lock-aquires-closer-to-try-catch-finally.patch

File 0002-Revert-Move-lock-aquires-closer-to-try-catch-finally.patch, 2.6 KB (added by michael2402, 11 years ago)

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

    From 8869b08b916a87b50eadaff96f622f3dd89be61b Mon Sep 17 00:00:00 2001
From: Michael Zangl <michael.zangl@student.kit.edu>
Date: Thu, 6 Aug 2015 14:06:03 +0200
Subject: [PATCH 2/3] Revert "Move lock aquires closer to try/catch/finally, to
 silent FindBugs warnings. Addresses: #11689"

This reverts commit 8a813993cf5826a83814a78a2e04cfbfcc76275e.
---
 src/org/openstreetmap/josm/gui/MapView.java | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/org/openstreetmap/josm/gui/MapView.java b/src/org/openstreetmap/josm/gui/MapView.java
index ef6d0e8..c1ec650 100644
    a b implements PropertyChangeListener, PreferenceChangedListener, OsmDataLayer.Layer  
    404404     */
    405405    public void addLayer(Layer layer) {
    406406        boolean isOsmDataLayer = layer instanceof OsmDataLayer;
     407        layerLock.writeLock().lock();
     408        layerLock.readLock().lock();
    407409        EnumSet<LayerListenerType> listenersToFire = EnumSet.noneOf(LayerListenerType.class);
    408410        Layer oldActiveLayer = activeLayer;
    409411        OsmDataLayer oldEditLayer = editLayer;
    410 
    411         layerLock.writeLock().lock();
    412         layerLock.readLock().lock();
    413412        try {
    414413            try {
    415414                if (layer instanceof MarkerLayer && playHeadMarker == null) {
    … … implements PropertyChangeListener, PreferenceChangedListener, OsmDataLayer.Layer  
    530529     * @param layer The layer to remove
    531530     */
    532531    public void removeLayer(Layer layer) {
     532        layerLock.writeLock().lock();
     533        layerLock.readLock().lock();
     534
    533535        EnumSet<LayerListenerType> listenersToFire = EnumSet.noneOf(LayerListenerType.class);
    534536        Layer oldActiveLayer = activeLayer;
    535537        OsmDataLayer oldEditLayer = editLayer;
    536 
    537         layerLock.writeLock().lock();
    538         layerLock.readLock().lock();
    539538        try {
    540539            try {
    541540                List<Layer> layersList = new ArrayList<>(layers);
    … … implements PropertyChangeListener, PreferenceChangedListener, OsmDataLayer.Layer  
    601600     * @param pos       The new position of the layer
    602601     */
    603602    public void moveLayer(Layer layer, int pos) {
     603        layerLock.writeLock().lock();
     604        layerLock.readLock().lock();
    604605        EnumSet<LayerListenerType> listenersToFire;
    605606        Layer oldActiveLayer = activeLayer;
    606607        OsmDataLayer oldEditLayer = editLayer;
    607 
    608         layerLock.writeLock().lock();
    609         layerLock.readLock().lock();
    610608        try {
    611609            try {
    612610                int curLayerPos = layers.indexOf(layer);