You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by jo...@apache.org on 2010/12/01 11:08:49 UTC
svn commit: r1040929 -
/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/ui/property/AnnotationPropertyPage.java
Author: joern
Date: Wed Dec 1 10:08:49 2010
New Revision: 1040929
URL: http://svn.apache.org/viewvc?rev=1040929&view=rev
Log:
UIMA-1875 Fixed an issue where the configuration part of an AnnotationStyle was dropped while cloneing it.
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/ui/property/AnnotationPropertyPage.java
Modified: uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/ui/property/AnnotationPropertyPage.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/ui/property/AnnotationPropertyPage.java?rev=1040929&r1=1040928&r2=1040929&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/ui/property/AnnotationPropertyPage.java (original)
+++ uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/ui/property/AnnotationPropertyPage.java Wed Dec 1 10:08:49 2010
@@ -51,7 +51,6 @@ import org.eclipse.swt.graphics.RGB;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.layout.RowLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
@@ -384,7 +383,7 @@ public abstract class AnnotationProperty
AnnotationStyle style = getWorkingCopyAnnotationStyle(getSelectedType());
AnnotationStyle newStyle = new AnnotationStyle(style.getAnnotation(), AnnotationStyle.Style
- .valueOf(mStyleCombo.getText()), style.getColor(), style.getLayer());
+ .valueOf(mStyleCombo.getText()), style.getColor(), style.getLayer(), style.getConfiguration());
updateCustomStyleControl(newStyle, getSelectedType());
@@ -399,7 +398,6 @@ public abstract class AnnotationProperty
}
setAnnotationStyle(newStyle);
-
}
@@ -430,7 +428,7 @@ public abstract class AnnotationProperty
setAnnotationStyle(new AnnotationStyle(
style.getAnnotation(), style.getStyle(),
- color, style.getLayer()));
+ color, style.getLayer(), style.getConfiguration()));
}
});
@@ -447,7 +445,7 @@ public abstract class AnnotationProperty
setAnnotationStyle(new AnnotationStyle(
style.getAnnotation(), AnnotationStyle.Style.valueOf(mStyleCombo.getText()),
- style.getColor(), style.getLayer() + 1));
+ style.getColor(), style.getLayer() + 1, style.getConfiguration()));
mTypeList.update(getSelectedType(), null);
}
@@ -469,7 +467,7 @@ public abstract class AnnotationProperty
if (style.getLayer() - 1 >= 0) {
setAnnotationStyle(new AnnotationStyle(style
.getAnnotation(), AnnotationStyle.Style.valueOf(mStyleCombo.getText()),
- style.getColor(), style.getLayer() - 1));
+ style.getColor(), style.getLayer() - 1, style.getConfiguration()));
mTypeList.update(getSelectedType(), null);
}