You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by jo...@apache.org on 2011/05/05 21:20:30 UTC
svn commit: r1099927 - in /uima/uimaj/trunk/uimaj-ep-cas-editor: plugin.xml
src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
Author: joern
Date: Thu May 5 19:20:30 2011
New Revision: 1099927
URL: http://svn.apache.org/viewvc?rev=1099927&view=rev
Log:
UIMA-2139 Defined command and key binding for annotate action also
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/plugin.xml
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/plugin.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/plugin.xml?rev=1099927&r1=1099926&r2=1099927&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-cas-editor/plugin.xml (original)
+++ uima/uimaj/trunk/uimaj-ep-cas-editor/plugin.xml Thu May 5 19:20:30 2011
@@ -169,7 +169,13 @@
<command
categoryId="org.apache.uima.caseditor.annotate"
- id="Enter"
+ id="QuickAnnotate"
+ description="Quick Annotate"
+ name="Quick Annotate">
+ </command>
+ <command
+ categoryId="org.apache.uima.caseditor.annotate"
+ id="Annotate"
description="Quick Annotate"
name="Quick Annotate">
</command>
@@ -202,12 +208,18 @@
<extension
point="org.eclipse.ui.bindings">
<key
- commandId="Enter"
+ commandId="QuickAnnotate"
contextId="org.eclipse.ui.contexts.window"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
sequence="CR">
</key>
<key
+ commandId="Annotate"
+ contextId="org.eclipse.ui.contexts.window"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="M2+CR">
+ </key>
+ <key
commandId="WideLeftAnnotationSide"
contextId="org.eclipse.ui.contexts.window"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
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=1099927&r1=1099926&r2=1099927&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 Thu May 5 19:20:30 2011
@@ -160,6 +160,8 @@ public final class AnnotationEditor exte
*/
private class AnnotateAction extends AbstractAnnotateAction {
+ private static final String ID = "QuickAnnotate";
+
private StyledText mTextWidget;
/**
@@ -207,6 +209,8 @@ public final class AnnotationEditor exte
private class SmartAnnotateAction extends AbstractAnnotateAction {
+ private static final String ID = "Annotate";
+
@Override
public void run() {
@@ -916,8 +920,8 @@ public final class AnnotationEditor exte
// Add Annotate action
menu.appendToGroup(IWorkbenchActionConstants.MB_ADDITIONS, new Separator());
- menu.appendToGroup(IWorkbenchActionConstants.MB_ADDITIONS, getAction(ITextEditorActionDefinitionIds.SMART_ENTER));
- menu.appendToGroup(IWorkbenchActionConstants.MB_ADDITIONS, getAction("Enter"));
+ menu.appendToGroup(IWorkbenchActionConstants.MB_ADDITIONS, getAction(SmartAnnotateAction.ID));
+ menu.appendToGroup(IWorkbenchActionConstants.MB_ADDITIONS, getAction(AnnotateAction.ID));
menu.appendToGroup(IWorkbenchActionConstants.MB_ADDITIONS, getAction(ITextEditorActionDefinitionIds.DELETE));
TypeSystem typeSytem = getDocument().getCAS().getTypeSystem();
@@ -1402,23 +1406,16 @@ public final class AnnotationEditor exte
// create annotate action
AnnotateAction annotateAction = new AnnotateAction(getSourceViewer().getTextWidget());
-
- final String annotateActionID = "Enter";
-
- annotateAction.setActionDefinitionId(annotateActionID);
+ annotateAction.setActionDefinitionId(AnnotateAction.ID);
annotateAction.setText("Quick Annotate");
- setAction(annotateActionID, annotateAction);
+ setAction(AnnotateAction.ID, annotateAction);
getSite().getSelectionProvider().addSelectionChangedListener(annotateAction);
-
+
SmartAnnotateAction smartAnnotateAction = new SmartAnnotateAction();
- smartAnnotateAction.setActionDefinitionId(ITextEditorActionDefinitionIds.SMART_ENTER);
+ smartAnnotateAction.setActionDefinitionId(SmartAnnotateAction.ID);
smartAnnotateAction.setText("Annotate");
- smartAnnotateAction.setAccelerator(SWT.SHIFT | SWT.CR);
+ setAction(SmartAnnotateAction.ID, smartAnnotateAction);
getSite().getSelectionProvider().addSelectionChangedListener(smartAnnotateAction);
- setAction(ITextEditorActionDefinitionIds.SMART_ENTER, smartAnnotateAction);
-
- setActionActivationCode(ITextEditorActionDefinitionIds.SMART_ENTER, '\r', SWT.CR,
- SWT.SHIFT);
// create delete action
DeleteFeatureStructureAction deleteAnnotationAction = new DeleteFeatureStructureAction(