From b95a275cb86fc3e253faf0973510abf65a27ff17 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Fri, 15 Jun 2012 18:37:45 +0200 Subject: [PATCH] use createUrl instead of deprecated getUrl --- .../cli/cmd/CreateRepositorySubCommand.java | 2 +- .../scm/cli/cmd/GetRepositorySubCommand.java | 2 +- .../cli/cmd/ListRepositoriesSubCommand.java | 2 +- .../cli/cmd/ModifyRepositorySubCommand.java | 2 +- .../scm/cli/cmd/PermissionSubCommand.java | 2 +- .../scm/cli/wrapper/RepositoryWrapper.java | 23 +++++++++++++++++-- .../sonia/scm/cli/wrapper/WrapperUtil.java | 9 ++++++-- 7 files changed, 33 insertions(+), 9 deletions(-) diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CreateRepositorySubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CreateRepositorySubCommand.java index 79e8c5a96f..52828eba25 100644 --- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CreateRepositorySubCommand.java +++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CreateRepositorySubCommand.java @@ -170,7 +170,7 @@ public class CreateRepositorySubCommand extends TemplateSubCommand Map env = new HashMap(); - env.put("repository", new RepositoryWrapper(repository)); + env.put("repository", new RepositoryWrapper(config, repository)); renderTemplate(env, GetRepositorySubCommand.TEMPLATE); } diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetRepositorySubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetRepositorySubCommand.java index 9e9c0fbe29..c7c497bacf 100644 --- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetRepositorySubCommand.java +++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetRepositorySubCommand.java @@ -104,7 +104,7 @@ public class GetRepositorySubCommand extends TemplateSubCommand { Map env = new HashMap(); - env.put("repository", new RepositoryWrapper(repository)); + env.put("repository", new RepositoryWrapper(config, repository)); renderTemplate(env, TEMPLATE); } else diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ListRepositoriesSubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ListRepositoriesSubCommand.java index 518bd062d5..2235781791 100644 --- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ListRepositoriesSubCommand.java +++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ListRepositoriesSubCommand.java @@ -74,7 +74,7 @@ public class ListRepositoriesSubCommand extends TemplateSubCommand List repositories = session.getRepositoryHandler().getAll(); Map env = new HashMap(); - env.put("repositories", WrapperUtil.wrapRepositories(repositories)); + env.put("repositories", WrapperUtil.wrapRepositories(config, repositories)); renderTemplate(env, TEMPLATE); } } diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ModifyRepositorySubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ModifyRepositorySubCommand.java index 1f991fa746..5ec4c59519 100644 --- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ModifyRepositorySubCommand.java +++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ModifyRepositorySubCommand.java @@ -214,7 +214,7 @@ public class ModifyRepositorySubCommand extends TemplateSubCommand Map env = new HashMap(); - env.put("repository", new RepositoryWrapper(repository)); + env.put("repository", new RepositoryWrapper(config, repository)); renderTemplate(env, GetRepositorySubCommand.TEMPLATE); } else diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/PermissionSubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/PermissionSubCommand.java index c701a45808..a6b5eba2f5 100644 --- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/PermissionSubCommand.java +++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/PermissionSubCommand.java @@ -120,7 +120,7 @@ public abstract class PermissionSubCommand extends TemplateSubCommand Map env = new HashMap(); - env.put("repository", new RepositoryWrapper(repository)); + env.put("repository", new RepositoryWrapper(config, repository)); renderTemplate(env, GetRepositorySubCommand.TEMPLATE); } else diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/wrapper/RepositoryWrapper.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/wrapper/RepositoryWrapper.java index 68d5131cbc..216afde624 100644 --- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/wrapper/RepositoryWrapper.java +++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/wrapper/RepositoryWrapper.java @@ -35,6 +35,7 @@ package sonia.scm.cli.wrapper; //~--- non-JDK imports -------------------------------------------------------- +import sonia.scm.cli.config.ServerConfig; import sonia.scm.repository.Permission; import sonia.scm.repository.Repository; @@ -54,10 +55,25 @@ public class RepositoryWrapper extends AbstractWrapper * Constructs ... * * + * @param config * @param repository */ - public RepositoryWrapper(Repository repository) + public RepositoryWrapper(ServerConfig config, Repository repository) { + this(config.getServerUrl(), repository); + } + + /** + * Constructs ... + * + * + * + * @param baseUrl + * @param repository + */ + public RepositoryWrapper(String baseUrl, Repository repository) + { + this.baseUrl = baseUrl; this.repository = repository; } @@ -159,7 +175,7 @@ public class RepositoryWrapper extends AbstractWrapper */ public String getUrl() { - return repository.getUrl(); + return repository.createUrl(baseUrl); } /** @@ -186,6 +202,9 @@ public class RepositoryWrapper extends AbstractWrapper //~--- fields --------------------------------------------------------------- + /** Field description */ + private String baseUrl; + /** Field description */ private Repository repository; } diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/wrapper/WrapperUtil.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/wrapper/WrapperUtil.java index dce0bef3fc..f508b45039 100644 --- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/wrapper/WrapperUtil.java +++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/wrapper/WrapperUtil.java @@ -35,6 +35,7 @@ package sonia.scm.cli.wrapper; //~--- non-JDK imports -------------------------------------------------------- +import sonia.scm.cli.config.ServerConfig; import sonia.scm.group.Group; import sonia.scm.repository.Repository; import sonia.scm.user.User; @@ -76,18 +77,22 @@ public class WrapperUtil * Method description * * + * + * @param baseUrl + * + * @param config * @param repositories * * @return */ - public static List wrapRepositories( + public static List wrapRepositories(ServerConfig config, Collection repositories) { List wrappers = new ArrayList(); for (Repository r : repositories) { - wrappers.add(new RepositoryWrapper(r)); + wrappers.add(new RepositoryWrapper(config.getServerUrl(), r)); } return wrappers;