You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by jo...@apache.org on 2011/10/04 20:09:32 UTC

svn commit: r1178888 - in /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain: element/ElementTreeLabelProvider.java tree/ExplainTree.java

Author: joern
Date: Tue Oct  4 18:09:31 2011
New Revision: 1178888

URL: http://svn.apache.org/viewvc?rev=1178888&view=rev
Log:
UIMA-2234 Dynamic anchoring of rule elements. Patch from Peter Klügl applied.

Modified:
    uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/element/ElementTreeLabelProvider.java
    uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/tree/ExplainTree.java

Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/element/ElementTreeLabelProvider.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/element/ElementTreeLabelProvider.java?rev=1178888&r1=1178887&r2=1178888&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/element/ElementTreeLabelProvider.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/element/ElementTreeLabelProvider.java Tue Oct  4 18:09:31 2011
@@ -71,15 +71,18 @@ public class ElementTreeLabelProvider ex
         Type type = ts.getType(ExplainConstants.RULE_ELEMENT_MATCHES_TYPE);
         FeatureStructure fs = debugNode.getFeatureStructure();
         Feature f = type.getFeatureByBaseName(ExplainTree.ELEMENT);
-        if (f != null) {
+        Feature fanchor = type.getFeatureByBaseName(ExplainTree.RULE_ANCHOR);
+        if (f != null && fanchor != null) {
           String v = fs.getStringValue(f);
-          return v;
+          String ruleAnchor = fs.getBooleanValue(fanchor) ? "'" : "";
+          return ruleAnchor + v;
         }
       } else if (element instanceof RuleElementMatchNode) {
         FeatureStructure fs = debugNode.getFeatureStructure();
         if (fs instanceof AnnotationFS) {
           String s = ((AnnotationFS) fs).getCoveredText();
           s = s.replaceAll("[\\n\\r]", "");
+
           return s;
         }
       } else if (element instanceof ConditionNode) {

Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/tree/ExplainTree.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/tree/ExplainTree.java?rev=1178888&r1=1178887&r2=1178888&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/tree/ExplainTree.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/tree/ExplainTree.java Tue Oct  4 18:09:31 2011
@@ -58,6 +58,8 @@ public class ExplainTree {
 
   public static final String ELEMENT = "element";
 
+  public static final String RULE_ANCHOR = "ruleAnchor";
+
   public static final String TIME = "time";
 
   private IExplainTreeNode root;