Author: joern
Date: Tue Dec 4 15:04:02 2018
New Revision: 1848160
URL: http://svn.apache.org/viewvc?rev=1848160&view=rev
Log:
UIMA-5925: Fix null error in AnnotationStyle.equals
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationStyle.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/test/java/org/apache/uima/caseditor/core/model/dotcorpus/AnnotationStyleTest.java
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationStyle.java
URL:
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationStyle.java?rev=1848160&r1=1848159&r2=1848160&view=diff
==============================================================================
---
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationStyle.java
(original)
+++
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationStyle.java
Tue Dec 4 15:04:02 2018
@@ -22,6 +22,7 @@ package org.apache.uima.caseditor.editor
import java.awt.Color;
import java.util.HashMap;
import java.util.Map;
+import java.util.Objects;
import org.apache.uima.caseditor.core.model.DefaultColors;
import org.eclipse.jface.preference.IPreferenceStore;
@@ -209,9 +210,8 @@ public final class AnnotationStyle {
} else if (object instanceof AnnotationStyle) {
AnnotationStyle style = (AnnotationStyle) object;
- boolean isConfigEqual = configuration == style.configuration ||
- (configuration != null ? false :
configuration.equals(style.configuration));
-
+ boolean isConfigEqual = Objects.equals(configuration,
style.configuration);
+
isEqual = annotation.equals(style.annotation) &&
this.style.equals(style.style)
&& color.equals(style.color) && layer == style.layer &&
isConfigEqual;
} else {
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/test/java/org/apache/uima/caseditor/core/model/dotcorpus/AnnotationStyleTest.java
URL:
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/test/java/org/apache/uima/caseditor/core/model/dotcorpus/AnnotationStyleTest.java?rev=1848160&r1=1848159&r2=1848160&view=diff
==============================================================================
---
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/test/java/org/apache/uima/caseditor/core/model/dotcorpus/AnnotationStyleTest.java
(original)
+++
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/test/java/org/apache/uima/caseditor/core/model/dotcorpus/AnnotationStyleTest.java
Tue Dec 4 15:04:02 2018
@@ -19,13 +19,14 @@
package org.apache.uima.caseditor.core.model.dotcorpus;
-import static org.junit.Assert.assertEquals;
-
import java.awt.Color;
import org.apache.uima.caseditor.editor.AnnotationStyle;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
/**
* Unit test for the {@link AnnotationStyle} class.
*/
@@ -42,6 +43,11 @@ public class AnnotationStyleTest {
255, 255, 0), 0);
assertEquals(a, b);
+
+ AnnotationStyle c = new AnnotationStyle("testType",
AnnotationStyle.Style.BRACKET, new Color(
+ 255, 255, 0), 0, "config");
+
+ assertNotEquals(a, c);
}
/**
