svn commit: r556527 - in /incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/editor: AnnotationEditor.java ChangeModeAction.java

[mb...@apache.org]

Author: mbaessler
Date: Mon Jul 16 00:15:03 2007
New Revision: 556527

URL: http://svn.apache.org/viewvc?view=rev&rev=556527
Log:
UIMA-454

applied patch UIMA-454.patch

JIRA ticket https://issues.apache.org/jira/browse/UIMA-454

Modified:
    incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
    incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/editor/ChangeModeAction.java

Modified: incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java?view=diff&rev=556527&r1=556526&r2=556527
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java (original)
+++ incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java Mon Jul 16 00:15:03 2007
@@ -628,7 +628,7 @@
 	    EditorAnnotationStatus status = mDocument.getProject().getEditorAnnotationStatus();
       
       
-	    setAnnotationType(status.getMode());
+	    setAnnotationMode(status.getMode());
     }
   }
 
@@ -715,11 +715,13 @@
    * 
    * @param type
    */
-  protected void setAnnotationType(Type type) {
+  protected void setAnnotationMode(Type type) {
     // TODO: check if this type is a subtype of Annotation
 
     mAnnotationMode = type;
 
+    highlight(0, 0);
+    
     setProjectEditorStatus();
 
     updateStatusLineModeItem();
@@ -877,11 +879,12 @@
 
       // only process these selection if the annotations belong
       // to the current editor instance
-      if (getSite().getPage().getActiveEditor() == this && !annotations.isEmpty()) {
+      if (getSite().getPage().getActiveEditor() == this && !annotations.isEmpty() 
+              && annotations.getFirst().getType() == mAnnotationMode) {
         highlight(annotations.getFirst().getBegin(), annotations.getLast().getEnd()
                 - annotations.getFirst().getBegin());
 
-        // move caret to new positon when selected outside of the editor
+        // move caret to new position when selected outside of the editor
         if (AnnotationEditor.this != part)
         // TODO: replace with this == part and test it
         {

Modified: incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/editor/ChangeModeAction.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/editor/ChangeModeAction.java?view=diff&rev=556527&r1=556526&r2=556527
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/editor/ChangeModeAction.java (original)
+++ incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/editor/ChangeModeAction.java Mon Jul 16 00:15:03 2007
@@ -66,7 +66,7 @@
   @Override
   public void run() {
     if (mEditor != null) {
-      mEditor.setAnnotationType(mMode);
+      mEditor.setAnnotationMode(mMode);
     }
   }
 }