You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2007/09/08 17:00:40 UTC

svn commit: r573851 - /jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/gui/WrapperEditor.java

Author: sebb
Date: Sat Sep  8 08:00:40 2007
New Revision: 573851

URL: http://svn.apache.org/viewvc?rev=573851&view=rev
Log:
Distinguish different IllegalArgument conditions

Modified:
    jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/gui/WrapperEditor.java

Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/gui/WrapperEditor.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/gui/WrapperEditor.java?rev=573851&r1=573850&r2=573851&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/gui/WrapperEditor.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/gui/WrapperEditor.java Sat Sep  8 08:00:40 2007
@@ -50,8 +50,6 @@
  * provides optional support for JMeter 'expressions' (you can choose whether
  * they make valid property values).
  * 
- * @author <a href="mailto:jsalvata@apache.org">Jordi Salvat i Alabart</a>
- * @version $Revision$ updated on $Date$
  */
 class WrapperEditor extends PropertyEditorSupport implements PropertyChangeListener {
 	protected static Logger log = LoggingManager.getLoggerForClass();
@@ -298,7 +296,7 @@
 
 		if (value == null) {
 			if (!acceptsNull)
-				throw new IllegalArgumentException();
+				throw new IllegalArgumentException("Null is not allowed");
 			text = null;
 		} else if (acceptsExpressions && isExpression(value)) {
 			text = (String) value;
@@ -308,7 +306,7 @@
 			text = typeEditor.getAsText();
 
 			if (!acceptsOther && !isATag(text))
-				throw new IllegalArgumentException();
+				throw new IllegalArgumentException("Value not allowed: "+text);
 		}
 
 		guiEditor.setValue(text);
@@ -349,7 +347,7 @@
 
 		if (text == null) {
 			if (!acceptsNull)
-				throw new IllegalArgumentException();
+				throw new IllegalArgumentException("Null parameter not allowed");
 			value = null;
 		} else {
 			if (acceptsExpressions && isExpression(text)) {
@@ -357,12 +355,11 @@
 			} else {
 				// Some editors do tiny transformations (e.g. "true" to
 				// "True",...):
-				typeEditor.setAsText(text); // may throw
-											// IllegalArgumentException
+				typeEditor.setAsText(text); // may throw IllegalArgumentException
 				value = typeEditor.getAsText();
 
 				if (!acceptsOther && !isATag(text))
-					throw new IllegalArgumentException();
+					throw new IllegalArgumentException("Value not allowed: "+text);
 			}
 		}
 



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