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/05/12 16:41:24 UTC
svn commit: r1481571 -
/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/validator/RutaTypeChecker.java
Author: pkluegl
Date: Sun May 12 14:41:24 2013
New Revision: 1481571
URL: http://svn.apache.org/r1481571
Log:
UIMA-2758
- fixed feature match checker for something like C.b==true
Modified:
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/validator/RutaTypeChecker.java
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/validator/RutaTypeChecker.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/validator/RutaTypeChecker.java?rev=1481571&r1=1481570&r2=1481571&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/validator/RutaTypeChecker.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/validator/RutaTypeChecker.java Sun May 12 14:41:24 2013
@@ -433,11 +433,11 @@ public class RutaTypeChecker implements
private void checkTypeOfFeatureMatch(String featText, FeatureMatchExpression fme) {
int lastIndexOf = featText.lastIndexOf(".");
String aref = featText.substring(0, lastIndexOf);
- String fref = featText.substring(lastIndexOf+1, featText.length());
+ String fref = featText.substring(lastIndexOf + 1, featText.length());
String match = isFeatureMatch(aref);
if (match != null) {
int kind = fme.getValue().getKind();
- if(fme.getValue() instanceof StringLiteral) {
+ if (fme.getValue() instanceof StringLiteral) {
kind = RutaTypeConstants.RUTA_TYPE_S;
}
boolean findFeature = findFeature(match, fref, kind);
@@ -555,17 +555,21 @@ public class RutaTypeChecker implements
private String checkFeatureMatch(String name, String type) {
if (name.startsWith(type)) {
boolean foundAll = true;
- String tail = name.substring(type.length() + 1);
- String[] split = tail.split("[.]");
- String typeToCheck = type;
- for (String feat : split) {
- typeToCheck = checkFSFeatureOfType(feat, typeToCheck);
- foundAll &= (typeToCheck != null);
- if (!foundAll) {
- return null;
+ if (name.length() > type.length()) {
+ String tail = name.substring(type.length() + 1);
+ String[] split = tail.split("[.]");
+ String typeToCheck = type;
+ for (String feat : split) {
+ typeToCheck = checkFSFeatureOfType(feat, typeToCheck);
+ foundAll &= (typeToCheck != null);
+ if (!foundAll) {
+ return null;
+ }
}
+ return typeToCheck;
+ } else {
+ return type;
}
- return typeToCheck;
} else {
return null;
}