Changeset 32398 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/FindRelationAction.java

Timestamp:

2016-06-25T11:56:57+02:00 (10 years ago)

Author:

donvip

Message:

checkstyle

File:

• applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/FindRelationAction.java (modified) (9 diffs)

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/FindRelationAction.java

@@ -63 +63 @@
         relationsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         relationsList.setCellRenderer(new OsmPrimitivRenderer());
-        panel.add(new JScrollPane(relationsList, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER), BorderLayout.CENTER);
+        panel.add(new JScrollPane(relationsList,
+                JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER), BorderLayout.CENTER);
         panel.setPreferredSize(new Dimension(400, 400));
 
@@ -108 +109 @@
             @Override
             public void keyPressed(KeyEvent e) {
-                if (shouldForward(e) ) {
+                if (shouldForward(e)) {
                     relationsList.dispatchEvent(e);
                 }
@@ -115 +116 @@
             @Override
             public void keyReleased(KeyEvent e) {
-                if (shouldForward(e) ) {
+                if (shouldForward(e)) {
                     relationsList.dispatchEvent(e);
                 }
@@ -132 +133 @@
         Object answer = optionPane.getValue();
         if (answer == null || answer == JOptionPane.UNINITIALIZED_VALUE
-                || (answer instanceof Integer && (Integer)answer != JOptionPane.OK_OPTION))
+                || (answer instanceof Integer && (Integer) answer != JOptionPane.OK_OPTION))
             return;
 
         Relation r = relationsList.getSelectedValue();
-        if (r != null ) {
+        if (r != null) {
             chRel.set(r);
         }
@@ -143 +144 @@
     @Override
     protected void updateEnabledState() {
-        setEnabled(getCurrentDataSet() != null);
+        setEnabled(getLayerManager().getEditDataSet() != null);
     }
 
@@ -150 +151 @@
         if (keywords.length > 0) {
             List<String> filteredKeywords = new ArrayList<>(keywords.length);
-            for (String s : keywords )
-                if (s.length() > 0 ) {
+            for (String s : keywords) {
+                if (s.length() > 0) {
                     filteredKeywords.add(s.trim().toLowerCase());
                 }
+            }
             keywords = filteredKeywords.toArray(new String[0]);
         }
 
-        System.out.println("keywords.length = " + keywords.length);
-        for (int i = 0; i < keywords.length; i++ ) {
-            System.out.println("keyword["+i+"] = " + keywords[i]);
+        if (Main.isDebugEnabled()) {
+            Main.debug("keywords.length = " + keywords.length);
+            for (int i = 0; i < keywords.length; i++) {
+                Main.debug("keyword["+i+"] = " + keywords[i]);
+            }
         }
 
         List<Relation> relations = new ArrayList<>();
-        if (getEditLayer() != null) {
-            for (Relation r : getEditLayer().data.getRelations()) {
+        if (getLayerManager().getEditLayer() != null) {
+            for (Relation r : getLayerManager().getEditLayer().data.getRelations()) {
                 if (!r.isDeleted() && r.isVisible() && !r.isIncomplete()) {
                     boolean add = true;
                     for (int i = 0; i < keywords.length && add; i++) {
                         boolean ok = false;
-                        if (String.valueOf(r.getPrimitiveId().getUniqueId()).contains(keywords[i]) ) {
+                        if (String.valueOf(r.getPrimitiveId().getUniqueId()).contains(keywords[i])) {
                             ok = true;
                         } else {
@@ -180 +184 @@
                             }
                         }
-                        if (!ok ) {
+                        if (!ok) {
                             add = false;
                         }
                     }
-                    if (add ) {
+                    if (add) {
                         relations.add(r);
                     }
@@ -227 +231 @@
         public void setRelations(Collection<Relation> relations) {
             int selectedIndex = selectionModel.getMinSelectionIndex();
-            Relation sel =  selectedIndex < 0 ? null : getElementAt(selectedIndex);
+            Relation sel = selectedIndex < 0 ? null : getElementAt(selectedIndex);
 
             this.relations.clear();
             selectionModel.clearSelection();
-            if (relations != null ) {
+            if (relations != null) {
                 this.relations.addAll(relations);
             }
@@ -238 +242 @@
             if (sel != null) {
                 selectedIndex = this.relations.indexOf(sel);
-                if (selectedIndex >= 0 ) {
+                if (selectedIndex >= 0) {
                     selectionModel.addSelectionInterval(selectedIndex, selectedIndex);
                 }
             }
-            if (selectionModel.isSelectionEmpty() && !this.relations.isEmpty() ) {
+            if (selectionModel.isSelectionEmpty() && !this.relations.isEmpty()) {
                 selectionModel.addSelectionInterval(0, 0);
             }