Author: pkluegl Date: Tue Oct 18 11:16:53 2011 New Revision: 1185575 URL: http://svn.apache.org/viewvc?rev=1185575&view=rev Log: UIMA-2252 Removed SelectionViewPage and AnnotationBrowserPage, AnnotationTreeViewPage isn't abstract anymore and AnnotationTreeViewPage is used directly in both views now. Listener are removed when disposing the page. Directly using argument of AnnotationTreeViewPage.annotationModeChanged.
Removed: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/browser/AnnotationBrowserPage.java uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/selection/SelectionViewPage.java Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/browser/AnnotationBrowserView.java uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/selection/SelectionView.java uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/tree/AnnotationTreeContentProvider.java uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/tree/AnnotationTreeViewPage.java Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/browser/AnnotationBrowserView.java URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/browser/AnnotationBrowserView.java?rev=1185575&r1=1185574&r2=1185575&view=diff ============================================================================== --- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/browser/AnnotationBrowserView.java (original) +++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/browser/AnnotationBrowserView.java Tue Oct 18 11:16:53 2011 @@ -22,6 +22,7 @@ package org.apache.uima.textmarker.cased 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.textmarker.caseditor.view.tree.AnnotationTreeViewPage; public class AnnotationBrowserView extends AnnotationEditorView { public static final String ID = "org.apache.uima.caseditor.browser"; @@ -34,7 +35,7 @@ public class AnnotationBrowserView exten protected PageRec doCreatePage(ICasEditor editor) { PageRec result = null; if (editor.getDocument() != null && editor instanceof AnnotationEditor) { - AnnotationBrowserPage page = new AnnotationBrowserPage((AnnotationEditor) editor); + AnnotationTreeViewPage page = new AnnotationTreeViewPage(false, (AnnotationEditor) editor); initPage(page); page.createControl(getPageBook()); result = new PageRec(editor, page); Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/selection/SelectionView.java URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/selection/SelectionView.java?rev=1185575&r1=1185574&r2=1185575&view=diff ============================================================================== --- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/selection/SelectionView.java (original) +++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/selection/SelectionView.java Tue Oct 18 11:16:53 2011 @@ -22,6 +22,7 @@ package org.apache.uima.textmarker.cased 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.textmarker.caseditor.view.tree.AnnotationTreeViewPage; /** */ @@ -37,7 +38,7 @@ public final class SelectionView extends protected PageRec doCreatePage(ICasEditor editor) { PageRec result = null; if (editor.getDocument() != null && editor instanceof AnnotationEditor) { - SelectionViewPage page = new SelectionViewPage((AnnotationEditor) editor); + AnnotationTreeViewPage page = new AnnotationTreeViewPage(true, (AnnotationEditor) editor); initPage(page); page.createControl(getPageBook()); result = new PageRec(editor, page); Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/tree/AnnotationTreeContentProvider.java URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/tree/AnnotationTreeContentProvider.java?rev=1185575&r1=1185574&r2=1185575&view=diff ============================================================================== --- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/tree/AnnotationTreeContentProvider.java (original) +++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/tree/AnnotationTreeContentProvider.java Tue Oct 18 11:16:53 2011 @@ -44,7 +44,7 @@ public class AnnotationTreeContentProvid @Override public void dispose() { - + document.removeChangeListener(this); } /* Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/tree/AnnotationTreeViewPage.java URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/tree/AnnotationTreeViewPage.java?rev=1185575&r1=1185574&r2=1185575&view=diff ============================================================================== --- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/tree/AnnotationTreeViewPage.java (original) +++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/tree/AnnotationTreeViewPage.java Tue Oct 18 11:16:53 2011 @@ -73,9 +73,8 @@ import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.part.IPageSite; import org.eclipse.ui.part.Page; -public abstract class AnnotationTreeViewPage extends Page implements MouseListener, - IDoubleClickListener, Listener, ISelectionListener, ICheckStateListener, - IAnnotationEditorModifyListener { +public class AnnotationTreeViewPage extends Page implements MouseListener, IDoubleClickListener, + Listener, ISelectionListener, ICheckStateListener, IAnnotationEditorModifyListener { public class TreeViewAnnotationStyleChangeListener extends AnnotationStyleChangeListener { @@ -110,6 +109,8 @@ public abstract class AnnotationTreeView private int offset = -1; + private TreeViewAnnotationStyleChangeListener styleListener; + public AnnotationTreeViewPage(boolean useSelection, AnnotationEditor editor) { super(); this.useSelection = useSelection; @@ -202,7 +203,7 @@ public abstract class AnnotationTreeView }); - TreeViewAnnotationStyleChangeListener styleListener = new TreeViewAnnotationStyleChangeListener(); + styleListener = new TreeViewAnnotationStyleChangeListener(); editor.getCasDocumentProvider().getTypeSystemPreferenceStore(editor.getEditorInput()) .addPropertyChangeListener(styleListener); @@ -224,6 +225,9 @@ public abstract class AnnotationTreeView @Override public void dispose() { super.dispose(); + getSite().getPage().removeSelectionListener(this); + editor.getCasDocumentProvider().getTypeSystemPreferenceStore(editor.getEditorInput()) + .removePropertyChangeListener(styleListener); overlay.dispose(); Collection<Image> values = icons.values(); for (Image image : values) { @@ -520,7 +524,7 @@ public abstract class AnnotationTreeView } public void annotationModeChanged(Type newMode) { - getTreeViewer().setGrayed(new TypeTreeNode(editor.getAnnotationMode()), true); + getTreeViewer().setGrayed(new TypeTreeNode(newMode), true); } public void showAnnotationsChanged(Collection<Type> shownAnnotationTypes) {