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

Timestamp:

2015-04-28T00:49:49+02:00 (9 years ago)

Author:

Don-vip

Message:

fix sonar squid:S2039 - Member variable visibility should be specified

Location:

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

Files:

• CorrelateGpxWithImages.java (modified) (7 diffs)
• GeoImageLayer.java (modified) (2 diffs)
• ImageDisplay.java (modified) (1 diff)
• ThumbsLoader.java (modified) (1 diff)

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

@@ -91 +91 @@
     private static List<GpxData> loadedGpxData = new ArrayList<>();
 
-    GeoImageLayer yLayer = null;
-    double timezone;
-    long delta;
+    private GeoImageLayer yLayer = null;
+    private double timezone;
+    private long delta;
 
     /**
@@ -105 +105 @@
 
     private static class GpxDataWrapper {
-        String name;
-        GpxData data;
-        File file;
+        private String name;
+        private GpxData data;
+        private File file;
 
         public GpxDataWrapper(String name, GpxData data, File file) {
@@ -121 +121 @@
     }
 
-    ExtendedDialog syncDialog;
-    List<GpxDataWrapper> gpxLst = new ArrayList<>();
-    JPanel outerPanel;
-    JosmComboBox<GpxDataWrapper> cbGpx;
-    JosmTextField tfTimezone;
-    JosmTextField tfOffset;
-    JCheckBox cbExifImg;
-    JCheckBox cbTaggedImg;
-    JCheckBox cbShowThumbs;
-    JLabel statusBarText;
+    private ExtendedDialog syncDialog;
+    private List<GpxDataWrapper> gpxLst = new ArrayList<>();
+    private JPanel outerPanel;
+    private JosmComboBox<GpxDataWrapper> cbGpx;
+    private JosmTextField tfTimezone;
+    private JosmTextField tfOffset;
+    private JCheckBox cbExifImg;
+    private JCheckBox cbTaggedImg;
+    private JCheckBox cbShowThumbs;
+    private JLabel statusBarText;
 
     // remember the last number of matched photos
-    int lastNumMatched = 0;
+    private int lastNumMatched = 0;
 
     /** This class is called when the user doesn't find the GPX file he needs in the files that have
@@ -231 +231 @@
      */
     private class SetOffsetActionListener implements ActionListener {
-        JPanel panel;
-        JLabel lbExifTime;
-        JosmTextField tfGpsTime;
-        JosmComboBox<String> cbTimezones;
-        ImageDisplay imgDisp;
-        JList<String> imgList;
+        private JPanel panel;
+        private JLabel lbExifTime;
+        private JosmTextField tfGpsTime;
+        private JosmComboBox<String> cbTimezones;
+        private ImageDisplay imgDisp;
+        private JList<String> imgList;
 
         @Override
@@ -665 +665 @@
         syncDialog.pack();
         syncDialog.addWindowListener(new WindowAdapter() {
-            static final int CANCEL = -1;
-            static final int DONE = 0;
-            static final int AGAIN = 1;
-            static final int NOTHING = 2;
+            private static final int CANCEL = -1;
+            private static final int DONE = 0;
+            private static final int AGAIN = 1;
+            private static final int NOTHING = 2;
             private int checkAndSave() {
                 if (syncDialog.isVisible())
@@ -764 +764 @@
     }
 
-    StatusBarUpdater statusBarUpdater = new StatusBarUpdater(false);
-    StatusBarUpdater statusBarUpdaterWithRepaint = new StatusBarUpdater(true);
+    private StatusBarUpdater statusBarUpdater = new StatusBarUpdater(false);
+    private StatusBarUpdater statusBarUpdaterWithRepaint = new StatusBarUpdater(true);
 
     private class StatusBarUpdater implements  DocumentListener, ItemListener, ActionListener {
@@ -835 +835 @@
     }
 
-    RepaintTheMapListener repaintTheMap = new RepaintTheMapListener();
+    private RepaintTheMapListener repaintTheMap = new RepaintTheMapListener();
     private class RepaintTheMapListener implements FocusListener {
         @Override

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

@@ -94 +94 @@
 
     boolean useThumbs = false;
-    ExecutorService thumbsLoaderExecutor = Executors.newSingleThreadExecutor(new ThreadFactory() {
+    private ExecutorService thumbsLoaderExecutor = Executors.newSingleThreadExecutor(new ThreadFactory() {
         @Override
         public Thread newThread(Runnable r) {
@@ -102 +102 @@
         }
     });
-    ThumbsLoader thumbsloader;
-    boolean thumbsLoaderRunning = false;
+    private ThumbsLoader thumbsloader;
+    private boolean thumbsLoaderRunning = false;
     volatile boolean thumbsLoaded = false;
     private BufferedImage offscreenBuffer;

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

@@ -135 +135 @@
     private class ImgDisplayMouseListener implements MouseListener, MouseWheelListener, MouseMotionListener {
 
-        boolean mouseIsDragging = false;
-        long lastTimeForMousePoint = 0L;
-        Point mousePointInImg = null;
+        private boolean mouseIsDragging = false;
+        private long lastTimeForMousePoint = 0L;
+        private Point mousePointInImg = null;
 
         /** 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/ThumbsLoader.java

@@ -20 +20 @@
     public static final int minSize = 22;
     public volatile boolean stop = false;
-    List<ImageEntry> data;
-    GeoImageLayer layer;
-    MediaTracker tracker;
-    CacheFiles cache;
-    boolean cacheOff = Main.pref.getBoolean("geoimage.noThumbnailCache", false);
+    private List<ImageEntry> data;
+    private GeoImageLayer layer;
+    private MediaTracker tracker;
+    private CacheFiles cache;
+    private boolean cacheOff = Main.pref.getBoolean("geoimage.noThumbnailCache", false);
 
     public ThumbsLoader(GeoImageLayer layer) {