X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Fozacc%2Fmail%2Ffetch%2Fimpl%2Fsk_jp%2Fio%2FUnicodeCorrector.java;h=2cc00c5151d3668d8c1c3c942bf58269e2943b60;hb=ac064c7dcd057e5df2ec3d431f19e51a09025ad0;hp=07affe3caadfb1b2c3db31576f77a6f4beccd9e0;hpb=9acd02fa2f08c0a0cf999619f1950e86aae0cc18;p=spring-ext%2Fozacc-mail.git

diff --git a/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/io/UnicodeCorrector.java b/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/io/UnicodeCorrector.java
index 07affe3..2cc00c5 100644
--- a/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/io/UnicodeCorrector.java
+++ b/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/io/UnicodeCorrector.java
@@ -32,7 +32,7 @@ import java.util.Map;
  * @version $Revision: 1.1.2.1 $ $Date: 2005/01/18 07:20:36 $
  */
 public abstract class UnicodeCorrector {
-    private static final Map correctorMap = new HashMap();
+    private static final Map<String, Class<? extends UnicodeCorrector>> correctorMap = new HashMap<>();
     static {
         // x-sjis-cp932等でおかしく変換されたUnicodeを他のエンコーディングで
         // 出力する場合です
@@ -67,12 +67,12 @@ public abstract class UnicodeCorrector {
      */
     public static UnicodeCorrector getInstance(String enc)
             throws UnsupportedEncodingException {
-        Class correctorClass = (Class)correctorMap.get(enc.toLowerCase());
+        Class<? extends UnicodeCorrector> correctorClass = correctorMap.get(enc.toLowerCase());
         if (correctorClass == null) {
             throw new UnsupportedEncodingException(enc);
         }
         try {
-            return (UnicodeCorrector)correctorClass.newInstance();
+            return correctorClass.newInstance();
         } catch (Exception e) {
             throw new UnsupportedEncodingException(
                     correctorClass + " cannot get newInstance.\n" + e);
@@ -93,7 +93,7 @@ public abstract class UnicodeCorrector {
      *              in case of different result size.
      */
     public char[] correct(char cbuf[], int off, int len) {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         for (int i = off; i < len; i++) {
             buf.append(correct(cbuf[i]));
         }
@@ -101,7 +101,7 @@ public abstract class UnicodeCorrector {
     }
 
     public String correct(String s) {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         for (int i = 0; i < s.length(); i++) {
             buf.append(correct(s.charAt(i)));
         }
@@ -120,7 +120,7 @@ public abstract class UnicodeCorrector {
      * @param enc 対応するエンコーディング名
      * @param correctorClass UnicodeCorrectorサブクラスのClassオブジェクト
      */
-    public static void addCorrector(String enc, Class correctorClass) {
+    public static void addCorrector(String enc, Class<? extends UnicodeCorrector> correctorClass) {
         if (!correctorClass.isInstance(UnicodeCorrector.class)) {
             throw new IllegalArgumentException(
                     "Corrector is not UnicodeCorrector type.");