Changeset 28113 in osm for applications/editors/josm/plugins/opendata/modules/be.bruxelles

Timestamp:

2012-03-19T00:23:49+01:00 (13 years ago)

Author:

donvip

Message:

opendata: large code reorganization, ask for license agreement before downloading, from embedded HTML/RTF files for ODbL and LO/OL

Location:

applications/editors/josm/plugins/opendata/modules/be.bruxelles/src/org/openstreetmap/josm/plugins/opendata/modules/be/bruxelles/datasets

Files:

• BruxellesDataSetHandler.java (modified) (2 diffs)
• culture/BDHandler.java (modified) (2 diffs)

applications/editors/josm/plugins/opendata/modules/be.bruxelles/src/org/openstreetmap/josm/plugins/opendata/modules/be/bruxelles/datasets/BruxellesDataSetHandler.java

@@ -18 +18 @@
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.Locale;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.plugins.opendata.core.datasets.be.BelgianDataSetHandler;
+import org.openstreetmap.josm.plugins.opendata.core.util.OdUtils;
 import org.openstreetmap.josm.plugins.opendata.modules.be.bruxelles.BruxellesConstants;
 
@@ -70 +69 @@
         public URL getLocalPortalURL() {
                 String basePortal = null;
-                String lang = Main.pref.get("language");
-                if (lang == null || lang.isEmpty()) {
-                        lang = Locale.getDefault().toString();
-                }
+                String lang = OdUtils.getJosmLanguage();
                         
                 if (lang.startsWith("fr")) {

applications/editors/josm/plugins/opendata/modules/be.bruxelles/src/org/openstreetmap/josm/plugins/opendata/modules/be/bruxelles/datasets/culture/BDHandler.java

@@ -7 +7 @@
 public class BDHandler extends BruxellesDataSetHandler {
 
+        public BDHandler() {
+                getCsvHandler().setSeparator(",");
+        }
+        
         @Override
         public boolean acceptsFilename(String filename) {
@@ -19 +23 @@
                 }
         }
-
-        /* (non-Javadoc)
-         * @see org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler#getCsvSeparator()
-         */
-        @Override
-        public String getCsvSeparator() {
-                return ",";
-        }
 }