Changeset 10179 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java

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/tags/TagConflictResolver.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java

@@ -21 +21 @@
  * This is a UI widget for resolving tag conflicts, i.e. differences of the tag values
  * of multiple {@link org.openstreetmap.josm.data.osm.OsmPrimitive}s.
- *
- *
+ * @since 2008
  */
 public class TagConflictResolver extends JPanel {
@@ -29 +28 @@
     private final TagConflictResolverModel model;
     /** selects whether only tags with conflicts are displayed */
-    private JCheckBox cbShowTagsWithConflictsOnly;
-    private JCheckBox cbShowTagsWithMultiValuesOnly;
+    private final JCheckBox cbShowTagsWithConflictsOnly = new JCheckBox(tr("Show tags with conflicts only"));
+    private final JCheckBox cbShowTagsWithMultiValuesOnly = new JCheckBox(tr("Show tags with multiple values only"));
+
+    /**
+     * Constructs a new {@code TagConflictResolver}.
+     */
+    public TagConflictResolver() {
+        this.model = new TagConflictResolverModel();
+        build();
+    }
 
     protected JPanel buildInfoPanel() {
@@ -47 +54 @@
         gc.fill = GridBagConstraints.HORIZONTAL;
         gc.weighty = 0.0;
-        pnl.add(cbShowTagsWithConflictsOnly = new JCheckBox(tr("Show tags with conflicts only")), gc);
-        pnl.add(cbShowTagsWithMultiValuesOnly = new JCheckBox(tr("Show tags with multiple values only")), gc);
+        pnl.add(cbShowTagsWithConflictsOnly, gc);
+        pnl.add(cbShowTagsWithMultiValuesOnly, gc);
         cbShowTagsWithConflictsOnly.addChangeListener(
                 new ChangeListener() {
@@ -92 +99 @@
 
     /**
-     * Constructs a new {@code TagConflictResolver}.
-     */
-    public TagConflictResolver() {
-        this.model = new TagConflictResolverModel();
-        build();
-    }
-
-    /**
      * Replies the model used by this dialog
      *