You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by pk...@apache.org on 2013/04/29 15:41:12 UTC
svn commit: r1477062 - in
/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/constraint:
BasicTypeConstraint.java MarkupConstraint.java NotConstraint.java
NotMatchConstraint.java
Author: pkluegl
Date: Mon Apr 29 13:41:12 2013
New Revision: 1477062
URL: http://svn.apache.org/r1477062
Log:
UIMA-2850
- renaming
Modified:
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/constraint/BasicTypeConstraint.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/constraint/MarkupConstraint.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/constraint/NotConstraint.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/constraint/NotMatchConstraint.java
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/constraint/BasicTypeConstraint.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/constraint/BasicTypeConstraint.java?rev=1477062&r1=1477061&r2=1477062&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/constraint/BasicTypeConstraint.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/constraint/BasicTypeConstraint.java Mon Apr 29 13:41:12 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.constraint;
+package org.apache.uima.ruta.constraint;
import java.util.ArrayList;
import java.util.Collection;
@@ -25,7 +25,7 @@ import java.util.Collection;
import org.apache.uima.cas.FSTypeConstraint;
import org.apache.uima.cas.FeatureStructure;
import org.apache.uima.cas.Type;
-import org.apache.uima.textmarker.type.TextMarkerBasic;
+import org.apache.uima.ruta.type.RutaBasic;
public class BasicTypeConstraint implements FSTypeConstraint {
private static final long serialVersionUID = 1115953538613617791L;
@@ -56,8 +56,8 @@ public class BasicTypeConstraint impleme
}
public boolean match(FeatureStructure fs) {
- if (fs instanceof TextMarkerBasic) {
- TextMarkerBasic tmb = (TextMarkerBasic) fs;
+ if (fs instanceof RutaBasic) {
+ RutaBasic tmb = (RutaBasic) fs;
if(tmb.getBeginMap().isEmpty() && tmb.getEndMap().isEmpty()) {
return true;
}
@@ -66,8 +66,8 @@ public class BasicTypeConstraint impleme
return true;
}
boolean result = false;
- if (fs instanceof TextMarkerBasic) {
- TextMarkerBasic tmb = (TextMarkerBasic) fs;
+ if (fs instanceof RutaBasic) {
+ RutaBasic tmb = (RutaBasic) fs;
if (types != null) {
for (Type each : types) {
result |= tmb.isPartOf(each)|| tmb.beginsWith(each) || tmb.endsWith(each);
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/constraint/MarkupConstraint.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/constraint/MarkupConstraint.java?rev=1477062&r1=1477061&r2=1477062&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/constraint/MarkupConstraint.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/constraint/MarkupConstraint.java Mon Apr 29 13:41:12 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.constraint;
+package org.apache.uima.ruta.constraint;
import java.util.ArrayList;
import java.util.List;
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/constraint/NotConstraint.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/constraint/NotConstraint.java?rev=1477062&r1=1477061&r2=1477062&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/constraint/NotConstraint.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/constraint/NotConstraint.java Mon Apr 29 13:41:12 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.constraint;
+package org.apache.uima.ruta.constraint;
import org.apache.uima.cas.FSMatchConstraint;
import org.apache.uima.cas.FeatureStructure;
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/constraint/NotMatchConstraint.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/constraint/NotMatchConstraint.java?rev=1477062&r1=1477061&r2=1477062&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/constraint/NotMatchConstraint.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/constraint/NotMatchConstraint.java Mon Apr 29 13:41:12 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.constraint;
+package org.apache.uima.ruta.constraint;
import org.apache.uima.cas.FSMatchConstraint;
import org.apache.uima.cas.FeatureStructure;