Changeset 10179 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair

Timestamp:

2016-05-11T02:44:10+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:AssignmentInSubExpressionCheck - Assignments should not be made from within sub-expressions

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java (modified) (14 diffs)

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

@@ -37 +37 @@
     private static final DecimalFormat COORD_FORMATTER = new DecimalFormat("###0.0000000");
 
-    private JLabel lblMyCoordinates;
-    private JLabel lblMergedCoordinates;
-    private JLabel lblTheirCoordinates;
-
-    private JLabel lblMyDeletedState;
-    private JLabel lblMergedDeletedState;
-    private JLabel lblTheirDeletedState;
-
-    private JLabel lblMyReferrers;
-    private JLabel lblTheirReferrers;
+    private final JLabel lblMyCoordinates = buildValueLabel("label.mycoordinates");
+    private final JLabel lblMergedCoordinates = buildValueLabel("label.mergedcoordinates");
+    private final JLabel lblTheirCoordinates = buildValueLabel("label.theircoordinates");
+
+    private final JLabel lblMyDeletedState = buildValueLabel("label.mydeletedstate");
+    private final JLabel lblMergedDeletedState = buildValueLabel("label.mergeddeletedstate");
+    private final JLabel lblTheirDeletedState = buildValueLabel("label.theirdeletedstate");
+
+    private final JLabel lblMyReferrers = buildValueLabel("label.myreferrers");
+    private final JLabel lblTheirReferrers = buildValueLabel("label.theirreferrers");
 
     private final transient PropertiesMergeModel model;
@@ -61 +61 @@
     }
 
-    protected JLabel buildValueLabel(String name) {
+    protected static JLabel buildValueLabel(String name) {
         JLabel lbl = new JLabel();
         lbl.setName(name);
@@ -129 +129 @@
         gc.weightx = 0.33;
         gc.weighty = 0.0;
-        add(lblMyCoordinates = buildValueLabel("label.mycoordinates"), gc);
+        add(lblMyCoordinates, gc);
 
         gc.gridx = 2;
@@ -147 +147 @@
         gc.weightx = 0.33;
         gc.weighty = 0.0;
-        add(lblMergedCoordinates = buildValueLabel("label.mergedcoordinates"), gc);
+        add(lblMergedCoordinates, gc);
 
         gc.gridx = 4;
@@ -164 +164 @@
         gc.weightx = 0.33;
         gc.weighty = 0.0;
-        add(lblTheirCoordinates = buildValueLabel("label.theircoordinates"), gc);
+        add(lblTheirCoordinates, gc);
 
         // ---------------------------------------------------
@@ -198 +198 @@
         gc.weightx = 0.33;
         gc.weighty = 0.0;
-        add(lblMyDeletedState = buildValueLabel("label.mydeletedstate"), gc);
+        add(lblMyDeletedState, gc);
 
         gc.gridx = 2;
@@ -216 +216 @@
         gc.weightx = 0.33;
         gc.weighty = 0.0;
-        add(lblMergedDeletedState = buildValueLabel("label.mergeddeletedstate"), gc);
+        add(lblMergedDeletedState, gc);
 
         gc.gridx = 4;
@@ -234 +234 @@
         gc.weightx = 0.33;
         gc.weighty = 0.0;
-        add(lblTheirDeletedState = buildValueLabel("label.theirdeletedstate"), gc);
+        add(lblTheirDeletedState, gc);
 
         // ---------------------------------------------------
@@ -270 +270 @@
         gc.weightx = 0.33;
         gc.weighty = 0.0;
-        add(lblMyReferrers = buildValueLabel("label.myreferrers"), gc);
+        add(lblMyReferrers, gc);
 
         gc.gridx = 5;
@@ -278 +278 @@
         gc.weightx = 0.33;
         gc.weighty = 0.0;
-        add(lblTheirReferrers = buildValueLabel("label.theirreferrers"), gc);
+        add(lblTheirReferrers, gc);
     }
 
@@ -289 +289 @@
     }
 
-    public String coordToString(LatLon coord) {
+    protected static String coordToString(LatLon coord) {
         if (coord == null)
             return tr("(none)");
@@ -301 +301 @@
     }
 
-    public String deletedStateToString(Boolean deleted) {
+    protected static String deletedStateToString(Boolean deleted) {
         if (deleted == null)
             return tr("(none)");
@@ -310 +310 @@
     }
 
-    public String referrersToString(List<OsmPrimitive> referrers) {
+    protected static String referrersToString(List<OsmPrimitive> referrers) {
         if (referrers.isEmpty())
             return tr("(none)");
@@ -390 +390 @@
     }
 
+    /**
+     * Returns properties merge model.
+     * @return properties merge model
+     */
     public PropertiesMergeModel getModel() {
         return model;