You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by mb...@apache.org on 2007/08/21 09:22:04 UTC
svn commit: r567991 -
/incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
Author: mbaessler
Date: Tue Aug 21 00:22:02 2007
New Revision: 567991
URL: http://svn.apache.org/viewvc?rev=567991&view=rev
Log:
UIMA-533
applied patch UIMA-533.patch
JIRA ticket https://issues.apache.org/jira/browse/UIMA-533
Modified:
incubator/uima/sandbox/trunk/CasEditor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.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?rev=567991&r1=567990&r2=567991&view=diff
==============================================================================
--- 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 Tue Aug 21 00:22:02 2007
@@ -27,7 +27,6 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import java.util.Vector;
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.Type;
@@ -284,22 +283,28 @@
*/
@Override
public void fill(Menu menu, int index) {
- fillTypeMenu(mParentType, menu);
+ fillTypeMenu(mParentType, menu, false);
}
- private void fillTypeMenu(Type parentType, Menu parentMenu) {
- Vector childs = mTypeSystem.getDirectlySubsumedTypes(parentType);
+ private void fillTypeMenu(Type parentType, Menu parentMenu, boolean isParentIncluded) {
+ List childs = mTypeSystem.getProperlySubsumedTypes(parentType);
Menu newSubMenu;
// has this type sub types ?
// yes
if (childs.size() != 0) {
- MenuItem subMenuItem = new MenuItem(parentMenu, SWT.CASCADE);
- subMenuItem.setText(parentType.getShortName());
- newSubMenu = new Menu(subMenuItem);
- subMenuItem.setMenu(newSubMenu);
+ if (isParentIncluded) {
+ MenuItem subMenuItem = new MenuItem(parentMenu, SWT.CASCADE);
+ subMenuItem.setText(parentType.getShortName());
+
+ newSubMenu = new Menu(subMenuItem);
+ subMenuItem.setMenu(newSubMenu);
+ }
+ else {
+ newSubMenu = parentMenu;
+ }
insertAction(parentType, newSubMenu);
@@ -308,7 +313,7 @@
while (childsIterator.hasNext()) {
Type child = (Type) childsIterator.next();
- fillTypeMenu(child, newSubMenu);
+ fillTypeMenu(child, newSubMenu, true);
}
}
// no
@@ -316,7 +321,6 @@
insertAction(parentType, parentMenu);
}
}
-
protected abstract void insertAction(final Type type, Menu parentMenu);
}