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/02 00:07:03 UTC

svn commit: r1041207 - /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationStyle.java

Author: joern
Date: Wed Dec  1 23:07:02 2010
New Revision: 1041207

URL: http://svn.apache.org/viewvc?rev=1041207&view=rev
Log:
UIMA-1875 Fixed bug in equals method, which failed the test case

Modified:
    uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationStyle.java

Modified: uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationStyle.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationStyle.java?rev=1041207&r1=1041206&r2=1041207&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationStyle.java (original)
+++ uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationStyle.java Wed Dec  1 23:07:02 2010
@@ -181,7 +181,7 @@ public final class AnnotationStyle {
       AnnotationStyle style = (AnnotationStyle) object;
       
       boolean isConfigEqual = configuration == style.configuration ||
-          configuration != null ? false : configuration.equals(style.configuration);
+          (configuration != null ? false : configuration.equals(style.configuration));
       
       isEqual = annotation.equals(style.annotation) && this.style.equals(style.style)
               && color.equals(style.color) && layer == style.layer && isConfigEqual;