Author: pkluegl
Date: Thu Aug 1 15:30:33 2013
New Revision: 1509297
URL: http://svn.apache.org/r1509297
Log:
UIMA-2938
- fixed formatter fro wildcards
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/RutaRuleElement.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=1509297&r1=1509296&r2=1509297&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
Thu Aug 1 15:30:33 2013
@@ -634,6 +634,9 @@ public class RutaFormattedPrinter extend
if (ruleEl.getHead() != null) {
append(ruleEl.getHead());
}
+ if(ruleEl.isWildcard()) {
+ append("#");
+ }
List<RutaCondition> conditions = ruleEl.getConditions();
List<RutaAction> actions = ruleEl.getActions();
// don't print {->} for empty rule elements
Modified:
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaRuleElement.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaRuleElement.java?rev=1509297&r1=1509296&r2=1509297&view=diff
==============================================================================
---
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaRuleElement.java
(original)
+++
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/RutaRuleElement.java
Thu Aug 1 15:30:33 2013
@@ -42,6 +42,8 @@ public class RutaRuleElement extends Exp
private boolean afterConcat;
+ private boolean wildcard;
+
// TODO to be removed
public RutaRuleElement(int start, int end) {
super(start, end);
@@ -156,5 +158,13 @@ public class RutaRuleElement extends Exp
public void setAfterConcat(boolean afterConcat) {
this.afterConcat = afterConcat;
}
+
+ public boolean isWildcard() {
+ return wildcard;
+ }
+
+ public void setWildcard(boolean wildcard) {
+ this.wildcard = wildcard;
+ }
}
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=1509297&r1=1509296&r2=1509297&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
Thu Aug 1 15:30:33 2013
@@ -139,7 +139,11 @@ public class ScriptFactory extends Abstr
setMinBegin(bounds, w);
filterNullObjects(c);
filterNullObjects(a);
- return new RutaRuleElement(bounds[0], bounds[1], null, null, c, a);
+ RutaRuleElement rutaRuleElement = new RutaRuleElement(bounds[0],
bounds[1], null, null, c, a);
+ if(w != null && w.getText().equals("#")) {
+ rutaRuleElement.setWildcard(true);
+ }
+ return rutaRuleElement;
}
/**
