Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Struckmann2014-10-22 08:04:45 +0000
committerSebastian Struckmann2014-10-22 08:04:45 +0000
commit0b46aa3e128e23211d237e1d3477257b81f9f406 (patch)
treecf3236d7e917d3677548b2e2a108188a84550cb0 /org.eclipse.jubula.toolkit.api.gen
parentf1200943bccb97092f503266e9db025b727c4546 (diff)
downloadorg.eclipse.jubula.core-0b46aa3e128e23211d237e1d3477257b81f9f406.tar.gz
org.eclipse.jubula.core-0b46aa3e128e23211d237e1d3477257b81f9f406.tar.xz
org.eclipse.jubula.core-0b46aa3e128e23211d237e1d3477257b81f9f406.zip
Sprint task - Java API - Switched from Assert to Validate in generated classes
Diffstat (limited to 'org.eclipse.jubula.toolkit.api.gen')
-rw-r--r--org.eclipse.jubula.toolkit.api.gen/templates/ClassGenerator.javajet6
1 files changed, 3 insertions, 3 deletions
diff --git a/org.eclipse.jubula.toolkit.api.gen/templates/ClassGenerator.javajet b/org.eclipse.jubula.toolkit.api.gen/templates/ClassGenerator.javajet
index fc4d6337e..c2d65d37d 100644
--- a/org.eclipse.jubula.toolkit.api.gen/templates/ClassGenerator.javajet
+++ b/org.eclipse.jubula.toolkit.api.gen/templates/ClassGenerator.javajet
@@ -76,10 +76,10 @@ package <%=packageName%>;
import org.eclipse.jubula.communication.CAP;
<%if (!genInterface) {%>
+import org.apache.commons.lang.Validate;
import org.eclipse.jubula.communication.internal.message.MessageCap;
import org.eclipse.jubula.communication.internal.message.MessageParam;
import org.eclipse.jubula.tools.ComponentIdentifier;
-import org.eclipse.jubula.tools.internal.exception.Assert;
import org.eclipse.jubula.tools.internal.objects.IComponentIdentifier;
import org.eclipse.jubula.toolkit.internal.annotations.RealizedType;
import org.eclipse.jubula.toolkit.internal.annotations.TesterClass;
@@ -118,7 +118,7 @@ public <%if (genInterface) {%>interface<%} else {%>class<%}%> <%=className%>
protected IComponentIdentifier m_componentIdentifier;
public <%=className%>(ComponentIdentifier componentIdentifier) {
super();
- Assert.verify(componentIdentifier instanceof IComponentIdentifier);
+ Validate.isTrue(componentIdentifier instanceof IComponentIdentifier);
m_componentIdentifier = (IComponentIdentifier) componentIdentifier;
}<%}%>
<%}%>
@@ -178,7 +178,7 @@ public <%if (genInterface) {%>interface<%} else {%>class<%}%> <%=className%>
<%for (Param parameter : params) {
String paramName = parameter.getName();%>
<%String translatedParamName = nameLoader.translateFromCompSystem(paramName);%>
- Assert.verify(<%=translatedParamName%> != null, "Argument '<%=translatedParamName%>' must not be null");
+ Validate.notNull(<%=translatedParamName%>, "Argument '<%=translatedParamName%>' must not be null");
<%String paramType = paramMap.get(paramName);%>
<%if (nameLoader.isInEnumMap(paramType)) {%>
messageCap.addMessageParam(new MessageParam(<%=translatedParamName%>.rcValue(), "java.lang.String"));

Back to the top