Author: pkluegl
Date: Fri Jul 27 11:54:41 2012
New Revision: 1366346
URL: http://svn.apache.org/viewvc?rev=1366346&view=rev
Log:
UIMA-2439
- changed order in if-statement. Second alternative was already covered by
first one since TypeExpression implements StringExpression for automatic
conversion
Modified:
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/AbstractStructureAction.java
Modified:
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/AbstractStructureAction.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/AbstractStructureAction.java?rev=1366346&r1=1366345&r2=1366346&view=diff
==============================================================================
---
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/AbstractStructureAction.java
(original)
+++
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/AbstractStructureAction.java
Fri Jul 27 11:54:41 2012
@@ -65,10 +65,7 @@ public abstract class AbstractStructureA
Object valueObject = map.get(shortFName);
Type range = targetFeature.getRange();
if (valueObject != null) {
- if (valueObject instanceof StringExpression &&
range.getName().equals(UIMAConstants.TYPE_STRING)) {
- structure.setStringValue(targetFeature,
- ((StringExpression)
valueObject).getStringValue(element.getParent()));
- } else if (valueObject instanceof TypeExpression
+ if (valueObject instanceof TypeExpression
&& range.getName().equals(UIMAConstants.TYPE_STRING)) {
TypeExpression type = (TypeExpression) valueObject;
List<AnnotationFS> annotationsInWindow =
stream.getAnnotationsInWindow(matchedAnnotation,
@@ -77,25 +74,30 @@ public abstract class AbstractStructureA
AnnotationFS annotation = annotationsInWindow.get(0);
structure.setStringValue(targetFeature,
annotation.getCoveredText());
}
+ } else if (valueObject instanceof StringExpression
+ && range.getName().equals(UIMAConstants.TYPE_STRING)) {
+ structure.setStringValue(targetFeature,
+ ((StringExpression)
valueObject).getStringValue(element.getParent()));
+
} else if (valueObject instanceof NumberExpression) {
- if(range.getName().equals(UIMAConstants.TYPE_INTEGER)) {
+ if (range.getName().equals(UIMAConstants.TYPE_INTEGER)) {
structure.setIntValue(targetFeature,
((NumberExpression)
valueObject).getIntegerValue(element.getParent()));
- } else if(range.getName().equals(UIMAConstants.TYPE_DOUBLE)) {
+ } else if (range.getName().equals(UIMAConstants.TYPE_DOUBLE)) {
structure.setDoubleValue(targetFeature,
((NumberExpression)
valueObject).getDoubleValue(element.getParent()));
- } else if(range.getName().equals(UIMAConstants.TYPE_FLOAT)) {
+ } else if (range.getName().equals(UIMAConstants.TYPE_FLOAT)) {
structure.setFloatValue(targetFeature,
((NumberExpression)
valueObject).getFloatValue(element.getParent()));
- } else if(range.getName().equals(UIMAConstants.TYPE_BYTE)) {
- structure.setByteValue(targetFeature, (byte)
- ((NumberExpression)
valueObject).getIntegerValue(element.getParent()));
- } else if(range.getName().equals(UIMAConstants.TYPE_SHORT)) {
- structure.setShortValue(targetFeature, (short)
- ((NumberExpression)
valueObject).getIntegerValue(element.getParent()));
- } else if(range.getName().equals(UIMAConstants.TYPE_LONG)) {
- structure.setLongValue(targetFeature, (long)
- ((NumberExpression)
valueObject).getIntegerValue(element.getParent()));
+ } else if (range.getName().equals(UIMAConstants.TYPE_BYTE)) {
+ structure.setByteValue(targetFeature,
+ (byte) ((NumberExpression)
valueObject).getIntegerValue(element.getParent()));
+ } else if (range.getName().equals(UIMAConstants.TYPE_SHORT)) {
+ structure.setShortValue(targetFeature,
+ (short) ((NumberExpression)
valueObject).getIntegerValue(element.getParent()));
+ } else if (range.getName().equals(UIMAConstants.TYPE_LONG)) {
+ structure.setLongValue(targetFeature,
+ (long) ((NumberExpression)
valueObject).getIntegerValue(element.getParent()));
}
} else if (valueObject instanceof BooleanExpression
&& range.getName().equals(UIMAConstants.TYPE_BOOLEAN)) {
