FIX: some charset-insecure input streams.

diff --git a/src/org/cacert/gigi/output/AssurancesDisplay.java b/src/org/cacert/gigi/output/AssurancesDisplay.java
index 78973d0ace887834814b020a3e6139ee55887a0e..b0908c5df3c9781fb2ef9511d129c930be4db360 100644 (file)
--- a/src/org/cacert/gigi/output/AssurancesDisplay.java
+++ b/src/org/cacert/gigi/output/AssurancesDisplay.java
@@ -1,6 +1,5 @@
 package org.cacert.gigi.output;
 
-import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.util.Map;
 
@@ -18,7 +17,7 @@ public class AssurancesDisplay implements Outputable {
     public String assuranceArray;
 
     static {
-        template = new Template(new InputStreamReader(AssurancesDisplay.class.getResourceAsStream("AssurancesDisplay.templ")));
+        template = new Template(AssurancesDisplay.class.getResource("AssurancesDisplay.templ"));
     }
 
     public AssurancesDisplay(String assuranceArray, boolean assurer) {

diff --git a/src/org/cacert/gigi/pages/account/MyDetailsForm.java b/src/org/cacert/gigi/pages/account/MyDetailsForm.java
index 359880b409b706c19f8a4b6563a9c6544616dac1..c79bcea5f0063f02ee519e22344e9e471296241e 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MyDetailsForm.java
+++ b/src/org/cacert/gigi/pages/account/MyDetailsForm.java
@@ -1,6 +1,5 @@
 package org.cacert.gigi.pages.account;
 
-import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.util.Map;
 
@@ -21,7 +20,7 @@ public class MyDetailsForm extends Form {
 
     private static Template templ;
     static {
-        templ = new Template(new InputStreamReader(MyDetailsForm.class.getResourceAsStream("MyDetailsForm.templ")));
+        templ = new Template(MyDetailsForm.class.getResource("MyDetailsForm.templ"));
     }
 
     private User target;

diff --git a/src/org/cacert/gigi/pages/account/MyListingForm.java b/src/org/cacert/gigi/pages/account/MyListingForm.java
index c1a6f4244067dcd6baeb2a2d80a92cf2912a5ecc..97f32629f16445f476f9e3b00a2f30f7e8c99c45 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MyListingForm.java
+++ b/src/org/cacert/gigi/pages/account/MyListingForm.java
@@ -1,6 +1,5 @@
 package org.cacert.gigi.pages.account;
 
-import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.util.Map;
 
@@ -16,7 +15,7 @@ public class MyListingForm extends Form {
     private static Template template;
 
     static {
-        template = new Template(new InputStreamReader(MyListingForm.class.getResourceAsStream("MyListingForm.templ")));
+        template = new Template(MyListingForm.class.getResource("MyListingForm.templ"));
     }
 
     private User target;