You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by df...@apache.org on 2005/05/25 18:47:29 UTC
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
Author: dflorey
Date: Wed May 25 09:47:29 2005
New Revision: 178484
URL: http://svn.apache.org/viewcvs?rev=178484&view=rev
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/contract/i18n/ParameterBundle.java
jakarta/commons/sandbox/contract/trunk/src/java/org/apache/commons/contract/util/InteractiveMainWrapper.java
Modified: jakarta/commons/sandbox/contract/trunk/build.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/contract/trunk/build.xml?rev=178484&r1=178483&r2=178484&view=diff
==============================================================================
--- jakarta/commons/sandbox/contract/trunk/build.xml (original)
+++ jakarta/commons/sandbox/contract/trunk/build.xml Wed May 25 09:47:29 2005
@@ -18,7 +18,7 @@
<property name="deprecation" value="true" />
<property name="optimize" value="true" />
- <property name="version" value="0.2" />
+ <property name="version" value="20050525" />
<property name="name" value="commons-contract" />
<!--
===================================================================
@@ -96,8 +96,8 @@
</fileset>
<manifest>
<attribute name="Built-By" value="Daniel Florey"/>
- <attribute name="Main-Class" value="org/apache/commons/contract/example/SimpleMain"/>
- <attribute name="Class-Path" value="commons-contract-0.2.jar ../../lib/commons-xmlio-0.1pre.jar ../../lib/commons-i18n-0.2.jar"/>
+ <attribute name="Main-Class" value="org/apache/commons/contract/example/TestSpeedCalculator"/>
+ <attribute name="Class-Path" value="commons-contract-20050525.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/project.properties?rev=178484&r1=178483&r2=178484&view=diff
==============================================================================
--- 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 = ${basedir}/lib/commons-i18n-0.4.jar
-maven.jar.commons-xmlio = ${basedir}/lib/commons-xmlio-0.1pre.jar
+maven.jar.commons-i18n = ${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/project.xml?rev=178484&r1=178483&r2=178484&view=diff
==============================================================================
--- 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>
- <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>
Modified: jakarta/commons/sandbox/contract/trunk/run_example.bat
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/contract/trunk/run_example.bat?rev=178484&r1=178483&r2=178484&view=diff
==============================================================================
Binary files - no diff available.
Modified: jakarta/commons/sandbox/contract/trunk/src/java/org/apache/commons/contract/i18n/ParameterBundle.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/contract/trunk/src/java/org/apache/commons/contract/i18n/ParameterBundle.java?rev=178484&r1=178483&r2=178484&view=diff
==============================================================================
--- jakarta/commons/sandbox/contract/trunk/src/java/org/apache/commons/contract/i18n/ParameterBundle.java (original)
+++ jakarta/commons/sandbox/contract/trunk/src/java/org/apache/commons/contract/i18n/ParameterBundle.java Wed May 25 09:47:29 2005
@@ -20,19 +20,11 @@
super(messageId, arguments);
}
- public String getPrompt() {
- return getEntry(PROMPT, Locale.getDefault());
- }
-
public String getPrompt(Locale locale) {
return getEntry(PROMPT, locale);
}
- 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/commons/contract/util/InteractiveMainWrapper.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/contract/trunk/src/java/org/apache/commons/contract/util/InteractiveMainWrapper.java?rev=178484&r1=178483&r2=178484&view=diff
==============================================================================
--- jakarta/commons/sandbox/contract/trunk/src/java/org/apache/commons/contract/util/InteractiveMainWrapper.java (original)
+++ jakarta/commons/sandbox/contract/trunk/src/java/org/apache/commons/contract/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;
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].getDescription()).getPrompt());
+ System.out.print(((ParameterBundle)parameterDescriptors[i].getDescription()).getPrompt(Locale.getDefault()));
try {
String userInput = in.readLine();
value = Executor.prepareValue(parameterDescriptors[i], userInput, context);
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org