Author: pkluegl
Date: Wed Jan 18 15:38:52 2012
New Revision: 1232936

URL: http://svn.apache.org/viewvc?rev=1232936&view=rev
Log:
UIMA-2287
TextMarker views now extend CasEditorView. Removed basic stream view.

Modified:
    uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/plugin.xml
    
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/apply/ApplyView.java
    
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/apply/ApplyViewPage.java
    
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/element/ElementView.java
    
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/failed/FailedView.java
    
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/matched/MatchedView.java
    
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/rulelist/RuleListView.java
    
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/selection/ExplainSelectionView.java
    
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/statistics/StatisticsView.java
    
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/testing/ui/views/EvaluationViewPage.java
    
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/testing/ui/views/fn/FalseNegativeView.java
    
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/testing/ui/views/fp/FalsePositiveView.java
    
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/testing/ui/views/tp/TruePositiveView.java

Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/plugin.xml
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/plugin.xml?rev=1232936&r1=1232935&r2=1232936&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/plugin.xml 
(original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/plugin.xml Wed Jan 
18 15:38:52 2012
@@ -486,13 +486,6 @@ under the License.
          point="org.eclipse.ui.views">
       <view
             category="org.apache.uima.textmarker.ide.ui"
-            
class="org.apache.uima.textmarker.explain.basic.BasicTokenStreamView"
-            icon="icons/text_list_numbers.png"
-            id="org.apache.uima.textmarker.explain.basic"
-            name="Basic Stream">
-      </view>
-      <view
-            category="org.apache.uima.textmarker.ide.ui"
             class="org.apache.uima.textmarker.explain.apply.ApplyView"
             icon="icons/chart_organisation.png"
             id="org.apache.uima.textmarker.explain.apply"

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/apply/ApplyView.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/apply/ApplyView.java?rev=1232936&r1=1232935&r2=1232936&view=diff
==============================================================================
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/apply/ApplyView.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/apply/ApplyView.java
 Wed Jan 18 15:38:52 2012
@@ -20,10 +20,11 @@
 package org.apache.uima.textmarker.explain.apply;
 
 import org.apache.uima.caseditor.editor.AnnotationEditor;
-import org.apache.uima.caseditor.editor.AnnotationEditorView;
+import org.apache.uima.caseditor.editor.CasEditorView;
 import org.apache.uima.caseditor.editor.ICasEditor;
+import org.eclipse.ui.part.IPageBookViewPage;
 
-public class ApplyView extends AnnotationEditorView {
+public class ApplyView extends CasEditorView {
 
   public static final String ID = "org.apache.uima.textmarker.explain.apply";
 
@@ -32,13 +33,11 @@ public class ApplyView extends Annotatio
   }
 
   @Override
-  protected PageRec doCreatePage(ICasEditor editor) {
-    PageRec result = null;
+  protected IPageBookViewPage doCreatePage(ICasEditor editor) {
+    IPageBookViewPage result = null;
     if (editor.getDocument() != null && editor instanceof AnnotationEditor) {
       ApplyViewPage page = new ApplyViewPage((AnnotationEditor) editor);
-      initPage(page);
-      page.createControl(getPageBook());
-      result = new PageRec(editor, page);
+      result = page;
     }
     return result;
   }

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/apply/ApplyViewPage.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/apply/ApplyViewPage.java?rev=1232936&r1=1232935&r2=1232936&view=diff
==============================================================================
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/apply/ApplyViewPage.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/apply/ApplyViewPage.java
 Wed Jan 18 15:38:52 2012
@@ -163,12 +163,12 @@ public class ApplyViewPage extends Page 
   @Override
   public void casDocumentChanged(IEditorInput oldInput, ICasDocument 
oldDocument,
           IEditorInput newInput, ICasDocument newDocument) {
-    editor.removeCasEditorInputListener(this);
-    document = newDocument;
-    editor.addCasEditorInputListener(this);
-    ExplainTree tree = new ExplainTree(document.getCAS());
-    viewer.setInput(tree.getRoot());
-    viewer.refresh();
+//    editor.removeCasEditorInputListener(this);
+//    document = newDocument;
+//    editor.addCasEditorInputListener(this);
+//    ExplainTree tree = new ExplainTree(document.getCAS());
+//    viewer.setInput(tree.getRoot());
+//    viewer.refresh();
     
   }
 }

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/element/ElementView.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/element/ElementView.java?rev=1232936&r1=1232935&r2=1232936&view=diff
==============================================================================
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/element/ElementView.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/element/ElementView.java
 Wed Jan 18 15:38:52 2012
@@ -20,10 +20,11 @@
 package org.apache.uima.textmarker.explain.element;
 
 import org.apache.uima.caseditor.editor.AnnotationEditor;
-import org.apache.uima.caseditor.editor.AnnotationEditorView;
+import org.apache.uima.caseditor.editor.CasEditorView;
 import org.apache.uima.caseditor.editor.ICasEditor;
+import org.eclipse.ui.part.IPageBookViewPage;
 
-public class ElementView extends AnnotationEditorView {
+public class ElementView extends CasEditorView {
 
   public static final String ID = "org.apache.uima.textmarker.explain.element";
 
@@ -32,13 +33,11 @@ public class ElementView extends Annotat
   }
 
   @Override
-  protected PageRec doCreatePage(ICasEditor editor) {
-    PageRec result = null;
+  protected IPageBookViewPage doCreatePage(ICasEditor editor) {
+    IPageBookViewPage result = null;
     if (editor.getDocument() != null && editor instanceof AnnotationEditor) {
       ElementViewPage page = new ElementViewPage((AnnotationEditor) editor);
-      initPage(page);
-      page.createControl(getPageBook());
-      result = new PageRec(editor, page);
+      result = page;
     }
     return result;
   }

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/failed/FailedView.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/failed/FailedView.java?rev=1232936&r1=1232935&r2=1232936&view=diff
==============================================================================
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/failed/FailedView.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/failed/FailedView.java
 Wed Jan 18 15:38:52 2012
@@ -20,10 +20,11 @@
 package org.apache.uima.textmarker.explain.failed;
 
 import org.apache.uima.caseditor.editor.AnnotationEditor;
-import org.apache.uima.caseditor.editor.AnnotationEditorView;
+import org.apache.uima.caseditor.editor.CasEditorView;
 import org.apache.uima.caseditor.editor.ICasEditor;
+import org.eclipse.ui.part.IPageBookViewPage;
 
-public class FailedView extends AnnotationEditorView {
+public class FailedView extends CasEditorView {
 
   public static final String ID = "org.apache.uima.textmarker.explain.failed";
 
@@ -32,13 +33,11 @@ public class FailedView extends Annotati
   }
 
   @Override
-  protected PageRec doCreatePage(ICasEditor editor) {
-    PageRec result = null;
+  protected IPageBookViewPage doCreatePage(ICasEditor editor) {
+    IPageBookViewPage result = null;
     if (editor.getDocument() != null && editor instanceof AnnotationEditor) {
       FailedViewPage page = new FailedViewPage((AnnotationEditor) editor);
-      initPage(page);
-      page.createControl(getPageBook());
-      result = new PageRec(editor, page);
+      result = page;
     }
     return result;
   }

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/matched/MatchedView.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/matched/MatchedView.java?rev=1232936&r1=1232935&r2=1232936&view=diff
==============================================================================
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/matched/MatchedView.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/matched/MatchedView.java
 Wed Jan 18 15:38:52 2012
@@ -20,10 +20,11 @@
 package org.apache.uima.textmarker.explain.matched;
 
 import org.apache.uima.caseditor.editor.AnnotationEditor;
-import org.apache.uima.caseditor.editor.AnnotationEditorView;
+import org.apache.uima.caseditor.editor.CasEditorView;
 import org.apache.uima.caseditor.editor.ICasEditor;
+import org.eclipse.ui.part.IPageBookViewPage;
 
-public class MatchedView extends AnnotationEditorView {
+public class MatchedView extends CasEditorView {
 
   public static final String ID = "org.apache.uima.textmarker.explain.matched";
 
@@ -32,13 +33,11 @@ public class MatchedView extends Annotat
   }
 
   @Override
-  protected PageRec doCreatePage(ICasEditor editor) {
-    PageRec result = null;
+  protected IPageBookViewPage doCreatePage(ICasEditor editor) {
+    IPageBookViewPage result = null;
     if (editor.getDocument() != null && editor instanceof AnnotationEditor) {
       MatchedViewPage page = new MatchedViewPage((AnnotationEditor) editor);
-      initPage(page);
-      page.createControl(getPageBook());
-      result = new PageRec(editor, page);
+      result = page;
     }
     return result;
   }

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/rulelist/RuleListView.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/rulelist/RuleListView.java?rev=1232936&r1=1232935&r2=1232936&view=diff
==============================================================================
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/rulelist/RuleListView.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/rulelist/RuleListView.java
 Wed Jan 18 15:38:52 2012
@@ -20,10 +20,11 @@
 package org.apache.uima.textmarker.explain.rulelist;
 
 import org.apache.uima.caseditor.editor.AnnotationEditor;
-import org.apache.uima.caseditor.editor.AnnotationEditorView;
+import org.apache.uima.caseditor.editor.CasEditorView;
 import org.apache.uima.caseditor.editor.ICasEditor;
+import org.eclipse.ui.part.IPageBookViewPage;
 
-public class RuleListView extends AnnotationEditorView {
+public class RuleListView extends CasEditorView {
 
   public static final String ID = 
"org.apache.uima.textmarker.explain.rulelist";
 
@@ -32,13 +33,11 @@ public class RuleListView extends Annota
   }
 
   @Override
-  protected PageRec doCreatePage(ICasEditor editor) {
-    PageRec result = null;
+  protected IPageBookViewPage doCreatePage(ICasEditor editor) {
+    IPageBookViewPage result = null;
     if (editor.getDocument() != null && editor instanceof AnnotationEditor) {
       RuleListViewPage page = new RuleListViewPage((AnnotationEditor) editor);
-      initPage(page);
-      page.createControl(getPageBook());
-      result = new PageRec(editor, page);
+      result = page;
     }
     return result;
   }

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/selection/ExplainSelectionView.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/selection/ExplainSelectionView.java?rev=1232936&r1=1232935&r2=1232936&view=diff
==============================================================================
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/selection/ExplainSelectionView.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/selection/ExplainSelectionView.java
 Wed Jan 18 15:38:52 2012
@@ -20,10 +20,11 @@
 package org.apache.uima.textmarker.explain.selection;
 
 import org.apache.uima.caseditor.editor.AnnotationEditor;
-import org.apache.uima.caseditor.editor.AnnotationEditorView;
+import org.apache.uima.caseditor.editor.CasEditorView;
 import org.apache.uima.caseditor.editor.ICasEditor;
+import org.eclipse.ui.part.IPageBookViewPage;
 
-public class ExplainSelectionView extends AnnotationEditorView {
+public class ExplainSelectionView extends CasEditorView {
 
   public static final String ID = 
"org.apache.uima.textmarker.explain.selection";
 
@@ -32,13 +33,11 @@ public class ExplainSelectionView extend
   }
 
   @Override
-  protected PageRec doCreatePage(ICasEditor editor) {
-    PageRec result = null;
+  protected IPageBookViewPage doCreatePage(ICasEditor editor) {
+    IPageBookViewPage result = null;
     if (editor.getDocument() != null && editor instanceof AnnotationEditor) {
       ExplainSelectionViewPage page = new 
ExplainSelectionViewPage((AnnotationEditor) editor);
-      initPage(page);
-      page.createControl(getPageBook());
-      result = new PageRec(editor, page);
+      result = page;
     }
     return result;
   }

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/statistics/StatisticsView.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/statistics/StatisticsView.java?rev=1232936&r1=1232935&r2=1232936&view=diff
==============================================================================
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/statistics/StatisticsView.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/statistics/StatisticsView.java
 Wed Jan 18 15:38:52 2012
@@ -20,10 +20,11 @@
 package org.apache.uima.textmarker.statistics;
 
 import org.apache.uima.caseditor.editor.AnnotationEditor;
-import org.apache.uima.caseditor.editor.AnnotationEditorView;
+import org.apache.uima.caseditor.editor.CasEditorView;
 import org.apache.uima.caseditor.editor.ICasEditor;
+import org.eclipse.ui.part.IPageBookViewPage;
 
-public class StatisticsView extends AnnotationEditorView {
+public class StatisticsView extends CasEditorView {
 
   public static final String ID = "org.apache.uima.textmarker.explain.apply";
 
@@ -32,13 +33,13 @@ public class StatisticsView extends Anno
   }
 
   @Override
-  protected PageRec doCreatePage(ICasEditor editor) {
-    PageRec result = null;
+  protected IPageBookViewPage doCreatePage(ICasEditor editor) {
+    IPageBookViewPage result = null;
     if (editor.getDocument() != null && editor instanceof AnnotationEditor) {
       StatisticsViewPage page = new StatisticsViewPage((AnnotationEditor) 
editor);
       initPage(page);
       page.createControl(getPageBook());
-      result = new PageRec(editor, page);
+      result = page;
     }
     return result;
   }

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/testing/ui/views/EvaluationViewPage.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/testing/ui/views/EvaluationViewPage.java?rev=1232936&r1=1232935&r2=1232936&view=diff
==============================================================================
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/testing/ui/views/EvaluationViewPage.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/testing/ui/views/EvaluationViewPage.java
 Wed Jan 18 15:38:52 2012
@@ -173,10 +173,10 @@ public class EvaluationViewPage extends 
   @Override
   public void casDocumentChanged(IEditorInput oldInput, ICasDocument 
oldDocument,
           IEditorInput newInput, ICasDocument newDocument) {
-    document.removeChangeListener(this);
-    document = newDocument;
-    document.addChangeListener(this);
-    changed();
+//    document.removeChangeListener(this);
+//    document = newDocument;
+//    document.addChangeListener(this);
+//    changed();
   }
 
 }

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/testing/ui/views/fn/FalseNegativeView.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/testing/ui/views/fn/FalseNegativeView.java?rev=1232936&r1=1232935&r2=1232936&view=diff
==============================================================================
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/testing/ui/views/fn/FalseNegativeView.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/testing/ui/views/fn/FalseNegativeView.java
 Wed Jan 18 15:38:52 2012
@@ -20,12 +20,13 @@
 package org.apache.uima.textmarker.testing.ui.views.fn;
 
 import org.apache.uima.caseditor.editor.AnnotationEditor;
-import org.apache.uima.caseditor.editor.AnnotationEditorView;
+import org.apache.uima.caseditor.editor.CasEditorView;
 import org.apache.uima.caseditor.editor.ICasEditor;
 import org.apache.uima.textmarker.testing.evaluator.ICasEvaluator;
 import org.apache.uima.textmarker.testing.ui.views.EvaluationViewPage;
+import org.eclipse.ui.part.IPageBookViewPage;
 
-public class FalseNegativeView extends AnnotationEditorView {
+public class FalseNegativeView extends CasEditorView {
 
   public static final String ID = 
"org.apache.uima.textmarker.testing.falseNegative";
 
@@ -34,14 +35,12 @@ public class FalseNegativeView extends A
   }
 
   @Override
-  protected PageRec doCreatePage(ICasEditor editor) {
-    PageRec result = null;
+  protected IPageBookViewPage doCreatePage(ICasEditor editor) {
+    IPageBookViewPage result = null;
     if (editor.getDocument() != null && editor instanceof AnnotationEditor) {
       EvaluationViewPage page = new 
EvaluationViewPage(ICasEvaluator.FALSE_NEGATIVE,
               (AnnotationEditor) editor);
-      initPage(page);
-      page.createControl(getPageBook());
-      result = new PageRec(editor, page);
+      result = page;
     }
     return result;
   }

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/testing/ui/views/fp/FalsePositiveView.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/testing/ui/views/fp/FalsePositiveView.java?rev=1232936&r1=1232935&r2=1232936&view=diff
==============================================================================
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/testing/ui/views/fp/FalsePositiveView.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/testing/ui/views/fp/FalsePositiveView.java
 Wed Jan 18 15:38:52 2012
@@ -20,12 +20,13 @@
 package org.apache.uima.textmarker.testing.ui.views.fp;
 
 import org.apache.uima.caseditor.editor.AnnotationEditor;
-import org.apache.uima.caseditor.editor.AnnotationEditorView;
+import org.apache.uima.caseditor.editor.CasEditorView;
 import org.apache.uima.caseditor.editor.ICasEditor;
 import org.apache.uima.textmarker.testing.evaluator.ICasEvaluator;
 import org.apache.uima.textmarker.testing.ui.views.EvaluationViewPage;
+import org.eclipse.ui.part.IPageBookViewPage;
 
-public class FalsePositiveView extends AnnotationEditorView {
+public class FalsePositiveView extends CasEditorView {
 
   public static final String ID = 
"org.apache.uima.textmarker.testing.falsePositive";
 
@@ -34,14 +35,12 @@ public class FalsePositiveView extends A
   }
 
   @Override
-  protected PageRec doCreatePage(ICasEditor editor) {
-    PageRec result = null;
+  protected IPageBookViewPage doCreatePage(ICasEditor editor) {
+    IPageBookViewPage result = null;
     if (editor.getDocument() != null && editor instanceof AnnotationEditor) {
       EvaluationViewPage page = new 
EvaluationViewPage(ICasEvaluator.FALSE_POSITIVE,
               (AnnotationEditor) editor);
-      initPage(page);
-      page.createControl(getPageBook());
-      result = new PageRec(editor, page);
+      result = page;
     }
     return result;
   }

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/testing/ui/views/tp/TruePositiveView.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/testing/ui/views/tp/TruePositiveView.java?rev=1232936&r1=1232935&r2=1232936&view=diff
==============================================================================
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/testing/ui/views/tp/TruePositiveView.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/testing/ui/views/tp/TruePositiveView.java
 Wed Jan 18 15:38:52 2012
@@ -20,12 +20,13 @@
 package org.apache.uima.textmarker.testing.ui.views.tp;
 
 import org.apache.uima.caseditor.editor.AnnotationEditor;
-import org.apache.uima.caseditor.editor.AnnotationEditorView;
+import org.apache.uima.caseditor.editor.CasEditorView;
 import org.apache.uima.caseditor.editor.ICasEditor;
 import org.apache.uima.textmarker.testing.evaluator.ICasEvaluator;
 import org.apache.uima.textmarker.testing.ui.views.EvaluationViewPage;
+import org.eclipse.ui.part.IPageBookViewPage;
 
-public class TruePositiveView extends AnnotationEditorView {
+public class TruePositiveView extends CasEditorView {
 
   public static final String ID = 
"org.apache.uima.textmarker.testing.truePositive";
 
@@ -34,14 +35,12 @@ public class TruePositiveView extends An
   }
 
   @Override
-  protected PageRec doCreatePage(ICasEditor editor) {
-    PageRec result = null;
+  protected IPageBookViewPage doCreatePage(ICasEditor editor) {
+    IPageBookViewPage result = null;
     if (editor.getDocument() != null && editor instanceof AnnotationEditor) {
       EvaluationViewPage page = new 
EvaluationViewPage(ICasEvaluator.TRUE_POSITIVE,
               (AnnotationEditor) editor);
-      initPage(page);
-      page.createControl(getPageBook());
-      result = new PageRec(editor, page);
+      result = page;
     }
     return result;
   }


Reply via email to