diff --git a/src/main/java/org/ntlab/rdlcanvas/Main.java b/src/main/java/org/ntlab/rdlcanvas/Main.java index a5bddc1..f9faef7 100644 --- a/src/main/java/org/ntlab/rdlcanvas/Main.java +++ b/src/main/java/org/ntlab/rdlcanvas/Main.java @@ -1,22 +1,11 @@ package org.ntlab.rdlcanvas; -import org.ntlab.rdlcanvas.parser.JsonValue; -import org.ntlab.rdlcanvas.parser.Parser; -import org.ntlab.rdlcanvas.parser.StringValue; -import org.ntlab.rdlcanvas.parser.Value; +import org.ntlab.rdlcanvas.generaterdl.GenerateRDL; -import java.util.Map; public class Main { public static void main(String[] args) { - Parser parser = new Parser(); - Value value = parser.getValue(); - System.out.println(value.toString()); -// Map map = ((JsonValue)value).getJson(); -// for (StringValue key : map.keySet()){ -// String keyName = key.getStringValue(); -// System.out.println(keyName); -// } + GenerateRDL generateRDL = new GenerateRDL(); } } diff --git a/src/main/java/org/ntlab/rdlcanvas/generaterdl/GenerateRDL.java b/src/main/java/org/ntlab/rdlcanvas/generaterdl/GenerateRDL.java index da4da9d..1f6a8b0 100644 --- a/src/main/java/org/ntlab/rdlcanvas/generaterdl/GenerateRDL.java +++ b/src/main/java/org/ntlab/rdlcanvas/generaterdl/GenerateRDL.java @@ -9,20 +9,23 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; public class GenerateRDL { List screendataList = new ArrayList(); //各画面のWidget一覧 - List rdlList = new ArrayList(); //RDLのメゾットを格納するリスト + List screenRDLList = new ArrayList(); //RDLのメゾットを格納するリスト public GenerateRDL(){ Parser parser = new Parser(); createScreenData(parser.getValue()); - for(List data : screendataList){ + for(List data : screendataList){ System.out.println("screenId: " + data.get(0) + ", wId: " + data.get(1) + ", wMeta: " + data.get(2) + ", data: " + data.get(3)); } + createScreenRDL(screendataList); + toStingScreenRDL(); } public GenerateRDL(final BufferedReader reader){ @@ -56,8 +59,35 @@ } // RDLを生成 - private void createRDL(List screendataList){ + private void createScreenRDL(List screendataList){ // RDLを生成する処理をここに実装する + for(List data: screendataList){ + StringBuilder stringBuilder = new StringBuilder(); + stringBuilder.append("[["); + stringBuilder.append(data.get(2)); + stringBuilder.append(":wId->"); + stringBuilder.append(data.get(1)); + stringBuilder.append("]:scId->"); + stringBuilder.append(data.get(0)); + stringBuilder.append("]="); + stringBuilder.append(data.get(3)); + screenRDLList.add(stringBuilder); + } + } + + + // screenRDLListを返す + public List getScreenRDLList(){ + return screenRDLList; + } + + // 作成されたRDLコードを標準出力 + public void toStingScreenRDL(){ + String result = screenRDLList.stream() + .map(StringBuilder::toString) + .collect(Collectors.joining("\n")); + + System.out.println(result); } // screendataListを返す diff --git a/src/main/java/org/ntlab/rdlcanvas/rdlgenerator/RDLGenerator.java b/src/main/java/org/ntlab/rdlcanvas/rdlgenerator/RDLGenerator.java deleted file mode 100644 index c7990c7..0000000 --- a/src/main/java/org/ntlab/rdlcanvas/rdlgenerator/RDLGenerator.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.ntlab.rdlcanvas.rdlgenerator; - -public class RDLGenerator { -}