Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/AbstractDataSetHandler.java
===================================================================
--- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/AbstractDataSetHandler.java	(revision 36439)
+++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/AbstractDataSetHandler.java	(revision 36440)
@@ -89,5 +89,5 @@
     }
 
-    private static boolean acceptsFilename(String filename, String[] expected, String ... extensions) {
+    private static boolean acceptsFilename(String filename, String[] expected, String... extensions) {
         if (filename != null) {
             for (String expectedName : expected) {
Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/SimpleDataSetHandler.java
===================================================================
--- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/SimpleDataSetHandler.java	(revision 36439)
+++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/SimpleDataSetHandler.java	(revision 36440)
@@ -65,5 +65,5 @@
     }
 
-    protected SimpleDataSetHandler(boolean relevantUnion, Tag ... relevantTags) {
+    protected SimpleDataSetHandler(boolean relevantUnion, Tag... relevantTags) {
         addRelevantTag(relevantTags);
         this.relevantUnion = relevantUnion;
Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/fr/FrenchDataSetHandler.java
===================================================================
--- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/fr/FrenchDataSetHandler.java	(revision 36439)
+++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/fr/FrenchDataSetHandler.java	(revision 36440)
@@ -118,4 +118,5 @@
 
     protected static LatLon getLatLonByDptCode(EastNorth en, String dpt, boolean useCC9) {
+        // CHECKSTYLE.OFF: BooleanExpressionComplexity
         // CHECKSTYLE.OFF: LineLength
         if (dpt.equals("971") || dpt.equals("972") || dpt.equals("977") || dpt.equals("978")) {    // Antilles
@@ -151,4 +152,5 @@
         }
         // CHECKSTYLE.ON: LineLength
+        // CHECKSTYLE.ON: BooleanExpressionComplexity
     }
 
Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/CandidateChooser.java
===================================================================
--- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/CandidateChooser.java	(revision 36439)
+++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/CandidateChooser.java	(revision 36440)
@@ -33,5 +33,5 @@
     }
 
-    private static class Renderer extends DefaultListCellRenderer {
+    private final static class Renderer extends DefaultListCellRenderer {
 
         @Override
Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifReader.java
===================================================================
--- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifReader.java	(revision 36439)
+++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifReader.java	(revision 36440)
@@ -144,5 +144,5 @@
 
         // Origin, latitude
-        switch(proj) {
+        switch (proj) {
         case Albers_Equal_Area_Conic:
         case Azimuthal_Equidistant_polar_aspect_only:
Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/session/OpenDataSessionExporter.java
===================================================================
--- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/session/OpenDataSessionExporter.java	(revision 36439)
+++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/session/OpenDataSessionExporter.java	(revision 36440)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.opendata.core.io.session;
 
Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/session/OpenDataSessionImporter.java
===================================================================
--- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/session/OpenDataSessionImporter.java	(revision 36439)
+++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/session/OpenDataSessionImporter.java	(revision 36440)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.opendata.core.io.session;
 
Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleHandler.java
===================================================================
--- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleHandler.java	(revision 36439)
+++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleHandler.java	(revision 36440)
@@ -169,5 +169,5 @@
 
         if (pnlMessage.isRememberDecision()) {
-            switch(ret) {
+            switch (ret) {
             case 0:
                 Config.getPref().put(togglePreferenceKey, "always");
@@ -331,5 +331,5 @@
                 ret.put(pi.name, pi);
             }
-            return ret;
+            return Collections.unmodifiableMap(ret);
         } finally {
             monitor.finishTask();