svn commit: r1342619 - in /uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker: action/TransferAction.java rule/RuleMatch.java

2012-05-25 Thread pkluegl 
Author: pkluegl
Date: Fri May 25 13:35:19 2012
New Revision: 1342619

URL: http://svn.apache.org/viewvc?rev=1342619view=rev
Log:
UIMA-2411
deleted empty method and fixed TRANSFER action

Modified:

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/TransferAction.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/rule/RuleMatch.java

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/TransferAction.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/TransferAction.java?rev=1342619r1=1342618r2=1342619view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/TransferAction.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/TransferAction.java
 Fri May 25 13:35:19 2012
@@ -42,18 +42,20 @@ public class TransferAction extends Type
   @Override
   public void execute(RuleMatch match, RuleElement element, TextMarkerStream 
stream,
   InferenceCrowd crowd) {
-ListRuleElementMatch list = match.getMatchInfos().get(element);
+ListListRuleElementMatch list = match.getMatchInfo(element);
 CAS cas = stream.getCas();
 Type t = type.getType(element.getParent());
-for (RuleElementMatch each : list) {
-  ListAnnotationFS matched = each.getTextsMatched();
-  for (AnnotationFS annotationFS : matched) {
-FeatureStructure createFS = cas.createFS(t);
-copyFeatures(annotationFS, createFS, cas);
-if (createFS instanceof AnnotationFS) {
-  stream.addAnnotation((AnnotationFS) createFS);
+for (ListRuleElementMatch eachList : list) {
+  for (RuleElementMatch each : eachList) {
+ListAnnotationFS matched = each.getTextsMatched();
+for (AnnotationFS annotationFS : matched) {
+  FeatureStructure createFS = cas.createFS(t);
+  copyFeatures(annotationFS, createFS, cas);
+  if (createFS instanceof AnnotationFS) {
+stream.addAnnotation((AnnotationFS) createFS);
+  }
+  cas.addFsToIndexes(createFS);
 }
-cas.addFsToIndexes(createFS);
   }
 }
 

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/rule/RuleMatch.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/rule/RuleMatch.java?rev=1342619r1=1342618r2=1342619view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/rule/RuleMatch.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/rule/RuleMatch.java
 Fri May 25 13:35:19 2012
@@ -239,11 +239,6 @@ public class RuleMatch {
 this.rootMatch = rootMatch;
   }
 
-  public MapRuleElement, ListRuleElementMatch getMatchInfos() {
-assert (false);
-return null;
-  }
-
   public ListListRuleElementMatch getMatchInfo(RuleElement element) {
 return getMatchInfo(rootMatch, element);
   }

svn commit: r1342672 - in /uima/sandbox/trunk: uima-basp/ uima-bsp/

2012-05-25 Thread tommaso 
Author: tommaso
Date: Fri May 25 15:07:43 2012
New Revision: 1342672

URL: http://svn.apache.org/viewvc?rev=1342672view=rev
Log:
[UIMA-2410] - fixing typo in UIMA-BSP root directory

Added:
uima/sandbox/trunk/uima-bsp/
  - copied from r1342670, uima/sandbox/trunk/uima-basp/
Removed:
uima/sandbox/trunk/uima-basp/

svn commit: r1342714 [1/5] - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/ uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/

2012-05-25 Thread pkluegl 
Author: pkluegl
Date: Fri May 25 16:26:54 2012
New Revision: 1342714

URL: http://svn.apache.org/viewvc?rev=1342714view=rev
Log:
UIMA-2402
- changed language definition in order to provide new arguments for MARKTABLE
- adapted ast and inference implementation for additional arguments
- some smaller changes in supporting IDE functionality due to changes in ast 
implementation of StructuredAction

Modified:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/formatter/TextMarkerFormattedPrinter.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/parser/ast/ActionFactory.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/parser/ast/TextMarkerStructureAction.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/validator/TextMarkerVarRefChecker.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/ActionFactory.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/MarkTableAction.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.g

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/resource/CSVTable.java

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g?rev=1342714r1=1342713r2=1342714view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g
 Fri May 25 16:26:54 2012
@@ -1197,19 +1197,30 @@ actionCreate returns [TextMarkerAction a
 
 actionMarkTable returns [TextMarkerAction action = null]
 @init {
-List left = new ArrayList();
-List right = new ArrayList();
+ListExpression left = new ArrayListExpression();
+ListExpression right = new ArrayListExpression();
 }
 :
 name = MARKTABLE LPAREN 
 structure = typeExpression COMMA 
 index = numberExpression COMMA
 table = wordTableExpression 
-(COMMA 
-fname = stringExpression ASSIGN_EQUAL obj1 = numberExpression 
{left.add(fname); right.add(obj1);} 
-(COMMA fname = stringExpression ASSIGN_EQUAL obj1 = numberExpression 
{left.add(fname);right.add(obj1);})*
-)? 
-{action = ActionFactory.createStructureAction(name, structure, index, 
table, left, right);}
+   
+(COMMA key=stringExpression ASSIGN_EQUAL value = numberExpression)=(COMMA 
key = stringExpression {left.add(key);} ASSIGN_EQUAL value = 
numberExpression{right.add(value);} )+
+(COMMA ignoreCase = booleanExpression)=(COMMA ignoreCase = 
booleanExpression 
+COMMA ignoreLength = numberExpression 
+COMMA ignoreChar = stringExpression
+COMMA maxIgnoreChar = numberExpression)?
+
+{
+ListExpression args = new ArrayListExpression();
+args.add(index);
+args.add(table);
+   args.add(ignoreCase);
+   args.add(ignoreLength);
+   args.add(ignoreChar);
+   args.add(maxIgnoreChar);
+action = ActionFactory.createStructureAction(name, args, left, right, 
structure);}
 RPAREN
 ;
 
@@ -1539,14 +1550,14 @@ ListExpression right = new ArrayListE
 //TODO cost parameter
 
 {
-List args = new ArrayList();
+ListExpression args = new ArrayListExpression();
args.add(ignoreCase);
args.add(ignoreLength);
args.add(edit);
args.add(distance);
args.add(ignoreChar);
 
-action = ActionFactory.createStructureAction(name, list, args, left, 
right);}
+action = ActionFactory.createStructureAction(name, args, left, right, 
list);}
 RPAREN
 ;

svn commit: r1342714 [3/5] - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/ uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/

2012-05-25 Thread pkluegl 
Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/formatter/TextMarkerFormattedPrinter.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/formatter/TextMarkerFormattedPrinter.java?rev=1342714r1=1342713r2=1342714view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/formatter/TextMarkerFormattedPrinter.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/formatter/TextMarkerFormattedPrinter.java
 Fri May 25 16:26:54 2012
@@ -452,11 +452,13 @@ public class TextMarkerFormattedPrinter 
   private void printStructureAction(TextMarkerAction a) {
 TextMarkerStructureAction tmca = (TextMarkerStructureAction) a;
 // structure
-append(tmca.getStructure());
+if (tmca.getStructure() != null) {
+  append(tmca.getStructure());
+}
 append(COMMA);
 append( );
 // number expressions
-ListExpression indices = tmca.getIndices();
+ListExpression indices = tmca.getExpressions();
 if (indices != null) {
   traverseAstNodes(indices);
 }
@@ -515,12 +517,13 @@ public class TextMarkerFormattedPrinter 
   append( );
 }
 // structure
-
-append(tmca.getStructure());
+if (tmca.getStructure() != null) {
+  append(tmca.getStructure());
+}
 append(COMMA);
 append( );
 // number expressions
-ListExpression indices = tmca.getIndices();
+ListExpression indices = tmca.getExpressions();
 if (indices != null) {
   traverseAstNodes(indices);
 }

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/parser/ast/ActionFactory.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/parser/ast/ActionFactory.java?rev=1342714r1=1342713r2=1342714view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/parser/ast/ActionFactory.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/parser/ast/ActionFactory.java
 Fri May 25 16:26:54 2012
@@ -91,32 +91,12 @@ public class ActionFactory extends Abstr
   }
 
   public static TextMarkerAction createStructureAction(Token type, Expression 
structure,
-  List indexes, ListExpression left, ListExpression right) {
-int bounds[] = getBounds(type);
-int nameStart = bounds[0];
-int nameEnd = bounds[1];
-ListExpression numExprs = new ArrayListExpression();
-MapExpression, Expression assignments = new LinkedHashMapExpression, 
Expression();
-filterNullObjsAndSetBounds(indexes, bounds, numExprs);
-if (left != null  right != null) {
-  IteratorExpression keysIt = left.iterator();
-  IteratorExpression valsIt = right.iterator();
-  Expression val = null;
-  while (keysIt.hasNext()) {
-Expression key = keysIt.next();
-if (!valsIt.hasNext()) {
-  break;
-}
-val = valsIt.next();
-assignments.put(key, val);
-  }
-  if (val != null) {
-bounds[1] = val.sourceEnd();
-  }
+  ListExpression indexes, ListExpression left, ListExpression 
right) {
+ListExpression args = new ArrayListExpression();
+if (indexes != null) {
+  args.addAll(indexes);
 }
-return new TextMarkerStructureAction(bounds[0], bounds[1], numExprs,
-ExpressionConstants.USER_EXPRESSION_START + type.getType(), 
type.getText(), nameStart,
-nameEnd, assignments, structure);
+return createStructureAction(type, args, left, right, structure);
   }
 
   /**
@@ -168,6 +148,7 @@ public class ActionFactory extends Abstr
 ListExpression indexes = new ArrayListExpression();
 indexes.add(table);
 indexes.add(index);
+indexes.add(structure);
 filterNullObjsAndSetBounds(indexes, bounds, numExprs);
 if (left != null  right != null) {
   IteratorExpression keysIt = left.iterator();
@@ -218,4 +199,34 @@ public class ActionFactory extends Abstr
 }
 return createAction(name, exprs);
   }
+
+  public static TextMarkerAction createStructureAction(Token name, 
ListExpression args,
+  ListExpression left, ListExpression right, Expression structure) 
{
+int bounds[] = getBounds(name);
+int nameStart = bounds[0];
+int nameEnd = bounds[1];
+ListExpression numExprs = new ArrayListExpression();
+MapExpression, Expression assignments = new LinkedHashMapExpression, 
Expression();
+filterNullObjsAndSetBounds(args, bounds, numExprs);
+if (left != null  right !=