diff --git a/src/main/java/org/ntlab/rdlcanvas/generaterdl/AppSpecific.java b/src/main/java/org/ntlab/rdlcanvas/generaterdl/AppSpecific.java new file mode 100644 index 0000000..59b80b6 --- /dev/null +++ b/src/main/java/org/ntlab/rdlcanvas/generaterdl/AppSpecific.java @@ -0,0 +1,56 @@ +package org.ntlab.rdlcanvas.generaterdl; + +import org.ntlab.rdlcanvas.models.RDLSpecDependencyTerm; +import org.ntlab.rdlcanvas.models.RDLSpecEvaluatableTerm; + +import java.util.List; + +public class AppSpecific extends GeneratorBase { + + + public AppSpecific() { + + } + + // [[metaId : wId -> wIdName] : scId -> scIdName] ex: [[wText : wId -> "editButton"] : scId -> "一覧画面"]] + public RDLSpecDependencyTerm createWidgetMetaIdDependencyTerm(String metaIdName, String wIdName, String scIdName, boolean Primed) { + RDLSpecDependencyTerm widgetDependencyTerm; + if (Primed) { + widgetDependencyTerm = createNestedDependencyTermFromTerm(createDependencyTerm(metaIdName, "wId", true, wIdName), "scId", true, scIdName); + } else { + widgetDependencyTerm = createNestedDependencyTermFromTerm(createDependencyTerm(metaIdName, "wId", false, wIdName), "scId", false, scIdName); + } + + return widgetDependencyTerm; + } + + //ex: [[wState : wId -> "editButton"] : scId -> "一覧画面"] + public RDLSpecDependencyTerm createStateDependencyTerm(String wIdName, String scId) { + RDLSpecDependencyTerm stateDependencyTerm; + + stateDependencyTerm = createNestedDependencyTermFromTerm(createDependencyTerm("wState", false, "wId", true, wIdName), "scId", true, scId); + + return stateDependencyTerm; + } + + // [[columnValue : columnNo -> columnNum, key -> curKey] : tableId -> tableIdName] ex: [[columnValue : columnNo -> "0", key -> curKey] : tableId -> "顧客"] + public RDLSpecDependencyTerm createColumnValueDependencyTerm(String columnNum, String tableIdName) { + RDLSpecDependencyTerm tableOutsideDependencyTerm; + RDLSpecDependencyTerm tableInsideDependencyTerm = createDependencyTerm("columnValue", false, "columnNo", false, columnNum, "key", false, "curKey"); + tableOutsideDependencyTerm = createNestedDependencyTermFromTerm(tableInsideDependencyTerm, "tableId", false, tableIdName); + + return tableOutsideDependencyTerm; + } + + // [depending : depended01 -> constantArgument01, depended02 -> constantArgument02] + public RDLSpecDependencyTerm createDependencyTerm(String depending, boolean isDependingPrimed, String depended01, boolean isDependedPrimed01, String constantArgument, String depended02, boolean isDependedPrimed02, String ResourceArgument) { + RDLSpecDependencyTerm dependencyTerm; + List dependedList = createDependedResourcesList(depended01, isDependedPrimed01, depended02, isDependedPrimed02); + List argumentsList = createConstantArgumentList(constantArgument, depended01); + argumentsList.add(getResource(ResourceArgument)); + dependencyTerm = new RDLSpecDependencyTerm(getResource(depending, isDependingPrimed), dependedList, argumentsList); + + return dependencyTerm; + } + +} diff --git a/src/main/java/org/ntlab/rdlcanvas/generaterdl/AppSpecificEventHandler.java b/src/main/java/org/ntlab/rdlcanvas/generaterdl/AppSpecificEventHandler.java new file mode 100644 index 0000000..1ca9712 --- /dev/null +++ b/src/main/java/org/ntlab/rdlcanvas/generaterdl/AppSpecificEventHandler.java @@ -0,0 +1,63 @@ +package org.ntlab.rdlcanvas.generaterdl; + +import org.ntlab.rdlcanvas.models.*; + +import java.util.List; + +public class AppSpecificEventHandler extends AppSpecific { + + public AppSpecificEventHandler() { + addEquationFormula(createChangedScreenEquation("editButton", "一覧画面", "編集画面")); + addEquationFormula(createChangedScreenEquation("updateButton", "編集画面", "一覧画面")); + addEquationFormula(createChangedColumnValueEquationByClicked("0", "顧客", "editButton", "編集画面", "wText", "nameInput", "編集画面")); + } + + //ex: [depending : dependedTerm -> constantArgument] + private RDLSpecDependencyTerm createNestedDependencyTermFromTerm(String depending, boolean isDependingPrimed, RDLSpecEvaluatableTerm dependedTerm, String constantArgument) { + RDLSpecDependencyTerm dependencyTerm; + + List dependedList = List.of(dependedTerm); + List argumentsList = List.of(spec.getConstant(constantArgument, RDLSpecLang.typeString)); + dependencyTerm = new RDLSpecDependencyTerm(getResource(depending, isDependingPrimed), dependedList, argumentsList); + return dependencyTerm; + } + + //ex: [[curScId' : [[wState : wId' -> "editButton"] : scId` -> "一覧画面"] -> "clicked"] = "編集画面" + private RDLSpecEquationFormula createChangedScreenEquation(String wId, String curScId, String nextScId) { + RDLSpecEquationFormula equationFormula; + RDLSpecDependencyTerm dependedStateDependencyTerm = createStateDependencyTerm(wId, curScId); + RDLSpecDependencyTerm curScreenDependencyTerm = createNestedDependencyTermFromTerm("curScId", true, dependedStateDependencyTerm, "clicked"); + + equationFormula = new RDLSpecEquationFormula(curScreenDependencyTerm, spec.getConstant(nextScId, RDLSpecLang.typeString)); + + return equationFormula; + } + + //ex: [[[columnValue : columnNo -> 0, key -> curKey] : tableId -> "顧客"] : [[wState : wid' -> "updateButton"] : scId' -> "編集画面"] -> "clicked"] = [[wText : wId' -> "nameInput"] : scId' -> curScId] + private RDLSpecEquationFormula createChangedColumnValueEquationByClicked(String columnNum, String tableIdName, String stateWIdName, String stateCurScIdName, String metaIdName, String metaWIdName, String metaCurScIdName) { + RDLSpecEquationFormula equationFormula; + RDLSpecDependencyTerm columnValueDependencyTerm = createColumnValueDependencyTerm(columnNum, tableIdName); + RDLSpecDependencyTerm dependedStateDependencyTerm = createStateDependencyTerm(stateWIdName, stateCurScIdName); + RDLSpecDependencyTerm leftTerm = new RDLSpecDependencyTerm(columnValueDependencyTerm, List.of(dependedStateDependencyTerm), List.of(spec.getConstant("clicked", RDLSpecLang.typeString))); + RDLSpecDependencyTerm rightTerm = createWidgetMetaIdDependencyTerm(metaIdName, metaWIdName, metaCurScIdName, true); + + equationFormula = new RDLSpecEquationFormula(leftTerm, rightTerm); + + return equationFormula; + } + + //ex: [[wText : wId' -> "memoInput"] : scId' -> "メモ編集画面"] : [[wState : wId' -> "editButton"] : scId' -> "メモ編集画面"] -> "clicked"] = [[wText : wId' -> "memo"] : scId' -> "メモ表示画面"] + private RDLSpecEquationFormula createChangedWidgetTextOverScreenEquationByClicked(String changedMetaIdName, String changedWIdName, String changedScIdName, String triggerWIdName, String triggerScIdName, String metaIdName, String wIdName, String scIdName) { + RDLSpecEquationFormula equationFormula; + RDLSpecDependencyTerm changedWidgetMetaIdDependencyTerm = createWidgetMetaIdDependencyTerm(changedMetaIdName, changedWIdName, changedScIdName, true); + RDLSpecDependencyTerm dependedStateDependencyTerm = createStateDependencyTerm(triggerWIdName, triggerScIdName); + RDLSpecDependencyTerm leftTerm = new RDLSpecDependencyTerm(changedWidgetMetaIdDependencyTerm, List.of(dependedStateDependencyTerm), List.of(spec.getConstant("clicked", RDLSpecLang.typeString))); + RDLSpecDependencyTerm rightTerm = createWidgetMetaIdDependencyTerm(metaIdName, wIdName, scIdName, true); + + equationFormula = new RDLSpecEquationFormula(leftTerm, rightTerm); + + return equationFormula; + + } + +} diff --git a/src/main/java/org/ntlab/rdlcanvas/generaterdl/AppSpecificInitialValue.java b/src/main/java/org/ntlab/rdlcanvas/generaterdl/AppSpecificInitialValue.java new file mode 100644 index 0000000..c795ad8 --- /dev/null +++ b/src/main/java/org/ntlab/rdlcanvas/generaterdl/AppSpecificInitialValue.java @@ -0,0 +1,35 @@ +package org.ntlab.rdlcanvas.generaterdl; + + +import org.ntlab.rdlcanvas.models.RDLSpecDependencyTerm; +import org.ntlab.rdlcanvas.models.RDLSpecEquationFormula; + +public class AppSpecificInitialValue extends AppSpecific { + + public AppSpecificInitialValue() { + addEquationFormula(createWidgetEquationWithColumnValue("wText", "nameInput", "編集画面", false , "0", "顧客")); + addEquationFormula(createWidgetEquationWithColumnValue("wText", "nameInput", "編集画面", true, "0", "顧客")); + } + + // [[metaId : wId -> wIdName] : scId -> scIdName] = [[columnValue : columnNo -> columnNum, key -> curKey] : tabled -> tableIdName] + private RDLSpecEquationFormula createWidgetEquationWithColumnValue(String metaId, String wIdName, String scIdName, boolean Primed, String columnNum, String tableIdName) { + RDLSpecEquationFormula equationFormula; + RDLSpecDependencyTerm widgetDependencyTerm; + + if (Primed) { + widgetDependencyTerm = createWidgetMetaIdDependencyTerm(metaId, wIdName, scIdName, true); + } else { + widgetDependencyTerm = createWidgetMetaIdDependencyTerm(metaId, wIdName, scIdName, false); + } + RDLSpecDependencyTerm columnValueDependencyTerm = createColumnValueDependencyTerm(columnNum, tableIdName); + + + equationFormula = new RDLSpecEquationFormula(widgetDependencyTerm, columnValueDependencyTerm); + return equationFormula; + } + + + + + +} diff --git a/src/main/java/org/ntlab/rdlcanvas/generaterdl/AppSpecificScreen.java b/src/main/java/org/ntlab/rdlcanvas/generaterdl/AppSpecificScreen.java new file mode 100644 index 0000000..f19f66d --- /dev/null +++ b/src/main/java/org/ntlab/rdlcanvas/generaterdl/AppSpecificScreen.java @@ -0,0 +1,53 @@ +package org.ntlab.rdlcanvas.generaterdl; + +import org.ntlab.rdlcanvas.models.*; +import org.ntlab.rdlcanvas.parser.JsonValue; +import org.ntlab.rdlcanvas.parser.StringValue; +import org.ntlab.rdlcanvas.parser.Value; + +import java.util.Map; + +public class AppSpecificScreen extends AppSpecific { + + // parser済みのJsonを引数とする + public AppSpecificScreen(JsonValue value) { + System.out.println(value.toString()); + addScreenRDL(value); + } + + // Jsonを構成するデータを抽出する + private void addScreenRDL(JsonValue value) { + + Map screenMap = value.getKeyToValue(); + + for (StringValue key1 : screenMap.keySet()) { + String scIdString = key1.getStringValue(); //ScreenIDをStringValue(key1)からStringに変換 + Value widgets = screenMap.get(key1); + Map widgetMap = ((org.ntlab.rdlcanvas.parser.JsonValue) widgets).getKeyToValue(); + + for (StringValue key2 : widgetMap.keySet()) { + String wIdString = key2.getStringValue(); //widgetIDをStringValue(key2)からStringに変換 + Value metas = widgetMap.get(key2); + Map metaMap = ((org.ntlab.rdlcanvas.parser.JsonValue) metas).getKeyToValue(); + + for (StringValue key3 : metaMap.keySet()) { + String metaIdString = key3.getStringValue(); //MetaIDをStringValue(key3)からStringへ変換 + Value data = metaMap.get(key3); //Dataを取得 +// System.out.println(metaIdString); + addInitializationFormula(createScreenInitialization(metaIdString, wIdString, scIdString, false, data)); + } + } + } + } + + + //ex [[wText : wId -> "editBotton"] : scId -> "一覧画面"] := "編集" + private RDLSpecInitialization createScreenInitialization(String metaId, String wIdName, String scIdName, boolean isPrimed, Value initializeValue) { + RDLSpecInitialization initialization; + RDLSpecDependencyTerm left = createWidgetMetaIdDependencyTerm(metaId, wIdName, scIdName, isPrimed); + + initialization = new RDLSpecInitialization(left, spec.getConstant(initializeValue.toString(), checkValueType(initializeValue))); + + return initialization; + } +} diff --git a/src/main/java/org/ntlab/rdlcanvas/generaterdl/AppSpecificTable.java b/src/main/java/org/ntlab/rdlcanvas/generaterdl/AppSpecificTable.java new file mode 100644 index 0000000..30cf199 --- /dev/null +++ b/src/main/java/org/ntlab/rdlcanvas/generaterdl/AppSpecificTable.java @@ -0,0 +1,71 @@ +package org.ntlab.rdlcanvas.generaterdl; + +import org.ntlab.rdlcanvas.models.*; +import org.ntlab.rdlcanvas.parser.ArrayValue; +import org.ntlab.rdlcanvas.parser.JsonValue; +import org.ntlab.rdlcanvas.parser.StringValue; +import org.ntlab.rdlcanvas.parser.Value; + +import java.util.List; +import java.util.Map; + +public class AppSpecificTable extends AppSpecific { + + public AppSpecificTable(JsonValue value) { + System.out.println(value.toString()); + addTableRDL(value); + } + + public void addTableRDL(JsonValue value) { + + Map tableMap = value.getKeyToValue(); + + + for (StringValue key1 : tableMap.keySet()) { + String tableNameString = key1.getStringValue(); + Value meta = tableMap.get(key1); + Map metaMap = ((org.ntlab.rdlcanvas.parser.JsonValue) meta).getKeyToValue(); + for (StringValue key2 : metaMap.keySet()) { + String metaIdString = key2.getStringValue(); + Value data = metaMap.get(key2); + + if (metaIdString.equals("keyName")) { + addEquationFormula(createKeyNameEquation(tableNameString, data)); + } else if (metaIdString.equals("columnName")) { + if (data instanceof ArrayValue) { + List dataList = ((ArrayValue) data).getValues(); + int index = 0; //columnNo用のindex + for (Value v : dataList) { + if (v instanceof StringValue) { + addEquationFormula(createColumnNameEquation(Integer.toString(index), tableNameString, v)); + } + index++; + } + } + } + } + } + + } + + //ex: [keyName : tableId -> "顧客"] = "顧客ID" + public RDLSpecEquationFormula createKeyNameEquation(String tableIdName, Value value) { + RDLSpecEquationFormula equationFormula; + RDLSpecDependencyTerm dependencyTerm = createDependencyTerm("keyName", false, "tableId", false, tableIdName); + + equationFormula = new RDLSpecEquationFormula(dependencyTerm, spec.getConstant(value.toString(), checkValueType(value))); + + return equationFormula; + } + + //ex: [columnName : columnNo -> 0] : tableId -> "顧客"] = "顧客名" + public RDLSpecEquationFormula createColumnNameEquation(String columnNum, String tableIdName, Value value) { + RDLSpecEquationFormula equationFormula; + RDLSpecDependencyTerm nestedDependencyTerm = createNestedDependencyTermFromTerm(createDependencyTerm("columnName", false, "columnNo", false, columnNum), "tableId", false, tableIdName); + + equationFormula = new RDLSpecEquationFormula(nestedDependencyTerm, spec.getConstant(value.toString(), checkValueType(value))); + + return equationFormula; + + } +} diff --git a/src/main/java/org/ntlab/rdlcanvas/generaterdl/AppUnique.java b/src/main/java/org/ntlab/rdlcanvas/generaterdl/AppUnique.java deleted file mode 100644 index ca8fb00..0000000 --- a/src/main/java/org/ntlab/rdlcanvas/generaterdl/AppUnique.java +++ /dev/null @@ -1,56 +0,0 @@ -package org.ntlab.rdlcanvas.generaterdl; - -import org.ntlab.rdlcanvas.models.RDLSpecDependencyTerm; -import org.ntlab.rdlcanvas.models.RDLSpecEvaluatableTerm; - -import java.util.List; - -public class AppUnique extends GeneratorBase { - - - public AppUnique() { - - } - - // [[metaId : wId -> wIdName] : scId -> scIdName] ex: [[wText : wId -> "editButton"] : scId -> "一覧画面"]] - public RDLSpecDependencyTerm createWidgetMetaIdDependencyTerm(String metaIdName, String wIdName, String scIdName, boolean Primed) { - RDLSpecDependencyTerm widgetDependencyTerm; - if (Primed) { - widgetDependencyTerm = createNestedDependencyTermFromTerm(createDependencyTerm(metaIdName, "wId", true, wIdName), "scId", true, scIdName); - } else { - widgetDependencyTerm = createNestedDependencyTermFromTerm(createDependencyTerm(metaIdName, "wId", false, wIdName), "scId", false, scIdName); - } - - return widgetDependencyTerm; - } - - //ex: [[wState : wId -> "editButton"] : scId -> "一覧画面"] - public RDLSpecDependencyTerm createStateDependencyTerm(String wIdName, String scId) { - RDLSpecDependencyTerm stateDependencyTerm; - - stateDependencyTerm = createNestedDependencyTermFromTerm(createDependencyTerm("wState", false, "wId", true, wIdName), "scId", true, scId); - - return stateDependencyTerm; - } - - // [[columnValue : columnNo -> columnNum, key -> curKey] : tableId -> tableIdName] ex: [[columnValue : columnNo -> "0", key -> curKey] : tableId -> "顧客"] - public RDLSpecDependencyTerm createColumnValueDependencyTerm(String columnNum, String tableIdName) { - RDLSpecDependencyTerm tableOutsideDependencyTerm; - RDLSpecDependencyTerm tableInsideDependencyTerm = createDependencyTerm("columnValue", false, "columnNo", false, columnNum, "key", false, "curKey"); - tableOutsideDependencyTerm = createNestedDependencyTermFromTerm(tableInsideDependencyTerm, "tableId", false, tableIdName); - - return tableOutsideDependencyTerm; - } - - // [depending : depended01 -> constantArgument01, depended02 -> constantArgument02] - public RDLSpecDependencyTerm createDependencyTerm(String depending, boolean isDependingPrimed, String depended01, boolean isDependedPrimed01, String constantArgument, String depended02, boolean isDependedPrimed02, String ResourceArgument) { - RDLSpecDependencyTerm dependencyTerm; - List dependedList = createDependedResourcesList(depended01, isDependedPrimed01, depended02, isDependedPrimed02); - List argumentsList = createConstantArgumentList(constantArgument, depended01); - argumentsList.add(getResource(ResourceArgument)); - dependencyTerm = new RDLSpecDependencyTerm(getResource(depending, isDependingPrimed), dependedList, argumentsList); - - return dependencyTerm; - } - -} diff --git a/src/main/java/org/ntlab/rdlcanvas/generaterdl/AppUniqueEventHandler.java b/src/main/java/org/ntlab/rdlcanvas/generaterdl/AppUniqueEventHandler.java deleted file mode 100644 index 56596c7..0000000 --- a/src/main/java/org/ntlab/rdlcanvas/generaterdl/AppUniqueEventHandler.java +++ /dev/null @@ -1,63 +0,0 @@ -package org.ntlab.rdlcanvas.generaterdl; - -import org.ntlab.rdlcanvas.models.*; - -import java.util.List; - -public class AppUniqueEventHandler extends AppUnique { - - public AppUniqueEventHandler() { - addEquationFormula(createChangedScreenEquation("editButton", "一覧画面", "編集画面")); - addEquationFormula(createChangedScreenEquation("updateButton", "編集画面", "一覧画面")); - addEquationFormula(createChangedColumnValueEquationByClicked("0", "顧客", "editButton", "編集画面", "wText", "nameInput", "編集画面")); - } - - //ex: [depending : dependedTerm -> constantArgument] - private RDLSpecDependencyTerm createNestedDependencyTermFromTerm(String depending, boolean isDependingPrimed, RDLSpecEvaluatableTerm dependedTerm, String constantArgument) { - RDLSpecDependencyTerm dependencyTerm; - - List dependedList = List.of(dependedTerm); - List argumentsList = List.of(spec.getConstant(constantArgument, RDLSpecLang.typeString)); - dependencyTerm = new RDLSpecDependencyTerm(getResource(depending, isDependingPrimed), dependedList, argumentsList); - return dependencyTerm; - } - - //ex: [[curScId' : [[wState : wId' -> "editButton"] : scId` -> "一覧画面"] -> "clicked"] = "編集画面" - private RDLSpecEquationFormula createChangedScreenEquation(String wId, String curScId, String nextScId) { - RDLSpecEquationFormula equationFormula; - RDLSpecDependencyTerm dependedStateDependencyTerm = createStateDependencyTerm(wId, curScId); - RDLSpecDependencyTerm curScreenDependencyTerm = createNestedDependencyTermFromTerm("curScId", true, dependedStateDependencyTerm, "clicked"); - - equationFormula = new RDLSpecEquationFormula(curScreenDependencyTerm, spec.getConstant(nextScId, RDLSpecLang.typeString)); - - return equationFormula; - } - - //ex: [[[columnValue : columnNo -> 0, key -> curKey] : tableId -> "顧客"] : [[wState : wid' -> "updateButton"] : scId' -> "編集画面"] -> "clicked"] = [[wText : wId' -> "nameInput"] : scId' -> curScId] - private RDLSpecEquationFormula createChangedColumnValueEquationByClicked(String columnNum, String tableIdName, String stateWIdName, String stateCurScIdName, String metaIdName, String metaWIdName, String metaCurScIdName) { - RDLSpecEquationFormula equationFormula; - RDLSpecDependencyTerm columnValueDependencyTerm = createColumnValueDependencyTerm(columnNum, tableIdName); - RDLSpecDependencyTerm dependedStateDependencyTerm = createStateDependencyTerm(stateWIdName, stateCurScIdName); - RDLSpecDependencyTerm leftTerm = new RDLSpecDependencyTerm(columnValueDependencyTerm, List.of(dependedStateDependencyTerm), List.of(spec.getConstant("clicked", RDLSpecLang.typeString))); - RDLSpecDependencyTerm rightTerm = createWidgetMetaIdDependencyTerm(metaIdName, metaWIdName, metaCurScIdName, true); - - equationFormula = new RDLSpecEquationFormula(leftTerm, rightTerm); - - return equationFormula; - } - - //ex: [[wText : wId' -> "memoInput"] : scId' -> "メモ編集画面"] : [[wState : wId' -> "editButton"] : scId' -> "メモ編集画面"] -> "clicked"] = [[wText : wId' -> "memo"] : scId' -> "メモ表示画面"] - private RDLSpecEquationFormula createChangedWidgetTextOverScreenEquationByClicked(String changedMetaIdName, String changedWIdName, String changedScIdName, String triggerWIdName, String triggerScIdName, String metaIdName, String wIdName, String scIdName) { - RDLSpecEquationFormula equationFormula; - RDLSpecDependencyTerm changedWidgetMetaIdDependencyTerm = createWidgetMetaIdDependencyTerm(changedMetaIdName, changedWIdName, changedScIdName, true); - RDLSpecDependencyTerm dependedStateDependencyTerm = createStateDependencyTerm(triggerWIdName, triggerScIdName); - RDLSpecDependencyTerm leftTerm = new RDLSpecDependencyTerm(changedWidgetMetaIdDependencyTerm, List.of(dependedStateDependencyTerm), List.of(spec.getConstant("clicked", RDLSpecLang.typeString))); - RDLSpecDependencyTerm rightTerm = createWidgetMetaIdDependencyTerm(metaIdName, wIdName, scIdName, true); - - equationFormula = new RDLSpecEquationFormula(leftTerm, rightTerm); - - return equationFormula; - - } - -} diff --git a/src/main/java/org/ntlab/rdlcanvas/generaterdl/AppUniqueInitialValue.java b/src/main/java/org/ntlab/rdlcanvas/generaterdl/AppUniqueInitialValue.java deleted file mode 100644 index 5770f3d..0000000 --- a/src/main/java/org/ntlab/rdlcanvas/generaterdl/AppUniqueInitialValue.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.ntlab.rdlcanvas.generaterdl; - - -import org.ntlab.rdlcanvas.models.RDLSpecDependencyTerm; -import org.ntlab.rdlcanvas.models.RDLSpecEquationFormula; - -public class AppUniqueInitialValue extends AppUnique { - - public AppUniqueInitialValue() { - addEquationFormula(createWidgetEquationWithColumnValue("wText", "nameInput", "編集画面", false , "0", "顧客")); - addEquationFormula(createWidgetEquationWithColumnValue("wText", "nameInput", "編集画面", true, "0", "顧客")); - } - - // [[metaId : wId -> wIdName] : scId -> scIdName] = [[columnValue : columnNo -> columnNum, key -> curKey] : tabled -> tableIdName] - private RDLSpecEquationFormula createWidgetEquationWithColumnValue(String metaId, String wIdName, String scIdName, boolean Primed, String columnNum, String tableIdName) { - RDLSpecEquationFormula equationFormula; - RDLSpecDependencyTerm widgetDependencyTerm; - - if (Primed) { - widgetDependencyTerm = createWidgetMetaIdDependencyTerm(metaId, wIdName, scIdName, true); - } else { - widgetDependencyTerm = createWidgetMetaIdDependencyTerm(metaId, wIdName, scIdName, false); - } - RDLSpecDependencyTerm columnValueDependencyTerm = createColumnValueDependencyTerm(columnNum, tableIdName); - - - equationFormula = new RDLSpecEquationFormula(widgetDependencyTerm, columnValueDependencyTerm); - return equationFormula; - } - - - - - -} diff --git a/src/main/java/org/ntlab/rdlcanvas/generaterdl/AppUniqueScreen.java b/src/main/java/org/ntlab/rdlcanvas/generaterdl/AppUniqueScreen.java deleted file mode 100644 index caa3751..0000000 --- a/src/main/java/org/ntlab/rdlcanvas/generaterdl/AppUniqueScreen.java +++ /dev/null @@ -1,53 +0,0 @@ -package org.ntlab.rdlcanvas.generaterdl; - -import org.ntlab.rdlcanvas.models.*; -import org.ntlab.rdlcanvas.parser.JsonValue; -import org.ntlab.rdlcanvas.parser.StringValue; -import org.ntlab.rdlcanvas.parser.Value; - -import java.util.Map; - -public class AppUniqueScreen extends AppUnique { - - // parser済みのJsonを引数とする - public AppUniqueScreen(JsonValue value) { - System.out.println(value.toString()); - addScreenRDL(value); - } - - // Jsonを構成するデータを抽出する - private void addScreenRDL(JsonValue value) { - - Map screenMap = value.getKeyToValue(); - - for (StringValue key1 : screenMap.keySet()) { - String scIdString = key1.getStringValue(); //ScreenIDをStringValue(key1)からStringに変換 - Value widgets = screenMap.get(key1); - Map widgetMap = ((org.ntlab.rdlcanvas.parser.JsonValue) widgets).getKeyToValue(); - - for (StringValue key2 : widgetMap.keySet()) { - String wIdString = key2.getStringValue(); //widgetIDをStringValue(key2)からStringに変換 - Value metas = widgetMap.get(key2); - Map metaMap = ((org.ntlab.rdlcanvas.parser.JsonValue) metas).getKeyToValue(); - - for (StringValue key3 : metaMap.keySet()) { - String metaIdString = key3.getStringValue(); //MetaIDをStringValue(key3)からStringへ変換 - Value data = metaMap.get(key3); //Dataを取得 -// System.out.println(metaIdString); - addInitializationFormula(createScreenInitialization(metaIdString, wIdString, scIdString, false, data)); - } - } - } - } - - - //ex [[wText : wId -> "editBotton"] : scId -> "一覧画面"] := "編集" - private RDLSpecInitialization createScreenInitialization(String metaId, String wIdName, String scIdName, boolean isPrimed, Value initializeValue) { - RDLSpecInitialization initialization; - RDLSpecDependencyTerm left = createWidgetMetaIdDependencyTerm(metaId, wIdName, scIdName, isPrimed); - - initialization = new RDLSpecInitialization(left, spec.getConstant(initializeValue.toString(), checkValueType(initializeValue))); - - return initialization; - } -} diff --git a/src/main/java/org/ntlab/rdlcanvas/generaterdl/AppUniqueTable.java b/src/main/java/org/ntlab/rdlcanvas/generaterdl/AppUniqueTable.java deleted file mode 100644 index e1f5adc..0000000 --- a/src/main/java/org/ntlab/rdlcanvas/generaterdl/AppUniqueTable.java +++ /dev/null @@ -1,71 +0,0 @@ -package org.ntlab.rdlcanvas.generaterdl; - -import org.ntlab.rdlcanvas.models.*; -import org.ntlab.rdlcanvas.parser.ArrayValue; -import org.ntlab.rdlcanvas.parser.JsonValue; -import org.ntlab.rdlcanvas.parser.StringValue; -import org.ntlab.rdlcanvas.parser.Value; - -import java.util.List; -import java.util.Map; - -public class AppUniqueTable extends AppUnique { - - public AppUniqueTable(JsonValue value) { - System.out.println(value.toString()); - addTableRDL(value); - } - - public void addTableRDL(JsonValue value) { - - Map tableMap = value.getKeyToValue(); - - - for (StringValue key1 : tableMap.keySet()) { - String tableNameString = key1.getStringValue(); - Value meta = tableMap.get(key1); - Map metaMap = ((org.ntlab.rdlcanvas.parser.JsonValue) meta).getKeyToValue(); - for (StringValue key2 : metaMap.keySet()) { - String metaIdString = key2.getStringValue(); - Value data = metaMap.get(key2); - - if (metaIdString.equals("keyName")) { - addEquationFormula(createKeyNameEquation(tableNameString, data)); - } else if (metaIdString.equals("columnName")) { - if (data instanceof ArrayValue) { - List dataList = ((ArrayValue) data).getValues(); - int index = 0; //columnNo用のindex - for (Value v : dataList) { - if (v instanceof StringValue) { - addEquationFormula(createColumnNameEquation(Integer.toString(index), tableNameString, v)); - } - index++; - } - } - } - } - } - - } - - //ex: [keyName : tableId -> "顧客"] = "顧客ID" - public RDLSpecEquationFormula createKeyNameEquation(String tableIdName, Value value) { - RDLSpecEquationFormula equationFormula; - RDLSpecDependencyTerm dependencyTerm = createDependencyTerm("keyName", false, "tableId", false, tableIdName); - - equationFormula = new RDLSpecEquationFormula(dependencyTerm, spec.getConstant(value.toString(), checkValueType(value))); - - return equationFormula; - } - - //ex: [columnName : columnNo -> 0] : tableId -> "顧客"] = "顧客名" - public RDLSpecEquationFormula createColumnNameEquation(String columnNum, String tableIdName, Value value) { - RDLSpecEquationFormula equationFormula; - RDLSpecDependencyTerm nestedDependencyTerm = createNestedDependencyTermFromTerm(createDependencyTerm("columnName", false, "columnNo", false, columnNum), "tableId", false, tableIdName); - - equationFormula = new RDLSpecEquationFormula(nestedDependencyTerm, spec.getConstant(value.toString(), checkValueType(value))); - - return equationFormula; - - } -} diff --git a/src/main/java/org/ntlab/rdlcanvas/generaterdl/RDLGenerator.java b/src/main/java/org/ntlab/rdlcanvas/generaterdl/RDLGenerator.java index 5665b5a..c1925d6 100644 --- a/src/main/java/org/ntlab/rdlcanvas/generaterdl/RDLGenerator.java +++ b/src/main/java/org/ntlab/rdlcanvas/generaterdl/RDLGenerator.java @@ -15,7 +15,7 @@ public RDLGenerator(final BufferedReader reader) { GeneratorBase.resetSpec(); generateMetaAppRDL(); - generateUniqueAppRDL(reader); + generateSpecificAppRDL(reader); } //メタアプリケーション仕様 @@ -26,15 +26,15 @@ } //アプリケーション固有仕様 - private void generateUniqueAppRDL(BufferedReader reader) { + private void generateSpecificAppRDL(BufferedReader reader) { Parser parser = new Parser(reader); //JsonValueを取得 JsonValue jsonValue = parser.parseJsonValue(); - AppUniqueScreen appUniqueScreen = new AppUniqueScreen((JsonValue) jsonValue.getValue(VALUE_KEY_SCREEN)); - AppUniqueTable appUniqueTable = new AppUniqueTable((JsonValue) jsonValue.getValue(VALUE_KEY_TABLE)); - AppUniqueInitialValue appUniqueInitialValue = new AppUniqueInitialValue(); - AppUniqueEventHandler appUniqueEventHandler = new AppUniqueEventHandler(); + AppSpecificScreen appSpecificScreen = new AppSpecificScreen((JsonValue) jsonValue.getValue(VALUE_KEY_SCREEN)); + AppSpecificTable appSpecificTable = new AppSpecificTable((JsonValue) jsonValue.getValue(VALUE_KEY_TABLE)); + AppSpecificInitialValue appSpecificInitialValue = new AppSpecificInitialValue(); + AppSpecificEventHandler appSpecificEventHandler = new AppSpecificEventHandler(); }