You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2013/02/20 19:03:51 UTC
svn commit: r1448326 - in /uima/sandbox/uimafit/trunk:
uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/
uimafit/src/main/java/org/apache/uima/fit/component/initialize/
uimafit/src/main/java/org/apache/uima/fit/descriptor/ uima...
Author: rec
Date: Wed Feb 20 18:03:50 2013
New Revision: 1448326
URL: http://svn.apache.org/r1448326
Log:
[UIMA-2683] Remove remaining references to "org.uimafit"
https://issues.apache.org/jira/browse/UIMA-2683
- Removed references in comments/documentation
- Renamed built-in values in Java annotations and updated legacy converters accordingly
Modified:
uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/ConfigurationParameterConverter.java
uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/FsIndexConverter.java
uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/SofaCapabilityConverter.java
uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/TypeCapabilityConverter.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/initialize/ConfigurationParameterInitializer.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/descriptor/ConfigurationParameter.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/descriptor/FsIndex.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/descriptor/SofaCapability.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/descriptor/TypeCapability.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/AggregateBuilder.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/AnalysisEngineFactory.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/testing/factory/TokenBuilder.java
uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/ReversableTestFlowController.java
uima/sandbox/uimafit/trunk/uimafit/src/test/resources/data/descriptor/README
Modified: uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/ConfigurationParameterConverter.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/ConfigurationParameterConverter.java?rev=1448326&r1=1448325&r2=1448326&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/ConfigurationParameterConverter.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/ConfigurationParameterConverter.java Wed Feb 20 18:03:50 2013
@@ -86,7 +86,13 @@ public class ConfigurationParameterConve
}
public String[] defaultValue() {
- return legacyAnnotation.defaultValue();
+ String[] values = legacyAnnotation.defaultValue();
+ if (values.length == 1
+ && org.uimafit.descriptor.ConfigurationParameter.NO_DEFAULT_VALUE.equals(values[0])) {
+ return new String[] { ConfigurationParameter.NO_DEFAULT_VALUE };
+ } else {
+ return values;
+ }
}
}
}
Modified: uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/FsIndexConverter.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/FsIndexConverter.java?rev=1448326&r1=1448325&r2=1448326&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/FsIndexConverter.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/FsIndexConverter.java Wed Feb 20 18:03:50 2013
@@ -59,7 +59,11 @@ public class FsIndexConverter
}
public String typeName() {
- return legacyAnnotation.typeName();
+ if (org.uimafit.descriptor.FsIndex.NO_NAME_TYPE_SET.equals(legacyAnnotation.typeName())) {
+ return FsIndex.NO_NAME_TYPE_SET;
+ } else {
+ return legacyAnnotation.typeName();
+ }
}
public Class<? extends TOP> type() {
Modified: uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/SofaCapabilityConverter.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/SofaCapabilityConverter.java?rev=1448326&r1=1448325&r2=1448326&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/SofaCapabilityConverter.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/SofaCapabilityConverter.java Wed Feb 20 18:03:50 2013
@@ -53,11 +53,23 @@ public class SofaCapabilityConverter
}
public String[] inputSofas() {
- return legacyAnnotation.inputSofas();
+ String[] values = legacyAnnotation.inputSofas();
+ if (values.length == 1
+ && org.uimafit.descriptor.SofaCapability.NO_DEFAULT_VALUE.equals(values[0])) {
+ return new String[] { SofaCapability.NO_DEFAULT_VALUE };
+ } else {
+ return values;
+ }
}
public String[] outputSofas() {
- return legacyAnnotation.outputSofas();
+ String[] values = legacyAnnotation.outputSofas();
+ if (values.length == 1
+ && org.uimafit.descriptor.SofaCapability.NO_DEFAULT_VALUE.equals(values[0])) {
+ return new String[] { SofaCapability.NO_DEFAULT_VALUE };
+ } else {
+ return values;
+ }
}
}
}
Modified: uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/TypeCapabilityConverter.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/TypeCapabilityConverter.java?rev=1448326&r1=1448325&r2=1448326&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/TypeCapabilityConverter.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/TypeCapabilityConverter.java Wed Feb 20 18:03:50 2013
@@ -53,11 +53,23 @@ public class TypeCapabilityConverter
}
public String[] inputs() {
- return legacyAnnotation.inputs();
+ String[] values = legacyAnnotation.inputs();
+ if (values.length == 1
+ && org.uimafit.descriptor.TypeCapability.NO_DEFAULT_VALUE.equals(values[0])) {
+ return new String[] { TypeCapability.NO_DEFAULT_VALUE };
+ } else {
+ return values;
+ }
}
public String[] outputs() {
- return legacyAnnotation.outputs();
+ String[] values = legacyAnnotation.outputs();
+ if (values.length == 1
+ && org.uimafit.descriptor.TypeCapability.NO_DEFAULT_VALUE.equals(values[0])) {
+ return new String[] { TypeCapability.NO_DEFAULT_VALUE };
+ } else {
+ return values;
+ }
}
}
}
Modified: uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/initialize/ConfigurationParameterInitializer.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/initialize/ConfigurationParameterInitializer.java?rev=1448326&r1=1448325&r2=1448326&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/initialize/ConfigurationParameterInitializer.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/initialize/ConfigurationParameterInitializer.java Wed Feb 20 18:03:50 2013
@@ -117,25 +117,7 @@ public final class ConfigurationParamete
// this check is already performed by UIMA
if (annotation.mandatory()) {
mandatoryValues.add(field.getName());
-
- // if (parameterValue == null) {
- // final String key = ResourceInitializationException.CONFIG_SETTING_ABSENT;
- // throw new ResourceInitializationException(key,
- // new Object[] { configurationParameterName });
- // }
}
- // else {
- // if (parameterValue == null) {
- // continue;
- // }
- // }
- // final Object fieldValue = convertValue(field, parameterValue);
- // try {
- // setParameterValue(component, field, fieldValue);
- // }
- // catch (Exception e) {
- // throw new ResourceInitializationException(e);
- // }
}
}
@@ -282,216 +264,4 @@ public final class ConfigurationParamete
ConfigurationParameterSettings settings = metaData.getConfigurationParameterSettings();
initialize(component, settings.getParameterSettings());
}
-
- // /**
- // * This method converts UIMA values to values that are appropriate for instantiating the
- // * annotated member variable. For example, if the "uima" value is a string array and the member
- // * variable is of type List<String>, then this method will return a list
- // *
- // * @param field
- // * @param uimaValue
- // * @return
- // */
- // public static Object convertValue(Field field, Object uimaValue) {
- // if (ConfigurationParameterFactory.isConfigurationParameterField(field)) {
- //
- // Object result;
- // Class<?> fieldType = field.getType();
- // Class<?> componentType = getComponentType(field);
- // Converter<?> converter = getConverter(componentType);
- //
- // // arrays
- // if (fieldType.isArray()) {
- // Object[] uimaValues = (Object[]) uimaValue;
- // result = Array.newInstance(componentType, uimaValues.length);
- // for (int index = 0; index < uimaValues.length; ++index) {
- // Array.set(result, index, converter.convert(uimaValues[index]));
- // }
- // }
- //
- // // collections
- // else if (Collection.class.isAssignableFrom(fieldType)) {
- // Collection<Object> collection;
- // if (fieldType == List.class) {
- // collection = new ArrayList<Object>();
- // }
- // else if (fieldType == Set.class) {
- // collection = new HashSet<Object>();
- // }
- // else {
- // collection = newCollection(fieldType);
- // }
- // Object[] uimaValues = (Object[]) uimaValue;
- // for (Object value : uimaValues) {
- // collection.add(converter.convert(value));
- // }
- // result = collection;
- // }
- //
- // // other
- // else {
- // result = converter.convert(uimaValue);
- // }
- // return result;
- // }
- // else {
- // throw new IllegalArgumentException("field is not annotated with annotation of type "
- // + org.uimafit.descriptor.ConfigurationParameter.class.getName());
- // }
- // }
- //
- // @SuppressWarnings("unchecked")
- // private static Collection<Object> newCollection(Class<?> cls) {
- // try {
- // return cls.asSubclass(Collection.class).newInstance();
- // }
- // catch (Exception e) {
- // throw new RuntimeException(e);
- // }
- // }
- //
- // private static Class<?> getComponentType(Field field) {
- // Class<?> fieldType = field.getType();
- // if (fieldType.isArray()) {
- // return fieldType.getComponentType();
- // }
- // else if (Collection.class.isAssignableFrom(fieldType)) {
- // ParameterizedType collectionType = (ParameterizedType) field.getGenericType();
- // return (Class<?>) collectionType.getActualTypeArguments()[0];
- // }
- // else {
- // return fieldType;
- // }
- // }
- //
- // private static void setParameterValue(Object component, Field field, Object value)
- // throws IllegalArgumentException, IllegalAccessException, SecurityException {
- //
- // boolean accessible = field.isAccessible();
- // field.setAccessible(true);
- // try {
- // field.set(component, value);
- // }
- // finally {
- // field.setAccessible(accessible);
- // }
- // }
- //
- // private ConfigurationParameterInitializer() {
- // // should not be instantiated
- // }
- //
- // @SuppressWarnings({ "rawtypes", "unchecked" })
- // private static Converter<?> getConverter(Class<?> cls) {
- // Converter<?> converter = CONVERTERS.get(cls);
- // if (converter != null) {
- // return converter;
- // }
- //
- // // Check if we have an enumeration type
- // if (Enum.class.isAssignableFrom(cls)) {
- // return new EnumConverter(cls);
- // }
- //
- // try {
- // Constructor<?> constructor = cls.getConstructor(String.class);
- // return new ConstructorConverter(constructor);
- // }
- // catch (NoSuchMethodException e) {
- // throw new IllegalArgumentException("don't know how to convert type " + cls);
- // }
- // }
- //
- // private interface Converter<T> {
- // T convert(Object aObject);
- // }
- //
- // private static class BooleanConverter implements Converter<Boolean> {
- // public Boolean convert(Object aObject) {
- // return (Boolean) aObject;
- // }
- // }
- //
- // private static class FloatConverter implements Converter<Float> {
- // public Float convert(Object aObject) {
- // return (Float) aObject;
- // }
- // }
- //
- // private static class DoubleConverter implements Converter<Float> {
- // public Float convert(Object aObject) {
- // return ((Number) aObject).floatValue();
- // }
- // }
- //
- // private static class IntegerConverter implements Converter<Integer> {
- // public Integer convert(Object aObject) {
- // return (Integer) aObject;
- // }
- // }
- //
- // private static class StringConverter implements Converter<String> {
- // public String convert(Object aObject) {
- // return String.valueOf(aObject);
- // }
- // }
- //
- // private static class PatternConverter implements Converter<Pattern> {
- // public Pattern convert(Object aObject) {
- // return Pattern.compile(aObject.toString());
- // }
- // }
- //
- // private static class ConstructorConverter implements Converter<Object> {
- // final private Constructor<?> constructor;
- //
- // public ConstructorConverter(Constructor<?> constructor) {
- // this.constructor = constructor;
- // }
- //
- // public Object convert(Object o) {
- // try {
- // return this.constructor.newInstance(o);
- // }
- // catch (Exception e) {
- // throw new RuntimeException(e);
- // }
- // }
- //
- // }
- //
- // private static class EnumConverter<T extends Enum<T>> implements Converter<Object> {
- // final private Class<T> enumClass;
- //
- // public EnumConverter(Class<T> aClass) {
- // this.enumClass = aClass;
- // }
- //
- // public T convert(Object o) {
- // try {
- // return Enum.valueOf(enumClass, o.toString());
- // }
- // catch (Exception e) {
- // throw new RuntimeException(e);
- // }
- // }
- // }
- //
- // private static class LocaleConverter implements Converter<Locale> {
- // public Locale convert(Object o) {
- // if (o == null) {
- // return Locale.getDefault();
- // }
- // else if ("".equals(o)) {
- // return Locale.getDefault();
- // }
- // if (o instanceof String) {
- // return LocaleUtil.getLocale((String) o);
- // }
- // throw new IllegalArgumentException("the value for a locale should be either null or an "
- // + "empty string to get the default locale. Otherwise, the locale should be "
- // + "specified by a single string that names a locale constant (e.g. 'US') or "
- // + "that contains hyphen delimited locale information (e.g. 'en-US').");
- // }
- // }
}
Modified: uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/descriptor/ConfigurationParameter.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/descriptor/ConfigurationParameter.java?rev=1448326&r1=1448325&r2=1448326&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/descriptor/ConfigurationParameter.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/descriptor/ConfigurationParameter.java Wed Feb 20 18:03:50 2013
@@ -102,6 +102,5 @@ public @interface ConfigurationParameter
/**
* Tells the ConfigurationParameterFactory that no default value has been provided
*/
- public static final String NO_DEFAULT_VALUE = "org.uimafit.descriptor.ConfigurationParameter.NO_DEFAULT_VALUE";
-
+ public static final String NO_DEFAULT_VALUE = "org.apache.uima.fit.descriptor.ConfigurationParameter.NO_DEFAULT_VALUE";
}
Modified: uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/descriptor/FsIndex.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/descriptor/FsIndex.java?rev=1448326&r1=1448325&r2=1448326&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/descriptor/FsIndex.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/descriptor/FsIndex.java Wed Feb 20 18:03:50 2013
@@ -80,6 +80,6 @@ public @interface FsIndex {
public static final class NoClassSet extends TOP { /* Nothing */
}
- public static final String NO_NAME_TYPE_SET = "org.uimafit.descriptor.FsIndex.NO_NAME_TYPE_SET";
+ public static final String NO_NAME_TYPE_SET = "org.apache.uima.fit.descriptor.FsIndex.NO_NAME_TYPE_SET";
}
Modified: uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/descriptor/SofaCapability.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/descriptor/SofaCapability.java?rev=1448326&r1=1448325&r2=1448326&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/descriptor/SofaCapability.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/descriptor/SofaCapability.java Wed Feb 20 18:03:50 2013
@@ -67,6 +67,6 @@ public @interface SofaCapability {
* no value has been given to the inputs or outputs elements.
*/
- public static final String NO_DEFAULT_VALUE = "org.uimafit.descriptor.SofaCapability.NO_DEFAULT_VALUE";
+ public static final String NO_DEFAULT_VALUE = "org.apache.uima.fit.descriptor.SofaCapability.NO_DEFAULT_VALUE";
}
Modified: uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/descriptor/TypeCapability.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/descriptor/TypeCapability.java?rev=1448326&r1=1448325&r2=1448326&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/descriptor/TypeCapability.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/descriptor/TypeCapability.java Wed Feb 20 18:03:50 2013
@@ -61,5 +61,5 @@ public @interface TypeCapability {
* Provides the default value for the inputs and the outputs that tells the CapabilityFactory that
* no value has been given to the inputs or outputs elements.
*/
- public static final String NO_DEFAULT_VALUE = "org.uimafit.descriptor.TypeCapability.NO_DEFAULT_VALUE";
+ public static final String NO_DEFAULT_VALUE = "org.apache.uima.fit.descriptor.TypeCapability.NO_DEFAULT_VALUE";
}
Modified: uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/AggregateBuilder.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/AggregateBuilder.java?rev=1448326&r1=1448325&r2=1448326&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/AggregateBuilder.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/AggregateBuilder.java Wed Feb 20 18:03:50 2013
@@ -46,7 +46,7 @@ import org.apache.uima.resource.metadata
* <blockquote>
*
* <pre>
- * import static org.uimafit.factory.AnalysisEngineFactory.createPrimitiveDescription;
+ * import static org.apache.uima.fit.factory.AnalysisEngineFactory.createPrimitiveDescription;
*
* AggregateBuilder builder = new AggregateBuilder();
* builder.add(createPrimitiveDescription(Annotator1.class, typeSystemDescription),
Modified: uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/AnalysisEngineFactory.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/AnalysisEngineFactory.java?rev=1448326&r1=1448325&r2=1448326&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/AnalysisEngineFactory.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/AnalysisEngineFactory.java Wed Feb 20 18:03:50 2013
@@ -201,7 +201,7 @@ public final class AnalysisEngineFactory
*
* @param componentClass
* a class that extends AnalysisComponent e.g.
- * org.uimafit.component.JCasAnnotator_ImplBase
+ * {@link org.apache.uima.fit.component.JCasAnnotator_ImplBase}
*/
public static AnalysisEngineDescription createPrimitiveDescription(
Class<? extends AnalysisComponent> componentClass, TypeSystemDescription typeSystem,
@@ -217,7 +217,7 @@ public final class AnalysisEngineFactory
*
* @param componentClass
* a class that extends AnalysisComponent e.g.
- * org.uimafit.component.JCasAnnotator_ImplBase
+ * {@link org.apache.uima.fit.component.JCasAnnotator_ImplBase}
*/
public static AnalysisEngineDescription createPrimitiveDescription(
Class<? extends AnalysisComponent> componentClass, Object... configurationData)
Modified: uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/testing/factory/TokenBuilder.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/testing/factory/TokenBuilder.java?rev=1448326&r1=1448325&r2=1448326&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/testing/factory/TokenBuilder.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/testing/factory/TokenBuilder.java Wed Feb 20 18:03:50 2013
@@ -34,9 +34,9 @@ import org.apache.uima.jcas.tcas.Annotat
*
*
* @param <TOKEN_TYPE>
- * the type system token type (e.g. org.uimafit.examples.type.Token)
+ * the type system token type (e.g. {@link org.apache.uima.fit.examples.type.Token})
* @param <SENTENCE_TYPE>
- * the type system sentence type (e.g. org.uimafit.examples.type.Sentence)
+ * the type system sentence type (e.g. {@link org.apache.uima.fit.examples.type.Sentence})
*/
public class TokenBuilder<TOKEN_TYPE extends Annotation, SENTENCE_TYPE extends Annotation> {
@@ -86,15 +86,15 @@ public class TokenBuilder<TOKEN_TYPE ext
* tokens.
*
* @param <T>
- * the type system token type (e.g. org.uimafit.examples.type.Token)
+ * the type system token type (e.g. org.apache.uima.fit.examples.type.Token)
* @param <S>
- * the type system sentence type (e.g. org.uimafit.examples.type.Sentence)
+ * the type system sentence type (e.g. {@link org.apache.uima.fit.examples.type.Sentence})
* @param tokenClass
* the class of your token type from your type system (e.g.
- * org.apache.uima.fit.type.Token.class)
+ * {@link org.apache.uima.fit.type.Token})
* @param sentenceClass
* the class of your sentence type from your type system (e.g.
- * org.apache.uima.fit.type.Sentence.class)
+ * {@link org.apache.uima.fit.type.Sentence})
* @return the builder.
*/
public static <T extends Annotation, S extends Annotation> TokenBuilder<T, S> create(
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/ReversableTestFlowController.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/ReversableTestFlowController.java?rev=1448326&r1=1448325&r2=1448326&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/ReversableTestFlowController.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/ReversableTestFlowController.java Wed Feb 20 18:03:50 2013
@@ -26,6 +26,7 @@ import java.util.Map;
import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.analysis_engine.metadata.AnalysisEngineMetaData;
+import org.apache.uima.fit.component.JCasFlowController_ImplBase;
import org.apache.uima.fit.descriptor.ConfigurationParameter;
import org.apache.uima.flow.FinalStep;
import org.apache.uima.flow.Flow;
@@ -37,7 +38,7 @@ import org.apache.uima.jcas.JCas;
/**
*
- * NOTE: this class extends org.uimafit.component.JCasFlowController_ImplBase
+ * NOTE: this class extends {@link JCasFlowController_ImplBase}
*/
public class ReversableTestFlowController extends
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/resources/data/descriptor/README
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/resources/data/descriptor/README?rev=1448326&r1=1448325&r2=1448326&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/resources/data/descriptor/README (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/resources/data/descriptor/README Wed Feb 20 18:03:50 2013
@@ -1,2 +1,2 @@
These files are used by ConfigurationParameterInitializerTest.
-For a description on how they were generated see org.uimafit.component.initialize.ConfigurationParameterInitializerTest.main(String[])
\ No newline at end of file
+For a description on how they were generated see org.apache.uima.fit.component.initialize.ConfigurationParameterInitializerTest.main(String[])
\ No newline at end of file