Merge pull request #856 from ohmage/ohmage-2.16

merge min/max validation to user_setup branch

Author: stevenolen

.gitignore

@@ -8,3 +8,4 @@ web/WEB-INF/properties/system.properties
 thirdparty
 /nbproject/
 .settings
+.ant-targets-build.xml

src/org/ohmage/domain/campaign/prompt/BoundedPrompt.java

@@ -142,6 +142,11 @@ public BoundedPrompt(
 		}
 		this.max = max;
 
+		// max has to be >= min
+		if (this.max.compareTo(this.min) < 0) {
+		    throw new DomainException("The max value (" +this.max + ") is less than the min value (" + this.min + ")");
+		}
+		
 		// Validate the default value.
 		if(defaultValue != null) {
 			if(mustBeWholeNumber() && (! isWholeNumber(defaultValue))) {
@@ -152,7 +157,7 @@ public BoundedPrompt(
 			else if(defaultValue.compareTo(min) < 0) {
 				throw
 					new DomainException(
-						"The default value is greater than the minimum " +
+						"The default value is smaller than the minimum " +
 							"value (" +
 							min +
 							"): " +