Changeset 30701 in osm for applications/editors/josm/plugins/opendata/modules/fr.datagouvfr

Timestamp:

2014-10-04T17:28:45+02:00 (10 years ago)

Author:

donvip

Message:

[josm_plugins] fix various compilation warnings

Location:

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

Files:

• administration/GeoFlaHandler.java (modified) (1 diff)
• agriculture/RegistreParcellaireHandler.java (modified) (1 diff)
• ecologie/AssainissementHandler.java (modified) (2 diffs)
• ecologie/ForetsPubliquesHandler.java (modified) (2 diffs)
• ecologie/InventaireForestierNationalHandler.java (modified) (2 diffs)
• hydrologie/EauxDeSurfaceHandler.java (modified) (2 diffs)
• transport/Route500Handler.java (modified) (2 diffs)

applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/administration/GeoFlaHandler.java

@@ -178 +178 @@
         
         private Pair<String, URL> getGeoflaURL(String name, String urlSuffix) throws MalformedURLException {
-                return new Pair<String, URL>(name, new URL("http://professionnels.ign.fr/sites/default/files/"+urlSuffix));
+                return new Pair<>(name, new URL("http://professionnels.ign.fr/sites/default/files/"+urlSuffix));
         }
 
         @Override
         public List<Pair<String, URL>> getDataURLs() {
-                List<Pair<String, URL>> result = new ArrayList<Pair<String,URL>>();
+                List<Pair<String, URL>> result = new ArrayList<>();
                 try {
                         result.add(getGeoflaURL("Départements France métropolitaine et Corse", "GEOFLADept_FR_Corse_AV_L93.zip"));

applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/agriculture/RegistreParcellaireHandler.java

@@ -117 +117 @@
 
         private Pair<String, URL> getRpgURL(String number, String name) throws MalformedURLException {
-                return new Pair<String, URL>(number+" - "+name, new URL("http://www.data.gouv.fr/var/download/ign/RPG_2010_"+number+".ZIP"));
+                return new Pair<>(number+" - "+name, new URL("http://www.data.gouv.fr/var/download/ign/RPG_2010_"+number+".ZIP"));
         }
         
         @Override
         public List<Pair<String, URL>> getDataURLs() {
-                List<Pair<String, URL>> result = new ArrayList<Pair<String,URL>>();
+                List<Pair<String, URL>> result = new ArrayList<>();
                 try {
                         for (FrenchAdministrativeUnit dpt : FrenchAdministrativeUnit.allDepartments) {

applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/ecologie/AssainissementHandler.java

@@ -38 +38 @@
         @Override
         public List<Pair<String, URL>> getDataURLs() {
-                List<Pair<String, URL>> result = new ArrayList<Pair<String,URL>>();
+                List<Pair<String, URL>> result = new ArrayList<>();
                 try {
-                        result.add(new Pair<String, URL>("Données 2009", new URL("http://www.assainissement.developpement-durable.gouv.fr/telecharger2.php")));
-                        result.add(new Pair<String, URL>("Données 2010", new URL("http://www.assainissement.developpement-durable.gouv.fr/telecharger2_2010.php")));
-                        result.add(new Pair<String, URL>("Données 2011", new URL("http://www.assainissement.developpement-durable.gouv.fr/telecharger2_2011.php")));
+                        result.add(new Pair<>("Données 2009", new URL("http://www.assainissement.developpement-durable.gouv.fr/telecharger2.php")));
+                        result.add(new Pair<>("Données 2010", new URL("http://www.assainissement.developpement-durable.gouv.fr/telecharger2_2010.php")));
+                        result.add(new Pair<>("Données 2011", new URL("http://www.assainissement.developpement-durable.gouv.fr/telecharger2_2011.php")));
                 } catch (MalformedURLException e) {
                         e.printStackTrace();
@@ -53 +53 @@
             private Node nodeWithKeys;
             
-            private final Set<String> interestingKeys = new HashSet<String>();
+            private final Set<String> interestingKeys = new HashSet<>();
             
         public InternalOdsHandler() {

applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/ecologie/ForetsPubliquesHandler.java

@@ -109 +109 @@
         @Override
         public List<Pair<String, URL>> getDataURLs() {
-                List<Pair<String, URL>> result = new ArrayList<Pair<String,URL>>();
+                List<Pair<String, URL>> result = new ArrayList<>();
                 try {
                         for (FrenchAdministrativeUnit region : FrenchAdministrativeUnit.allRegions) {
@@ -123 +123 @@
 
         private Pair<String, URL> getForetURL(String code, String regionName) throws MalformedURLException {
-                return new Pair<String, URL>("PublicForests_"+regionName, new URL(FRENCH_PORTAL+"var/download/"+"for_publ_v2011_reg"+code+".zip"));
+                return new Pair<>("PublicForests_"+regionName, new URL(FRENCH_PORTAL+"var/download/"+"for_publ_v2011_reg"+code+".zip"));
         }
 }

applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/ecologie/InventaireForestierNationalHandler.java

@@ -81 +81 @@
         @Override
         public List<Pair<String, URL>> getDataURLs() {
-                List<Pair<String, URL>> result = new ArrayList<Pair<String,URL>>();
+                List<Pair<String, URL>> result = new ArrayList<>();
                 try {
                         for (int year = 2010; year >= 2005; year--) {
@@ -94 +94 @@
         
         private Pair<String, URL> getIfnURL(int year, String name, String type) throws MalformedURLException {
-                return new Pair<String, URL>(name+" "+year, new URL("http://www.ifn.fr/spip/IMG/csv/placettes_"+type+"_"+year+".csv"));
+                return new Pair<>(name+" "+year, new URL("http://www.ifn.fr/spip/IMG/csv/placettes_"+type+"_"+year+".csv"));
         }
 }

applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/hydrologie/EauxDeSurfaceHandler.java

@@ -94 +94 @@
         @Override
         public List<Pair<String, URL>> getDataURLs() {
-                List<Pair<String, URL>> result = new ArrayList<Pair<String,URL>>();
+                List<Pair<String, URL>> result = new ArrayList<>();
                 try {
                         for (WaterAgency wa : waterAgencies) {
@@ -106 +106 @@
 
         private Pair<String, URL> getDownloadURL(WaterAgency a) throws MalformedURLException {
-                return new Pair<String, URL>("SurfaceWater_"+a.name, new URL("http://www.rapportage.eaufrance.fr/sites/default/files/SIG/FR"+a.code+"_SW.zip"));
+                return new Pair<>("SurfaceWater_"+a.name, new URL("http://www.rapportage.eaufrance.fr/sites/default/files/SIG/FR"+a.code+"_SW.zip"));
         }
         

applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/transport/Route500Handler.java

@@ -44 +44 @@
     @Override
     public List<Pair<String, URL>> getDataURLs() {
-        List<Pair<String, URL>> result = new ArrayList<Pair<String,URL>>();
+        List<Pair<String, URL>> result = new ArrayList<>();
         try {
             for (FrenchAdministrativeUnit dpt : FrenchAdministrativeUnit.allDepartments) {
@@ -58 +58 @@
 
     private Pair<String, URL> getRoute500URL(String code, String name) throws MalformedURLException {
-        return new Pair<String, URL>(name, new URL(OSMFR_PORTAL+"ROUTE500_1-1_SHP_LAMB93_D"+code+"_2012-11-21.7z"));
+        return new Pair<>(name, new URL(OSMFR_PORTAL+"ROUTE500_1-1_SHP_LAMB93_D"+code+"_2012-11-21.7z"));
     }
 }