Commit: b1368d21491b39b04896e75bf5ad5a56a8ba64c3 - FileCleaner (git)

Commit MetaInfo

• Revision: b1368d21491b39b04896e75bf5ad5a56a8ba64c3 (tree)
• Time: 2018-01-08 22:50:02
• Author: [e-mail] <shupeluter@hotm...>
• Commiter: [e-mail]

Log Message

文字コードを設定できるように変更

Change Summary

• modified: src/main/java/jp/co/nec/jsight/filecleaner/JavaCleaner.java
• modified: src/main/java/jp/co/nec/jsight/filecleaner/ReplaceInfoManager.java
• modified: src/main/resources/replace.properties
• modified: src/test/resources/FileObjectScanerTest/Case3-2.xls
• modified: src/test/resources/FileObjectScanerTest/Case3_4.java
• modified: src/test/resources/JavaCleanerTest/TestTarget1.java
• modified: src/test/resources/replace.properties

Incremental Difference

--- a/src/main/java/jp/co/nec/jsight/filecleaner/JavaCleaner.java
+++ b/src/main/java/jp/co/nec/jsight/filecleaner/JavaCleaner.java
@@ -11,25 +11,37 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
-import java.io.FileWriter;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import jp.co.nec.jsight.common.JSightException;
 
 /**
  *
  * @author shupe
  */
 public class JavaCleaner extends AbsFileCleaner implements IBasicFileCleaner {
-
+    private String inputCode = "UTF-8";
+    private String outputCode= "UTF-8";
+    
     public JavaCleaner(List<Map.Entry> repList) {
         super(repList);
+        try {
+            this.loadCharCode();
+        } catch (IOException ex) {
+            Logger.getLogger(JavaCleaner.class.getName()).log(Level.SEVERE, null, ex);
+        } catch (Exception ex) {
+            Logger.getLogger(JavaCleaner.class.getName()).log(Level.SEVERE, null, ex);
+        }
     }
 
+    
     @Override
     public void clean(File file) {
         super.checkBefore(file);
@@ -44,7 +56,7 @@ public class JavaCleaner extends AbsFileCleaner implements IBasicFileCleaner {
         contents = new StringBuilder();
 
         try {
-            BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(file)));
+            BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(file),inputCode));
 
             String line = null;
 
@@ -69,7 +81,7 @@ public class JavaCleaner extends AbsFileCleaner implements IBasicFileCleaner {
 
     private void recordContents(File file, StringBuilder contents) {
         try {
-            BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file)));
+            BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file),outputCode));
             bw.append(contents.toString());
             bw.flush();
         } catch (FileNotFoundException ex) {
@@ -79,4 +91,30 @@ public class JavaCleaner extends AbsFileCleaner implements IBasicFileCleaner {
         }
     }
 
+        
+    private void loadCharCode() throws IOException, Exception {
+        try (InputStream in = ReplaceInfoManager.class.getResourceAsStream(ReplaceInfoManager.STR_PROP_FILE_NAME)) {
+
+            if (in == null) {
+                throw new FileNotFoundException(ReplaceInfoManager.STR_PROP_FILE_NAME + "が見つかりません。");
+            }
+
+            Properties props = new Properties();
+            props.load(in);
+            this.outputCode = props.getProperty("output.code");
+            if(outputCode == null){
+                throw new JSightException("プロパティ、output.codeが設定されていません。");
+            }
+            this.inputCode  = props.getProperty("input.code");
+            if(inputCode == null){
+                throw new JSightException("プロパティ、input.codeが設定されていません。");
+            }
+        }
+
+    }
+
+    private Exception JSightException(String プロパティoutcodeが設定されていません) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+    
 }

--- a/src/main/java/jp/co/nec/jsight/filecleaner/ReplaceInfoManager.java
+++ b/src/main/java/jp/co/nec/jsight/filecleaner/ReplaceInfoManager.java
@@ -24,31 +24,34 @@ import jp.co.nec.jsight.common.JSightException;
  */
 public class ReplaceInfoManager {
 
-    private final String STR_PROP_FILE_NAME = "/replace.properties";
+    static final String STR_PROP_FILE_NAME = "/replace.properties";
+
+    private List<Entry> infoList;
+    private List<Entry> replacerList;
+    private String inputCharCode = "UTF-8";
+    private String outputCharCode = "UTF-8";
 
-    List<Entry> infoList;
-    List<Entry> replacerList;
-    
     public ReplaceInfoManager() {
         try {
-            infoList = loadRelaceInfo("rep.from","rep.to");
-            replacerList = loadRelaceInfo("rep.id","rep.class");
-            
+            infoList = loadRelaceInfo("rep.from", "rep.to");
+            replacerList = loadRelaceInfo("rep.id", "rep.class");
+            //loadCharCode();
         } catch (IOException | JSightException ex) {
             Logger.getLogger(ReplaceInfoManager.class.getName()).log(Level.SEVERE, null, ex);
         }
     }
 
-
-    public List getReplaceStrs(){
+    public List getReplaceStrs() {
         return infoList;
     }
 
-    public List getReplacerStrs(){
+    public List getReplacerStrs() {
         return replacerList;
     }
+
+   
     
-    private List<Entry> loadRelaceInfo(String from,String to) throws FileNotFoundException, IOException, JSightException {
+    private List<Entry> loadRelaceInfo(String from, String to) throws FileNotFoundException, IOException, JSightException {
         List<Entry> result = new ArrayList();
 
         try (InputStream in = ReplaceInfoManager.class.getResourceAsStream(STR_PROP_FILE_NAME)) {
@@ -61,15 +64,15 @@ public class ReplaceInfoManager {
             props.load(in);
 
             String fromInfo = props.getProperty(from);
-            if(fromInfo == null){
-                throw new JSightException(from+"プロパティが設定されていません。");
+            if (fromInfo == null) {
+                throw new JSightException(from + "プロパティが設定されていません。");
             }
-            
+
             String toInfo = props.getProperty(to);
-            if(toInfo == null){
-                throw new JSightException(to+"プロパティが設定されていません。");
+            if (toInfo == null) {
+                throw new JSightException(to + "プロパティが設定されていません。");
             }
-            
+
             //,で文字列を分解
             String[] fromStrs = fromInfo.split(",");
             String[] toStrs = toInfo.split(",");
@@ -82,8 +85,26 @@ public class ReplaceInfoManager {
                 result.add(new AbstractMap.SimpleEntry<>(fromStrs[i], toStrs[i]));
             }
         }
-        
+
         return result;
-        
+
     }
+
+    //ToDo 本来はここに作りたい
+    /*private void loadCharCode() throws IOException {
+        try (InputStream in = ReplaceInfoManager.class.getResourceAsStream(STR_PROP_FILE_NAME)) {
+
+            if (in == null) {
+                throw new FileNotFoundException(STR_PROP_FILE_NAME + "が見つかりません。");
+            }
+
+            Properties props = new Properties();
+            props.load(in);
+            this.outputCharCode = props.getProperty("out.code");
+            this.inputCharCode  = props.getProperty("input.code");
+        }
+
+    }*/
+    
+    
 }

--- a/src/main/resources/replace.properties
+++ b/src/main/resources/replace.properties
@@ -5,5 +5,11 @@
 #\u7f6e\u63db\u5bfe\u8c61\u30ad\u30fc\u30ef\u30fc\u30c9
 rep.from=XX\u30c6\u30b9\u30c8,XX\u30c6\u30b9\u30c8\uff12,\u00d7\u00d7,xx
 rep.to=\u3007\u3007\u30c6\u30b9\u30c8,\u3007\u3007\u30c6\u30b9\u30c8\uff12,\u3007\u3007,oo
+
+#\u30d5\u30a1\u30a4\u30eb\u306e\u7a2e\u985e\u3068\u30cf\u30f3\u30c9\u30e9
 rep.id=java,xls
-rep.class=jp.co.nec.jsight.filecleaner.JavaCleaner,jp.co.nec.jsight.filecleaner.ExcelCleaner
\ No newline at end of file
+rep.class=jp.co.nec.jsight.filecleaner.JavaCleaner,jp.co.nec.jsight.filecleaner.ExcelCleaner
+
+#\u30c6\u30ad\u30b9\u30c8\u7cfb\u30d5\u30a1\u30a4\u30eb\u306e\u51fa\u529b\u3001\u5165\u529b\u6587\u5b57\u30b3\u30fc\u30c9
+output.code=UTF-8
+input.code=UTF-8
\ No newline at end of file

Binary files a/src/test/resources/FileObjectScanerTest/Case3-2.xls and b/src/test/resources/FileObjectScanerTest/Case3-2.xls differ

--- a/src/test/resources/FileObjectScanerTest/Case3_4.java
+++ b/src/test/resources/FileObjectScanerTest/Case3_4.java
@@ -1,24 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package FileObjectScanerTest;
-
-/**
- *
- * @author shupe
- */
-public class Case3_4 {
-
-    public Case3_4() {
-    }
-    public void testXX(){
-        
-    }
-    
-    public void testoo(){
-       //�?
-    }
-}
-

--- a/src/test/resources/JavaCleanerTest/TestTarget1.java
+++ b/src/test/resources/JavaCleanerTest/TestTarget1.java
@@ -1,23 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package TestTarget1;
-
-/**
- *
- * @author shupe
- */
-public class TestTarget1 {
-
-    public TestTarget1() {
-    }
-    public void testXX(){
-        
-    }
-    
-    public void testoo(){
-       //ﾃ療?
-    }
-}

--- a/src/test/resources/replace.properties
+++ b/src/test/resources/replace.properties
@@ -5,5 +5,11 @@
 #\u7f6e\u63db\u5bfe\u8c61\u30ad\u30fc\u30ef\u30fc\u30c9
 rep.from=XX\u30c6\u30b9\u30c8,XX\u30c6\u30b9\u30c8\uff12,\u00d7\u00d7,xx
 rep.to=\u3007\u3007\u30c6\u30b9\u30c8,\u3007\u3007\u30c6\u30b9\u30c8\uff12,\u3007\u3007,oo
+
+#\u30d5\u30a1\u30a4\u30eb\u306e\u7a2e\u985e\u3068\u30cf\u30f3\u30c9\u30e9
 rep.id=java,xls
-rep.class=jp.co.nec.jsight.filecleaner.JavaCleaner,jp.co.nec.jsight.filecleaner.ExcelCleaner
\ No newline at end of file
+rep.class=jp.co.nec.jsight.filecleaner.JavaCleaner,jp.co.nec.jsight.filecleaner.ExcelCleaner
+
+#\u30c6\u30ad\u30b9\u30c8\u7cfb\u30d5\u30a1\u30a4\u30eb\u306e\u51fa\u529b\u3001\u5165\u529b\u6587\u5b57\u30b3\u30fc\u30c9
+output.code=UTF-8
+input.code=UTF-8
\ No newline at end of file