Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'org.eclipse.jubula.rc.common')
-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
2 files changed, 10 insertions, 8 deletions
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(),

Back to the top