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

Timestamp:

2012-09-08T19:09:04+02:00 (13 years ago)

Author:

donvip

Message:

[josm_opendata] Allow to split Toulouse data by sector/neighbourhood (admin level 10 and 11)

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/actions/ToolsAction.java (deleted)
• core/datasets/AbstractDataSetHandler.java (modified) (2 diffs)
• core/gui/OdDialog.java (modified) (6 diffs)
• core/io/NetworkReader.java (modified) (2 diffs)
• core/io/archive/ZipImporter.java (modified) (1 diff)
• core/io/archive/ZipReader.java (modified) (3 diffs)
• core/layers/OdDataLayer.java (modified) (1 diff)

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

@@ -70 +70 @@
         private final JMenu menu;
         
+        private OdDialog dialog;
+        
         public OdPlugin(PluginInformation info) { // NO_UCD
                 super(info);
@@ -167 +169 @@
         public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
                 if (newFrame != null) {
-                        newFrame.addToggleDialog(new OdDialog());
+                        newFrame.addToggleDialog(dialog = new OdDialog());
+                } else {
+                    dialog = null;
                 }
         }
@@ -203 +207 @@
     public final File getResourcesDirectory() {
         return getSubDirectory("resources");
+    }
+
+    public OdDialog getDialog() {
+        return dialog;
     }
 

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

@@ -53 +53 @@
         @Override
         public Future<?> loadUrl(boolean newLayer, String url, ProgressMonitor progressMonitor) {
-        downloadTask = new InternalDownloadTasK(newLayer, new NetworkReader(url, handler), progressMonitor);
+        downloadTask = new InternalDownloadTasK(newLayer, new NetworkReader(url, handler, true), progressMonitor);
         currentBounds = null;
         if (handler == null || !handler.hasLicenseToBeAccepted() || askLicenseAgreement(handler.getLicense())) {

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/AbstractDataSetHandler.java

@@ -24 +24 @@
 import java.util.regex.Pattern;
 
+import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -478 +479 @@
                 }
         }
+        
+        // Tools
+
+        private final Collection<JosmAction> tools = new ArrayList<JosmAction>();
+        
+        public final Collection<JosmAction> getTools() {
+            return tools;
+        }
+        
+        public final boolean addTool(JosmAction tool) {
+        return tool != null ? tools.add(tool) : false;
+        }
+        
+        public final boolean removeTool(JosmAction tool) {
+            return tool != null ? tools.remove(tool) : false;
+        }
+
+    public void notifyActive() {
+        // To be overriden when the handler has specific treatments to perform when its layer becomes active
+    }
 }

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/OdDialog.java

@@ -6 +6 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 import java.util.Arrays;
 import java.util.List;
 
+import javax.swing.JPopupMenu;
 import javax.swing.JTree;
 import javax.swing.tree.DefaultTreeModel;
@@ -23 +26 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.plugins.opendata.core.OdConstants;
-import org.openstreetmap.josm.plugins.opendata.core.actions.ToolsAction;
 import org.openstreetmap.josm.plugins.opendata.core.layers.OdDataLayer;
 import org.openstreetmap.josm.plugins.opendata.core.layers.OdLayer;
@@ -76 +78 @@
                 }
     }
+    
+    private class ToolsAction extends JosmAction {
+        public ToolsAction() {
+            super(marktr("Tools"), "dialogs/utils", tr("Open tools menu for this data."), null, false);
+        }
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            // Done via mouseListener
+        }
+    }
 
         public OdDialog() {
@@ -87 +99 @@
                                 diffButton = new SideButton(new DiffAction()),
                                 toolsButton = new SideButton(new ToolsAction())
+        });
+                
+                this.toolsButton.addMouseListener(new MouseAdapter() {
+                    @Override
+                    public void mousePressed(MouseEvent e) {
+                    if (Main.main.getEditLayer() instanceof OdLayer) {
+                    JPopupMenu popup = new JPopupMenu();
+                        for (JosmAction tool : dataLayer.handler.getTools()) {
+                            popup.add(tool);
+                        }
+                    popup.show(e.getComponent(), e.getX(), e.getY());
+                    }
+                    }
         });
                 
@@ -124 +149 @@
                                 diffButton.setEnabled(true);
                         }
+                        toolsButton.setEnabled(dataLayer.handler != null && !dataLayer.handler.getTools().isEmpty());
                 } else {
                         disableAllButtons();
@@ -143 +169 @@
         MapView.removeEditLayerChangeListener(this);
     }
+
+    public OdDataLayer getDataLayer() {
+        return dataLayer;
+    }
 }

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

@@ -47 +47 @@
         private final AbstractDataSetHandler handler;
         private Class<? extends AbstractReader> readerClass;
+        private final boolean promptUser;
 
         private File file;
         private String filename;
         
-    public NetworkReader(String url, AbstractDataSetHandler handler) {
+    public NetworkReader(String url, AbstractDataSetHandler handler, boolean promptUser) {
         CheckParameterUtil.ensureParameterNotNull(url, "url");
         this.url = url;
         this.handler = handler;
         this.readerClass = null;
+        this.promptUser = promptUser;
     }
     
@@ -150 +152 @@
             instance = progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false);
             if (readerClass.equals(ZipReader.class)) {
-                ZipReader zipReader = new ZipReader(in, handler);
+                ZipReader zipReader = new ZipReader(in, handler, promptUser);
                 DataSet ds = zipReader.parseDoc(instance);
                 file = zipReader.getReadFile();

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

@@ -33 +33 @@
                         throws IllegalDataException {
                 try {
-                        return ZipReader.parseDataSet(in, handler, instance);
+                        return ZipReader.parseDataSet(in, handler, instance, true);
                 } catch (Exception e) {
                         throw new IllegalDataException(e);

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

@@ -55 +55 @@
         private final AbstractDataSetHandler handler;
         private final ZipHandler zipHandler;
+        private final boolean promptUser;
         
         private File file;
     
-    public ZipReader(InputStream in, AbstractDataSetHandler handler) {
+    public ZipReader(InputStream in, AbstractDataSetHandler handler, boolean promptUser) {
         this.zis = in instanceof ZipInputStream ? (ZipInputStream) in : new ZipInputStream(in);
         this.handler = handler;
         this.zipHandler = handler != null ? handler.getZipHandler() : null;
+        this.promptUser = promptUser;
     }
 
-        public static DataSet parseDataSet(InputStream in, AbstractDataSetHandler handler, ProgressMonitor instance) throws IOException, XMLStreamException, FactoryConfigurationError, JAXBException {
-                return new ZipReader(in, handler).parseDoc(instance);
+        public static DataSet parseDataSet(InputStream in, AbstractDataSetHandler handler, ProgressMonitor instance, boolean promptUser) 
+                throws IOException, XMLStreamException, FactoryConfigurationError, JAXBException {
+                return new ZipReader(in, handler, promptUser).parseDoc(instance);
         }
         
@@ -156 +159 @@
                         file = null;
                         
-                        if (candidates.size() > 1) {
+                        if (promptUser && candidates.size() > 1) {
                                 DialogPrompter<CandidateChooser> prompt = new DialogPrompter() {
                                         @Override
@@ -166 +169 @@
                                         file = prompt.getDialog().getSelectedFile();
                                 }
-                        } else if (candidates.size() == 1) {
+                        } else if (!candidates.isEmpty()) {
                                 file = candidates.get(0);
                         }

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/layers/OdDataLayer.java

@@ -115 +115 @@
         @Override
         public void activeLayerChange(Layer oldLayer, Layer newLayer) {
+            if (newLayer == this && this.handler != null) {
+                this.handler.notifyActive();
+            }
         }