Changeset 10179 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.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/preferences/projection/CodeProjectionChoice.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java

@@ -47 +47 @@
     private static class CodeSelectionPanel extends JPanel implements ListSelectionListener, DocumentListener {
 
-        public JosmTextField filter;
-        private ProjectionCodeListModel model;
+        public final JosmTextField filter = new JosmTextField(30);
+        private final ProjectionCodeListModel model = new ProjectionCodeListModel();
         public JList<String> selectionList;
         private final List<String> data;
@@ -89 +89 @@
 
         private void build() {
-            filter = new JosmTextField(30);
             filter.setColumns(10);
             filter.getDocument().addDocumentListener(this);
 
             selectionList = new JList<>(data.toArray(new String[0]));
-            selectionList.setModel(model = new ProjectionCodeListModel());
+            selectionList.setModel(model);
             JScrollPane scroll = new JScrollPane(selectionList);
             scroll.setPreferredSize(new Dimension(200, 214));
@@ -105 +104 @@
         public String getCode() {
             int idx = selectionList.getSelectedIndex();
-            if (idx == -1) return lastCode;
+            if (idx == -1)
+                return lastCode;
             return filteredData.get(selectionList.getSelectedIndex());
         }
@@ -174 +174 @@
                 if (matcher2.matches()) {
                     int cmp1 = matcher1.group(1).compareTo(matcher2.group(1));
-                    if (cmp1 != 0) return cmp1;
+                    if (cmp1 != 0)
+                        return cmp1;
                     int num1 = Integer.parseInt(matcher1.group(2));
                     int num2 = Integer.parseInt(matcher2.group(2));