You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by mb...@apache.org on 2007/07/12 17:02:08 UTC
svn commit: r555653 - in /incubator/uima/sandbox/trunk/CasEditor/src:
main/java/org/apache/uima/caseditor/core/model/dotcorpus/
main/java/org/apache/uima/caseditor/editor/
main/java/org/apache/uima/caseditor/ui/property/
plugintest/java/org/apache/uima...
Author: mbaessler
Date: Thu Jul 12 08:02:06 2007
New Revision: 555653
URL: http://svn.apache.org/viewvc?view=rev&rev=555653
Log:
UIMA-430
applied patch UIMA-430.patch
JIRA ticket https://issues.apache.org/jira/browse/UIMA-430
Modified:
incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/core/model/dotcorpus/AnnotationStyle.java
incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/core/model/dotcorpus/DotCorpusSerializer.java
incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/ui/property/AnnotationPropertyPage.java
incubator/uima/sandbox/trunk/CasEditor/src/plugintest/java/org/apache/uima/caseditor/core/test/DefectiveNlpModelTest.java
incubator/uima/sandbox/trunk/CasEditor/src/plugintest/java/org/apache/uima/caseditor/core/test/TestProject.java
incubator/uima/sandbox/trunk/CasEditor/src/test/java/org/apache/uima/caseditor/core/model/dotcorpus/AnnotationStyleTest.java
incubator/uima/sandbox/trunk/CasEditor/src/test/java/org/apache/uima/caseditor/core/model/dotcorpus/DotCorpusSerializerTest.java
Modified: incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/core/model/dotcorpus/AnnotationStyle.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/core/model/dotcorpus/AnnotationStyle.java?view=diff&rev=555653&r1=555652&r2=555653
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/core/model/dotcorpus/AnnotationStyle.java (original)
+++ incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/core/model/dotcorpus/AnnotationStyle.java Thu Jul 12 08:02:06 2007
@@ -19,7 +19,8 @@
package org.apache.uima.caseditor.core.model.dotcorpus;
-import org.eclipse.swt.graphics.Color;
+import java.awt.Color;
+
/**
* The <code>AnnotationStyle</code> describes the look of an certain annotation type in the
@@ -62,7 +63,7 @@
/**
* The default drawing color.
*/
- public static final Color DEFAULT_COLOR = new Color(null, 0xff, 0, 0);
+ public static final Color DEFAULT_COLOR = new Color(0xff, 0, 0);
private String mAnnotation;
Modified: incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/core/model/dotcorpus/DotCorpusSerializer.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/core/model/dotcorpus/DotCorpusSerializer.java?view=diff&rev=555653&r1=555652&r2=555653
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/core/model/dotcorpus/DotCorpusSerializer.java (original)
+++ incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/core/model/dotcorpus/DotCorpusSerializer.java Thu Jul 12 08:02:06 2007
@@ -148,8 +148,7 @@
Color color = new Color(colorInteger);
AnnotationStyle style = new AnnotationStyle(type, AnnotationStyle.Style
- .valueOf(styleString), new org.eclipse.swt.graphics.Color(null, color.getRed(),
- color.getGreen(), color.getBlue()));
+ .valueOf(styleString), color);
dotCorpus.setStyle(style);
} else if (CAS_PROCESSOR_ELEMENT.equals(corporaChildElement.getNodeName())) {
@@ -206,7 +205,7 @@
corpusFolderAttributes.addAttribute("", "", STYLE_STYLE_ATTRIBUTE, "", style.getStyle()
.name());
- org.eclipse.swt.graphics.Color color = style.getColor();
+ Color color = style.getColor();
Integer colorInt = new Color(color.getRed(), color.getGreen(), color.getBlue()).getRGB();
corpusFolderAttributes.addAttribute("", "", STYLE_COLOR_ATTRIBUTE, "", colorInt.toString());
Modified: incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java?view=diff&rev=555653&r1=555652&r2=555653
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java (original)
+++ incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java Thu Jul 12 08:02:06 2007
@@ -71,6 +71,7 @@
import org.eclipse.swt.events.MouseEvent;
import org.eclipse.swt.events.MouseListener;
import org.eclipse.swt.events.MouseMoveListener;
+import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
@@ -744,7 +745,9 @@
mPainter.addDrawingStrategy(type.getName(),
DrawingStyle.valueOf(style.getStyle().name()).getStrategy());
mPainter.addAnnotationType(type.getName(), type.getName());
- mPainter.setAnnotationTypeColor(type.getName(), style.getColor());
+ java.awt.Color color = style.getColor();
+ mPainter.setAnnotationTypeColor(type.getName(), new Color(null, color.getRed(),
+ color.getGreen(), color.getBlue()));
}
/**
Modified: incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/ui/property/AnnotationPropertyPage.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/ui/property/AnnotationPropertyPage.java?view=diff&rev=555653&r1=555652&r2=555653
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/ui/property/AnnotationPropertyPage.java (original)
+++ incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/ui/property/AnnotationPropertyPage.java Thu Jul 12 08:02:06 2007
@@ -19,6 +19,8 @@
package org.apache.uima.caseditor.ui.property;
+import java.awt.Color;
+
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.TypeSystem;
@@ -34,7 +36,6 @@
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.RGB;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
@@ -203,7 +204,7 @@
RGB colorRGB = mColorSelector.getColorValue();
- Color color = new Color(null, colorRGB);
+ Color color = new Color(colorRGB.red, colorRGB.green, colorRGB.blue);
mCurrentSelectedAnnotation = new AnnotationStyle(
mCurrentSelectedAnnotation.getAnnotation(),
@@ -250,7 +251,9 @@
mStyleCombo.setText(style.getStyle().name());
mStyleCombo.setEnabled(true);
- mColorSelector.setColorValue(style.getColor().getRGB());
+ Color color = style.getColor();
+ mColorSelector.setColorValue(new RGB(color.getRed(), color.getGreen(),
+ color.getBlue()));
mColorSelector.setEnabled(true);
}
Modified: incubator/uima/sandbox/trunk/CasEditor/src/plugintest/java/org/apache/uima/caseditor/core/test/DefectiveNlpModelTest.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditor/src/plugintest/java/org/apache/uima/caseditor/core/test/DefectiveNlpModelTest.java?view=diff&rev=555653&r1=555652&r2=555653
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditor/src/plugintest/java/org/apache/uima/caseditor/core/test/DefectiveNlpModelTest.java (original)
+++ incubator/uima/sandbox/trunk/CasEditor/src/plugintest/java/org/apache/uima/caseditor/core/test/DefectiveNlpModelTest.java Thu Jul 12 08:02:06 2007
@@ -98,7 +98,7 @@
mProject.getDocument().setContents(new ByteArrayInputStream(new byte[0]), true, true, null);
assertTrue(((DocumentElement) CasEditorPlugin.getNlpModel().findMember(mProject.getDocument()))
- .getCAS() == null);
+ .getDocument().getCAS() == null);
}
@Test
Modified: incubator/uima/sandbox/trunk/CasEditor/src/plugintest/java/org/apache/uima/caseditor/core/test/TestProject.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditor/src/plugintest/java/org/apache/uima/caseditor/core/test/TestProject.java?view=diff&rev=555653&r1=555652&r2=555653
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditor/src/plugintest/java/org/apache/uima/caseditor/core/test/TestProject.java (original)
+++ incubator/uima/sandbox/trunk/CasEditor/src/plugintest/java/org/apache/uima/caseditor/core/test/TestProject.java Thu Jul 12 08:02:06 2007
@@ -171,7 +171,7 @@
DotCorpus dotCorpus = new DotCorpus();
dotCorpus.addCorpusFolder(mCorpusFolder.getName());
- dotCorpus.setUimaConfigFolderName(mSourceFolder.getName());
+ dotCorpus.addCasProcessorFolder(mSourceFolder.getName());
dotCorpus.setTypeSystemFilename(mTypesystem.getName());
ByteArrayOutputStream out = new ByteArrayOutputStream();
Modified: incubator/uima/sandbox/trunk/CasEditor/src/test/java/org/apache/uima/caseditor/core/model/dotcorpus/AnnotationStyleTest.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditor/src/test/java/org/apache/uima/caseditor/core/model/dotcorpus/AnnotationStyleTest.java?view=diff&rev=555653&r1=555652&r2=555653
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditor/src/test/java/org/apache/uima/caseditor/core/model/dotcorpus/AnnotationStyleTest.java (original)
+++ incubator/uima/sandbox/trunk/CasEditor/src/test/java/org/apache/uima/caseditor/core/model/dotcorpus/AnnotationStyleTest.java Thu Jul 12 08:02:06 2007
@@ -21,9 +21,9 @@
import static org.junit.Assert.assertEquals;
+import java.awt.Color;
+
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.RGB;
import org.junit.Test;
/**
@@ -35,9 +35,9 @@
*/
@Test
public void testEquals() {
- AnnotationStyle a = new AnnotationStyle("testType", AnnotationStyle.Style.BRACKET, new Color(null, 255, 255, 0));
+ AnnotationStyle a = new AnnotationStyle("testType", AnnotationStyle.Style.BRACKET, new Color(255, 255, 0));
- AnnotationStyle b = new AnnotationStyle("testType", AnnotationStyle.Style.BRACKET, new Color(null, 255, 255, 0));
+ AnnotationStyle b = new AnnotationStyle("testType", AnnotationStyle.Style.BRACKET, new Color(255, 255, 0));
assertEquals(a, b);
}
@@ -47,9 +47,9 @@
*
*/
public void testHashCode() {
- AnnotationStyle a = new AnnotationStyle("testType", AnnotationStyle.Style.BRACKET, new Color(null, 255, 255, 0));
+ AnnotationStyle a = new AnnotationStyle("testType", AnnotationStyle.Style.BRACKET, new Color(255, 255, 0));
- AnnotationStyle b = new AnnotationStyle("testType", AnnotationStyle.Style.BRACKET, new Color(null, 255, 255, 0));
+ AnnotationStyle b = new AnnotationStyle("testType", AnnotationStyle.Style.BRACKET, new Color(255, 255, 0));
assertEquals(a.hashCode(), b.hashCode());
}
Modified: incubator/uima/sandbox/trunk/CasEditor/src/test/java/org/apache/uima/caseditor/core/model/dotcorpus/DotCorpusSerializerTest.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditor/src/test/java/org/apache/uima/caseditor/core/model/dotcorpus/DotCorpusSerializerTest.java?view=diff&rev=555653&r1=555652&r2=555653
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditor/src/test/java/org/apache/uima/caseditor/core/model/dotcorpus/DotCorpusSerializerTest.java (original)
+++ incubator/uima/sandbox/trunk/CasEditor/src/test/java/org/apache/uima/caseditor/core/model/dotcorpus/DotCorpusSerializerTest.java Thu Jul 12 08:02:06 2007
@@ -21,13 +21,13 @@
import static org.junit.Assert.assertEquals;
+import java.awt.Color;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import org.apache.uima.caseditor.core.model.dotcorpus.AnnotationStyle.Style;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.swt.graphics.Color;
import org.junit.Test;
/**
@@ -44,7 +44,7 @@
DotCorpus original = new DotCorpus();
original.setTypeSystemFilename("typesystem");
original.addCasProcessorFolder("uima processor folder");
- original.setStyle(new AnnotationStyle("test", Style.BRACKET, new Color(null, 255, 255, 0)));
+ original.setStyle(new AnnotationStyle("test", Style.BRACKET, new Color(255, 255, 0)));
original.addCorpusFolder("corpus");
ByteArrayOutputStream out = new ByteArrayOutputStream();