- rewrote i18n code

- externalised error strings


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/cli/trunk@280462 13f79535-47bb-0310-9956-ffa450edef68

Author: John Keyes

src/java/org/apache/commons/cli2/OptionException.java

@@ -1,5 +1,5 @@
-/**
- * Copyright 2003-2004 The Apache Software Foundation
+/*
+ * Copyright 2003-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,44 +23,42 @@
 /**
  * A problem found while dealing with command line options.
  */
-public class OptionException extends Exception {
-
+public class OptionException
+    extends Exception {
     /**
      * The settings used when displaying the related Option.
-     * 
+     *
      * @see DisplaySetting
      */
-    public static final Set HELP_SETTINGS = 
-        Collections.unmodifiableSet(
-            Collections.singleton(
-                DisplaySetting.DISPLAY_PROPERTY_OPTION));
+    public static final Set HELP_SETTINGS =
+        Collections.unmodifiableSet(Collections.singleton(DisplaySetting.DISPLAY_PROPERTY_OPTION));
+
+    /** resource helper instance */
+    private static final ResourceHelper helper = ResourceHelper.getResourceHelper();
 
     /** The Option the exception relates to */
     private final Option option;
-    
+
     /** The message explaining the Exception */
     private final String message;
 
-    /** resource helper instance */
-    private static final ResourceHelper helper =
-        ResourceHelper.getResourceHelper(OptionException.class);
-    
     /**
      * Creates a new OptionException.
-     * 
+     *
      * @param option
      *            The Option the exception relates to
      */
     public OptionException(final Option option) {
         this(option, null, null);
     }
-    
+
     /**
      * Creates a new OptionException.
      * @param option the Option the exception relates to
      * @param messageKey the id of the message to display
      */
-    public OptionException(final Option option, final String messageKey) {
+    public OptionException(final Option option,
+                           final String messageKey) {
         this(option, messageKey, null);
     }
 
@@ -70,40 +68,38 @@ public OptionException(final Option option, final String messageKey) {
      * @param messageKey the id of the message to display
      * @param value a value to display with the message
      */
-    public OptionException(
-            final Option option, 
-            final String messageKey, 
-            final String value) {
-        
+    public OptionException(final Option option,
+                           final String messageKey,
+                           final String value) {
         this.option = option;
-        
+
         if (messageKey != null) {
             final StringBuffer buffer = new StringBuffer();
+
             if (value != null) {
                 buffer.append(helper.getMessage(messageKey, value));
-            }
-            else {
+            } else {
                 buffer.append(helper.getMessage(messageKey));
             }
+
             buffer.append(" ");
 
             option.appendUsage(buffer, HELP_SETTINGS, null);
             message = buffer.toString();
-        }
-        else {
+        } else {
             message = "";
         }
     }
-    
+
     /**
      * Gets the Option the exception relates to
-     * 
+     *
      * @return The related Option
      */
     public Option getOption() {
         return option;
     }
-    
+
     public String getMessage() {
         return message;
     }

src/java/org/apache/commons/cli2/builder/CommandBuilder.java

@@ -1,5 +1,5 @@
-/**
- * Copyright 2003-2004 The Apache Software Foundation
+/*
+ * Copyright 2003-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,12 +21,13 @@
 import org.apache.commons.cli2.Argument;
 import org.apache.commons.cli2.Group;
 import org.apache.commons.cli2.option.Command;
+import org.apache.commons.cli2.resource.ResourceConstants;
+import org.apache.commons.cli2.resource.ResourceHelper;
 
 /**
  * Builds Command instances
  */
 public class CommandBuilder {
-
     /** the preferred name of the command */
     private String preferredName;
 
@@ -58,26 +59,18 @@ public CommandBuilder() {
     /**
      * Creates a new <code>Command</code> instance using the properties of the
      * <code>CommandBuilder</code>.
-     * 
+     *
      * @return the new Command instance
      */
     public Command create() {
-
         // check we have a valid name
         if (preferredName == null) {
-            throw new IllegalStateException("Options must have at least one name");
+            throw new IllegalStateException(ResourceHelper.getResourceHelper().getMessage(ResourceConstants.OPTION_NO_NAME));
         }
 
         // build the command
         final Command option =
-            new Command(
-                preferredName,
-                description,
-                aliases,
-                required,
-                argument,
-                children,
-                id);
+            new Command(preferredName, description, aliases, required, argument, children, id);
 
         // reset the builder
         reset();
@@ -86,8 +79,8 @@ public Command create() {
     }
 
     /**
-     * Resets the CommandBuilder to the defaults for a new Command. 
-     * 
+     * Resets the CommandBuilder to the defaults for a new Command.
+     *
      * This method is called automatically at the end of the
      * {@link #create() create} method.
      */
@@ -99,24 +92,24 @@ public CommandBuilder reset() {
         argument = null;
         children = null;
         id = 0;
+
         return this;
     }
 
     /**
-     * Specifies the name for the next <code>Command</code> 
+     * Specifies the name for the next <code>Command</code>
      * that is created.  The first name is used as the preferred
-     * display name for the <code>Command</code> and then 
+     * display name for the <code>Command</code> and then
      * later names are used as aliases.
-     * 
+     *
      * @param name the name for the next <code>Command</code>
      * that is created.
      * @return this <code>CommandBuilder</code>.
      */
     public CommandBuilder withName(final String name) {
         if (preferredName == null) {
             preferredName = name;
-        }
-        else {
+        } else {
             aliases.add(name);
         }
 
@@ -125,15 +118,16 @@ public CommandBuilder withName(final String name) {
 
     /**
      * Specifies the description for the next <code>Command</code>
-     * that is created.  This description is used to produce 
+     * that is created.  This description is used to produce
      * help documentation for the <code>Command</code>.
-     * 
-     * @param newDescription the description for the next 
+     *
+     * @param newDescription the description for the next
      * <code>Command</code> that is created.
      * @return this <code>CommandBuilder</code>.
      */
     public CommandBuilder withDescription(final String newDescription) {
         this.description = newDescription;
+
         return this;
     }
 
@@ -146,43 +140,47 @@ public CommandBuilder withDescription(final String newDescription) {
      */
     public CommandBuilder withRequired(final boolean newRequired) {
         this.required = newRequired;
+
         return this;
     }
 
     /**
-     * Specifies the children for the next <code>Command</code> 
+     * Specifies the children for the next <code>Command</code>
      * that is created.
-     * 
+     *
      * @param newChildren the child options for the next <code>Command</code>
      * that is created.
      * @return this <code>CommandBuilder</code>.
      */
     public CommandBuilder withChildren(final Group newChildren) {
         this.children = newChildren;
+
         return this;
     }
 
     /**
-     * Specifies the argument for the next <code>Command</code> 
+     * Specifies the argument for the next <code>Command</code>
      * that is created.
-     * 
-     * @param newArgument the argument for the next <code>Command</code> 
+     *
+     * @param newArgument the argument for the next <code>Command</code>
      * that is created.
      * @return this <code>CommandBuilder</code>.
      */
     public CommandBuilder withArgument(final Argument newArgument) {
         this.argument = newArgument;
+
         return this;
     }
 
     /**
      * Specifies the id for the next <code>Command</code> that is created.
-     * 
+     *
      * @param newId the id for the next <code>Command</code> that is created.
      * @return this <code>CommandBuilder</code>.
      */
     public final CommandBuilder withId(final int newId) {
         this.id = newId;
+
         return this;
     }
 }