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/06/24 13:56:44 UTC
svn commit: r787989 - in
/incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor:
editor/ editor/editview/ editor/fsview/ editor/outline/ ui/action/
Author: joern
Date: Wed Jun 24 11:56:44 2009
New Revision: 787989
URL: http://svn.apache.org/viewvc?rev=787989&view=rev
Log:
UIMA-1397
Added:
incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasEditor.java (with props)
Modified:
incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationDocument.java
incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorView.java
incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ChangeModeAction.java
incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FeatureValue.java
incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasDocument.java
incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/EditView.java
incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/EditViewPage.java
incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureStructureContentProvider.java
incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserView.java
incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserViewPage.java
incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationTreeNodeList.java
incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/OutlineContentProviderBase.java
incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/TypeGroupedContentProvider.java
incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/ui/action/DocumentActionRunnable.java
Modified: incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationDocument.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationDocument.java?rev=787989&r1=787988&r2=787989&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationDocument.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationDocument.java Wed Jun 24 11:56:44 2009
@@ -219,7 +219,7 @@
/**
* Notifies listener about a document change.
*/
- public void fireDocumentChanged() {
+ private void fireDocumentChanged() {
DocumentEvent ev = new DocumentEvent();
ev.fDocument = this;
fireDocumentChanged(ev);
Modified: incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java?rev=787989&r1=787988&r2=787989&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java Wed Jun 24 11:56:44 2009
@@ -111,7 +111,7 @@
* add an action to decrease left side on an annotation
* add an action to decrease right side on an annotation
*/
-public final class AnnotationEditor extends StatusTextEditor implements ISelectionListener {
+public final class AnnotationEditor extends StatusTextEditor implements ICasEditor, ISelectionListener {
/**
* This action annotates the selected text with a defined tag.
*/
@@ -156,7 +156,7 @@
}
}
- AnnotationDocument getDocument() {
+ ICasDocument getDocument() {
return AnnotationEditor.this.getDocument();
}
}
@@ -481,7 +481,7 @@
*/
private int mCursorPosition;
- private AnnotationDocument mDocument;
+ private ICasDocument mDocument;
boolean mIsSomethingHighlighted = false;
@@ -671,7 +671,7 @@
protected void doSetInput(IEditorInput input) throws CoreException {
super.doSetInput(input);
- mDocument = (AnnotationDocument) getDocumentProvider().getDocument(input);
+ mDocument = (ICasDocument) getDocumentProvider().getDocument(input);
if (mDocument != null) {
@@ -733,7 +733,7 @@
*
* @return current <code>AnnotationDocument</code>
*/
- public AnnotationDocument getDocument() {
+ public ICasDocument getDocument() {
return mDocument;
}
@@ -1024,10 +1024,6 @@
super.dispose();
}
- public void setDirty() {
- getDocument().fireDocumentChanged();
- }
-
void setAnnotationSelection(AnnotationFS annotation) {
mFeatureStructureSelectionProvider.setSelection(getDocument(), annotation);
}
Modified: incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorView.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorView.java?rev=787989&r1=787988&r2=787989&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorView.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorView.java Wed Jun 24 11:56:44 2009
@@ -48,13 +48,13 @@
return page;
}
- protected abstract PageRec doCreatePage(AnnotationEditor editor);
+ protected abstract PageRec doCreatePage(ICasEditor editor);
@Override
protected final PageRec doCreatePage(IWorkbenchPart part) {
if (part instanceof AnnotationEditor) {
- AnnotationEditor editor = (AnnotationEditor) part;
+ ICasEditor editor = (ICasEditor) part;
return doCreatePage(editor);
}
Modified: incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ChangeModeAction.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ChangeModeAction.java?rev=787989&r1=787988&r2=787989&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ChangeModeAction.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ChangeModeAction.java Wed Jun 24 11:56:44 2009
@@ -54,7 +54,7 @@
*
* @return the document
*/
- protected AnnotationDocument getDocument() {
+ protected ICasDocument getDocument() {
return mEditor.getDocument();
}
@@ -67,4 +67,4 @@
mEditor.setAnnotationMode(mMode);
}
}
-}
\ No newline at end of file
+}
Modified: incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FeatureValue.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FeatureValue.java?rev=787989&r1=787988&r2=787989&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FeatureValue.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FeatureValue.java Wed Jun 24 11:56:44 2009
@@ -38,7 +38,7 @@
* @param feature
* @param value
*/
- public FeatureValue(AnnotationDocument document, FeatureStructure structure, Feature feature) {
+ public FeatureValue(ICasDocument document, FeatureStructure structure, Feature feature) {
Assert.isNotNull(document);
// TODO: Remove document parameter ? Not needed anymore!
Modified: incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasDocument.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasDocument.java?rev=787989&r1=787988&r2=787989&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasDocument.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasDocument.java Wed Jun 24 11:56:44 2009
@@ -184,4 +184,4 @@
* @return the type
*/
Type getType(String type);
-}
\ No newline at end of file
+}
Added: incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasEditor.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasEditor.java?rev=787989&view=auto
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasEditor.java (added)
+++ incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasEditor.java Wed Jun 24 11:56:44 2009
@@ -0,0 +1,12 @@
+package org.apache.uima.caseditor.editor;
+
+import org.apache.uima.cas.CAS;
+import org.eclipse.ui.IEditorPart;
+
+/**
+ * A Cas Editor is an extension to the {@link IEditorPart} interface and
+ * is responsible to view and edit a {@link CAS} object.
+ */
+public interface ICasEditor extends IEditorPart{
+ ICasDocument getDocument();
+}
Propchange: incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasEditor.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/EditView.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/EditView.java?rev=787989&r1=787988&r2=787989&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/EditView.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/EditView.java Wed Jun 24 11:56:44 2009
@@ -19,9 +19,9 @@
package org.apache.uima.caseditor.editor.editview;
-import org.apache.uima.caseditor.editor.AnnotationDocument;
-import org.apache.uima.caseditor.editor.AnnotationEditor;
import org.apache.uima.caseditor.editor.AnnotationEditorView;
+import org.apache.uima.caseditor.editor.ICasDocument;
+import org.apache.uima.caseditor.editor.ICasEditor;
/**
* TODO: add javadoc here
@@ -38,11 +38,11 @@
}
@Override
- protected PageRec doCreatePage(AnnotationEditor editor) {
+ protected PageRec doCreatePage(ICasEditor editor) {
PageRec result = null;
- AnnotationDocument document = editor.getDocument();
+ ICasDocument document = editor.getDocument();
if (document != null) {
EditViewPage page = new EditViewPage(this, document);
Modified: incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/EditViewPage.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/EditViewPage.java?rev=787989&r1=787988&r2=787989&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/EditViewPage.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/EditViewPage.java Wed Jun 24 11:56:44 2009
@@ -38,11 +38,11 @@
import org.apache.uima.cas.TypeSystem;
import org.apache.uima.caseditor.CasEditorPlugin;
import org.apache.uima.caseditor.Images;
-import org.apache.uima.caseditor.editor.AnnotationDocument;
import org.apache.uima.caseditor.editor.ArrayValue;
import org.apache.uima.caseditor.editor.CasEditorError;
import org.apache.uima.caseditor.editor.FeatureStructureSelection;
import org.apache.uima.caseditor.editor.FeatureValue;
+import org.apache.uima.caseditor.editor.ICasDocument;
import org.apache.uima.caseditor.editor.editview.validator.CellEditorValidatorFacotory;
import org.apache.uima.caseditor.editor.util.FeatureStructureTransfer;
import org.apache.uima.caseditor.editor.util.Primitives;
@@ -528,13 +528,13 @@
private TreeViewer viewer;
- private AnnotationDocument document;
+ private ICasDocument document;
private PinAction pinAction;
private final EditView editView;
- EditViewPage(EditView editView, AnnotationDocument document) {
+ EditViewPage(EditView editView, ICasDocument document) {
if (editView == null || document == null)
throw new IllegalArgumentException("Parameters must not be null!");
Modified: incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureStructureContentProvider.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureStructureContentProvider.java?rev=787989&r1=787988&r2=787989&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureStructureContentProvider.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureStructureContentProvider.java Wed Jun 24 11:56:44 2009
@@ -29,10 +29,10 @@
import org.apache.uima.cas.StringArrayFS;
import org.apache.uima.cas.Type;
import org.apache.uima.caseditor.editor.AbstractDocumentListener;
-import org.apache.uima.caseditor.editor.AnnotationDocument;
import org.apache.uima.caseditor.editor.ArrayValue;
import org.apache.uima.caseditor.editor.CasEditorError;
import org.apache.uima.caseditor.editor.FeatureValue;
+import org.apache.uima.caseditor.editor.ICasDocument;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.swt.widgets.Display;
@@ -40,11 +40,11 @@
final class FeatureStructureContentProvider extends AbstractDocumentListener
implements ITreeContentProvider {
- private AnnotationDocument mDocument;
+ private ICasDocument mDocument;
private Viewer viewer;
- FeatureStructureContentProvider(AnnotationDocument document) {
+ FeatureStructureContentProvider(ICasDocument document) {
if (document == null) {
throw new IllegalArgumentException("document parameter must not be null!");
Modified: incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserView.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserView.java?rev=787989&r1=787988&r2=787989&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserView.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserView.java Wed Jun 24 11:56:44 2009
@@ -19,9 +19,9 @@
package org.apache.uima.caseditor.editor.fsview;
-import org.apache.uima.caseditor.editor.AnnotationDocument;
-import org.apache.uima.caseditor.editor.AnnotationEditor;
import org.apache.uima.caseditor.editor.AnnotationEditorView;
+import org.apache.uima.caseditor.editor.ICasEditor;
+import org.apache.uima.caseditor.editor.ICasDocument;
/**
*/
@@ -36,11 +36,11 @@
}
@Override
- protected PageRec doCreatePage(AnnotationEditor editor) {
+ protected PageRec doCreatePage(ICasEditor editor) {
PageRec result = null;
- AnnotationDocument document = editor.getDocument();
+ ICasDocument document = editor.getDocument();
if (document != null) {
FeatureStructureBrowserViewPage page = new FeatureStructureBrowserViewPage(
Modified: incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserViewPage.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserViewPage.java?rev=787989&r1=787988&r2=787989&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserViewPage.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserViewPage.java Wed Jun 24 11:56:44 2009
@@ -33,8 +33,8 @@
import org.apache.uima.caseditor.CasEditorPlugin;
import org.apache.uima.caseditor.Images;
import org.apache.uima.caseditor.editor.AbstractAnnotationDocumentListener;
-import org.apache.uima.caseditor.editor.AnnotationDocument;
import org.apache.uima.caseditor.editor.FeatureValue;
+import org.apache.uima.caseditor.editor.ICasDocument;
import org.apache.uima.caseditor.editor.ModelFeatureStructure;
import org.apache.uima.caseditor.editor.action.DeleteFeatureStructureAction;
import org.apache.uima.caseditor.editor.util.StrictTypeConstraint;
@@ -66,13 +66,13 @@
final class FeatureStructureTreeContentProvider extends AbstractAnnotationDocumentListener
implements ITreeContentProvider {
- private AnnotationDocument mDocument;
+ private ICasDocument mDocument;
private CAS mCAS;
private Type mCurrentType;
- FeatureStructureTreeContentProvider(AnnotationDocument document, CAS tcas) {
+ FeatureStructureTreeContentProvider(ICasDocument document, CAS tcas) {
mCAS = tcas;
mDocument = document;
}
@@ -293,16 +293,14 @@
// TODO: check if an AnnotationFS was created, if so
// add it to the document
- mDocument.fireDocumentChanged();
-
- // inserts a new feature strucutre of current type
+ // inserts a new feature structure of current type
if (mCurrentType == null) {
return;
}
FeatureStructure newFeatureStructure = mCAS.createFS(mCurrentType);
- mCAS.getIndexRepository().addFS(newFeatureStructure);
+ mDocument.addFeatureStructure(newFeatureStructure);
mFSList.refresh();
}
@@ -316,7 +314,7 @@
}
}
- private AnnotationDocument mDocument;
+ private ICasDocument mDocument;
private CAS mCAS;
@@ -337,7 +335,7 @@
*
* @param document
*/
- public FeatureStructureBrowserViewPage(AnnotationDocument document) {
+ public FeatureStructureBrowserViewPage(ICasDocument document) {
if (document == null)
throw new IllegalArgumentException("document parameter must not be null!");
Modified: incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationTreeNodeList.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationTreeNodeList.java?rev=787989&r1=787988&r2=787989&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationTreeNodeList.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationTreeNodeList.java Wed Jun 24 11:56:44 2009
@@ -25,7 +25,6 @@
import java.util.List;
import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.caseditor.editor.AnnotationDocument;
import org.apache.uima.caseditor.editor.ICasDocument;
/**
@@ -46,7 +45,7 @@
mDocument = document;
}
- AnnotationTreeNodeList(AnnotationDocument document, Collection<AnnotationFS> annotations) {
+ AnnotationTreeNodeList(ICasDocument document, Collection<AnnotationFS> annotations) {
mDocument = document;
for (AnnotationFS annotation : annotations) {
Modified: incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/OutlineContentProviderBase.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/OutlineContentProviderBase.java?rev=787989&r1=787988&r2=787989&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/OutlineContentProviderBase.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/OutlineContentProviderBase.java Wed Jun 24 11:56:44 2009
@@ -25,7 +25,6 @@
import org.apache.uima.cas.FeatureStructure;
import org.apache.uima.cas.text.AnnotationFS;
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.ICasDocument;
import org.eclipse.jface.viewers.ITreeContentProvider;
@@ -64,11 +63,11 @@
*/
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
if (oldInput != null) {
- ((AnnotationDocument) oldInput).removeChangeListener(this);
+ ((ICasDocument) oldInput).removeChangeListener(this);
}
if (newInput != null) {
- ((AnnotationDocument) newInput).addChangeListener(this);
+ ((ICasDocument) newInput).addChangeListener(this);
mInputDocument = (ICasDocument) newInput;
@@ -104,4 +103,4 @@
}
});
}
-}
\ No newline at end of file
+}
Modified: incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/TypeGroupedContentProvider.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/TypeGroupedContentProvider.java?rev=787989&r1=787988&r2=787989&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/TypeGroupedContentProvider.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/TypeGroupedContentProvider.java Wed Jun 24 11:56:44 2009
@@ -31,8 +31,8 @@
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.cas.text.AnnotationIndex;
import org.apache.uima.caseditor.CasEditorPlugin;
-import org.apache.uima.caseditor.editor.AnnotationDocument;
import org.apache.uima.caseditor.editor.AnnotationEditor;
+import org.apache.uima.caseditor.editor.ICasDocument;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
@@ -127,11 +127,11 @@
@Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
if (oldInput != null) {
- ((AnnotationDocument) oldInput).removeChangeListener(this);
+ ((ICasDocument) oldInput).removeChangeListener(this);
}
if (newInput != null) {
- mInputDocument = (AnnotationDocument) newInput;
+ mInputDocument = (ICasDocument) newInput;
mInputDocument.addChangeListener(this);
Modified: incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/ui/action/DocumentActionRunnable.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/ui/action/DocumentActionRunnable.java?rev=787989&r1=787988&r2=787989&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/ui/action/DocumentActionRunnable.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/ui/action/DocumentActionRunnable.java Wed Jun 24 11:56:44 2009
@@ -133,7 +133,7 @@
} else if (!editorMap.get(documentElement).isDirty()) {
// element is opened in editor and not dirty
AnnotationEditor editor = editorMap.get(documentElement);
- editor.setDirty();
+ editor.getDocument().changed();
} else {
// element is opened in editor and dirty, do nothing
}