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

Timestamp:

2014-10-18T15:31:53+02:00 (12 years ago)

Author:

donvip

Message:

[josm_opendata] fix some sonar issues

Location:

applications/editors/josm/plugins/opendata/modules/be.bruxelles

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/opendata/modules/be/bruxelles/BruxellesConstants.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/opendata/modules/be/bruxelles/BruxellesModule.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/opendata/modules/be/bruxelles/datasets/BruxellesDataSetHandler.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/opendata/modules/be/bruxelles/datasets/culture/BDHandler.java (modified) (1 diff)

applications/editors/josm/plugins/opendata/modules/be.bruxelles/build.xml

@@ -14 +14 @@
     <property name="module.dist.dir" value="../../dist"/>
     <property name="module.jar" value="${module.dist.dir}/${ant.project.name}.jar"/>
-        <!-- conditions -->
+    <!-- conditions -->
     <condition property="resources.exist">
         <available file="resources" type="dir" />

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

@@ -4 +4 @@
 
 public interface BruxellesConstants {
-        
-        /**
-         * Source
-         */
-        public static final String SOURCE_BRUXELLES = "Ville de Bruxelles";
-        
-        /**
-         * Portal
-         */
-        public static final String PORTAL_EN = "http://www.brussels.be";
-        public static final String PORTAL_FR = "http://www.bruxelles.be";
-        public static final String PORTAL_NL = "http://www.brussel.be";
+    
+    /**
+     * Source
+     */
+    public static final String SOURCE_BRUXELLES = "Ville de Bruxelles";
+    
+    /**
+     * Portal
+     */
+    public static final String PORTAL_EN = "http://www.brussels.be";
+    public static final String PORTAL_FR = "http://www.bruxelles.be";
+    public static final String PORTAL_NL = "http://www.brussel.be";
 }

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

@@ -8 +8 @@
 public class BruxellesModule extends AbstractModule {
 
-        public BruxellesModule(ModuleInformation info) {
-                super(info);
-                handlers.add(BDHandler.class);
+    public BruxellesModule(ModuleInformation info) {
+        super(info);
+        handlers.add(BDHandler.class);
     }
 }

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

@@ -11 +11 @@
 
 public abstract class BruxellesDataSetHandler extends BelgianDataSetHandler implements BruxellesConstants {
-        
-        private Integer localPortalId;
-        
-        public BruxellesDataSetHandler() {
-                init(null, null);
-        }
+    
+    private Integer localPortalId;
+    
+    public BruxellesDataSetHandler() {
+        init(null, null);
+    }
 
-        public BruxellesDataSetHandler(Integer portalId) {
-                init(portalId, null);
-        }
+    public BruxellesDataSetHandler(Integer portalId) {
+        init(portalId, null);
+    }
 
-        public BruxellesDataSetHandler(Integer portalId, Projection singleProjection) {
-                init(portalId, singleProjection);
-        }
+    public BruxellesDataSetHandler(Integer portalId, Projection singleProjection) {
+        init(portalId, singleProjection);
+    }
 
-        public BruxellesDataSetHandler(Integer portalId, Projection singleProjection, String relevantTag) {
-                super(relevantTag);
-                init(portalId, singleProjection);
-        }
+    public BruxellesDataSetHandler(Integer portalId, Projection singleProjection, String relevantTag) {
+        super(relevantTag);
+        init(portalId, singleProjection);
+    }
 
-        public BruxellesDataSetHandler(Integer portalId, String relevantTag) {
-                super(relevantTag);
-                init(portalId, null);
-        }
+    public BruxellesDataSetHandler(Integer portalId, String relevantTag) {
+        super(relevantTag);
+        init(portalId, null);
+    }
 
-        private void init(Integer portalId, Projection singleProjection) {
-                setSingleProjection(singleProjection);
-                this.localPortalId = portalId;
-        }
+    private void init(Integer portalId, Projection singleProjection) {
+        setSingleProjection(singleProjection);
+        this.localPortalId = portalId;
+    }
 
-        @Override
-        public String getSource() {
-                return SOURCE_BRUXELLES;
-        }
+    @Override
+    public String getSource() {
+        return SOURCE_BRUXELLES;
+    }
 
-        @Override
-        public URL getLocalPortalURL() {
-                String basePortal = null;
-                String lang = OdUtils.getJosmLanguage();
-                        
-                if (lang.startsWith("fr")) {
-                        basePortal = PORTAL_FR;
-                } else if (lang.startsWith("nl")) {
-                        basePortal = PORTAL_NL;
-                } else {
-                        basePortal = PORTAL_EN;
-                }
+    @Override
+    public URL getLocalPortalURL() {
+        String basePortal = null;
+        String lang = OdUtils.getJosmLanguage();
+            
+        if (lang.startsWith("fr")) {
+            basePortal = PORTAL_FR;
+        } else if (lang.startsWith("nl")) {
+            basePortal = PORTAL_NL;
+        } else {
+            basePortal = PORTAL_EN;
+        }
 
-                try {
-                        return new URL(basePortal + "/artdet.cfm?id=" + localPortalId);
-                } catch (MalformedURLException e) {
-                        e.printStackTrace();
-                        return null;
-                }
-        }
+        try {
+            return new URL(basePortal + "/artdet.cfm?id=" + localPortalId);
+        } catch (MalformedURLException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
 }

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

@@ -8 +8 @@
 public class BDHandler extends BruxellesDataSetHandler {
 
-        public BDHandler() {
-                getCsvHandler().setSeparator(",");
-        }
-        
-        @Override
-        public boolean acceptsFilename(String filename) {
-                return acceptsCsvFilename(filename, "textfile");
-        }
+    public BDHandler() {
+        getCsvHandler().setSeparator(",");
+    }
+    
+    @Override
+    public boolean acceptsFilename(String filename) {
+        return acceptsCsvFilename(filename, "textfile");
+    }
 
-        @Override
-        public void updateDataSet(DataSet ds) {
-                for (Node n : ds.getNodes()) {
-                        n.put("tourism", "artwork");
-                        replace(n, "Description", "name");
-                }
-        }
+    @Override
+    public void updateDataSet(DataSet ds) {
+        for (Node n : ds.getNodes()) {
+            n.put("tourism", "artwork");
+            replace(n, "Description", "name");
+        }
+    }
 }