diff --git a/src/main/java/org/ntlab/rdlcanvas/generaterdl/MetaScreenViewGenerateRDL.java b/src/main/java/org/ntlab/rdlcanvas/generaterdl/MetaScreenViewGenerateRDL.java index 7bf6050..3d697cd 100644 --- a/src/main/java/org/ntlab/rdlcanvas/generaterdl/MetaScreenViewGenerateRDL.java +++ b/src/main/java/org/ntlab/rdlcanvas/generaterdl/MetaScreenViewGenerateRDL.java @@ -19,7 +19,7 @@ addResourceDeclaration(spec, "curWId", 1, StructuralType.id, RDLSpecLang.typeString); addResourceDeclaration(spec, "curWText", 1, RDLSpecLang.typeString); addResourceDeclaration(spec, "curWState", 1, RDLSpecLang.typeString); - addResourceDeclaration(spec, "curScId", 1, StructuralType.id, RDLSpecLang.typeString); + addResourceDeclaration(spec, "curScId", 0, StructuralType.id, RDLSpecLang.typeString); } diff --git a/src/main/java/org/ntlab/rdlcanvas/generaterdl/ScreenGenerateRDL.java b/src/main/java/org/ntlab/rdlcanvas/generaterdl/ScreenGenerateRDL.java index 065243b..6732c4e 100644 --- a/src/main/java/org/ntlab/rdlcanvas/generaterdl/ScreenGenerateRDL.java +++ b/src/main/java/org/ntlab/rdlcanvas/generaterdl/ScreenGenerateRDL.java @@ -8,9 +8,6 @@ public class ScreenGenerateRDL{ - //-> RDLSpecStatementのリストにすべて入れる - - // parser済みのJsonを引数とする public ScreenGenerateRDL(Value value, RDLSpec spec){ createScreenConstant(value, spec); @@ -34,7 +31,7 @@ for (StringValue key3 : metamap.keySet()){ String metaIdString = key3.getStringValue(); //MetaIDをStringValue(key3)からStringへ変換 Value data = metamap.get(key3); //Dataを取得 - createScreenDefinition(scIdString, wIdString, metaIdString, data, spec); + addScreenDefinition(scIdString, wIdString, metaIdString, data, spec); } } } @@ -53,8 +50,8 @@ return RDLSpecLang.typeDouble; } - //ex [wText : wId -> "editBotton"] : scId -> "一覧画面"] := "編集" - private void createScreenDefinition(String scIdName, String wIdName, String metaIdName, Value dataName, RDLSpec spec){ + //ex [[wText : wId -> "editBotton"] : scId -> "一覧画面"] := "編集" + private void addScreenDefinition(String scIdName, String wIdName, String metaIdName, Value dataName, RDLSpec spec){ RDLSpecDependencyTerm insideDependencyTerm = new RDLSpecDependencyTerm(spec.getConstant(metaIdName, RDLSpecLang.typeString), new ArrayList<>(Arrays.asList(spec.getRDLSpecResourceDeclaration("wId").getResource())), new ArrayList<>(Arrays.asList(spec.getConstant(wIdName, RDLSpecLang.typeString)))); RDLSpecDependencyTerm outsideDependencyTerm = new RDLSpecDependencyTerm(insideDependencyTerm, new ArrayList<>(Arrays.asList(spec.getRDLSpecResourceDeclaration("scId").getResource())), new ArrayList<>(Arrays.asList(spec.getConstant(scIdName, RDLSpecLang.typeString)))); spec.addRDLSpecStatement(new RDLSpecInitialization(outsideDependencyTerm, spec.getConstant(dataName.toString(), checkValueType(dataName))));