From 0d93b268c10e26446232f50ac645b9685a2c63ff Mon Sep 17 00:00:00 2001 From: Heongseok Heo Date: Thu, 24 Oct 2013 21:24:41 +0900 Subject: [PATCH] [Title]Rename CLIConfig.java to Configuration.java [Desc.]Since CLIConfig.java can be confused with other classes like ConfigCLI etc. So changed the class name to clarify the meaning of class. Change-Id: I23e86f01e0b257faeb4dc68f3281129256607026 Signed-off-by: Heongseok Heo --- .../ncli/ide/config/{CLIConfig.java => Configuration.java} | 4 ++-- org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/ConfigCLI.java | 4 ++-- .../src/org/tizen/ncli/ide/subcommands/ConfigCLICommand.java | 10 +++++----- .../org/tizen/ncli/ide/subcommands/ConfigCommandListTest.java | 4 ++-- .../src/org/tizen/ncli/ide/subcommands/ConfigCommandTest.java | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) rename org.tizen.ncli.ide/src/org/tizen/ncli/ide/config/{CLIConfig.java => Configuration.java} (94%) diff --git a/org.tizen.ncli.ide/src/org/tizen/ncli/ide/config/CLIConfig.java b/org.tizen.ncli.ide/src/org/tizen/ncli/ide/config/Configuration.java similarity index 94% rename from org.tizen.ncli.ide/src/org/tizen/ncli/ide/config/CLIConfig.java rename to org.tizen.ncli.ide/src/org/tizen/ncli/ide/config/Configuration.java index 63e3d30..4e450e5 100644 --- a/org.tizen.ncli.ide/src/org/tizen/ncli/ide/config/CLIConfig.java +++ b/org.tizen.ncli.ide/src/org/tizen/ncli/ide/config/Configuration.java @@ -36,13 +36,13 @@ import org.tizen.ncli.ide.CLIConstant; * * @author Harry Hyeongseok Heo{@literal } (S-core) */ -public class CLIConfig { +public class Configuration { private Collection globalKeys; private Collection localKeys; - public CLIConfig() { + public Configuration() { setConfigValues(); } diff --git a/org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/ConfigCLI.java b/org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/ConfigCLI.java index b27b611..2f1869a 100644 --- a/org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/ConfigCLI.java +++ b/org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/ConfigCLI.java @@ -38,7 +38,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.tizen.ncli.ide.Tizen; import org.tizen.ncli.ide.TizenCLIConfig; -import org.tizen.ncli.ide.config.CLIConfig; +import org.tizen.ncli.ide.config.Configuration; import org.tizen.ncli.ide.core.command.SetConfigCommand; import org.tizen.ncli.ide.subcommands.ConfigCLICommand; @@ -77,7 +77,7 @@ public class ConfigCLI extends AbstractCLI{ configCommand.setGlobal(global); configCommand.setKeyValue(properties); - CLIConfig tizenCLIConfig = configCommand.runCommand(); + Configuration tizenCLIConfig = configCommand.runCommand(); //Printout result of command if(list) { //TODO print message should be refined diff --git a/org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/ConfigCLICommand.java b/org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/ConfigCLICommand.java index bd5d587..08278dd 100644 --- a/org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/ConfigCLICommand.java +++ b/org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/ConfigCLICommand.java @@ -38,7 +38,7 @@ import org.tizen.common.config.Preference; import org.tizen.common.util.Assert; import org.tizen.common.util.IOUtil; import org.tizen.ncli.ide.CLIConstant; -import org.tizen.ncli.ide.config.CLIConfig; +import org.tizen.ncli.ide.config.Configuration; import org.tizen.ncli.ide.core.config.NCLIConfigLoader; import org.tizen.ncli.ide.core.config.TizenCLIConfigProvider; @@ -47,7 +47,7 @@ import org.tizen.ncli.ide.core.config.TizenCLIConfigProvider; * * @author Harry Hyeongseok Heo{@literal } (S-core) */ -public class ConfigCLICommand extends AbstractSubCommand{ +public class ConfigCLICommand extends AbstractSubCommand{ private boolean list = false; private boolean global = false; private Map properties = new HashMap(); @@ -88,9 +88,9 @@ public class ConfigCLICommand extends AbstractSubCommand{ * @see org.tizen.ncli.ide.subcommands.AbstractSubCommand#call() */ @Override - public CLIConfig call() { + public Configuration call() { if(list) { - return new CLIConfig(); + return new Configuration(); }else if(global){ log.trace("global config set call() - {}",properties); File file = NCLIConfigLoader.getGlobalConfigFile(); @@ -107,7 +107,7 @@ public class ConfigCLICommand extends AbstractSubCommand{ log.error("Fail to write configuration file!"); } } - return new CLIConfig(); + return new Configuration(); } private boolean writeProperties2File(File file, Properties load) { diff --git a/org.tizen.ncli.ide/test/src/org/tizen/ncli/ide/subcommands/ConfigCommandListTest.java b/org.tizen.ncli.ide/test/src/org/tizen/ncli/ide/subcommands/ConfigCommandListTest.java index fb56083..1483690 100644 --- a/org.tizen.ncli.ide/test/src/org/tizen/ncli/ide/subcommands/ConfigCommandListTest.java +++ b/org.tizen.ncli.ide/test/src/org/tizen/ncli/ide/subcommands/ConfigCommandListTest.java @@ -42,7 +42,7 @@ import org.powermock.modules.junit4.PowerMockRunner; import org.tizen.common.config.Preference; import org.tizen.common.config.provider.EnvironmentProvider; import org.tizen.common.config.provider.SystemPropertiesProvider; -import org.tizen.ncli.ide.config.CLIConfig; +import org.tizen.ncli.ide.config.Configuration; import org.tizen.ncli.ide.core.config.TizenCLIConfigProvider; /** @@ -81,7 +81,7 @@ public class ConfigCommandListTest extends CommonCLISubCommandTest{ configCmd.setList(true); - CLIConfig cliConfig = configCmd.call(); + Configuration cliConfig = configCmd.call(); assertNotNull(cliConfig); Collection expectedGlobalKeys = new HashSet(); diff --git a/org.tizen.ncli.ide/test/src/org/tizen/ncli/ide/subcommands/ConfigCommandTest.java b/org.tizen.ncli.ide/test/src/org/tizen/ncli/ide/subcommands/ConfigCommandTest.java index a30d7f9..7546cc2 100644 --- a/org.tizen.ncli.ide/test/src/org/tizen/ncli/ide/subcommands/ConfigCommandTest.java +++ b/org.tizen.ncli.ide/test/src/org/tizen/ncli/ide/subcommands/ConfigCommandTest.java @@ -50,7 +50,7 @@ import org.tizen.common.config.provider.EnvironmentProvider; import org.tizen.common.config.provider.SystemPropertiesProvider; import org.tizen.common.util.IOUtil; import org.tizen.ncli.ide.CLIConstant; -import org.tizen.ncli.ide.config.CLIConfig; +import org.tizen.ncli.ide.config.Configuration; import org.tizen.ncli.ide.core.config.NCLIConfigLoader; import org.tizen.ncli.ide.core.config.TizenCLIConfigProvider; @@ -97,7 +97,7 @@ public class ConfigCommandTest extends CommonCLISubCommandTest{ configCmd.setConfig("local.key.test", "this is LOCAL test value"); //method for test - CLIConfig cliConfig = configCmd.call(); + Configuration cliConfig = configCmd.call(); assertEquals("this is LOCAL test value", cliConfig.getLocalValue("local.key.test")); @@ -126,7 +126,7 @@ public class ConfigCommandTest extends CommonCLISubCommandTest{ configCmd.setConfig("global.key.test", "this is GLOBAL test value"); configCmd.setGlobal(true); //method for test - CLIConfig cliConfig = configCmd.call(); + Configuration cliConfig = configCmd.call(); assertEquals("this is GLOBAL test value", cliConfig.getGlobalValue("global.key.test")); } -- 2.7.4