diff --git a/src/main/java/org/ntlab/rdlcanvas/generaterdl/BaseGenerateRDL.java b/src/main/java/org/ntlab/rdlcanvas/generaterdl/BaseGenerateRDL.java index e7a142e..31c1f27 100644 --- a/src/main/java/org/ntlab/rdlcanvas/generaterdl/BaseGenerateRDL.java +++ b/src/main/java/org/ntlab/rdlcanvas/generaterdl/BaseGenerateRDL.java @@ -19,15 +19,15 @@ } // [depending: insideDependedId -> insideArguments] : outsideDependedId -> outsideArguments] - public RDLSpecDependencyTerm createNestDependencyTerm(RDLSpec spec, String depending, String insideDependedId, boolean insideDependedIdPrime, String insideArgument, String outsideDependedId, boolean outsideDependedIdPrime, String outsideArgument){ + public RDLSpecDependencyTerm createNestedDependencyTerm(RDLSpec spec, String depending, String insideDependedId, boolean insideDependedIdPrime, String insideArgument, String outsideDependedId, boolean outsideDependedIdPrime, String outsideArgument){ ArrayList insideDependedResourceList = new ArrayList<>(); ArrayList insideArgumentsList = new ArrayList<>(); ArrayList outsideDependedResourceList = new ArrayList<>(); ArrayList outsideArgumentsList = new ArrayList<>(); - insideArgumentsList.add(spec.getConstant(insideArgument, RDLSpecLang.typeString)); - outsideArgumentsList.add(spec.getConstant(outsideArgument, RDLSpecLang.typeString)); + insideArgumentsList.add(spec.getConstant(insideArgument, spec.getRDLSpecResourceDeclaration(insideDependedId).getResource().getValueType())); + outsideArgumentsList.add(spec.getConstant(outsideArgument, spec.getRDLSpecResourceDeclaration(outsideDependedId).getResource().getValueType())); if(insideDependedIdPrime){ insideDependedResourceList.add(spec.getRDLSpecResourceDeclaration(insideDependedId).getPrimedResource()); diff --git a/src/main/java/org/ntlab/rdlcanvas/generaterdl/ScreenGenerateRDL.java b/src/main/java/org/ntlab/rdlcanvas/generaterdl/ScreenGenerateRDL.java index a319c92..b1296ae 100644 --- a/src/main/java/org/ntlab/rdlcanvas/generaterdl/ScreenGenerateRDL.java +++ b/src/main/java/org/ntlab/rdlcanvas/generaterdl/ScreenGenerateRDL.java @@ -44,7 +44,7 @@ //ex [[wText : wId -> "editBotton"] : scId -> "一覧画面"] := "編集" private void addScreenDefinition(RDLSpec spec, String depending, String insideDependedId, boolean insideDependedIdPrime, String insideArgument, String outsideDependedId, boolean outsideDependedIdPrime, String outsideArguments, Value initializeValue){ - RDLSpecDependencyTerm left = createNestDependencyTerm(spec, depending, insideDependedId, insideDependedIdPrime, insideArgument, outsideDependedId,outsideDependedIdPrime, outsideArguments); + RDLSpecDependencyTerm left = createNestedDependencyTerm(spec, depending, insideDependedId, insideDependedIdPrime, insideArgument, outsideDependedId,outsideDependedIdPrime, outsideArguments); spec.addRDLSpecStatement(new RDLSpecInitialization(left, spec.getConstant(initializeValue.toString(), checkValueType(initializeValue)))); } }