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
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
-rw-r--r--org.eclipse.jubula.toolkit.api.gen/templates/ClassGenerator.javajet6
-rw-r--r--org.eclipse.jubula.toolkit.base.api/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.jubula.toolkit.concrete.api/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.jubula.toolkit.gef.api/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.jubula.toolkit.html.api/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.jubula.toolkit.ios.api/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.jubula.toolkit.javafx.api/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.jubula.toolkit.mobile.api/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.jubula.toolkit.swing.api/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.jubula.toolkit.swt.api/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.jubula.toolkit.win.api/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.jubula.toolkit.winapps.api/META-INF/MANIFEST.MF3
12 files changed, 25 insertions, 14 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"));
diff --git a/org.eclipse.jubula.toolkit.base.api/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.base.api/META-INF/MANIFEST.MF
index 28191348c..434bec5ac 100644
--- a/org.eclipse.jubula.toolkit.base.api/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.base.api/META-INF/MANIFEST.MF
@@ -11,7 +11,8 @@ Export-Package: org.eclipse.jubula.toolkit.base.config,
org.eclipse.jubula.toolkit.base.internal.impl,
org.eclipse.jubula.toolkit.base.components,
org.eclipse.jubula.toolkit.base
-Require-Bundle: org.eclipse.jubula.client.api;bundle-version="[2.4.0,2.5.0)",
+Require-Bundle: org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
+ org.eclipse.jubula.client.api;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.toolkit.api;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.toolkit.api.gen;resolution:=optional;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.tools;bundle-version="[2.4.0,2.5.0)",
diff --git a/org.eclipse.jubula.toolkit.concrete.api/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.concrete.api/META-INF/MANIFEST.MF
index 523289e6b..84db62f1e 100644
--- a/org.eclipse.jubula.toolkit.concrete.api/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.concrete.api/META-INF/MANIFEST.MF
@@ -10,7 +10,8 @@ Bundle-ClassPath: .
Export-Package: org.eclipse.jubula.toolkit.concrete.components,
org.eclipse.jubula.toolkit.concrete.internal.impl,
org.eclipse.jubula.toolkit.concrete
-Require-Bundle: org.eclipse.jubula.toolkit.api;bundle-version="[2.4.0,2.5.0)",
+Require-Bundle: org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
+ org.eclipse.jubula.toolkit.api;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.toolkit.api.gen;resolution:=optional;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.toolkit.base.api;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.tools;bundle-version="[2.4.0,2.5.0)",
diff --git a/org.eclipse.jubula.toolkit.gef.api/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.gef.api/META-INF/MANIFEST.MF
index 2d1e283e6..0a665c705 100644
--- a/org.eclipse.jubula.toolkit.gef.api/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.gef.api/META-INF/MANIFEST.MF
@@ -7,7 +7,8 @@ Bundle-Vendor: Eclipse Jubula
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
-Require-Bundle: org.eclipse.jubula.toolkit.api;bundle-version="[2.4.0,2.5.0)",
+Require-Bundle: org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
+ org.eclipse.jubula.toolkit.api;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.toolkit.api.gen;resolution:=optional;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.toolkit.base.api;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.toolkit.rcp.api;bundle-version="[2.4.0,2.5.0)",
diff --git a/org.eclipse.jubula.toolkit.html.api/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.html.api/META-INF/MANIFEST.MF
index 1268854af..a5682a22d 100644
--- a/org.eclipse.jubula.toolkit.html.api/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.html.api/META-INF/MANIFEST.MF
@@ -7,7 +7,8 @@ Bundle-Vendor: Eclipse Jubula
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
-Require-Bundle: org.eclipse.jubula.toolkit.api;bundle-version="[2.4.0,2.5.0)",
+Require-Bundle: org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
+ org.eclipse.jubula.toolkit.api;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.toolkit.api.gen;resolution:=optional;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.toolkit.base.api;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.toolkit.concrete.api;bundle-version="[2.4.0,2.5.0)",
diff --git a/org.eclipse.jubula.toolkit.ios.api/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.ios.api/META-INF/MANIFEST.MF
index 83a3d10b9..6d689ef80 100644
--- a/org.eclipse.jubula.toolkit.ios.api/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.ios.api/META-INF/MANIFEST.MF
@@ -7,7 +7,8 @@ Bundle-Vendor: Eclipse Jubula
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
-Require-Bundle: org.eclipse.jubula.toolkit.api;bundle-version="[2.4.0,2.5.0)",
+Require-Bundle: org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
+ org.eclipse.jubula.toolkit.api;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.toolkit.api.gen;resolution:=optional;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.toolkit.base.api;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.toolkit.concrete.api;bundle-version="[2.4.0,2.5.0)",
diff --git a/org.eclipse.jubula.toolkit.javafx.api/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.javafx.api/META-INF/MANIFEST.MF
index fcbf7e237..2139776bd 100644
--- a/org.eclipse.jubula.toolkit.javafx.api/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.javafx.api/META-INF/MANIFEST.MF
@@ -7,7 +7,8 @@ Bundle-Vendor: Eclipse Jubula
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
-Require-Bundle: org.eclipse.jubula.toolkit.api;bundle-version="[2.4.0,2.5.0)",
+Require-Bundle: org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
+ org.eclipse.jubula.toolkit.api;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.toolkit.api.gen;resolution:=optional;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.toolkit.base.api;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.toolkit.concrete.api;bundle-version="[2.4.0,2.5.0)",
diff --git a/org.eclipse.jubula.toolkit.mobile.api/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.mobile.api/META-INF/MANIFEST.MF
index 6aef09980..a194548f2 100644
--- a/org.eclipse.jubula.toolkit.mobile.api/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.mobile.api/META-INF/MANIFEST.MF
@@ -8,7 +8,8 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Export-Package: org.eclipse.jubula.toolkit.mobile
-Require-Bundle: org.eclipse.jubula.toolkit.api;bundle-version="[2.4.0,2.5.0)",
+Require-Bundle: org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
+ org.eclipse.jubula.toolkit.api;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.toolkit.api.gen;resolution:=optional;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.toolkit.base.api;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.toolkit.concrete.api;bundle-version="[2.4.0,2.5.0)",
diff --git a/org.eclipse.jubula.toolkit.swing.api/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.swing.api/META-INF/MANIFEST.MF
index d3627d906..cdb266649 100644
--- a/org.eclipse.jubula.toolkit.swing.api/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.swing.api/META-INF/MANIFEST.MF
@@ -7,7 +7,8 @@ Bundle-Vendor: Eclipse Jubula
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
-Require-Bundle: org.eclipse.jubula.toolkit.api;bundle-version="[2.4.0,2.5.0)",
+Require-Bundle: org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
+ org.eclipse.jubula.toolkit.api;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.toolkit.api.gen;resolution:=optional;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.toolkit.base.api;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.toolkit.concrete.api;bundle-version="[2.4.0,2.5.0)",
diff --git a/org.eclipse.jubula.toolkit.swt.api/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.swt.api/META-INF/MANIFEST.MF
index 56f2c0a23..80eced295 100644
--- a/org.eclipse.jubula.toolkit.swt.api/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.swt.api/META-INF/MANIFEST.MF
@@ -11,7 +11,8 @@ Export-Package: org.eclipse.jubula.toolkit.swt.config,
org.eclipse.jubula.toolkit.swt.components,
org.eclipse.jubula.toolkit.swt.internal.impl,
org.eclipse.jubula.toolkit.swt
-Require-Bundle: org.eclipse.jubula.toolkit.api;bundle-version="[2.4.0,2.5.0)",
+Require-Bundle: org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
+ org.eclipse.jubula.toolkit.api;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.client.api;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.toolkit.base.api;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.tools;bundle-version="[2.4.0,2.5.0)",
diff --git a/org.eclipse.jubula.toolkit.win.api/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.win.api/META-INF/MANIFEST.MF
index 8fff26d72..aa212ee47 100644
--- a/org.eclipse.jubula.toolkit.win.api/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.win.api/META-INF/MANIFEST.MF
@@ -10,7 +10,8 @@ Bundle-ClassPath: .
Export-Package: org.eclipse.jubula.toolkit.win,
org.eclipse.jubula.toolkit.win.components,
org.eclipse.jubula.toolkit.win.internal.impl
-Require-Bundle: org.eclipse.jubula.toolkit.api;bundle-version="[2.4.0,2.5.0)",
+Require-Bundle: org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
+ org.eclipse.jubula.toolkit.api;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.toolkit.api.gen;resolution:=optional;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.toolkit.base.api;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.toolkit.concrete.api;bundle-version="[2.4.0,2.5.0)",
diff --git a/org.eclipse.jubula.toolkit.winapps.api/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.winapps.api/META-INF/MANIFEST.MF
index c6c4ccee4..a51853921 100644
--- a/org.eclipse.jubula.toolkit.winapps.api/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.winapps.api/META-INF/MANIFEST.MF
@@ -7,7 +7,8 @@ Bundle-Vendor: Eclipse Jubula
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
-Require-Bundle: org.eclipse.jubula.toolkit.api;bundle-version="[2.4.0,2.5.0)",
+Require-Bundle: org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
+ org.eclipse.jubula.toolkit.api;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.toolkit.api.gen;resolution:=optional;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.toolkit.base.api;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.toolkit.win.api;bundle-version="[2.4.0,2.5.0)",

Back to the top