Commit: master - StuxCommon (git)

共通モジュールとかとか

Commit MetaInfo

• Revision: 196f90d449e6872b738ef6efdf0de44dcfbb39f2 (tree)
• Time: 2018-01-05 10:56:00
• Author: [e-mail] <shupeluter@hotm...>
• Commiter: [e-mail]

Log Message

整理

Change Summary

• delete: stux.common/src/main/java/org/stux/common/util/excel/BaseExcelParser.java
• delete: stux.common/src/main/java/org/stux/common/util/excel/BasicResultWriter.java
• delete: stux.common/src/main/java/org/stux/common/util/excel/IParseResult.java
• delete: stux.common/src/main/java/org/stux/common/util/excel/IndexInfo.java
• modified: stux.common/src/main/java/org/stux/common/util/file/BasicFileObjectScanner.java
• delete: stux.common/src/main/java/org/stux/common/util/file/ResultWriter.java

Incremental Difference

--- a/stux.common/src/main/java/org/stux/common/util/excel/BaseExcelParser.java
+++ /dev/null
@@ -1,129 +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 org.stux.common.util.excel;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.ss.formula.Formula;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.FormulaEvaluator;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
-import org.stux.common.Exception.StuxBasicException;
-
-/**
- *
- * @author YoshihiroSaitoh
- */
-public abstract class BaseExcelParser {
-
-    public final String KEY_PROP_PATH = "path.prop";
-
-    private Map<Integer, Sheet> sheetMap = new HashMap();
-    protected String fileName;
-    protected String filePath;
-    protected String propFilepath;
-
-    public void parse(File file) throws StuxBasicException {
-        fileName = file.getName();
-        filePath = file.getPath();
-        try {
-            Workbook wb = WorkbookFactory.create(file);
-            int numberOfSheet = wb.getNumberOfSheets();
-
-            for (int i = 0; i < numberOfSheet; i++) {
-                sheetMap.put(i, wb.getSheetAt(i));
-            }
-
-            parse(sheetMap);
-            wb.close();
-
-        } catch (IOException ex) {
-            throw new StuxBasicException(ex, "ワークブック読み取り中に例外が発生しました。");
-        } catch (InvalidFormatException ex) {
-            throw new StuxBasicException(ex, "ファイルのフォーマットが正しくありません。");
-        } finally {
-            //TODO wbはここで閉じたいだけ。
-        }
-
-    }
-
-    protected String getStringValue(Sheet sheet, IndexInfo tempInfo) {
-        Row targetRow = sheet.getRow(tempInfo.getRow());
-        if (targetRow == null) {
-            return "";
-        }
-        Cell targetCell = targetRow.getCell(tempInfo.getCol());
-        if (targetCell == null) {
-            return "";
-        }
-
-        switch (targetCell.getCellType()) {
-            case Cell.CELL_TYPE_NUMERIC:
-                return Integer.toString((int) targetCell.getNumericCellValue());
-            case Cell.CELL_TYPE_STRING:
-                return targetCell.getStringCellValue().replaceAll("\n", "");
-            case Cell.CELL_TYPE_FORMULA:
-                return targetCell.getCellFormula();
-
-        }
-        return "";
-    }
-
-    protected String getStringValue(Sheet sheet, int row, IndexInfo tempInfo) {
-        Row tmprow = sheet.getRow(row);
-        if (tmprow == null) {
-            return "";
-        }
-        Cell targetCell = tmprow.getCell(tempInfo.getCol());
-        if (targetCell == null) {
-            return "";
-        }
-        switch (targetCell.getCellType()) {
-            case Cell.CELL_TYPE_NUMERIC:
-                //return targetCell.getDateCellValue().toString();
-                return Integer.toString((int) targetCell.getNumericCellValue());
-            //return Double.toString(targetCell.getNumericCellValue());
-            case Cell.CELL_TYPE_STRING:
-                return targetCell.getStringCellValue().replaceAll("\n", " ");
-            case Cell.CELL_TYPE_FORMULA:
-                return targetCell.getCellFormula();
-            default:
-                return targetCell.getStringCellValue();
-        }
-
-    }
-
-    protected String getFormulaValue(Sheet sheet, IndexInfo tempInfo) {
-        String res = "";
-        Cell targetCell = sheet.getRow(tempInfo.getRow()).getCell(tempInfo.getCol());
-        if (targetCell.getCellType() == Cell.CELL_TYPE_FORMULA) {
-
-            FormulaEvaluator evaluator = sheet.getWorkbook().getCreationHelper().createFormulaEvaluator();
-            targetCell = evaluator.evaluateInCell(targetCell);
-        }
-        switch (targetCell.getCellType()) {
-            case Cell.CELL_TYPE_NUMERIC:
-                return Integer.toString((int) targetCell.getNumericCellValue());
-            //return Double.toString(targetCell.getNumericCellValue());
-            case Cell.CELL_TYPE_STRING:
-                return targetCell.getStringCellValue().replaceAll("\n", " ");
-            case Cell.CELL_TYPE_FORMULA:
-                return targetCell.getCellFormula();
-        }
-
-        return res;
-    }
-
-    public abstract void parse(Map<Integer, Sheet> sheets) throws StuxBasicException;
-
-}

--- a/stux.common/src/main/java/org/stux/common/util/excel/BasicResultWriter.java
+++ /dev/null
@@ -1,14 +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 org.stux.common.util.excel;
-
-/**
- *
- * @author 0000011141935
- */
-public abstract class BasicResultWriter {
-    public abstract void write(IParseResult target);
-}

--- a/stux.common/src/main/java/org/stux/common/util/excel/IParseResult.java
+++ /dev/null
@@ -1,14 +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 org.stux.common.util.excel;
-
-/**
- *
- * @author 0000011141935
- */
-public interface IParseResult {
-    
-}

--- a/stux.common/src/main/java/org/stux/common/util/excel/IndexInfo.java
+++ /dev/null
@@ -1,61 +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 org.stux.common.util.excel;
-
-import org.stux.common.Exception.StuxBasicException;
-import org.stux.worktool.reviewinfocounter.EnumCellType;
-
-/**
- *
- * @author YoshihiroSaitoh
- */
-public class IndexInfo {
-
-    private final int INDEX_ROWNO=0;
-    private final int INDEX_COLNO=1;
-    private final int INDEX_CELLTYPE=2;
-    private final String STR_DATE_TYPE="DATE";
-    private final String STR_NUM_TYPE="NUMBER";
-    private final String STR_FORMULA_TYPE ="FORMULA";
-    
-    private final String demiliter = ",";
-    private final int colSize = 3;
-    private int row;
-    private int col;
-    private EnumCellType type;
-
-    
-    public IndexInfo(String arg) throws StuxBasicException{
-        String[] factors = arg.split(demiliter);
-        
-        if(factors.length != colSize) throw new StuxBasicException("設定値が<ROW_NO>,<COL_NO>,<CEL_TYPE>のフォーマットになっていません。");
-        String strCelType= factors[INDEX_CELLTYPE];
-        this.row = Integer.parseInt(factors[INDEX_ROWNO]);
-        this.col = Integer.parseInt(factors[INDEX_COLNO]);
-        
-        //セルの書式に応じて、TYPEを設定
-        if(STR_DATE_TYPE.equals(strCelType.toUpperCase())) this.type = EnumCellType.DATE;
-        else if(STR_NUM_TYPE.equals(strCelType.toUpperCase())) this.type = EnumCellType.NUMBER;
-        else if(STR_FORMULA_TYPE.equals(strCelType.toUpperCase()))this.type = EnumCellType.FORMULA;
-        else this.type = EnumCellType.STRING;
-        
-    }
-
-    public EnumCellType getType() {
-        return type;
-    }
-
-    public int getRow() {
-        return row;
-    }
-
-    public int getCol() {
-        return col;
-    }
-    
-    
-    
-}

--- a/stux.common/src/main/java/org/stux/common/util/file/BasicFileObjectScanner.java
+++ b/stux.common/src/main/java/org/stux/common/util/file/BasicFileObjectScanner.java
@@ -9,7 +9,7 @@ import java.io.File;
 import java.io.FileFilter;
 import java.util.ArrayList;
 import java.util.List;
-import org.stux.common.Exception.StuxBasicException;
+import org.stux.common.exception.StuxBasicException;
 
 /**
  * 指定したディレクトリ配下の全フォルダ/全ファイルを取得するツール

--- a/stux.common/src/main/java/org/stux/common/util/file/ResultWriter.java
+++ /dev/null
@@ -1,17 +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 org.stux.common.util.file;
-
-import org.stux.worktool.testspecanalizer.model.TestSpecFactor;
-
-
-/**
- *
- * @author YoshihiroSaitoh
- */
-public interface ResultWriter {
-    public void write(TestSpecFactor factor);
-}