Changeset 8507 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2015-06-20T00:27:53+02:00 (9 years ago)

Author:

simon04

Message:

fix #10593 - Preference, mappaint/preset/validator sources: indicate added/active items by gray/green checkmark

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java

@@ -18 +18 @@
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 import java.io.BufferedReader;
 import java.io.File;
@@ -49 +51 @@
 import javax.swing.DefaultListSelectionModel;
 import javax.swing.Icon;
+import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
@@ -134 +137 @@
         this.lstAvailableSources = new JList<>(availableSourcesModel);
         this.lstAvailableSources.setSelectionModel(selectionModel);
-        this.lstAvailableSources.setCellRenderer(new SourceEntryListCellRenderer());
+        final SourceEntryListCellRenderer listCellRenderer = new SourceEntryListCellRenderer();
+        this.lstAvailableSources.setCellRenderer(listCellRenderer);
         this.availableSourcesUrl = availableSourcesUrl;
         this.sourceProviders = sourceProviders;
@@ -164 +168 @@
         }
 
+        activeSourcesModel.addTableModelListener(new TableModelListener() {
+            @Override
+            public void tableChanged(TableModelEvent e) {
+                listCellRenderer.updateSources(activeSourcesModel.getSources());
+                lstAvailableSources.repaint();
+            }
+        });
+        tblActiveSources.addPropertyChangeListener(new PropertyChangeListener() {
+            @Override
+            public void propertyChange(PropertyChangeEvent evt) {
+                listCellRenderer.updateSources(activeSourcesModel.getSources());
+                lstAvailableSources.repaint();
+            }
+        });
         activeSourcesModel.addTableModelListener(new TableModelListener() {
             // Force swing to show horizontal scrollbars for the JTable
@@ -1215 +1233 @@
 
     static class SourceEntryListCellRenderer extends JLabel implements ListCellRenderer<ExtendedSourceEntry> {
+
+        private final ImageIcon GREEN_CHECK = ImageProvider.getIfAvailable("misc", "green_check");
+        private final ImageIcon GRAY_CHECK = ImageProvider.getIfAvailable("misc", "gray_check");
+        private final Map<String, SourceEntry> entryByUrl = new HashMap<>();
+
         @Override
         public Component getListCellRendererComponent(JList<? extends ExtendedSourceEntry> list, ExtendedSourceEntry value,
@@ -1232 +1255 @@
             setOpaque(true);
             setToolTipText(value.getTooltip());
+            final SourceEntry sourceEntry = entryByUrl.get(value.url);
+            setIcon(sourceEntry == null ? null : sourceEntry.active ? GREEN_CHECK : GRAY_CHECK);
             return this;
+        }
+
+        public void updateSources(List<SourceEntry> sources) {
+            synchronized (entryByUrl) {
+                entryByUrl.clear();
+                for (SourceEntry i : sources) {
+                    entryByUrl.put(i.url, i);
+                }
+            }
         }
     }