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 2008/11/04 23:17:18 UTC
svn commit: r711448 - in
/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin: ./ META-INF/
main/java/src/org/apache/uima/caseditor/ src/ src/main/ src/main/java/
src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/uima/
src/main/java...
Author: joern
Date: Tue Nov 4 14:17:16 2008
New Revision: 711448
URL: http://svn.apache.org/viewvc?rev=711448&view=rev
Log:
UIMA-1178: Also moved tests and changed src folder to maven default
Added:
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/
- copied from r711402, incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/main/java/src/org/apache/uima/caseditor/
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/ICasDocument.java (contents, props changed)
- copied, changed from r711402, incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/main/java/src/org/apache/uima/caseditor/editor/IDocument.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/ICasDocumentListener.java (contents, props changed)
- copied, changed from r711402, incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/main/java/src/org/apache/uima/caseditor/editor/IDocumentListener.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/util/AnnotationSelection.java (contents, props changed)
- copied, changed from r711402, incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/main/java/src/org/apache/uima/caseditor/editor/AnnotationSelection.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/test/
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/test/java/
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/test/java/org/
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/test/java/org/apache/
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/test/java/org/apache/uima/
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/test/java/org/apache/uima/caseditor/
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/test/java/org/apache/uima/caseditor/editor/
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/test/java/org/apache/uima/caseditor/editor/AnnotationStyleTest.java (contents, props changed)
- copied, changed from r709279, incubator/uima/sandbox/trunk/CasEditor/src/test/java/org/apache/uima/caseditor/core/model/dotcorpus/AnnotationStyleTest.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/test/java/org/apache/uima/caseditor/editor/util/
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/test/java/org/apache/uima/caseditor/editor/util/SpanTest.java
Removed:
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/main/java/src/org/apache/uima/caseditor/
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/AnnotationSelection.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/IDocument.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/IDocumentListener.java
Modified:
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/.classpath
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/META-INF/MANIFEST.MF
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/AbstractDocument.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/AbstractDocumentListener.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/CasDocumentProvider.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/CasEditorPlugin.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/DocumentUimaImpl.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/FeatureStructureSelectionProvider.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/ModelFeatureStructure.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/action/DeleteFeatureStructureAction.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/action/LowerLeftAnnotationSideAction.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/action/LowerRightAnnotationSideAction.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/action/MergeAnnotationAction.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/action/WideLeftAnnotationSideAction.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/action/WideRightAnnotationSideAction.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationOutline.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/outline/AnnotationTreeNodeList.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/outline/OutlineContentProviderBase.java
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/.classpath
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/.classpath?rev=711448&r1=711447&r2=711448&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/.classpath (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/.classpath Tue Nov 4 14:17:16 2008
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="main/java/src"/>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="target/classes"/>
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/META-INF/MANIFEST.MF?rev=711448&r1=711447&r2=711448&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/META-INF/MANIFEST.MF (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/META-INF/MANIFEST.MF Tue Nov 4 14:17:16 2008
@@ -12,6 +12,7 @@
org.eclipse.jface.text;bundle-version="3.4.0",
org.eclipse.ui.workbench.texteditor;bundle-version="3.4.0",
org.eclipse.ui.views;bundle-version="3.3.0",
+ org.junit4;resolution:=optional,
org.eclipse.core.resources;bundle-version="3.4.1"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/AbstractDocument.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/AbstractDocument.java?rev=711448&r1=711402&r2=711448&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/AbstractDocument.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/AbstractDocument.java Tue Nov 4 14:17:16 2008
@@ -37,18 +37,18 @@
/**
* Abstract base class for document implementations.
*/
-public abstract class AbstractDocument implements IDocument {
+public abstract class AbstractDocument implements ICasDocument {
/**
* Contains the change listener objects.
*/
- private Set<IDocumentListener> mListener = new HashSet<IDocumentListener>();
+ private Set<ICasDocumentListener> mListener = new HashSet<ICasDocumentListener>();
/**
* Registers a change listener.
*
* @param listener
*/
- public void addChangeListener(final IDocumentListener listener) {
+ public void addChangeListener(final ICasDocumentListener listener) {
mListener.add(listener);
}
@@ -57,7 +57,7 @@
*
* @param listener
*/
- public void removeChangeListener(IDocumentListener listener) {
+ public void removeChangeListener(ICasDocumentListener listener) {
mListener.remove(listener);
}
@@ -88,7 +88,7 @@
* @param annotation
*/
protected void fireAddedAnnotation(FeatureStructure annotation) {
- for (IDocumentListener listener : mListener) {
+ for (ICasDocumentListener listener : mListener) {
listener.added(annotation);
}
}
@@ -99,7 +99,7 @@
* @param annotations
*/
protected void fireAddedAnnotation(Collection<FeatureStructure> annotations) {
- for (IDocumentListener listener : mListener) {
+ for (ICasDocumentListener listener : mListener) {
listener.added(Collections.unmodifiableCollection(annotations));
}
}
@@ -110,7 +110,7 @@
* @param annotation
*/
protected void fireRemovedAnnotation(FeatureStructure annotation) {
- for (IDocumentListener listener : mListener) {
+ for (ICasDocumentListener listener : mListener) {
listener.removed(annotation);
}
}
@@ -121,7 +121,7 @@
* @param annotations
*/
protected void fireRemovedAnnotations(Collection<FeatureStructure> annotations) {
- for (IDocumentListener listener : mListener) {
+ for (ICasDocumentListener listener : mListener) {
listener.removed(Collections.unmodifiableCollection(annotations));
}
}
@@ -132,7 +132,7 @@
* @param annotation
*/
protected void fireUpdatedFeatureStructure(FeatureStructure annotation) {
- for (IDocumentListener listener : mListener) {
+ for (ICasDocumentListener listener : mListener) {
listener.updated(annotation);
}
}
@@ -143,13 +143,13 @@
* @param annotations
*/
protected void fireUpdatedFeatureStructures(Collection<FeatureStructure> annotations) {
- for (IDocumentListener listener : mListener) {
+ for (ICasDocumentListener listener : mListener) {
listener.updated(Collections.unmodifiableCollection(annotations));
}
}
protected void fireChanged() {
- for (IDocumentListener listener : mListener) {
+ for (ICasDocumentListener listener : mListener) {
listener.changed();
}
}
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/AbstractDocumentListener.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/AbstractDocumentListener.java?rev=711448&r1=711402&r2=711448&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/AbstractDocumentListener.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/AbstractDocumentListener.java Tue Nov 4 14:17:16 2008
@@ -27,7 +27,7 @@
/**
* TODO: add javadoc here
*/
-public abstract class AbstractDocumentListener implements IDocumentListener {
+public abstract class AbstractDocumentListener implements ICasDocumentListener {
/**
* Forwards the call.
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=711448&r1=711402&r2=711448&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 Tue Nov 4 14:17:16 2008
@@ -36,8 +36,8 @@
*
* Note: Before an instance can be used, the project and document must be set.
*/
-public class AnnotationDocument extends Document implements IDocument {
- private IDocument mDocument;
+public class AnnotationDocument extends Document implements ICasDocument {
+ private ICasDocument mDocument;
// private NlpProject mProject;
@@ -56,7 +56,7 @@
/**
* @param element
*/
- public void setDocument(IDocument element) {
+ public void setDocument(ICasDocument element) {
mDocument = element;
set(getText());
@@ -211,7 +211,7 @@
*
* @param listener
*/
- public void addChangeListener(IDocumentListener listener) {
+ public void addChangeListener(ICasDocumentListener listener) {
mDocument.addChangeListener(listener);
}
@@ -220,7 +220,7 @@
*
* @param listener
*/
- public void removeChangeListener(IDocumentListener listener) {
+ public void removeChangeListener(ICasDocumentListener listener) {
mDocument.removeChangeListener(listener);
}
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=711448&r1=711402&r2=711448&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 Tue Nov 4 14:17:16 2008
@@ -40,6 +40,7 @@
import org.apache.uima.caseditor.editor.contextmenu.ShowAnnotationsMenu;
import org.apache.uima.caseditor.editor.outline.AnnotationOutline;
import org.apache.uima.caseditor.editor.util.AnnotationComparator;
+import org.apache.uima.caseditor.editor.util.AnnotationSelection;
import org.apache.uima.caseditor.editor.util.FeatureStructureTransfer;
import org.apache.uima.caseditor.editor.util.Span;
import org.eclipse.core.runtime.CoreException;
@@ -934,7 +935,7 @@
// remove selection listener
getSite().getWorkbenchWindow().getSelectionService().removeSelectionListener(this);
- IDocument document = getDocument();
+ ICasDocument document = getDocument();
if (document != null) {
document.removeChangeListener(mAnnotationSynchronizer);
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/CasDocumentProvider.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/CasDocumentProvider.java?rev=711448&r1=711402&r2=711448&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/CasDocumentProvider.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/CasDocumentProvider.java Tue Nov 4 14:17:16 2008
@@ -39,7 +39,7 @@
import org.eclipse.ui.texteditor.AbstractDocumentProvider;
/**
- * Provides the {@link org.apache.uima.caseditor.editor.IDocument} for
+ * Provides the {@link org.apache.uima.caseditor.editor.ICasDocument} for
* the {@link AnnotationEditor}.
*/
public abstract class CasDocumentProvider extends AbstractDocumentProvider {
@@ -58,7 +58,7 @@
protected IAnnotationModel createAnnotationModel(Object element) throws CoreException {
return new IAnnotationModel() {
- private org.apache.uima.caseditor.editor.IDocument mDocument;
+ private org.apache.uima.caseditor.editor.ICasDocument mDocument;
public void addAnnotation(Annotation annotation, Position position) {
}
@@ -67,7 +67,7 @@
}
public void connect(IDocument document) {
- mDocument = (org.apache.uima.caseditor.editor.IDocument) document;
+ mDocument = (org.apache.uima.caseditor.editor.ICasDocument) document;
}
public void disconnect(IDocument document) {
@@ -119,23 +119,8 @@
@Override
protected abstract void doSaveDocument(IProgressMonitor monitor,
- Object element, IDocument document, boolean overwrite) throws CoreException;
-// {
-// fireElementStateChanging(element);
-//
-// org.apache.uima.caseditor.editor.IDocument casDocument =
-// (org.apache.uima.caseditor.editor.IDocument) document;
-//
-// try {
-// casDocument.save();
-// }
-// catch (CoreException e) {
-// fireElementStateChangeFailed(element);
-// throw e;
-// }
-//
-// fireElementDirtyStateChanged(element, false);
-// }
+ Object element, IDocument document, boolean overwrite) throws CoreException;
+
@Override
protected IRunnableContext getOperationRunner(IProgressMonitor monitor) {
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/CasEditorPlugin.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/CasEditorPlugin.java?rev=711448&r1=711402&r2=711448&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/CasEditorPlugin.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/CasEditorPlugin.java Tue Nov 4 14:17:16 2008
@@ -32,7 +32,7 @@
* TODO: add javadoc here
*/
public class CasEditorPlugin extends AbstractUIPlugin {
- public static final String ID = "org.apache.uima.caseditor";
+ public static final String ID = "org.apache.uima.caseditor.editor";
private static final String ICONS_PATH = "icons/";
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/DocumentUimaImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/DocumentUimaImpl.java?rev=711448&r1=711402&r2=711448&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/DocumentUimaImpl.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/DocumentUimaImpl.java Tue Nov 4 14:17:16 2008
@@ -373,12 +373,4 @@
"Unkown file format!", null));
}
}
-
-// public DocumentElement getDocumentElement() {
-// return mDocumentElement;
-// }
-//
-// public void save() throws CoreException {
-// getDocumentElement().saveDocument();
-// }
}
\ No newline at end of file
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/FeatureStructureSelectionProvider.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/FeatureStructureSelectionProvider.java?rev=711448&r1=711402&r2=711448&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/FeatureStructureSelectionProvider.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/FeatureStructureSelectionProvider.java Tue Nov 4 14:17:16 2008
@@ -97,7 +97,7 @@
*
* @param annotation
*/
- public void setSelection(IDocument document, AnnotationFS annotation) {
+ public void setSelection(ICasDocument document, AnnotationFS annotation) {
if (annotation == null) {
throw new IllegalArgumentException("annotation must not be null!");
}
@@ -105,7 +105,7 @@
setSelection(new StructuredSelection(new ModelFeatureStructure(document, annotation)));
}
- public void setSelection(IDocument document, List<AnnotationFS> selection) {
+ public void setSelection(ICasDocument document, List<AnnotationFS> selection) {
setSelection(new StructuredSelection(ModelFeatureStructure.create(document, selection)));
}
Copied: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/ICasDocument.java (from r711402, incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/main/java/src/org/apache/uima/caseditor/editor/IDocument.java)
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/ICasDocument.java?p2=incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/ICasDocument.java&p1=incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/main/java/src/org/apache/uima/caseditor/editor/IDocument.java&r1=711402&r2=711448&rev=711448&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/main/java/src/org/apache/uima/caseditor/editor/IDocument.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/ICasDocument.java Tue Nov 4 14:17:16 2008
@@ -29,9 +29,9 @@
import org.apache.uima.caseditor.editor.util.Span;
/**
- * The {@link IDocument} represents texts with meta information.
+ * The {@link ICasDocument} represents texts with meta information.
*
- * A {@link IDocument} allows manipulation of its meta information
+ * A {@link ICasDocument} allows manipulation of its meta information
* the text must not be changed.
*
* Meta information can be retrieved over the {@link CAS} object.
@@ -39,23 +39,23 @@
* Note: All changes to meta information should be done with
* calls to the manipulation methods of the document.
* If this is not possible, change the {@link CAS} and after
- * the change call the {@link IDocument#changed()} method.
+ * the change call the {@link ICasDocument#changed()} method.
*/
-public interface IDocument {
+public interface ICasDocument {
/**
* Adds a given change listener.
*
* @param listener
*/
- void addChangeListener(IDocumentListener listener);
+ void addChangeListener(ICasDocumentListener listener);
/**
* Removes the given change listener.
*
* @param listener
*/
- void removeChangeListener(IDocumentListener listener);
+ void removeChangeListener(ICasDocumentListener listener);
/**
* Retrieves the CAS.
Propchange: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/ICasDocument.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/ICasDocumentListener.java (from r711402, incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/main/java/src/org/apache/uima/caseditor/editor/IDocumentListener.java)
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/ICasDocumentListener.java?p2=incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/ICasDocumentListener.java&p1=incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/main/java/src/org/apache/uima/caseditor/editor/IDocumentListener.java&r1=711402&r2=711448&rev=711448&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/main/java/src/org/apache/uima/caseditor/editor/IDocumentListener.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/ICasDocumentListener.java Tue Nov 4 14:17:16 2008
@@ -26,7 +26,7 @@
/**
* This interface is used to notifies clients about {@link FeatureStructure} changes.
*/
-public interface IDocumentListener {
+public interface ICasDocumentListener {
/**
* This method is called if an {@link FeatureStructure} is added.
*
Propchange: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/ICasDocumentListener.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/ModelFeatureStructure.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/ModelFeatureStructure.java?rev=711448&r1=711402&r2=711448&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/ModelFeatureStructure.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/ModelFeatureStructure.java Tue Nov 4 14:17:16 2008
@@ -35,7 +35,7 @@
* create feature value structure
*/
public class ModelFeatureStructure implements IAdaptable {
- private IDocument mDocument;
+ private ICasDocument mDocument;
private FeatureStructure mFeatureStructre;
@@ -45,12 +45,12 @@
* @param document
* @param featureStructre
*/
- public ModelFeatureStructure(IDocument document, FeatureStructure featureStructre) {
+ public ModelFeatureStructure(ICasDocument document, FeatureStructure featureStructre) {
mDocument = document;
mFeatureStructre = featureStructre;
}
- public IDocument getDocument() {
+ public ICasDocument getDocument() {
return mDocument;
}
@@ -75,7 +75,7 @@
}
- public static List<ModelFeatureStructure> create(IDocument document,
+ public static List<ModelFeatureStructure> create(ICasDocument document,
List<AnnotationFS> annotations) {
List<ModelFeatureStructure> structres = new ArrayList<ModelFeatureStructure>(annotations.size());
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/action/DeleteFeatureStructureAction.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/action/DeleteFeatureStructureAction.java?rev=711448&r1=711402&r2=711448&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/action/DeleteFeatureStructureAction.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/action/DeleteFeatureStructureAction.java Tue Nov 4 14:17:16 2008
@@ -21,7 +21,7 @@
import org.apache.uima.caseditor.editor.FeatureStructureSelection;
-import org.apache.uima.caseditor.editor.IDocument;
+import org.apache.uima.caseditor.editor.ICasDocument;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.actions.BaseSelectionListenerAction;
@@ -29,14 +29,14 @@
* Deletes all selected annotations.
*/
public class DeleteFeatureStructureAction extends BaseSelectionListenerAction {
- private IDocument mDocument;
+ private ICasDocument mDocument;
/**
* Initializes the current instance.
*
* @param document
*/
- public DeleteFeatureStructureAction(IDocument document) {
+ public DeleteFeatureStructureAction(ICasDocument document) {
super("DeleteAction");
mDocument = document;
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/action/LowerLeftAnnotationSideAction.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/action/LowerLeftAnnotationSideAction.java?rev=711448&r1=711402&r2=711448&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/action/LowerLeftAnnotationSideAction.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/action/LowerLeftAnnotationSideAction.java Tue Nov 4 14:17:16 2008
@@ -23,8 +23,8 @@
import org.apache.uima.cas.Feature;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.caseditor.editor.AnnotationSelection;
-import org.apache.uima.caseditor.editor.IDocument;
+import org.apache.uima.caseditor.editor.ICasDocument;
+import org.apache.uima.caseditor.editor.util.AnnotationSelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.actions.BaseSelectionListenerAction;
@@ -32,7 +32,7 @@
* Lowers the left side of the currently selected annotation by one.
*/
public final class LowerLeftAnnotationSideAction extends BaseSelectionListenerAction {
- private IDocument mDocument;
+ private ICasDocument mDocument;
/**
* Initializes a new instance.
@@ -40,7 +40,7 @@
* @param document
*
*/
- public LowerLeftAnnotationSideAction(IDocument document) {
+ public LowerLeftAnnotationSideAction(ICasDocument document) {
super("LowerLeftAnnotationSide");
mDocument = document;
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/action/LowerRightAnnotationSideAction.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/action/LowerRightAnnotationSideAction.java?rev=711448&r1=711402&r2=711448&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/action/LowerRightAnnotationSideAction.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/action/LowerRightAnnotationSideAction.java Tue Nov 4 14:17:16 2008
@@ -23,8 +23,8 @@
import org.apache.uima.cas.Feature;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.caseditor.editor.AnnotationSelection;
-import org.apache.uima.caseditor.editor.IDocument;
+import org.apache.uima.caseditor.editor.ICasDocument;
+import org.apache.uima.caseditor.editor.util.AnnotationSelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.actions.BaseSelectionListenerAction;
@@ -32,14 +32,14 @@
* Lowers the right side of the currently selected annotation by one.
*/
public final class LowerRightAnnotationSideAction extends BaseSelectionListenerAction {
- private IDocument mDocument;
+ private ICasDocument mDocument;
/**
* Initializes the current instance.
*
* @param document
*/
- public LowerRightAnnotationSideAction(IDocument document) {
+ public LowerRightAnnotationSideAction(ICasDocument document) {
super("LowerRightAnnotationSide");
mDocument = document;
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/action/MergeAnnotationAction.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/action/MergeAnnotationAction.java?rev=711448&r1=711402&r2=711448&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/action/MergeAnnotationAction.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/action/MergeAnnotationAction.java Tue Nov 4 14:17:16 2008
@@ -22,8 +22,8 @@
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.caseditor.editor.AnnotationSelection;
-import org.apache.uima.caseditor.editor.IDocument;
+import org.apache.uima.caseditor.editor.ICasDocument;
+import org.apache.uima.caseditor.editor.util.AnnotationSelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.actions.BaseSelectionListenerAction;
@@ -34,14 +34,14 @@
* in conflict case do nothing
*/
public class MergeAnnotationAction extends BaseSelectionListenerAction {
- private IDocument mDocument;
+ private ICasDocument mDocument;
/**
* Initializes the current instance.
*
* @param document
*/
- public MergeAnnotationAction(IDocument document) {
+ public MergeAnnotationAction(ICasDocument document) {
super("MergeAnnotationAction");
mDocument = document;
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/action/WideLeftAnnotationSideAction.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/action/WideLeftAnnotationSideAction.java?rev=711448&r1=711402&r2=711448&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/action/WideLeftAnnotationSideAction.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/action/WideLeftAnnotationSideAction.java Tue Nov 4 14:17:16 2008
@@ -23,8 +23,8 @@
import org.apache.uima.cas.Feature;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.caseditor.editor.AnnotationSelection;
-import org.apache.uima.caseditor.editor.IDocument;
+import org.apache.uima.caseditor.editor.ICasDocument;
+import org.apache.uima.caseditor.editor.util.AnnotationSelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.actions.BaseSelectionListenerAction;
@@ -32,14 +32,14 @@
* Widens the left side of the currently selected annotation by one.
*/
public final class WideLeftAnnotationSideAction extends BaseSelectionListenerAction {
- private IDocument mDocument;
+ private ICasDocument mDocument;
/**
* Initializes a new instance.
*
* @param document
*/
- public WideLeftAnnotationSideAction(IDocument document) {
+ public WideLeftAnnotationSideAction(ICasDocument document) {
super("WideLeftAnnotationSside");
mDocument = document;
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/action/WideRightAnnotationSideAction.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/action/WideRightAnnotationSideAction.java?rev=711448&r1=711402&r2=711448&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/action/WideRightAnnotationSideAction.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/action/WideRightAnnotationSideAction.java Tue Nov 4 14:17:16 2008
@@ -23,8 +23,8 @@
import org.apache.uima.cas.Feature;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.caseditor.editor.AnnotationSelection;
-import org.apache.uima.caseditor.editor.IDocument;
+import org.apache.uima.caseditor.editor.ICasDocument;
+import org.apache.uima.caseditor.editor.util.AnnotationSelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.actions.BaseSelectionListenerAction;
@@ -32,14 +32,14 @@
* Widens the right side of the currently selected annotation by one.
*/
public final class WideRightAnnotationSideAction extends BaseSelectionListenerAction {
- private IDocument mDocument;
+ private ICasDocument mDocument;
/**
* Initializes a new instance.
*
* @param document
*/
- public WideRightAnnotationSideAction(IDocument document) {
+ public WideRightAnnotationSideAction(ICasDocument document) {
super("WideRightAnnotationSide");
mDocument = document;
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationOutline.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationOutline.java?rev=711448&r1=711402&r2=711448&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationOutline.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationOutline.java Tue Nov 4 14:17:16 2008
@@ -26,7 +26,6 @@
import org.apache.uima.caseditor.editor.CasEditorPlugin;
import org.apache.uima.caseditor.editor.Images;
import org.apache.uima.caseditor.editor.AnnotationEditor;
-import org.apache.uima.caseditor.editor.AnnotationSelection;
import org.apache.uima.caseditor.editor.CasEditorError;
import org.apache.uima.caseditor.editor.IAnnotationEditorModifyListener;
import org.apache.uima.caseditor.editor.action.DeleteFeatureStructureAction;
@@ -35,6 +34,7 @@
import org.apache.uima.caseditor.editor.action.MergeAnnotationAction;
import org.apache.uima.caseditor.editor.action.WideLeftAnnotationSideAction;
import org.apache.uima.caseditor.editor.action.WideRightAnnotationSideAction;
+import org.apache.uima.caseditor.editor.util.AnnotationSelection;
import org.apache.uima.caseditor.editor.util.FeatureStructureTransfer;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.jface.action.Action;
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=711448&r1=711402&r2=711448&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 Tue Nov 4 14:17:16 2008
@@ -23,7 +23,7 @@
import org.apache.uima.cas.FeatureStructure;
import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.caseditor.editor.IDocument;
+import org.apache.uima.caseditor.editor.ICasDocument;
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IAdaptable;
@@ -37,9 +37,9 @@
private AnnotationFS mAnnotation;
- private IDocument mDocument;
+ private ICasDocument mDocument;
- AnnotationTreeNode(IDocument document, AnnotationFS annotation) {
+ AnnotationTreeNode(ICasDocument document, AnnotationFS annotation) {
Assert.isNotNull(document);
mDocument = document;
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationTreeNodeList.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationTreeNodeList.java?rev=711448&r1=711402&r2=711448&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationTreeNodeList.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationTreeNodeList.java Tue Nov 4 14:17:16 2008
@@ -26,7 +26,7 @@
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.caseditor.editor.AnnotationDocument;
-import org.apache.uima.caseditor.editor.IDocument;
+import org.apache.uima.caseditor.editor.ICasDocument;
/**
* The {@link AnnotationTreeNodeList} class can build a tree of
@@ -40,9 +40,9 @@
public class AnnotationTreeNodeList {
private List<AnnotationTreeNode> mElements = new ArrayList<AnnotationTreeNode>();
- private IDocument mDocument;
+ private ICasDocument mDocument;
- AnnotationTreeNodeList(IDocument document) {
+ AnnotationTreeNodeList(ICasDocument document) {
mDocument = document;
}
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/outline/OutlineContentProviderBase.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/outline/OutlineContentProviderBase.java?rev=711448&r1=711402&r2=711448&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/outline/OutlineContentProviderBase.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/outline/OutlineContentProviderBase.java Tue Nov 4 14:17:16 2008
@@ -27,7 +27,7 @@
import org.apache.uima.caseditor.editor.AbstractAnnotationDocumentListener;
import org.apache.uima.caseditor.editor.AnnotationDocument;
import org.apache.uima.caseditor.editor.AnnotationEditor;
-import org.apache.uima.caseditor.editor.IDocument;
+import org.apache.uima.caseditor.editor.ICasDocument;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
@@ -38,7 +38,7 @@
protected AnnotationEditor mEditor;
- protected IDocument mInputDocument;
+ protected ICasDocument mInputDocument;
protected TreeViewer viewer;
@@ -70,7 +70,7 @@
if (newInput != null) {
((AnnotationDocument) newInput).addChangeListener(this);
- mInputDocument = (IDocument) newInput;
+ mInputDocument = (ICasDocument) newInput;
changed();
}
Copied: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/util/AnnotationSelection.java (from r711402, incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/main/java/src/org/apache/uima/caseditor/editor/AnnotationSelection.java)
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/util/AnnotationSelection.java?p2=incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/util/AnnotationSelection.java&p1=incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/main/java/src/org/apache/uima/caseditor/editor/AnnotationSelection.java&r1=711402&r2=711448&rev=711448&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/main/java/src/org/apache/uima/caseditor/editor/AnnotationSelection.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/util/AnnotationSelection.java Tue Nov 4 14:17:16 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.caseditor.editor;
+package org.apache.uima.caseditor.editor.util;
import java.util.ArrayList;
import java.util.Collection;
@@ -27,7 +27,7 @@
import org.apache.uima.cas.FeatureStructure;
import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.caseditor.editor.util.AnnotationComparator;
+import org.apache.uima.caseditor.editor.FeatureStructureSelectionIterator;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StructuredSelection;
Propchange: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/util/AnnotationSelection.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/test/java/org/apache/uima/caseditor/editor/AnnotationStyleTest.java (from r709279, 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/CasEditorEclipsePlugin/src/test/java/org/apache/uima/caseditor/editor/AnnotationStyleTest.java?p2=incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/test/java/org/apache/uima/caseditor/editor/AnnotationStyleTest.java&p1=incubator/uima/sandbox/trunk/CasEditor/src/test/java/org/apache/uima/caseditor/core/model/dotcorpus/AnnotationStyleTest.java&r1=709279&r2=711448&rev=711448&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditor/src/test/java/org/apache/uima/caseditor/core/model/dotcorpus/AnnotationStyleTest.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/test/java/org/apache/uima/caseditor/editor/AnnotationStyleTest.java Tue Nov 4 14:17:16 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.caseditor.core.model.dotcorpus;
+package org.apache.uima.caseditor.editor;
import static org.junit.Assert.assertEquals;
Propchange: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/test/java/org/apache/uima/caseditor/editor/AnnotationStyleTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Added: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/test/java/org/apache/uima/caseditor/editor/util/SpanTest.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/test/java/org/apache/uima/caseditor/editor/util/SpanTest.java?rev=711448&view=auto
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/test/java/org/apache/uima/caseditor/editor/util/SpanTest.java (added)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/test/java/org/apache/uima/caseditor/editor/util/SpanTest.java Tue Nov 4 14:17:16 2008
@@ -0,0 +1,160 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.uima.caseditor.editor.util;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+import org.apache.uima.caseditor.editor.util.Span;
+import org.junit.Test;
+
+/**
+ * Unit test for the <code>Span</code> class.
+ */
+public class SpanTest {
+ /**
+ * Test the Span.equals() method.
+ */
+ @Test
+ public void testEquals() {
+ Span a = new Span(100, 1000);
+ Span b = new Span(100, 1000);
+
+ assertEquals(a.equals(b), true);
+ }
+
+ /**
+ * Test the Span.equals() method.
+ */
+ @Test
+ public void testEqualsWithAnotherObject() {
+ Span a = new Span(0, 0);
+
+ assertFalse(Boolean.TRUE.equals(a));
+ }
+
+ /**
+ * Test the Span.equals() method.
+ */
+ @Test
+ public void testEqualsWithNull() {
+ Span a = new Span(0, 0);
+
+ assertEquals(a.equals(null), false);
+ }
+
+ /**
+ * Test the Span.compareTo(Object) method.
+ */
+ @Test
+ public void testCompareToWithBiggerSpan() {
+ Span a = new Span(100, 1000);
+ Span b = new Span(5000, 900);
+
+ assertEquals(true, a.compareTo(b) > 0);
+ }
+
+ /**
+ * Test the Span.compareTo(Object) method.
+ */
+ @Test
+ public void testCompareToWithBiggerIntersectSpan() {
+ Span a = new Span(100, 1000);
+ Span b = new Span(900, 900);
+
+ assertEquals(true, a.compareTo(b) > 0);
+ }
+
+ /**
+ * Test the Span.compareTo(Object) method.
+ */
+ @Test
+ public void testCompareToWithLowerSpan() {
+ Span a = new Span(5000, 900);
+ Span b = new Span(100, 1000);
+
+ assertEquals(true, a.compareTo(b) < 0);
+ }
+
+ /**
+ * Test the Span.compareTo(Object) method.
+ */
+ @Test
+ public void testCompareToWithLowerIntersectSpan() {
+ Span a = new Span(5000, 900);
+ Span b = new Span(4900, 1000);
+
+ assertEquals(true, a.compareTo(b) < 0);
+ }
+
+ /**
+ * Test the Span.compareTo(Object) method.
+ */
+ @Test
+ public void testCompareToEquals() {
+ Span a = new Span(4900, 1000);
+ Span b = new Span(4900, 1000);
+
+ assertEquals(true, a.compareTo(b) == 0);
+ }
+
+ /**
+ * Test the Span.IsContaining(Span) method.
+ */
+ @Test
+ public void testIsContaining() {
+ Span a = new Span(5000, 900);
+ Span b = new Span(5200, 600);
+
+ assertEquals(true, a.isContaining(b));
+ }
+
+ /**
+ * Test the Span.IsContaining(Span) method.
+ */
+ @Test
+ public void testIsContainingWithEqual() {
+ Span a = new Span(5000, 900);
+
+ assertEquals(true, a.isContaining(a));
+ }
+
+ /**
+ * Test the Span.IsContaining(Span) method.
+ */
+ @Test
+ public void testIsContainingWithLowerIntersect() {
+ Span a = new Span(5000, 900);
+ Span b = new Span(4500, 1000);
+
+ assertEquals(false, a.isContaining(b));
+ }
+
+ /**
+ * Test the Span.IsContaining(Span) method.
+ */
+ @Test
+ public void testIsContainingWithHigherIntersect() {
+ Span a = new Span(5000, 900);
+ Span b = new Span(5000, 1000);
+
+ assertEquals(false, a.isContaining(b));
+ }
+}
\ No newline at end of file