Author: pkluegl
Date: Wed Jul 31 08:44:07 2013
New Revision: 1508771
URL: http://svn.apache.org/r1508771
Log:
UIMA-3071
- fixed ast for composed rule elements
Modified:
uima/sandbox/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/RutaFormattedPrinter.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ComposedRuleElement.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ScriptFactory.java
Modified:
uima/sandbox/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/RutaFormattedPrinter.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/RutaFormattedPrinter.java?rev=1508771&r1=1508770&r2=1508771&view=diff
==============================================================================
---
uima/sandbox/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/RutaFormattedPrinter.java
(original)
+++
uima/sandbox/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/RutaFormattedPrinter.java
Wed Jul 31 08:44:07 2013
@@ -352,7 +352,15 @@ public class RutaFormattedPrinter extend
inLargeRule = 4;
}
append(PAR_OPEN);
- traverseAstNodes(elements, cre.isDisjunctive() ? " |" : "");
+ String sep = "";
+ if (cre.isDisjunctive() != null) {
+ if (cre.isDisjunctive()) {
+ sep = " |";
+ } else {
+ sep = " &";
+ }
+ }
+ traverseAstNodes(elements, sep);
append(PAR_CLOSE);
appendRuleElement(cre);
if (inLargeRule == 4) {
Modified:
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ComposedRuleElement.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ComposedRuleElement.java?rev=1508771&r1=1508770&r2=1508771&view=diff
==============================================================================
---
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ComposedRuleElement.java
(original)
+++
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ComposedRuleElement.java
Wed Jul 31 08:44:07 2013
@@ -28,11 +28,11 @@ import org.eclipse.dltk.ast.expressions.
public class ComposedRuleElement extends RutaRuleElement {
List<Expression> elements;
- private boolean disjunctive;
+ private Boolean disjunctive;
public ComposedRuleElement(int start, int end, List<Expression> elements,
List<Expression> quantifierExpressions, List<RutaCondition>
conditionExpressions,
- List<RutaAction> actionExpressions, boolean disjunctive) {
+ List<RutaAction> actionExpressions, Boolean disjunctive) {
super(start, end, null, quantifierExpressions, conditionExpressions,
actionExpressions);
if (elements != null) {
this.elements = elements;
@@ -80,11 +80,11 @@ public class ComposedRuleElement extends
return elements;
}
- public boolean isDisjunctive() {
+ public Boolean isDisjunctive() {
return disjunctive;
}
- public void setDisjunctive(boolean disjunctive) {
+ public void setDisjunctive(Boolean disjunctive) {
this.disjunctive = disjunctive;
}
Modified:
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ScriptFactory.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ScriptFactory.java?rev=1508771&r1=1508770&r2=1508771&view=diff
==============================================================================
---
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ScriptFactory.java
(original)
+++
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ScriptFactory.java
Wed Jul 31 08:44:07 2013
@@ -76,7 +76,7 @@ public class ScriptFactory extends Abstr
}
public ComposedRuleElement createComposedRuleElement(List<Expression> res,
List<Expression> q,
- List<RutaCondition> c, List<RutaAction> a, boolean disjunctive,
RutaBlock env,
+ List<RutaCondition> c, List<RutaAction> a, Boolean disjunctive,
RutaBlock env,
Token... tokens) {
int bounds[] = getSurroundingBounds((ASTNode) null, res);
// taking care of null statements - errors should have been recognized
