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 2009/05/22 11:25:41 UTC
svn commit: r777438 - in
/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor:
core/model/ core/model/dotcorpus/ editor/ editor/fsview/ editor/outline/
editor/util/
Author: joern
Date: Fri May 22 09:25:24 2009
New Revision: 777438
URL: http://svn.apache.org/viewvc?rev=777438&view=rev
Log:
UIMA-546: Fixed findbugs errors
Modified:
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/core/model/DefaultColors.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/core/model/DotCorpusElement.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/core/model/NlpProject.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/core/model/dotcorpus/DotCorpus.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/AnnotationDocument.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/AnnotationStyle.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserViewPage.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationTreeNode.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/util/AnnotationComparator.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/util/ContainingConstraint.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/util/IDGenerator.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/util/StrictTypeConstraint.java
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/core/model/DefaultColors.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/core/model/DefaultColors.java?rev=777438&r1=777437&r2=777438&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/core/model/DefaultColors.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/core/model/DefaultColors.java Fri May 22 09:25:24 2009
@@ -110,9 +110,9 @@
newStyles.add(style);
}
- for (String typeName : typeNameToColorMap.keySet()) {
- newStyles.add(new AnnotationStyle(typeName, AnnotationStyle.Style.BACKGROUND,
- typeNameToColorMap.get(typeName), 0));
+ for (Map.Entry<String, Color> entry : typeNameToColorMap.entrySet()) {
+ newStyles.add(new AnnotationStyle(entry.getKey(), AnnotationStyle.Style.BACKGROUND,
+ entry.getValue(), 0));
}
return Collections.unmodifiableSet(newStyles);
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/core/model/DotCorpusElement.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/core/model/DotCorpusElement.java?rev=777438&r1=777437&r2=777438&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/core/model/DotCorpusElement.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/core/model/DotCorpusElement.java Fri May 22 09:25:24 2009
@@ -289,6 +289,14 @@
}
/**
+ * Always returns hash code 0.
+ */
+ @Override
+ public int hashCode() {
+ return 0;
+ }
+
+ /**
* Test for equality with another object.
*/
@Override
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/core/model/NlpProject.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/core/model/NlpProject.java?rev=777438&r1=777437&r2=777438&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/core/model/NlpProject.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/core/model/NlpProject.java Fri May 22 09:25:24 2009
@@ -194,9 +194,7 @@
private void loadDotCorpus() {
IResource dotCorpusResource = getProject().getFile(DOT_CORPUS_FILENAME);
- if (dotCorpusResource instanceof IFile) {
- mDotCorpusElement = DotCorpusElement.createDotCorpus((IFile) dotCorpusResource, this);
- }
+ mDotCorpusElement = DotCorpusElement.createDotCorpus((IFile) dotCorpusResource, this);
// TODO: What happens when there is a folder with the name ".corpus"
// then load default .corpus ...
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/core/model/dotcorpus/DotCorpus.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/core/model/dotcorpus/DotCorpus.java?rev=777438&r1=777437&r2=777438&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/core/model/dotcorpus/DotCorpus.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/core/model/dotcorpus/DotCorpus.java Fri May 22 09:25:24 2009
@@ -204,6 +204,14 @@
}
/**
+ * Always returns hash code 0.
+ */
+ @Override
+ public int hashCode() {
+ return 0;
+ }
+
+ /**
* Checks if the given object is equal to the current instance.
*/
@Override
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/AnnotationDocument.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/AnnotationDocument.java?rev=777438&r1=777437&r2=777438&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/AnnotationDocument.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/AnnotationDocument.java Fri May 22 09:25:24 2009
@@ -242,7 +242,7 @@
for (int i = 0; i < text.length; i++) {
- if (text[i] == '\r' | text[i] == '\n') {
+ if (text[i] == '\r' || text[i] == '\n') {
charCounter = 0;
}
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java?rev=777438&r1=777437&r2=777438&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java Fri May 22 09:25:24 2009
@@ -187,14 +187,12 @@
* Initializes a new instance.
*/
ShowAnnotationContextEditAction() {
- if (mPresenter == null) {
- mPresenter = new InformationPresenter(new AnnotationEditingControlCreator());
+ mPresenter = new InformationPresenter(new AnnotationEditingControlCreator());
- mPresenter.setInformationProvider(new AnnotationInformationProvider(AnnotationEditor.this),
- org.eclipse.jface.text.IDocument.DEFAULT_CONTENT_TYPE);
- mPresenter.setDocumentPartitioning(org.eclipse.jface.text.IDocument.DEFAULT_CONTENT_TYPE);
- mPresenter.install(getSourceViewer());
- }
+ mPresenter.setInformationProvider(new AnnotationInformationProvider(AnnotationEditor.this),
+ org.eclipse.jface.text.IDocument.DEFAULT_CONTENT_TYPE);
+ mPresenter.setDocumentPartitioning(org.eclipse.jface.text.IDocument.DEFAULT_CONTENT_TYPE);
+ mPresenter.install(getSourceViewer());
}
/**
@@ -428,7 +426,7 @@
* Listens for resource remove/delete event, if the input file for the
* editor is removed the editor will be closed.
*/
- private class CloseEditorListener implements IResourceChangeListener {
+ private static class CloseEditorListener implements IResourceChangeListener {
private AnnotationEditor editor;
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/AnnotationStyle.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/AnnotationStyle.java?rev=777438&r1=777437&r2=777438&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/AnnotationStyle.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/AnnotationStyle.java Fri May 22 09:25:24 2009
@@ -166,7 +166,7 @@
} else if (object instanceof AnnotationStyle) {
AnnotationStyle style = (AnnotationStyle) object;
- isEqual = annotation.equals(style.annotation) && style.style.equals(style.style)
+ isEqual = annotation.equals(style.annotation) && this.style.equals(style.style)
&& color.equals(style.color) && layer == style.layer;
} else {
isEqual = false;
@@ -194,4 +194,4 @@
annotationStyle += " Layer: " + getLayer();
return annotationStyle;
}
-}
\ No newline at end of file
+}
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserViewPage.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserViewPage.java?rev=777438&r1=777437&r2=777438&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserViewPage.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserViewPage.java Fri May 22 09:25:24 2009
@@ -144,11 +144,6 @@
} else if (parentElement instanceof FeatureValue) {
FeatureValue value = (FeatureValue) parentElement;
- if (parentElement instanceof StringArray) {
- StringArray array = (StringArray) parentElement;
- return array.toArray();
- }
-
featureStructure = (FeatureStructure) value.getValue();
} else {
assert false : "Unexpected element!";
@@ -159,15 +154,7 @@
Type type = featureStructure.getType();
for (Feature feature : type.getFeatures()) {
-
- if (feature.getRange().isPrimitive()) {
- // create a new pair
- // feature and value
- // add string
- childs.add(new FeatureValue(mDocument, featureStructure, feature));
- } else {
- childs.add(new FeatureValue(mDocument, featureStructure, feature));
- }
+ childs.add(new FeatureValue(mDocument, featureStructure, feature));
}
assert childs.size() > 0;
@@ -516,4 +503,4 @@
public void setFocus() {
mInstanceComposite.setFocus();
}
-}
\ No newline at end of file
+}
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationTreeNode.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationTreeNode.java?rev=777438&r1=777437&r2=777438&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationTreeNode.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationTreeNode.java Fri May 22 09:25:24 2009
@@ -33,11 +33,11 @@
public class AnnotationTreeNode implements IAdaptable {
private AnnotationTreeNode mParent;
- private AnnotationTreeNodeList mChildren;
+ private final AnnotationTreeNodeList mChildren;
- private AnnotationFS mAnnotation;
+ private final AnnotationFS mAnnotation;
- private ICasDocument mDocument;
+ private final ICasDocument mDocument;
AnnotationTreeNode(ICasDocument document, AnnotationFS annotation) {
Assert.isNotNull(document);
@@ -97,32 +97,29 @@
@Override
public int hashCode() {
- final int PRIME = 31;
- int result = 1;
- result = PRIME * result + (mAnnotation == null ? 0 : mAnnotation.hashCode());
- result = PRIME * result + (mChildren == null ? 0 : mChildren.hashCode());
- result = PRIME * result + (mParent == null ? 0 : mParent.hashCode());
+
+// final int PRIME = 31;
+// int result = 1;
+// result = PRIME * result + (mAnnotation == null ? 0 : mAnnotation.hashCode());
+// result = PRIME * result + (mChildren == null ? 0 : mChildren.hashCode());
+// result = PRIME * result + (mParent == null ? 0 : mParent.hashCode());
+
return mAnnotation.hashCode();
}
@Override
public boolean equals(Object obj) {
- if (getClass() != obj.getClass()) {
+
+ if (this == obj) {
+ return true;
+ }
+ else if (obj instanceof AnnotationTreeNode) {
+ AnnotationTreeNode other = (AnnotationTreeNode) obj;
+
+ return other.getAnnotation().equals(mAnnotation);
+ }
+ else {
return false;
}
-
- final AnnotationTreeNode other = (AnnotationTreeNode) obj;
-
- /*
- * if (this == obj) return true; if (!super.equals(obj)) return false; if (getClass() !=
- * obj.getClass()) return false; final AnnotationTreeNode other = (AnnotationTreeNode) obj; if
- * (mAnnotation == null) { if (other.mAnnotation != null) return false; } else if
- * (!mAnnotation.equals(other.mAnnotation)) return false; if (mChildren == null) { if
- * (other.mChildren != null) return false; } else if (!mChildren.equals(other.mChildren)) return
- * false; if (mParent == null) { if (other.mParent != null) return false; } else if
- * (!mParent.equals(other.mParent)) return false;
- */
- return other.getAnnotation().equals(mAnnotation);
}
-
-}
\ No newline at end of file
+}
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/util/AnnotationComparator.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/util/AnnotationComparator.java?rev=777438&r1=777437&r2=777438&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/util/AnnotationComparator.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/util/AnnotationComparator.java Fri May 22 09:25:24 2009
@@ -19,6 +19,7 @@
package org.apache.uima.caseditor.editor.util;
+import java.io.Serializable;
import java.util.Comparator;
import org.apache.uima.cas.text.AnnotationFS;
@@ -26,11 +27,14 @@
/**
* Checks two annotations for equality.
*/
-public class AnnotationComparator implements Comparator<AnnotationFS> {
+public class AnnotationComparator implements Comparator<AnnotationFS>, Serializable {
+
+ private static final long serialVersionUID = 1L;
+
/**
* Compares the given annotations a and b. This implementations only compares the begin index.
*/
public int compare(AnnotationFS a, AnnotationFS b) {
return a.getBegin() - b.getBegin();
}
-}
\ No newline at end of file
+}
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/util/ContainingConstraint.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/util/ContainingConstraint.java?rev=777438&r1=777437&r2=777438&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/util/ContainingConstraint.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/util/ContainingConstraint.java Fri May 22 09:25:24 2009
@@ -27,15 +27,17 @@
import org.apache.uima.cas.text.AnnotationFS;
/**
- * TODO: add javadoc here
+ * Filters out all annotations which are not contained by one of the provided
+ * annotations.
*/
public class ContainingConstraint implements FSMatchConstraint {
+
private static final long serialVersionUID = 1;
- transient private Collection<AnnotationFS> mContainingAnnotations = new LinkedList<AnnotationFS>();
+ private Collection<AnnotationFS> mContainingAnnotations = new LinkedList<AnnotationFS>();
/**
- * Adds an annoation in which the an other annotations must be containded to match this
+ * Adds an annotation in which the an other annotations must be contained to match this
* constraint.
*
* @param containingAnnotation
@@ -45,7 +47,7 @@
}
/**
- * Checks if the given FeatureStructure is inside the a containing annoation.
+ * Checks if the given FeatureStructure is inside the a containing annotation.
*/
public boolean match(FeatureStructure featureStructure) {
boolean result = false;
@@ -76,4 +78,4 @@
return isContaining;
}
-}
\ No newline at end of file
+}
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/util/IDGenerator.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/util/IDGenerator.java?rev=777438&r1=777437&r2=777438&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/util/IDGenerator.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/util/IDGenerator.java Fri May 22 09:25:24 2009
@@ -36,7 +36,7 @@
/**
* The unique id that will be incremented.
*/
- private long sUniqueID = sStartValue + 1;
+ private long sUniqueID;
/**
* The singleton instance.
@@ -44,15 +44,16 @@
private static IDGenerator sIdGeneratorInstance;
/**
- * Call <code>IDGenerator.getInstance()</code> to retrive an instance of this class. Must not be
- * instanciated outside this class, singleton pattern.
+ * Call <code>IDGenerator.getInstance()</code> to retrieve an instance of this class. Must not be
+ * instantiated outside this class, singleton pattern.
*/
private IDGenerator() {
sStartValue = new Random().nextLong();
+ sUniqueID = sStartValue + 1;
}
/**
- * Retrive the next unique ID.
+ * Retrieve the next unique ID.
*
* @throws IllegalStateException -
* if there are more than Long.MAX_VALUE calls to
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/util/StrictTypeConstraint.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/util/StrictTypeConstraint.java?rev=777438&r1=777437&r2=777438&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/util/StrictTypeConstraint.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/util/StrictTypeConstraint.java Fri May 22 09:25:24 2009
@@ -42,9 +42,9 @@
}
/**
- * Chekcs if the given {@link FeatureStructure} matchs this constraint.
+ * Checks if the given {@link FeatureStructure} matchs this constraint.
*/
public boolean match(FeatureStructure candidateFS) {
return candidateFS.getType().getName().equals(mMatch.getName());
}
-}
\ No newline at end of file
+}