Changeset 32551 in osm for applications

Timestamp:

2016-07-04T09:29:30+02:00 (8 years ago)

Author:

donvip

Message:

checkstyle

Location:

applications/editors/josm/plugins/waypoint_search

Files:

• .checkstyle (added)
• .project (modified) (1 diff)
• .settings/org.eclipse.jdt.ui.prefs (added)
• src/org/openstreetmap/josm/plugins/waypointSearch/Engine.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java (modified) (8 diffs)
• src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java (modified) (2 diffs)

applications/editors/josm/plugins/waypoint_search/.project

@@ -16 +16 @@
                         </arguments>
                 </buildCommand>
+                <buildCommand>
+                        <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
         </buildSpec>
         <natures>
                 <nature>org.eclipse.jdt.core.javanature</nature>
+                <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
         </natures>
 </projectDescription>

applications/editors/josm/plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/Engine.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.waypointSearch;
 
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
-import org.openstreetmap.josm.gui.layer.markerlayer.Marker;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 import java.util.regex.Pattern;
 
-class Engine {
-    
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.layer.markerlayer.Marker;
+import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
+
+final class Engine {
+
     private Engine() {
         // Utility class
@@ -25 +28 @@
                         returnList.add(marker);
                     }
-                }               
+                }
             }
-        } 
+        }
         return returnList;
-    }   
-    
+    }
+
     static boolean gpxLayersExist() {
         return !Main.getLayerManager().getLayersOfType(MarkerLayer.class).isEmpty();

applications/editors/josm/plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.waypointSearch;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.BorderLayout;
@@ -9 +12 @@
 import java.util.Iterator;
 import java.util.List;
-import javax.swing.*;
+
+import javax.swing.DefaultListModel;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextField;
+import javax.swing.ListSelectionModel;
 
 import org.openstreetmap.josm.Main;
@@ -15 +25 @@
 import org.openstreetmap.josm.gui.layer.markerlayer.Marker;
 import org.openstreetmap.josm.tools.Shortcut;
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 class SelectWaypointDialog extends ToggleDialog implements KeyListener, MouseListener {
@@ -24 +33 @@
     private List<Marker> searchResultObjectCache = new ArrayList<>();
     private boolean firstTimeSearch = true;
-    
+
     SelectWaypointDialog(String name, String iconName, String tooltip,
             Shortcut shortcut, int preferredHeight) {
@@ -34 +43 @@
         //add panel - all the gui of the plugin goes in here
         JPanel panel = new JPanel(new BorderLayout());
-        
+
         //search field
         searchPattern.setText(tr("Enter search expression here.."));
         searchPattern.addKeyListener(this);
         searchPattern.addMouseListener(this);
-        panel.add(searchPattern,BorderLayout.NORTH);
-        
+        panel.add(searchPattern, BorderLayout.NORTH);
+
         //add result table
         searchResult.setLayoutOrientation(JList.VERTICAL);
@@ -47 +56 @@
         JScrollPane scrollPane = new JScrollPane(searchResult);
         scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
-        panel.add(scrollPane,BorderLayout.CENTER);
-        
+        panel.add(scrollPane, BorderLayout.CENTER);
+
         //add label
         JLabel label = new JLabel(tr("Select waypoint to move map"));
-        panel.add(label,BorderLayout.SOUTH);
-        
+        panel.add(label, BorderLayout.SOUTH);
+
         //add panel to JOSM gui
         createLayout(panel, false, null);
     }
-    
+
     void updateSearchResults() {
         String searchfor = "";
@@ -88 +97 @@
     @Override
     public void mouseClicked(MouseEvent e) {
-        if (e.getSource()==searchResult) {
+        if (e.getSource() == searchResult) {
             //click on the search result box
             Marker marker = searchResultObjectCache.get(searchResult.getSelectedIndex());
             Main.map.mapView.zoomTo(marker.getCoor());
-        } else {
-            //click on the text field (input search expression)
         }
     }
@@ -109 +116 @@
     @Override
     public void mousePressed(MouseEvent arg0) {
-        if (searchPattern.getSelectedText()==null) {
+        if (searchPattern.getSelectedText() == null) {
             searchPattern.selectAll();
         }

applications/editors/josm/plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.waypointSearch;
 
@@ -18 +19 @@
  * Click on one of the search results/waypoints to move the map.
  */
-public class WaypointSearchPlugin extends Plugin implements LayerChangeListener  {
+public class WaypointSearchPlugin extends Plugin implements LayerChangeListener {
     private SelectWaypointDialog waypointDialog;