diff --git a/src/main/java/org/ntlab/rdlcanvas/Main.java b/src/main/java/org/ntlab/rdlcanvas/Main.java index 2ab9946..3834ddd 100644 --- a/src/main/java/org/ntlab/rdlcanvas/Main.java +++ b/src/main/java/org/ntlab/rdlcanvas/Main.java @@ -11,7 +11,7 @@ public class Main { public static void main(String[] args) { - File file = new File("models/screen-wighet-sample.json"); + File file = new File("models/screen-table-sample.json"); try { BufferedReader reader = new BufferedReader(new FileReader(file)); diff --git a/src/main/java/org/ntlab/rdlcanvas/generaterdl/MetaScreenViewRDLGenerator.java b/src/main/java/org/ntlab/rdlcanvas/generaterdl/MetaScreenViewRDLGenerator.java index ee0a65e..4a474c4 100644 --- a/src/main/java/org/ntlab/rdlcanvas/generaterdl/MetaScreenViewRDLGenerator.java +++ b/src/main/java/org/ntlab/rdlcanvas/generaterdl/MetaScreenViewRDLGenerator.java @@ -4,15 +4,15 @@ import java.util.List; -public class MetaScreenViewRDLGenerator extends RDLGeneratorBase{ +public class MetaScreenViewRDLGenerator extends RDLGeneratorBase { - public MetaScreenViewRDLGenerator(){ + public MetaScreenViewRDLGenerator() { addScreenViewResourceDeclaration(); addScreenViewDependencyFormula(); addEquationFormula(createScreenViewEquationFormula()); } - private void addScreenViewResourceDeclaration(){ + private void addScreenViewResourceDeclaration() { // ex curWidget(1)::struct addResourceDeclaration("curWidget", 1, StructuralType.structure, null); @@ -23,7 +23,7 @@ } - private void addScreenViewDependencyFormula(){ + private void addScreenViewDependencyFormula() { // ex curWidget:curWId addDependencyFormula(createElementPairDependency("curWidget", "curWId", false)); @@ -34,7 +34,7 @@ } // curWidget = [[widget:wId->curWId]:scId->curScId, curWId->curWId] - private RDLSpecEquationFormula createScreenViewEquationFormula(){ + private RDLSpecEquationFormula createScreenViewEquationFormula() { RDLSpecEquationFormula equationFormula; List insideDependedList = createDependedResourceList("wId", false); diff --git a/src/main/java/org/ntlab/rdlcanvas/generaterdl/RDLGenerator.java b/src/main/java/org/ntlab/rdlcanvas/generaterdl/RDLGenerator.java index 26900ce..45da2d3 100644 --- a/src/main/java/org/ntlab/rdlcanvas/generaterdl/RDLGenerator.java +++ b/src/main/java/org/ntlab/rdlcanvas/generaterdl/RDLGenerator.java @@ -12,34 +12,31 @@ final StringValue VALUE_KEY_SCREEN = new StringValue("screen"); final StringValue VALUE_KEY_TABLE = new StringValue("table"); - public RDLGenerator(final BufferedReader reader){ + public RDLGenerator(final BufferedReader reader) { RDLGeneratorBase.resetSpec(); generateMetaAppRDL(); generateUniqueAppRDL(reader); } //メタアプリケーション仕様 - private void generateMetaAppRDL(){ + private void generateMetaAppRDL() { MetaScreenRDLGenerator metaScreenRDLGenerator = new MetaScreenRDLGenerator(); - MetaTableRDLGenerator metaTableRDLGenerator =new MetaTableRDLGenerator(); + MetaTableRDLGenerator metaTableRDLGenerator = new MetaTableRDLGenerator(); MetaScreenViewRDLGenerator metaScreenViewRDLGenerator = new MetaScreenViewRDLGenerator(); } //アプリケーション固有仕様 - private void generateUniqueAppRDL(BufferedReader reader){ + private void generateUniqueAppRDL(BufferedReader reader) { Parser parser = new Parser(reader); - - //JsonをScreen部分とTable部分に分割 - //JsonValue jsonValue = parser.parseJsonValue(); - - -// ScreenGenerateRDL screenGenerateRDL = new ScreenGenerateRDL(jsonValue.getValue(STRING_VALUE_SCREEN), spec); -// TableGenerateRDL tableGenerateRDL = new TableGenerateRDL(separatedJson.table, spec); + //JsonValueを取得 + JsonValue jsonValue = parser.parseJsonValue(); + ScreenRDLGenerator screenRDLGenerator = new ScreenRDLGenerator((JsonValue) jsonValue.getValue(VALUE_KEY_SCREEN)); + TableRDLGenerator tableRDLGenerator = new TableRDLGenerator((JsonValue) jsonValue.getValue(VALUE_KEY_TABLE)); } - public RDLSpec getSpec(){ + public RDLSpec getSpec() { return RDLGeneratorBase.getSpec(); } } diff --git a/src/main/java/org/ntlab/rdlcanvas/generaterdl/RDLGeneratorBase.java b/src/main/java/org/ntlab/rdlcanvas/generaterdl/RDLGeneratorBase.java index 1e110b7..2968f7e 100644 --- a/src/main/java/org/ntlab/rdlcanvas/generaterdl/RDLGeneratorBase.java +++ b/src/main/java/org/ntlab/rdlcanvas/generaterdl/RDLGeneratorBase.java @@ -17,12 +17,12 @@ } //specの初期化 - public static void resetSpec(){ + public static void resetSpec() { spec = new RDLSpec(); } //specの取得 - public static RDLSpec getSpec(){ + public static RDLSpec getSpec() { return spec; } @@ -69,14 +69,14 @@ } // DependencyTerm用のArgumentリスト - public List createArgumentList(String argument, String dependedId){ + public List createArgumentList(String argument, String dependedId) { List argumentList = new ArrayList<>(); argumentList.add(spec.getConstant(argument, spec.getRDLSpecResourceDeclaration(dependedId).getResource().getValueType())); return argumentList; } - public List createArgumentsList(String argument01, String dependedId01, String argument02, String dependedId02){ + public List createArgumentsList(String argument01, String dependedId01, String argument02, String dependedId02) { List argumentsList = new ArrayList<>(); argumentsList.add(spec.getConstant(argument01, spec.getRDLSpecResourceDeclaration(dependedId01).getResource().getValueType())); argumentsList.add(spec.getConstant(argument02, spec.getRDLSpecResourceDeclaration(dependedId02).getResource().getValueType())); @@ -109,7 +109,7 @@ // [depending : insideDepended]:outsideDepended - public RDLSpecDependency createNestedDependency(String depending,String insideDepended, boolean insideDependedPrime, String outsideDepended, boolean outsideDependedPrime) { + public RDLSpecDependency createNestedDependency(String depending, String insideDepended, boolean insideDependedPrime, String outsideDepended, boolean outsideDependedPrime) { RDLSpecDependency nestedDependency; List insideDependedList = createDependedResourceList(insideDepended, insideDependedPrime); List outsideDependedList = createDependedResourceList(outsideDepended, outsideDependedPrime); @@ -132,7 +132,7 @@ } // [depending : insideDependedList] : outsideDependedList - public RDLSpecDependency createNestedDependencyFromList(String depending, List insideDependedList, List outsideDependedList){ + public RDLSpecDependency createNestedDependencyFromList(String depending, List insideDependedList, List outsideDependedList) { RDLSpecDependency nestedDependency; nestedDependency = new RDLSpecDependency(new RDLSpecDependency(spec.getRDLSpecResourceDeclaration(depending).getResource(), insideDependedList), outsideDependedList); @@ -141,9 +141,9 @@ } // [depending : depended -> argument] - public RDLSpecDependencyTerm createDependencyTerm(String depending, String depended, boolean dependedPrime, String argument){ + public RDLSpecDependencyTerm createDependencyTerm(String depending, String depended, boolean dependedPrime, String argument) { RDLSpecDependencyTerm dependencyTerm; - List dependedList = createDependedResourceList(depended, dependedPrime); + List dependedList = createDependedResourceList(depended, dependedPrime); List arguemntList = createArgumentList(argument, depended); dependencyTerm = new RDLSpecDependencyTerm(spec.getRDLSpecResourceDeclaration(depending).getResource(), dependedList, arguemntList); @@ -151,7 +151,7 @@ } // [depending : depended01 -> argument01, depended02 -> argument02] - public RDLSpecDependencyTerm createDependencyTerm(String depending, String depended01, boolean dependedPrime01, String argument01, String depended02, boolean dependedPrime02, String argument02){ + public RDLSpecDependencyTerm createDependencyTerm(String depending, String depended01, boolean dependedPrime01, String argument01, String depended02, boolean dependedPrime02, String argument02) { RDLSpecDependencyTerm dependencyTerm; List dependedList = createDependedResourcesList(depended01, dependedPrime01, depended02, dependedPrime02); List argumentList = createArgumentsList(argument01, depended01, argument02, depended02); @@ -161,14 +161,14 @@ } // [depending : dependedList -> argumentList] - public RDLSpecDependencyTerm createDependencyTermFromList(String depending, List depenededList, List argumentList){ + public RDLSpecDependencyTerm createDependencyTermFromList(String depending, List depenededList, List argumentList) { RDLSpecDependencyTerm dependencyTerm; dependencyTerm = new RDLSpecDependencyTerm(spec.getRDLSpecResourceDeclaration(depending).getResource(), depenededList, argumentList); return dependencyTerm; } // [(dependencyTerm) : depended -> argument] - public RDLSpecDependencyTerm createNestedDependencyTermFromTerm(RDLSpecEvaluatableTerm dependingTerm, String depended, boolean dependedPrime, String argument){ + public RDLSpecDependencyTerm createNestedDependencyTermFromTerm(RDLSpecEvaluatableTerm dependingTerm, String depended, boolean dependedPrime, String argument) { RDLSpecDependencyTerm dependencyTerm; List dependedList = createDependedResourceList(depended, dependedPrime); List argumentList = createArgumentList(argument, depended); @@ -178,25 +178,25 @@ } // [(dependencyTerm) : dependedList -> argumentList] - public RDLSpecDependencyTerm createNestedDependencyTermFromTerm(RDLSpecEvaluatableTerm dependingTerm, List depenededList, List argumentList){ + public RDLSpecDependencyTerm createNestedDependencyTermFromTerm(RDLSpecEvaluatableTerm dependingTerm, List depenededList, List argumentList) { RDLSpecDependencyTerm dependencyTerm; dependencyTerm = new RDLSpecDependencyTerm(dependingTerm, depenededList, argumentList); return dependencyTerm; } - public RDLSpecDependencyTerm createNestedDependencyTermFromTerm(RDLSpecEvaluatableTerm dependingTerm, String depended01, boolean dependedPrime01, String argument01, String depended02, boolean dependedPrime02, String argument02){ + public RDLSpecDependencyTerm createNestedDependencyTermFromTerm(RDLSpecEvaluatableTerm dependingTerm, String depended01, boolean dependedPrime01, String argument01, String depended02, boolean dependedPrime02, String argument02) { RDLSpecDependencyTerm dependencyTerm; List dependedList = createDependedResourcesList(depended01, dependedPrime01, depended02, dependedPrime02); List argumentList = createArgumentsList(argument01, depended01, argument02, depended02); dependencyTerm = new RDLSpecDependencyTerm(dependingTerm, dependedList, argumentList); - return dependencyTerm; + return dependencyTerm; } - // [depending: insideDependedId -> insideArguments] : outsideDependedId -> outsideArguments] - public RDLSpecDependencyTerm createNestedDependencyTerm(String depending, String insideDependedId, boolean insideDependedIdPrime,String insideArgument, String outsideDependedId, boolean outsideDependedIdPrime , String outsideArgument) { + // [depending: insideDependedId -> insideArguments] : outsideDependedId -> outsideArguments] + public RDLSpecDependencyTerm createNestedDependencyTerm(String depending, String insideDependedId, boolean insideDependedIdPrime, String insideArgument, String outsideDependedId, boolean outsideDependedIdPrime, String outsideArgument) { RDLSpecDependencyTerm insideDependencyTerm = createDependencyTerm(depending, insideDependedId, insideDependedIdPrime, insideArgument); List outsideDependedResourceList = createDependedResourceList(outsideDependedId, outsideDependedIdPrime); @@ -219,5 +219,10 @@ spec.addRDLSpecStatement(rdlSpecEquationFormula); } + public void addInitializationFormula(RDLSpecInitialization rdlInitializationFormula) { + + spec.addRDLSpecStatement(rdlInitializationFormula); + } + } diff --git a/src/main/java/org/ntlab/rdlcanvas/generaterdl/ScreenGenerateRDL.java b/src/main/java/org/ntlab/rdlcanvas/generaterdl/ScreenGenerateRDL.java deleted file mode 100644 index b1296ae..0000000 --- a/src/main/java/org/ntlab/rdlcanvas/generaterdl/ScreenGenerateRDL.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.ntlab.rdlcanvas.generaterdl; - -import org.ntlab.rdlcanvas.models.*; -import org.ntlab.rdlcanvas.parser.StringValue; -import org.ntlab.rdlcanvas.parser.Value; - -import java.util.*; - -public class ScreenGenerateRDL extends BaseGenerateRDL{ - - // parser済みのJsonを引数とする - public ScreenGenerateRDL(Value value, RDLSpec spec){ - //System.out.println(value.toString()); - addScreenRDL(value, spec); - } - - // Jsonを構成するデータを抽出する - private void addScreenRDL(Value value, RDLSpec spec){ - - Map screenMap = ((org.ntlab.rdlcanvas.parser.JsonValue)value).getJson(); - - 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).getJson(); - - 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).getJson(); - - for (StringValue key3 : metaMap.keySet()){ - String metaIdString = key3.getStringValue(); //MetaIDをStringValue(key3)からStringへ変換 - Value data = metaMap.get(key3); //Dataを取得 -// System.out.println(metaIdString); - addScreenDefinition(spec, metaIdString, "wId", false, wIdString, "scId", false, scIdString, data); - } - } - } - //spec.outputConstant(); //デバッグ用 Constantを出力 - } - - - //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 = createNestedDependencyTerm(spec, depending, insideDependedId, insideDependedIdPrime, insideArgument, outsideDependedId,outsideDependedIdPrime, outsideArguments); - spec.addRDLSpecStatement(new RDLSpecInitialization(left, spec.getConstant(initializeValue.toString(), checkValueType(initializeValue)))); - } -} diff --git a/src/main/java/org/ntlab/rdlcanvas/generaterdl/ScreenRDLGenerator.java b/src/main/java/org/ntlab/rdlcanvas/generaterdl/ScreenRDLGenerator.java new file mode 100644 index 0000000..768e22b --- /dev/null +++ b/src/main/java/org/ntlab/rdlcanvas/generaterdl/ScreenRDLGenerator.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 ScreenRDLGenerator extends RDLGeneratorBase { + + // parser済みのJsonを引数とする + public ScreenRDLGenerator(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, "wId", false, wIdString, "scId", false, scIdString, data)); + } + } + } + } + + + //ex [[wText : wId -> "editBotton"] : scId -> "一覧画面"] := "編集" + private RDLSpecInitialization createScreenInitialization(String depending, String insideDependedId, boolean insideDependedIdPrime, String insideArgument, String outsideDependedId, boolean outsideDependedIdPrime, String outsideArguments, Value initializeValue) { + + RDLSpecInitialization initialization; + RDLSpecDependencyTerm left = createNestedDependencyTerm(depending, insideDependedId, insideDependedIdPrime, insideArgument, outsideDependedId, outsideDependedIdPrime, outsideArguments); + initialization = new RDLSpecInitialization(left, spec.getConstant(initializeValue.toString(), checkValueType(initializeValue))); + + return initialization; + } +} diff --git a/src/main/java/org/ntlab/rdlcanvas/generaterdl/TableGenerateRDL.java b/src/main/java/org/ntlab/rdlcanvas/generaterdl/TableGenerateRDL.java deleted file mode 100644 index 15d5427..0000000 --- a/src/main/java/org/ntlab/rdlcanvas/generaterdl/TableGenerateRDL.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.ntlab.rdlcanvas.generaterdl; - -import org.ntlab.rdlcanvas.models.*; -import org.ntlab.rdlcanvas.parser.ArrayValue; -import org.ntlab.rdlcanvas.parser.StringValue; -import org.ntlab.rdlcanvas.parser.Value; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -public class TableGenerateRDL extends BaseGenerateRDL{ - - public TableGenerateRDL(Value value, RDLSpec spec){ - //System.out.println(value.toString()); - addTableRDL(value, spec); - } - - public void addTableRDL(Value value, RDLSpec spec){ - - Map tableMap = ((org.ntlab.rdlcanvas.parser.JsonValue)value).getJson(); - - - for(StringValue key1 : tableMap.keySet()){ - String tableNameString = key1.getStringValue(); - Value meta = tableMap.get(key1); - Map metaMap = ((org.ntlab.rdlcanvas.parser.JsonValue)meta).getJson(); - for(StringValue key2 : metaMap.keySet()){ - String metaIdString = key2.getStringValue(); - Value data = metaMap.get(key2); - - if(metaIdString.equals("keyName")){ - addDependencyEquationFormula(spec, metaIdString, "tableId", false, 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){ - addNestedDependencyEquationFormula(spec, metaIdString, "columnNo", false, Integer.toString(index), "tableId", false, tableNameString, v); - } - index ++; - } - } - } - } - } - - } - - //[depending : dependedId -> arguments] = value , ex [keyName : tableId -> "顧客"] = "顧客ID" - public void addDependencyEquationFormula(RDLSpec spec, String depending, String dependedId, boolean dependedIdPrime, String argument, Value corrValue){ - ArrayList dependedList = new ArrayList<>(); - ArrayList argumentList = new ArrayList<>(); - - if(dependedIdPrime){ - dependedList.add(spec.getRDLSpecResourceDeclaration(dependedId).getPrimedResource()); - }else{ - dependedList.add(spec.getRDLSpecResourceDeclaration(dependedId).getResource()); - } - - argumentList.add(spec.getConstant(argument, spec.getRDLSpecResourceDeclaration(dependedId).getResource().getValueType())); - - spec.addRDLSpecStatement(new RDLSpecEquationFormula(new RDLSpecDependencyTerm(spec.getRDLSpecResourceDeclaration(depending).getResource(), dependedList, argumentList), spec.getConstant(corrValue.toString(), checkValueType(corrValue)))); - } - - //[depending: insideDependedId -> insideArguments] : outsideDependedId -> outsideArguments] = corrValue - public void addNestedDependencyEquationFormula(RDLSpec spec, String depending, String insideDependedId, boolean insideDependedIdPrime, String insideArgument, String outsideDependedId, boolean outsideDependedIdPrime, String outsideArgument, Value corrValue){ - - RDLSpecDependencyTerm nestedDependencyTerm = createNestedDependencyTerm(spec, depending, insideDependedId, insideDependedIdPrime, insideArgument, outsideDependedId, outsideDependedIdPrime, outsideArgument); - spec.addRDLSpecStatement(new RDLSpecEquationFormula(nestedDependencyTerm, spec.getConstant(corrValue.toString(), checkValueType(corrValue)))); - - } -} diff --git a/src/main/java/org/ntlab/rdlcanvas/generaterdl/TableRDLGenerator.java b/src/main/java/org/ntlab/rdlcanvas/generaterdl/TableRDLGenerator.java new file mode 100644 index 0000000..da0757d --- /dev/null +++ b/src/main/java/org/ntlab/rdlcanvas/generaterdl/TableRDLGenerator.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 TableRDLGenerator extends RDLGeneratorBase { + + public TableRDLGenerator(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(createTableDependencyEquationFormula(metaIdString, "tableId", false, 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(createNestedDependencyEquationFormula(metaIdString, "columnNo", false, Integer.toString(index), "tableId", false, tableNameString, v)); + } + index++; + } + } + } + } + } + + } + + //[depending : dependedId -> arguments] = value , ex [keyName : tableId -> "顧客"] = "顧客ID" + public RDLSpecEquationFormula createTableDependencyEquationFormula(String depending, String dependedId, boolean dependedIdPrime, String argument, Value corrValue) { + RDLSpecEquationFormula equationFormula; + RDLSpecDependencyTerm dependencyTerm = createDependencyTerm(depending, dependedId, dependedIdPrime, argument); + + equationFormula = new RDLSpecEquationFormula(dependencyTerm, spec.getConstant(corrValue.toString(), checkValueType(corrValue))); + + return equationFormula; + } + + //[depending: insideDependedId -> insideArguments] : outsideDependedId -> outsideArguments] = corrValue + public RDLSpecEquationFormula createNestedDependencyEquationFormula(String depending, String insideDependedId, boolean insideDependedIdPrime, String insideArgument, String outsideDependedId, boolean outsideDependedIdPrime, String outsideArgument, Value corrValue) { + RDLSpecEquationFormula equationFormula; + RDLSpecDependencyTerm nestedDependencyTerm = createNestedDependencyTerm(depending, insideDependedId, insideDependedIdPrime, insideArgument, outsideDependedId, outsideDependedIdPrime, outsideArgument); + + equationFormula = new RDLSpecEquationFormula(nestedDependencyTerm, spec.getConstant(corrValue.toString(), checkValueType(corrValue))); + + return equationFormula; + + } +}