Changeset 6267 in josm for trunk/src/org/openstreetmap/josm/gui/conflict

Timestamp:

2013-09-27T13:38:15+02:00 (11 years ago)

Author:

Don-vip

Message:

Sonar/FindBugs - Replace singular fields by local variables

Location:

trunk/src/org/openstreetmap/josm/gui/conflict/pair

Files:

• ListMerger.java (modified) (4 diffs)
• properties/PropertiesMerger.java (modified) (4 diffs)
• tags/TagMerger.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java

@@ -75 +75 @@
     private AdjustmentSynchronizer adjustmentSynchronizer;
 
-    private  JCheckBox cbLockMyScrolling;
-    private  JCheckBox cbLockMergedScrolling;
-    private  JCheckBox cbLockTheirScrolling;
-
     private  JLabel lblMyVersion;
     private  JLabel lblMergedVersion;
@@ -307 +303 @@
         gc.weighty = 0.0;
         gc.insets = new Insets(0,0,0,0);
-        cbLockMyScrolling = new JCheckBox();
+        JCheckBox cbLockMyScrolling = new JCheckBox();
         cbLockMyScrolling.setName("checkbox.lockmyscrolling");
         add(buildAdjustmentLockControlPanel(cbLockMyScrolling), gc);
@@ -313 +309 @@
         gc.gridx = 2;
         gc.gridy = 1;
-        cbLockMergedScrolling = new JCheckBox();
+        JCheckBox cbLockMergedScrolling = new JCheckBox();
         cbLockMergedScrolling.setName("checkbox.lockmergedscrolling");
         add(buildAdjustmentLockControlPanel(cbLockMergedScrolling), gc);
@@ -319 +315 @@
         gc.gridx = 4;
         gc.gridy = 1;
-        cbLockTheirScrolling = new JCheckBox();
+        JCheckBox cbLockTheirScrolling = new JCheckBox();
         cbLockTheirScrolling.setName("checkbox.locktheirscrolling");
         add(buildAdjustmentLockControlPanel(cbLockTheirScrolling), gc);

trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java

@@ -37 +37 @@
     private static DecimalFormat COORD_FORMATTER = new DecimalFormat("###0.0000000");
 
-    private  JLabel lblMyVersion;
-    private  JLabel lblMergedVersion;
-    private  JLabel lblTheirVersion;
-
     private JLabel lblMyCoordinates;
     private JLabel lblMergedCoordinates;
@@ -75 +71 @@
         gc.weighty = 0.0;
         gc.insets = new Insets(10,0,10,0);
-        lblMyVersion = new JLabel(tr("My version"));
+        JLabel lblMyVersion = new JLabel(tr("My version"));
         lblMyVersion.setToolTipText(tr("Properties in my dataset, i.e. the local dataset"));
         add(lblMyVersion, gc);
@@ -81 +77 @@
         gc.gridx = 3;
         gc.gridy = 0;
-        lblMergedVersion = new JLabel(tr("Merged version"));
+        JLabel lblMergedVersion = new JLabel(tr("Merged version"));
         lblMergedVersion.setToolTipText(tr("Properties in the merged element. They will replace properties in my elements when merge decisions are applied."));
         add(lblMergedVersion, gc);
@@ -87 +83 @@
         gc.gridx = 5;
         gc.gridy = 0;
-        lblTheirVersion = new JLabel(tr("Their version"));
+        JLabel lblTheirVersion = new JLabel(tr("Their version"));
         lblTheirVersion.setToolTipText(tr("Properties in their dataset, i.e. the server dataset"));
         add(lblTheirVersion, gc);

trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java

@@ -41 +41 @@
     private JTable theirTable;
     private final TagMergeModel model;
-    private JButton btnKeepMine;
-    private JButton btnKeepTheir;
     AdjustmentSynchronizer adjustmentSynchronizer;
 
@@ -173 +171 @@
         KeepMineAction keepMineAction = new KeepMineAction();
         mineTable.getSelectionModel().addListSelectionListener(keepMineAction);
-        btnKeepMine = new JButton(keepMineAction);
+        JButton btnKeepMine = new JButton(keepMineAction);
         btnKeepMine.setName("button.keepmine");
         add(btnKeepMine, gc);
@@ -196 +194 @@
         gc.weighty = 0.0;
         KeepTheirAction keepTheirAction = new KeepTheirAction();
-        btnKeepTheir = new JButton(keepTheirAction);
+        JButton btnKeepTheir = new JButton(keepTheirAction);
         btnKeepTheir.setName("button.keeptheir");
         add(btnKeepTheir, gc);