Author: pkluegl Date: Mon Apr 29 15:27:24 2013 New Revision: 1477149 URL: http://svn.apache.org/r1477149 Log: UIMA-2850 - renaming
Modified: uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/textmarker/example/extensions/ExampleAction.java uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/textmarker/example/extensions/ExampleActionExtension.java uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/textmarker/example/extensions/ExampleActionIDEExtension.java uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/textmarker/example/extensions/ExampleCondition.java uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/textmarker/example/extensions/ExampleConditionExtension.java uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/textmarker/example/extensions/ExampleConditionIDEExtension.java Modified: uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/textmarker/example/extensions/ExampleAction.java URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/textmarker/example/extensions/ExampleAction.java?rev=1477149&r1=1477148&r2=1477149&view=diff ============================================================================== --- uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/textmarker/example/extensions/ExampleAction.java (original) +++ uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/textmarker/example/extensions/ExampleAction.java Mon Apr 29 15:27:24 2013 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.uima.textmarker.example.extensions; +package org.apache.uima.ruta.example.extensions; import java.util.ArrayList; import java.util.List; @@ -26,14 +26,14 @@ import java.util.Random; import org.apache.uima.cas.Type; import org.apache.uima.cas.TypeSystem; import org.apache.uima.cas.text.AnnotationFS; -import org.apache.uima.textmarker.TextMarkerStream; -import org.apache.uima.textmarker.action.AbstractTextMarkerAction; -import org.apache.uima.textmarker.expression.number.NumberExpression; -import org.apache.uima.textmarker.rule.RuleElement; -import org.apache.uima.textmarker.rule.RuleMatch; -import org.apache.uima.textmarker.visitor.InferenceCrowd; +import org.apache.uima.ruta.RutaStream; +import org.apache.uima.ruta.action.AbstractRutaAction; +import org.apache.uima.ruta.expression.number.NumberExpression; +import org.apache.uima.ruta.rule.RuleElement; +import org.apache.uima.ruta.rule.RuleMatch; +import org.apache.uima.ruta.visitor.InferenceCrowd; -public class ExampleAction extends AbstractTextMarkerAction { +public class ExampleAction extends AbstractRutaAction { private List<NumberExpression> indexExprList; @@ -43,7 +43,7 @@ public class ExampleAction extends Abstr } @Override - public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream, + public void execute(RuleMatch match, RuleElement element, RutaStream stream, InferenceCrowd crowd) { List<Integer> indexes = new ArrayList<Integer>(); for (NumberExpression each : indexExprList) { @@ -66,7 +66,7 @@ public class ExampleAction extends Abstr } } - private Type getRandomType(TextMarkerStream stream) { + private Type getRandomType(RutaStream stream) { Type annotationType = stream.getCas().getAnnotationType(); TypeSystem typeSystem = stream.getCas().getTypeSystem(); List<Type> subsumedTypes = typeSystem.getProperlySubsumedTypes(annotationType); Modified: uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/textmarker/example/extensions/ExampleActionExtension.java URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/textmarker/example/extensions/ExampleActionExtension.java?rev=1477149&r1=1477148&r2=1477149&view=diff ============================================================================== --- uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/textmarker/example/extensions/ExampleActionExtension.java (original) +++ uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/textmarker/example/extensions/ExampleActionExtension.java Mon Apr 29 15:27:24 2013 @@ -17,27 +17,27 @@ * under the License. */ -package org.apache.uima.textmarker.example.extensions; +package org.apache.uima.ruta.example.extensions; import java.util.ArrayList; import java.util.List; -import org.apache.uima.textmarker.TextMarkerElement; -import org.apache.uima.textmarker.action.AbstractTextMarkerAction; -import org.apache.uima.textmarker.expression.TextMarkerExpression; -import org.apache.uima.textmarker.expression.number.NumberExpression; -import org.apache.uima.textmarker.extensions.ITextMarkerActionExtension; -import org.apache.uima.textmarker.verbalize.TextMarkerVerbalizer; +import org.apache.uima.ruta.RutaElement; +import org.apache.uima.ruta.action.AbstractRutaAction; +import org.apache.uima.ruta.expression.RutaExpression; +import org.apache.uima.ruta.expression.number.NumberExpression; +import org.apache.uima.ruta.extensions.IRutaActionExtension; +import org.apache.uima.ruta.verbalize.RutaVerbalizer; import antlr.ANTLRException; -public class ExampleActionExtension implements ITextMarkerActionExtension { +public class ExampleActionExtension implements IRutaActionExtension { private final String[] knownExtensions = new String[] { "ExampleAction" }; private final Class<?>[] extensions = new Class[] { ExampleAction.class }; - public String verbalize(TextMarkerElement element, TextMarkerVerbalizer verbalizer) { + public String verbalize(RutaElement element, RutaVerbalizer verbalizer) { if (element instanceof ExampleAction) { return verbalizeName(element) + "(" + verbalizer.verbalizeExpressionList(((ExampleAction) element).getIndexExprList()) + ")"; @@ -46,11 +46,11 @@ public class ExampleActionExtension impl } } - public AbstractTextMarkerAction createAction(String name, List<TextMarkerExpression> args) + public AbstractRutaAction createAction(String name, List<RutaExpression> args) throws ANTLRException { List<NumberExpression> arguments = new ArrayList<NumberExpression>(); if (args != null) { - for (TextMarkerExpression each : args) { + for (RutaExpression each : args) { if (each instanceof NumberExpression) { arguments.add((NumberExpression) each); } else { @@ -61,7 +61,7 @@ public class ExampleActionExtension impl return new ExampleAction(arguments); } - public String verbalizeName(TextMarkerElement element) { + public String verbalizeName(RutaElement element) { return knownExtensions[0]; } Modified: uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/textmarker/example/extensions/ExampleActionIDEExtension.java URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/textmarker/example/extensions/ExampleActionIDEExtension.java?rev=1477149&r1=1477148&r2=1477149&view=diff ============================================================================== --- uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/textmarker/example/extensions/ExampleActionIDEExtension.java (original) +++ uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/textmarker/example/extensions/ExampleActionIDEExtension.java Mon Apr 29 15:27:24 2013 @@ -1,12 +1,12 @@ -package org.apache.uima.textmarker.example.extensions; +package org.apache.uima.ruta.example.extensions; import java.util.List; import org.antlr.runtime.RecognitionException; -import org.apache.uima.textmarker.ide.core.extensions.IIDEActionExtension; -import org.apache.uima.textmarker.ide.parser.ast.TMTypeConstants; -import org.apache.uima.textmarker.ide.parser.ast.TextMarkerAction; -import org.apache.uima.textmarker.ide.validator.TextMarkerCheckerProblemFactory; +import org.apache.uima.ruta.ide.core.extensions.IIDEActionExtension; +import org.apache.uima.ruta.ide.parser.ast.TMTypeConstants; +import org.apache.uima.ruta.ide.parser.ast.RutaAction; +import org.apache.uima.ruta.ide.validator.RutaCheckerProblemFactory; import org.eclipse.dltk.ast.expressions.Expression; import org.eclipse.dltk.compiler.problem.IProblem; import org.eclipse.dltk.compiler.problem.IProblemReporter; @@ -18,10 +18,10 @@ public class ExampleActionIDEExtension i return strings; } - public boolean checkSyntax(Expression element, TextMarkerCheckerProblemFactory problemFactory, + public boolean checkSyntax(Expression element, RutaCheckerProblemFactory problemFactory, IProblemReporter rep) throws RecognitionException { - if (element instanceof TextMarkerAction) { - TextMarkerAction a = (TextMarkerAction) element; + if (element instanceof RutaAction) { + RutaAction a = (RutaAction) element; String name = a.getName(); if (!name.equals(strings[0])) { IProblem problem = problemFactory.createUnknownActionProblem(a); Modified: uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/textmarker/example/extensions/ExampleCondition.java URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/textmarker/example/extensions/ExampleCondition.java?rev=1477149&r1=1477148&r2=1477149&view=diff ============================================================================== --- uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/textmarker/example/extensions/ExampleCondition.java (original) +++ uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/textmarker/example/extensions/ExampleCondition.java Mon Apr 29 15:27:24 2013 @@ -17,20 +17,20 @@ * under the License. */ -package org.apache.uima.textmarker.example.extensions; +package org.apache.uima.ruta.example.extensions; import java.text.SimpleDateFormat; import java.util.Date; import org.apache.uima.cas.text.AnnotationFS; -import org.apache.uima.textmarker.TextMarkerStream; -import org.apache.uima.textmarker.condition.AbstractTextMarkerCondition; -import org.apache.uima.textmarker.expression.string.StringExpression; -import org.apache.uima.textmarker.rule.EvaluatedCondition; -import org.apache.uima.textmarker.rule.RuleElement; -import org.apache.uima.textmarker.visitor.InferenceCrowd; +import org.apache.uima.ruta.RutaStream; +import org.apache.uima.ruta.condition.AbstractRutaCondition; +import org.apache.uima.ruta.expression.string.StringExpression; +import org.apache.uima.ruta.rule.EvaluatedCondition; +import org.apache.uima.ruta.rule.RuleElement; +import org.apache.uima.ruta.visitor.InferenceCrowd; -public class ExampleCondition extends AbstractTextMarkerCondition { +public class ExampleCondition extends AbstractRutaCondition { private final StringExpression dateExpr; @@ -44,7 +44,7 @@ public class ExampleCondition extends Ab @Override public EvaluatedCondition eval(AnnotationFS annotation, RuleElement element, - TextMarkerStream stream, InferenceCrowd crowd) { + RutaStream stream, InferenceCrowd crowd) { String coveredText = annotation.getCoveredText(); String dateValue = dateExpr.getStringValue(element.getParent()); String formatValue = formatExpr.getStringValue(element.getParent()); Modified: uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/textmarker/example/extensions/ExampleConditionExtension.java URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/textmarker/example/extensions/ExampleConditionExtension.java?rev=1477149&r1=1477148&r2=1477149&view=diff ============================================================================== --- uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/textmarker/example/extensions/ExampleConditionExtension.java (original) +++ uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/textmarker/example/extensions/ExampleConditionExtension.java Mon Apr 29 15:27:24 2013 @@ -17,26 +17,26 @@ * under the License. */ -package org.apache.uima.textmarker.example.extensions; +package org.apache.uima.ruta.example.extensions; import java.util.List; -import org.apache.uima.textmarker.TextMarkerElement; -import org.apache.uima.textmarker.condition.AbstractTextMarkerCondition; -import org.apache.uima.textmarker.expression.TextMarkerExpression; -import org.apache.uima.textmarker.expression.string.StringExpression; -import org.apache.uima.textmarker.extensions.ITextMarkerConditionExtension; -import org.apache.uima.textmarker.verbalize.TextMarkerVerbalizer; +import org.apache.uima.ruta.RutaElement; +import org.apache.uima.ruta.condition.AbstractRutaCondition; +import org.apache.uima.ruta.expression.RutaExpression; +import org.apache.uima.ruta.expression.string.StringExpression; +import org.apache.uima.ruta.extensions.IRutaConditionExtension; +import org.apache.uima.ruta.verbalize.RutaVerbalizer; import antlr.ANTLRException; -public class ExampleConditionExtension implements ITextMarkerConditionExtension { +public class ExampleConditionExtension implements IRutaConditionExtension { private final String[] knownExtensions = new String[] { "ExampleCondition" }; private final Class<?>[] extensions = new Class[] { ExampleCondition.class }; - public String verbalize(TextMarkerElement element, TextMarkerVerbalizer verbalizer) { + public String verbalize(RutaElement element, RutaVerbalizer verbalizer) { if (element instanceof ExampleCondition) { ExampleCondition c = (ExampleCondition) element; return verbalizeName(element) + "(" + verbalizer.verbalize(c.getExpr()) + ", " @@ -46,7 +46,7 @@ public class ExampleConditionExtension i } } - public AbstractTextMarkerCondition createCondition(String name, List<TextMarkerExpression> args) + public AbstractRutaCondition createCondition(String name, List<RutaExpression> args) throws ANTLRException { if (args != null && args.size() == 2) { if (!(args.get(0) instanceof StringExpression)) { @@ -60,7 +60,7 @@ public class ExampleConditionExtension i return new ExampleCondition((StringExpression) args.get(0), (StringExpression) args.get(1)); } - public String verbalizeName(TextMarkerElement element) { + public String verbalizeName(RutaElement element) { return knownExtensions[0]; } Modified: uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/textmarker/example/extensions/ExampleConditionIDEExtension.java URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/textmarker/example/extensions/ExampleConditionIDEExtension.java?rev=1477149&r1=1477148&r2=1477149&view=diff ============================================================================== --- uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/textmarker/example/extensions/ExampleConditionIDEExtension.java (original) +++ uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/textmarker/example/extensions/ExampleConditionIDEExtension.java Mon Apr 29 15:27:24 2013 @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.uima.textmarker.example.extensions; +package org.apache.uima.ruta.example.extensions; import java.util.List; import org.antlr.runtime.RecognitionException; -import org.apache.uima.textmarker.ide.core.extensions.IIDEConditionExtension; -import org.apache.uima.textmarker.ide.parser.ast.TMTypeConstants; -import org.apache.uima.textmarker.ide.parser.ast.TextMarkerCondition; -import org.apache.uima.textmarker.ide.validator.TextMarkerCheckerProblemFactory; +import org.apache.uima.ruta.ide.core.extensions.IIDEConditionExtension; +import org.apache.uima.ruta.ide.parser.ast.TMTypeConstants; +import org.apache.uima.ruta.ide.parser.ast.RutaCondition; +import org.apache.uima.ruta.ide.validator.RutaCheckerProblemFactory; import org.eclipse.dltk.ast.expressions.Expression; import org.eclipse.dltk.compiler.problem.IProblem; import org.eclipse.dltk.compiler.problem.IProblemReporter; @@ -39,10 +39,10 @@ public class ExampleConditionIDEExtensio return strings; } - public boolean checkSyntax(Expression element, TextMarkerCheckerProblemFactory problemFactory, + public boolean checkSyntax(Expression element, RutaCheckerProblemFactory problemFactory, IProblemReporter rep) throws RecognitionException { - if (element instanceof TextMarkerCondition) { - TextMarkerCondition a = (TextMarkerCondition) element; + if (element instanceof RutaCondition) { + RutaCondition a = (RutaCondition) element; String name = a.getName(); if (!name.equals(strings[0])) { IProblem problem = problemFactory.createUnknownConditionProblem(a);