Return-Path: 
 <commons-dev-return-71782-apmail-jakarta-commons-dev-archive=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-commons-dev-archive@www.apache.org
Received: (qmail 46536 invoked from network); 25 May 2005 16:47:38 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 25 May 2005 16:47:38 -0000
Received: (qmail 57859 invoked by uid 500); 25 May 2005 16:47:34 -0000
Delivered-To: apmail-jakarta-commons-dev-archive@jakarta.apache.org
Received: (qmail 57823 invoked by uid 500); 25 May 2005 16:47:34 -0000
Mailing-List: contact commons-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:commons-dev-unsubscribe@jakarta.apache.org>
List-Help: <mailto:commons-dev-help@jakarta.apache.org>
List-Post: <mailto:commons-dev@jakarta.apache.org>
List-Id: "Jakarta Commons Developers List" <commons-dev.jakarta.apache.org>
Reply-To: "Jakarta Commons Developers List" <commons-dev@jakarta.apache.org>
Delivered-To: mailing list commons-dev@jakarta.apache.org
Received: (qmail 57808 invoked by uid 500); 25 May 2005 16:47:34 -0000
Received: (qmail 57805 invoked by uid 99); 25 May 2005 16:47:34 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Wed, 25 May 2005 09:47:32 -0700
Received: (qmail 46486 invoked by uid 65534); 25 May 2005 16:47:30 -0000
Message-ID: <20050525164730.46485.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Subject: svn commit: r178484 - in /jakarta/commons/sandbox/contract/trunk:
 build.xml
 project.properties project.xml run_example.bat
 src/java/org/apache/commons/contract/i18n/ParameterBundle.java
 src/java/org/apache/commons/contract/util/InteractiveMainWrapper.java
Date: Wed, 25 May 2005 16:47:29 -0000
To: commons-cvs@jakarta.apache.org
From: dflorey@apache.org
X-Mailer: svnmailer-1.0.0-dev
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: dflorey
Date: Wed May 25 09:47:29 2005
New Revision: 178484

URL: http://svn.apache.org/viewcvs?rev=3D178484&view=3Drev
Log: (empty)

Modified:
    jakarta/commons/sandbox/contract/trunk/build.xml
    jakarta/commons/sandbox/contract/trunk/project.properties
    jakarta/commons/sandbox/contract/trunk/project.xml
    jakarta/commons/sandbox/contract/trunk/run_example.bat
    jakarta/commons/sandbox/contract/trunk/src/java/org/apache/commons/cont=
ract/i18n/ParameterBundle.java
    jakarta/commons/sandbox/contract/trunk/src/java/org/apache/commons/cont=
ract/util/InteractiveMainWrapper.java

Modified: jakarta/commons/sandbox/contract/trunk/build.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/contract/trunk/b=
uild.xml?rev=3D178484&r1=3D178483&r2=3D178484&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- jakarta/commons/sandbox/contract/trunk/build.xml (original)
+++ jakarta/commons/sandbox/contract/trunk/build.xml Wed May 25 09:47:29 20=
05
@@ -18,7 +18,7 @@
 	<property name=3D"deprecation" value=3D"true" />
 	<property name=3D"optimize" value=3D"true" />
=20
-	<property name=3D"version" value=3D"0.2" />
+	<property name=3D"version" value=3D"20050525" />
 	<property name=3D"name" value=3D"commons-contract" />
 	<!--=20
   =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
@@ -96,8 +96,8 @@
 			</fileset>
             <manifest>
               <attribute name=3D"Built-By" value=3D"Daniel Florey"/>
-              <attribute name=3D"Main-Class" value=3D"org/apache/commons/c=
ontract/example/SimpleMain"/>
-              <attribute name=3D"Class-Path" value=3D"commons-contract-0.2=
.jar ../../lib/commons-xmlio-0.1pre.jar ../../lib/commons-i18n-0.2.jar"/>
+              <attribute name=3D"Main-Class" value=3D"org/apache/commons/c=
ontract/example/TestSpeedCalculator"/>
+              <attribute name=3D"Class-Path" value=3D"commons-contract-200=
50525.jar ../../lib/commons-i18n-20050525.jar"/>
             </manifest>
 		</jar>
 	</target>

Modified: jakarta/commons/sandbox/contract/trunk/project.properties
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/contract/trunk/p=
roject.properties?rev=3D178484&r1=3D178483&r2=3D178484&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- jakarta/commons/sandbox/contract/trunk/project.properties (original)
+++ jakarta/commons/sandbox/contract/trunk/project.properties Wed May 25 09=
:47:29 2005
@@ -30,5 +30,4 @@
 # ------------------------------------------------------------------------
 # Jars set explicity by path.
 # ------------------------------------------------------------------------
-maven.jar.commons-i18n =3D ${basedir}/lib/commons-i18n-0.4.jar
-maven.jar.commons-xmlio =3D ${basedir}/lib/commons-xmlio-0.1pre.jar
+maven.jar.commons-i18n =3D ${basedir}/lib/commons-i18n-20050525.jar
\ No newline at end of file

Modified: jakarta/commons/sandbox/contract/trunk/project.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/contract/trunk/p=
roject.xml?rev=3D178484&r1=3D178483&r2=3D178484&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- jakarta/commons/sandbox/contract/trunk/project.xml (original)
+++ jakarta/commons/sandbox/contract/trunk/project.xml Wed May 25 09:47:29 =
2005
@@ -10,7 +10,7 @@
   <shortDescription>Commons Contract</shortDescription>
   <description>Contract based programming</description>
=20
-  <currentVersion>0.2</currentVersion>
+  <currentVersion>20050525</currentVersion>
   <versions>
   </versions>
   <branches>
@@ -42,11 +42,7 @@
   <dependencies>
     <dependency>
       <id>commons-i18n</id>
-      <version>0.4</version>
-    </dependency>
-    <dependency>
-      <id>commons-xmlio</id>
-      <version>0.1pre</version>
+      <version>20050525</version>
     </dependency>
   </dependencies>
=20

Modified: jakarta/commons/sandbox/contract/trunk/run_example.bat
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/contract/trunk/r=
un_example.bat?rev=3D178484&r1=3D178483&r2=3D178484&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
Binary files - no diff available.

Modified: jakarta/commons/sandbox/contract/trunk/src/java/org/apache/common=
s/contract/i18n/ParameterBundle.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/contract/trunk/s=
rc/java/org/apache/commons/contract/i18n/ParameterBundle.java?rev=3D178484&=
r1=3D178483&r2=3D178484&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- jakarta/commons/sandbox/contract/trunk/src/java/org/apache/commons/cont=
ract/i18n/ParameterBundle.java (original)
+++ jakarta/commons/sandbox/contract/trunk/src/java/org/apache/commons/cont=
ract/i18n/ParameterBundle.java Wed May 25 09:47:29 2005
@@ -20,19 +20,11 @@
         super(messageId, arguments);
     }
=20
-    public String getPrompt() {
-        return getEntry(PROMPT, Locale.getDefault());
-    }
-
     public String getPrompt(Locale locale) {
         return getEntry(PROMPT, locale);
     }
=20
-    public String getPrompt(String defaultPrompt) {
-        return getEntry(PROMPT, defaultPrompt, Locale.getDefault());
-    }
-
     public String getPrompt(Locale locale, String defaultPrompt) {
-        return getEntry(PROMPT, defaultPrompt, locale);
+        return getEntry(PROMPT, locale, defaultPrompt);
     }
 }

Modified: jakarta/commons/sandbox/contract/trunk/src/java/org/apache/common=
s/contract/util/InteractiveMainWrapper.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/contract/trunk/s=
rc/java/org/apache/commons/contract/util/InteractiveMainWrapper.java?rev=3D=
178484&r1=3D178483&r2=3D178484&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- jakarta/commons/sandbox/contract/trunk/src/java/org/apache/commons/cont=
ract/util/InteractiveMainWrapper.java (original)
+++ jakarta/commons/sandbox/contract/trunk/src/java/org/apache/commons/cont=
ract/util/InteractiveMainWrapper.java Wed May 25 09:47:29 2005
@@ -23,6 +23,7 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
=20
 import org.apache.commons.contract.Context;
@@ -47,7 +48,7 @@
             do {
                 System.out.print(parameterDescriptors[i].getName()+" - ");
             printParameterInfo(parameterDescriptors[i]);
-            System.out.print(((ParameterBundle)parameterDescriptors[i].get=
Description()).getPrompt());
+            System.out.print(((ParameterBundle)parameterDescriptors[i].get=
Description()).getPrompt(Locale.getDefault()));
             try {
                 String userInput =3D in.readLine();
                 value =3D Executor.prepareValue(parameterDescriptors[i], u=
serInput, context);



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org