Index: /applications/editors/josm/plugins/waypoint_search/.checkstyle =================================================================== --- /applications/editors/josm/plugins/waypoint_search/.checkstyle (revision 32551) +++ /applications/editors/josm/plugins/waypoint_search/.checkstyle (revision 32551) @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + Index: /applications/editors/josm/plugins/waypoint_search/.project =================================================================== --- /applications/editors/josm/plugins/waypoint_search/.project (revision 32550) +++ /applications/editors/josm/plugins/waypoint_search/.project (revision 32551) @@ -16,7 +16,13 @@ + + net.sf.eclipsecs.core.CheckstyleBuilder + + + org.eclipse.jdt.core.javanature + net.sf.eclipsecs.core.CheckstyleNature Index: /applications/editors/josm/plugins/waypoint_search/.settings/org.eclipse.jdt.ui.prefs =================================================================== --- /applications/editors/josm/plugins/waypoint_search/.settings/org.eclipse.jdt.ui.prefs (revision 32551) +++ /applications/editors/josm/plugins/waypoint_search/.settings/org.eclipse.jdt.ui.prefs (revision 32551) @@ -0,0 +1,60 @@ +eclipse.preferences.version=1 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=false +sp_cleanup.add_missing_annotations=true +sp_cleanup.add_missing_deprecated_annotations=true +sp_cleanup.add_missing_methods=false +sp_cleanup.add_missing_nls_tags=false +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_missing_override_annotations_interface_methods=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_functional_interfaces=false +sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=false +sp_cleanup.format_source_code_changes_only=false +sp_cleanup.insert_inferred_type_arguments=false +sp_cleanup.make_local_variable_final=true +sp_cleanup.make_parameters_final=false +sp_cleanup.make_private_fields_final=true +sp_cleanup.make_type_abstract_if_missing_method=false +sp_cleanup.make_variable_declarations_final=false +sp_cleanup.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +sp_cleanup.on_save_use_additional_actions=true +sp_cleanup.organize_imports=true +sp_cleanup.qualify_static_field_accesses_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_redundant_type_arguments=true +sp_cleanup.remove_trailing_whitespaces=true +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_casts=true +sp_cleanup.remove_unnecessary_nls_tags=false +sp_cleanup.remove_unused_imports=true +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=false +sp_cleanup.remove_unused_private_methods=true +sp_cleanup.remove_unused_private_types=true +sp_cleanup.sort_members=false +sp_cleanup.sort_members_all=false +sp_cleanup.use_anonymous_class_creation=false +sp_cleanup.use_blocks=false +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_lambda=true +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true +sp_cleanup.use_type_arguments=false Index: /applications/editors/josm/plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/Engine.java =================================================================== --- /applications/editors/josm/plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/Engine.java (revision 32550) +++ /applications/editors/josm/plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/Engine.java (revision 32551) @@ -1,13 +1,16 @@ +// 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,10 +28,10 @@ returnList.add(marker); } - } + } } - } + } return returnList; - } - + } + static boolean gpxLayersExist() { return !Main.getLayerManager().getLayersOfType(MarkerLayer.class).isEmpty(); Index: /applications/editors/josm/plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java =================================================================== --- /applications/editors/josm/plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java (revision 32550) +++ /applications/editors/josm/plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java (revision 32551) @@ -1,3 +1,6 @@ +// 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,5 +12,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,5 +25,4 @@ 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,5 +33,5 @@ private List searchResultObjectCache = new ArrayList<>(); private boolean firstTimeSearch = true; - + SelectWaypointDialog(String name, String iconName, String tooltip, Shortcut shortcut, int preferredHeight) { @@ -34,11 +43,11 @@ //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,14 +56,14 @@ 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,10 +97,8 @@ @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,5 +116,5 @@ @Override public void mousePressed(MouseEvent arg0) { - if (searchPattern.getSelectedText()==null) { + if (searchPattern.getSelectedText() == null) { searchPattern.selectAll(); } Index: /applications/editors/josm/plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java =================================================================== --- /applications/editors/josm/plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java (revision 32550) +++ /applications/editors/josm/plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java (revision 32551) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.waypointSearch; @@ -18,5 +19,5 @@ * 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;