Merge branch 'master' of ssh://e5.valueserver.jp/virtual/satomichan/gitrepo/nucalgen

# Conflicts:
#	src/main/java/jp/satomichan/nucalgen/MoeStdFoodCompTable.java
#	src/main/java/jp/satomichan/nucalgen/Nucalgen.java

diff --git a/src/main/java/jp/satomichan/nucalgen/MoeStdFoodCompTable.java b/src/main/java/jp/satomichan/nucalgen/MextStdFoodCompTable.java
similarity index 95%
rename from src/main/java/jp/satomichan/nucalgen/MoeStdFoodCompTable.java
rename to src/main/java/jp/satomichan/nucalgen/MextStdFoodCompTable.java
index 1a39f2dcc36bc72ecb3b1ca2381f1df0f1e16753..d85124898ebffdea68e075f3a59930f0d6e9c44e 100644 (file)
--- a/src/main/java/jp/satomichan/nucalgen/MoeStdFoodCompTable.java
+++ b/src/main/java/jp/satomichan/nucalgen/MextStdFoodCompTable.java
@@ -11,11 +11,11 @@ import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 
-public class MoeStdFoodCompTable {
+public class MextStdFoodCompTable {
        private String brightColoredVegetablesXmlFileName = "";
        private List<String> brightColoredVegetableList = new ArrayList<String>();
 
-       MoeStdFoodCompTable(String brightColoredVegetablesXmlFileName_){
+       MextStdFoodCompTable(String brightColoredVegetablesXmlFileName_){
                this.brightColoredVegetablesXmlFileName = brightColoredVegetablesXmlFileName_;
 
                try {
@@ -37,7 +37,6 @@ public class MoeStdFoodCompTable {
                Sheet foodComposithonSheet = outputWorkbook.cloneSheet(0);
                outputWorkbook.setSheetName(18, "成分表");
                outputWorkbook.setSheetOrder("成分表", 0);
-               //Sheet foodComposithonSheet = outputWorkbook.createSheet("成分表");
 
                //「成分識別子」行
                Row idRow = foodComposithonSheet.getRow(10);

diff --git a/src/main/java/jp/satomichan/nucalgen/Nucalgen.java b/src/main/java/jp/satomichan/nucalgen/Nucalgen.java
index a385604a1dda49f58b6ed45af9ba356f6c4fbd24..9f900568c84cd660be73021ff7b7b5f6406c4c32 100644 (file)
--- a/src/main/java/jp/satomichan/nucalgen/Nucalgen.java
+++ b/src/main/java/jp/satomichan/nucalgen/Nucalgen.java
@@ -41,7 +41,7 @@ public class Nucalgen {
                        CommandLineParser parser = new DefaultParser();
                        CommandLine cmd = parser.parse(options, args);
 
-                       final String moeStdFoodCompTableFileName = cmd.getOptionValue("std-food-comp-table");
+                       final String mextStdFoodCompTableFileName = cmd.getOptionValue("std-food-comp-table");
                        final String columnsXmlFileName = cmd.getOptionValue("columns");
                        final String outputXlsxFileName = cmd.getOptionValue("output");
                        final int lines = Integer.parseInt(cmd.getOptionValue("lines"));
@@ -51,11 +51,11 @@ public class Nucalgen {
                        NutritionColumnHolder nc = new NutritionColumnHolder(config);
 
                        //Book生成
-                       Workbook outputWorkbook = WorkbookFactory.create(new FileInputStream(moeStdFoodCompTableFileName));
+                       Workbook outputWorkbook = WorkbookFactory.create(new FileInputStream(mextStdFoodCompTableFileName));
 
                        if(cmd.hasOption("use-processed-table") == false) {
                                //成分表 変換
-                               MoeStdFoodCompTable moe = new MoeStdFoodCompTable(cmd.getOptionValue("bright-colored-vegetables-list"));
+                               MextStdFoodCompTable moe = new MextStdFoodCompTable(cmd.getOptionValue("bright-colored-vegetables-list"));
                                moe.processInto(outputWorkbook);
                        }
 
@@ -115,7 +115,7 @@ public class Nucalgen {
                        }
 
 
-                       //摂取量　名前付き範囲
+                       //摂取量 名前付き範囲
                        String intakeArea = new CellReference(calcSheet.getSheetName(), 3, 3, true, true).formatAsString() + ":" + new CellReference(calcSheet.getSheetName(), rowIndex -1, 3, true, true).formatAsString();
                        XSSFName intakeNamedRangeArea = (XSSFName) outputWorkbook.createName();
                        intakeNamedRangeArea.setNameName("AREA_INTAKE");