Author: pkluegl
Date: Wed Nov 6 10:29:16 2019
New Revision: 1869457
URL: http://svn.apache.org/viewvc?rev=1869457&view=rev
Log:
UIMA-4238: hard removal of getRule()
Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/AbstractRuleElement.java
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleElement.java
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleElementCaretaker.java
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleElementContainer.java
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleElementIsolator.java
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/visitor/DebugInfoFactory.java
Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/AbstractRuleElement.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/AbstractRuleElement.java?rev=1869457&r1=1869456&r2=1869457&view=diff
==============================================================================
---
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/AbstractRuleElement.java
(original)
+++
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/AbstractRuleElement.java
Wed Nov 6 10:29:16 2019
@@ -38,6 +38,8 @@ import org.apache.uima.ruta.visitor.Infe
public abstract class AbstractRuleElement extends RutaElement implements
RuleElement {
+ protected static final InferenceCrowd EMPTY_CROWD = new
InferenceCrowd(Collections.emptyList());
+
protected RuleElementQuantifier quantifier;
protected List<AbstractRutaCondition> conditions;
@@ -52,9 +54,6 @@ public abstract class AbstractRuleElemen
protected RutaBlock parent;
- @SuppressWarnings("unchecked")
- protected final InferenceCrowd emptyCrowd = new
InferenceCrowd(Collections.EMPTY_LIST);
-
protected List<List<RutaStatement>> inlinedConditionRuleBlocks = new
ArrayList<>();
protected List<List<RutaStatement>> inlinedActionRuleBlocks = new
ArrayList<>();
@@ -232,7 +231,7 @@ public abstract class AbstractRuleElemen
@Override
public List<RuleElementMatch> evaluateMatches(List<RuleElementMatch> matches,
MatchContext context, RutaStream stream) {
- return quantifier.evaluateMatches(matches, context, stream, emptyCrowd);
+ return quantifier.evaluateMatches(matches, context, stream, EMPTY_CROWD);
}
@Override
@@ -339,11 +338,6 @@ public abstract class AbstractRuleElemen
}
@Override
- public RutaRule getRule() {
- return container.getRule();
- }
-
- @Override
public RuleElementContainer getContainer() {
return container;
}
Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleElement.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleElement.java?rev=1869457&r1=1869456&r2=1869457&view=diff
==============================================================================
---
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleElement.java
(original)
+++
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleElement.java
Wed Nov 6 10:29:16 2019
@@ -62,8 +62,6 @@ public interface RuleElement {
RutaBlock getParent();
- RutaRule getRule();
-
RuleElementContainer getContainer();
void setContainer(RuleElementContainer container);
Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleElementCaretaker.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleElementCaretaker.java?rev=1869457&r1=1869456&r2=1869457&view=diff
==============================================================================
---
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleElementCaretaker.java
(original)
+++
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleElementCaretaker.java
Wed Nov 6 10:29:16 2019
@@ -69,12 +69,13 @@ public class RuleElementCaretaker implem
for (RuleElement ruleElement : ruleElements) {
if (ruleElement.isStartAnchor()) {
return ruleElement;
- }
- if(ruleElement instanceof ComposedRuleElement) {
- RuleElement anchoringRuleElement = ((ComposedRuleElement)
ruleElement).getAnchoringRuleElement(stream);
- if(anchoringRuleElement.isStartAnchor()) {
- return ruleElement;
- }
+ }
+ if (ruleElement instanceof ComposedRuleElement) {
+ RuleElement anchoringRuleElement = ((ComposedRuleElement) ruleElement)
+ .getAnchoringRuleElement(stream);
+ if (anchoringRuleElement.isStartAnchor()) {
+ return ruleElement;
+ }
}
}
@@ -123,11 +124,6 @@ public class RuleElementCaretaker implem
}
@Override
- public RutaRule getRule() {
- return container.getRule();
- }
-
- @Override
public RuleElement getNextElement(boolean after, RuleElement ruleElement) {
if (after) {
return getElementAfter(ruleElement);
Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleElementContainer.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleElementContainer.java?rev=1869457&r1=1869456&r2=1869457&view=diff
==============================================================================
---
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleElementContainer.java
(original)
+++
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleElementContainer.java
Wed Nov 6 10:29:16 2019
@@ -28,10 +28,6 @@ public interface RuleElementContainer {
List<RuleElement> getRuleElements();
- // RuleElement getElementAfter(RuleElement element);
- //
- // RuleElement getElementBefore(RuleElement element);
-
RuleElement getFirstElement();
RuleElement getLastElement();
@@ -40,8 +36,6 @@ public interface RuleElementContainer {
void applyRuleElements(RuleMatch ruleMatch, RutaStream stream,
InferenceCrowd crowd);
- RutaRule getRule();
-
RuleElement getNextElement(boolean after, RuleElement ruleElement);
}
Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleElementIsolator.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleElementIsolator.java?rev=1869457&r1=1869456&r2=1869457&view=diff
==============================================================================
---
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleElementIsolator.java
(original)
+++
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleElementIsolator.java
Wed Nov 6 10:29:16 2019
@@ -75,11 +75,6 @@ public class RuleElementIsolator impleme
}
@Override
- public RutaRule getRule() {
- return container.getRule();
- }
-
- @Override
public RuleElement getNextElement(boolean after, RuleElement ruleElement) {
return null;
}
Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/visitor/DebugInfoFactory.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/visitor/DebugInfoFactory.java?rev=1869457&r1=1869456&r2=1869457&view=diff
==============================================================================
---
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/visitor/DebugInfoFactory.java
(original)
+++
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/visitor/DebugInfoFactory.java
Wed Nov 6 10:29:16 2019
@@ -34,7 +34,6 @@ import org.apache.uima.ruta.RutaStream;
import org.apache.uima.ruta.ScriptApply;
import org.apache.uima.ruta.block.BlockApply;
import org.apache.uima.ruta.rule.AbstractRule;
-import org.apache.uima.ruta.rule.AbstractRuleElement;
import org.apache.uima.ruta.rule.AbstractRuleMatch;
import org.apache.uima.ruta.rule.ComposedRuleElement;
import org.apache.uima.ruta.rule.ComposedRuleElementMatch;
@@ -192,9 +191,6 @@ public class DebugInfoFactory {
if (element instanceof RutaStatement) {
RutaStatement rs = (RutaStatement) element;
namespace = rs.getParent().getScript().getRootBlock().getNamespace();
- } else if (element instanceof AbstractRuleElement) {
- AbstractRuleElement are = (AbstractRuleElement) element;
- are.getRule().getParent().getScript().getRootBlock().getNamespace();
}
dra.setElement(verbalizer.verbalize(element));
dra.setApplied(ruleApply.getApplied());
