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 23180) +++ applications/editors/josm/plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/Engine.java (revision 23190) @@ -9,42 +9,42 @@ public class Engine { - - public List searchGpxWaypoints(String waypointSearchPattern) { - List returnList = new ArrayList(); - if (gpxLayersExist()) { - //Loop over marker (waypoint) layers.. it could be more than one - for (Iterator layerIterator = Main.map.mapView.getLayersOfType(MarkerLayer.class).iterator(); layerIterator.hasNext();) { - //loop over each marker (waypoint) - for (Iterator markerIterator = layerIterator.next().data.iterator(); markerIterator.hasNext();) { - Marker marker = markerIterator.next(); - if (Pattern.matches(".*\\Q"+waypointSearchPattern.toLowerCase()+"\\E.*", marker.getText().toLowerCase())) { - returnList.add(marker); - } - } - } - } - return returnList; - } - - - - + + public List searchGpxWaypoints(String waypointSearchPattern) { + List returnList = new ArrayList(); + if (gpxLayersExist()) { + //Loop over marker (waypoint) layers.. it could be more than one + for (Iterator layerIterator = Main.map.mapView.getLayersOfType(MarkerLayer.class).iterator(); layerIterator.hasNext();) { + //loop over each marker (waypoint) + for (Iterator markerIterator = layerIterator.next().data.iterator(); markerIterator.hasNext();) { + Marker marker = markerIterator.next(); + if (Pattern.matches(".*\\Q"+waypointSearchPattern.toLowerCase()+"\\E.*", marker.getText().toLowerCase())) { + returnList.add(marker); + } + } + } + } + return returnList; + } + + + + - - - + + + public boolean gpxLayersExist() { - boolean rv = false; - if (Main.map != null) { - if (Main.map.mapView.hasLayers()) { - if (Main.map.mapView.getLayersOfType(MarkerLayer.class).size()>0) { - rv = true; - } - } - } - return rv; + boolean rv = false; + if (Main.map != null) { + if (Main.map.mapView.hasLayers()) { + if (Main.map.mapView.getLayersOfType(MarkerLayer.class).size()>0) { + rv = true; + } + } + } + return rv; } - - - + + + } 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 23180) +++ applications/editors/josm/plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java (revision 23190) @@ -20,43 +20,43 @@ public class SelectWaypointDialog extends ToggleDialog implements KeyListener, MouseListener { - private JTextField searchPattern = new JTextField(20); - private DefaultListModel listModel = new DefaultListModel(); - private JList searchResult = new JList(listModel); - private List SearchResultObjectCache = new ArrayList(); - private boolean first_time_search = true; - private Engine engine = new Engine(); - - - public SelectWaypointDialog(String name, String iconName, String tooltip, - Shortcut shortcut, int preferredHeight) { - super(name, iconName, tooltip, shortcut, preferredHeight); - build(); - } - + private JTextField searchPattern = new JTextField(20); + private DefaultListModel listModel = new DefaultListModel(); + private JList searchResult = new JList(listModel); + private List SearchResultObjectCache = new ArrayList(); + private boolean first_time_search = true; + private Engine engine = new Engine(); + + + public SelectWaypointDialog(String name, String iconName, String tooltip, + Shortcut shortcut, int preferredHeight) { + super(name, iconName, tooltip, shortcut, preferredHeight); + build(); + } + protected void build() { - //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); - - //add result table - searchResult.setLayoutOrientation(JList.VERTICAL); - searchResult.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - searchResult.addMouseListener(this); - JScrollPane scrollPane = new JScrollPane(searchResult); - scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); - panel.add(scrollPane,BorderLayout.CENTER); - - //add label - JLabel label = new JLabel(tr("Select waypoint to move map")); - panel.add(label,BorderLayout.SOUTH); - - //add panel to JOSM gui - add(panel,BorderLayout.CENTER); + //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); + + //add result table + searchResult.setLayoutOrientation(JList.VERTICAL); + searchResult.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + searchResult.addMouseListener(this); + JScrollPane scrollPane = new JScrollPane(searchResult); + scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + panel.add(scrollPane,BorderLayout.CENTER); + + //add label + JLabel label = new JLabel(tr("Select waypoint to move map")); + panel.add(label,BorderLayout.SOUTH); + + //add panel to JOSM gui + add(panel,BorderLayout.CENTER); } @@ -78,15 +78,15 @@ - @Override - public void keyPressed(KeyEvent arg0) { - // TODO Auto-generated method stub - } + @Override + public void keyPressed(KeyEvent arg0) { + // TODO Auto-generated method stub + } - @Override - public void keyReleased(KeyEvent arg0) { - // TODO Auto-generated method stub - updateSearchResults(); - } + @Override + public void keyReleased(KeyEvent arg0) { + // TODO Auto-generated method stub + updateSearchResults(); + } @@ -97,43 +97,43 @@ - @Override - public void mouseClicked(MouseEvent e) { - 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) - } - } + @Override + public void mouseClicked(MouseEvent e) { + 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) + } + } - @Override - public void mouseEntered(MouseEvent arg0) { - // TODO Auto-generated method stub - - } + @Override + public void mouseEntered(MouseEvent arg0) { + // TODO Auto-generated method stub + + } - @Override - public void mouseExited(MouseEvent arg0) { - // TODO Auto-generated method stub - - } + @Override + public void mouseExited(MouseEvent arg0) { + // TODO Auto-generated method stub + + } - @Override - public void mousePressed(MouseEvent arg0) { - if (searchPattern.getSelectedText()==null) { - searchPattern.selectAll(); - } - - } + @Override + public void mousePressed(MouseEvent arg0) { + if (searchPattern.getSelectedText()==null) { + searchPattern.selectAll(); + } + + } - @Override - public void mouseReleased(MouseEvent arg0) { - // TODO Auto-generated method stub - - } + @Override + public void mouseReleased(MouseEvent arg0) { + // TODO Auto-generated method stub + + } } 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 23180) +++ applications/editors/josm/plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java (revision 23190) @@ -10,12 +10,12 @@ public class WaypointSearchPlugin extends Plugin implements LayerChangeListener { - /** + /** * Will be invoked by JOSM to bootstrap the plugin * * @param info information about the plugin and its local installation */ - private Engine engine = new Engine(); - private SelectWaypointDialog waypointDialog = new SelectWaypointDialog(tr("Waypoint search"), "ToolbarIcon", tr("Search after waypoint. Click and move the map view to the waypoint."), null, 100); - + private Engine engine = new Engine(); + private SelectWaypointDialog waypointDialog = new SelectWaypointDialog(tr("Waypoint search"), "ToolbarIcon", tr("Search after waypoint. Click and move the map view to the waypoint."), null, 100); + public WaypointSearchPlugin(PluginInformation info) { super(info); @@ -23,9 +23,9 @@ } - @Override - public void activeLayerChange(Layer oldLayer, Layer newLayer) { - // TODO Auto-generated method stub - - } + @Override + public void activeLayerChange(Layer oldLayer, Layer newLayer) { + // TODO Auto-generated method stub + + } @@ -44,10 +44,10 @@ - @Override - public void layerRemoved(Layer oldLayer) { - if (!engine.gpxLayersExist()) { - waypointDialog.updateSearchResults(); - } - } + @Override + public void layerRemoved(Layer oldLayer) { + if (!engine.gpxLayersExist()) { + waypointDialog.updateSearchResults(); + } + } }