Changeset 28113 in osm for applications/editors/josm/plugins/opendata/modules/fr.cg41

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

File:

• applications/editors/josm/plugins/opendata/modules/fr.cg41/src/org/openstreetmap/josm/plugins/opendata/modules/fr/cg41/datasets/Cg41DataSetHandler.java (modified) (4 diffs)

applications/editors/josm/plugins/opendata/modules/fr.cg41/src/org/openstreetmap/josm/plugins/opendata/modules/fr/cg41/datasets/Cg41DataSetHandler.java

@@ -2 +2 @@
 
 import java.net.MalformedURLException;
-import java.net.URL;
 
 import org.openstreetmap.josm.data.osm.Tag;
@@ -9 +8 @@
 
 public abstract class Cg41DataSetHandler extends FrenchDataSetHandler implements Cg41Constants {
-        
-        private int portalId;
         
         public Cg41DataSetHandler(int portalId, String nationalPath) {
@@ -36 +33 @@
 
         private final void init(int portalId, String nationalPath) {
-                this.portalId = portalId;
                 setNationalPortalPath(nationalPath);
+                try {
+                        if (portalId > 0) {
+                                setLocalPortalURL(PORTAL_CG41 + portalId);
+                        }
+                } catch (MalformedURLException e) {
+                        e.printStackTrace();
+                }
+
         }
 
@@ -63 +67 @@
                 return ICON_CG41_16;
         }
-
-        public final URL getLocalPortalURL() {
-                try {
-                        if (portalId > 0) {
-                                return new URL(PORTAL_CG41 + portalId);
-                        }
-                } catch (MalformedURLException e) {
-                        e.printStackTrace();
-                }
-                return null;
-        }
 }