You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2010/05/14 15:23:24 UTC
svn commit: r944248 - in
/uima/uimaj/branches/mavenAlign/uimaj-ep-cas-editor: ./
src/main/java/org/apache/uima/caseditor/editor/FindAnnotateDialog.java
src/test/java/org/apache/uima/caseditor/editor/AnnotationStyleTest.java
Author: schor
Date: Fri May 14 13:23:24 2010
New Revision: 944248
URL: http://svn.apache.org/viewvc?rev=944248&view=rev
Log:
[UIMA-1756] merge trunk -> branch
Modified:
uima/uimaj/branches/mavenAlign/uimaj-ep-cas-editor/ (props changed)
uima/uimaj/branches/mavenAlign/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FindAnnotateDialog.java
uima/uimaj/branches/mavenAlign/uimaj-ep-cas-editor/src/test/java/org/apache/uima/caseditor/editor/AnnotationStyleTest.java (props changed)
Propchange: uima/uimaj/branches/mavenAlign/uimaj-ep-cas-editor/
------------------------------------------------------------------------------
svn:mergeinfo = /incubator/uima/uimaj/trunk/uimaj-ep-cas-editor:933233
Modified: uima/uimaj/branches/mavenAlign/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FindAnnotateDialog.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FindAnnotateDialog.java?rev=944248&r1=944247&r2=944248&view=diff
==============================================================================
--- uima/uimaj/branches/mavenAlign/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FindAnnotateDialog.java (original)
+++ uima/uimaj/branches/mavenAlign/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FindAnnotateDialog.java Fri May 14 13:23:24 2010
@@ -19,11 +19,7 @@
package org.apache.uima.caseditor.editor;
-import java.util.HashSet;
-import java.util.Set;
-
import org.apache.uima.cas.CAS;
-import org.apache.uima.cas.FeatureStructure;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.caseditor.CasEditorPlugin;
@@ -34,7 +30,6 @@ import org.apache.uima.caseditor.editor.
import org.apache.uima.caseditor.editor.action.WideLeftAnnotationSideAction;
import org.apache.uima.caseditor.editor.action.WideRightAnnotationSideAction;
import org.apache.uima.caseditor.editor.fsview.TypeCombo;
-import org.eclipse.jface.action.IAction;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.text.IFindReplaceTarget;
import org.eclipse.swt.SWT;
@@ -418,6 +413,7 @@ class FindAnnotateDialog extends Dialog
}
else if (CLOSE_BUTTON == buttonID) {
close();
+ return;
}
else {
throw new TaeError("Unkown button!");
Propchange: uima/uimaj/branches/mavenAlign/uimaj-ep-cas-editor/src/test/java/org/apache/uima/caseditor/editor/AnnotationStyleTest.java
('svn:mergeinfo' removed)