diff --git a/java_console/ui/src/com/rusefi/ui/config/DialogModel.java b/java_console/ui/src/com/rusefi/ui/config/DialogModel.java index 1fdde01699..c6ba0162e1 100644 --- a/java_console/ui/src/com/rusefi/ui/config/DialogModel.java +++ b/java_console/ui/src/com/rusefi/ui/config/DialogModel.java @@ -8,11 +8,26 @@ import java.util.List; * 1/17/2016. */ public class DialogModel { - private final String name; + private final String key; + private final String uiName; private final List fields; - public DialogModel(String name, List fields) { - this.name = name; + public DialogModel(String key, String uiName, List fields) { + this.key = key; + this.uiName = uiName; this.fields = new ArrayList<>(fields); } + + public List getFields() { + return fields; + } + + @Override + public String toString() { + return "DialogModel{" + + "key='" + key + '\'' + + ", uiName='" + uiName + '\'' + + ", fields=" + fields.size() + + '}'; + } } diff --git a/java_console/ui/src/com/rusefi/ui/config/IniFileModel.java b/java_console/ui/src/com/rusefi/ui/config/IniFileModel.java index 1bc918f980..bcb87fce78 100644 --- a/java_console/ui/src/com/rusefi/ui/config/IniFileModel.java +++ b/java_console/ui/src/com/rusefi/ui/config/IniFileModel.java @@ -12,12 +12,13 @@ public class IniFileModel { private static final String FILENAME = "rusefi.ini"; private final static IniFileModel INSTANCE = new IniFileModel(); - private String dialogName; + private String dialogId; + private String dialogUiName; private List fields = new ArrayList<>(); - private List dialogs = new ArrayList<>(); + private Map dialogs = new TreeMap<>(); public static void main(String[] args) { - System.out.println(IniFileModel.INSTANCE); + System.out.println(IniFileModel.INSTANCE.dialogs); } private IniFileModel() { @@ -54,9 +55,9 @@ public class IniFileModel { private void finishDialog() { if (fields.isEmpty()) return; - dialogs.add(new DialogModel(dialogName, fields)); + dialogs.put(dialogUiName, new DialogModel(dialogId, dialogUiName, fields)); - dialogName = null; + dialogId = null; fields.clear(); } @@ -102,7 +103,8 @@ public class IniFileModel { // trim(list); String name = list.isEmpty() ? null : list.removeFirst(); - dialogName = keyword; + dialogId = keyword; + dialogUiName = name; System.out.println("Dialog key=" + keyword + ": name=[" + name + "]"); } @@ -142,4 +144,11 @@ public class IniFileModel { return c == ' ' || c == '\t' || c == '=' || c == ','; } + public static IniFileModel getinstance() { + return INSTANCE; + } + + public Map getDialogs() { + return dialogs; + } }