From 015ab637eba8d1b91f4eefdd0bd6c0cb2bf50606 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Sun, 22 May 2011 15:27:07 +0200
Subject: [PATCH] remove metavar prefix

---
 .../sonia/scm/cli/cmd/AddPermissionSubCommand.java     |  2 +-
 .../java/sonia/scm/cli/cmd/DeleteGroupSubCommand.java  |  6 +++++-
 .../main/java/sonia/scm/cli/cmd/MembersSubCommand.java |  2 +-
 .../sonia/scm/cli/cmd/SubCommandOptionHandler.java     |  2 +-
 .../src/main/resources/sonia/resources/i18n.properties | 10 +++++-----
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/AddPermissionSubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/AddPermissionSubCommand.java
index b0d30b8f24..6b0ea149f5 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/AddPermissionSubCommand.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/AddPermissionSubCommand.java
@@ -140,7 +140,7 @@ public class AddPermissionSubCommand extends PermissionSubCommand
     name = "--type",
     usage = "optionPermissionType",
     required = true,
-    metaVar="metaVar_permissionType",
+    metaVar="permissiontype",
     aliases = { "-t" }
   )
   private PermissionType type;
diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/DeleteGroupSubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/DeleteGroupSubCommand.java
index 0f183aeaf7..345cf5baec 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/DeleteGroupSubCommand.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/DeleteGroupSubCommand.java
@@ -92,6 +92,10 @@ public class DeleteGroupSubCommand extends SubCommand
   //~--- fields ---------------------------------------------------------------
 
   /** Field description */
-  @Argument(usage = "optionGroupName", required = true)
+  @Argument(
+    usage = "optionGroupName",
+    metaVar = "groupname",
+    required = true
+  )
   private String name;
 }
diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/MembersSubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/MembersSubCommand.java
index 801b4b2f94..6c37f73f4e 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/MembersSubCommand.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/MembersSubCommand.java
@@ -156,7 +156,7 @@ public abstract class MembersSubCommand extends TemplateSubCommand
   /** Field description */
   @Argument(
     usage = "optionGroupName",
-    metaVar = "metaVar_groupName",
+    metaVar = "groupname",
     required = true
   )
   private String name;
diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/SubCommandOptionHandler.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/SubCommandOptionHandler.java
index 80a6726d8a..cf14b44b8e 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/SubCommandOptionHandler.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/SubCommandOptionHandler.java
@@ -108,6 +108,6 @@ public class SubCommandOptionHandler extends OptionHandler<SubCommand>
   @Override
   public String getDefaultMetaVariable()
   {
-    return "metaVar_command";
+    return "command";
   }
 }
diff --git a/scm-clients/scm-cli-client/src/main/resources/sonia/resources/i18n.properties b/scm-clients/scm-cli-client/src/main/resources/sonia/resources/i18n.properties
index 52045c2ed2..37bb7a999a 100644
--- a/scm-clients/scm-cli-client/src/main/resources/sonia/resources/i18n.properties
+++ b/scm-clients/scm-cli-client/src/main/resources/sonia/resources/i18n.properties
@@ -67,11 +67,11 @@ repositoryNotFound = The repository is not available
 userNotFound = The user could not be found
 groupNotFoun = The group could not be found
 
-metaVar_config = configname
-metaVar_arg = subcommand arguments
-metaVar_command = subcommand
-metaVar_permissionType = value
-metaVar_groupName = groupname
+config = configname
+arg = subcommand arguments
+command = subcommand
+permissiontype = value
+groupname = groupname
 
 config = Configuration
 misc = Miscellaneous