Changeset 10938 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2016-09-03T12:37:39+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S1450 - Private fields only used as local variables in methods should become local variables

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• AutosaveTask.java (modified) (2 diffs)
• cache/BufferedImageCacheEntry.java (modified) (2 diffs)
• projection/proj/ObliqueMercator.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/AutosaveTask.java

@@ -94 +94 @@
     private final Set<DataSet> changedDatasets = new HashSet<>();
     private final List<AutosaveLayerInfo> layersInfo = new ArrayList<>();
-    private Timer timer;
     private final Object layersLock = new Object();
     private final Deque<File> deletedLayers = new LinkedList<>();
@@ -132 +131 @@
             }
 
-            timer = new Timer(true);
-            timer.schedule(this, 1000L, PROP_INTERVAL.get() * 1000L);
+            new Timer(true).schedule(this, 1000L, PROP_INTERVAL.get() * 1000L);
             Main.getLayerManager().addLayerChangeListener(this, true);
         }

trunk/src/org/openstreetmap/josm/data/cache/BufferedImageCacheEntry.java

@@ -18 +18 @@
     // transient to avoid serialization, volatile to avoid synchronization of whole getImage() method
     private transient volatile BufferedImage img;
-    private transient volatile boolean writtenToDisk;
     // we need to have separate control variable, to know, if we already tried to load the image, as img might be null
     // after we loaded image, as for example, when image file is malformed (eg. HTML file)
@@ -79 +78 @@
             }
             out.writeObject(this);
-            // ugly hack to wait till element will get to disk to clean the memory
-            writtenToDisk = true;
 
             if (img != null) {

trunk/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java

@@ -159 +159 @@
      * Constants used in the transformation.
      */
-    private double b, a, e;
-
-    /**
-     * Convenience value equal to {@link #a} / {@link #b}.
+    private double b, e;
+
+    /**
+     * Convenience value equal to {@code a} / {@link #b}.
      */
     private double arb;
 
     /**
-     * Convenience value equal to {@link #a}×{@link #b}.
+     * Convenience value equal to {@code a}×{@link #b}.
      */
     private double ab;
 
     /**
-     * Convenience value equal to {@link #b} / {@link #a}.
+     * Convenience value equal to {@link #b} / {@code a}.
      */
     private double bra;
@@ -237 +237 @@
         double temp = cosph0 * cosph0;
         b = Math.sqrt(1.0 + e2 * (temp * temp) / (1.0 - e2));
-        a = b * com / con;
+        double a = b * com / con;
         final double d = b * com / (cosph0 * Math.sqrt(con));
         double f = d * d - 1.0;