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 2009/07/03 17:07:16 UTC
svn commit: r790937 - in
/incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor:
FindAnnotateAction.java FindAnnotateDialog.java fsview/TypeCombo.java
Author: joern
Date: Fri Jul 3 15:07:16 2009
New Revision: 790937
URL: http://svn.apache.org/viewvc?rev=790937&view=rev
Log:
UIMA-1418
Modified:
incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FindAnnotateAction.java
incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FindAnnotateDialog.java
incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/TypeCombo.java
Modified: incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FindAnnotateAction.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FindAnnotateAction.java?rev=790937&r1=790936&r2=790937&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FindAnnotateAction.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FindAnnotateAction.java Fri Jul 3 15:07:16 2009
@@ -42,7 +42,7 @@
public void run() {
FindAnnotateDialog dialog = new FindAnnotateDialog(
Display.getCurrent().getActiveShell(),
- editor.getDocument(), target);
+ editor.getDocument(), target, editor.getAnnotationMode());
dialog.open();
}
Modified: incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FindAnnotateDialog.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FindAnnotateDialog.java?rev=790937&r1=790936&r2=790937&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FindAnnotateDialog.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FindAnnotateDialog.java Fri Jul 3 15:07:16 2009
@@ -21,6 +21,7 @@
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.FeatureStructure;
+import org.apache.uima.cas.Type;
import org.apache.uima.caseditor.core.TaeError;
import org.apache.uima.caseditor.editor.fsview.TypeCombo;
import org.eclipse.jface.dialogs.Dialog;
@@ -57,16 +58,18 @@
private final IFindReplaceTarget findReplaceTarget;
private final ICasDocument document;
-
+ private final Type modeType;
+
private Combo findField;
private TypeCombo typeField;
-
+
private Button forwardRadioButton;
- FindAnnotateDialog(Shell parentShell, ICasDocument document, IFindReplaceTarget findReplaceTarget) {
+ FindAnnotateDialog(Shell parentShell, ICasDocument document, IFindReplaceTarget findReplaceTarget, Type modeType) {
super(parentShell);
this.document = document;
this.findReplaceTarget = findReplaceTarget;
+ this.modeType = modeType;
}
@Override
@@ -121,6 +124,7 @@
document.getCAS().getTypeSystem().getType(CAS.TYPE_NAME_ANNOTATION),
document.getCAS().getTypeSystem());
+ typeField.select(modeType);
GridData typeFieldData = new GridData();
typeFieldData.horizontalAlignment = SWT.FILL;
typeFieldData.grabExcessHorizontalSpace = true;
Modified: incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/TypeCombo.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/TypeCombo.java?rev=790937&r1=790936&r2=790937&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/TypeCombo.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/TypeCombo.java Fri Jul 3 15:07:16 2009
@@ -20,8 +20,11 @@
package org.apache.uima.caseditor.editor.fsview;
import java.util.Collection;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
import java.util.Set;
import org.apache.uima.cas.Type;
@@ -47,6 +50,8 @@
private Combo typeCombo;
+ private List<String> typeNameList;
+
public TypeCombo(Composite parent, Type superType, TypeSystem typeSystem) {
this(parent, superType, typeSystem, new LinkedList<Type>());
}
@@ -71,7 +76,7 @@
}
});
- Collection<String> typeNameList = new LinkedList<String>();
+ typeNameList = new LinkedList<String>();
typeNameList.add(superType.getName());
@@ -88,6 +93,20 @@
typeCombo.select(0);
}
+ /**
+ * Selects the given type or does nothing if the
+ * type is not listed.
+ *
+ * @param type
+ */
+ public void select(Type type) {
+ Integer typeIndex = typeNameList.indexOf(type.getName());
+
+ if (typeIndex != null) {
+ typeCombo.select(typeIndex);
+ }
+ }
+
public Type getType() {
return typeSystem.getType(typeCombo.getText());
}