Changeset 10179 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.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/dialogs/changeset/query/UrlBasedQueryPanel.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java

@@ -31 +31 @@
 public class UrlBasedQueryPanel extends JPanel {
 
-    private JosmTextField tfUrl;
-    private JLabel lblValid;
+    private final JosmTextField tfUrl = new JosmTextField();
+    private final JLabel lblValid = new JLabel();
+
+    /**
+     * Constructs a new {@code UrlBasedQueryPanel}.
+     */
+    public UrlBasedQueryPanel() {
+        build();
+    }
 
     protected JPanel buildURLPanel() {
@@ -45 +52 @@
         gc.weightx = 1.0;
         gc.fill = GridBagConstraints.HORIZONTAL;
-        pnl.add(tfUrl = new JosmTextField(), gc);
+        pnl.add(tfUrl, gc);
         tfUrl.getDocument().addDocumentListener(new ChangetQueryUrlValidator());
         tfUrl.addFocusListener(
@@ -59 +66 @@
         gc.weightx = 0.0;
         gc.fill = GridBagConstraints.HORIZONTAL;
-        pnl.add(lblValid = new JLabel(), gc);
+        pnl.add(lblValid, gc);
         lblValid.setPreferredSize(new Dimension(20, 20));
         return pnl;
@@ -115 +122 @@
     }
 
-    /**
-     * Constructs a new {@code UrlBasedQueryPanel}.
-     */
-    public UrlBasedQueryPanel() {
-        build();
-    }
-
     protected boolean isValidChangesetQueryUrl(String text) {
         return buildChangesetQuery(text) != null;
@@ -135 +135 @@
         String path = url.getPath();
         String query = url.getQuery();
-        if (path == null || !path.endsWith("/changesets")) return null;
+        if (path == null || !path.endsWith("/changesets"))
+            return null;
 
         try {
@@ -170 +171 @@
 
         protected void feedbackValid() {
-            if ("valid".equals(getCurrentFeedback())) return;
+            if ("valid".equals(getCurrentFeedback()))
+                return;
             lblValid.setIcon(ImageProvider.get("dialogs", "valid"));
             lblValid.setToolTipText(null);
@@ -177 +179 @@
 
         protected void feedbackInvalid() {
-            if ("invalid".equals(getCurrentFeedback())) return;
+            if ("invalid".equals(getCurrentFeedback()))
+                return;
             lblValid.setIcon(ImageProvider.get("warning-small"));
             lblValid.setToolTipText(tr("This changeset query URL is invalid"));