Changeset 10938 in josm for trunk

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

Files:

• actions/CloseChangesetAction.java (modified) (2 diffs)
• data/AutosaveTask.java (modified) (2 diffs)
• data/cache/BufferedImageCacheEntry.java (modified) (2 diffs)
• data/projection/proj/ObliqueMercator.java (modified) (2 diffs)
• gui/dialogs/ChangesetDialog.java (modified) (3 diffs)
• gui/dialogs/UserListDialog.java (modified) (2 diffs)
• gui/dialogs/changeset/ChangesetContentPanel.java (modified) (1 diff)
• gui/layer/geoimage/CorrelateGpxWithImages.java (modified) (7 diffs)
• gui/oauth/FullyAutomaticAuthorizationUI.java (modified) (2 diffs)

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

@@ -83 +83 @@
         private List<Changeset> changesets;
         private Exception lastException;
-        private UserInfo userInfo;
 
         private DownloadOpenChangesetsTask() {
@@ -121 +120 @@
         protected void realRun() throws SAXException, IOException, OsmTransferException {
             try {
-                userInfo = fetchUserInfo();
+                UserInfo userInfo = fetchUserInfo();
                 if (canceled)
                     return;

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;

trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java

@@ -86 +86 @@
     private ShowChangesetInfoAction showChangesetInfoAction;
     private CloseOpenChangesetsAction closeChangesetAction;
-    private LaunchChangesetManagerAction launchChangesetManagerAction;
 
     private ChangesetDialogPopup popupMenu;
@@ -206 +205 @@
         cbInSelectionOnly.addItemListener(showChangesetInfoAction);
 
-        // -- launch changeset manager action
-        launchChangesetManagerAction = new LaunchChangesetManagerAction();
-
         popupMenu = new ChangesetDialogPopup(lstInActiveDataLayer, lstInSelection);
 
@@ -220 +216 @@
             new SideButton(closeChangesetAction, false),
             new SideButton(showChangesetInfoAction, false),
-            new SideButton(launchChangesetManagerAction, false)
+            new SideButton(new LaunchChangesetManagerAction(), false)
         }));
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java

@@ -59 +59 @@
     private UserTableModel model;
     private SelectUsersPrimitivesAction selectionUsersPrimitivesAction;
-    private ShowUserInfoAction showUserInfoAction;
 
     /**
@@ -95 +94 @@
         // -- info action
         //
-        showUserInfoAction = new ShowUserInfoAction();
+        ShowUserInfoAction showUserInfoAction = new ShowUserInfoAction();
         userTable.getSelectionModel().addListSelectionListener(showUserInfoAction);
 

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java

@@ -400 +400 @@
     private static class HeaderPanel extends JPanel {
 
-        private JMultilineLabel lblMessage;
         private transient Changeset current;
+
+        HeaderPanel() {
+            build();
+        }
 
         protected final void build() {
             setLayout(new FlowLayout(FlowLayout.LEFT));
-            lblMessage = new JMultilineLabel(
-                    tr("The content of this changeset is not downloaded yet.")
-            );
-            add(lblMessage);
+            add(new JMultilineLabel(tr("The content of this changeset is not downloaded yet.")));
             add(new JButton(new DownloadAction()));
 
-        }
-
-        HeaderPanel() {
-            build();
         }
 

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

@@ -342 +342 @@
      */
     private class SetOffsetActionListener implements ActionListener {
-        private JPanel panel;
-        private JLabel lbExifTime;
-        private JosmTextField tfGpsTime;
-        private JosmComboBox<String> cbTimezones;
-        private ImageDisplay imgDisp;
-        private JList<String> imgList;
 
         @Override
@@ -353 +347 @@
             SimpleDateFormat dateFormat = (SimpleDateFormat) DateUtils.getDateTimeFormat(DateFormat.SHORT, DateFormat.MEDIUM);
 
-            panel = new JPanel(new BorderLayout());
+            JPanel panel = new JPanel(new BorderLayout());
             panel.add(new JLabel(tr("<html>Take a photo of your GPS receiver while it displays the time.<br>"
                     + "Display that photo here.<br>"
@@ -359 +353 @@
                     BorderLayout.NORTH);
 
-            imgDisp = new ImageDisplay();
+            ImageDisplay imgDisp = new ImageDisplay();
             imgDisp.setPreferredSize(new Dimension(300, 225));
             panel.add(imgDisp, BorderLayout.CENTER);
@@ -373 +367 @@
             panelTf.add(new JLabel(tr("Photo time (from exif):")), gc);
 
-            lbExifTime = new JLabel();
+            JLabel lbExifTime = new JLabel();
             gc.gridx = 1;
             gc.weightx = 1.0;
@@ -388 +382 @@
             panelTf.add(new JLabel(tr("Gps time (read from the above photo): ")), gc);
 
-            tfGpsTime = new JosmTextField(12);
+            JosmTextField tfGpsTime = new JosmTextField(12);
             tfGpsTime.setEnabled(false);
             tfGpsTime.setMinimumSize(new Dimension(155, tfGpsTime.getMinimumSize().height));
@@ -422 +416 @@
             Collections.sort(vtTimezones);
 
-            cbTimezones = new JosmComboBox<>(vtTimezones.toArray(new String[0]));
+            JosmComboBox<String> cbTimezones = new JosmComboBox<>(vtTimezones.toArray(new String[0]));
 
             String tzId = Main.pref.get("geoimage.timezoneid", "");
@@ -446 +440 @@
             JPanel panelLst = new JPanel(new BorderLayout());
 
-            imgList = new JList<>(new AbstractListModel<String>() {
+            JList<String> imgList = new JList<>(new AbstractListModel<String>() {
                 @Override
                 public String getElementAt(int i) {

trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java

@@ -399 +399 @@
     class FullyAutomaticAuthorisationTask extends PleaseWaitRunnable {
         private boolean canceled;
-        private OsmOAuthAuthorizationClient authClient;
 
         FullyAutomaticAuthorisationTask(Component parent) {
@@ -480 +479 @@
             try {
                 getProgressMonitor().setTicksCount(3);
-                authClient = new OsmOAuthAuthorizationClient(
+                OsmOAuthAuthorizationClient authClient = new OsmOAuthAuthorizationClient(
                         getAdvancedPropertiesPanel().getAdvancedParameters()
                 );