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

Timestamp:

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

Author:

donvip

Message:

[josm_opendata] fix some sonar issues

Location:

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

Files:

• Cg41Constants.java (modified) (1 diff)
• Cg41Module.java (modified) (1 diff)
• datasets/Cg41DataSetHandler.java (modified) (1 diff)
• datasets/environnement/ZonesInondablesBrayeHandler.java (modified) (1 diff)
• datasets/transport/ArretsBusHandler.java (modified) (1 diff)

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

@@ -5 +5 @@
 
 public interface Cg41Constants extends FrenchConstants {
-        
-        /**
-         * Source
-         */
-        public static final String SOURCE_CG41 = "Conseil général du Loir-et-Cher";
+    
+    /**
+     * Source
+     */
+    public static final String SOURCE_CG41 = "Conseil général du Loir-et-Cher";
 
-        /**
-         * Icons
-         */
-        public static final String ICON_CG41_16 = "data.fr.cg41_16.png";
-        public static final String ICON_CG41_24 = "data.fr.cg41_24.png";
-        
-        /**
-         * Portal
-         */
-        public static final String PORTAL_CG41 = "http://www.pilote41.fr/geosource/srv/fr/metadata.show?id=";
+    /**
+     * Icons
+     */
+    public static final String ICON_CG41_16 = "data.fr.cg41_16.png";
+    public static final String ICON_CG41_24 = "data.fr.cg41_24.png";
+    
+    /**
+     * Portal
+     */
+    public static final String PORTAL_CG41 = "http://www.pilote41.fr/geosource/srv/fr/metadata.show?id=";
 }

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

@@ -9 +9 @@
 public class Cg41Module extends AbstractModule {
 
-        public Cg41Module(ModuleInformation info) {
-                super(info);
-                handlers.add(ArretsBusHandler.class);
-                handlers.add(ZonesInondablesBrayeHandler.class);
+    public Cg41Module(ModuleInformation info) {
+        super(info);
+        handlers.add(ArretsBusHandler.class);
+        handlers.add(ZonesInondablesBrayeHandler.class);
     }
 }

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

@@ -9 +9 @@
 
 public abstract class Cg41DataSetHandler extends FrenchDataSetHandler implements Cg41Constants {
-        
-        public Cg41DataSetHandler(int portalId, String nationalPath) {
-                init(portalId, nationalPath);
-        }
-        
-        public Cg41DataSetHandler(int portalId, String nationalPath, String relevantTag) {
-                super(relevantTag);
-                init(portalId, nationalPath);
-        }
-        
-        public Cg41DataSetHandler(int portalId, String nationalPath, boolean relevantUnion, String ... relevantTags) {
-                super(relevantUnion, relevantTags);
-                init(portalId, nationalPath);
-        }
+    
+    public Cg41DataSetHandler(int portalId, String nationalPath) {
+        init(portalId, nationalPath);
+    }
+    
+    public Cg41DataSetHandler(int portalId, String nationalPath, String relevantTag) {
+        super(relevantTag);
+        init(portalId, nationalPath);
+    }
+    
+    public Cg41DataSetHandler(int portalId, String nationalPath, boolean relevantUnion, String ... relevantTags) {
+        super(relevantUnion, relevantTags);
+        init(portalId, nationalPath);
+    }
 
-        public Cg41DataSetHandler(int portalId, String nationalPath, String ... relevantTags) {
-                this(portalId, nationalPath, false, relevantTags);
-        }
+    public Cg41DataSetHandler(int portalId, String nationalPath, String ... relevantTags) {
+        this(portalId, nationalPath, false, relevantTags);
+    }
 
-        public Cg41DataSetHandler(int portalId, String nationalPath, boolean relevantUnion, Tag ... relevantTags) {
-                super(relevantUnion, relevantTags);
-                init(portalId, nationalPath);
-        }
+    public Cg41DataSetHandler(int portalId, String nationalPath, boolean relevantUnion, Tag ... relevantTags) {
+        super(relevantUnion, relevantTags);
+        init(portalId, nationalPath);
+    }
 
-        private final void init(int portalId, String nationalPath) {
-                setNationalPortalPath(nationalPath);
-                try {
-                        if (portalId > 0) {
-                                setLocalPortalURL(PORTAL_CG41 + portalId);
-                        }
-                } catch (MalformedURLException e) {
-                        e.printStackTrace();
-                }
+    private final void init(int portalId, String nationalPath) {
+        setNationalPortalPath(nationalPath);
+        try {
+            if (portalId > 0) {
+                setLocalPortalURL(PORTAL_CG41 + portalId);
+            }
+        } catch (MalformedURLException e) {
+            e.printStackTrace();
+        }
 
-        }
+    }
 
-        @Override
-        public String getSource() {
-                return SOURCE_CG41;
-        }
+    @Override
+    public String getSource() {
+        return SOURCE_CG41;
+    }
 
-        @Override
-        public String getLocalPortalIconName() {
-                return ICON_CG41_24;
-        }
+    @Override
+    public String getLocalPortalIconName() {
+        return ICON_CG41_24;
+    }
 
-        @Override
-        public String getDataLayerIconName() {
-                return ICON_CG41_16;
-        }
+    @Override
+    public String getDataLayerIconName() {
+        return ICON_CG41_16;
+    }
 }

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

@@ -6 +6 @@
 
 public class ZonesInondablesBrayeHandler extends Cg41DataSetHandler {
-        public ZonesInondablesBrayeHandler() {
-                super(14624, "Zone-inondable-de-la-Braye-au-1-25000-(partie-Loir-et-Cher)-30383255");
-        }
+    public ZonesInondablesBrayeHandler() {
+        super(14624, "Zone-inondable-de-la-Braye-au-1-25000-(partie-Loir-et-Cher)-30383255");
+    }
 
-        @Override
-        public boolean acceptsFilename(String filename) {
-                return acceptsMifFilename(filename, "aleas_braye");
-        }
+    @Override
+    public boolean acceptsFilename(String filename) {
+        return acceptsMifFilename(filename, "aleas_braye");
+    }
 
-        @Override
-        public void updateDataSet(DataSet ds) {
-                // TODO Auto-generated method stub
-        }
+    @Override
+    public void updateDataSet(DataSet ds) {
+        // TODO Auto-generated method stub
+    }
 }

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

@@ -7 +7 @@
 public class ArretsBusHandler extends Cg41DataSetHandler {
 
-        public ArretsBusHandler() {
-                super(14615, "Points-d'arrêt-du-réseau-de-transport-départemental-\"Route41\"-30383156");
-        }
+    public ArretsBusHandler() {
+        super(14615, "Points-d'arrêt-du-réseau-de-transport-départemental-\"Route41\"-30383156");
+    }
 
-        @Override
-        public boolean acceptsFilename(String filename) {
-                return acceptsShpFilename(filename, "Points_ROUTE41");
-        }
+    @Override
+    public boolean acceptsFilename(String filename) {
+        return acceptsShpFilename(filename, "Points_ROUTE41");
+    }
 
-        @Override
-        public void updateDataSet(DataSet ds) {
-                // TODO Auto-generated method stub
-        }
+    @Override
+    public void updateDataSet(DataSet ds) {
+        // TODO Auto-generated method stub
+    }
 }