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/01/26 14:02:54 UTC
svn commit: r737684 - in
/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor:
AnnotationEditorView.java editview/EditView.java editview/EditViewPage.java
fsview/FeatureStructureBrowserView.java
Author: joern
Date: Mon Jan 26 13:02:53 2009
New Revision: 737684
URL: http://svn.apache.org/viewvc?rev=737684&view=rev
Log:
UIMA-546 Moved duplicated code to AnnoationEditorView and made it abstract
Modified:
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorView.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/editview/EditView.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/editview/EditViewPage.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserView.java
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorView.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorView.java?rev=737684&r1=737683&r2=737684&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorView.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorView.java Mon Jan 26 13:02:53 2009
@@ -19,6 +19,7 @@
package org.apache.uima.caseditor.editor;
+import org.apache.uima.cas.CAS;
import org.eclipse.ui.IPartListener;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.part.IPage;
@@ -26,6 +27,10 @@
import org.eclipse.ui.part.PageBook;
import org.eclipse.ui.part.PageBookView;
+/**
+ * Base view for views which show information about the {@link CAS} opened
+ * in the editor.
+ */
public abstract class AnnotationEditorView extends PageBookView {
private final String editorNotAvailableMessage;
@@ -43,6 +48,20 @@
return page;
}
+ protected abstract PageRec doCreatePage(AnnotationEditor editor);
+
+ @Override
+ protected final PageRec doCreatePage(IWorkbenchPart part) {
+
+ if ((part instanceof AnnotationEditor)) {
+ AnnotationEditor editor = (AnnotationEditor) part;
+
+ return doCreatePage(editor);
+ }
+
+ return null;
+ }
+
@Override
protected IWorkbenchPart getBootstrapPart() {
return getSite().getPage().getActiveEditor();
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/editview/EditView.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/editview/EditView.java?rev=737684&r1=737683&r2=737684&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/editview/EditView.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/editview/EditView.java Mon Jan 26 13:02:53 2009
@@ -19,7 +19,6 @@
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;
@@ -29,39 +28,31 @@
* TODO: add javadoc here
*/
public final class EditView extends AnnotationEditorView {
- /**
- * The ID of the feature structure view.
- */
- public static final String ID = "org.apache.uima.caseditor.editview";
- public static final String ID_2 = "org.apache.uima.caseditor.editview2";
-
-
- public EditView() {
- super("The edit view is currently not available.");
- }
-
- @Override
- protected PageRec doCreatePage(IWorkbenchPart part) {
+ /**
+ * The ID of the feature structure view.
+ */
+ public static final String ID = "org.apache.uima.caseditor.editview";
+ public static final String ID_2 = "org.apache.uima.caseditor.editview2";
- // if its not possible to create a result the view
- // unavailable message is displayed
+ public EditView() {
+ super("The edit view is currently not available.");
+ }
- PageRec result = null;
+ @Override
+ protected PageRec doCreatePage(AnnotationEditor editor) {
- if ((part instanceof AnnotationEditor)) {
- AnnotationEditor editor = (AnnotationEditor) part;
+ PageRec result = null;
- AnnotationDocument document = editor.getDocument();
+ AnnotationDocument document = editor.getDocument();
- if (document != null) {
- EditViewPage page = new EditViewPage(this, document);
- initPage(page);
- page.createControl(getPageBook());
+ if (document != null) {
+ EditViewPage page = new EditViewPage(this, document);
+ initPage(page);
+ page.createControl(getPageBook());
- result = new PageRec(part, page);
- }
- }
+ result = new PageRec(editor, page);
+ }
- return result;
- }
+ return result;
+ }
}
\ No newline at end of file
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/editview/EditViewPage.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/editview/EditViewPage.java?rev=737684&r1=737683&r2=737684&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/editview/EditViewPage.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/editview/EditViewPage.java Mon Jan 26 13:02:53 2009
@@ -526,7 +526,7 @@
}
}
- TreeViewer viewer;
+ private TreeViewer viewer;
private AnnotationDocument document;
@@ -565,8 +565,7 @@
valueColumn.setLabelProvider(new ValueColumnLabelProvider());
- valueColumn.setEditingSupport(new ValueEditingSupport(viewer)
- );
+ valueColumn.setEditingSupport(new ValueEditingSupport(viewer));
FeatureStructureContentProvider contentProvider =
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserView.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserView.java?rev=737684&r1=737683&r2=737684&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserView.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserView.java Mon Jan 26 13:02:53 2009
@@ -19,11 +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.eclipse.ui.IWorkbenchPart;
/**
*/
@@ -38,28 +36,21 @@
}
@Override
- protected PageRec doCreatePage(IWorkbenchPart part) {
-
- // if its not possible to create a result the view
- // unavailable message is displayed
+ protected PageRec doCreatePage(AnnotationEditor editor) {
- PageRec result = null;
+ PageRec result = null;
- if ((part instanceof AnnotationEditor)) {
- AnnotationEditor editor = (AnnotationEditor) part;
+ AnnotationDocument document = editor.getDocument();
- AnnotationDocument document = editor.getDocument();
+ if (document != null) {
+ FeatureStructureBrowserViewPage page = new FeatureStructureBrowserViewPage(
+ document);
+ initPage(page);
+ page.createControl(getPageBook());
- if (document != null) {
- FeatureStructureBrowserViewPage page =
- new FeatureStructureBrowserViewPage(document);
- initPage(page);
- page.createControl(getPageBook());
+ result = new PageRec(editor, page);
+ }
- result = new PageRec(part, page);
- }
- }
-
- return result;
- }
+ return result;
+ }
}
\ No newline at end of file