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

Timestamp:

2012-03-15T20:29:01+01:00 (12 years ago)

Author:

donvip

Message:

opendata: Le Mans full data support

Location:

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

Files:

• OdPlugin.java (modified) (2 diffs)
• core/OdConstants.java (modified) (1 diff)
• core/datasets/AbstractDataSetHandler.java (modified) (2 diffs)
• core/modules/ModuleInformation.java (modified) (2 diffs)

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;
@@ -59 +60 @@
 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;
 

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

@@ -85 +85 @@
 
         public static final String ICON_AGREEMENT_24 = "agreement24.png";
+        public static final String ICON_EMPTY_24 = "empty24.png";
 
     /**

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

@@ -154 +154 @@
         }
 
+        protected final boolean acceptsKmzShpFilename(String filename, String ... expected) {
+                return acceptsFilename(filename, expected, KMZ_EXT, SHP_EXT);
+        }
+
         protected final boolean acceptsKmzTabFilename(String filename, String ... expected) {
                 return acceptsFilename(filename, expected, KMZ_EXT, TAB_EXT);
@@ -169 +173 @@
                 return acceptsFilename(filename, expected, CSV_EXT, KMZ_EXT, TAB_EXT);
         }
-        
-        protected final boolean acceptsCsvKmzShpFilename(String filename, String ... expected) {
-                return acceptsFilename(filename, expected, CSV_EXT, KMZ_EXT, SHP_EXT);
-        }
-        
+                
         protected final boolean acceptsCsvXlsFilename(String filename, String ... expected) {
                 return acceptsFilename(filename, expected, CSV_EXT, XLS_EXT);

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

@@ -40 +40 @@
 import org.openstreetmap.josm.plugins.opendata.OdPlugin;
 import org.openstreetmap.josm.plugins.opendata.core.OdConstants;
+import org.openstreetmap.josm.plugins.opendata.core.util.OdUtils;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.LanguageInfo;
@@ -359 +360 @@
     public ImageIcon getScaledIcon() {
         if (icon == null)
-            return null;
+            return OdUtils.getImageIcon(ICON_EMPTY_24);
         return new ImageIcon(icon.getImage().getScaledInstance(24, 24, Image.SCALE_SMOOTH));
     }