Index: /trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (revision 17098) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (revision 17099) @@ -9,5 +9,4 @@ import java.awt.Component; import java.awt.Dimension; -import java.awt.Font; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; @@ -40,9 +39,9 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; +import java.util.stream.Stream; import javax.swing.AbstractAction; import javax.swing.BorderFactory; import javax.swing.Box; -import javax.swing.DefaultListModel; import javax.swing.DefaultListSelectionModel; import javax.swing.JButton; @@ -51,5 +50,4 @@ import javax.swing.JFileChooser; import javax.swing.JLabel; -import javax.swing.JList; import javax.swing.JOptionPane; import javax.swing.JPanel; @@ -59,5 +57,4 @@ import javax.swing.JToolBar; import javax.swing.KeyStroke; -import javax.swing.ListCellRenderer; import javax.swing.ListSelectionModel; import javax.swing.UIManager; @@ -94,4 +91,5 @@ import org.openstreetmap.josm.gui.widgets.AbstractFileChooser; import org.openstreetmap.josm.gui.widgets.FileChooserManager; +import org.openstreetmap.josm.gui.widgets.FilterField; import org.openstreetmap.josm.gui.widgets.JosmTextField; import org.openstreetmap.josm.io.CachedFile; @@ -125,7 +123,7 @@ protected final ActiveSourcesModel activeSourcesModel; /** the list of available sources **/ - protected final JList lstAvailableSources; + protected final JTable tblAvailableSources; /** the underlying model of available sources **/ - protected final AvailableSourcesListModel availableSourcesModel; + protected final AvailableSourcesModel availableSourcesModel; /** the URL from which the available sources are fetched **/ protected final String availableSourcesUrl; @@ -152,10 +150,11 @@ DefaultListSelectionModel selectionModel = new DefaultListSelectionModel(); - this.availableSourcesModel = new AvailableSourcesListModel(selectionModel); - this.lstAvailableSources = new JList<>(availableSourcesModel); - this.lstAvailableSources.setSelectionModel(selectionModel); - final SourceEntryListCellRenderer listCellRenderer = new SourceEntryListCellRenderer(); - this.lstAvailableSources.setCellRenderer(listCellRenderer); - GuiHelper.extendTooltipDelay(lstAvailableSources); + this.availableSourcesModel = new AvailableSourcesModel(); + this.tblAvailableSources = new ScrollHackTable(availableSourcesModel); + this.tblAvailableSources.setAutoCreateRowSorter(true); + this.tblAvailableSources.setSelectionModel(selectionModel); + final FancySourceEntryTableCellRenderer availableSourcesEntryRenderer = new FancySourceEntryTableCellRenderer(); + this.tblAvailableSources.getColumnModel().getColumn(0).setCellRenderer(availableSourcesEntryRenderer); + GuiHelper.extendTooltipDelay(tblAvailableSources); this.availableSourcesUrl = availableSourcesUrl; this.sourceProviders = sourceProviders; @@ -166,9 +165,11 @@ tblActiveSources.putClientProperty("terminateEditOnFocusLost", Boolean.TRUE); tblActiveSources.setSelectionModel(selectionModel); - tblActiveSources.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); - tblActiveSources.setShowGrid(false); - tblActiveSources.setIntercellSpacing(new Dimension(0, 0)); - tblActiveSources.setTableHeader(null); - tblActiveSources.setAutoResizeMode(JTable.AUTO_RESIZE_OFF); + Stream.of(tblAvailableSources, tblActiveSources).forEach(t -> { + t.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); + t.setShowGrid(false); + t.setIntercellSpacing(new Dimension(0, 0)); + t.setTableHeader(null); + t.setAutoResizeMode(JTable.AUTO_RESIZE_OFF); + }); SourceEntryTableCellRenderer sourceEntryRenderer = new SourceEntryTableCellRenderer(); if (canEnable) { @@ -181,13 +182,14 @@ activeSourcesModel.addTableModelListener(e -> { - listCellRenderer.updateSources(activeSourcesModel.getSources()); - lstAvailableSources.repaint(); + availableSourcesEntryRenderer.updateSources(activeSourcesModel.getSources()); + tblAvailableSources.repaint(); }); tblActiveSources.addPropertyChangeListener(evt -> { - listCellRenderer.updateSources(activeSourcesModel.getSources()); - lstAvailableSources.repaint(); + availableSourcesEntryRenderer.updateSources(activeSourcesModel.getSources()); + tblAvailableSources.repaint(); }); // Force Swing to show horizontal scrollbars for the JTable // Yes, this is a little ugly, but should work + availableSourcesModel.addTableModelListener(e -> TableHelper.adjustColumnWidth(tblAvailableSources, 0, 800)); activeSourcesModel.addTableModelListener(e -> TableHelper.adjustColumnWidth(tblActiveSources, canEnable ? 1 : 0, 800)); activeSourcesModel.setActiveSources(getInitialSourcesList()); @@ -227,5 +229,5 @@ ActivateSourcesAction activateSourcesAction = new ActivateSourcesAction(); - lstAvailableSources.addListSelectionListener(activateSourcesAction); + tblAvailableSources.getSelectionModel().addListSelectionListener(activateSourcesAction); JButton activate = new JButton(activateSourcesAction); @@ -256,6 +258,10 @@ gbc.insets = new Insets(0, 11, 0, 0); - JScrollPane sp1 = new JScrollPane(lstAvailableSources); - add(sp1, gbc); + FilterField availableSourcesFilter = new FilterField().filter(tblAvailableSources, availableSourcesModel); + JPanel defaultPane = new JPanel(new GridBagLayout()); + JScrollPane sp1 = new JScrollPane(tblAvailableSources); + defaultPane.add(availableSourcesFilter, GBC.eol().insets(0, 0, 0, 0).fill(GridBagConstraints.HORIZONTAL)); + defaultPane.add(sp1, GBC.eol().insets(0, 0, 0, 0).fill(GridBagConstraints.BOTH)); + add(defaultPane, gbc); gbc.gridx = 1; @@ -561,15 +567,12 @@ * List model of available sources. */ - protected static class AvailableSourcesListModel extends DefaultListModel { + protected static class AvailableSourcesModel extends AbstractTableModel { private final transient List data; - private final DefaultListSelectionModel selectionModel; /** * Constructs a new {@code AvailableSourcesListModel} - * @param selectionModel selection model - */ - public AvailableSourcesListModel(DefaultListSelectionModel selectionModel) { + */ + public AvailableSourcesModel() { data = new ArrayList<>(); - this.selectionModel = selectionModel; } @@ -583,43 +586,25 @@ data.addAll(sources); } - fireContentsChanged(this, 0, data.size()); - } - - @Override - public ExtendedSourceEntry getElementAt(int index) { - return data.get(index); - } - - @Override - public int getSize() { + fireTableDataChanged(); + } + + public ExtendedSourceEntry getValueAt(int rowIndex) { + return data.get(rowIndex); + } + + @Override + public ExtendedSourceEntry getValueAt(int rowIndex, int ignored) { + return getValueAt(rowIndex); + } + + @Override + public int getRowCount() { if (data == null) return 0; return data.size(); } - /** - * Deletes the selected sources. - */ - public void deleteSelected() { - Iterator it = data.iterator(); - int i = 0; - while (it.hasNext()) { - it.next(); - if (selectionModel.isSelectedIndex(i)) { - it.remove(); - } - i++; - } - fireContentsChanged(this, 0, data.size()); - } - - /** - * Returns the selected sources. - * @return the selected sources - */ - public List getSelected() { - return IntStream.range(0, data.size()) - .filter(selectionModel::isSelectedIndex) - .mapToObj(data::get) - .collect(Collectors.toList()); + @Override + public int getColumnCount() { + return 1; } } @@ -1066,5 +1051,5 @@ protected final void updateEnabledState() { - setEnabled(lstAvailableSources.getSelectedIndices().length > 0); + setEnabled(tblAvailableSources.getSelectedRowCount() > 0); } @@ -1076,5 +1061,9 @@ @Override public void actionPerformed(ActionEvent e) { - List sources = availableSourcesModel.getSelected(); + List sources = Arrays.stream(tblAvailableSources.getSelectedRows()) + .map(tblAvailableSources::convertRowIndexToModel) + .mapToObj(availableSourcesModel::getValueAt) + .collect(Collectors.toList()); + int josmVersion = Version.getInstance().getVersion(); if (josmVersion != Version.JOSM_UNKNOWN_VERSION) { @@ -1330,5 +1319,5 @@ } - static class SourceEntryListCellRenderer extends JLabel implements ListCellRenderer { + static class FancySourceEntryTableCellRenderer extends DefaultTableCellRenderer { private static final NamedColorProperty SOURCE_ENTRY_ACTIVE_BACKGROUND_COLOR = new NamedColorProperty( @@ -1342,19 +1331,9 @@ @Override - public Component getListCellRendererComponent(JList list, ExtendedSourceEntry value, - int index, boolean isSelected, boolean cellHasFocus) { + public Component getTableCellRendererComponent(JTable list, Object object, boolean isSelected, boolean hasFocus, int row, int column) { + super.getTableCellRendererComponent(list, object, isSelected, hasFocus, row, column); + final ExtendedSourceEntry value = (ExtendedSourceEntry) object; String s = value.toString(); setText(s); - if (isSelected) { - setBackground(list.getSelectionBackground()); - setForeground(list.getSelectionForeground()); - } else { - setBackground(list.getBackground()); - setForeground(list.getForeground()); - } - setEnabled(list.isEnabled()); - setFont(list.getFont()); - setFont(getFont().deriveFont(Font.PLAIN)); - setOpaque(true); setToolTipText(value.getTooltip()); if (!isSelected) {