svn commit: r1185575 - in /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view: browser/ selection/ tree/

2011-10-18 Thread pkluegl 
Author: pkluegl
Date: Tue Oct 18 11:16:53 2011
New Revision: 1185575

URL: http://svn.apache.org/viewvc?rev=1185575view=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=1185575r1=1185574r2=1185575view=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=1185575r1=1185574r2=1185575view=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:

svn commit: r1185586 - /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/META-INF/MANIFEST.MF

2011-10-18 Thread pkluegl 
Author: pkluegl
Date: Tue Oct 18 11:41:56 2011
New Revision: 1185586

URL: http://svn.apache.org/viewvc?rev=1185586view=rev
Log:
UIMA-2252
changed plugin id to org.apache.uima.textmarker.caseditor

Modified:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/META-INF/MANIFEST.MF

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/META-INF/MANIFEST.MF
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/META-INF/MANIFEST.MF?rev=1185586r1=1185585r2=1185586view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/META-INF/MANIFEST.MF
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/META-INF/MANIFEST.MF
 Tue Oct 18 11:41:56 2011
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: uimaj-ep-textmarker-caseditor
-Bundle-SymbolicName: uimaj-ep-textmarker-caseditor;singleton:=true
+Bundle-SymbolicName: org.apache.uima.textmarker.caseditor;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.apache.uima.caseditor;bundle-version=2.4.0,

svn commit: r1185601 - /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java

2011-10-18 Thread joern 
Author: joern
Date: Tue Oct 18 12:02:02 2011
New Revision: 1185601

URL: http://svn.apache.org/viewvc?rev=1185601view=rev
Log:
UIMA-2265 Added a method to remove a registerd annotation listener.

Modified:

uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java

Modified: 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java?rev=1185601r1=1185600r2=1185601view=diff
==
--- 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
 (original)
+++ 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
 Tue Oct 18 12:02:02 2011
@@ -1196,6 +1196,10 @@ public final class AnnotationEditor exte
   public void addAnnotationListener(IAnnotationEditorModifyListener listener) {
 mEditorListener.add(listener);
   }
+  
+  public void removeAnnotationListener(IAnnotationEditorModifyListener 
listener) {
+mEditorListener.remove(listener);
+  }
 
   /**
* Returns the selection.