Changeset 4839 in josm

Timestamp:

21.01.2012 22:12:13 (4 months ago)

Author:

Don-vip

Message:

Allow plugins to register custom map painting styles and tagging presets

Location:

trunk/src/org/openstreetmap/josm/gui/preferences

Files:

• MapPaintPreference.java (modified) (3 diffs)
• SourceEditor.java (modified) (7 diffs)
• SourceProvider.java (added)
• TaggingPresetPreference.java (modified) (2 diffs)

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

@@ -6 +6 @@
 
 import java.awt.GridBagLayout;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -28 +29 @@
     private JCheckBox enableIconDefault;
 
+    private static final List<SourceProvider> styleSourceProviders = new ArrayList<SourceProvider>();
+
+    public static final boolean registerSourceProvider(SourceProvider provider) {
+        if (provider != null) {
+            return styleSourceProviders.add(provider);
+        }
+        return false;
+    }
+    
     public static class Factory implements PreferenceSettingFactory {
         public PreferenceSetting createPreferenceSetting() {
@@ -67 +77 @@
 
         public MapPaintSourceEditor() {
-            super(true, "http://josm.openstreetmap.de/styles");
+            super(true, "http://josm.openstreetmap.de/styles", styleSourceProviders);
         }
 

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

@@ -85 +85 @@
     final protected boolean isMapPaint;
 
-    protected JTable tblActiveSources;
-    protected ActiveSourcesModel activeSourcesModel;
-    protected JList lstAvailableSources;
-    protected AvailableSourcesListModel availableSourcesModel;
-    protected JTable tblIconPaths = null;
-    protected IconPathTableModel iconPathsModel;
+    protected final JTable tblActiveSources;
+    protected final ActiveSourcesModel activeSourcesModel;
+    protected final JList lstAvailableSources;
+    protected final AvailableSourcesListModel availableSourcesModel;
+    protected final JTable tblIconPaths;
+    protected final IconPathTableModel iconPathsModel;
+    protected final String availableSourcesUrl;
+    protected final List<SourceProvider> sourceProviders;
+
     protected boolean sourcesInitiallyLoaded;
-    protected String availableSourcesUrl;
 
     /**
@@ -99 +101 @@
      *  for TaggingPresetPreference subclass
      * @param availableSourcesUrl the URL to the list of available sources
+     * @param sourceProviders the list of additional source providers, from plugins
      */
-    public SourceEditor(final boolean isMapPaint, final String availableSourcesUrl) {
+    public SourceEditor(final boolean isMapPaint, final String availableSourcesUrl, final List<SourceProvider> sourceProviders) {
 
         this.isMapPaint = isMapPaint;
         DefaultListSelectionModel selectionModel = new DefaultListSelectionModel();
-        lstAvailableSources = new JList(availableSourcesModel = new AvailableSourcesListModel(selectionModel));
-        lstAvailableSources.setSelectionModel(selectionModel);
-        lstAvailableSources.setCellRenderer(new SourceEntryListCellRenderer());
+        this.lstAvailableSources = new JList(availableSourcesModel = new AvailableSourcesListModel(selectionModel));
+        this.lstAvailableSources.setSelectionModel(selectionModel);
+        this.lstAvailableSources.setCellRenderer(new SourceEntryListCellRenderer());
         this.availableSourcesUrl = availableSourcesUrl;
+        this.sourceProviders = sourceProviders;
 
         selectionModel = new DefaultListSelectionModel();
@@ -263 +267 @@
         bottomLeftTB.setBorderPainted(false);
         bottomLeftTB.setOpaque(false);
-        bottomLeftTB.add(new ReloadSourcesAction(availableSourcesUrl));
+        bottomLeftTB.add(new ReloadSourcesAction(availableSourcesUrl, sourceProviders));
         bottomLeftTB.add(Box.createHorizontalGlue());
         add(bottomLeftTB, gbc);
@@ -412 +416 @@
     }
 
-    protected void reloadAvailableSources(String url) {
-        Main.worker.submit(new SourceLoader(url));
+    protected void reloadAvailableSources(String url, List<SourceProvider> sourceProviders) {
+        Main.worker.submit(new SourceLoader(url, sourceProviders));
     }
 
     public void initiallyLoadAvailableSources() {
         if (!sourcesInitiallyLoaded) {
-            reloadAvailableSources(this.availableSourcesUrl);
+            reloadAvailableSources(availableSourcesUrl, sourceProviders);
         }
         sourcesInitiallyLoaded = true;
@@ -907 +911 @@
 
     class ReloadSourcesAction extends AbstractAction {
-        private String url;
-        public ReloadSourcesAction(String url) {
+        private final String url;
+        private final List<SourceProvider> sourceProviders;
+        public ReloadSourcesAction(String url, List<SourceProvider> sourceProviders) {
             putValue(NAME, tr("Reload"));
             putValue(SHORT_DESCRIPTION, tr(getStr(I18nString.RELOAD_ALL_AVAILABLE), url));
             putValue(SMALL_ICON, ImageProvider.get("dialogs", "refresh"));
             this.url = url;
+            this.sourceProviders = sourceProviders;
         }
 
         public void actionPerformed(ActionEvent e) {
             MirroredInputStream.cleanup(url);
-            reloadAvailableSources(url);
+            reloadAvailableSources(url, sourceProviders);
         }
     }
@@ -1096 +1102 @@
 
     class SourceLoader extends PleaseWaitRunnable {
-        private String url;
+        private final String url;
+        private final List<SourceProvider> sourceProviders;
         private BufferedReader reader;
         private boolean canceled;
         private final List<ExtendedSourceEntry> sources = new ArrayList<ExtendedSourceEntry>();
 
-        public SourceLoader(String url) {
+        public SourceLoader(String url, List<SourceProvider> sourceProviders) {
             super(tr(getStr(I18nString.LOADING_SOURCES_FROM), url));
             this.url = url;
+            this.sourceProviders = sourceProviders;
         }
 
@@ -1138 +1146 @@
             try {
                 sources.addAll(getDefault());
+                
+                for (SourceProvider provider : sourceProviders) {
+                    for (SourceEntry src : provider.getSources()) {
+                        if (src instanceof ExtendedSourceEntry) {
+                            sources.add((ExtendedSourceEntry) src);
+                        }
+                    }
+                }
+                
                 MirroredInputStream stream = new MirroredInputStream(url);
                 InputStreamReader r;

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

@@ -46 +46 @@
     }
 
+    private static final List<SourceProvider> presetSourceProviders = new ArrayList<SourceProvider>();
     public static Collection<TaggingPreset> taggingPresets;
     private SourceEditor sources;
     private JCheckBox sortMenu;
+    
+    public static final boolean registerSourceProvider(SourceProvider provider) {
+        if (provider != null) {
+            return presetSourceProviders.add(provider);
+        }
+        return false;
+    }
 
     private ValidationListener validationListener = new ValidationListener() {
@@ -167 +175 @@
 
         public TaggingPresetSourceEditor() {
-            super(false, "http://josm.openstreetmap.de/presets");
+            super(false, "http://josm.openstreetmap.de/presets", presetSourceProviders);
         }