Changeset 8840 in josm for trunk/src/org/openstreetmap/josm/gui/layer/geoimage

Timestamp:

2015-10-09T02:12:45+02:00 (9 years ago)

Author:

Don-vip

Message:

sonar - squid:S3052 - Fields should not be initialized to default values

Location:

trunk/src/org/openstreetmap/josm/gui/layer/geoimage

Files:

• CorrelateGpxWithImages.java (modified) (2 diffs)
• GeoImageLayer.java (modified) (4 diffs)
• ImageDisplay.java (modified) (2 diffs)
• ImageEntry.java (modified) (1 diff)
• ImageViewerDialog.java (modified) (2 diffs)
• ThumbsLoader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

@@ -92 +92 @@
     private static List<GpxData> loadedGpxData = new ArrayList<>();
 
-    private transient GeoImageLayer yLayer = null;
+    private transient GeoImageLayer yLayer;
     private double timezone;
     private long delta;
@@ -237 +237 @@
 
     // remember the last number of matched photos
-    private int lastNumMatched = 0;
+    private int lastNumMatched;
 
     /** This class is called when the user doesn't find the GPX file he needs in the files that have

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

@@ -93 +93 @@
     private int currentPhoto = -1;
 
-    boolean useThumbs = false;
+    boolean useThumbs;
     private ExecutorService thumbsLoaderExecutor =
             Executors.newSingleThreadExecutor(Utils.newThreadFactory("thumbnail-loader-%d", Thread.MIN_PRIORITY));
     private ThumbsLoader thumbsloader;
-    private boolean thumbsLoaderRunning = false;
-    volatile boolean thumbsLoaded = false;
+    private boolean thumbsLoaderRunning;
+    volatile boolean thumbsLoaded;
     private BufferedImage offscreenBuffer;
     boolean updateOffscreenBuffer = true;
@@ -109 +109 @@
     private static final class Loader extends PleaseWaitRunnable {
 
-        private boolean canceled = false;
+        private boolean canceled;
         private GeoImageLayer layer;
         private Collection<File> selection;
@@ -902 +902 @@
     }
 
-    private static volatile List<MapMode> supportedMapModes = null;
+    private static volatile List<MapMode> supportedMapModes;
 
     /**
@@ -938 +938 @@
     }
 
-    private MouseAdapter mouseAdapter = null;
-    private MapModeChangeListener mapModeListener = null;
+    private MouseAdapter mouseAdapter;
+    private MapModeChangeListener mapModeListener;
 
     @Override

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java

@@ -33 +33 @@
 
     /** The file that is currently displayed */
-    private File file = null;
+    private File file;
 
     /** The image currently displayed */
-    private transient Image image = null;
+    private transient Image image;
 
     /** The image currently displayed */
-    private boolean errorLoading = false;
+    private boolean errorLoading;
 
     /** The rectangle (in image coordinates) of the image that is visible. This rectangle is calculated
      * each time the zoom is modified */
-    private Rectangle visibleRect = null;
+    private Rectangle visibleRect;
 
     /** When a selection is done, the rectangle of the selection (in image coordinates) */
-    private Rectangle selectedRect = null;
+    private Rectangle selectedRect;
 
     /** The tracker to load the images */
     private MediaTracker tracker = new MediaTracker(this);
 
-    private String osdText = null;
+    private String osdText;
 
     private static final int DRAG_BUTTON = Main.pref.getBoolean("geoimage.agpifo-style-drag-and-zoom", false) ? 1 : 3;
@@ -136 +136 @@
     private class ImgDisplayMouseListener implements MouseListener, MouseWheelListener, MouseMotionListener {
 
-        private boolean mouseIsDragging = false;
-        private long lastTimeForMousePoint = 0L;
-        private Point mousePointInImg = null;
+        private boolean mouseIsDragging;
+        private long lastTimeForMousePoint;
+        private Point mousePointInImg;
 
         /** Zoom in and out, trying to preserve the point of the image that was under the mouse cursor

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java

@@ -23 +23 @@
      * The flag can used to decide for which image file the EXIF GPS data is (re-)written.
      */
-    private boolean isNewGpsData = false;
+    private boolean isNewGpsData;
     /** Temporary source of GPS time if not correlated with GPX track. */
-    private Date exifGpsTime = null;
+    private Date exifGpsTime;
     Image thumbnail;
 

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java

@@ -46 +46 @@
 
     private ImageDisplay imgDisplay = new ImageDisplay();
-    private boolean centerView = false;
+    private boolean centerView;
 
     // Only one instance of that class is present at one time
     private static volatile ImageViewerDialog dialog;
 
-    private boolean collapseButtonClicked = false;
+    private boolean collapseButtonClicked;
 
     static void newInstance() {
@@ -276 +276 @@
     }
 
-    private transient GeoImageLayer currentLayer = null;
-    private transient ImageEntry currentEntry = null;
+    private transient GeoImageLayer currentLayer;
+    private transient ImageEntry currentEntry;
 
     public void displayImage(GeoImageLayer layer, ImageEntry entry) {

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java

@@ -26 +26 @@
     public static final int maxSize = 120;
     public static final int minSize = 22;
-    public volatile boolean stop = false;
+    public volatile boolean stop;
     private List<ImageEntry> data;
     private GeoImageLayer layer;