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

[jo...@apache.org]

Author: joern
Date: Wed Apr 13 12:59:46 2011
New Revision: 1091767

URL: http://svn.apache.org/viewvc?rev=1091767&view=rev
Log:
UIMA-2125 Added key bindings to change selected annotation span

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=1091767&r1=1091766&r2=1091767&view=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 Wed Apr 13 12:59:46 2011
@@ -36,6 +36,10 @@ import org.apache.uima.cas.TypeSystem;
 import org.apache.uima.cas.text.AnnotationFS;
 import org.apache.uima.caseditor.CasEditorPlugin;
 import org.apache.uima.caseditor.editor.action.DeleteFeatureStructureAction;
+import org.apache.uima.caseditor.editor.action.LowerLeftAnnotationSideAction;
+import org.apache.uima.caseditor.editor.action.LowerRightAnnotationSideAction;
+import org.apache.uima.caseditor.editor.action.WideLeftAnnotationSideAction;
+import org.apache.uima.caseditor.editor.action.WideRightAnnotationSideAction;
 import org.apache.uima.caseditor.editor.annotation.DrawingStyle;
 import org.apache.uima.caseditor.editor.annotation.EclipseAnnotationPeer;
 import org.apache.uima.caseditor.editor.context.AnnotationEditingControlCreator;
@@ -324,16 +328,20 @@ public final class AnnotationEditor exte
     @Override
     public void updatedAnnotation(Collection<AnnotationFS> annotations) {
 
+      List<AnnotationFS> selectedFSes = getSelectedAnnotations();
+      
+      // TODO: Improve update handling
+      // Removing and adding is problematic because the selection goes away
       removedAnnotation(annotations);
       addedAnnotation(annotations);
 
       List<ModelFeatureStructure> structures = new LinkedList<ModelFeatureStructure>();
 
-      for (AnnotationFS annotation : annotations) {
+      for (AnnotationFS annotation : selectedFSes) {
         structures.add(new ModelFeatureStructure(getDocument(), annotation));
       }
 
-      selectionChanged(getSite().getPage().getActivePart(), new StructuredSelection(structures));
+      mFeatureStructureSelectionProvider.setSelection(getDocument(), selectedFSes);
     }
 
     public void changed() {
@@ -1388,8 +1396,7 @@ public final class AnnotationEditor exte
     getSite().getSelectionProvider().addSelectionChangedListener(annotateAction);
     
     setAction(annotateActionID, annotateAction);
-    setActionActivationCode(annotateActionID, '\r', SWT.CR,
-            SWT.NONE);
+    setActionActivationCode(annotateActionID, '\r', -1, SWT.DEFAULT);
 
     SmartAnnotateAction smartAnnotateAction = new SmartAnnotateAction();
     smartAnnotateAction.setActionDefinitionId(ITextEditorActionDefinitionIds.SMART_ENTER);
@@ -1423,6 +1430,34 @@ public final class AnnotationEditor exte
     FindAnnotateAction findAnnotateAction = new FindAnnotateAction(this, getSourceViewer().getFindReplaceTarget());
     findAnnotateAction.setActionDefinitionId(IWorkbenchActionDefinitionIds.FIND_REPLACE);
     setAction(ITextEditorActionConstants.FIND, findAnnotateAction);
+    
+    // Lower left side of annotation action
+    LowerLeftAnnotationSideAction lowerLeftAnnotationSideAction = new LowerLeftAnnotationSideAction(getDocument());
+    lowerLeftAnnotationSideAction.setActionDefinitionId("LowerLeftAnnotationSide");
+    setActionActivationCode("LowerLeftAnnotationSide", 'm', -1, SWT.CTRL);
+    setAction("LowerLeftAnnotationSide", lowerLeftAnnotationSideAction);
+    getSite().getSelectionProvider().addSelectionChangedListener(lowerLeftAnnotationSideAction);
+    
+    // Wide left side of annotation action
+    WideLeftAnnotationSideAction wideLeftAnnotationSide = new WideLeftAnnotationSideAction(getDocument());
+    wideLeftAnnotationSide.setActionDefinitionId("WideLeftAnnotationSide");
+    setActionActivationCode("WideLeftAnnotationSide", 'n', -1, SWT.CTRL);
+    setAction("WideLeftAnnotationSide", wideLeftAnnotationSide);
+    getSite().getSelectionProvider().addSelectionChangedListener(wideLeftAnnotationSide);
+    
+    // Lower right side of annotation
+    LowerRightAnnotationSideAction lowerRightAnnotationSideAction = new LowerRightAnnotationSideAction(getDocument());
+    lowerRightAnnotationSideAction.setActionDefinitionId("LowerRightAnnotationSide");
+    setActionActivationCode("LowerRightAnnotationSide", ',', -1, SWT.CTRL);
+    setAction("LowerRightAnnotationSide", lowerRightAnnotationSideAction);
+    getSite().getSelectionProvider().addSelectionChangedListener(lowerRightAnnotationSideAction);
+    
+    // Wide right side of annotation
+    WideRightAnnotationSideAction wideRightAnnotationSideAction = new WideRightAnnotationSideAction(getDocument());
+    wideRightAnnotationSideAction.setActionDefinitionId("WideRightAnnotationSide");
+    setActionActivationCode("WideRightAnnotationSide", '.', -1, SWT.CTRL);
+    setAction("WideRightAnnotationSide", wideRightAnnotationSideAction);
+    getSite().getSelectionProvider().addSelectionChangedListener(wideRightAnnotationSideAction);
   }
 
   @Override