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 15:44:32 UTC
svn commit: r1477068 -
/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/
Author: pkluegl
Date: Mon Apr 29 13:44:31 2013
New Revision: 1477068
URL: http://svn.apache.org/r1477068
Log:
UIMA-2850
- renaming
Modified:
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/AnonymousWordList.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/CSVTable.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/EditDistanceCostMap.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/EditDistanceResultMap.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/MultiTextNode.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/MultiTreeWordList.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/MultiTreeWordListPersistence.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/TextNode.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/TreeWordList.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/TrieXMLEventHandler.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/XMLEventHandler.java
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/AnonymousWordList.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/AnonymousWordList.java?rev=1477068&r1=1477067&r2=1477068&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/AnonymousWordList.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/AnonymousWordList.java Mon Apr 29 13:44:31 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.resource;
+package org.apache.uima.ruta.resource;
import java.util.ArrayList;
import java.util.List;
@@ -25,10 +25,10 @@ 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.textmarker.type.TextMarkerBasic;
+import org.apache.uima.ruta.RutaStream;
+import org.apache.uima.ruta.type.RutaBasic;
-public class AnonymousWordList implements TextMarkerWordList {
+public class AnonymousWordList implements RutaWordList {
private final List<String> list;
@@ -47,13 +47,13 @@ public class AnonymousWordList implement
return contains(s, ignoreCase, size, ignoreChars, maxIgnoreChars, ignoreWS);
}
- public List<AnnotationFS> find(TextMarkerStream stream, boolean ignoreCase, int size,
+ public List<AnnotationFS> find(RutaStream stream, boolean ignoreCase, int size,
char[] ignoreToken, int maxIgnoredTokens, boolean ignoreWS) {
List<AnnotationFS> result = new ArrayList<AnnotationFS>();
for (String each : list) {
stream.moveToFirst();
while (stream.hasNext()) {
- TextMarkerBasic next = (TextMarkerBasic) stream.next();
+ RutaBasic next = (RutaBasic) stream.next();
if (each.equals(next.getCoveredText())) {
result.add(next);
}
@@ -62,7 +62,7 @@ public class AnonymousWordList implement
return result;
}
- public List<AnnotationFS> find(TextMarkerStream stream, Map<String, Type> typeMap,
+ public List<AnnotationFS> find(RutaStream stream, Map<String, Type> typeMap,
boolean ignoreCase, int ignoreLength, boolean edit, double distance, String ignoreToken) {
return new ArrayList<AnnotationFS>();
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/CSVTable.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/CSVTable.java?rev=1477068&r1=1477067&r2=1477068&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/CSVTable.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/CSVTable.java Mon Apr 29 13:44:31 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.resource;
+package org.apache.uima.ruta.resource;
import java.io.FileInputStream;
import java.nio.charset.Charset;
@@ -29,15 +29,15 @@ import java.util.List;
import java.util.Map;
import java.util.Scanner;
-public class CSVTable implements TextMarkerTable {
+public class CSVTable implements RutaTable {
private List<List<String>> tableData;
- private Map<Integer, TextMarkerWordList> columnWordLists;
+ private Map<Integer, RutaWordList> columnWordLists;
public CSVTable(String location) {
super();
- columnWordLists = new HashMap<Integer, TextMarkerWordList>(2);
+ columnWordLists = new HashMap<Integer, RutaWordList>(2);
try {
buildTable(location);
} catch (Exception e) {
@@ -59,8 +59,8 @@ public class CSVTable implements TextMar
}
}
- public TextMarkerWordList getWordList(int index) {
- TextMarkerWordList list = columnWordLists.get(index);
+ public RutaWordList getWordList(int index) {
+ RutaWordList list = columnWordLists.get(index);
if (list == null) {
if (index > 0 && index <= tableData.get(0).size()) {
list = new TreeWordList(getColumnData(index - 1));
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/EditDistanceCostMap.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/EditDistanceCostMap.java?rev=1477068&r1=1477067&r2=1477068&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/EditDistanceCostMap.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/EditDistanceCostMap.java Mon Apr 29 13:44:31 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.resource;
+package org.apache.uima.ruta.resource;
import java.io.BufferedReader;
import java.io.BufferedWriter;
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/EditDistanceResultMap.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/EditDistanceResultMap.java?rev=1477068&r1=1477067&r2=1477068&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/EditDistanceResultMap.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/EditDistanceResultMap.java Mon Apr 29 13:44:31 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.resource;
+package org.apache.uima.ruta.resource;
import java.util.Collections;
import java.util.HashMap;
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/MultiTextNode.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/MultiTextNode.java?rev=1477068&r1=1477067&r2=1477068&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/MultiTextNode.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/MultiTextNode.java Mon Apr 29 13:44:31 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.resource;
+package org.apache.uima.ruta.resource;
import java.util.Collection;
import java.util.Collections;
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/MultiTreeWordList.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/MultiTreeWordList.java?rev=1477068&r1=1477067&r2=1477068&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/MultiTreeWordList.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/MultiTreeWordList.java Mon Apr 29 13:44:31 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.resource;
+package org.apache.uima.ruta.resource;
import java.io.BufferedReader;
import java.io.File;
@@ -39,15 +39,15 @@ import java.util.Set;
import org.apache.uima.cas.FSIterator;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.textmarker.TextMarkerStream;
-import org.apache.uima.textmarker.type.TextMarkerBasic;
+import org.apache.uima.ruta.RutaStream;
+import org.apache.uima.ruta.type.RutaBasic;
/**
* Class MultiTreeWordList.
*
*
*/
-public class MultiTreeWordList implements TextMarkerWordList {
+public class MultiTreeWordList implements RutaWordList {
private static final String ENCODING = "UTF-8";
@@ -574,7 +574,7 @@ public class MultiTreeWordList implement
}
}
- public Collection<AnnotationFS> find(TextMarkerStream stream, Map<String, Type> typeMap,
+ public Collection<AnnotationFS> find(RutaStream stream, Map<String, Type> typeMap,
boolean ignoreCase, int ignoreLength, boolean edit, double distance, String ignoreToken) {
Collection<AnnotationFS> results = new HashSet<AnnotationFS>();
@@ -582,10 +582,10 @@ public class MultiTreeWordList implement
FSIterator<AnnotationFS> streamPointer = stream.copy();
while (stream.isValid()) {
- TextMarkerBasic anchorBasic = (TextMarkerBasic) stream.get();
+ RutaBasic anchorBasic = (RutaBasic) stream.get();
streamPointer.moveTo(anchorBasic);
- List<TextMarkerBasic> basicsToAdd = new ArrayList<TextMarkerBasic>();
+ List<RutaBasic> basicsToAdd = new ArrayList<RutaBasic>();
basicsToAdd.add(anchorBasic);
String text = anchorBasic.getCoveredText();
StringBuilder candidate = new StringBuilder(text);
@@ -600,7 +600,7 @@ public class MultiTreeWordList implement
if (!types.isEmpty()) {
streamPointer.moveToNext();
if (streamPointer.isValid()) {
- TextMarkerBasic next = (TextMarkerBasic) streamPointer.get();
+ RutaBasic next = (RutaBasic) streamPointer.get();
// List<String> contains = contains(candidate,
// ignoreCase,
// ignoreLength, edit, distance, ignoreToken);
@@ -637,14 +637,14 @@ public class MultiTreeWordList implement
return results;
}
- public List<AnnotationFS> find(TextMarkerStream stream, boolean ignoreCase, int size,
+ public List<AnnotationFS> find(RutaStream stream, boolean ignoreCase, int size,
char[] ignoreChars, int maxIgnoredChars, boolean ignoreWS) {
assert false;
return new ArrayList<AnnotationFS>();
}
- private void tryToCreateAnnotation(TextMarkerStream stream, Collection<AnnotationFS> results,
- List<TextMarkerBasic> basicsToAdd, String lastCandidate, List<AnnotationFS> interResult,
+ private void tryToCreateAnnotation(RutaStream stream, Collection<AnnotationFS> results,
+ List<RutaBasic> basicsToAdd, String lastCandidate, List<AnnotationFS> interResult,
boolean ignoreCase, int ignoreLength, boolean edit, double distance, String ignoreToken,
Map<String, Type> map) {
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/MultiTreeWordListPersistence.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/MultiTreeWordListPersistence.java?rev=1477068&r1=1477067&r2=1477068&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/MultiTreeWordListPersistence.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/MultiTreeWordListPersistence.java Mon Apr 29 13:44:31 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.resource;
+package org.apache.uima.ruta.resource;
import java.io.FileInputStream;
import java.io.FileOutputStream;
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/TextNode.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/TextNode.java?rev=1477068&r1=1477067&r2=1477068&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/TextNode.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/TextNode.java Mon Apr 29 13:44:31 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.resource;
+package org.apache.uima.ruta.resource;
import java.util.HashMap;
import java.util.Map;
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/TreeWordList.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/TreeWordList.java?rev=1477068&r1=1477067&r2=1477068&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/TreeWordList.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/TreeWordList.java Mon Apr 29 13:44:31 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.resource;
+package org.apache.uima.ruta.resource;
import java.io.File;
import java.io.FileInputStream;
@@ -41,14 +41,14 @@ import org.apache.uima.cas.FSIterator;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.jcas.tcas.Annotation;
-import org.apache.uima.textmarker.TextMarkerStream;
-import org.apache.uima.textmarker.type.TextMarkerBasic;
+import org.apache.uima.ruta.RutaStream;
+import org.apache.uima.ruta.type.RutaBasic;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
import org.xml.sax.XMLReader;
-public class TreeWordList implements TextMarkerWordList {
+public class TreeWordList implements RutaWordList {
private TextNode root;
private String name;
@@ -244,16 +244,16 @@ public class TreeWordList implements Tex
return null;
}
- public List<AnnotationFS> find(TextMarkerStream stream, boolean ignoreCase, int size,
+ public List<AnnotationFS> find(RutaStream stream, boolean ignoreCase, int size,
char[] ignoreChars, int maxIgnoredChars, boolean ignoreWS) {
ArrayList<AnnotationFS> results = new ArrayList<AnnotationFS>();
stream.moveToFirst();
FSIterator<AnnotationFS> streamPointer = stream.copy();
while (stream.isValid()) {
- TextMarkerBasic anchorBasic = (TextMarkerBasic) stream.get();
+ RutaBasic anchorBasic = (RutaBasic) stream.get();
streamPointer.moveTo(anchorBasic);
- List<TextMarkerBasic> basicsToAdd = new ArrayList<TextMarkerBasic>();
+ List<RutaBasic> basicsToAdd = new ArrayList<RutaBasic>();
basicsToAdd.add(anchorBasic);
String text = anchorBasic.getCoveredText();
StringBuilder candidate = new StringBuilder(text);
@@ -264,7 +264,7 @@ public class TreeWordList implements Tex
ignoreWS)) {
streamPointer.moveToNext();
if (streamPointer.isValid()) {
- TextMarkerBasic next = (TextMarkerBasic) streamPointer.get();
+ RutaBasic next = (RutaBasic) streamPointer.get();
if (contains(candidate.toString(), ignoreCase, size, ignoreChars, maxIgnoredChars,
ignoreWS)) {
interResult = new Annotation(stream.getJCas(), basicsToAdd.get(0).getBegin(),
@@ -290,13 +290,13 @@ public class TreeWordList implements Tex
return results;
}
- public List<AnnotationFS> find(TextMarkerStream stream, boolean ignoreCase, int size,
+ public List<AnnotationFS> find(RutaStream stream, boolean ignoreCase, int size,
boolean ignoreWS) {
return find(stream, ignoreCase, size, null, 0, ignoreWS);
}
- private void tryToCreateAnnotation(TextMarkerStream stream, boolean ignoreCase, int size,
- ArrayList<AnnotationFS> results, List<TextMarkerBasic> basicsToAdd, String lastCandidate,
+ private void tryToCreateAnnotation(RutaStream stream, boolean ignoreCase, int size,
+ ArrayList<AnnotationFS> results, List<RutaBasic> basicsToAdd, String lastCandidate,
Annotation interResult, char[] ignoreChars, int maxIgnoredChars, boolean ignoreWS) {
if (basicsToAdd.size() >= 1
&& contains(lastCandidate, ignoreCase, size, ignoreChars, maxIgnoredChars, ignoreWS)) {
@@ -373,7 +373,7 @@ public class TreeWordList implements Tex
return name;
}
- public List<AnnotationFS> find(TextMarkerStream stream, Map<String, Type> typeMap,
+ public List<AnnotationFS> find(RutaStream stream, Map<String, Type> typeMap,
boolean ignoreCase, int ignoreLength, boolean edit, double distance, String ignoreToken) {
return null;
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/TrieXMLEventHandler.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/TrieXMLEventHandler.java?rev=1477068&r1=1477067&r2=1477068&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/TrieXMLEventHandler.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/TrieXMLEventHandler.java Mon Apr 29 13:44:31 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.resource;
+package org.apache.uima.ruta.resource;
import java.util.Stack;
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/XMLEventHandler.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/XMLEventHandler.java?rev=1477068&r1=1477067&r2=1477068&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/XMLEventHandler.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/XMLEventHandler.java Mon Apr 29 13:44:31 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.resource;
+package org.apache.uima.ruta.resource;
import java.util.Stack;