Return-Path: <jvanzyl@apache.org>
Mailing-List: contact turbine-maven-dev-help@jakarta.apache.org; run by ezmlm
Delivered-To: mailing list turbine-maven-dev@jakarta.apache.org
Received: (qmail 1260 invoked by uid 97); 3 Dec 2002 02:49:53 -0000
Received: (qmail 1256 invoked by uid 98); 3 Dec 2002 02:49:52 -0000
X-Antivirus: nagoya (v4218 created Aug 14 2002)
Received: (qmail 1237 invoked from network); 3 Dec 2002 02:49:50 -0000
Received: from daedalus.apache.org (HELO apache.org) (63.251.56.142)
  by nagoya.betaversion.org with SMTP; 3 Dec 2002 02:49:50 -0000
Received: (qmail 21029 invoked by uid 500); 3 Dec 2002 02:48:37 -0000
Received: (qmail 21022 invoked from network); 3 Dec 2002 02:48:37 -0000
Received: from icarus.apache.org (63.251.56.143)
  by daedalus.apache.org with SMTP; 3 Dec 2002 02:48:37 -0000
Received: (qmail 84548 invoked by uid 1162); 3 Dec 2002 02:48:36 -0000
Date: 3 Dec 2002 02:48:36 -0000
Message-ID: <20021203024836.84547.qmail@icarus.apache.org>
From: jvanzyl@apache.org
To: jakarta-turbine-maven-cvs@apache.org
Subject: cvs commit: jakarta-turbine-maven/src/java/org/apache/maven
 MavenUtils.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

jvanzyl     2002/12/02 18:48:36

  Modified:    src/java/org/apache/maven MavenUtils.java
  Log:
  o adding really simple localized messaging and just
  defaulting to english right now.
  
  Revision  Changes    Path
  1.73      +48 -1     jakarta-turbine-maven/src/java/org/apache/maven/MavenUtils.java
  
  Index: MavenUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/MavenUtils.java,v
  retrieving revision 1.72
  retrieving revision 1.73
  diff -u -r1.72 -r1.73
  --- MavenUtils.java	2 Dec 2002 15:21:44 -0000	1.72
  +++ MavenUtils.java	3 Dec 2002 02:48:36 -0000	1.73
  @@ -818,4 +818,51 @@
               baseObject.addProperty( name + ":" + value );
           }
       }
  +
  +    private static Properties messages;
  +
  +    private static void loadMessages()
  +    {
  +        messages = loadProperties(
  +            MavenUtils.class.getClassLoader().getResourceAsStream(
  +                "org/apache/maven/messages/messages.en" ) );
  +    }
  +
  +    /**
  +     * Retrieve a user message.
  +     *
  +     * @param messageId Id of message type to use.
  +     * @return Message for the user's locale.
  +     */
  +    public static String getMessage( String messageId )
  +    {
  +        return getMessage( messageId, null );
  +    }
  +
  +   /**
  +     * Retrieve a user message.
  +     *
  +     * @param messageId Id of message type to use.
  +     * @param variable Value to substitute for ${1} in the given message.
  +     * @return Message for the user's locale.
  +     */
  +    public static String getMessage( String messageId, Object variable )
  +    {
  +        if ( messages == null )
  +        {
  +            loadMessages();
  +        }
  +
  +        if ( variable == null )
  +        {
  +            return messages.getProperty( messageId );
  +        }
  +        else
  +        {
  +            return StringUtils.replace( messages.getProperty( messageId ),
  +                                        "${1}",
  +                                        variable.toString() );
  +        }
  +
  +    }
   }