From 5aa833f3de1ecb13a352d79506953fee6c27a651 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Wed, 18 May 2011 21:53:24 +0200 Subject: [PATCH] create config package --- .../src/main/java/sonia/scm/cli/App.java | 3 ++ .../src/main/java/sonia/scm/cli/Command.java | 4 +-- .../main/java/sonia/scm/cli/SubCommand.java | 1 + .../scm/cli/SubCommandOptionHandler.java | 2 +- .../cli/{ => config}/ConfigOptionHandler.java | 2 +- .../scm/cli/{ => config}/ScmClientConfig.java | 36 ++++++++++++++++--- .../scm/cli/{ => config}/ServerConfig.java | 2 +- 7 files changed, 41 insertions(+), 9 deletions(-) rename scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/{ => config}/ConfigOptionHandler.java (99%) rename scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/{ => config}/ScmClientConfig.java (84%) rename scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/{ => config}/ServerConfig.java (99%) diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/App.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/App.java index 2cc8ff2505..0bed19023c 100644 --- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/App.java +++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/App.java @@ -43,6 +43,9 @@ import org.kohsuke.args4j.Option; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import sonia.scm.cli.config.ConfigOptionHandler; +import sonia.scm.cli.config.ScmClientConfig; +import sonia.scm.cli.config.ServerConfig; import sonia.scm.util.IOUtil; import sonia.scm.util.Util; diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/Command.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/Command.java index 0dc6cae0f8..19b9a39fc5 100644 --- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/Command.java +++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/Command.java @@ -47,6 +47,6 @@ import java.lang.annotation.RetentionPolicy; @Retention(RetentionPolicy.RUNTIME) public @interface Command { - String value() default ""; - String usage() default ""; + String value() default ""; + String usage() default ""; } diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/SubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/SubCommand.java index 24d3d8315b..639796cde4 100644 --- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/SubCommand.java +++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/SubCommand.java @@ -42,6 +42,7 @@ import org.kohsuke.args4j.Option; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import sonia.scm.cli.config.ServerConfig; import sonia.scm.client.ScmClient; import sonia.scm.client.ScmClientSession; import sonia.scm.util.IOUtil; diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/SubCommandOptionHandler.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/SubCommandOptionHandler.java index 886fba41b2..0cb3e653b0 100644 --- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/SubCommandOptionHandler.java +++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/SubCommandOptionHandler.java @@ -83,7 +83,7 @@ public class SubCommandOptionHandler extends OptionHandler * @param setter */ public SubCommandOptionHandler(CmdLineParser parser, OptionDef option, - Setter setter) + Setter setter) { super(parser, option, setter); subCommands = new HashMap(); diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/ConfigOptionHandler.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/config/ConfigOptionHandler.java similarity index 99% rename from scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/ConfigOptionHandler.java rename to scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/config/ConfigOptionHandler.java index b6d10c7b76..15e030b8bc 100644 --- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/ConfigOptionHandler.java +++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/config/ConfigOptionHandler.java @@ -31,7 +31,7 @@ -package sonia.scm.cli; +package sonia.scm.cli.config; //~--- non-JDK imports -------------------------------------------------------- diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/ScmClientConfig.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/config/ScmClientConfig.java similarity index 84% rename from scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/ScmClientConfig.java rename to scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/config/ScmClientConfig.java index 834440a524..cb3036fc71 100644 --- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/ScmClientConfig.java +++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/config/ScmClientConfig.java @@ -31,17 +31,20 @@ -package sonia.scm.cli; +package sonia.scm.cli.config; //~--- JDK imports ------------------------------------------------------------ import java.util.HashMap; import java.util.Map; +import javax.xml.bind.annotation.XmlRootElement; + /** * * @author Sebastian Sdorra */ +@XmlRootElement(name = "client-config") public class ScmClientConfig { @@ -78,9 +81,7 @@ public class ScmClientConfig { if (instance == null) { - - // TODO load config - instance = new ScmClientConfig(); + instance = load(); } } } @@ -88,6 +89,33 @@ public class ScmClientConfig return instance; } + //~--- methods -------------------------------------------------------------- + + /** + * Method description + * + * + * @return + */ + private static ScmClientConfig load() + { + + // TODO load config + return new ScmClientConfig(); + } + + /** + * Method description + * + */ + public void store() + { + + // TODO + } + + //~--- get methods ---------------------------------------------------------- + /** * Method description * diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/ServerConfig.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/config/ServerConfig.java similarity index 99% rename from scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/ServerConfig.java rename to scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/config/ServerConfig.java index 0c8fa5b54e..c7fb4108c5 100644 --- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/ServerConfig.java +++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/config/ServerConfig.java @@ -31,7 +31,7 @@ -package sonia.scm.cli; +package sonia.scm.cli.config; //~--- non-JDK imports --------------------------------------------------------