Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAutServer.java1
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartHtmlAutServerCommand.java1
-rw-r--r--org.eclipse.jubula.feature/feature.xml7
-rw-r--r--org.eclipse.jubula.rc.common/META-INF/MANIFEST.MF1
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/util/MatchUtil.java17
-rw-r--r--org.eclipse.jubula.toolkit.api/.classpath2
-rw-r--r--org.eclipse.jubula.toolkit.api/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.jubula.toolkit.api/build.properties6
-rw-r--r--org.eclipse.jubula.toolkit.api/src/org/eclipse/jubula/toolkit/enums/ValueSets.java52
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/constants/CommandConstants.java2
10 files changed, 79 insertions, 13 deletions
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAutServer.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAutServer.java
index f11837064..f187eb02a 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAutServer.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAutServer.java
@@ -107,6 +107,7 @@ public abstract class AbstractStartJavaAutServer extends AbstractStartJavaAut {
CommandConstants.TOOLS_BUNDLE_ID,
CommandConstants.COMMUNICATION_BUNDLE_ID,
CommandConstants.RC_COMMON_BUNDLE_ID,
+ CommandConstants.TOOLKIT_API_BUNDLE_ID,
CommandConstants.SLF4J_JCL_BUNDLE_ID,
CommandConstants.SLF4J_API_BUNDLE_ID,
CommandConstants.COMMONS_LANG_BUNDLE_ID,
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartHtmlAutServerCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartHtmlAutServerCommand.java
index d4f440f01..3aacf7471 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartHtmlAutServerCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartHtmlAutServerCommand.java
@@ -115,6 +115,7 @@ public class StartHtmlAutServerCommand extends AbstractStartPseudoJavaAUT {
CommandConstants.TOOLS_BUNDLE_ID,
CommandConstants.COMMUNICATION_BUNDLE_ID,
CommandConstants.RC_COMMON_BUNDLE_ID,
+ CommandConstants.TOOLKIT_API_BUNDLE_ID,
CommandConstants.RC_BREDEX_COMMON_BUNDLE_ID,
CommandConstants.SLF4J_JCL_BUNDLE_ID,
CommandConstants.ORG_SLF4J_JUL_BUNDLE_ID,
diff --git a/org.eclipse.jubula.feature/feature.xml b/org.eclipse.jubula.feature/feature.xml
index 24d089f55..cfb965788 100644
--- a/org.eclipse.jubula.feature/feature.xml
+++ b/org.eclipse.jubula.feature/feature.xml
@@ -74,6 +74,13 @@ BREDEX GmbH - initial API and implementation and/or initial documentation
unpack="false"/>
<plugin
+ id="org.eclipse.jubula.toolkit.api"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
id="org.eclipse.jubula.toolkit.html.provider"
download-size="0"
install-size="0"
diff --git a/org.eclipse.jubula.rc.common/META-INF/MANIFEST.MF b/org.eclipse.jubula.rc.common/META-INF/MANIFEST.MF
index c63a9f39b..739411ccc 100644
--- a/org.eclipse.jubula.rc.common/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.rc.common/META-INF/MANIFEST.MF
@@ -28,6 +28,7 @@ Require-Bundle: org.apache.commons.beanutils;bundle-version="[1.7.0,2.0.0)",
org.apache.oro;bundle-version="[2.0.8,3.0.0)",
org.slf4j.api;bundle-version="[1.7.2,2.0.0)",
org.eclipse.jubula.tools;bundle-version="[2.4.0,2.5.0)",
+ org.eclipse.jubula.toolkit.api;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.communication;bundle-version="[2.4.0,2.5.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: .
diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/util/MatchUtil.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/util/MatchUtil.java
index b563e7395..bb1b7732d 100644
--- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/util/MatchUtil.java
+++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/util/MatchUtil.java
@@ -23,6 +23,7 @@ import org.apache.oro.text.regex.PatternMatcher;
import org.apache.oro.text.regex.Perl5Compiler;
import org.apache.oro.text.regex.Perl5Matcher;
import org.eclipse.jubula.rc.common.exception.StepExecutionException;
+import org.eclipse.jubula.toolkit.enums.ValueSets.Operator;
import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.objects.event.EventFactory;
import org.eclipse.jubula.tools.objects.event.TestErrorEvent;
@@ -100,7 +101,7 @@ public class MatchUtil {
* @param pattern
* a pattern
* @return
- * postion and value of match
+ * position and value of match
*/
public FindResult find(String text, String pattern);
}
@@ -108,22 +109,22 @@ public class MatchUtil {
/**
* match if text equals pattern
*/
- public static final String EQUALS = "equals"; //$NON-NLS-1$
-
+ public static final String EQUALS = Operator.equals.getValue();
+
/**
* match if text and pattern are not equal
*/
- public static final String NOT_EQUALS = "not equals"; //$NON-NLS-1$
+ public static final String NOT_EQUALS = Operator.notEquals.getValue();
/**
* match if text matches a regexp pattern
*/
- public static final String MATCHES_REGEXP = "matches"; //$NON-NLS-1$
+ public static final String MATCHES_REGEXP = Operator.matches.getValue();
/**
* match if text matches a Unix-style glob pattern
*/
- public static final String MATCHES_GLOB = "simple match"; //$NON-NLS-1$
+ public static final String MATCHES_GLOB = Operator.simpleMatch.getValue();
/**
* default operator
@@ -215,7 +216,7 @@ public class MatchUtil {
* @param operator
* operator used for matching
* @return
- * postion and value of match
+ * position and value of match
* @throws StepExecutionException
* if the operator is not known
*/
@@ -401,7 +402,7 @@ public class MatchUtil {
* @param pattern
* a pattern
* @return
- * value and posotion of match
+ * value and position of match
*/
private FindResult findGlob(String text, String pattern) {
return findRegExp(text, GlobCompiler.globToPerl5(pattern.toCharArray(),
diff --git a/org.eclipse.jubula.toolkit.api/.classpath b/org.eclipse.jubula.toolkit.api/.classpath
index deb673668..472ee29b1 100644
--- a/org.eclipse.jubula.toolkit.api/.classpath
+++ b/org.eclipse.jubula.toolkit.api/.classpath
@@ -2,6 +2,6 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.jubula.toolkit.api/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.api/META-INF/MANIFEST.MF
index 04e720cb6..ddc796372 100644
--- a/org.eclipse.jubula.toolkit.api/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.api/META-INF/MANIFEST.MF
@@ -4,6 +4,7 @@ Bundle-Name: Jubula Toolkit - API
Bundle-SymbolicName: org.eclipse.jubula.toolkit.api
Bundle-Version: 2.4.0.qualifier
Bundle-Vendor: Eclipse Jubula
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
+Export-Package: org.eclipse.jubula.toolkit.enums
diff --git a/org.eclipse.jubula.toolkit.api/build.properties b/org.eclipse.jubula.toolkit.api/build.properties
index ad98b27ef..0f7711c46 100644
--- a/org.eclipse.jubula.toolkit.api/build.properties
+++ b/org.eclipse.jubula.toolkit.api/build.properties
@@ -11,7 +11,7 @@ jars.compile.order = .
bin.includes = about.html,\
META-INF/,\
.
-javacSource = 1.6
-javacTarget = 1.6
+javacSource = 1.5
+javacTarget = 1.5
javacErrors.. = -assertIdentifier
-jre.compilation.profile = JavaSE-1.6
+jre.compilation.profile = J2SE-1.5
diff --git a/org.eclipse.jubula.toolkit.api/src/org/eclipse/jubula/toolkit/enums/ValueSets.java b/org.eclipse.jubula.toolkit.api/src/org/eclipse/jubula/toolkit/enums/ValueSets.java
new file mode 100644
index 000000000..431f5a290
--- /dev/null
+++ b/org.eclipse.jubula.toolkit.api/src/org/eclipse/jubula/toolkit/enums/ValueSets.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2014 BREDEX GmbH.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * BREDEX GmbH - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+package org.eclipse.jubula.toolkit.enums;
+
+/** @author BREDEX GmbH */
+public final class ValueSets {
+
+ /** @author BREDEX GmbH */
+ public enum Operator {
+ /** value comparison operator */
+ equals("equals"), //$NON-NLS-1$
+ /** value comparison operator */
+ notEquals("not equals"), //$NON-NLS-1$
+ /** value comparison operator */
+ matches("matches"), //$NON-NLS-1$
+ /** value comparison operator */
+ simpleMatch("simple match"); //$NON-NLS-1$
+
+ /** holds the value necessary for the RC side */
+ private final String m_value;
+
+ /**
+ * Constructor
+ *
+ * @param value
+ * the value
+ */
+ private Operator(String value) {
+ this.m_value = value;
+ }
+
+ /**
+ * @return the value
+ */
+ public String getValue() {
+ return m_value;
+ }
+ }
+
+ /** Constructor */
+ private ValueSets() {
+ // hide
+ }
+}
diff --git a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/constants/CommandConstants.java b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/constants/CommandConstants.java
index 84a1dd678..936ac10aa 100644
--- a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/constants/CommandConstants.java
+++ b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/constants/CommandConstants.java
@@ -80,6 +80,8 @@ public abstract class CommandConstants {
public static final String COMMUNICATION_BUNDLE_ID = "org.eclipse.jubula.communication"; //$NON-NLS-1$
/** ID of the common RC bundle */
public static final String RC_COMMON_BUNDLE_ID = "org.eclipse.jubula.rc.common"; //$NON-NLS-1$
+ /** ID of the toolkit API bundle */
+ public static final String TOOLKIT_API_BUNDLE_ID = "org.eclipse.jubula.toolkit.api"; //$NON-NLS-1$
/** ID of the common RC bundle */
public static final String RC_BREDEX_COMMON_BUNDLE_ID = "com.bredexsw.jubula.rc.common"; //$NON-NLS-1$
/** ID of the RC Common Agent bundle */

Back to the top