Changeset 32897 in osm for applications/editors/josm/plugins/opendata

Timestamp:

2016-09-02T20:40:51+02:00 (8 years ago)

Author:

donvip

Message:

checkstyle

Location:

applications/editors/josm/plugins/opendata/modules

Files:

• be.bruxelles/src/org/openstreetmap/josm/plugins/opendata/modules/be/bruxelles/BruxellesConstants.java (modified) (1 diff)
• be.datagovbe/src/org/openstreetmap/josm/plugins/opendata/modules/be/datagovbe/DataGovBeConstants.java (modified) (1 diff)
• fr.lemans/src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/datasets/LeMansDataSetHandler.java (modified) (6 diffs)
• fr.paris/src/org/openstreetmap/josm/plugins/opendata/modules/fr/paris/ParisConstants.java (modified) (1 diff)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/ChantiersLineairesHandler.java (modified) (1 diff)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.opendata.modules.be.bruxelles;
 
+public interface BruxellesConstants {
 
-public interface BruxellesConstants {
-    
     /**
      * Source
      */
-    public static final String SOURCE_BRUXELLES = "Ville de Bruxelles";
-    
+    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";
+    String PORTAL_EN = "http://www.brussels.be";
+    String PORTAL_FR = "http://www.bruxelles.be";
+    String PORTAL_NL = "http://www.brussel.be";
 }

applications/editors/josm/plugins/opendata/modules/be.datagovbe/src/org/openstreetmap/josm/plugins/opendata/modules/be/datagovbe/DataGovBeConstants.java

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.opendata.modules.be.datagovbe;
 
+public interface DataGovBeConstants {
 
-public interface DataGovBeConstants {
-    
     /**
      * Source
      */
-    public static final String SOURCE_DATAGOVBE = "data.gov.be";
+    String SOURCE_DATAGOVBE = "data.gov.be";
 }

applications/editors/josm/plugins/opendata/modules/fr.lemans/src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/datasets/LeMansDataSetHandler.java

@@ -14 +14 @@
 
 public abstract class LeMansDataSetHandler extends FrenchDataSetHandler implements LeMansConstants {
-    
+
     private String kmzUuid;
     private String shpUuid;
-    
+
     public LeMansDataSetHandler(String uuid) {
         init(uuid);
     }
-    
+
     public LeMansDataSetHandler(String uuid, String relevantTag) {
         super(relevantTag);
         init(uuid);
     }
-    
+
     public LeMansDataSetHandler(String uuid, boolean relevantUnion, String ... relevantTags) {
         super(relevantUnion, relevantTags);
@@ -36 +36 @@
     }
 
-    
     public LeMansDataSetHandler(String uuid, boolean relevantUnion, Tag ... relevantTags) {
         super(relevantUnion, relevantTags);
@@ -42 +41 @@
     }
 
-    private final void init(String uuid) {
+    private void init(String uuid) {
         try {
             setLicense(License.ODbL);
@@ -52 +51 @@
         }
     }
-        
+
     protected final void setKmzShpUuid(String kmzUuid, String shpUuid) {
         this.kmzUuid = kmzUuid;
@@ -62 +61 @@
         return SOURCE_LE_MANS;
     }
-    
+
     /*@Override
     public URL getLicenseURL() {
@@ -77 +76 @@
         List<Pair<String, URL>> result = new ArrayList<>();
         try {
-            if (kmzUuid != null && !kmzUuid.isEmpty()) result.add(new Pair<>(getName() + " (KMZ)", new URL(PORTAL + "download.do?uuid=" + kmzUuid)));
-            if (shpUuid != null && !shpUuid.isEmpty()) result.add(new Pair<>(getName() + " (SHP)", new URL(PORTAL + "download.do?uuid=" + shpUuid)));
+            if (kmzUuid != null && !kmzUuid.isEmpty())
+                result.add(new Pair<>(getName() + " (KMZ)", new URL(PORTAL + "download.do?uuid=" + kmzUuid)));
+            if (shpUuid != null && !shpUuid.isEmpty())
+                result.add(new Pair<>(getName() + " (SHP)", new URL(PORTAL + "download.do?uuid=" + shpUuid)));
         } catch (MalformedURLException e) {
             e.printStackTrace();

applications/editors/josm/plugins/opendata/modules/fr.paris/src/org/openstreetmap/josm/plugins/opendata/modules/fr/paris/ParisConstants.java

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.opendata.modules.fr.paris;
 
+public interface ParisConstants {
 
-public interface ParisConstants {
-        
     /**
      * Source
      */
-    public static final String SOURCE = "opendataparis";
-    
+    String SOURCE = "opendataparis";
+
     /**
      * Portal
      */
-    public static final String PORTAL = "http://opendata.paris.fr/opendata/";
+    String PORTAL = "http://opendata.paris.fr/opendata/";
 
     /**
      * Icons
      */
-    public static final String ICON_PARIS_24 = "data.fr.paris_24.png";
+    String ICON_PARIS_24 = "data.fr.paris_24.png";
 }

applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/ChantiersLineairesHandler.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.transport;
-
 
 public class ChantiersLineairesHandler extends ChantiersHandler {