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

Timestamp:

2016-06-24T09:10:57+02:00 (10 years ago)

Author:

donvip

Message:

checkstyle, update to JOSM 10279

File:

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

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package relcontext.actions;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.BorderLayout;
 import java.awt.Dialog.ModalityType;
 import java.awt.Dimension;
-import java.awt.event.*;
-import static org.openstreetmap.josm.tools.I18n.tr;
-import java.util.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 import java.util.ArrayList;
-import javax.swing.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import javax.swing.AbstractListModel;
+import javax.swing.DefaultListSelectionModel;
+import javax.swing.JDialog;
+import javax.swing.JList;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextField;
+import javax.swing.ListSelectionModel;
+import javax.swing.SwingUtilities;
+
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
@@ -15 +35 @@
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
 import org.openstreetmap.josm.tools.Shortcut;
+
 import relcontext.ChosenRelation;
 
@@ -25 +46 @@
     protected ChosenRelation chRel;
 
-    public FindRelationAction( ChosenRelation chRel ) {
+    public FindRelationAction(ChosenRelation chRel) {
         super(tr("Find"), "relcontext/find", tr("Find a relation"),
                 Shortcut.registerShortcut("reltoolbox:find", tr("Relation Toolbox: {0}", tr("Find a relation")),
-                KeyEvent.VK_F, Shortcut.ALT_CTRL), false);
+                        KeyEvent.VK_F, Shortcut.ALT_CTRL), false);
         this.chRel = chRel;
     }
 
-    public void actionPerformed( ActionEvent e ) {
+    @Override
+    public void actionPerformed(ActionEvent e) {
         JPanel panel = new JPanel(new BorderLayout());
         final JTextField searchField = new JTextField();
@@ -55 +77 @@
         relationsList.addMouseListener(new MouseAdapter() {
             @Override
-            public void mouseClicked( MouseEvent e ) {
-                if( e.getClickCount() >= 2 && !relationsList.isSelectionEmpty() ) {
+            public void mouseClicked(MouseEvent e) {
+                if (e.getClickCount() >= 2 && !relationsList.isSelectionEmpty()) {
                     dlg.setVisible(false);
                     optionPane.setValue(JOptionPane.OK_OPTION);
@@ -64 +86 @@
 
         searchField.addActionListener(new ActionListener() {
-            public void actionPerformed( ActionEvent e ) {
-                if( !relationsList.isSelectionEmpty() ) {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                if (!relationsList.isSelectionEmpty()) {
                     dlg.setVisible(false);
                     optionPane.setValue(JOptionPane.OK_OPTION);
@@ -74 +97 @@
         searchField.addKeyListener(new KeyAdapter() {
             @Override
-            public void keyTyped( KeyEvent e ) {
+            public void keyTyped(KeyEvent e) {
                 SwingUtilities.invokeLater(new Runnable() {
+                    @Override
                     public void run() {
                         updateRelationData(relationsData, searchField.getText());
@@ -83 +107 @@
 
             @Override
-            public void keyPressed( KeyEvent e ) {
-                if( shouldForward(e) )
+            public void keyPressed(KeyEvent e) {
+                if (shouldForward(e) ) {
                     relationsList.dispatchEvent(e);
-            }
-
-            @Override
-            public void keyReleased( KeyEvent e ) {
-                if( shouldForward(e) )
+                }
+            }
+
+            @Override
+            public void keyReleased(KeyEvent e) {
+                if (shouldForward(e) ) {
                     relationsList.dispatchEvent(e);
-            }
-
-            private boolean shouldForward( KeyEvent e ) {
+                }
+            }
+
+            private boolean shouldForward(KeyEvent e) {
                 return e.getKeyCode() == KeyEvent.VK_UP || e.getKeyCode() == KeyEvent.VK_DOWN
                         || e.getKeyCode() == KeyEvent.VK_PAGE_DOWN || e.getKeyCode() == KeyEvent.VK_PAGE_UP
@@ -105 +131 @@
 
         Object answer = optionPane.getValue();
-        if( answer == null || answer == JOptionPane.UNINITIALIZED_VALUE
-                || (answer instanceof Integer && (Integer)answer != JOptionPane.OK_OPTION) ) {
+        if (answer == null || answer == JOptionPane.UNINITIALIZED_VALUE
+                || (answer instanceof Integer && (Integer)answer != JOptionPane.OK_OPTION))
             return;
-        }
-
-        Relation r = (Relation)relationsList.getSelectedValue();
-        if( r != null )
+
+        Relation r = relationsList.getSelectedValue();
+        if (r != null ) {
             chRel.set(r);
+        }
     }
 
@@ -120 +146 @@
     }
 
-    protected void updateRelationData( FindRelationListModel data, String filter ) {
+    protected void updateRelationData(FindRelationListModel data, String filter) {
         String[] keywords = filter == null ? new String[0] : filter.split("\\s+");
-        if( keywords.length > 0 ) {
+        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++ )
+        for (int i = 0; i < keywords.length; i++ ) {
             System.out.println("keyword["+i+"] = " + keywords[i]);
+        }
 
         List<Relation> relations = new ArrayList<>();
-        if( getEditLayer() != null ) {
-            for( Relation r : getEditLayer().data.getRelations() ) {
-                if( !r.isDeleted() && r.isVisible() && !r.isIncomplete() ) {
+        if (getEditLayer() != null) {
+            for (Relation r : getEditLayer().data.getRelations()) {
+                if (!r.isDeleted() && r.isVisible() && !r.isIncomplete()) {
                     boolean add = true;
-                    for( int i = 0; i < keywords.length && add; i++ ) {
+                    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 {
-                            for( String key : r.keySet() ) {
-                                if( key.contains(keywords[i]) || r.get(key).toLowerCase().contains(keywords[i])
-                                        || tr(r.get(key)).toLowerCase().contains(keywords[i]) ) {
+                        } else {
+                            for (String key : r.keySet()) {
+                                if (key.contains(keywords[i]) || r.get(key).toLowerCase().contains(keywords[i])
+                                        || tr(r.get(key)).toLowerCase().contains(keywords[i])) {
                                     ok = true;
                                     break;
@@ -152 +180 @@
                             }
                         }
-                        if( !ok ) add = false;
+                        if (!ok ) {
+                            add = false;
+                        }
                     }
-                    if( add )
+                    if (add ) {
                         relations.add(r);
+                    }
                 }
             }
@@ -171 +202 @@
         private DefaultListSelectionModel selectionModel;
 
-        public FindRelationListModel( DefaultListSelectionModel selectionModel ) {
+        public FindRelationListModel(DefaultListSelectionModel selectionModel) {
             super();
             this.selectionModel = selectionModel;
@@ -190 +221 @@
 
         @Override
-        public Relation getElementAt( int index ) {
+        public Relation getElementAt(int index) {
             return relations.get(index);
         }
@@ -197 +228 @@
             int selectedIndex = selectionModel.getMinSelectionIndex();
             Relation sel =  selectedIndex < 0 ? null : getElementAt(selectedIndex);
-            
+
             this.relations.clear();
             selectionModel.clearSelection();
-            if( relations != null )
+            if (relations != null ) {
                 this.relations.addAll(relations);
+            }
             fireIntervalAdded(this, 0, getSize());
 
-            if( sel != null ) {
+            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);
+            }
         }
     }