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/04/04 13:54:43 UTC
svn commit: r1088570 - in
/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor:
AnnotationEditor.java contextmenu/ModeMenu.java
Author: joern
Date: Mon Apr 4 11:54:43 2011
New Revision: 1088570
URL: http://svn.apache.org/viewvc?rev=1088570&view=rev
Log:
UIMA-1893 Selected mode is now marked in the menu
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/contextmenu/ModeMenu.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=1088570&r1=1088569&r2=1088570&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 Mon Apr 4 11:54:43 2011
@@ -896,7 +896,7 @@ public final class AnnotationEditor exte
MenuManager modeMenuManager = new MenuManager("Mode");
menu.appendToGroup(IWorkbenchActionConstants.MB_ADDITIONS, modeMenuManager);
- ModeMenu modeMenu = new ModeMenu(typeSytem);
+ ModeMenu modeMenu = new ModeMenu(typeSytem, this);
modeMenu.addListener(new IModeMenuListener(){
public void modeChanged(Type newMode) {
Modified: uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/contextmenu/ModeMenu.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/contextmenu/ModeMenu.java?rev=1088570&r1=1088569&r2=1088570&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/contextmenu/ModeMenu.java (original)
+++ uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/contextmenu/ModeMenu.java Mon Apr 4 11:54:43 2011
@@ -25,6 +25,7 @@ import java.util.Set;
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.TypeSystem;
+import org.apache.uima.caseditor.editor.AnnotationEditor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
@@ -36,6 +37,8 @@ import org.eclipse.swt.widgets.MenuItem;
*/
public class ModeMenu extends TypeMenu {
+ private AnnotationEditor editor;
+
private Set<IModeMenuListener> listeners = new HashSet<IModeMenuListener>();
/**
@@ -44,8 +47,9 @@ public class ModeMenu extends TypeMenu {
* @param type
* @param typeSystem
*/
- public ModeMenu(TypeSystem typeSystem) {
+ public ModeMenu(TypeSystem typeSystem, AnnotationEditor editor) {
super(typeSystem.getType(CAS.TYPE_NAME_ANNOTATION), typeSystem);
+ this.editor = editor;
}
public void addListener(IModeMenuListener listener) {
@@ -58,9 +62,12 @@ public class ModeMenu extends TypeMenu {
@Override
protected void insertAction(final Type type, Menu parentMenu) {
- MenuItem actionItem = new MenuItem(parentMenu, SWT.PUSH);
+ MenuItem actionItem = new MenuItem(parentMenu, SWT.CHECK);
actionItem.setText(type.getShortName());
-
+
+ if (type.equals(editor.getAnnotationMode()))
+ actionItem.setSelection(true);
+
actionItem.addListener(SWT.Selection, new Listener() {
public void handleEvent(Event e) {