Changeset 28143 in osm for applications/editors/josm/plugins/opendata/src/org/openstreetmap

Timestamp:

2012-03-23T21:49:59+01:00 (13 years ago)

Author:

donvip

Message:

opendata: change in handlers management (use of classes instead of objects) to allow several instances of the same handler

Location:

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata

Files:

• OdPlugin.java (modified) (3 diffs)
• core/actions/DownloadDataTask.java (modified) (1 diff)
• core/io/AbstractImporter.java (modified) (1 diff)
• core/modules/AbstractModule.java (modified) (5 diffs)
• core/modules/Module.java (modified) (1 diff)

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java

@@ -28 +28 @@
 import java.util.Map;
 
-import javax.swing.ImageIcon;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
@@ -60 +59 @@
 import org.openstreetmap.josm.plugins.opendata.core.modules.ModuleHandler;
 import org.openstreetmap.josm.plugins.opendata.core.modules.ModuleInformation;
-import org.openstreetmap.josm.plugins.opendata.core.util.OdUtils;
 import org.openstreetmap.josm.tools.Pair;
 
@@ -115 +113 @@
                 Map<DataSetCategory, JMenu> catMenus = new HashMap<DataSetCategory, JMenu>();
                 JMenu moduleMenu = null;
-                for (AbstractDataSetHandler handler: module.getHandlers()) {
+                for (AbstractDataSetHandler handler: module.getNewlyInstanciatedHandlers()) {
                         if (handler.getDataURL() != null || (handler.getDataURLs() != null && !handler.getDataURLs().isEmpty())) {
                                 if (moduleMenu == null) {

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/actions/DownloadDataTask.java

@@ -66 +66 @@
                 this.handler = null;
                 for (Module module : ModuleHandler.moduleList) {
-                        for (AbstractDataSetHandler handler : module.getHandlers()) {
+                        for (AbstractDataSetHandler handler : module.getNewlyInstanciatedHandlers()) {
                                 if (handler.acceptsUrl(url)) {
                                         this.handler = handler;

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/AbstractImporter.java

@@ -44 +44 @@
     protected final AbstractDataSetHandler findDataSetHandler(File file) {
         for (Module module : ModuleHandler.moduleList) {
-                        for (AbstractDataSetHandler dsh : module.getHandlers()) {
+                        for (AbstractDataSetHandler dsh : module.getNewlyInstanciatedHandlers()) {
                                 if (dsh.acceptsFile(file)) {
                                         return dsh;

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/AbstractModule.java

@@ -33 +33 @@
 public abstract class AbstractModule implements Module, OdConstants {
 
-        protected final List<AbstractDataSetHandler> handlers = new ArrayList<AbstractDataSetHandler>();
-        
+        protected final List<Class<? extends AbstractDataSetHandler>> handlers = new ArrayList<Class <? extends AbstractDataSetHandler>>();
+
+        private final List<AbstractDataSetHandler> instanciatedHandlers = new ArrayList<AbstractDataSetHandler>();
+
         protected final ModuleInformation info;
         
@@ -53 +55 @@
          */
         @Override
-        public List<AbstractDataSetHandler> getHandlers() {
+        public List<Class<? extends AbstractDataSetHandler>> getHandlers() {
                 return handlers;
         }
@@ -71 +73 @@
         public SourceProvider getMapPaintStyleSourceProvider() {
                 final List<SourceEntry> sources = new ArrayList<SourceEntry>();
-                for (AbstractDataSetHandler handler : handlers) {
+                for (AbstractDataSetHandler handler : getInstanciatedHandlers()) {
                         ExtendedSourceEntry src;
                         if (handler != null && (src = handler.getMapPaintStyle()) != null) {
@@ -111 +113 @@
         public SourceProvider getPresetSourceProvider() {
                 final List<SourceEntry> sources = new ArrayList<SourceEntry>();
-                for (AbstractDataSetHandler handler : handlers) {
+                for (AbstractDataSetHandler handler : getInstanciatedHandlers()) {
                         if (handler != null && handler.getTaggingPreset() != null) {
                                 sources.add(handler.getTaggingPreset());
@@ -123 +125 @@
                 };
         }
+        
+        @Override
+        public final List<AbstractDataSetHandler> getNewlyInstanciatedHandlers() {
+                List<AbstractDataSetHandler> result = new ArrayList<AbstractDataSetHandler>();
+                for (Class<? extends AbstractDataSetHandler> handlerClass : handlers) {
+                        if (handlerClass != null) {
+                                try {
+                                        result.add(handlerClass.newInstance());
+                                } catch (InstantiationException e) {
+                                        System.err.println(e.getMessage());
+                                } catch (IllegalAccessException e) {
+                                        System.err.println(e.getMessage());
+                                }
+                        }
+                }
+                return result;
+        }
+
+        private final List<AbstractDataSetHandler> getInstanciatedHandlers() {
+                if (instanciatedHandlers.isEmpty()) {
+                        instanciatedHandlers.addAll(getNewlyInstanciatedHandlers());
+                }
+                return instanciatedHandlers;
+        }
 }

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/Module.java

@@ -25 +25 @@
         public String getDisplayedName();
 
-        public List<AbstractDataSetHandler> getHandlers();
-        
+        public List<Class<? extends AbstractDataSetHandler>> getHandlers();
+
+        public List<AbstractDataSetHandler> getNewlyInstanciatedHandlers();
+
         public SourceProvider getMapPaintStyleSourceProvider();