Index: /applications/editors/josm/plugins/relcontext/src/relcontext/RelContextDialog.java =================================================================== --- /applications/editors/josm/plugins/relcontext/src/relcontext/RelContextDialog.java (revision 25676) +++ /applications/editors/josm/plugins/relcontext/src/relcontext/RelContextDialog.java (revision 25677) @@ -161,7 +161,9 @@ // [+][Multi] [X]Adm [X]Tags [X]1 - JPanel bottomLine = new JPanel(new FlowLayout(FlowLayout.LEFT)); - bottomLine.add(new JButton(new CreateRelationAction(chosenRelation))); - bottomLine.add(new JButton(new CreateMultipolygonAction(chosenRelation))); + JPanel bottomLine = new JPanel(new GridBagLayout()); + bottomLine.add(new JButton(new CreateRelationAction(chosenRelation)), GBC.std()); + bottomLine.add(new JButton(new CreateMultipolygonAction(chosenRelation)), GBC.std()); + bottomLine.add(Box.createHorizontalGlue(), GBC.std().fill()); + bottomLine.add(new JButton(new FindRelationAction(chosenRelation)), GBC.eol()); rcPanel.add(bottomLine, BorderLayout.SOUTH); Index: /applications/editors/josm/plugins/relcontext/src/relcontext/actions/CreateRelationAction.java =================================================================== --- /applications/editors/josm/plugins/relcontext/src/relcontext/actions/CreateRelationAction.java (revision 25676) +++ /applications/editors/josm/plugins/relcontext/src/relcontext/actions/CreateRelationAction.java (revision 25677) @@ -9,5 +9,4 @@ import java.awt.event.ActionListener; import java.util.Arrays; -import java.util.LinkedList; import java.util.List; import javax.swing.Box; @@ -19,5 +18,4 @@ import org.openstreetmap.josm.actions.JosmAction; import org.openstreetmap.josm.command.AddCommand; -import org.openstreetmap.josm.command.Command; import org.openstreetmap.josm.data.osm.Relation; import org.openstreetmap.josm.data.osm.RelationMember; Index: /applications/editors/josm/plugins/relcontext/src/relcontext/actions/FindRelationAction.java =================================================================== --- /applications/editors/josm/plugins/relcontext/src/relcontext/actions/FindRelationAction.java (revision 25677) +++ /applications/editors/josm/plugins/relcontext/src/relcontext/actions/FindRelationAction.java (revision 25677) @@ -0,0 +1,220 @@ +package relcontext.actions; + +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.util.ArrayList; +import javax.swing.*; +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.actions.JosmAction; +import org.openstreetmap.josm.data.osm.NameFormatter; +import org.openstreetmap.josm.data.osm.Relation; +import org.openstreetmap.josm.gui.DefaultNameFormatter; +import org.openstreetmap.josm.gui.OsmPrimitivRenderer; +import relcontext.ChosenRelation; + +/** + * Opens a list of all relations with keyword search field. Choose selected relation. + * + * @author Zverik + */ +public class FindRelationAction extends JosmAction { + protected ChosenRelation chRel; + + public FindRelationAction( ChosenRelation chRel ) { + super("?", null, "Find a relation", null, false); + this.chRel = chRel; + } + + public void actionPerformed( ActionEvent e ) { + JPanel panel = new JPanel(new BorderLayout()); + final JTextField searchField = new JTextField(); + panel.add(searchField, BorderLayout.NORTH); + final FindRelationListModel relationsData = new FindRelationListModel(); + final JList relationsList = new JList(relationsData); + relationsList.setSelectionModel(relationsData.getSelectionModel()); + 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.setPreferredSize(new Dimension(400, 400)); + + final JOptionPane optionPane = new JOptionPane(panel, JOptionPane.PLAIN_MESSAGE, JOptionPane.OK_CANCEL_OPTION) { + @Override + public void selectInitialValue() { + searchField.requestFocusInWindow(); + } + }; + final JDialog dlg = optionPane.createDialog(Main.parent, tr("Find relation")); + dlg.setModalityType(ModalityType.DOCUMENT_MODAL); + + relationsList.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked( MouseEvent e ) { + if( e.getClickCount() >= 2 && !relationsList.isSelectionEmpty() ) { + dlg.setVisible(false); + optionPane.setValue(JOptionPane.OK_OPTION); + } + } + }); + + searchField.addActionListener(new ActionListener() { + public void actionPerformed( ActionEvent e ) { + if( !relationsList.isSelectionEmpty() ) { + dlg.setVisible(false); + optionPane.setValue(JOptionPane.OK_OPTION); + } + } + }); + + searchField.addKeyListener(new KeyAdapter() { + @Override + public void keyTyped( KeyEvent e ) { + SwingUtilities.invokeLater(new Runnable() { + public void run() { + updateRelationData(relationsData, searchField.getText()); + } + }); + } + + @Override + public void keyPressed( KeyEvent e ) { + if( shouldForward(e) ) + relationsList.dispatchEvent(e); + } + + @Override + public void keyReleased( KeyEvent e ) { + if( shouldForward(e) ) + relationsList.dispatchEvent(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 + || e.getKeyCode() == KeyEvent.VK_HOME || e.getKeyCode() == KeyEvent.VK_END; + } + }); + + updateRelationData(relationsData, null); + dlg.setVisible(true); + + Object answer = optionPane.getValue(); + if( answer == null || answer == JOptionPane.UNINITIALIZED_VALUE + || (answer instanceof Integer && (Integer)answer != JOptionPane.OK_OPTION) ) { + return; + } + + Relation r = (Relation)relationsList.getSelectedValue(); + if( r != null ) + chRel.set(r); + } + + @Override + protected void updateEnabledState() { + setEnabled(getCurrentDataSet() != null); + } + + protected void updateRelationData( FindRelationListModel data, String filter ) { + String[] keywords = filter == null ? new String[0] : filter.split("\\s+"); + if( keywords.length > 0 ) { + List filteredKeywords = new ArrayList(keywords.length); + 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]); + + List relations = new ArrayList(); + 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++ ) { + boolean ok = false; + 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]) ) { + ok = true; + break; + } + } + } + if( !ok ) add = false; + } + if( add ) + relations.add(r); + } + } + } + + final NameFormatter formatter = DefaultNameFormatter.getInstance(); + Collections.sort(relations, new Comparator() { + public int compare( Relation r1, Relation r2 ) { + return r1.getDisplayName(formatter).compareTo(r2.getDisplayName(formatter)); + } + }); + data.setRelations(relations); + } + + /** + * I admit, some of it was copypasted from {@link org.openstreetmap.josm.gui.dialogs.RelationListDialog.RelationListModel}. + */ + protected class FindRelationListModel extends AbstractListModel { + private final ArrayList relations = new ArrayList(); + private DefaultListSelectionModel selectionModel; + + public FindRelationListModel( DefaultListSelectionModel selectionModel ) { + super(); + this.selectionModel = selectionModel; + } + + public FindRelationListModel() { + this(new DefaultListSelectionModel()); + } + + public DefaultListSelectionModel getSelectionModel() { + return selectionModel; + } + + public Relation getRelation( int idx ) { + return relations.get(idx); + } + + public int getSize() { + return relations.size(); + } + + public Object getElementAt( int index ) { + return getRelation(index); + } + + public void setRelations(Collection relations) { + int selectedIndex = selectionModel.getMinSelectionIndex(); + Relation sel = selectedIndex < 0 ? null : getRelation(selectedIndex); + + this.relations.clear(); + selectionModel.clearSelection(); + if( relations != null ) + this.relations.addAll(relations); + fireIntervalAdded(this, 0, getSize()); + + if( sel != null ) { + selectedIndex = this.relations.indexOf(sel); + if( selectedIndex >= 0 ) + selectionModel.addSelectionInterval(selectedIndex, selectedIndex); + } + if( selectionModel.isSelectionEmpty() && !this.relations.isEmpty() ) + selectionModel.addSelectionInterval(0, 0); + } + } +}