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/13 04:47:55 UTC
svn commit: r824573 - in
/incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor: ./
src/main/java/org/apache/uima/tools/cfe/
src/main/java/org/apache/uima/tools/cfe/support/
Author: schor
Date: Tue Oct 13 02:47:55 2009
New Revision: 824573
URL: http://svn.apache.org/viewvc?rev=824573&view=rev
Log:
UIMA-1065 applied patch CFE-patch-20091012.txt plus fixed two new StringBuilder("") -> new StringBuilder()
Modified:
incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/pom.xml
incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/CFEConfigFromXML_XMLBeans.java
incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/CommonFeatureMatcher.java
incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/MatchedSingleFeatureMatcher.java
incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/PrimitiveFeatureTransformer.java
incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/RRMFeatureMatcher.java
incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/UIMAFeatureMatcher.java
incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/support/ComparableArray.java
Modified: incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/pom.xml?rev=824573&r1=824572&r2=824573&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/pom.xml (original)
+++ incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/pom.xml Tue Oct 13 02:47:55 2009
@@ -142,6 +142,7 @@
<goals><goal>xmlbeans</goal></goals>
<configuration>
<schemaDirectory>src/main/xsdForXMLBeans</schemaDirectory>
+ <javaSource>1.5</javaSource>
</configuration>
</execution>
</executions>
Modified: incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/CFEConfigFromXML_XMLBeans.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/CFEConfigFromXML_XMLBeans.java?rev=824573&r1=824572&r2=824573&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/CFEConfigFromXML_XMLBeans.java (original)
+++ incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/CFEConfigFromXML_XMLBeans.java Tue Oct 13 02:47:55 2009
@@ -53,10 +53,10 @@
EnumFeatureValues getEnumFeatureValues(EnumFeatureValuesXML efvs_xml)
throws IOException, URISyntaxException
{
- String[] vals = efvs_xml.getValuesArray();
+ List<String> vals = efvs_xml.getValuesList();
- if ((1 == vals.length) && (vals[0]).startsWith("file://")) {
- return new EnumFeatureValues(new URI((String)vals[0]).getPath(), efvs_xml.getCaseSensitive());
+ if ((1 == vals.size()) && (vals.get(0).startsWith("file://"))) {
+ return new EnumFeatureValues(new URI(vals.get(0)).getPath(), efvs_xml.getCaseSensitive());
}
return new EnumFeatureValues(vals, efvs_xml.getCaseSensitive());
}
@@ -139,11 +139,11 @@
GroupFeatureMatcher getGroupFeatureMatcher(GroupFeatureMatcherXML gfm_xml, String obj_class_name)
throws SecurityException, NoSuchMethodException, ClassNotFoundException, IOException, URISyntaxException
{
- SingleFeatureMatcherXML[] fms_xml = gfm_xml.getFeatureMatchersArray();
+ List<SingleFeatureMatcherXML> fms_xml = gfm_xml.getFeatureMatchersList();
List<SingleFeatureMatcher> sfms = new ArrayList<SingleFeatureMatcher>();
- for (int i = 0; i < fms_xml.length; ++i) {
- sfms.add(getSingleFeatureMatcher(fms_xml[i], obj_class_name));
+ for (SingleFeatureMatcherXML fm_xml : fms_xml) {
+ sfms.add(getSingleFeatureMatcher(fm_xml, obj_class_name));
}
return new GroupFeatureMatcher(sfms, gfm_xml.getExclude());
}
@@ -151,11 +151,11 @@
PartialObjectMatcher getPartialObjectMatcher(PartialObjectMatcherXML pom_xml)
throws SecurityException, NoSuchMethodException, IOException, URISyntaxException, ClassNotFoundException
{
- GroupFeatureMatcherXML[] gfms_xml = pom_xml.getGroupFeatureMatchersArray();
+ List<GroupFeatureMatcherXML> gfms_xml = pom_xml.getGroupFeatureMatchersList();
List<GroupFeatureMatcher> gfms = new ArrayList<GroupFeatureMatcher>();
- for (int i = 0; i < gfms_xml.length; ++i) {
- gfms.add(getGroupFeatureMatcher(gfms_xml[i], pom_xml.getAnnotationTypeName()));
+ for (GroupFeatureMatcherXML gfm_xml : gfms_xml) {
+ gfms.add(getGroupFeatureMatcher(gfm_xml, pom_xml.getAnnotationTypeName()));
}
return new PartialObjectMatcher(pom_xml.getAnnotationTypeName(), pom_xml.getFullPath(), gfms);
}
@@ -163,11 +163,11 @@
FeatureObjectMatcher getFeatureObjectMatcher(FeatureObjectMatcherXML fom_xml)
throws SecurityException, NoSuchMethodException, IOException, ClassNotFoundException, URISyntaxException
{
- GroupFeatureMatcherXML[] gfms_xml = fom_xml.getGroupFeatureMatchersArray();
+ List<GroupFeatureMatcherXML> gfms_xml = fom_xml.getGroupFeatureMatchersList();
List<GroupFeatureMatcher> gfms = new ArrayList<GroupFeatureMatcher>();
- for (int i = 0; i < gfms_xml.length; ++i) {
- gfms.add(getGroupFeatureMatcher(gfms_xml[i], fom_xml.getAnnotationTypeName()));
+ for (GroupFeatureMatcherXML gfm_xml : gfms_xml) {
+ gfms.add(getGroupFeatureMatcher(gfm_xml, fom_xml.getAnnotationTypeName()));
}
return new FeatureObjectMatcher(fom_xml.getAnnotationTypeName(), fom_xml.getFullPath(), gfms,
fom_xml.getWindowsizeLeft(),
@@ -183,11 +183,11 @@
throws SecurityException, NoSuchMethodException, IOException, ClassNotFoundException, URISyntaxException
{
PartialObjectMatcher ta_matcher = getPartialObjectMatcher(ta_xml.getTargetAnnotationMatcher());
- FeatureObjectMatcherXML[] fams_xml = ta_xml.getFeatureAnnotationMatchersArray();
+ List<FeatureObjectMatcherXML> fams_xml = ta_xml.getFeatureAnnotationMatchersList();
List<FeatureObjectMatcher> fams = new ArrayList<FeatureObjectMatcher>();
- for (int i = 0; i < fams_xml.length; ++i) {
- fams.add(getFeatureObjectMatcher(fams_xml[i]));
+ for (FeatureObjectMatcherXML fam_xml : fams_xml) {
+ fams.add(getFeatureObjectMatcher(fam_xml));
}
return new TargetAnnotationDescriptor(ta_xml.getClassName(),
ta_xml.getEnclosingAnnotation(),
@@ -200,9 +200,9 @@
throws SecurityException, NoSuchMethodException, IOException, ClassNotFoundException, URISyntaxException
{
List<TargetAnnotationDescriptor> result = new ArrayList<TargetAnnotationDescriptor>();
- TargetAnnotationXML[] tans = m_CFEDescriptor.getTargetAnnotationsArray();
- for (int i = 0; i < tans.length; ++i) {
- result.add(getTargetAnnotationDescriptor(tans[i], result.size() + 1));
+ List<TargetAnnotationXML> tans = m_CFEDescriptor.getTargetAnnotationsList();
+ for (TargetAnnotationXML tan_xml : tans) {
+ result.add(getTargetAnnotationDescriptor(tan_xml, result.size() + 1));
}
return result;
}
Modified: incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/CommonFeatureMatcher.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/CommonFeatureMatcher.java?rev=824573&r1=824572&r2=824573&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/CommonFeatureMatcher.java (original)
+++ incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/CommonFeatureMatcher.java Tue Oct 13 02:47:55 2009
@@ -166,7 +166,7 @@
protected static String make_image_position (MatchedAnnotationDescriptor mad)
{
- StringBuffer strBuf = new StringBuffer("");
+ StringBuilder strBuf = new StringBuilder();
if (mad.m_feature_matcher.m_orientation) {
strBuf.append((CONSTANT_LEFTLEFT == mad.m_direction) ? "L" :
(CONSTANT_LEFTINSIDE == mad.m_direction) ? "LI" :
@@ -185,7 +185,7 @@
protected String make_image (MatchedAnnotationDescriptor mad, Annotation trg)
throws IllegalArgumentException, IllegalAccessException, InvocationTargetException
{
- StringBuffer sb = new StringBuffer(mad.m_sfms_with_values.size() * 20);
+ StringBuilder sb = new StringBuilder(mad.m_sfms_with_values.size() * 20);
if (m_isAnnotationName) {
String[] name_toks = mad.m_feature_mv.m_matchedObject.getClass().getName().split("\\.");
@@ -218,7 +218,7 @@
{
Matcher m = m_featname_pattern.matcher(class_label);
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
int class_label_ind = 0;
while (m.find()) {
@@ -231,7 +231,7 @@
class_label_ind = end + 1;
TargetObjectMatcher tom = new TargetObjectMatcher((Class<?>)null, trg_mv.m_matchedObject.getClass().getName() + ":" + featname, false);
List<MatchedValue> vals = tom.getFeatureValues(trg_mv);
- StringBuffer feat_image = new StringBuffer();
+ StringBuilder feat_image = new StringBuilder();
for (Iterator<MatchedValue> it = vals.iterator(); it.hasNext();){
feat_image.append(it.next().m_matchedObject);
if (it.hasNext()) {
Modified: incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/MatchedSingleFeatureMatcher.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/MatchedSingleFeatureMatcher.java?rev=824573&r1=824572&r2=824573&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/MatchedSingleFeatureMatcher.java (original)
+++ incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/MatchedSingleFeatureMatcher.java Tue Oct 13 02:47:55 2009
@@ -35,7 +35,7 @@
String getFeatureImage(boolean feat_name, String[] value_separators)
{
- StringBuffer result = new StringBuffer("");
+ StringBuilder result = new StringBuilder();
ArrayDelimiterObject max_level = null;
if (!m_values.isEmpty()) {
// first element must be max_level
Modified: incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/PrimitiveFeatureTransformer.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/PrimitiveFeatureTransformer.java?rev=824573&r1=824572&r2=824573&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/PrimitiveFeatureTransformer.java (original)
+++ incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/PrimitiveFeatureTransformer.java Tue Oct 13 02:47:55 2009
@@ -31,7 +31,7 @@
static public String capitalize (String str)
{
- StringBuffer strBuf = new StringBuffer(str);
+ StringBuilder strBuf = new StringBuilder(str);
if (strBuf.length() > 1) {
if (Character.isLetter(strBuf.charAt(0))) {
Modified: incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/RRMFeatureMatcher.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/RRMFeatureMatcher.java?rev=824573&r1=824572&r2=824573&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/RRMFeatureMatcher.java (original)
+++ incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/RRMFeatureMatcher.java Tue Oct 13 02:47:55 2009
@@ -46,7 +46,7 @@
protected String featureWindowImage (MatchedAnnotationDescriptor mad)
{
- StringBuffer buf = new StringBuffer("W");
+ StringBuilder buf = new StringBuilder("W");
if (mad.m_feature_matcher.m_windowsizeLeft > 0) {
buf.append("L" + mad.m_feature_matcher.m_windowsizeLeft);
}
@@ -110,7 +110,7 @@
if (suffix.indexOf(" ") >= 0) {
System.err.println("ERROR: \"" + suffix + "\"" + "has spaces");
}
- StringBuffer feature = new StringBuffer();
+ StringBuilder feature = new StringBuilder();
Pattern pat = Pattern.compile("\\W");
Matcher mat = pat.matcher(suffix);
@@ -120,7 +120,7 @@
int gstart = mat.start();
feature.append(suffix.substring(start, gstart));
start = mat.end();
- StringBuffer replaced = new StringBuffer();
+ StringBuilder replaced = new StringBuilder();
String group = mat.group();
for (int i = 0; i < group.length(); ++i) {
replaced.append("__CHAR" + (int)group.charAt(i) + "__");
@@ -129,7 +129,7 @@
}
feature.append(suffix.substring(start));
- StringBuffer strBuf = new StringBuffer();
+ StringBuilder strBuf = new StringBuilder();
if (mad.m_feature_matcher.m_orientation || mad.m_feature_matcher.m_distance) {
strBuf.append(make_image_position(mad));
strBuf.append(m_fieldSeparator);
Modified: incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/UIMAFeatureMatcher.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/UIMAFeatureMatcher.java?rev=824573&r1=824572&r2=824573&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/UIMAFeatureMatcher.java (original)
+++ incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/UIMAFeatureMatcher.java Tue Oct 13 02:47:55 2009
@@ -78,7 +78,7 @@
String make_UIMA_feature (MatchedAnnotationDescriptor mad,
String other_fields)
{
- StringBuffer stBuff = new StringBuffer();
+ StringBuilder stBuff = new StringBuilder();
if (mad.m_feature_matcher.m_orientation || mad.m_feature_matcher.m_distance) {
stBuff.append(make_image_position(mad));
stBuff.append(m_fieldSeparator);
Modified: incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/support/ComparableArray.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/support/ComparableArray.java?rev=824573&r1=824572&r2=824573&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/support/ComparableArray.java (original)
+++ incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/support/ComparableArray.java Tue Oct 13 02:47:55 2009
@@ -81,7 +81,7 @@
{
assert (null != m_src);
- StringBuffer result = new StringBuffer(m_src.length * 8);
+ StringBuilder result = new StringBuilder(m_src.length * 8);
result.append("[");
for (int i = 0; i < m_src.length; ++i) {
if (0 != i) {