Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 16:35:45 +01:00
Code Issues Packages Projects Releases Activity

use new wrapper classes to fix freemarker date problem

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-05-23 08:12:37 +02:00
parent 99a0863621
commit fbfbf04bce
21 changed files with 51 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/AddPermissionSubCommand.java
View File

@@ -140,7 +140,7 @@ public class AddPermissionSubCommand extends PermissionSubCommand
name = "--type",
usage = "optionPermissionType",
required = true,
metaVar="permissiontype",
metaVar = "permissiontype",
aliases = { "-t" }
)
private PermissionType type;

3
scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CreateGroupSubCommand.java
View File

@@ -37,6 +37,7 @@ package sonia.scm.cli.cmd;
import org.kohsuke.args4j.Option;
import sonia.scm.cli.wrapper.GroupWrapper;
import sonia.scm.client.ScmClientSession;
import sonia.scm.group.Group;
@@ -170,7 +171,7 @@ public class CreateGroupSubCommand extends TemplateSubCommand
Map<String, Object> env = new HashMap<String, Object>();
env.put("group", group);
env.put("group", new GroupWrapper(group));
renderTemplate(env, GetGroupSubCommand.TEMPLATE);
}

3
scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CreateRepositorySubCommand.java
View File

@@ -37,6 +37,7 @@ package sonia.scm.cli.cmd;
import org.kohsuke.args4j.Option;
import sonia.scm.cli.wrapper.RepositoryWrapper;
import sonia.scm.client.ScmClientSession;
import sonia.scm.repository.Repository;
@@ -169,7 +170,7 @@ public class CreateRepositorySubCommand extends TemplateSubCommand
Map<String, Object> env = new HashMap<String, Object>();
env.put("repository", repository);
env.put("repository", new RepositoryWrapper(repository));
renderTemplate(env, GetRepositorySubCommand.TEMPLATE);
}

3
scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CreateUserSubCommand.java
View File

@@ -37,6 +37,7 @@ package sonia.scm.cli.cmd;
import org.kohsuke.args4j.Option;
import sonia.scm.cli.wrapper.UserWrapper;
import sonia.scm.client.ScmClientSession;
import sonia.scm.user.User;
@@ -215,7 +216,7 @@ public class CreateUserSubCommand extends TemplateSubCommand
Map<String, Object> env = new HashMap<String, Object>();
env.put("user", user);
env.put("user", new UserWrapper(user));
renderTemplate(env, GetUserSubCommand.TEMPLATE);
}

3
scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetGroupSubCommand.java
View File

@@ -38,6 +38,7 @@ package sonia.scm.cli.cmd;
import org.kohsuke.args4j.Argument;
import sonia.scm.cli.I18n;
import sonia.scm.cli.wrapper.GroupWrapper;
import sonia.scm.client.ScmClientSession;
import sonia.scm.group.Group;
@@ -103,7 +104,7 @@ public class GetGroupSubCommand extends TemplateSubCommand
{
Map<String, Object> env = new HashMap<String, Object>();
env.put("group", group);
env.put("group", new GroupWrapper(group));
renderTemplate(env, TEMPLATE);
}
else

9
scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetRepositorySubCommand.java
View File

@@ -38,6 +38,7 @@ package sonia.scm.cli.cmd;
import org.kohsuke.args4j.Argument;
import sonia.scm.cli.I18n;
import sonia.scm.cli.wrapper.RepositoryWrapper;
import sonia.scm.client.ScmClientSession;
import sonia.scm.repository.Repository;
@@ -103,7 +104,7 @@ public class GetRepositorySubCommand extends TemplateSubCommand
{
Map<String, Object> env = new HashMap<String, Object>();
env.put("repository", repository);
env.put("repository", new RepositoryWrapper(repository));
renderTemplate(env, TEMPLATE);
}
else
@@ -115,6 +116,10 @@ public class GetRepositorySubCommand extends TemplateSubCommand
//~--- fields ---------------------------------------------------------------
/** Field description */
@Argument(usage = "optionRepositoryId", metaVar="repositoryid", required = true)
@Argument(
usage = "optionRepositoryId",
metaVar = "repositoryid",
required = true
)
private String id;
}

9
scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetUserSubCommand.java
View File

@@ -38,6 +38,7 @@ package sonia.scm.cli.cmd;
import org.kohsuke.args4j.Argument;
import sonia.scm.cli.I18n;
import sonia.scm.cli.wrapper.UserWrapper;
import sonia.scm.client.ScmClientSession;
import sonia.scm.user.User;
@@ -103,7 +104,7 @@ public class GetUserSubCommand extends TemplateSubCommand
{
Map<String, Object> env = new HashMap<String, Object>();
env.put("user", user);
env.put("user", new UserWrapper(user));
renderTemplate(env, TEMPLATE);
}
else
@@ -115,6 +116,10 @@ public class GetUserSubCommand extends TemplateSubCommand
//~--- fields ---------------------------------------------------------------
/** Field description */
@Argument(usage = "optionUserName", metaVar="username", required = true)
@Argument(
usage = "optionUserName",
metaVar = "username",
required = true
)
private String name;
}

3
scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ListGroupsSubCommand.java
View File

@@ -35,6 +35,7 @@ package sonia.scm.cli.cmd;
//~--- non-JDK imports --------------------------------------------------------
import sonia.scm.cli.wrapper.WrapperUtil;
import sonia.scm.client.ScmClientSession;
import sonia.scm.group.Group;
@@ -72,7 +73,7 @@ public class ListGroupsSubCommand extends TemplateSubCommand
List<Group> groups = session.getGroupHandler().getAll();
Map<String, Object> env = new HashMap<String, Object>();
env.put("groups", groups);
env.put("groups", WrapperUtil.wrapGroups(groups));
renderTemplate(env, TEMPLATE);
}
}

3
scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ListRepositoriesSubCommand.java
View File

@@ -35,6 +35,7 @@ package sonia.scm.cli.cmd;
//~--- non-JDK imports --------------------------------------------------------
import sonia.scm.cli.wrapper.WrapperUtil;
import sonia.scm.client.ScmClientSession;
import sonia.scm.repository.Repository;
@@ -73,7 +74,7 @@ public class ListRepositoriesSubCommand extends TemplateSubCommand
List<Repository> repositories = session.getRepositoryHandler().getAll();
Map<String, Object> env = new HashMap<String, Object>();
env.put("repositories", repositories);
env.put("repositories", WrapperUtil.wrapRepositories(repositories));
renderTemplate(env, TEMPLATE);
}
}

3
scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ListUsersSubCommand.java
View File

@@ -35,6 +35,7 @@ package sonia.scm.cli.cmd;
//~--- non-JDK imports --------------------------------------------------------
import sonia.scm.cli.wrapper.WrapperUtil;
import sonia.scm.client.ScmClientSession;
import sonia.scm.user.User;
@@ -72,7 +73,7 @@ public class ListUsersSubCommand extends TemplateSubCommand
List<User> users = session.getUserHandler().getAll();
Map<String, Object> env = new HashMap<String, Object>();
env.put("users", users);
env.put("users", WrapperUtil.wrapUsers(users));
renderTemplate(env, TEMPLATE);
}
}

3
scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/MembersSubCommand.java
View File

@@ -39,6 +39,7 @@ import org.kohsuke.args4j.Argument;
import org.kohsuke.args4j.Option;
import sonia.scm.cli.I18n;
import sonia.scm.cli.wrapper.GroupWrapper;
import sonia.scm.client.GroupClientHandler;
import sonia.scm.client.ScmClientSession;
import sonia.scm.group.Group;
@@ -133,7 +134,7 @@ public abstract class MembersSubCommand extends TemplateSubCommand
Map<String, Object> env = new HashMap<String, Object>();
env.put("group", group);
env.put("group", new GroupWrapper(group));
renderTemplate(env, GetGroupSubCommand.TEMPLATE);
}
else

3
scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ModifyGroupSubCommand.java
View File

@@ -39,6 +39,7 @@ import org.kohsuke.args4j.Argument;
import org.kohsuke.args4j.Option;
import sonia.scm.cli.I18n;
import sonia.scm.cli.wrapper.GroupWrapper;
import sonia.scm.client.GroupClientHandler;
import sonia.scm.client.ScmClientSession;
import sonia.scm.group.Group;
@@ -109,7 +110,7 @@ public class ModifyGroupSubCommand extends TemplateSubCommand
Map<String, Object> env = new HashMap<String, Object>();
env.put("group", group);
env.put("group", new GroupWrapper(group));
renderTemplate(env, GetGroupSubCommand.TEMPLATE);
}
else

3
scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ModifyRepositorySubCommand.java
View File

@@ -39,6 +39,7 @@ import org.kohsuke.args4j.Argument;
import org.kohsuke.args4j.Option;
import sonia.scm.cli.I18n;
import sonia.scm.cli.wrapper.RepositoryWrapper;
import sonia.scm.client.RepositoryClientHandler;
import sonia.scm.client.ScmClientSession;
import sonia.scm.repository.Repository;
@@ -136,7 +137,7 @@ public class ModifyRepositorySubCommand extends TemplateSubCommand
Map<String, Object> env = new HashMap<String, Object>();
env.put("repository", repository);
env.put("repository", new RepositoryWrapper(repository));
renderTemplate(env, GetRepositorySubCommand.TEMPLATE);
}
else

3
scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ModifyUserSubCommand.java
View File

@@ -39,6 +39,7 @@ import org.kohsuke.args4j.Argument;
import org.kohsuke.args4j.Option;
import sonia.scm.cli.I18n;
import sonia.scm.cli.wrapper.UserWrapper;
import sonia.scm.client.ScmClientSession;
import sonia.scm.client.UserClientHandler;
import sonia.scm.user.User;
@@ -185,7 +186,7 @@ public class ModifyUserSubCommand extends TemplateSubCommand
Map<String, Object> env = new HashMap<String, Object>();
env.put("user", user);
env.put("user", new UserWrapper(user));
renderTemplate(env, GetUserSubCommand.TEMPLATE);
}
else

3
scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/PermissionSubCommand.java
View File

@@ -38,6 +38,7 @@ package sonia.scm.cli.cmd;
import org.kohsuke.args4j.Argument;
import sonia.scm.cli.I18n;
import sonia.scm.cli.wrapper.RepositoryWrapper;
import sonia.scm.client.RepositoryClientHandler;
import sonia.scm.client.ScmClientSession;
import sonia.scm.repository.Permission;
@@ -119,7 +120,7 @@ public abstract class PermissionSubCommand extends TemplateSubCommand
Map<String, Object> env = new HashMap<String, Object>();
env.put("repository", repository);
env.put("repository", new RepositoryWrapper(repository));
renderTemplate(env, GetRepositorySubCommand.TEMPLATE);
}
else