Index: /applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/EdigeoCharset.java
===================================================================
--- /applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/EdigeoCharset.java	(revision 35675)
+++ /applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/EdigeoCharset.java	(revision 35676)
@@ -5,4 +5,5 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Objects;
+import java.util.function.Supplier;
 
 /**
@@ -11,21 +12,21 @@
  */
 enum EdigeoCharset {
-    ISO_646_IRV("IRV", StandardCharsets.US_ASCII),
-    ISO_646_FRANCE("646-FRANCE", StandardCharsets.ISO_8859_1),
-    ISO_8859_1("8859-1", StandardCharsets.ISO_8859_1),
-    ISO_8859_2("8859-2", Charset.forName("ISO-8859-2")),
-    ISO_8859_3("8859-3", Charset.forName("ISO-8859-3")),
-    ISO_8859_4("8859-4", Charset.forName("ISO-8859-4")),
-    ISO_8859_5("8859-5", Charset.forName("ISO-8859-5")),
-    ISO_8859_6("8859-6", Charset.forName("ISO-8859-6")),
-    ISO_8859_7("8859-7", Charset.forName("ISO-8859-7")),
-    ISO_8859_8("8859-8", Charset.forName("ISO-8859-8")),
-    ISO_8859_9("8859-9", Charset.forName("ISO-8859-9"));
+    ISO_646_IRV("IRV", () -> StandardCharsets.US_ASCII),
+    ISO_646_FRANCE("646-FRANCE", () -> StandardCharsets.ISO_8859_1),
+    ISO_8859_1("8859-1", () -> StandardCharsets.ISO_8859_1),
+    ISO_8859_2("8859-2", () -> Charset.forName("ISO-8859-2")),
+    ISO_8859_3("8859-3", () -> Charset.forName("ISO-8859-3")),
+    ISO_8859_4("8859-4", () -> Charset.forName("ISO-8859-4")),
+    ISO_8859_5("8859-5", () -> Charset.forName("ISO-8859-5")),
+    ISO_8859_6("8859-6", () -> Charset.forName("ISO-8859-6")),
+    ISO_8859_7("8859-7", () -> Charset.forName("ISO-8859-7")),
+    ISO_8859_8("8859-8", () -> Charset.forName("ISO-8859-8")),
+    ISO_8859_9("8859-9", () -> Charset.forName("ISO-8859-9"));
     //ISO_6937_JEC("JEC");
 
     final String zv;
-    final Charset cs;
+    final Supplier<Charset> cs;
 
-    EdigeoCharset(String zv, Charset cs) {
+    EdigeoCharset(String zv, Supplier<Charset> cs) {
         this.zv = Objects.requireNonNull(zv, "zv");
         this.cs = Objects.requireNonNull(cs, "cs");
Index: /applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/EdigeoFile.java
===================================================================
--- /applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/EdigeoFile.java	(revision 35675)
+++ /applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/EdigeoFile.java	(revision 35676)
@@ -137,5 +137,5 @@
     private boolean bomFound;
     private boolean eomFound;
-    EdigeoCharset charset;
+    private EdigeoCharset charset;
     private Block currentBlock;