diff --git a/src/main/java/org/ntlab/rdlcanvas/generaterdl/BaseGenerateRDL.java b/src/main/java/org/ntlab/rdlcanvas/generaterdl/BaseGenerateRDL.java index 085a326..e7a142e 100644 --- a/src/main/java/org/ntlab/rdlcanvas/generaterdl/BaseGenerateRDL.java +++ b/src/main/java/org/ntlab/rdlcanvas/generaterdl/BaseGenerateRDL.java @@ -1,11 +1,23 @@ package org.ntlab.rdlcanvas.generaterdl; import org.ntlab.rdlcanvas.models.*; +import org.ntlab.rdlcanvas.parser.Value; import java.util.ArrayList; public class BaseGenerateRDL { + public ValueType checkValueType(Value value) { + if (value.getClass().getSimpleName().equals("StringValue")) { + return RDLSpecLang.typeString; + } else if (value.getClass().getSimpleName().equals("IntegerValue")) { + return RDLSpecLang.typeInt; + } else if (value.getClass().getSimpleName().equals("BooleanValue")) { + return RDLSpecLang.typeBoolean; + } + return RDLSpecLang.typeDouble; + } + // [depending: insideDependedId -> insideArguments] : outsideDependedId -> outsideArguments] public RDLSpecDependencyTerm createNestDependencyTerm(RDLSpec spec, String depending, String insideDependedId, boolean insideDependedIdPrime, String insideArgument, String outsideDependedId, boolean outsideDependedIdPrime, String outsideArgument){ diff --git a/src/main/java/org/ntlab/rdlcanvas/generaterdl/ScreenGenerateRDL.java b/src/main/java/org/ntlab/rdlcanvas/generaterdl/ScreenGenerateRDL.java index 012e8a6..a319c92 100644 --- a/src/main/java/org/ntlab/rdlcanvas/generaterdl/ScreenGenerateRDL.java +++ b/src/main/java/org/ntlab/rdlcanvas/generaterdl/ScreenGenerateRDL.java @@ -10,27 +10,28 @@ // parser済みのJsonを引数とする public ScreenGenerateRDL(Value value, RDLSpec spec){ - createScreenConstant(value, spec); + //System.out.println(value.toString()); + addScreenRDL(value, spec); } // Jsonを構成するデータを抽出する - private void createScreenConstant(Value value, RDLSpec spec){ + private void addScreenRDL(Value value, RDLSpec spec){ - Map screenmap = ((org.ntlab.rdlcanvas.parser.JsonValue)value).getJson(); + Map screenMap = ((org.ntlab.rdlcanvas.parser.JsonValue)value).getJson(); - for (StringValue key1 : screenmap.keySet()){ + 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(); + Value widgets = screenMap.get(key1); + Map widgetMap = ((org.ntlab.rdlcanvas.parser.JsonValue)widgets).getJson(); - for (StringValue key2 : widgetmap.keySet()){ + 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(); + Value metas = widgetMap.get(key2); + Map metaMap = ((org.ntlab.rdlcanvas.parser.JsonValue)metas).getJson(); - for (StringValue key3 : metamap.keySet()){ + for (StringValue key3 : metaMap.keySet()){ String metaIdString = key3.getStringValue(); //MetaIDをStringValue(key3)からStringへ変換 - Value data = metamap.get(key3); //Dataを取得 + Value data = metaMap.get(key3); //Dataを取得 // System.out.println(metaIdString); addScreenDefinition(spec, metaIdString, "wId", false, wIdString, "scId", false, scIdString, data); } @@ -40,17 +41,6 @@ } - private ValueType checkValueType(Value value) { - if (value.getClass().getSimpleName().equals("StringValue")) { - return RDLSpecLang.typeString; - } else if (value.getClass().getSimpleName().equals("IntegerValue")) { - return RDLSpecLang.typeInt; - } else if (value.getClass().getSimpleName().equals("BooleanValue")) { - return RDLSpecLang.typeBoolean; - } - return RDLSpecLang.typeDouble; - } - //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){