You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2009/10/09 18:19:29 UTC
svn commit: r823606 - in
/incubator/uima/sandbox/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper:
./ support/dictionaryResource/ support/tokenizer/ support/tokens/
Author: schor
Date: Fri Oct 9 16:19:28 2009
New Revision: 823606
URL: http://svn.apache.org/viewvc?rev=823606&view=rev
Log:
UIMA-1605 applied patch, changed StringBuffer to StringBuilder
Modified:
incubator/uima/sandbox/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/ConceptMapper.java
incubator/uima/sandbox/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/support/dictionaryResource/CompiledDictionaryResource_impl.java
incubator/uima/sandbox/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/support/dictionaryResource/DictionaryResource.java
incubator/uima/sandbox/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/support/dictionaryResource/DictionaryResource_impl.java
incubator/uima/sandbox/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/support/dictionaryResource/EntryPropertiesFactory.java
incubator/uima/sandbox/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/support/tokenizer/OffsetTokenizer.java
incubator/uima/sandbox/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/support/tokens/TokenFilter.java
Modified: incubator/uima/sandbox/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/ConceptMapper.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/ConceptMapper.java?rev=823606&r1=823605&r2=823606&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/ConceptMapper.java (original)
+++ incubator/uima/sandbox/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/ConceptMapper.java Fri Oct 9 16:19:28 2009
@@ -579,9 +579,6 @@
ArrayList<String> normalizedTokens = new ArrayList<String>();
- // mapping from words in sentence to list of dictionary entries starting with that word
- Map<String, Collection<DictEntry>> potentialEntries = new HashMap<String, Collection<DictEntry>>();
-
// iterate through all tokens within span and collect dict entries for each unique one
for (int whichToken = 0; whichToken < tokens.size(); whichToken++) {
token = tokens.get(whichToken);
@@ -595,13 +592,12 @@
// System.err.println("ENTRY SEARCH/ORIGINAL: " + word + " / " +
// tokenText);
}
- potentialEntries = findPotentialEntries(normalizedTokens, dict);
// System.err.println ("processTokenListSkipAny finding matches for " +
// normalizedTokens.toString ());
findMatchesSkipAnyToken(searchStrategy, findAllMatches, tcas, tokens, normalizedTokens,
- potentialEntries, spanAnnotation);
+ findPotentialEntries(normalizedTokens, dict), spanAnnotation);
}
private Map<String, Collection<DictEntry>> findPotentialEntries(
@@ -746,7 +742,7 @@
TreeMap<String, Integer> entryOccurences = findEntryOccurences(entry.getElements(), whichToken);
int begin = -1;
int end = 0;
- StringBuffer matchedText = new StringBuffer();
+ StringBuilder matchedText = new StringBuilder();
// while there are still items to match against
ArrayList<AnnotationFS> matched = new ArrayList<AnnotationFS>();
@@ -777,7 +773,7 @@
if (count.intValue() == 1) {
entryOccurences.remove(currentTokenText);
} else {
- entryOccurences.put(currentTokenText, new Integer(count.intValue() - 1));
+ entryOccurences.put(currentTokenText, Integer.valueOf (count.intValue() - 1));
}
}
@@ -806,9 +802,9 @@
for (String token : normalizedTokens) {
Integer count = result.get(token);
if (count == null) {
- count = new Integer(1);
+ count = Integer.valueOf (1);
} else {
- count = new Integer(count.intValue() + 1);
+ count = Integer.valueOf (count.intValue() + 1);
}
result.put(token, count);
Modified: incubator/uima/sandbox/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/support/dictionaryResource/CompiledDictionaryResource_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/support/dictionaryResource/CompiledDictionaryResource_impl.java?rev=823606&r1=823605&r2=823606&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/support/dictionaryResource/CompiledDictionaryResource_impl.java (original)
+++ incubator/uima/sandbox/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/support/dictionaryResource/CompiledDictionaryResource_impl.java Fri Oct 9 16:19:28 2009
@@ -39,7 +39,7 @@
*/
protected Hashtable<String, DictEntriesByLength> dictImpl;
- public DictionaryResource NewDictionaryResource(int initialSize) {
+ public DictionaryResource newDictionaryResource(int initialSize) {
throw new UnsupportedOperationException();
}
Modified: incubator/uima/sandbox/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/support/dictionaryResource/DictionaryResource.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/support/dictionaryResource/DictionaryResource.java?rev=823606&r1=823605&r2=823606&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/support/dictionaryResource/DictionaryResource.java (original)
+++ incubator/uima/sandbox/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/support/dictionaryResource/DictionaryResource.java Fri Oct 9 16:19:28 2009
@@ -35,7 +35,7 @@
// shared resource loader
public void load(DataResource data) throws ResourceInitializationException;
- public DictionaryResource NewDictionaryResource(int initialSize);
+ public DictionaryResource newDictionaryResource(int initialSize);
public interface DictEntriesByLength extends Serializable {
public DictEntries getEntries(int length);
Modified: incubator/uima/sandbox/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/support/dictionaryResource/DictionaryResource_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/support/dictionaryResource/DictionaryResource_impl.java?rev=823606&r1=823605&r2=823606&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/support/dictionaryResource/DictionaryResource_impl.java (original)
+++ incubator/uima/sandbox/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/support/dictionaryResource/DictionaryResource_impl.java Fri Oct 9 16:19:28 2009
@@ -232,7 +232,7 @@
InputStream dictStream = null;
try {
dictLoader.setLogger(logger);
- Boolean sortElementsParam = new Boolean(false);
+ Boolean sortElementsParam = Boolean.valueOf (false);
sortElementsParam = (Boolean) aContext.getConfigParameterValue(PARAM_ORDERINDEPENDENTLOOKUP);
if (sortElementsParam == null) {
@@ -315,7 +315,7 @@
private static class DictEntriesByLength_impl implements DictEntriesByLength {
private static final long serialVersionUID = -8150386021246495622L;
- private class ReverseOrderIntegerComparator implements Comparator<Integer>, Serializable {
+ private static class ReverseOrderIntegerComparator implements Comparator<Integer>, Serializable {
/**
*
@@ -347,7 +347,7 @@
* @see org.apache.uima.conceptMapper.support.dictionaryResource.DictionaryResource.DictEntriesByLength#getEntries(int)
*/
public DictEntries getEntries(int length) {
- return entries.get(new Integer(length));
+ return entries.get(Integer.valueOf (length));
}
/*
@@ -361,7 +361,7 @@
DictEntries entry = getEntries(length);
if (entry == null) {
entry = new DictEntriesImpl();
- entries.put(new Integer(length), entry);
+ entries.put(Integer.valueOf (length), entry);
}
entry.putEntry(elements, unsorted, props);
}
@@ -380,7 +380,7 @@
}
public String toString() {
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
int i = getLongest().intValue();
int last = getShortest().intValue();
@@ -436,7 +436,7 @@
}
public String toString() {
- StringBuffer result = new StringBuffer("<DictEntries>");
+ StringBuilder result = new StringBuilder("<DictEntries>");
for (int i = 0; i < size(); i++) {
result.append(((DictEntryImpl) get(i)).toString());
}
@@ -487,7 +487,19 @@
}
public String toString() {
- StringBuffer result = new StringBuffer("<DictEntry Text ='" + getElements().toString() + "'>");
+ StringBuilder result = new StringBuilder("<DictEntry Text ='[");
+
+ boolean firstTime = true;
+ for (String element: getElements()) {
+ if (firstTime) {
+ firstTime = false;
+ }
+ else {
+ result.append (", ");
+ }
+ result.append (element);
+ }
+ result.append ("''>");
for (String propertyName : EntryPropertiesFactory.propertyNames())
{
@@ -719,7 +731,6 @@
public void startElement(String uri, String local, String raw, Attributes attrs)
throws SAXException {
- String key = null;
DictionaryToken token = null;
int length = 0;
@@ -776,20 +787,18 @@
return;
}
- key = new String(tokenNormalizer.normalize(token.getText()));
//if (dumpDict)
//{
// System.err.println ("variant token key:" + key);
//}
- tokens.add(key);
+ tokens.add(tokenNormalizer.normalize(token.getText()));
length = 1;
while (tokenIter.hasNext()) {
token = (DictionaryToken) tokenIter.next();
String tokenText = tokenNormalizer.normalize(token.getText());
if (tokenFilter.isOK_Token(token, tokenNormalizer)) {
- key += " " + tokenText;
tokens.add(tokenText);
length++;
@@ -954,7 +963,7 @@
*
* @see org.apache.uima.conceptMapper.support.DictionaryResource#NewDictionaryResource(int)
*/
- public DictionaryResource NewDictionaryResource(int initialDictEntries) {
+ public DictionaryResource newDictionaryResource(int initialDictEntries) {
return new DictionaryResource_impl(initialDictEntries);
}
@@ -969,7 +978,7 @@
public static String stringTogetherTokens(String[] elements) {
- StringBuffer tokenString = new StringBuffer();
+ StringBuilder tokenString = new StringBuilder();
for (int i = 0; i < elements.length; i++) {
if (i > 0) {
@@ -982,7 +991,7 @@
public String toString() {
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
Enumeration<String> e = keys();
Modified: incubator/uima/sandbox/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/support/dictionaryResource/EntryPropertiesFactory.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/support/dictionaryResource/EntryPropertiesFactory.java?rev=823606&r1=823605&r2=823606&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/support/dictionaryResource/EntryPropertiesFactory.java (original)
+++ incubator/uima/sandbox/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/support/dictionaryResource/EntryPropertiesFactory.java Fri Oct 9 16:19:28 2009
@@ -24,7 +24,7 @@
private static String [] propertyNames = null;
- public static EntryPropertiesFactory create (String [] thePropertyNames)
+ public static synchronized EntryPropertiesFactory create (String [] thePropertyNames)
{
if (propertyNames == null)
{
Modified: incubator/uima/sandbox/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/support/tokenizer/OffsetTokenizer.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/support/tokenizer/OffsetTokenizer.java?rev=823606&r1=823605&r2=823606&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/support/tokenizer/OffsetTokenizer.java (original)
+++ incubator/uima/sandbox/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/support/tokenizer/OffsetTokenizer.java Fri Oct 9 16:19:28 2009
@@ -166,7 +166,7 @@
public TokenAnnotation nextToken(JCas jcas) {
- StringBuffer token = new StringBuffer();
+ StringBuilder token = new StringBuilder();
// System.out.println("in NextToken");
// skip any delimiters
while ((offset < length) && (getDelim().indexOf(getText().charAt((offset))) >= 0)) {
Modified: incubator/uima/sandbox/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/support/tokens/TokenFilter.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/support/tokens/TokenFilter.java?rev=823606&r1=823605&r2=823606&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/support/tokens/TokenFilter.java (original)
+++ incubator/uima/sandbox/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/support/tokens/TokenFilter.java Fri Oct 9 16:19:28 2009
@@ -190,8 +190,8 @@
}
}
stopWords = initializeStopWordList(stopWordList);
- } catch (Exception ie) {
- throw new AnnotatorConfigurationException();
+ } catch (AnnotatorContextException ie) {
+ throw new AnnotatorConfigurationException(ie);
}
}
@@ -277,7 +277,7 @@
boolean returnValue = true;
if (tokenTypeFeature != null) {
- Integer tokenType = new Integer(token.getIntValue(tokenTypeFeature));
+ Integer tokenType = Integer.valueOf (token.getIntValue(tokenTypeFeature));
if (tokenType != null) {
returnValue = isOK_TokenType(tokenType);