Index: lutincommandline/src/test/org/codelutin/option/ui/UITest.java diff -u lutincommandline/src/test/org/codelutin/option/ui/UITest.java:1.2 lutincommandline/src/test/org/codelutin/option/ui/UITest.java:1.3 --- lutincommandline/src/test/org/codelutin/option/ui/UITest.java:1.2 Thu Feb 21 17:16:57 2008 +++ lutincommandline/src/test/org/codelutin/option/ui/UITest.java Fri Feb 22 20:57:25 2008 @@ -19,11 +19,10 @@ import org.codelutin.i18n.I18n; import org.codelutin.i18n.LanguageEnum; -import static org.codelutin.i18n.I18n.n_; import org.codelutin.option.Config; import org.codelutin.option.ConfigPropertyKey; -import org.codelutin.option.def.ConfigPropertyModifier; import static org.codelutin.option.ConfigPropertyKey.newConfigPropertyKey; +import static org.codelutin.option.def.ConfigPropertyModifier.MANDATORY; import java.io.File; import java.net.URL; @@ -37,37 +36,67 @@ public static void main(String[] args) throws Exception { I18n.initISO88591(); - MyConfig config = new MyConfig(); - config.init(); - ConfigUI.showUI(config, ConfigTableModel.TypeModel.all); + + new ConfigUI().init( + new MyConfig(), + new MyConfigLocal(), + new MyConfigRemote() + ).setVisible(true); } private static class MyConfig extends Config { - static public final ConfigPropertyKey BOOLEAN_PROPERTY_KEY; - static public final ConfigPropertyKey INT_PROPERTY_KEY; - static public final ConfigPropertyKey CLASS_PROPERTY_KEY; - static public final ConfigPropertyKey FILE_PROPERTY_KEY; - static public final ConfigPropertyKey URL_PROPERTY_KEY; - static public final ConfigPropertyKey LANGUAGE_PROPERTY_KEY; - - public MyConfig() { - super("test", "test description"); + static public final ConfigPropertyKey BOOLEAN_PROPERTY_KEY = newConfigPropertyKey("booleanMain", Boolean.class, 0, "lutinutil.common.boolean.description", "true"); + static public final ConfigPropertyKey INT_PROPERTY_KEY = newConfigPropertyKey("intMain", Integer.class, MANDATORY.getIntValue(), "lutinutil.common.int.description", "10"); + static public final ConfigPropertyKey CLASS_PROPERTY_KEY = newConfigPropertyKey("classMain", Class.class, MANDATORY.getIntValue(), "lutinutil.common.class.description", "java.lang.Class"); + static public final ConfigPropertyKey FILE_PROPERTY_KEY = newConfigPropertyKey("fileMain", File.class, 8, "lutinutil.common.file.description", "/tmp"); + static public final ConfigPropertyKey URL_PROPERTY_KEY = newConfigPropertyKey("urlMain", URL.class, 11, "lutinutil.common.url.description", "http://lutinutil.labs.libre-entreprise.org"); + static public final ConfigPropertyKey LANGUAGE_PROPERTY_KEY = newConfigPropertyKey("languageMain", LanguageEnum.class, 8, "lutinutil.common.language.description", "fr"); + + public MyConfig() throws Exception { + super("main", "main description"); + init(); + } + protected void init() throws Exception { + loadFromDefaultValue(); + clearModified(); } + } - protected void init() throws Exception { + private static class MyConfigLocal extends Config { + + static public final ConfigPropertyKey BOOLEAN_PROPERTY_KEY = newConfigPropertyKey("booleanLocal", Boolean.class, 0, "lutinutil.common.boolean.description", "false"); + static public final ConfigPropertyKey INT_PROPERTY_KEY = newConfigPropertyKey("intLocal", Integer.class, MANDATORY.getIntValue(), "lutinutil.common.int.description"); + static public final ConfigPropertyKey CLASS_PROPERTY_KEY = newConfigPropertyKey("classLocal", Class.class, MANDATORY.getIntValue(), "lutinutil.common.class.description", "java.lang.Class"); + static public final ConfigPropertyKey FILE_PROPERTY_KEY = newConfigPropertyKey("fileLocal", File.class, 8, "lutinutil.common.file.description", "/tmp"); + static public final ConfigPropertyKey URL_PROPERTY_KEY = newConfigPropertyKey("urlLocal", URL.class, 11, "lutinutil.common.url.description", "http://lutinutil.labs.libre-entreprise.org"); + static public final ConfigPropertyKey LANGUAGE_PROPERTY_KEY = newConfigPropertyKey("languageLocal", LanguageEnum.class, 8, "lutinutil.common.language.description", "fr"); + + public MyConfigLocal() throws Exception { + super("local", "local description"); + init(); + } + protected void init() throws Exception { loadFromDefaultValue(); clearModified(); } + } - static { - BOOLEAN_PROPERTY_KEY = newConfigPropertyKey("boolean", Boolean.class, 0, n_("lutinutil.common.boolean.description"), "false"); - INT_PROPERTY_KEY = newConfigPropertyKey("int", Integer.class, ConfigPropertyModifier.MANDATORY.getIntValue(), n_("lutinutil.config.main.int.description")); - CLASS_PROPERTY_KEY = newConfigPropertyKey("class", Class.class, ConfigPropertyModifier.MANDATORY.getIntValue(), n_("lutinutil.config.main.class.description"),"java.lang.Class"); - - FILE_PROPERTY_KEY = newConfigPropertyKey("file", File.class, 8, n_("lutinutil.common.file.description"), "/tmp"); - URL_PROPERTY_KEY = newConfigPropertyKey("url", URL.class, 11, n_("lutinutil.common.url.description"), "http://lutinutil.labs.libre-entreprise.org"); - LANGUAGE_PROPERTY_KEY = newConfigPropertyKey("language", LanguageEnum.class, 8, n_("lutinutil.common.language.description"), "fr"); + private static class MyConfigRemote extends Config { + static public final ConfigPropertyKey BOOLEAN_PROPERTY_KEY = newConfigPropertyKey("booleanRemote", Boolean.class, 0, "lutinutil.common.boolean.description", "false"); + static public final ConfigPropertyKey INT_PROPERTY_KEY = newConfigPropertyKey("intRemote", Integer.class, MANDATORY.getIntValue(), "lutinutil.common.int.description"); + static public final ConfigPropertyKey CLASS_PROPERTY_KEY = newConfigPropertyKey("classRemote", Class.class, MANDATORY.getIntValue(), "lutinutil.common.class.description", "java.lang.Class"); + static public final ConfigPropertyKey FILE_PROPERTY_KEY = newConfigPropertyKey("fileRemote", File.class, 8, "lutinutil.common.file.description", "/tmp"); + static public final ConfigPropertyKey URL_PROPERTY_KEY = newConfigPropertyKey("urlRemote", URL.class, 11, "lutinutil.common.url.description", "http://lutinutil.labs.libre-entreprise.org"); + static public final ConfigPropertyKey LANGUAGE_PROPERTY_KEY = newConfigPropertyKey("languageRemote", LanguageEnum.class, 8, "lutinutil.common.language.description", "fr"); + + public MyConfigRemote() throws Exception { + super("remote", "remote description"); + init(); + } + protected void init() throws Exception { + loadFromDefaultValue(); + clearModified(); } } }