You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by pk...@apache.org on 2013/04/29 16:09:55 UTC
svn commit: r1477088 [2/3] - in /uima/sandbox/ruta/trunk/ruta-core/src:
main/java/org/apache/uima/ruta/ main/java/org/apache/uima/ruta/action/
main/java/org/apache/uima/ruta/condition/
main/java/org/apache/uima/ruta/engine/ main/java/org/apache/uima/ru...
Copied: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/Ruta.java (from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/TextMarker.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/Ruta.java?p2=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/Ruta.java&p1=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/TextMarker.java&r1=1477049&r2=1477088&rev=1477088&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/TextMarker.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/Ruta.java Mon Apr 29 14:09:53 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.engine;
+package org.apache.uima.ruta.engine;
import java.io.File;
import java.io.IOException;
@@ -38,25 +38,25 @@ import org.apache.uima.util.FileUtils;
import org.apache.uima.util.InvalidXMLException;
import org.apache.uima.util.XMLInputSource;
-public class TextMarker {
+public class Ruta {
public static void apply(CAS cas, String script) throws IOException, InvalidXMLException,
ResourceInitializationException, ResourceConfigurationException,
AnalysisEngineProcessException, URISyntaxException {
String viewName = cas.getViewName();
- URL aedesc = TextMarkerEngine.class.getResource("BasicEngine.xml");
+ URL aedesc = RutaEngine.class.getResource("BasicEngine.xml");
AnalysisEngine ae = wrapAnalysisEngine(aedesc, viewName);
- File scriptFile = File.createTempFile("TextMarker", ".tm");
+ File scriptFile = File.createTempFile("Ruta", ".tm");
scriptFile.deleteOnExit();
if (!script.startsWith("PACKAGE")) {
- script = "PACKAGE org.apache.uima.textmarker;\n" + script;
+ script = "PACKAGE org.apache.uima.ruta;\n" + script;
}
FileUtils.saveString2File(script, scriptFile);
- ae.setConfigParameterValue(TextMarkerEngine.SCRIPT_PATHS, new String[] { scriptFile
+ ae.setConfigParameterValue(RutaEngine.SCRIPT_PATHS, new String[] { scriptFile
.getParentFile().getAbsolutePath() });
String name = scriptFile.getName().substring(0, scriptFile.getName().length() - 3);
- ae.setConfigParameterValue(TextMarkerEngine.MAIN_SCRIPT, name);
+ ae.setConfigParameterValue(RutaEngine.MAIN_SCRIPT, name);
ae.reconfigure();
ae.process(cas);
scriptFile.delete();
@@ -69,7 +69,7 @@ public class TextMarker {
return wrapAnalysisEngine(descriptorUrl, viewName, false, Charset.defaultCharset().name());
}
- public static AnalysisEngine wrapAnalysisEngine(URL descriptorUrl, String viewName, boolean textmarkerEngine,
+ public static AnalysisEngine wrapAnalysisEngine(URL descriptorUrl, String viewName, boolean rutaEngine,
String encoding) throws ResourceInitializationException, ResourceConfigurationException,
InvalidXMLException, IOException, URISyntaxException {
if (viewName.equals(CAS.NAME_DEFAULT_SOFA)) {
@@ -79,16 +79,16 @@ public class TextMarker {
return ae;
} else {
InputStream inputStream = null;
- if(textmarkerEngine) {
- inputStream = TextMarker.class.getResourceAsStream("AAEDBasicEngine.xml");
+ if(rutaEngine) {
+ inputStream = Ruta.class.getResourceAsStream("AAEDBasicEngine.xml");
} else {
- inputStream = TextMarker.class.getResourceAsStream("AAED.xml");
+ inputStream = Ruta.class.getResourceAsStream("AAED.xml");
}
String aaedString = IOUtils.toString(inputStream, encoding);
String absolutePath = descriptorUrl.toExternalForm();
aaedString = aaedString.replaceAll("\\$\\{sofaName\\}", viewName);
aaedString = aaedString.replaceAll("\\$\\{descriptorLocation\\}", absolutePath);
- File tempFile = File.createTempFile("TextMarkerAAED", ".xml");
+ File tempFile = File.createTempFile("RutaAAED", ".xml");
FileUtils.saveString2File(aaedString, tempFile);
XMLInputSource in = new XMLInputSource(tempFile);
ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
Copied: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java (from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/TextMarkerEngine.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java?p2=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java&p1=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/TextMarkerEngine.java&r1=1477049&r2=1477088&rev=1477088&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/TextMarkerEngine.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java Mon Apr 29 14:09:53 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.engine;
+package org.apache.uima.ruta.engine;
import java.io.File;
import java.io.FileNotFoundException;
@@ -55,32 +55,32 @@ import org.apache.uima.resource.Resource
import org.apache.uima.resource.metadata.ConfigurationParameter;
import org.apache.uima.resource.metadata.ConfigurationParameterDeclarations;
import org.apache.uima.resource.metadata.TypeSystemDescription;
-import org.apache.uima.textmarker.FilterManager;
-import org.apache.uima.textmarker.TextMarkerBlock;
-import org.apache.uima.textmarker.TextMarkerModule;
-import org.apache.uima.textmarker.TextMarkerStream;
-import org.apache.uima.textmarker.extensions.IEngineLoader;
-import org.apache.uima.textmarker.extensions.ITextMarkerExtension;
-import org.apache.uima.textmarker.extensions.TextMarkerEngineLoader;
-import org.apache.uima.textmarker.extensions.TextMarkerExternalFactory;
-import org.apache.uima.textmarker.parser.TextMarkerLexer;
-import org.apache.uima.textmarker.parser.TextMarkerParser;
-import org.apache.uima.textmarker.seed.TextMarkerAnnotationSeeder;
-import org.apache.uima.textmarker.verbalize.TextMarkerVerbalizer;
-import org.apache.uima.textmarker.visitor.CreatedByVisitor;
-import org.apache.uima.textmarker.visitor.DebugInfoCollectorVisitor;
-import org.apache.uima.textmarker.visitor.InferenceCrowd;
-import org.apache.uima.textmarker.visitor.StatisticsVisitor;
-import org.apache.uima.textmarker.visitor.TextMarkerInferenceVisitor;
-import org.apache.uima.textmarker.visitor.TimeProfilerVisitor;
+import org.apache.uima.ruta.FilterManager;
+import org.apache.uima.ruta.RutaBlock;
+import org.apache.uima.ruta.RutaModule;
+import org.apache.uima.ruta.RutaStream;
+import org.apache.uima.ruta.extensions.IEngineLoader;
+import org.apache.uima.ruta.extensions.IRutaExtension;
+import org.apache.uima.ruta.extensions.RutaEngineLoader;
+import org.apache.uima.ruta.extensions.RutaExternalFactory;
+import org.apache.uima.ruta.parser.RutaLexer;
+import org.apache.uima.ruta.parser.RutaParser;
+import org.apache.uima.ruta.seed.RutaAnnotationSeeder;
+import org.apache.uima.ruta.verbalize.RutaVerbalizer;
+import org.apache.uima.ruta.visitor.CreatedByVisitor;
+import org.apache.uima.ruta.visitor.DebugInfoCollectorVisitor;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
+import org.apache.uima.ruta.visitor.StatisticsVisitor;
+import org.apache.uima.ruta.visitor.RutaInferenceVisitor;
+import org.apache.uima.ruta.visitor.TimeProfilerVisitor;
import org.apache.uima.util.InvalidXMLException;
import org.apache.uima.util.XMLInputSource;
-public class TextMarkerEngine extends JCasAnnotator_ImplBase {
+public class RutaEngine extends JCasAnnotator_ImplBase {
public static final String SOURCE_DOCUMENT_INFORMATION = "org.apache.uima.examples.SourceDocumentInformation";
- public static final String BASIC_TYPE = "org.apache.uima.textmarker.type.TextMarkerBasic";
+ public static final String BASIC_TYPE = "org.apache.uima.ruta.type.RutaBasic";
public static final String SEEDERS = "seeders";
@@ -144,7 +144,7 @@ public class TextMarkerEngine extends JC
private UimaContext context;
- private TextMarkerModule script;
+ private RutaModule script;
private String[] additionalScriptLocations;
@@ -154,9 +154,9 @@ public class TextMarkerEngine extends JC
private String[] additionalEngineLoaders;
- private TextMarkerExternalFactory factory;
+ private RutaExternalFactory factory;
- private TextMarkerEngineLoader engineLoader;
+ private RutaEngineLoader engineLoader;
private String[] defaultFilteredTypes;
@@ -166,7 +166,7 @@ public class TextMarkerEngine extends JC
private String[] descriptorPaths;
- private TextMarkerVerbalizer verbalizer;
+ private RutaVerbalizer verbalizer;
private Boolean removeBasics;
@@ -235,9 +235,9 @@ public class TextMarkerEngine extends JC
this.context = aContext;
- factory = new TextMarkerExternalFactory();
- engineLoader = new TextMarkerEngineLoader();
- verbalizer = new TextMarkerVerbalizer();
+ factory = new RutaExternalFactory();
+ engineLoader = new RutaEngineLoader();
+ verbalizer = new RutaVerbalizer();
localTSDMap = new HashMap<String, TypeSystemDescription>();
@@ -269,7 +269,7 @@ public class TextMarkerEngine extends JC
initialized = true;
}
InferenceCrowd crowd = initializeCrowd();
- TextMarkerStream stream = initializeStream(cas, crowd);
+ RutaStream stream = initializeStream(cas, crowd);
stream.setDynamicAnchoring(dynamicAnchoring);
try {
script.apply(stream, crowd);
@@ -300,37 +300,37 @@ public class TextMarkerEngine extends JC
private void resetEnvironments(CAS cas) {
resetEnvironment(script, cas);
- Collection<TextMarkerModule> scripts = script.getScripts().values();
- for (TextMarkerModule module : scripts) {
+ Collection<RutaModule> scripts = script.getScripts().values();
+ for (RutaModule module : scripts) {
resetEnvironment(module, cas);
}
}
- private void resetEnvironment(TextMarkerModule module, CAS cas) {
- TextMarkerBlock block = module.getBlock(null);
+ private void resetEnvironment(RutaModule module, CAS cas) {
+ RutaBlock block = module.getBlock(null);
block.getEnvironment().reset(cas);
- Collection<TextMarkerBlock> blocks = module.getBlocks().values();
- for (TextMarkerBlock each : blocks) {
+ Collection<RutaBlock> blocks = module.getBlocks().values();
+ for (RutaBlock each : blocks) {
each.getEnvironment().reset(cas);
}
}
- private void initializeTypes(TextMarkerModule script, CAS cas) {
+ private void initializeTypes(RutaModule script, CAS cas) {
// TODO find a better solution for telling everyone about the types!
- TextMarkerBlock mainRootBlock = script.getBlock(null);
+ RutaBlock mainRootBlock = script.getBlock(null);
mainRootBlock.getEnvironment().initializeTypes(cas);
- Collection<TextMarkerModule> values = script.getScripts().values();
- for (TextMarkerModule eachModule : values) {
+ Collection<RutaModule> values = script.getScripts().values();
+ for (RutaModule eachModule : values) {
relinkEnvironments(eachModule, mainRootBlock);
// initializeTypes(eachModule, cas);
}
}
- private void relinkEnvironments(TextMarkerModule script, TextMarkerBlock mainRootBlock) {
- TextMarkerBlock block = script.getBlock(null);
+ private void relinkEnvironments(RutaModule script, RutaBlock mainRootBlock) {
+ RutaBlock block = script.getBlock(null);
block.setParent(mainRootBlock);
- Collection<TextMarkerModule> innerScripts = script.getScripts().values();
- for (TextMarkerModule textMarkerModule : innerScripts) {
+ Collection<RutaModule> innerScripts = script.getScripts().values();
+ for (RutaModule textMarkerModule : innerScripts) {
relinkEnvironments(textMarkerModule, mainRootBlock);
}
}
@@ -342,8 +342,8 @@ public class TextMarkerEngine extends JC
for (String each : additionalExtensions) {
try {
Class<?> forName = Class.forName(each);
- if (ITextMarkerExtension.class.isAssignableFrom(forName)) {
- ITextMarkerExtension extension = (ITextMarkerExtension) forName.newInstance();
+ if (IRutaExtension.class.isAssignableFrom(forName)) {
+ IRutaExtension extension = (IRutaExtension) forName.newInstance();
verbalizer.addExternalVerbalizers(extension);
for (String name : extension.getKnownExtensions()) {
factory.addExtension(name, extension);
@@ -375,7 +375,7 @@ public class TextMarkerEngine extends JC
}
private InferenceCrowd initializeCrowd() {
- List<TextMarkerInferenceVisitor> visitors = new ArrayList<TextMarkerInferenceVisitor>();
+ List<RutaInferenceVisitor> visitors = new ArrayList<RutaInferenceVisitor>();
if (createDebugInfo) {
visitors.add(new DebugInfoCollectorVisitor(createDebugInfo, withMatches, Arrays
.asList(createDebugOnlyFor), verbalizer));
@@ -392,7 +392,7 @@ public class TextMarkerEngine extends JC
return new InferenceCrowd(visitors);
}
- private TextMarkerStream initializeStream(CAS cas, InferenceCrowd crowd) throws AnalysisEngineProcessException {
+ private RutaStream initializeStream(CAS cas, InferenceCrowd crowd) throws AnalysisEngineProcessException {
Collection<Type> filterTypes = new ArrayList<Type>();
TypeSystem typeSystem = cas.getTypeSystem();
for (String each : defaultFilteredTypes) {
@@ -404,7 +404,7 @@ public class TextMarkerEngine extends JC
FilterManager filter = new FilterManager(filterTypes, cas);
Type basicType = typeSystem.getType(BASIC_TYPE);
seedTypes = seedAnnotations(cas);
- TextMarkerStream stream = new TextMarkerStream(cas, basicType, filter, lowMemoryProfile, simpleGreedyForComposed, crowd);
+ RutaStream stream = new RutaStream(cas, basicType, filter, lowMemoryProfile, simpleGreedyForComposed, crowd);
stream.initalizeBasics();
return stream;
@@ -427,7 +427,7 @@ public class TextMarkerEngine extends JC
throw new AnalysisEngineProcessException(e);
}
try {
- TextMarkerAnnotationSeeder seeder = (TextMarkerAnnotationSeeder) newInstance;
+ RutaAnnotationSeeder seeder = (RutaAnnotationSeeder) newInstance;
result.add(seeder.seed(cas.getDocumentText(), cas));
} catch (Exception e) {
throw new AnalysisEngineProcessException(e);
@@ -463,7 +463,7 @@ public class TextMarkerEngine extends JC
}
}
- Map<String, TextMarkerModule> additionalScripts = new HashMap<String, TextMarkerModule>();
+ Map<String, RutaModule> additionalScripts = new HashMap<String, RutaModule>();
Map<String, AnalysisEngine> additionalEngines = new HashMap<String, AnalysisEngine>();
if (additionalEngineLocations != null) {
@@ -523,12 +523,12 @@ public class TextMarkerEngine extends JC
}
}
- for (TextMarkerModule each : additionalScripts.values()) {
+ for (RutaModule each : additionalScripts.values()) {
each.setScriptDependencies(additionalScripts);
}
script.setScriptDependencies(additionalScripts);
- for (TextMarkerModule each : additionalScripts.values()) {
+ for (RutaModule each : additionalScripts.values()) {
each.setEngineDependencies(additionalEngines);
}
script.setEngineDependencies(additionalEngines);
@@ -611,12 +611,12 @@ public class TextMarkerEngine extends JC
return name + suffix;
}
- private void recursiveLoadScript(String toLoad, Map<String, TextMarkerModule> additionalScripts,
+ private void recursiveLoadScript(String toLoad, Map<String, RutaModule> additionalScripts,
Map<String, AnalysisEngine> additionalEngines, String viewName) throws AnalysisEngineProcessException {
String location = locate(toLoad, scriptPaths, ".tm");
try {
TypeSystemDescription localTSD = getLocalTSD(toLoad);
- TextMarkerModule eachScript = loadScript(location, localTSD);
+ RutaModule eachScript = loadScript(location, localTSD);
additionalScripts.put(toLoad, eachScript);
for (String add : eachScript.getScripts().keySet()) {
if (!additionalScripts.containsKey(add)) {
@@ -670,45 +670,45 @@ public class TextMarkerEngine extends JC
return result;
}
- private TextMarkerModule loadScript(String scriptLocation, TypeSystemDescription localTSD)
+ private RutaModule loadScript(String scriptLocation, TypeSystemDescription localTSD)
throws IOException, RecognitionException {
File scriptFile = new File(scriptLocation);
CharStream st = new ANTLRFileStream(scriptLocation, scriptEncoding);
- TextMarkerLexer lexer = new TextMarkerLexer(st);
+ RutaLexer lexer = new RutaLexer(st);
CommonTokenStream tokens = new CommonTokenStream(lexer);
- TextMarkerParser parser = new TextMarkerParser(tokens);
+ RutaParser parser = new RutaParser(tokens);
parser.setLocalTSD(localTSD);
parser.setExternalFactory(factory);
parser.setResourcePaths(resourcePaths);
String name = scriptFile.getName();
int lastIndexOf = name.lastIndexOf(".tm");
name = name.substring(0, lastIndexOf);
- TextMarkerModule script = parser.file_input(name);
+ RutaModule script = parser.file_input(name);
return script;
}
- private TextMarkerModule loadScriptIS(String scriptLocation, TypeSystemDescription localTSD)
+ private RutaModule loadScriptIS(String scriptLocation, TypeSystemDescription localTSD)
throws IOException, RecognitionException {
InputStream scriptInputStream = getClass().getClassLoader().getResourceAsStream(scriptLocation);
CharStream st = new ANTLRInputStream(scriptInputStream, scriptEncoding);
- TextMarkerLexer lexer = new TextMarkerLexer(st);
+ RutaLexer lexer = new RutaLexer(st);
CommonTokenStream tokens = new CommonTokenStream(lexer);
- TextMarkerParser parser = new TextMarkerParser(tokens);
+ RutaParser parser = new RutaParser(tokens);
parser.setLocalTSD(localTSD);
parser.setExternalFactory(factory);
parser.setResourcePaths(resourcePaths);
String name = scriptLocation;
int lastIndexOf = name.lastIndexOf(".tm");
name = name.substring(0, lastIndexOf);
- TextMarkerModule script = parser.file_input(name);
+ RutaModule script = parser.file_input(name);
return script;
}
- public TextMarkerExternalFactory getFactory() {
+ public RutaExternalFactory getFactory() {
return factory;
}
- public TextMarkerEngineLoader getEngineLoader() {
+ public RutaEngineLoader getEngineLoader() {
return engineLoader;
}
Copied: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaModifier.java (from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/TextMarkerModifier.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaModifier.java?p2=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaModifier.java&p1=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/TextMarkerModifier.java&r1=1477049&r2=1477088&rev=1477088&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/TextMarkerModifier.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaModifier.java Mon Apr 29 14:09:53 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.engine;
+package org.apache.uima.ruta.engine;
import java.io.File;
import java.io.IOException;
@@ -40,11 +40,11 @@ import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.jcas.JCas;
import org.apache.uima.resource.ResourceInitializationException;
-import org.apache.uima.textmarker.type.TextMarkerBasic;
+import org.apache.uima.ruta.type.RutaBasic;
import org.apache.uima.tools.stylemap.StyleMapEntry;
import org.apache.uima.util.FileUtils;
-public class TextMarkerModifier extends JCasAnnotator_ImplBase {
+public class RutaModifier extends JCasAnnotator_ImplBase {
public static final String DEFAULT_MODIFIED_VIEW = "modified";
public static final String OUTPUT_LOCATION = "outputLocation";
@@ -66,10 +66,10 @@ public class TextMarkerModifier extends
super.initialize(aContext);
styleMapLocation = (String) aContext.getConfigParameterValue(StyleMapCreator.STYLE_MAP);
descriptorPaths = (String[]) aContext
- .getConfigParameterValue(TextMarkerEngine.DESCRIPTOR_PATHS);
- outputLocation = (String) aContext.getConfigParameterValue(TextMarkerModifier.OUTPUT_LOCATION);
+ .getConfigParameterValue(RutaEngine.DESCRIPTOR_PATHS);
+ outputLocation = (String) aContext.getConfigParameterValue(RutaModifier.OUTPUT_LOCATION);
styleMapFactory = new StyleMapFactory();
- modifiedViewName = (String) aContext.getConfigParameterValue(TextMarkerModifier.OUTPUT_VIEW);
+ modifiedViewName = (String) aContext.getConfigParameterValue(RutaModifier.OUTPUT_VIEW);
modifiedViewName = StringUtils.isBlank(modifiedViewName) ? DEFAULT_MODIFIED_VIEW : modifiedViewName;
}
@@ -99,7 +99,7 @@ public class TextMarkerModifier extends
} else {
modifiedView = cas.getView(modifiedViewName);
}
- String locate = TextMarkerEngine.locate(styleMapLocation, descriptorPaths, ".xml", true);
+ String locate = RutaEngine.locate(styleMapLocation, descriptorPaths, ".xml", true);
try {
String modifiedDocument = getModifiedDocument(cas, locate);
modifiedView.setDocumentText(modifiedDocument);
@@ -130,7 +130,7 @@ public class TextMarkerModifier extends
return null;
}
- Type sdiType = cas.getTypeSystem().getType(TextMarkerEngine.SOURCE_DOCUMENT_INFORMATION);
+ Type sdiType = cas.getTypeSystem().getType(RutaEngine.SOURCE_DOCUMENT_INFORMATION);
String filename = "output.modified.html";
File file = new File(outputLocation, filename);
if (sdiType != null) {
@@ -161,9 +161,9 @@ public class TextMarkerModifier extends
}
List<String> tokens = new ArrayList<String>();
FSIterator<org.apache.uima.jcas.tcas.Annotation> iterator = cas.getAnnotationIndex(
- TextMarkerBasic.type).iterator();
+ RutaBasic.type).iterator();
while (iterator.isValid()) {
- TextMarkerBasic each = (TextMarkerBasic) iterator.get();
+ RutaBasic each = (RutaBasic) iterator.get();
String replace = each.getReplacement() == null ? each.getCoveredText() : each
.getReplacement();
Type type = getColorType(each, coloredTypes, cas);
@@ -187,7 +187,7 @@ public class TextMarkerModifier extends
return sb.toString();
}
- private Type getColorType(TextMarkerBasic basic, List<Type> coloredTypes, JCas cas) {
+ private Type getColorType(RutaBasic basic, List<Type> coloredTypes, JCas cas) {
if (coloredTypes.isEmpty()) {
return null;
}
Copied: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/RutaExpression.java (from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/TextMarkerExpression.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/RutaExpression.java?p2=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/RutaExpression.java&p1=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/TextMarkerExpression.java&r1=1477049&r2=1477088&rev=1477088&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/TextMarkerExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/RutaExpression.java Mon Apr 29 14:09:53 2013
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression;
+package org.apache.uima.ruta.expression;
-import org.apache.uima.textmarker.TextMarkerElement;
+import org.apache.uima.ruta.RutaElement;
-public class TextMarkerExpression extends TextMarkerElement {
+public class RutaExpression extends RutaElement {
}
Copied: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaActionExtension.java (from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/ITextMarkerActionExtension.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaActionExtension.java?p2=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaActionExtension.java&p1=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/ITextMarkerActionExtension.java&r1=1477049&r2=1477088&rev=1477088&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/ITextMarkerActionExtension.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaActionExtension.java Mon Apr 29 14:09:53 2013
@@ -17,18 +17,18 @@
* under the License.
*/
-package org.apache.uima.textmarker.extensions;
+package org.apache.uima.ruta.extensions;
import java.util.List;
-import org.apache.uima.textmarker.action.AbstractTextMarkerAction;
-import org.apache.uima.textmarker.expression.TextMarkerExpression;
+import org.apache.uima.ruta.action.AbstractRutaAction;
+import org.apache.uima.ruta.expression.RutaExpression;
import antlr.ANTLRException;
-public interface ITextMarkerActionExtension extends ITextMarkerExtension {
+public interface IRutaActionExtension extends IRutaExtension {
- AbstractTextMarkerAction createAction(String name, List<TextMarkerExpression> args)
+ AbstractRutaAction createAction(String name, List<RutaExpression> args)
throws ANTLRException;
}
Copied: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaBooleanFunctionExtension.java (from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/ITextMarkerBooleanFunctionExtension.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaBooleanFunctionExtension.java?p2=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaBooleanFunctionExtension.java&p1=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/ITextMarkerBooleanFunctionExtension.java&r1=1477049&r2=1477088&rev=1477088&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/ITextMarkerBooleanFunctionExtension.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaBooleanFunctionExtension.java Mon Apr 29 14:09:53 2013
@@ -17,18 +17,18 @@
* under the License.
*/
-package org.apache.uima.textmarker.extensions;
+package org.apache.uima.ruta.extensions;
import java.util.List;
-import org.apache.uima.textmarker.expression.TextMarkerExpression;
-import org.apache.uima.textmarker.expression.bool.BooleanFunctionExpression;
+import org.apache.uima.ruta.expression.RutaExpression;
+import org.apache.uima.ruta.expression.bool.BooleanFunctionExpression;
import antlr.ANTLRException;
-public interface ITextMarkerBooleanFunctionExtension extends ITextMarkerExtension {
+public interface IRutaBooleanFunctionExtension extends IRutaExtension {
- BooleanFunctionExpression createBooleanFunction(String name, List<TextMarkerExpression> args)
+ BooleanFunctionExpression createBooleanFunction(String name, List<RutaExpression> args)
throws ANTLRException;
}
Copied: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaConditionExtension.java (from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/ITextMarkerConditionExtension.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaConditionExtension.java?p2=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaConditionExtension.java&p1=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/ITextMarkerConditionExtension.java&r1=1477049&r2=1477088&rev=1477088&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/ITextMarkerConditionExtension.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaConditionExtension.java Mon Apr 29 14:09:53 2013
@@ -17,18 +17,18 @@
* under the License.
*/
-package org.apache.uima.textmarker.extensions;
+package org.apache.uima.ruta.extensions;
import java.util.List;
-import org.apache.uima.textmarker.condition.AbstractTextMarkerCondition;
-import org.apache.uima.textmarker.expression.TextMarkerExpression;
+import org.apache.uima.ruta.condition.AbstractRutaCondition;
+import org.apache.uima.ruta.expression.RutaExpression;
import antlr.ANTLRException;
-public interface ITextMarkerConditionExtension extends ITextMarkerExtension {
+public interface IRutaConditionExtension extends IRutaExtension {
- AbstractTextMarkerCondition createCondition(String name, List<TextMarkerExpression> args)
+ AbstractRutaCondition createCondition(String name, List<RutaExpression> args)
throws ANTLRException;
}
Copied: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaExtension.java (from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/ITextMarkerExtension.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaExtension.java?p2=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaExtension.java&p1=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/ITextMarkerExtension.java&r1=1477049&r2=1477088&rev=1477088&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/ITextMarkerExtension.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaExtension.java Mon Apr 29 14:09:53 2013
@@ -17,19 +17,19 @@
* under the License.
*/
-package org.apache.uima.textmarker.extensions;
+package org.apache.uima.ruta.extensions;
-import org.apache.uima.textmarker.TextMarkerElement;
-import org.apache.uima.textmarker.verbalize.TextMarkerVerbalizer;
+import org.apache.uima.ruta.RutaElement;
+import org.apache.uima.ruta.verbalize.RutaVerbalizer;
-public interface ITextMarkerExtension {
+public interface IRutaExtension {
String[] getKnownExtensions();
Class<?>[] extensions();
- String verbalize(TextMarkerElement element, TextMarkerVerbalizer verbalizer);
+ String verbalize(RutaElement element, RutaVerbalizer verbalizer);
- String verbalizeName(TextMarkerElement element);
+ String verbalizeName(RutaElement element);
}
Copied: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaNumberFunctionExtension.java (from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/ITextMarkerNumberFunctionExtension.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaNumberFunctionExtension.java?p2=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaNumberFunctionExtension.java&p1=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/ITextMarkerNumberFunctionExtension.java&r1=1477049&r2=1477088&rev=1477088&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/ITextMarkerNumberFunctionExtension.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaNumberFunctionExtension.java Mon Apr 29 14:09:53 2013
@@ -17,18 +17,18 @@
* under the License.
*/
-package org.apache.uima.textmarker.extensions;
+package org.apache.uima.ruta.extensions;
import java.util.List;
-import org.apache.uima.textmarker.expression.TextMarkerExpression;
-import org.apache.uima.textmarker.expression.number.NumberFunctionExpression;
+import org.apache.uima.ruta.expression.RutaExpression;
+import org.apache.uima.ruta.expression.number.NumberFunctionExpression;
import antlr.ANTLRException;
-public interface ITextMarkerNumberFunctionExtension extends ITextMarkerExtension {
+public interface IRutaNumberFunctionExtension extends IRutaExtension {
- NumberFunctionExpression createNumberFunction(String name, List<TextMarkerExpression> args)
+ NumberFunctionExpression createNumberFunction(String name, List<RutaExpression> args)
throws ANTLRException;
}
Copied: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaStringFunctionExtension.java (from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/ITextMarkerStringFunctionExtension.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaStringFunctionExtension.java?p2=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaStringFunctionExtension.java&p1=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/ITextMarkerStringFunctionExtension.java&r1=1477049&r2=1477088&rev=1477088&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/ITextMarkerStringFunctionExtension.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaStringFunctionExtension.java Mon Apr 29 14:09:53 2013
@@ -17,18 +17,18 @@
* under the License.
*/
-package org.apache.uima.textmarker.extensions;
+package org.apache.uima.ruta.extensions;
import java.util.List;
-import org.apache.uima.textmarker.expression.TextMarkerExpression;
-import org.apache.uima.textmarker.expression.string.StringFunctionExpression;
+import org.apache.uima.ruta.expression.RutaExpression;
+import org.apache.uima.ruta.expression.string.StringFunctionExpression;
import antlr.ANTLRException;
-public interface ITextMarkerStringFunctionExtension extends ITextMarkerExtension {
+public interface IRutaStringFunctionExtension extends IRutaExtension {
- StringFunctionExpression createStringFunction(String name, List<TextMarkerExpression> args)
+ StringFunctionExpression createStringFunction(String name, List<RutaExpression> args)
throws ANTLRException;
}
Copied: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaTypeFunctionExtension.java (from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/ITextMarkerTypeFunctionExtension.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaTypeFunctionExtension.java?p2=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaTypeFunctionExtension.java&p1=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/ITextMarkerTypeFunctionExtension.java&r1=1477049&r2=1477088&rev=1477088&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/ITextMarkerTypeFunctionExtension.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaTypeFunctionExtension.java Mon Apr 29 14:09:53 2013
@@ -17,18 +17,18 @@
* under the License.
*/
-package org.apache.uima.textmarker.extensions;
+package org.apache.uima.ruta.extensions;
import java.util.List;
-import org.apache.uima.textmarker.expression.TextMarkerExpression;
-import org.apache.uima.textmarker.expression.type.TypeFunctionExpression;
+import org.apache.uima.ruta.expression.RutaExpression;
+import org.apache.uima.ruta.expression.type.TypeFunctionExpression;
import antlr.ANTLRException;
-public interface ITextMarkerTypeFunctionExtension extends ITextMarkerExtension {
+public interface IRutaTypeFunctionExtension extends IRutaExtension {
- TypeFunctionExpression createTypeFunction(String name, List<TextMarkerExpression> args)
+ TypeFunctionExpression createTypeFunction(String name, List<RutaExpression> args)
throws ANTLRException;
}
Copied: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/RutaEngineLoader.java (from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/TextMarkerEngineLoader.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/RutaEngineLoader.java?p2=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/RutaEngineLoader.java&p1=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/TextMarkerEngineLoader.java&r1=1477049&r2=1477088&rev=1477088&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/TextMarkerEngineLoader.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/RutaEngineLoader.java Mon Apr 29 14:09:53 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.extensions;
+package org.apache.uima.ruta.extensions;
import java.io.File;
import java.io.IOException;
@@ -30,11 +30,11 @@ import org.apache.uima.resource.Resource
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.util.InvalidXMLException;
-public class TextMarkerEngineLoader extends DefaultEngineLoader {
+public class RutaEngineLoader extends DefaultEngineLoader {
private Map<String, IEngineLoader> loaders;
- public TextMarkerEngineLoader() {
+ public RutaEngineLoader() {
super();
loaders = new HashMap<String, IEngineLoader>();
}
Copied: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/RutaExternalFactory.java (from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/TextMarkerExternalFactory.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/RutaExternalFactory.java?p2=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/RutaExternalFactory.java&p1=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/TextMarkerExternalFactory.java&r1=1477049&r2=1477088&rev=1477088&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/TextMarkerExternalFactory.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/RutaExternalFactory.java Mon Apr 29 14:09:53 2013
@@ -17,51 +17,51 @@
* under the License.
*/
-package org.apache.uima.textmarker.extensions;
+package org.apache.uima.ruta.extensions;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.antlr.runtime.Token;
-import org.apache.uima.textmarker.action.AbstractTextMarkerAction;
-import org.apache.uima.textmarker.condition.AbstractTextMarkerCondition;
-import org.apache.uima.textmarker.expression.TextMarkerExpression;
-import org.apache.uima.textmarker.expression.bool.BooleanExpression;
-import org.apache.uima.textmarker.expression.number.NumberExpression;
-import org.apache.uima.textmarker.expression.string.StringExpression;
-import org.apache.uima.textmarker.expression.type.TypeExpression;
+import org.apache.uima.ruta.action.AbstractRutaAction;
+import org.apache.uima.ruta.condition.AbstractRutaCondition;
+import org.apache.uima.ruta.expression.RutaExpression;
+import org.apache.uima.ruta.expression.bool.BooleanExpression;
+import org.apache.uima.ruta.expression.number.NumberExpression;
+import org.apache.uima.ruta.expression.string.StringExpression;
+import org.apache.uima.ruta.expression.type.TypeExpression;
import antlr.ANTLRException;
-public class TextMarkerExternalFactory {
+public class RutaExternalFactory {
- private Map<String, ITextMarkerConditionExtension> conditionExtensions;
+ private Map<String, IRutaConditionExtension> conditionExtensions;
- private Map<String, ITextMarkerActionExtension> actionExtensions;
+ private Map<String, IRutaActionExtension> actionExtensions;
- private Map<String, ITextMarkerTypeFunctionExtension> typeFunctionExtensions;
+ private Map<String, IRutaTypeFunctionExtension> typeFunctionExtensions;
- private Map<String, ITextMarkerBooleanFunctionExtension> booleanFunctionExtensions;
+ private Map<String, IRutaBooleanFunctionExtension> booleanFunctionExtensions;
- private Map<String, ITextMarkerStringFunctionExtension> stringFunctionExtensions;
+ private Map<String, IRutaStringFunctionExtension> stringFunctionExtensions;
- private Map<String, ITextMarkerNumberFunctionExtension> numberFunctionExtensions;
+ private Map<String, IRutaNumberFunctionExtension> numberFunctionExtensions;
- public TextMarkerExternalFactory() {
+ public RutaExternalFactory() {
super();
- conditionExtensions = new HashMap<String, ITextMarkerConditionExtension>();
- actionExtensions = new HashMap<String, ITextMarkerActionExtension>();
- booleanFunctionExtensions = new HashMap<String, ITextMarkerBooleanFunctionExtension>();
- stringFunctionExtensions = new HashMap<String, ITextMarkerStringFunctionExtension>();
- numberFunctionExtensions = new HashMap<String, ITextMarkerNumberFunctionExtension>();
- typeFunctionExtensions = new HashMap<String, ITextMarkerTypeFunctionExtension>();
+ conditionExtensions = new HashMap<String, IRutaConditionExtension>();
+ actionExtensions = new HashMap<String, IRutaActionExtension>();
+ booleanFunctionExtensions = new HashMap<String, IRutaBooleanFunctionExtension>();
+ stringFunctionExtensions = new HashMap<String, IRutaStringFunctionExtension>();
+ numberFunctionExtensions = new HashMap<String, IRutaNumberFunctionExtension>();
+ typeFunctionExtensions = new HashMap<String, IRutaTypeFunctionExtension>();
}
- public AbstractTextMarkerCondition createExternalCondition(Token id,
- List<TextMarkerExpression> args) throws ANTLRException {
+ public AbstractRutaCondition createExternalCondition(Token id,
+ List<RutaExpression> args) throws ANTLRException {
String name = id.getText();
- ITextMarkerConditionExtension extension = conditionExtensions.get(name);
+ IRutaConditionExtension extension = conditionExtensions.get(name);
if (extension != null) {
return extension.createCondition(name, args);
}
@@ -69,10 +69,10 @@ public class TextMarkerExternalFactory {
return null;
}
- public AbstractTextMarkerAction createExternalAction(Token id, List<TextMarkerExpression> args)
+ public AbstractRutaAction createExternalAction(Token id, List<RutaExpression> args)
throws ANTLRException {
String name = id.getText();
- ITextMarkerActionExtension extension = actionExtensions.get(name);
+ IRutaActionExtension extension = actionExtensions.get(name);
if (extension != null) {
return extension.createAction(name, args);
}
@@ -80,10 +80,10 @@ public class TextMarkerExternalFactory {
return null;
}
- public TypeExpression createExternalTypeFunction(Token id, List<TextMarkerExpression> args)
+ public TypeExpression createExternalTypeFunction(Token id, List<RutaExpression> args)
throws ANTLRException {
String name = id.getText();
- ITextMarkerTypeFunctionExtension extension = typeFunctionExtensions.get(name);
+ IRutaTypeFunctionExtension extension = typeFunctionExtensions.get(name);
if (extension != null) {
return extension.createTypeFunction(name, args);
}
@@ -91,10 +91,10 @@ public class TextMarkerExternalFactory {
return null;
}
- public BooleanExpression createExternalBooleanFunction(Token id, List<TextMarkerExpression> args)
+ public BooleanExpression createExternalBooleanFunction(Token id, List<RutaExpression> args)
throws ANTLRException {
String name = id.getText();
- ITextMarkerBooleanFunctionExtension extension = booleanFunctionExtensions.get(name);
+ IRutaBooleanFunctionExtension extension = booleanFunctionExtensions.get(name);
if (extension != null) {
return extension.createBooleanFunction(name, args);
}
@@ -102,10 +102,10 @@ public class TextMarkerExternalFactory {
return null;
}
- public StringExpression createExternalStringFunction(Token id, List<TextMarkerExpression> args)
+ public StringExpression createExternalStringFunction(Token id, List<RutaExpression> args)
throws ANTLRException {
String name = id.getText();
- ITextMarkerStringFunctionExtension extension = stringFunctionExtensions.get(name);
+ IRutaStringFunctionExtension extension = stringFunctionExtensions.get(name);
if (extension != null) {
return extension.createStringFunction(name, args);
}
@@ -113,10 +113,10 @@ public class TextMarkerExternalFactory {
return null;
}
- public NumberExpression createExternalNumberFunction(Token id, List<TextMarkerExpression> args)
+ public NumberExpression createExternalNumberFunction(Token id, List<RutaExpression> args)
throws ANTLRException {
String name = id.getText();
- ITextMarkerNumberFunctionExtension extension = numberFunctionExtensions.get(name);
+ IRutaNumberFunctionExtension extension = numberFunctionExtensions.get(name);
if (extension != null) {
return extension.createNumberFunction(name, args);
}
@@ -124,43 +124,43 @@ public class TextMarkerExternalFactory {
return null;
}
- public void addExtension(String id, ITextMarkerExtension extension) {
- if (extension instanceof ITextMarkerActionExtension) {
- addActionExtension(id, (ITextMarkerActionExtension) extension);
- } else if (extension instanceof ITextMarkerConditionExtension) {
- addConditionExtension(id, (ITextMarkerConditionExtension) extension);
- } else if (extension instanceof ITextMarkerBooleanFunctionExtension) {
- addBooleanFunctionExtension(id, (ITextMarkerBooleanFunctionExtension) extension);
- } else if (extension instanceof ITextMarkerStringFunctionExtension) {
- addStringFunctionExtension(id, (ITextMarkerStringFunctionExtension) extension);
- } else if (extension instanceof ITextMarkerNumberFunctionExtension) {
- addNumberFunctionExtension(id, (ITextMarkerNumberFunctionExtension) extension);
- } else if (extension instanceof ITextMarkerTypeFunctionExtension) {
- addTypeFunctionExtension(id, (ITextMarkerTypeFunctionExtension) extension);
+ public void addExtension(String id, IRutaExtension extension) {
+ if (extension instanceof IRutaActionExtension) {
+ addActionExtension(id, (IRutaActionExtension) extension);
+ } else if (extension instanceof IRutaConditionExtension) {
+ addConditionExtension(id, (IRutaConditionExtension) extension);
+ } else if (extension instanceof IRutaBooleanFunctionExtension) {
+ addBooleanFunctionExtension(id, (IRutaBooleanFunctionExtension) extension);
+ } else if (extension instanceof IRutaStringFunctionExtension) {
+ addStringFunctionExtension(id, (IRutaStringFunctionExtension) extension);
+ } else if (extension instanceof IRutaNumberFunctionExtension) {
+ addNumberFunctionExtension(id, (IRutaNumberFunctionExtension) extension);
+ } else if (extension instanceof IRutaTypeFunctionExtension) {
+ addTypeFunctionExtension(id, (IRutaTypeFunctionExtension) extension);
}
}
- public void addConditionExtension(String id, ITextMarkerConditionExtension extension) {
+ public void addConditionExtension(String id, IRutaConditionExtension extension) {
conditionExtensions.put(id, extension);
}
- public void addActionExtension(String id, ITextMarkerActionExtension extension) {
+ public void addActionExtension(String id, IRutaActionExtension extension) {
actionExtensions.put(id, extension);
}
- public void addNumberFunctionExtension(String id, ITextMarkerNumberFunctionExtension extension) {
+ public void addNumberFunctionExtension(String id, IRutaNumberFunctionExtension extension) {
numberFunctionExtensions.put(id, extension);
}
- public void addBooleanFunctionExtension(String id, ITextMarkerBooleanFunctionExtension extension) {
+ public void addBooleanFunctionExtension(String id, IRutaBooleanFunctionExtension extension) {
booleanFunctionExtensions.put(id, extension);
}
- public void addStringFunctionExtension(String id, ITextMarkerStringFunctionExtension extension) {
+ public void addStringFunctionExtension(String id, IRutaStringFunctionExtension extension) {
stringFunctionExtensions.put(id, extension);
}
- public void addTypeFunctionExtension(String id, ITextMarkerTypeFunctionExtension extension) {
+ public void addTypeFunctionExtension(String id, IRutaTypeFunctionExtension extension) {
typeFunctionExtensions.put(id, extension);
}
Copied: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/RutaTable.java (from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/TextMarkerTable.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/RutaTable.java?p2=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/RutaTable.java&p1=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/TextMarkerTable.java&r1=1477049&r2=1477088&rev=1477088&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/TextMarkerTable.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/RutaTable.java Mon Apr 29 14:09:53 2013
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.uima.textmarker.resource;
+package org.apache.uima.ruta.resource;
import java.util.List;
-public interface TextMarkerTable {
+public interface RutaTable {
- TextMarkerWordList getWordList(int index);
+ RutaWordList getWordList(int index);
String getEntry(int row, int column);
Copied: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/RutaWordList.java (from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/TextMarkerWordList.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/RutaWordList.java?p2=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/RutaWordList.java&p1=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/TextMarkerWordList.java&r1=1477049&r2=1477088&rev=1477088&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/TextMarkerWordList.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/RutaWordList.java Mon Apr 29 14:09:53 2013
@@ -17,16 +17,16 @@
* under the License.
*/
-package org.apache.uima.textmarker.resource;
+package org.apache.uima.ruta.resource;
import java.util.Collection;
import java.util.Map;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.textmarker.TextMarkerStream;
+import org.apache.uima.ruta.RutaStream;
-public interface TextMarkerWordList {
+public interface RutaWordList {
boolean contains(String string, boolean ignoreCase, int size, char[] ignoreChars,
int maxIgnoreChars, boolean ignoreWS);
@@ -40,10 +40,10 @@ public interface TextMarkerWordList {
Collection<String> containsFragment(String string, boolean ignoreCase, int ignoreLength,
boolean edit, double distance, String ignoreToken);
- Collection<AnnotationFS> find(TextMarkerStream stream, boolean ignoreCase, int size,
+ Collection<AnnotationFS> find(RutaStream stream, boolean ignoreCase, int size,
char[] ignoreToken, int maxIgnoredTokens, boolean ingoreWS);
- Collection<AnnotationFS> find(TextMarkerStream stream, Map<String, Type> typeMap,
+ Collection<AnnotationFS> find(RutaStream stream, Map<String, Type> typeMap,
boolean ignoreCase, int ignoreLength, boolean edit, double distance, String ignoreToken);
}
Copied: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaDisjunctiveMatcher.java (from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/TextMarkerDisjunctiveMatcher.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaDisjunctiveMatcher.java?p2=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaDisjunctiveMatcher.java&p1=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/TextMarkerDisjunctiveMatcher.java&r1=1477049&r2=1477088&rev=1477088&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/TextMarkerDisjunctiveMatcher.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaDisjunctiveMatcher.java Mon Apr 29 14:09:53 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.rule;
+package org.apache.uima.ruta.rule;
import java.util.ArrayList;
import java.util.Collection;
@@ -25,43 +25,43 @@ import java.util.List;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.textmarker.TextMarkerBlock;
-import org.apache.uima.textmarker.TextMarkerStream;
-import org.apache.uima.textmarker.expression.TextMarkerExpression;
-import org.apache.uima.textmarker.expression.string.StringExpression;
-import org.apache.uima.textmarker.expression.type.TypeExpression;
+import org.apache.uima.ruta.RutaBlock;
+import org.apache.uima.ruta.RutaStream;
+import org.apache.uima.ruta.expression.RutaExpression;
+import org.apache.uima.ruta.expression.string.StringExpression;
+import org.apache.uima.ruta.expression.type.TypeExpression;
-public class TextMarkerDisjunctiveMatcher implements TextMarkerMatcher {
- private final List<TextMarkerExpression> expressions;
+public class RutaDisjunctiveMatcher implements RutaMatcher {
+ private final List<RutaExpression> expressions;
- private List<TextMarkerMatcher> matchers ;
+ private List<RutaMatcher> matchers ;
- public TextMarkerDisjunctiveMatcher(List<TextMarkerExpression> expressions) {
+ public RutaDisjunctiveMatcher(List<RutaExpression> expressions) {
super();
this.expressions = expressions;
- matchers = new ArrayList<TextMarkerMatcher>();
- for (TextMarkerExpression each : expressions) {
+ matchers = new ArrayList<RutaMatcher>();
+ for (RutaExpression each : expressions) {
if(each instanceof TypeExpression) {
- matchers.add(new TextMarkerTypeMatcher((TypeExpression) each));
+ matchers.add(new RutaTypeMatcher((TypeExpression) each));
} else if(each instanceof StringExpression) {
- matchers.add(new TextMarkerLiteralMatcher((StringExpression) each));
+ matchers.add(new RutaLiteralMatcher((StringExpression) each));
}
}
}
- public Collection<AnnotationFS> getMatchingAnnotations(TextMarkerStream stream,
- TextMarkerBlock parent) {
+ public Collection<AnnotationFS> getMatchingAnnotations(RutaStream stream,
+ RutaBlock parent) {
Collection<AnnotationFS> result = new ArrayList<AnnotationFS>();
- for (TextMarkerMatcher each : matchers) {
+ for (RutaMatcher each : matchers) {
result.addAll(each.getMatchingAnnotations(stream, parent));
}
return result;
}
- public boolean match(AnnotationFS annotation, TextMarkerStream stream, TextMarkerBlock parent) {
- for (TextMarkerMatcher each : matchers) {
+ public boolean match(AnnotationFS annotation, RutaStream stream, RutaBlock parent) {
+ for (RutaMatcher each : matchers) {
boolean match = each.match(annotation, stream, parent);
if(match) {
return true;
@@ -70,45 +70,45 @@ public class TextMarkerDisjunctiveMatche
return false;
}
- public List<Type> getTypes(TextMarkerBlock parent, TextMarkerStream stream) {
+ public List<Type> getTypes(RutaBlock parent, RutaStream stream) {
List<Type> result = new ArrayList<Type>();
- for (TextMarkerMatcher each : matchers) {
+ for (RutaMatcher each : matchers) {
result.addAll(each.getTypes(parent, stream));
}
return result;
}
- public TextMarkerExpression getExpression() {
+ public RutaExpression getExpression() {
return null;
}
- public int estimateAnchors(TextMarkerBlock parent, TextMarkerStream stream) {
+ public int estimateAnchors(RutaBlock parent, RutaStream stream) {
int result = 0;
- for (TextMarkerMatcher each : matchers) {
+ for (RutaMatcher each : matchers) {
result += each.estimateAnchors(parent, stream);
}
return result;
}
- public Collection<AnnotationFS> getAnnotationsAfter(TextMarkerRuleElement ruleElement,
- AnnotationFS annotation, TextMarkerStream stream, TextMarkerBlock parent) {
+ public Collection<AnnotationFS> getAnnotationsAfter(RutaRuleElement ruleElement,
+ AnnotationFS annotation, RutaStream stream, RutaBlock parent) {
Collection<AnnotationFS> result = new ArrayList<AnnotationFS>();
- for (TextMarkerMatcher each : matchers) {
+ for (RutaMatcher each : matchers) {
result.addAll(each.getAnnotationsAfter(ruleElement, annotation, stream, parent));
}
return result;
}
- public Collection<AnnotationFS> getAnnotationsBefore(TextMarkerRuleElement ruleElement,
- AnnotationFS annotation, TextMarkerStream stream, TextMarkerBlock parent) {
+ public Collection<AnnotationFS> getAnnotationsBefore(RutaRuleElement ruleElement,
+ AnnotationFS annotation, RutaStream stream, RutaBlock parent) {
Collection<AnnotationFS> result = new ArrayList<AnnotationFS>();
- for (TextMarkerMatcher each : matchers) {
+ for (RutaMatcher each : matchers) {
result.addAll(each.getAnnotationsBefore(ruleElement, annotation, stream, parent));
}
return result;
}
- public List<TextMarkerExpression> getExpressions() {
+ public List<RutaExpression> getExpressions() {
return expressions;
}
Copied: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaLiteralMatcher.java (from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/TextMarkerLiteralMatcher.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaLiteralMatcher.java?p2=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaLiteralMatcher.java&p1=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/TextMarkerLiteralMatcher.java&r1=1477049&r2=1477088&rev=1477088&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/TextMarkerLiteralMatcher.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaLiteralMatcher.java Mon Apr 29 14:09:53 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.rule;
+package org.apache.uima.ruta.rule;
import java.util.ArrayList;
import java.util.Collection;
@@ -25,26 +25,26 @@ import java.util.List;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.textmarker.TextMarkerBlock;
-import org.apache.uima.textmarker.TextMarkerStream;
-import org.apache.uima.textmarker.expression.TextMarkerExpression;
-import org.apache.uima.textmarker.expression.string.StringExpression;
-import org.apache.uima.textmarker.type.TextMarkerBasic;
+import org.apache.uima.ruta.RutaBlock;
+import org.apache.uima.ruta.RutaStream;
+import org.apache.uima.ruta.expression.RutaExpression;
+import org.apache.uima.ruta.expression.string.StringExpression;
+import org.apache.uima.ruta.type.RutaBasic;
-public class TextMarkerLiteralMatcher implements TextMarkerMatcher {
+public class RutaLiteralMatcher implements RutaMatcher {
private final StringExpression expression;
- public TextMarkerLiteralMatcher(StringExpression expression) {
+ public RutaLiteralMatcher(StringExpression expression) {
super();
this.expression = expression;
}
- public List<AnnotationFS> getMatchingAnnotations(TextMarkerStream stream, TextMarkerBlock parent) {
+ public List<AnnotationFS> getMatchingAnnotations(RutaStream stream, RutaBlock parent) {
List<AnnotationFS> result = new ArrayList<AnnotationFS>();
AnnotationFS windowAnnotation = stream.getDocumentAnnotation();
- List<TextMarkerBasic> list = stream.getBasicsInWindow(windowAnnotation);
- for (TextMarkerBasic each : list) {
+ List<RutaBasic> list = stream.getBasicsInWindow(windowAnnotation);
+ for (RutaBasic each : list) {
if (each.getCoveredText().equals(expression.getStringValue(parent))) {
result.add(each);
}
@@ -52,7 +52,7 @@ public class TextMarkerLiteralMatcher im
return result;
}
- public boolean match(AnnotationFS annotation, TextMarkerStream stream, TextMarkerBlock parent) {
+ public boolean match(AnnotationFS annotation, RutaStream stream, RutaBlock parent) {
if (annotation == null) {
return false;
}
@@ -68,24 +68,24 @@ public class TextMarkerLiteralMatcher im
return expression;
}
- public int estimateAnchors(TextMarkerBlock parent, TextMarkerStream stream) {
+ public int estimateAnchors(RutaBlock parent, RutaStream stream) {
return Integer.MAX_VALUE;
}
- public Collection<AnnotationFS> getAnnotationsAfter(TextMarkerRuleElement ruleElement,
- AnnotationFS annotation, TextMarkerStream stream, TextMarkerBlock parent) {
+ public Collection<AnnotationFS> getAnnotationsAfter(RutaRuleElement ruleElement,
+ AnnotationFS annotation, RutaStream stream, RutaBlock parent) {
return getNextAnnotations(false, annotation, stream, parent);
}
- public Collection<AnnotationFS> getAnnotationsBefore(TextMarkerRuleElement ruleElement,
- AnnotationFS annotation, TextMarkerStream stream, TextMarkerBlock parent) {
+ public Collection<AnnotationFS> getAnnotationsBefore(RutaRuleElement ruleElement,
+ AnnotationFS annotation, RutaStream stream, RutaBlock parent) {
return getNextAnnotations(true, annotation, stream, parent);
}
- private Collection<AnnotationFS> getNextAnnotations(boolean before, AnnotationFS annotation, TextMarkerStream stream,
- TextMarkerBlock parent) {
+ private Collection<AnnotationFS> getNextAnnotations(boolean before, AnnotationFS annotation, RutaStream stream,
+ RutaBlock parent) {
List<AnnotationFS> result = new ArrayList<AnnotationFS>(1);
- TextMarkerBasic basicNextTo = stream.getBasicNextTo(before, annotation);
+ RutaBasic basicNextTo = stream.getBasicNextTo(before, annotation);
if(basicNextTo == null) {
return result;
}
@@ -96,7 +96,7 @@ public class TextMarkerLiteralMatcher im
return result;
}
- public List<Type> getTypes(TextMarkerBlock parent, TextMarkerStream stream) {
+ public List<Type> getTypes(RutaBlock parent, RutaStream stream) {
return new ArrayList<Type>();
}
Copied: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaMatcher.java (from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/TextMarkerMatcher.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaMatcher.java?p2=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaMatcher.java&p1=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/TextMarkerMatcher.java&r1=1477049&r2=1477088&rev=1477088&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/TextMarkerMatcher.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaMatcher.java Mon Apr 29 14:09:53 2013
@@ -17,33 +17,33 @@
* under the License.
*/
-package org.apache.uima.textmarker.rule;
+package org.apache.uima.ruta.rule;
import java.util.Collection;
import java.util.List;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.textmarker.TextMarkerBlock;
-import org.apache.uima.textmarker.TextMarkerStream;
-import org.apache.uima.textmarker.expression.TextMarkerExpression;
+import org.apache.uima.ruta.RutaBlock;
+import org.apache.uima.ruta.RutaStream;
+import org.apache.uima.ruta.expression.RutaExpression;
-public interface TextMarkerMatcher {
+public interface RutaMatcher {
- Collection<AnnotationFS> getMatchingAnnotations(TextMarkerStream stream, TextMarkerBlock parent);
+ Collection<AnnotationFS> getMatchingAnnotations(RutaStream stream, RutaBlock parent);
- boolean match(AnnotationFS annotation, TextMarkerStream stream, TextMarkerBlock parent);
+ boolean match(AnnotationFS annotation, RutaStream stream, RutaBlock parent);
- List<Type> getTypes(TextMarkerBlock parent, TextMarkerStream stream);
+ List<Type> getTypes(RutaBlock parent, RutaStream stream);
- TextMarkerExpression getExpression();
+ RutaExpression getExpression();
- int estimateAnchors(TextMarkerBlock parent, TextMarkerStream stream);
+ int estimateAnchors(RutaBlock parent, RutaStream stream);
- Collection<AnnotationFS> getAnnotationsAfter(TextMarkerRuleElement ruleElement,
- AnnotationFS annotation, TextMarkerStream stream, TextMarkerBlock parent);
+ Collection<AnnotationFS> getAnnotationsAfter(RutaRuleElement ruleElement,
+ AnnotationFS annotation, RutaStream stream, RutaBlock parent);
- Collection<AnnotationFS> getAnnotationsBefore(TextMarkerRuleElement ruleElement,
- AnnotationFS annotation, TextMarkerStream stream, TextMarkerBlock parent);
+ Collection<AnnotationFS> getAnnotationsBefore(RutaRuleElement ruleElement,
+ AnnotationFS annotation, RutaStream stream, RutaBlock parent);
}
Copied: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaRule.java (from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/TextMarkerRule.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaRule.java?p2=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaRule.java&p1=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/TextMarkerRule.java&r1=1477049&r2=1477088&rev=1477088&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/TextMarkerRule.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaRule.java Mon Apr 29 14:09:53 2013
@@ -17,30 +17,30 @@
* under the License.
*/
-package org.apache.uima.textmarker.rule;
+package org.apache.uima.ruta.rule;
import java.util.List;
-import org.apache.uima.textmarker.TextMarkerBlock;
-import org.apache.uima.textmarker.TextMarkerEnvironment;
-import org.apache.uima.textmarker.TextMarkerStream;
-import org.apache.uima.textmarker.visitor.InferenceCrowd;
+import org.apache.uima.ruta.RutaBlock;
+import org.apache.uima.ruta.RutaEnvironment;
+import org.apache.uima.ruta.RutaStream;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
-public class TextMarkerRule extends AbstractRule {
+public class RutaRule extends AbstractRule {
private ComposedRuleElement root;
- public TextMarkerRule(List<RuleElement> elements, TextMarkerBlock parent, int id) {
+ public RutaRule(List<RuleElement> elements, RutaBlock parent, int id) {
super(parent, id);
this.root = new ComposedRuleElement(elements, null, null, null, null, parent);
}
@Override
- public RuleApply apply(TextMarkerStream stream, InferenceCrowd crowd) {
+ public RuleApply apply(RutaStream stream, InferenceCrowd crowd) {
return apply(stream, crowd, false);
}
- public RuleApply apply(TextMarkerStream stream, InferenceCrowd crowd, boolean remember) {
+ public RuleApply apply(RutaStream stream, InferenceCrowd crowd, boolean remember) {
RuleApply ruleApply = new RuleApply(this, remember);
crowd.beginVisit(this, ruleApply);
RuleMatch ruleMatch = new RuleMatch(this);
@@ -59,7 +59,7 @@ public class TextMarkerRule extends Abst
}
@Override
- public TextMarkerEnvironment getEnvironment() {
+ public RutaEnvironment getEnvironment() {
return getParent().getEnvironment();
}
Copied: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaRuleElement.java (from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/TextMarkerRuleElement.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaRuleElement.java?p2=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaRuleElement.java&p1=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/TextMarkerRuleElement.java&r1=1477049&r2=1477088&rev=1477088&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/TextMarkerRuleElement.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaRuleElement.java Mon Apr 29 14:09:53 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.rule;
+package org.apache.uima.ruta.rule;
import java.util.ArrayList;
import java.util.Collection;
@@ -25,33 +25,33 @@ import java.util.Collections;
import java.util.List;
import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.textmarker.TextMarkerBlock;
-import org.apache.uima.textmarker.TextMarkerStream;
-import org.apache.uima.textmarker.action.AbstractTextMarkerAction;
-import org.apache.uima.textmarker.condition.AbstractTextMarkerCondition;
-import org.apache.uima.textmarker.rule.quantifier.RuleElementQuantifier;
-import org.apache.uima.textmarker.visitor.InferenceCrowd;
+import org.apache.uima.ruta.RutaBlock;
+import org.apache.uima.ruta.RutaStream;
+import org.apache.uima.ruta.action.AbstractRutaAction;
+import org.apache.uima.ruta.condition.AbstractRutaCondition;
+import org.apache.uima.ruta.rule.quantifier.RuleElementQuantifier;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
-public class TextMarkerRuleElement extends AbstractRuleElement {
+public class RutaRuleElement extends AbstractRuleElement {
- private TextMarkerMatcher matcher;
+ private RutaMatcher matcher;
@SuppressWarnings("unchecked")
protected final InferenceCrowd emptyCrowd = new InferenceCrowd(Collections.EMPTY_LIST);
- public TextMarkerRuleElement(TextMarkerMatcher matcher, RuleElementQuantifier quantifier,
- List<AbstractTextMarkerCondition> conditions, List<AbstractTextMarkerAction> actions,
- RuleElementContainer container, TextMarkerBlock parent) {
+ public RutaRuleElement(RutaMatcher matcher, RuleElementQuantifier quantifier,
+ List<AbstractRutaCondition> conditions, List<AbstractRutaAction> actions,
+ RuleElementContainer container, RutaBlock parent) {
super(quantifier, conditions, actions, container, parent);
this.matcher = matcher;
}
- public Collection<AnnotationFS> getAnchors(TextMarkerStream stream) {
+ public Collection<AnnotationFS> getAnchors(RutaStream stream) {
return matcher.getMatchingAnnotations(stream, getParent());
}
public void startMatch(RuleMatch ruleMatch, RuleApply ruleApply,
- ComposedRuleElementMatch containerMatch, RuleElement entryPoint, TextMarkerStream stream,
+ ComposedRuleElementMatch containerMatch, RuleElement entryPoint, RutaStream stream,
InferenceCrowd crowd) {
Collection<AnnotationFS> anchors = getAnchors(stream);
boolean useAlternatives = entryPoint == null && !(anchors.size() == 1);
@@ -68,7 +68,7 @@ public class TextMarkerRuleElement exten
if (extendedMatch.matched()) {
RuleElement after = getContainer().getNextElement(true, this);
RuleElement before = getContainer().getNextElement(false, this);
- TextMarkerRuleElement sideStepOrigin = hasAncestor(false) ? this : null;
+ RutaRuleElement sideStepOrigin = hasAncestor(false) ? this : null;
if (quantifier.continueMatch(true, eachAnchor, this, extendedMatch, extendedContainerMatch,
stream, crowd)) {
continueOwnMatch(true, eachAnchor, extendedMatch, ruleApply, extendedContainerMatch,
@@ -111,7 +111,7 @@ public class TextMarkerRuleElement exten
public void continueOwnMatch(boolean after, AnnotationFS annotation, RuleMatch ruleMatch,
RuleApply ruleApply, ComposedRuleElementMatch containerMatch,
- TextMarkerRuleElement sideStepOrigin, RuleElement entryPoint, TextMarkerStream stream,
+ RutaRuleElement sideStepOrigin, RuleElement entryPoint, RutaStream stream,
InferenceCrowd crowd) {
if (quantifier.continueMatch(after, annotation, this, ruleMatch, containerMatch, stream, crowd)) {
boolean stopMatching = false;
@@ -169,8 +169,8 @@ public class TextMarkerRuleElement exten
private void continueMatchSomewhereElse(boolean after, boolean failed, AnnotationFS eachAnchor,
RuleMatch extendedMatch, RuleApply ruleApply,
- ComposedRuleElementMatch extendedContainerMatch, TextMarkerRuleElement sideStepOrigin,
- RuleElement entryPoint, TextMarkerStream stream, InferenceCrowd crowd) {
+ ComposedRuleElementMatch extendedContainerMatch, RutaRuleElement sideStepOrigin,
+ RuleElement entryPoint, RutaStream stream, InferenceCrowd crowd) {
RuleElement nextRuleElement = getContainer().getNextElement(after, this);
if (nextRuleElement != null) {
nextRuleElement.continueMatch(after, eachAnchor, extendedMatch, ruleApply,
@@ -185,7 +185,7 @@ public class TextMarkerRuleElement exten
public void continueMatch(boolean after, AnnotationFS annotation, RuleMatch ruleMatch,
RuleApply ruleApply, ComposedRuleElementMatch containerMatch,
- TextMarkerRuleElement sideStepOrigin, RuleElement entryPoint, TextMarkerStream stream,
+ RutaRuleElement sideStepOrigin, RuleElement entryPoint, RutaStream stream,
InferenceCrowd crowd) {
// if() for really lazy quantifiers
if (quantifier.continueMatch(after, annotation, this, ruleMatch, containerMatch, stream, crowd)) {
@@ -232,7 +232,7 @@ public class TextMarkerRuleElement exten
private void stepbackMatch(boolean after, AnnotationFS annotation, RuleMatch ruleMatch,
RuleApply ruleApply, ComposedRuleElementMatch containerMatch,
- TextMarkerRuleElement sideStepOrigin, TextMarkerStream stream, InferenceCrowd crowd,
+ RutaRuleElement sideStepOrigin, RutaStream stream, InferenceCrowd crowd,
RuleElement entryPoint) {
if (ruleApply == null) {
return;
@@ -263,7 +263,7 @@ public class TextMarkerRuleElement exten
}
public void continueSideStep(boolean after, RuleMatch ruleMatch, RuleApply ruleApply,
- ComposedRuleElementMatch containerMatch, RuleElement entryPoint, TextMarkerStream stream,
+ ComposedRuleElementMatch containerMatch, RuleElement entryPoint, RutaStream stream,
InferenceCrowd crowd) {
boolean newDirection = !after;
@@ -306,7 +306,7 @@ public class TextMarkerRuleElement exten
}
private void doMatch(AnnotationFS annotation, RuleMatch ruleMatch,
- ComposedRuleElementMatch containerMatch, boolean ruleAnchor, TextMarkerStream stream,
+ ComposedRuleElementMatch containerMatch, boolean ruleAnchor, RutaStream stream,
InferenceCrowd crowd) {
// TODO rewite this method!
RuleElementMatch result = new RuleElementMatch(this, containerMatch);
@@ -316,7 +316,7 @@ public class TextMarkerRuleElement exten
boolean base = matcher.match(annotation, stream, getParent());
List<AnnotationFS> textsMatched = new ArrayList<AnnotationFS>(1);
if (base) {
- for (AbstractTextMarkerCondition condition : conditions) {
+ for (AbstractRutaCondition condition : conditions) {
crowd.beginVisit(condition, null);
EvaluatedCondition eval = condition.eval(annotation, this, stream, crowd);
crowd.endVisit(condition, null);
@@ -344,23 +344,23 @@ public class TextMarkerRuleElement exten
+ (actions.isEmpty() ? "" : "{" + actions.toString() + "}");
}
- public TextMarkerMatcher getMatcher() {
+ public RutaMatcher getMatcher() {
return matcher;
}
- public List<AbstractTextMarkerCondition> getConditions() {
+ public List<AbstractRutaCondition> getConditions() {
return conditions;
}
- public List<AbstractTextMarkerAction> getActions() {
+ public List<AbstractRutaAction> getActions() {
return actions;
}
- public TextMarkerBlock getParent() {
+ public RutaBlock getParent() {
return parent;
}
- public int estimateAnchors(TextMarkerStream stream) {
+ public int estimateAnchors(RutaStream stream) {
if (quantifier.isOptional(getParent())) {
return Integer.MAX_VALUE;
}
@@ -368,7 +368,7 @@ public class TextMarkerRuleElement exten
}
public Collection<AnnotationFS> getNextAnnotations(boolean after, AnnotationFS annotation,
- TextMarkerStream stream) {
+ RutaStream stream) {
if (after) {
return matcher.getAnnotationsAfter(this, annotation, stream, getParent());
} else {
Copied: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaTypeMatcher.java (from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/TextMarkerTypeMatcher.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaTypeMatcher.java?p2=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaTypeMatcher.java&p1=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/TextMarkerTypeMatcher.java&r1=1477049&r2=1477088&rev=1477088&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/TextMarkerTypeMatcher.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaTypeMatcher.java Mon Apr 29 14:09:53 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.rule;
+package org.apache.uima.ruta.rule;
import java.util.ArrayList;
import java.util.Collection;
@@ -29,35 +29,35 @@ import org.apache.uima.cas.ConstraintFac
import org.apache.uima.cas.FSMatchConstraint;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.textmarker.TextMarkerBlock;
-import org.apache.uima.textmarker.TextMarkerStream;
-import org.apache.uima.textmarker.constraint.BasicTypeConstraint;
-import org.apache.uima.textmarker.expression.TextMarkerExpression;
-import org.apache.uima.textmarker.expression.type.TypeExpression;
-import org.apache.uima.textmarker.type.TextMarkerBasic;
+import org.apache.uima.ruta.RutaBlock;
+import org.apache.uima.ruta.RutaStream;
+import org.apache.uima.ruta.constraint.BasicTypeConstraint;
+import org.apache.uima.ruta.expression.RutaExpression;
+import org.apache.uima.ruta.expression.type.TypeExpression;
+import org.apache.uima.ruta.type.RutaBasic;
-public class TextMarkerTypeMatcher implements TextMarkerMatcher {
+public class RutaTypeMatcher implements RutaMatcher {
private final TypeExpression expression;
private AnnotationComparator comparator;
- public TextMarkerTypeMatcher(TypeExpression expression) {
+ public RutaTypeMatcher(TypeExpression expression) {
super();
this.expression = expression;
this.comparator = new AnnotationComparator();
}
- public Collection<AnnotationFS> getMatchingAnnotations(TextMarkerStream stream,
- TextMarkerBlock parent) {
+ public Collection<AnnotationFS> getMatchingAnnotations(RutaStream stream,
+ RutaBlock parent) {
// TODO what about the matching direction?
Collection<AnnotationFS> result = new TreeSet<AnnotationFS>(comparator);
List<Type> types = getTypes(parent, stream);
for (Type type : types) {
String name = type.getName();
- TextMarkerBasic firstBasicOfAll = stream.getFirstBasicOfAll();
+ RutaBasic firstBasicOfAll = stream.getFirstBasicOfAll();
if ("uima.tcas.DocumentAnnotation".equals(name)
- || "org.apache.uima.textmarker.type.Document".equals(name)
+ || "org.apache.uima.ruta.type.Document".equals(name)
|| (stream.getDocumentAnnotationType().getName().equals(name) && (firstBasicOfAll != null && firstBasicOfAll
.beginsWith(type)))) {
// TODO what about dynamic windowing?
@@ -65,7 +65,7 @@ public class TextMarkerTypeMatcher imple
} else {
stream.moveToFirst();
while (stream.isValid()) {
- TextMarkerBasic nextBasic = (TextMarkerBasic) stream.get();
+ RutaBasic nextBasic = (RutaBasic) stream.get();
List<Type> allTypes = stream.getCas().getTypeSystem().getProperlySubsumedTypes(type);
allTypes.add(type);
for (Type eachType : allTypes) {
@@ -85,9 +85,9 @@ public class TextMarkerTypeMatcher imple
return result;
}
- public Collection<AnnotationFS> getAnnotationsAfter(TextMarkerRuleElement ruleElement,
- AnnotationFS annotation, TextMarkerStream stream, TextMarkerBlock parent) {
- TextMarkerBasic lastBasic = stream.getEndAnchor(annotation.getEnd());
+ public Collection<AnnotationFS> getAnnotationsAfter(RutaRuleElement ruleElement,
+ AnnotationFS annotation, RutaStream stream, RutaBlock parent) {
+ RutaBasic lastBasic = stream.getEndAnchor(annotation.getEnd());
if (lastBasic == null) {
return Collections.emptyList();
}
@@ -96,7 +96,7 @@ public class TextMarkerTypeMatcher imple
stream.moveToNext();
}
if (stream.isValid()) {
- TextMarkerBasic nextBasic = (TextMarkerBasic) stream.get();
+ RutaBasic nextBasic = (RutaBasic) stream.get();
List<Type> reTypes = getTypes(parent, stream);
Collection<AnnotationFS> anchors = new TreeSet<AnnotationFS>(comparator);
for (Type eachMatchType : reTypes) {
@@ -118,9 +118,9 @@ public class TextMarkerTypeMatcher imple
return Collections.emptyList();
}
- public Collection<AnnotationFS> getAnnotationsBefore(TextMarkerRuleElement ruleElement,
- AnnotationFS annotation, TextMarkerStream stream, TextMarkerBlock parent) {
- TextMarkerBasic firstBasic = stream.getBeginAnchor(annotation.getBegin());
+ public Collection<AnnotationFS> getAnnotationsBefore(RutaRuleElement ruleElement,
+ AnnotationFS annotation, RutaStream stream, RutaBlock parent) {
+ RutaBasic firstBasic = stream.getBeginAnchor(annotation.getBegin());
if (firstBasic == null) {
return Collections.emptyList();
}
@@ -129,7 +129,7 @@ public class TextMarkerTypeMatcher imple
stream.moveToPrevious();
}
if (stream.isValid()) {
- TextMarkerBasic nextBasic = (TextMarkerBasic) stream.get();
+ RutaBasic nextBasic = (RutaBasic) stream.get();
List<Type> reTypes = getTypes(parent, stream);
Collection<AnnotationFS> anchors = new TreeSet<AnnotationFS>(comparator);
for (Type eachMatchType : reTypes) {
@@ -152,7 +152,7 @@ public class TextMarkerTypeMatcher imple
return Collections.emptyList();
}
- public FSMatchConstraint createAnchorConstraints(TextMarkerBlock block, TextMarkerStream stream) {
+ public FSMatchConstraint createAnchorConstraints(RutaBlock block, RutaStream stream) {
ConstraintFactory cf = stream.getCas().getConstraintFactory();
List<Type> types = getTypes(block, stream);
FSMatchConstraint result = null;
@@ -170,7 +170,7 @@ public class TextMarkerTypeMatcher imple
return result;
}
- public boolean match(AnnotationFS annotation, TextMarkerStream stream, TextMarkerBlock parent) {
+ public boolean match(AnnotationFS annotation, RutaStream stream, RutaBlock parent) {
if (annotation == null) {
return false;
}
@@ -195,11 +195,11 @@ public class TextMarkerTypeMatcher imple
return expression.toString();
}
- public TextMarkerExpression getExpression() {
+ public RutaExpression getExpression() {
return expression;
}
- protected Type getType(TypeExpression expression, TextMarkerBlock parent, TextMarkerStream stream) {
+ protected Type getType(TypeExpression expression, RutaBlock parent, RutaStream stream) {
Type type = expression.getType(parent);
if ("uima.tcas.DocumentAnnotation".equals(type.getName())) {
return stream.getDocumentAnnotationType();
@@ -207,11 +207,11 @@ public class TextMarkerTypeMatcher imple
return type;
}
- public int estimateAnchors(TextMarkerBlock parent, TextMarkerStream stream) {
+ public int estimateAnchors(RutaBlock parent, RutaStream stream) {
return stream.getHistogram(getType(expression, parent, stream));
}
- public List<Type> getTypes(TextMarkerBlock parent, TextMarkerStream stream) {
+ public List<Type> getTypes(RutaBlock parent, RutaStream stream) {
List<Type> result = new ArrayList<Type>(1);
Type type = getType(expression, parent, stream);
result.add(type);