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

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

@@ -32 +32 @@
 /**
  * This is a modal dialog for entering query criteria to search for changesets.
- *
+ * @since 2689
  */
 public class ChangesetQueryDialog extends JDialog {
 
     private JTabbedPane tpQueryPanels;
-    private BasicChangesetQueryPanel pnlBasicChangesetQueries;
-    private UrlBasedQueryPanel pnlUrlBasedQueries;
-    private AdvancedChangesetQueryPanel pnlAdvancedQueries;
+    private final BasicChangesetQueryPanel pnlBasicChangesetQueries = new BasicChangesetQueryPanel();
+    private final UrlBasedQueryPanel pnlUrlBasedQueries = new UrlBasedQueryPanel();
+    private final AdvancedChangesetQueryPanel pnlAdvancedQueries = new AdvancedChangesetQueryPanel();
     private boolean canceled;
+
+    /**
+     * Constructs a new {@code ChangesetQueryDialog}.
+     * @param parent parent window
+     */
+    public ChangesetQueryDialog(Window parent) {
+        super(parent, ModalityType.DOCUMENT_MODAL);
+        build();
+    }
 
     protected JPanel buildContentPanel() {
         tpQueryPanels = new JTabbedPane();
-        tpQueryPanels.add(pnlBasicChangesetQueries = new BasicChangesetQueryPanel());
-        tpQueryPanels.add(pnlUrlBasedQueries = new UrlBasedQueryPanel());
-        tpQueryPanels.add(pnlAdvancedQueries = new AdvancedChangesetQueryPanel());
+        tpQueryPanels.add(pnlBasicChangesetQueries);
+        tpQueryPanels.add(pnlUrlBasedQueries);
+        tpQueryPanels.add(pnlAdvancedQueries);
 
         tpQueryPanels.setTitleAt(0, tr("Basic"));
@@ -92 +101 @@
 
         addWindowListener(new WindowEventHandler());
-    }
-
-    public ChangesetQueryDialog(Window parent) {
-        super(parent, ModalityType.DOCUMENT_MODAL);
-        build();
     }
 
@@ -184 +188 @@
                     }
                     break;
-
                 case 2:
                     if (getChangesetQuery() == null) {