svn commit: r1185575 - in /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view: browser/ selection/ tree/

2011-10-18 Thread pkluegl
Author: pkluegl
Date: Tue Oct 18 11:16:53 2011
New Revision: 1185575

URL: http://svn.apache.org/viewvc?rev=1185575view=rev
Log:
UIMA-2252
Removed SelectionViewPage and AnnotationBrowserPage, AnnotationTreeViewPage 
isn't abstract anymore and AnnotationTreeViewPage is used directly in both 
views now. Listener are removed when disposing the page. Directly using 
argument of AnnotationTreeViewPage.annotationModeChanged.

Removed:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/browser/AnnotationBrowserPage.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/selection/SelectionViewPage.java
Modified:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/browser/AnnotationBrowserView.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/selection/SelectionView.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/tree/AnnotationTreeContentProvider.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/tree/AnnotationTreeViewPage.java

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/browser/AnnotationBrowserView.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/browser/AnnotationBrowserView.java?rev=1185575r1=1185574r2=1185575view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/browser/AnnotationBrowserView.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/browser/AnnotationBrowserView.java
 Tue Oct 18 11:16:53 2011
@@ -22,6 +22,7 @@ package org.apache.uima.textmarker.cased
 import org.apache.uima.caseditor.editor.AnnotationEditor;
 import org.apache.uima.caseditor.editor.AnnotationEditorView;
 import org.apache.uima.caseditor.editor.ICasEditor;
+import org.apache.uima.textmarker.caseditor.view.tree.AnnotationTreeViewPage;
 
 public class AnnotationBrowserView extends AnnotationEditorView {
   public static final String ID = org.apache.uima.caseditor.browser;
@@ -34,7 +35,7 @@ public class AnnotationBrowserView exten
   protected PageRec doCreatePage(ICasEditor editor) {
 PageRec result = null;
 if (editor.getDocument() != null  editor instanceof AnnotationEditor) {
-  AnnotationBrowserPage page = new 
AnnotationBrowserPage((AnnotationEditor) editor);
+  AnnotationTreeViewPage page = new AnnotationTreeViewPage(false, 
(AnnotationEditor) editor);
   initPage(page);
   page.createControl(getPageBook());
   result = new PageRec(editor, page);

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/selection/SelectionView.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/selection/SelectionView.java?rev=1185575r1=1185574r2=1185575view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/selection/SelectionView.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/selection/SelectionView.java
 Tue Oct 18 11:16:53 2011
@@ -22,6 +22,7 @@ package org.apache.uima.textmarker.cased
 import org.apache.uima.caseditor.editor.AnnotationEditor;
 import org.apache.uima.caseditor.editor.AnnotationEditorView;
 import org.apache.uima.caseditor.editor.ICasEditor;
+import org.apache.uima.textmarker.caseditor.view.tree.AnnotationTreeViewPage;
 
 /**
  */
@@ -37,7 +38,7 @@ public final class SelectionView extends
   protected PageRec doCreatePage(ICasEditor editor) {
 PageRec result = null;
 if (editor.getDocument() != null  editor instanceof AnnotationEditor) {
-  SelectionViewPage page = new SelectionViewPage((AnnotationEditor) 
editor);
+  AnnotationTreeViewPage page = new AnnotationTreeViewPage(true, 
(AnnotationEditor) editor);
   initPage(page);
   page.createControl(getPageBook());
   result = new PageRec(editor, page);

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/tree/AnnotationTreeContentProvider.java
URL: 
http://svn.apache.org/viewvc

svn commit: r1185586 - /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/META-INF/MANIFEST.MF

2011-10-18 Thread pkluegl
Author: pkluegl
Date: Tue Oct 18 11:41:56 2011
New Revision: 1185586

URL: http://svn.apache.org/viewvc?rev=1185586view=rev
Log:
UIMA-2252
changed plugin id to org.apache.uima.textmarker.caseditor

Modified:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/META-INF/MANIFEST.MF

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/META-INF/MANIFEST.MF
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/META-INF/MANIFEST.MF?rev=1185586r1=1185585r2=1185586view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/META-INF/MANIFEST.MF
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/META-INF/MANIFEST.MF
 Tue Oct 18 11:41:56 2011
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: uimaj-ep-textmarker-caseditor
-Bundle-SymbolicName: uimaj-ep-textmarker-caseditor;singleton:=true
+Bundle-SymbolicName: org.apache.uima.textmarker.caseditor;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.apache.uima.caseditor;bundle-version=2.4.0,




svn commit: r1186126 - in /uima/uimaj/trunk: uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/ uimaj-ep-cas-editor/ uimaj-ep-cas-editor/schema/ uimaj-ep-cas-editor/src/main/java/org

2011-10-19 Thread pkluegl
Author: pkluegl
Date: Wed Oct 19 11:53:58 2011
New Revision: 1186126

URL: http://svn.apache.org/viewvc?rev=1186126view=rev
Log:
UIMA-2266
Added extension point for type system search strategies and integrated the 
extension in the DefaultCasDocumentProvider. Early version, tested only with 
one external additional strategy. No user settings in the preferences are 
available yet. The new package needs to be exported, but I have no clue what to 
do with the generated manifest.

Added:

uima/uimaj/trunk/uimaj-ep-cas-editor/schema/org.apache.uima.caseditor.searchstrategy.exsd

uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/searchStrategy/

uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/searchStrategy/ITypeSystemSearchStrategy.java

uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/searchStrategy/TypeSystemSearchStrategyFactory.java
Modified:

uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
uima/uimaj/trunk/uimaj-ep-cas-editor/plugin.xml

Modified: 
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java?rev=1186126r1=1186125r2=1186126view=diff
==
--- 
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
 (original)
+++ 
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
 Wed Oct 19 11:53:58 2011
@@ -23,14 +23,12 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.charset.Charset;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 
 import org.apache.uima.cas.CAS;
-import org.apache.uima.cas.Type;
 import org.apache.uima.cas.TypeSystem;
 import org.apache.uima.caseditor.CasEditorPlugin;
 import org.apache.uima.caseditor.core.model.DefaultColors;
@@ -42,6 +40,8 @@ import org.apache.uima.caseditor.editor.
 import org.apache.uima.caseditor.editor.DocumentUimaImpl;
 import org.apache.uima.caseditor.editor.ICasDocument;
 import org.apache.uima.caseditor.editor.ICasEditor;
+import 
org.apache.uima.caseditor.editor.searchStrategy.ITypeSystemSearchStrategy;
+import 
org.apache.uima.caseditor.editor.searchStrategy.TypeSystemSearchStrategyFactory;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IResourceChangeEvent;
@@ -73,8 +73,8 @@ public class DefaultCasDocumentProvider 
 org.apache.uima.caseditor.editor.CasDocumentProvider {
 
   /**
-   * Listens for resource remove/delete event, if the input file for the
-   * editor is removed the editor will be closed.
+   * Listens for resource remove/delete event, if the input file for the 
editor is removed the
+   * editor will be closed.
*/
   private class DeleteElementListener implements IResourceChangeListener {
 
@@ -93,7 +93,7 @@ public class DefaultCasDocumentProvider 
  delta.getResource().getType() == IResource.FILE) {
   if (delta.getKind() == IResourceDelta.REMOVED) {
 IResource resource = delta.getResource();
-
+
 if (resource.equals(fileInput.getFile())) {
   handleElementDeleted(fileInput);
 }
@@ -110,97 +110,94 @@ public class DefaultCasDocumentProvider 
   }
 }
   }
-  
+
   private static class FileElementInfo extends ElementInfo {
-
+
 private DeleteElementListener deleteListener;
-
+
 FileElementInfo(ElementInfo info) {
   super(info.element);
 }
   }
-  
+
   private class SaveSessionPreferencesTrigger implements 
IPropertyChangeListener {
 private Object element;
-
+
 SaveSessionPreferencesTrigger(Object element) {
   this.element = element;
 }
-
+
 public void propertyChange(PropertyChangeEvent event) {
   IResource tsFile = ResourcesPlugin.getWorkspace().getRoot()
-  .findMember((getTypesystemId(element)));
-  
+  .findMember((getTypesystemId(element)));
+
   PreferenceStore prefStore = (PreferenceStore) 
getSessionPreferenceStore(element);
-  
+
   ByteArrayOutputStream prefBytes = new ByteArrayOutputStream();
   try {
 prefStore.save(prefBytes, );
   } catch (IOException e) {
 CasEditorIdePlugin.log(e);
   }
-  
+
   try {
-tsFile.setPersistentProperty(
-new QualifiedName(, CAS_EDITOR_SESSION_PROPERTIES),
-new String

svn commit: r1186189 - in /uima/uimaj/trunk: uimaj-ep-cas-editor-ide/ uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/ uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/casedit

2011-10-19 Thread pkluegl
Author: pkluegl
Date: Wed Oct 19 13:17:47 2011
New Revision: 1186189

URL: http://svn.apache.org/viewvc?rev=1186189view=rev
Log: (empty)

Added:

uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/searchstrategy/

uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/searchstrategy/ITypeSystemSearchStrategy.java
  - copied, changed from r1186126, 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/searchStrategy/ITypeSystemSearchStrategy.java

uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/searchstrategy/TypeSystemSearchStrategyFactory.java
  - copied, changed from r1186126, 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/searchStrategy/TypeSystemSearchStrategyFactory.java
Removed:

uima/uimaj/trunk/uimaj-ep-cas-editor/schema/org.apache.uima.caseditor.searchstrategy.exsd

uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/searchStrategy/
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml

uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
uima/uimaj/trunk/uimaj-ep-cas-editor/plugin.xml

Modified: uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml?rev=1186189r1=1186188r2=1186189view=diff
==
--- uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml (original)
+++ uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml Wed Oct 19 13:17:47 2011
@@ -22,6 +22,7 @@
 
 plugin
extension-point id=org.apache.uima.caseditor.editor 
name=DocumentProvider schema=schema/org.apache.uima.caseditor.editor.exsd/
+   extension-point id=org.apache.uima.caseditor.ide.searchstrategy 
name=Type System Search Strategy 
schema=schema/org.apache.uima.caseditor.ide.searchstrategy.exsd/
 
extension point=org.eclipse.core.resources.natures
id=NLPProject name=UIMA Cas Editor Nature

Modified: 
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java?rev=1186189r1=1186188r2=1186189view=diff
==
--- 
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
 (original)
+++ 
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
 Wed Oct 19 13:17:47 2011
@@ -40,8 +40,8 @@ import org.apache.uima.caseditor.editor.
 import org.apache.uima.caseditor.editor.DocumentUimaImpl;
 import org.apache.uima.caseditor.editor.ICasDocument;
 import org.apache.uima.caseditor.editor.ICasEditor;
-import 
org.apache.uima.caseditor.editor.searchStrategy.ITypeSystemSearchStrategy;
-import 
org.apache.uima.caseditor.editor.searchStrategy.TypeSystemSearchStrategyFactory;
+import org.apache.uima.caseditor.ide.searchstrategy.ITypeSystemSearchStrategy;
+import 
org.apache.uima.caseditor.ide.searchstrategy.TypeSystemSearchStrategyFactory;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IResourceChangeEvent;

Copied: 
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/searchstrategy/ITypeSystemSearchStrategy.java
 (from r1186126, 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/searchStrategy/ITypeSystemSearchStrategy.java)
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/searchstrategy/ITypeSystemSearchStrategy.java?p2=uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/searchstrategy/ITypeSystemSearchStrategy.javap1=uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/searchStrategy/ITypeSystemSearchStrategy.javar1=1186126r2=1186189rev=1186189view=diff
==
--- 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/searchStrategy/ITypeSystemSearchStrategy.java
 (original)
+++ 
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/searchstrategy/ITypeSystemSearchStrategy.java
 Wed Oct 19 13:17:47 2011
@@ -1,4 +1,4 @@
-package org.apache.uima.caseditor.editor.searchStrategy;
+package org.apache.uima.caseditor.ide.searchstrategy;
 
 import org.eclipse.core.resources.IFile;
 

Copied: 
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima

svn commit: r1186190 - /uima/uimaj/trunk/uimaj-ep-cas-editor/schema/org.apache.uima.caseditor.ide.searchstrategy.exsd

2011-10-19 Thread pkluegl
Author: pkluegl
Date: Wed Oct 19 13:18:26 2011
New Revision: 1186190

URL: http://svn.apache.org/viewvc?rev=1186190view=rev
Log:
UIMA-2266
moved the type system search strategy code and extension point to the ide plugin

Added:

uima/uimaj/trunk/uimaj-ep-cas-editor/schema/org.apache.uima.caseditor.ide.searchstrategy.exsd
  - copied, changed from r1186126, 
uima/uimaj/trunk/uimaj-ep-cas-editor/schema/org.apache.uima.caseditor.searchstrategy.exsd

Copied: 
uima/uimaj/trunk/uimaj-ep-cas-editor/schema/org.apache.uima.caseditor.ide.searchstrategy.exsd
 (from r1186126, 
uima/uimaj/trunk/uimaj-ep-cas-editor/schema/org.apache.uima.caseditor.searchstrategy.exsd)
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/schema/org.apache.uima.caseditor.ide.searchstrategy.exsd?p2=uima/uimaj/trunk/uimaj-ep-cas-editor/schema/org.apache.uima.caseditor.ide.searchstrategy.exsdp1=uima/uimaj/trunk/uimaj-ep-cas-editor/schema/org.apache.uima.caseditor.searchstrategy.exsdr1=1186126r2=1186190rev=1186190view=diff
==
--- 
uima/uimaj/trunk/uimaj-ep-cas-editor/schema/org.apache.uima.caseditor.searchstrategy.exsd
 (original)
+++ 
uima/uimaj/trunk/uimaj-ep-cas-editor/schema/org.apache.uima.caseditor.ide.searchstrategy.exsd
 Wed Oct 19 13:18:26 2011
@@ -1,10 +1,10 @@
 ?xml version='1.0' encoding='UTF-8'?
 !-- Schema file written by PDE --
-schema targetNamespace=org.apache.uima.caseditor.editor 
xmlns=http://www.w3.org/2001/XMLSchema;
+schema targetNamespace=org.apache.uima.caseditor.ide 
xmlns=http://www.w3.org/2001/XMLSchema;
 annotation
-  appinfo
- meta.schema plugin=org.apache.uima.caseditor.editor 
id=org.apache.uima.caseditor.searchstrategy. name=Type System Search 
Strategy/
-  /appinfo
+  appInfo
+ meta.schema plugin=org.apache.uima.caseditor.ide 
id=org.apache.uima.caseditor.ide.searchstrategy. name=Type System Search 
Strategy/
+  /appInfo
   documentation
  
   /documentation
@@ -12,9 +12,9 @@
 
element name=extension
   annotation
- appinfo
+ appInfo
 meta.element /
- /appinfo
+ /appInfo
   /annotation
   complexType
  sequence
@@ -39,9 +39,9 @@
documentation
   
/documentation
-   appinfo
+   appInfo
   meta.attribute translatable=true/
-   /appinfo
+   /appInfo
 /annotation
  /attribute
   /complexType
@@ -54,9 +54,9 @@
documentation
   the qualified name of the document provider class
/documentation
-   appinfo
+   appInfo
   meta.attribute kind=java 
basedOn=:org.apache.uima.caseditor.searchStrategy.ICasEditorSearchStrategy/
-   /appinfo
+   /appInfo
 /annotation
  /attribute
  attribute name=id type=string use=required
@@ -88,9 +88,9 @@
 
 
annotation
-  appinfo
+  appInfo
  meta.section type=copyright/
-  /appinfo
+  /appInfo
   documentation
  Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file




svn commit: r1186203 - /uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java

2011-10-19 Thread pkluegl
Author: pkluegl
Date: Wed Oct 19 13:27:46 2011
New Revision: 1186203

URL: http://svn.apache.org/viewvc?rev=1186203view=rev
Log:
UIMA-2267
added check and refresh if the type system is out of sync

Modified:

uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java

Modified: 
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java?rev=1186203r1=1186202r2=1186203view=diff
==
--- 
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
 (original)
+++ 
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
 Wed Oct 19 13:27:46 2011
@@ -52,6 +52,7 @@ import org.eclipse.core.resources.Resour
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.QualifiedName;
 import org.eclipse.core.runtime.Status;
@@ -239,6 +240,10 @@ public class DefaultCasDocumentProvider 
 
   if (typeSystemFile != null  typeSystemFile.exists()) {
 
+if (!typeSystemFile.isSynchronized(IResource.DEPTH_ZERO)) {
+  typeSystemFile.refreshLocal(IResource.DEPTH_ZERO, new 
NullProgressMonitor());
+}
+
 // TODO: Update this comment!
 // Try to load a style file for the type system
 // Should be named: ts file name, prefixed with .style-




svn commit: r1186205 - /uima/uimaj/trunk/uimaj-ep-cas-editor/schema/org.apache.uima.caseditor.ide.searchstrategy.exsd

2011-10-19 Thread pkluegl
Author: pkluegl
Date: Wed Oct 19 13:29:20 2011
New Revision: 1186205

URL: http://svn.apache.org/viewvc?rev=1186205view=rev
Log:
UIMA-2266
removed schema again. SVN did something wrong...

Removed:

uima/uimaj/trunk/uimaj-ep-cas-editor/schema/org.apache.uima.caseditor.ide.searchstrategy.exsd



svn commit: r1186210 - in /uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/searchstrategy: ITypeSystemSearchStrategy.java TypeSystemSearchStrategyFactory.java

2011-10-19 Thread pkluegl
Author: pkluegl
Date: Wed Oct 19 13:43:26 2011
New Revision: 1186210

URL: http://svn.apache.org/viewvc?rev=1186210view=rev
Log:
UIMA-2266
Added missing headers

Modified:

uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/searchstrategy/ITypeSystemSearchStrategy.java

uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/searchstrategy/TypeSystemSearchStrategyFactory.java

Modified: 
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/searchstrategy/ITypeSystemSearchStrategy.java
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/searchstrategy/ITypeSystemSearchStrategy.java?rev=1186210r1=1186209r2=1186210view=diff
==
--- 
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/searchstrategy/ITypeSystemSearchStrategy.java
 (original)
+++ 
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/searchstrategy/ITypeSystemSearchStrategy.java
 Wed Oct 19 13:43:26 2011
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package org.apache.uima.caseditor.ide.searchstrategy;
 
 import org.eclipse.core.resources.IFile;

Modified: 
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/searchstrategy/TypeSystemSearchStrategyFactory.java
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/searchstrategy/TypeSystemSearchStrategyFactory.java?rev=1186210r1=1186209r2=1186210view=diff
==
--- 
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/searchstrategy/TypeSystemSearchStrategyFactory.java
 (original)
+++ 
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/searchstrategy/TypeSystemSearchStrategyFactory.java
 Wed Oct 19 13:43:26 2011
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package org.apache.uima.caseditor.ide.searchstrategy;
 
 import java.util.Map;




svn commit: r1186298 - in /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/query/ui: BasicEngine.xml BasicTypeSystem.xml InternalTypeSystem.xml QueryA

2011-10-19 Thread pkluegl
Author: pkluegl
Date: Wed Oct 19 16:10:42 2011
New Revision: 1186298

URL: http://svn.apache.org/viewvc?rev=1186298view=rev
Log:
UIMA-2268
- added method to remove debug annotation before query

Additionally:
- removed descriptors, using descriptors in engine project now
- removed speed bottleneck when updating the result viewer

Removed:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/query/ui/BasicEngine.xml

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/query/ui/BasicTypeSystem.xml

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/query/ui/InternalTypeSystem.xml
Modified:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/query/ui/QueryActionHandler.java

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/query/ui/QueryActionHandler.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/query/ui/QueryActionHandler.java?rev=1186298r1=1186297r2=1186298view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/query/ui/QueryActionHandler.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/query/ui/QueryActionHandler.java
 Wed Oct 19 16:10:42 2011
@@ -37,6 +37,7 @@ import org.apache.uima.cas.FeatureStruct
 import org.apache.uima.cas.Type;
 import org.apache.uima.cas.impl.XmiCasDeserializer;
 import org.apache.uima.cas.text.AnnotationFS;
+import org.apache.uima.cas.text.AnnotationIndex;
 import org.apache.uima.jcas.cas.FSArray;
 import org.apache.uima.resource.ResourceManager;
 import org.apache.uima.resource.ResourceSpecifier;
@@ -142,7 +143,7 @@ public class QueryActionHandler implemen
   // script += TYPESYSTEM  + typeSystemFileText.getText();
   script += rules;
   try {
-URL aedesc = getClass().getResource(BasicEngine.xml);
+URL aedesc = TextMarkerEngine.class.getResource(BasicEngine.xml);
 XMLInputSource inae = new XMLInputSource(aedesc);
 ResourceSpecifier specifier = 
UIMAFramework.getXMLParser().parseResourceSpecifier(inae);
 ResourceManager resMgr = UIMAFramework.newDefaultResourceManager();
@@ -213,8 +214,6 @@ public class QueryActionHandler implemen
 cas.setDocumentText(getText(each));
   }
 
-  ae.process(cas);
-
   Type matchedType = cas.getTypeSystem().getType(
   org.apache.uima.textmarker.type.DebugMatchedRuleMatch);
   Type ruleApplyType = cas.getTypeSystem().getType(
@@ -222,6 +221,10 @@ public class QueryActionHandler implemen
   Type blockApplyType = cas.getTypeSystem().getType(
   org.apache.uima.textmarker.type.DebugBlockApply);
 
+  removeDebugAnnotations(cas, matchedType, ruleApplyType, 
blockApplyType);
+
+  ae.process(cas);
+
   Feature innerApplyFeature = 
blockApplyType.getFeatureByBaseName(innerApply);
   Feature ruleApplyFeature = 
blockApplyType.getFeatureByBaseName(rules);
   FSIteratorAnnotationFS iterator = 
cas.getAnnotationIndex(blockApplyType).iterator();
@@ -241,12 +244,14 @@ public class QueryActionHandler implemen
 
 final int constFound = found;
 final int constFiles = files;
-queryComposite.getDisplay().asyncExec(new Runnable() {
+queryComposite.getDisplay().syncExec(new Runnable() {
   @Override
   public void run() {
+queryComposite.setResult(result);
 queryComposite.setResultInfo(constFound, constFiles);
   }
 });
+
   }
 
   monitor.worked(1);
@@ -261,6 +266,26 @@ public class QueryActionHandler implemen
 
 }
 
+private void removeDebugAnnotations(CAS cas, Type matchedType, Type 
ruleApplyType,
+Type blockApplyType) {
+  CollectionAnnotationFS toRemove = new ArrayListAnnotationFS();
+  AnnotationIndexAnnotationFS annotationIndex = 
cas.getAnnotationIndex(blockApplyType);
+  for (AnnotationFS annotationFS : annotationIndex) {
+toRemove.add(annotationFS);
+  }
+  annotationIndex = cas.getAnnotationIndex(ruleApplyType);
+  for (AnnotationFS annotationFS : annotationIndex) {
+toRemove.add(annotationFS);
+  }
+  annotationIndex = cas.getAnnotationIndex(matchedType);
+  for (AnnotationFS annotationFS : annotationIndex) {
+toRemove.add(annotationFS);
+  }
+  for (AnnotationFS annotationFS : toRemove) {
+cas.removeFsFromIndexes(annotationFS);
+  }
+}
+
 public int findRuleMatches(final ListQueryResult

svn commit: r1186749 [3/7] - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/ uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/tex

2011-10-20 Thread pkluegl
Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.tokens
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.tokens?rev=1186749r1=1186748r2=1186749view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.tokens
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.tokens
 Thu Oct 20 11:46:23 2011
@@ -1,150 +1,151 @@
-STAR=137
-FloatTypeSuffix=112
-OctalLiteral=110
-FILTERMARKUP=48
-LOG=38
-CONTAINS=8
-REMOVE=66
-GREATEREQUAL=150
-MARKFAST=42
-MATCHEDTEXT=72
-CONDITION=91
-COUNT=14
-LOGN=99
-NOT=64
-Identifier=122
-ACTION=92
-NOTEQUAL=147
-CLEAR=74
-VBAR=139
-DOUBLELIST=95
-ENDSWITH=63
-RPAREN=124
-CREATE=32
-GREATER=142
-SIN=100
-EXP=98
-CURRENTCOUNT=16
-COS=101
-TAN=102
-TYPELIST=97
-LESS=141
-REGEXP=26
-GET=69
-PARTOF=23
-UNMARK=55
-LAST=19
-COMMENT=152
-REMOVEDUPLICATE=67
-UNMARKALL=56
-RBRACK=126
-NEAR=21
-LINE_COMMENT=153
-IntegerTypeSuffix=107
-MARKSCORE=40
-REMOVESTRING=73
-TRANSFER=57
-LCURLY=127
-TRIE=7
-FILTERTYPE=49
-RETAINMARKUP=46
-STRINGLIST=96
-MARKONCE=41
-ScriptString=80
-EngineString=81
-WS=151
-WORDTABLE=11
-WORDLIST=10
-AutomataBlockString=83
-FloatingPointLiteral=113
-INTLIST=94
-OR=22
-JavaIDDigit=121
-CALL=50
-Annotation=5
-FALSE=105
-LESSEQUAL=149
-RessourceLiteral=117
-VOTE=28
-Letter=120
-EscapeSequence=114
-SIZE=71
-BasicAnnotationType=76
-LBRACK=125
-CharacterLiteral=115
-DEL=37
-ATTRIBUTE=35
-TypeString=84
-Exponent=111
-ASSIGN_EQUAL=143
-RETAINTYPE=47
-AND=12
-TypeSystemString=89
-EXPAND=58
-BlockString=82
-IntString=85
-HexDigit=106
-COLOR=36
-LPAREN=123
-POSITION=25
-IF=29
-AT=130
-LogLevel=77
-SLASH=138
-THEN=75
-FILL=34
-COMMA=133
-IS=61
-AMPER=140
-REPLACE=45
-GETLIST=70
-EQUAL=146
-GATHER=33
-INLIST=17
-PLUS=135
-BooleanString=88
-GETFEATURE=54
-DOT=131
-ListIdentifier=6
-PARTOFNEQ=24
-BOOLEANLIST=93
-ADD=65
-MARKTABLE=43
-HexLiteral=108
-XOR=103
-PERCENT=144
-MARK=39
-PARSE=31
-PackageString=79
-OldColor=78
-MARKLAST=44
-MERGE=68
-CONTEXTCOUNT=13
-BEFORE=59
-EXEC=51
-MINUS=136
-AFTER=60
-DecimalLiteral=109
-SEMI=134
-TRUE=104
-FEATURE=30
-SymbolString=90
-COLON=132
-StringLiteral=116
-StringString=87
-SCORE=27
-QUESTION=145
-UnicodeEscape=118
-RCURLY=128
-STARTSWITH=62
-ASSIGN=52
-TOTALCOUNT=15
-DECLARE=9
-DocComment=4
-ISINTAG=18
-MOFN=20
-OctalEscape=119
-SETFEATURE=53
-DoubleString=86
-CIRCUMFLEX=129
-ALT_NOTEQUAL=148
+ACTION=4
+ADD=5
+AFTER=6
+ALT_NOTEQUAL=7
+AMPER=8
+AND=9
+ASSIGN=10
+ASSIGN_EQUAL=11
+AT=12
+ATTRIBUTE=13
+Annotation=14
+AutomataBlockString=15
+BEFORE=16
+BOOLEANLIST=17
+BasicAnnotationType=18
+BlockString=19
+BooleanString=20
+CALL=21
+CIRCUMFLEX=22
+CLEAR=23
+COLON=24
+COLOR=25
+COMMA=26
+COMMENT=27
+CONDITION=28
+CONFIGURE=29
+CONTAINS=30
+CONTEXTCOUNT=31
+COS=32
+COUNT=33
+CREATE=34
+CURRENTCOUNT=35
+CharacterLiteral=36
+DECLARE=37
+DEL=38
+DOT=39
+DOUBLELIST=40
+DecimalLiteral=41
+DocComment=42
+DoubleString=43
+ENDSWITH=44
+EQUAL=45
+EXEC=46
+EXP=47
+EXPAND=48
+EngineString=49
+EscapeSequence=50
+Exponent=51
+FALSE=52
+FEATURE=53
+FILL=54
+FILTERMARKUP=55
+FILTERTYPE=56
+FloatTypeSuffix=57
+FloatingPointLiteral=58
+GATHER=59
+GET=60
+GETFEATURE=61
+GETLIST=62
+GREATER=63
+GREATEREQUAL=64
+HexDigit=65
+HexLiteral=66
+IF=67
+INLIST=68
+INTLIST=69
+IS=70
+ISINTAG=71
+Identifier=72
+IntString=73
+IntegerTypeSuffix=74
+JavaIDDigit=75
+LAST=76
+LBRACK=77
+LCURLY=78
+LESS=79
+LESSEQUAL=80
+LINE_COMMENT=81
+LOG=82
+LOGN=83
+LPAREN=84
+Letter=85
+ListIdentifier=86
+LogLevel=87
+MARK=88
+MARKFAST=89
+MARKLAST=90
+MARKONCE=91
+MARKSCORE=92
+MARKTABLE=93
+MATCHEDTEXT=94
+MERGE=95
+MINUS=96
+MOFN=97
+NEAR=98
+NOT=99
+NOTEQUAL=100
+OR=101
+OctalEscape=102
+OctalLiteral=103
+OldColor=104
+PARSE=105
+PARTOF=106
+PARTOFNEQ=107
+PERCENT=108
+PLUS=109
+POSITION=110
+PackageString=111
+QUESTION=112
+RBRACK=113
+RCURLY=114
+REGEXP=115
+REMOVE=116
+REMOVEDUPLICATE=117
+REMOVESTRING=118
+REPLACE=119
+RETAINMARKUP=120
+RETAINTYPE=121
+RPAREN=122
+RessourceLiteral=123
+SCORE=124
+SEMI=125
+SETFEATURE=126
+SIN=127
+SIZE=128
+SLASH=129
+STAR=130
+STARTSWITH=131
+STRINGLIST=132
+ScriptString=133
+StringLiteral=134
+StringString=135
+SymbolString=136
+TAN=137
+THEN=138
+TOTALCOUNT=139
+TRANSFER=140
+TRIE=141
+TRUE=142
+TYPELIST=143
+TypeString=144
+TypeSystemString=145
+UNMARK=146
+UNMARKALL=147
+UnicodeEscape=148
+VBAR=149
+VOTE=150
+WORDLIST=151
+WORDTABLE=152
+WS=153
+XOR=154

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.g
URL: 

svn commit: r1186749 [5/7] - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/ uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/tex

2011-10-20 Thread pkluegl
Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.tokens
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.tokens?rev=1186749r1=1186748r2=1186749view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.tokens
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.tokens
 Thu Oct 20 11:46:23 2011
@@ -1,150 +1,151 @@
-STAR=137
-FloatTypeSuffix=112
-OctalLiteral=110
-FILTERMARKUP=48
-LOG=38
-CONTAINS=8
-REMOVE=66
-GREATEREQUAL=150
-MARKFAST=42
-MATCHEDTEXT=72
-CONDITION=91
-COUNT=14
-LOGN=99
-NOT=64
-Identifier=122
-ACTION=92
-NOTEQUAL=147
-CLEAR=74
-VBAR=139
-DOUBLELIST=95
-ENDSWITH=63
-RPAREN=124
-CREATE=32
-GREATER=142
-SIN=100
-EXP=98
-CURRENTCOUNT=16
-COS=101
-TAN=102
-TYPELIST=97
-LESS=141
-REGEXP=26
-GET=69
-PARTOF=23
-UNMARK=55
-LAST=19
-COMMENT=152
-REMOVEDUPLICATE=67
-UNMARKALL=56
-RBRACK=126
-NEAR=21
-LINE_COMMENT=153
-IntegerTypeSuffix=107
-MARKSCORE=40
-REMOVESTRING=73
-TRANSFER=57
-LCURLY=127
-TRIE=7
-FILTERTYPE=49
-RETAINMARKUP=46
-STRINGLIST=96
-MARKONCE=41
-ScriptString=80
-EngineString=81
-WS=151
-WORDTABLE=11
-WORDLIST=10
-AutomataBlockString=83
-FloatingPointLiteral=113
-INTLIST=94
-OR=22
-JavaIDDigit=121
-CALL=50
-Annotation=5
-FALSE=105
-LESSEQUAL=149
-RessourceLiteral=117
-VOTE=28
-Letter=120
-EscapeSequence=114
-SIZE=71
-BasicAnnotationType=76
-LBRACK=125
-CharacterLiteral=115
-DEL=37
-ATTRIBUTE=35
-TypeString=84
-Exponent=111
-ASSIGN_EQUAL=143
-RETAINTYPE=47
-AND=12
-TypeSystemString=89
-EXPAND=58
-BlockString=82
-IntString=85
-HexDigit=106
-COLOR=36
-LPAREN=123
-POSITION=25
-IF=29
-AT=130
-LogLevel=77
-SLASH=138
-THEN=75
-FILL=34
-COMMA=133
-IS=61
-AMPER=140
-REPLACE=45
-GETLIST=70
-EQUAL=146
-GATHER=33
-INLIST=17
-PLUS=135
-BooleanString=88
-GETFEATURE=54
-DOT=131
-ListIdentifier=6
-PARTOFNEQ=24
-BOOLEANLIST=93
-ADD=65
-MARKTABLE=43
-HexLiteral=108
-XOR=103
-PERCENT=144
-MARK=39
-PARSE=31
-PackageString=79
-OldColor=78
-MARKLAST=44
-MERGE=68
-CONTEXTCOUNT=13
-BEFORE=59
-EXEC=51
-MINUS=136
-AFTER=60
-DecimalLiteral=109
-SEMI=134
-TRUE=104
-FEATURE=30
-SymbolString=90
-COLON=132
-StringLiteral=116
-StringString=87
-SCORE=27
-QUESTION=145
-UnicodeEscape=118
-RCURLY=128
-STARTSWITH=62
-ASSIGN=52
-TOTALCOUNT=15
-DECLARE=9
-DocComment=4
-ISINTAG=18
-MOFN=20
-OctalEscape=119
-SETFEATURE=53
-DoubleString=86
-CIRCUMFLEX=129
-ALT_NOTEQUAL=148
+ACTION=4
+ADD=5
+AFTER=6
+ALT_NOTEQUAL=7
+AMPER=8
+AND=9
+ASSIGN=10
+ASSIGN_EQUAL=11
+AT=12
+ATTRIBUTE=13
+Annotation=14
+AutomataBlockString=15
+BEFORE=16
+BOOLEANLIST=17
+BasicAnnotationType=18
+BlockString=19
+BooleanString=20
+CALL=21
+CIRCUMFLEX=22
+CLEAR=23
+COLON=24
+COLOR=25
+COMMA=26
+COMMENT=27
+CONDITION=28
+CONFIGURE=29
+CONTAINS=30
+CONTEXTCOUNT=31
+COS=32
+COUNT=33
+CREATE=34
+CURRENTCOUNT=35
+CharacterLiteral=36
+DECLARE=37
+DEL=38
+DOT=39
+DOUBLELIST=40
+DecimalLiteral=41
+DocComment=42
+DoubleString=43
+ENDSWITH=44
+EQUAL=45
+EXEC=46
+EXP=47
+EXPAND=48
+EngineString=49
+EscapeSequence=50
+Exponent=51
+FALSE=52
+FEATURE=53
+FILL=54
+FILTERMARKUP=55
+FILTERTYPE=56
+FloatTypeSuffix=57
+FloatingPointLiteral=58
+GATHER=59
+GET=60
+GETFEATURE=61
+GETLIST=62
+GREATER=63
+GREATEREQUAL=64
+HexDigit=65
+HexLiteral=66
+IF=67
+INLIST=68
+INTLIST=69
+IS=70
+ISINTAG=71
+Identifier=72
+IntString=73
+IntegerTypeSuffix=74
+JavaIDDigit=75
+LAST=76
+LBRACK=77
+LCURLY=78
+LESS=79
+LESSEQUAL=80
+LINE_COMMENT=81
+LOG=82
+LOGN=83
+LPAREN=84
+Letter=85
+ListIdentifier=86
+LogLevel=87
+MARK=88
+MARKFAST=89
+MARKLAST=90
+MARKONCE=91
+MARKSCORE=92
+MARKTABLE=93
+MATCHEDTEXT=94
+MERGE=95
+MINUS=96
+MOFN=97
+NEAR=98
+NOT=99
+NOTEQUAL=100
+OR=101
+OctalEscape=102
+OctalLiteral=103
+OldColor=104
+PARSE=105
+PARTOF=106
+PARTOFNEQ=107
+PERCENT=108
+PLUS=109
+POSITION=110
+PackageString=111
+QUESTION=112
+RBRACK=113
+RCURLY=114
+REGEXP=115
+REMOVE=116
+REMOVEDUPLICATE=117
+REMOVESTRING=118
+REPLACE=119
+RETAINMARKUP=120
+RETAINTYPE=121
+RPAREN=122
+RessourceLiteral=123
+SCORE=124
+SEMI=125
+SETFEATURE=126
+SIN=127
+SIZE=128
+SLASH=129
+STAR=130
+STARTSWITH=131
+STRINGLIST=132
+ScriptString=133
+StringLiteral=134
+StringString=135
+SymbolString=136
+TAN=137
+THEN=138
+TOTALCOUNT=139
+TRANSFER=140
+TRIE=141
+TRUE=142
+TYPELIST=143
+TypeString=144
+TypeSystemString=145
+UNMARK=146
+UNMARKALL=147
+UnicodeEscape=148
+VBAR=149
+VOTE=150
+WORDLIST=151
+WORDTABLE=152
+WS=153
+XOR=154

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/TextMarkerKeywords.java
URL: 

svn commit: r1186749 [1/7] - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/ uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/tex

2011-10-20 Thread pkluegl
Author: pkluegl
Date: Thu Oct 20 11:46:23 2011
New Revision: 1186749

URL: http://svn.apache.org/viewvc?rev=1186749view=rev
Log:
UIMA-2248
Added new CONFIGURE action that reconfigures the given analysis engine. Example:
CONFIGURE(AnnotationWriter, Type = Name)

Added:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/ConfigureAction.java
Modified:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/ActionFactory.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.g

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.tokens

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.g

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.tokens

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/TextMarkerKeywords.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.tokens

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/parser/ast/ActionFactory.java

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/ActionFactory.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/ActionFactory.java?rev=1186749r1=1186748r2=1186749view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/ActionFactory.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/ActionFactory.java
 Thu Oct 20 11:46:23 2011
@@ -114,6 +114,11 @@ public class ActionFactory {
 return new CallAction(ns);
   }
 
+  public static AbstractTextMarkerAction createConfigureAction(String ns,
+  MapStringExpression, TextMarkerExpression map, TextMarkerBlock 
env) {
+return new ConfigureAction(ns, map);
+  }
+
   public static AbstractTextMarkerAction createAssignAction(Token nv, 
TextMarkerExpression e,
   TextMarkerBlock parent) {
 return new AssignAction(nv.getText(), e);

Added: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/ConfigureAction.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/ConfigureAction.java?rev=1186749view=auto
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/ConfigureAction.java
 (added)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/ConfigureAction.java
 Thu Oct 20 11:46:23 2011
@@ -0,0 +1,158 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.uima.textmarker.action;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import org.apache.uima.analysis_engine.AnalysisEngine;
+import org.apache.uima.cas.Type

svn commit: r1186749 [7/7] - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/ uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/tex

2011-10-20 Thread pkluegl
Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.tokens
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.tokens?rev=1186749r1=1186748r2=1186749view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.tokens
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.tokens
 Thu Oct 20 11:46:23 2011
@@ -1,150 +1,151 @@
-STAR=137
-FloatTypeSuffix=112
-OctalLiteral=110
-FILTERMARKUP=48
-LOG=38
-CONTAINS=8
-REMOVE=66
-GREATEREQUAL=150
-MARKFAST=42
-MATCHEDTEXT=72
-CONDITION=91
-COUNT=14
-LOGN=99
-NOT=64
-Identifier=122
-ACTION=92
-NOTEQUAL=147
-CLEAR=74
-VBAR=139
-DOUBLELIST=95
-ENDSWITH=63
-RPAREN=124
-CREATE=32
-GREATER=142
-SIN=100
-EXP=98
-CURRENTCOUNT=16
-COS=101
-TAN=102
-TYPELIST=97
-LESS=141
-REGEXP=26
-GET=69
-PARTOF=23
-UNMARK=55
-LAST=19
-COMMENT=152
-REMOVEDUPLICATE=67
-UNMARKALL=56
-RBRACK=126
-NEAR=21
-LINE_COMMENT=153
-IntegerTypeSuffix=107
-MARKSCORE=40
-REMOVESTRING=73
-TRANSFER=57
-LCURLY=127
-TRIE=7
-FILTERTYPE=49
-RETAINMARKUP=46
-STRINGLIST=96
-MARKONCE=41
-ScriptString=80
-EngineString=81
-WS=151
-WORDTABLE=11
-WORDLIST=10
-AutomataBlockString=83
-FloatingPointLiteral=113
-INTLIST=94
-OR=22
-JavaIDDigit=121
-CALL=50
-Annotation=5
-FALSE=105
-LESSEQUAL=149
-RessourceLiteral=117
-VOTE=28
-Letter=120
-EscapeSequence=114
-SIZE=71
-BasicAnnotationType=76
-LBRACK=125
-CharacterLiteral=115
-DEL=37
-ATTRIBUTE=35
-TypeString=84
-Exponent=111
-ASSIGN_EQUAL=143
-RETAINTYPE=47
-AND=12
-TypeSystemString=89
-EXPAND=58
-BlockString=82
-IntString=85
-HexDigit=106
-COLOR=36
-LPAREN=123
-POSITION=25
-IF=29
-AT=130
-LogLevel=77
-SLASH=138
-THEN=75
-FILL=34
-COMMA=133
-IS=61
-AMPER=140
-REPLACE=45
-GETLIST=70
-EQUAL=146
-GATHER=33
-INLIST=17
-PLUS=135
-BooleanString=88
-GETFEATURE=54
-DOT=131
-ListIdentifier=6
-PARTOFNEQ=24
-BOOLEANLIST=93
-ADD=65
-MARKTABLE=43
-HexLiteral=108
-XOR=103
-PERCENT=144
-MARK=39
-PARSE=31
-PackageString=79
-OldColor=78
-MARKLAST=44
-MERGE=68
-CONTEXTCOUNT=13
-BEFORE=59
-EXEC=51
-MINUS=136
-AFTER=60
-DecimalLiteral=109
-SEMI=134
-TRUE=104
-FEATURE=30
-SymbolString=90
-COLON=132
-StringLiteral=116
-StringString=87
-SCORE=27
-QUESTION=145
-UnicodeEscape=118
-RCURLY=128
-STARTSWITH=62
-ASSIGN=52
-TOTALCOUNT=15
-DECLARE=9
-DocComment=4
-ISINTAG=18
-MOFN=20
-OctalEscape=119
-SETFEATURE=53
-DoubleString=86
-CIRCUMFLEX=129
-ALT_NOTEQUAL=148
+ACTION=4
+ADD=5
+AFTER=6
+ALT_NOTEQUAL=7
+AMPER=8
+AND=9
+ASSIGN=10
+ASSIGN_EQUAL=11
+AT=12
+ATTRIBUTE=13
+Annotation=14
+AutomataBlockString=15
+BEFORE=16
+BOOLEANLIST=17
+BasicAnnotationType=18
+BlockString=19
+BooleanString=20
+CALL=21
+CIRCUMFLEX=22
+CLEAR=23
+COLON=24
+COLOR=25
+COMMA=26
+COMMENT=27
+CONDITION=28
+CONFIGURE=29
+CONTAINS=30
+CONTEXTCOUNT=31
+COS=32
+COUNT=33
+CREATE=34
+CURRENTCOUNT=35
+CharacterLiteral=36
+DECLARE=37
+DEL=38
+DOT=39
+DOUBLELIST=40
+DecimalLiteral=41
+DocComment=42
+DoubleString=43
+ENDSWITH=44
+EQUAL=45
+EXEC=46
+EXP=47
+EXPAND=48
+EngineString=49
+EscapeSequence=50
+Exponent=51
+FALSE=52
+FEATURE=53
+FILL=54
+FILTERMARKUP=55
+FILTERTYPE=56
+FloatTypeSuffix=57
+FloatingPointLiteral=58
+GATHER=59
+GET=60
+GETFEATURE=61
+GETLIST=62
+GREATER=63
+GREATEREQUAL=64
+HexDigit=65
+HexLiteral=66
+IF=67
+INLIST=68
+INTLIST=69
+IS=70
+ISINTAG=71
+Identifier=72
+IntString=73
+IntegerTypeSuffix=74
+JavaIDDigit=75
+LAST=76
+LBRACK=77
+LCURLY=78
+LESS=79
+LESSEQUAL=80
+LINE_COMMENT=81
+LOG=82
+LOGN=83
+LPAREN=84
+Letter=85
+ListIdentifier=86
+LogLevel=87
+MARK=88
+MARKFAST=89
+MARKLAST=90
+MARKONCE=91
+MARKSCORE=92
+MARKTABLE=93
+MATCHEDTEXT=94
+MERGE=95
+MINUS=96
+MOFN=97
+NEAR=98
+NOT=99
+NOTEQUAL=100
+OR=101
+OctalEscape=102
+OctalLiteral=103
+OldColor=104
+PARSE=105
+PARTOF=106
+PARTOFNEQ=107
+PERCENT=108
+PLUS=109
+POSITION=110
+PackageString=111
+QUESTION=112
+RBRACK=113
+RCURLY=114
+REGEXP=115
+REMOVE=116
+REMOVEDUPLICATE=117
+REMOVESTRING=118
+REPLACE=119
+RETAINMARKUP=120
+RETAINTYPE=121
+RPAREN=122
+RessourceLiteral=123
+SCORE=124
+SEMI=125
+SETFEATURE=126
+SIN=127
+SIZE=128
+SLASH=129
+STAR=130
+STARTSWITH=131
+STRINGLIST=132
+ScriptString=133
+StringLiteral=134
+StringString=135
+SymbolString=136
+TAN=137
+THEN=138
+TOTALCOUNT=139
+TRANSFER=140
+TRIE=141
+TRUE=142
+TYPELIST=143
+TypeString=144
+TypeSystemString=145
+UNMARK=146
+UNMARKALL=147
+UnicodeEscape=148
+VBAR=149
+VOTE=150
+WORDLIST=151
+WORDTABLE=152
+WS=153
+XOR=154

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/parser/ast/ActionFactory.java
URL: 

svn commit: r1187303 [3/3] - in /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker: ./ action/ engine/ expression/ expression/bool/ expression/type/ par

2011-10-21 Thread pkluegl
Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/TextMarkerTypeMatcher.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/TextMarkerTypeMatcher.java?rev=1187303r1=1187302r2=1187303view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/TextMarkerTypeMatcher.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/TextMarkerTypeMatcher.java
 Fri Oct 21 11:33:26 2011
@@ -57,7 +57,7 @@ public class TextMarkerTypeMatcher imple
 for (Type type : types) {
   String name = type.getName();
   if (uima.tcas.DocumentAnnotation.equals(name)
-  || uima.tcas.DocumentAnnotation.equals(name)
+  || org.apache.uima.textmarker.type.Document.equals(name)
   || (stream.getDocumentAnnotationType().getName().equals(name)  
stream
   .getFirstBasicOfAll().beginsWith(type))) {
 // TODO what about dynamic windowing?

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/verbalize/ExpressionVerbalizer.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/verbalize/ExpressionVerbalizer.java?rev=1187303r1=1187302r2=1187303view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/verbalize/ExpressionVerbalizer.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/verbalize/ExpressionVerbalizer.java
 Fri Oct 21 11:33:26 2011
@@ -21,7 +21,6 @@ package org.apache.uima.textmarker.verba
 
 import java.util.Iterator;
 
-import org.apache.uima.cas.Type;
 import org.apache.uima.textmarker.expression.TextMarkerExpression;
 import org.apache.uima.textmarker.expression.bool.BooleanExpression;
 import org.apache.uima.textmarker.expression.bool.BooleanNumberExpression;
@@ -240,12 +239,15 @@ public class ExpressionVerbalizer {
   public String verbalize(TypeExpression expression) {
 if (expression instanceof SimpleTypeExpression) {
   SimpleTypeExpression e = (SimpleTypeExpression) expression;
-  Type type = e.getType(null);
-  String shortName = type.getShortName();
-  if (shortName.equals(DocumentAnnotation)) {
-shortName = Document;
+  String type = e.getTypeString();
+  int indexOf = type.lastIndexOf(.);
+  if (indexOf != -1) {
+type = type.substring(indexOf + 1, type.length());
   }
-  return shortName;
+  if (type.equals(DocumentAnnotation)) {
+type = Document;
+  }
+  return type;
 } else if (expression instanceof ReferenceTypeExpression) {
   ReferenceTypeExpression e = (ReferenceTypeExpression) expression;
   return e.getVar();




svn commit: r1187303 [1/3] - in /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker: ./ action/ engine/ expression/ expression/bool/ expression/type/ par

2011-10-21 Thread pkluegl
Author: pkluegl
Date: Fri Oct 21 11:33:26 2011
New Revision: 1187303

URL: http://svn.apache.org/viewvc?rev=1187303view=rev
Log:
UIMA-2238
The place where the scripts are parsed is now configurable: by default scripts 
are parsed in the initialize method and the types are set in the process 
method. Removed all dependencies of the CAS and type system from the parsing 
code. The values of variables will be reset if the script is not parsed again.

Modified:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerAutomataBlock.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerAutomataFactory.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerBlock.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerEnvironment.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerModule.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerScriptBlock.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerScriptFactory.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerStatement.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/MarkFastAction.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/TextMarkerEngine.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/expression/ExpressionFactory.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/expression/bool/BooleanTypeExpression.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/expression/type/SimpleTypeExpression.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.g

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/TextMarkerTypeMatcher.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/verbalize/ExpressionVerbalizer.java

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerAutomataBlock.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerAutomataBlock.java?rev=1187303r1=1187302r2=1187303view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerAutomataBlock.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerAutomataBlock.java
 Fri Oct 21 11:33:26 2011
@@ -21,7 +21,6 @@ package org.apache.uima.textmarker;
 
 import java.util.List;
 
-import org.apache.uima.cas.CAS;
 import org.apache.uima.cas.Type;
 import org.apache.uima.cas.text.AnnotationFS;
 import org.apache.uima.textmarker.rule.RuleApply;
@@ -33,9 +32,8 @@ import org.apache.uima.textmarker.visito
 public class TextMarkerAutomataBlock extends TextMarkerBlock {
 
   public TextMarkerAutomataBlock(String id, TextMarkerRule rule,
-  ListTextMarkerStatement elements, TextMarkerBlock parent, String 
defaultNamespace,
-  CAS cas) {
-super(id, rule, elements, parent, defaultNamespace, cas);
+  ListTextMarkerStatement elements, TextMarkerBlock parent, String 
defaultNamespace) {
+super(id, rule, elements, parent, defaultNamespace);
   }
 
   @Override

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerAutomataFactory.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerAutomataFactory.java?rev=1187303r1=1187302r2=1187303view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerAutomataFactory.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerAutomataFactory.java
 Fri Oct 21 11:33:26 2011
@@ -22,14 +22,13 @@ package

svn commit: r1187321 - /uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java

2011-10-21 Thread pkluegl
Author: pkluegl
Date: Fri Oct 21 12:59:39 2011
New Revision: 1187321

URL: http://svn.apache.org/viewvc?rev=1187321view=rev
Log:
UIMA-2266
Use search strategy before default location in the properties.

Modified:

uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java

Modified: 
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java?rev=1187321r1=1187320r2=1187321view=diff
==
--- 
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
 (original)
+++ 
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
 Fri Oct 21 12:59:39 2011
@@ -219,10 +219,6 @@ public class DefaultCasDocumentProvider 
 typeSystemFile = ResourcesPlugin.getWorkspace().getRoot()
 .getFile(new Path(typeSystemFileString));
 
-  // If non was found get it from project
-  if (typeSystemFile == null)
-typeSystemFile = 
TypeSystemLocationPropertyPage.getTypeSystemLocation(casFile.getProject());
-
   // use search strategies for finding the type system
   if (typeSystemFile == null || !typeSystemFile.exists()) {
 MapInteger, ITypeSystemSearchStrategy searchStrategies = 
TypeSystemSearchStrategyFactory
@@ -238,6 +234,10 @@ public class DefaultCasDocumentProvider 
 }
   }
 
+  // If non was found get it from project
+  if (typeSystemFile == null)
+typeSystemFile = 
TypeSystemLocationPropertyPage.getTypeSystemLocation(casFile.getProject());
+
   if (typeSystemFile != null  typeSystemFile.exists()) {
 
 if (!typeSystemFile.isSynchronized(IResource.DEPTH_ZERO)) {




svn commit: r1187332 [5/7] - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/ uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker

2011-10-21 Thread pkluegl
Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.tokens
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.tokens?rev=1187332r1=1187331r2=1187332view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.tokens
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.tokens
 Fri Oct 21 13:29:24 2011
@@ -35,117 +35,118 @@ DECLARE=37
 DEL=38
 DOT=39
 DOUBLELIST=40
-DecimalLiteral=41
-DocComment=42
-DoubleString=43
-ENDSWITH=44
-EQUAL=45
-EXEC=46
-EXP=47
-EXPAND=48
-EngineString=49
-EscapeSequence=50
-Exponent=51
-FALSE=52
-FEATURE=53
-FILL=54
-FILTERMARKUP=55
-FILTERTYPE=56
-FloatTypeSuffix=57
-FloatingPointLiteral=58
-GATHER=59
-GET=60
-GETFEATURE=61
-GETLIST=62
-GREATER=63
-GREATEREQUAL=64
-HexDigit=65
-HexLiteral=66
-IF=67
-INLIST=68
-INTLIST=69
-IS=70
-ISINTAG=71
-Identifier=72
-IntString=73
-IntegerTypeSuffix=74
-JavaIDDigit=75
-LAST=76
-LBRACK=77
-LCURLY=78
-LESS=79
-LESSEQUAL=80
-LINE_COMMENT=81
-LOG=82
-LOGN=83
-LPAREN=84
-Letter=85
-ListIdentifier=86
-LogLevel=87
-MARK=88
-MARKFAST=89
-MARKLAST=90
-MARKONCE=91
-MARKSCORE=92
-MARKTABLE=93
-MATCHEDTEXT=94
-MERGE=95
-MINUS=96
-MOFN=97
-NEAR=98
-NOT=99
-NOTEQUAL=100
-OR=101
-OctalEscape=102
-OctalLiteral=103
-OldColor=104
-PARSE=105
-PARTOF=106
-PARTOFNEQ=107
-PERCENT=108
-PLUS=109
-POSITION=110
-PackageString=111
-QUESTION=112
-RBRACK=113
-RCURLY=114
-REGEXP=115
-REMOVE=116
-REMOVEDUPLICATE=117
-REMOVESTRING=118
-REPLACE=119
-RETAINMARKUP=120
-RETAINTYPE=121
-RPAREN=122
-RessourceLiteral=123
-SCORE=124
-SEMI=125
-SETFEATURE=126
-SIN=127
-SIZE=128
-SLASH=129
-STAR=130
-STARTSWITH=131
-STRINGLIST=132
-ScriptString=133
-StringLiteral=134
-StringString=135
-SymbolString=136
-TAN=137
-THEN=138
-TOTALCOUNT=139
-TRANSFER=140
-TRIE=141
-TRUE=142
-TYPELIST=143
-TypeString=144
-TypeSystemString=145
-UNMARK=146
-UNMARKALL=147
-UnicodeEscape=148
-VBAR=149
-VOTE=150
-WORDLIST=151
-WORDTABLE=152
-WS=153
-XOR=154
+DYNAMICANCHORING=41
+DecimalLiteral=42
+DocComment=43
+DoubleString=44
+ENDSWITH=45
+EQUAL=46
+EXEC=47
+EXP=48
+EXPAND=49
+EngineString=50
+EscapeSequence=51
+Exponent=52
+FALSE=53
+FEATURE=54
+FILL=55
+FILTERMARKUP=56
+FILTERTYPE=57
+FloatTypeSuffix=58
+FloatingPointLiteral=59
+GATHER=60
+GET=61
+GETFEATURE=62
+GETLIST=63
+GREATER=64
+GREATEREQUAL=65
+HexDigit=66
+HexLiteral=67
+IF=68
+INLIST=69
+INTLIST=70
+IS=71
+ISINTAG=72
+Identifier=73
+IntString=74
+IntegerTypeSuffix=75
+JavaIDDigit=76
+LAST=77
+LBRACK=78
+LCURLY=79
+LESS=80
+LESSEQUAL=81
+LINE_COMMENT=82
+LOG=83
+LOGN=84
+LPAREN=85
+Letter=86
+ListIdentifier=87
+LogLevel=88
+MARK=89
+MARKFAST=90
+MARKLAST=91
+MARKONCE=92
+MARKSCORE=93
+MARKTABLE=94
+MATCHEDTEXT=95
+MERGE=96
+MINUS=97
+MOFN=98
+NEAR=99
+NOT=100
+NOTEQUAL=101
+OR=102
+OctalEscape=103
+OctalLiteral=104
+OldColor=105
+PARSE=106
+PARTOF=107
+PARTOFNEQ=108
+PERCENT=109
+PLUS=110
+POSITION=111
+PackageString=112
+QUESTION=113
+RBRACK=114
+RCURLY=115
+REGEXP=116
+REMOVE=117
+REMOVEDUPLICATE=118
+REMOVESTRING=119
+REPLACE=120
+RETAINMARKUP=121
+RETAINTYPE=122
+RPAREN=123
+RessourceLiteral=124
+SCORE=125
+SEMI=126
+SETFEATURE=127
+SIN=128
+SIZE=129
+SLASH=130
+STAR=131
+STARTSWITH=132
+STRINGLIST=133
+ScriptString=134
+StringLiteral=135
+StringString=136
+SymbolString=137
+TAN=138
+THEN=139
+TOTALCOUNT=140
+TRANSFER=141
+TRIE=142
+TRUE=143
+TYPELIST=144
+TypeString=145
+TypeSystemString=146
+UNMARK=147
+UNMARKALL=148
+UnicodeEscape=149
+VBAR=150
+VOTE=151
+WORDLIST=152
+WORDTABLE=153
+WS=154
+XOR=155

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/TextMarkerKeywords.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/TextMarkerKeywords.java?rev=1187332r1=1187331r2=1187332view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/TextMarkerKeywords.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/TextMarkerKeywords.java
 Fri Oct 21 13:29:24 2011
@@ -36,7 +36,7 @@ public class TextMarkerKeywords implemen
   ATTRIBUTE, MARKFAST, FILTERTYPE, FILTERMARKUP, CREATE, FILL, 
MARKTABLE,
   UNMARK, TRANSFER, MARKONCE, TRIE, GATHER, EXEC, MARKLAST, 
ADD, REMOVE,
   MERGE, GET, GETLIST, REMOVEDUPLICATE, GETFEATURE, 
MATCHEDTEXT, CLEAR,
-  UNMARKALL, EXPAND, CONFIGURE };
+  UNMARKALL, EXPAND, CONFIGURE, DYNAMICANCHORING };
 
   private static 

svn commit: r1187332 [1/7] - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/ uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker

2011-10-21 Thread pkluegl
Author: pkluegl
Date: Fri Oct 21 13:29:24 2011
New Revision: 1187332

URL: http://svn.apache.org/viewvc?rev=1187332view=rev
Log:
UIMA-2272
added new action DYNAMICACHORING

Added:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/DynamicAnchoringAction.java
Modified:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerStream.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/ActionFactory.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.g

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.tokens

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.g

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.tokens

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/TextMarkerKeywords.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.tokens

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerStream.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerStream.java?rev=1187332r1=1187331r2=1187332view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerStream.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerStream.java
 Fri Oct 21 13:29:24 2011
@@ -72,6 +72,10 @@ public class TextMarkerStream extends FS
 
   private boolean dynamicAnchoring;
 
+  private double indexPenalty = 5;
+
+  private double anchoringFactor;
+
   protected TextMarkerStream(CAS cas, FSIteratorAnnotationFS basic,
   FSIteratorAnnotationFS current, Type basicType, FilterManager 
filter) {
 super();
@@ -584,7 +588,7 @@ public class TextMarkerStream extends FS
   }
 
   public double getIndexPenalty() {
-return 2;
+return indexPenalty;
   }
 
   public TextMarkerBasic getEndAnchor(int end) {
@@ -603,4 +607,16 @@ public class TextMarkerStream extends FS
 this.dynamicAnchoring = dynamicAnchoring;
   }
 
+  public void setIndexPenalty(double indexPenalty) {
+this.indexPenalty = indexPenalty;
+  }
+
+  public double getAnchoringFactor() {
+return anchoringFactor;
+  }
+
+  public void setAnchoringFactor(double anchoringFactor) {
+this.anchoringFactor = anchoringFactor;
+  }
+
 }

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/ActionFactory.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/ActionFactory.java?rev=1187332r1=1187331r2=1187332view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/ActionFactory.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/ActionFactory.java
 Fri Oct 21 13:29:24 2011
@@ -234,4 +234,9 @@ public class ActionFactory {
 return new ExpandAction(type, list);
   }
 
+  public static AbstractTextMarkerAction 
createDynamicAnchoringAction(BooleanExpression active,
+  NumberExpression penalty, NumberExpression factor, TextMarkerBlock 
env) {
+return new DynamicAnchoringAction(active, penalty, factor);
+  }
+
 }

Added: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/DynamicAnchoringAction.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/DynamicAnchoringAction.java?rev=1187332view=auto

svn commit: r1187332 [3/7] - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/ uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker

2011-10-21 Thread pkluegl
Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.tokens
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.tokens?rev=1187332r1=1187331r2=1187332view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.tokens
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.tokens
 Fri Oct 21 13:29:24 2011
@@ -35,117 +35,118 @@ DECLARE=37
 DEL=38
 DOT=39
 DOUBLELIST=40
-DecimalLiteral=41
-DocComment=42
-DoubleString=43
-ENDSWITH=44
-EQUAL=45
-EXEC=46
-EXP=47
-EXPAND=48
-EngineString=49
-EscapeSequence=50
-Exponent=51
-FALSE=52
-FEATURE=53
-FILL=54
-FILTERMARKUP=55
-FILTERTYPE=56
-FloatTypeSuffix=57
-FloatingPointLiteral=58
-GATHER=59
-GET=60
-GETFEATURE=61
-GETLIST=62
-GREATER=63
-GREATEREQUAL=64
-HexDigit=65
-HexLiteral=66
-IF=67
-INLIST=68
-INTLIST=69
-IS=70
-ISINTAG=71
-Identifier=72
-IntString=73
-IntegerTypeSuffix=74
-JavaIDDigit=75
-LAST=76
-LBRACK=77
-LCURLY=78
-LESS=79
-LESSEQUAL=80
-LINE_COMMENT=81
-LOG=82
-LOGN=83
-LPAREN=84
-Letter=85
-ListIdentifier=86
-LogLevel=87
-MARK=88
-MARKFAST=89
-MARKLAST=90
-MARKONCE=91
-MARKSCORE=92
-MARKTABLE=93
-MATCHEDTEXT=94
-MERGE=95
-MINUS=96
-MOFN=97
-NEAR=98
-NOT=99
-NOTEQUAL=100
-OR=101
-OctalEscape=102
-OctalLiteral=103
-OldColor=104
-PARSE=105
-PARTOF=106
-PARTOFNEQ=107
-PERCENT=108
-PLUS=109
-POSITION=110
-PackageString=111
-QUESTION=112
-RBRACK=113
-RCURLY=114
-REGEXP=115
-REMOVE=116
-REMOVEDUPLICATE=117
-REMOVESTRING=118
-REPLACE=119
-RETAINMARKUP=120
-RETAINTYPE=121
-RPAREN=122
-RessourceLiteral=123
-SCORE=124
-SEMI=125
-SETFEATURE=126
-SIN=127
-SIZE=128
-SLASH=129
-STAR=130
-STARTSWITH=131
-STRINGLIST=132
-ScriptString=133
-StringLiteral=134
-StringString=135
-SymbolString=136
-TAN=137
-THEN=138
-TOTALCOUNT=139
-TRANSFER=140
-TRIE=141
-TRUE=142
-TYPELIST=143
-TypeString=144
-TypeSystemString=145
-UNMARK=146
-UNMARKALL=147
-UnicodeEscape=148
-VBAR=149
-VOTE=150
-WORDLIST=151
-WORDTABLE=152
-WS=153
-XOR=154
+DYNAMICANCHORING=41
+DecimalLiteral=42
+DocComment=43
+DoubleString=44
+ENDSWITH=45
+EQUAL=46
+EXEC=47
+EXP=48
+EXPAND=49
+EngineString=50
+EscapeSequence=51
+Exponent=52
+FALSE=53
+FEATURE=54
+FILL=55
+FILTERMARKUP=56
+FILTERTYPE=57
+FloatTypeSuffix=58
+FloatingPointLiteral=59
+GATHER=60
+GET=61
+GETFEATURE=62
+GETLIST=63
+GREATER=64
+GREATEREQUAL=65
+HexDigit=66
+HexLiteral=67
+IF=68
+INLIST=69
+INTLIST=70
+IS=71
+ISINTAG=72
+Identifier=73
+IntString=74
+IntegerTypeSuffix=75
+JavaIDDigit=76
+LAST=77
+LBRACK=78
+LCURLY=79
+LESS=80
+LESSEQUAL=81
+LINE_COMMENT=82
+LOG=83
+LOGN=84
+LPAREN=85
+Letter=86
+ListIdentifier=87
+LogLevel=88
+MARK=89
+MARKFAST=90
+MARKLAST=91
+MARKONCE=92
+MARKSCORE=93
+MARKTABLE=94
+MATCHEDTEXT=95
+MERGE=96
+MINUS=97
+MOFN=98
+NEAR=99
+NOT=100
+NOTEQUAL=101
+OR=102
+OctalEscape=103
+OctalLiteral=104
+OldColor=105
+PARSE=106
+PARTOF=107
+PARTOFNEQ=108
+PERCENT=109
+PLUS=110
+POSITION=111
+PackageString=112
+QUESTION=113
+RBRACK=114
+RCURLY=115
+REGEXP=116
+REMOVE=117
+REMOVEDUPLICATE=118
+REMOVESTRING=119
+REPLACE=120
+RETAINMARKUP=121
+RETAINTYPE=122
+RPAREN=123
+RessourceLiteral=124
+SCORE=125
+SEMI=126
+SETFEATURE=127
+SIN=128
+SIZE=129
+SLASH=130
+STAR=131
+STARTSWITH=132
+STRINGLIST=133
+ScriptString=134
+StringLiteral=135
+StringString=136
+SymbolString=137
+TAN=138
+THEN=139
+TOTALCOUNT=140
+TRANSFER=141
+TRIE=142
+TRUE=143
+TYPELIST=144
+TypeString=145
+TypeSystemString=146
+UNMARK=147
+UNMARKALL=148
+UnicodeEscape=149
+VBAR=150
+VOTE=151
+WORDLIST=152
+WORDTABLE=153
+WS=154
+XOR=155

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.g
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.g?rev=1187332r1=1187331r2=1187332view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.g
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.g
 Fri Oct 21 13:29:24 2011
@@ -1078,6 +1078,7 @@ action  returns [AbstractTextMarkerActio
| a = actionClear
| a = actionExpand
| a = actionConfigure
+   | a = actionDynamicAnchoring 
| (a = externalAction)= a = externalAction
| a = variableAction
) {result = a;}
@@ -1380,6 +1381,16 @@ actionGetFeature returns [AbstractTextMa
 {action = ActionFactory.createGetFeatureAction(f, v, 

svn commit: r1187332 [7/7] - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/ uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker

2011-10-21 Thread pkluegl
Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.tokens
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.tokens?rev=1187332r1=1187331r2=1187332view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.tokens
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.tokens
 Fri Oct 21 13:29:24 2011
@@ -35,117 +35,118 @@ DECLARE=37
 DEL=38
 DOT=39
 DOUBLELIST=40
-DecimalLiteral=41
-DocComment=42
-DoubleString=43
-ENDSWITH=44
-EQUAL=45
-EXEC=46
-EXP=47
-EXPAND=48
-EngineString=49
-EscapeSequence=50
-Exponent=51
-FALSE=52
-FEATURE=53
-FILL=54
-FILTERMARKUP=55
-FILTERTYPE=56
-FloatTypeSuffix=57
-FloatingPointLiteral=58
-GATHER=59
-GET=60
-GETFEATURE=61
-GETLIST=62
-GREATER=63
-GREATEREQUAL=64
-HexDigit=65
-HexLiteral=66
-IF=67
-INLIST=68
-INTLIST=69
-IS=70
-ISINTAG=71
-Identifier=72
-IntString=73
-IntegerTypeSuffix=74
-JavaIDDigit=75
-LAST=76
-LBRACK=77
-LCURLY=78
-LESS=79
-LESSEQUAL=80
-LINE_COMMENT=81
-LOG=82
-LOGN=83
-LPAREN=84
-Letter=85
-ListIdentifier=86
-LogLevel=87
-MARK=88
-MARKFAST=89
-MARKLAST=90
-MARKONCE=91
-MARKSCORE=92
-MARKTABLE=93
-MATCHEDTEXT=94
-MERGE=95
-MINUS=96
-MOFN=97
-NEAR=98
-NOT=99
-NOTEQUAL=100
-OR=101
-OctalEscape=102
-OctalLiteral=103
-OldColor=104
-PARSE=105
-PARTOF=106
-PARTOFNEQ=107
-PERCENT=108
-PLUS=109
-POSITION=110
-PackageString=111
-QUESTION=112
-RBRACK=113
-RCURLY=114
-REGEXP=115
-REMOVE=116
-REMOVEDUPLICATE=117
-REMOVESTRING=118
-REPLACE=119
-RETAINMARKUP=120
-RETAINTYPE=121
-RPAREN=122
-RessourceLiteral=123
-SCORE=124
-SEMI=125
-SETFEATURE=126
-SIN=127
-SIZE=128
-SLASH=129
-STAR=130
-STARTSWITH=131
-STRINGLIST=132
-ScriptString=133
-StringLiteral=134
-StringString=135
-SymbolString=136
-TAN=137
-THEN=138
-TOTALCOUNT=139
-TRANSFER=140
-TRIE=141
-TRUE=142
-TYPELIST=143
-TypeString=144
-TypeSystemString=145
-UNMARK=146
-UNMARKALL=147
-UnicodeEscape=148
-VBAR=149
-VOTE=150
-WORDLIST=151
-WORDTABLE=152
-WS=153
-XOR=154
+DYNAMICANCHORING=41
+DecimalLiteral=42
+DocComment=43
+DoubleString=44
+ENDSWITH=45
+EQUAL=46
+EXEC=47
+EXP=48
+EXPAND=49
+EngineString=50
+EscapeSequence=51
+Exponent=52
+FALSE=53
+FEATURE=54
+FILL=55
+FILTERMARKUP=56
+FILTERTYPE=57
+FloatTypeSuffix=58
+FloatingPointLiteral=59
+GATHER=60
+GET=61
+GETFEATURE=62
+GETLIST=63
+GREATER=64
+GREATEREQUAL=65
+HexDigit=66
+HexLiteral=67
+IF=68
+INLIST=69
+INTLIST=70
+IS=71
+ISINTAG=72
+Identifier=73
+IntString=74
+IntegerTypeSuffix=75
+JavaIDDigit=76
+LAST=77
+LBRACK=78
+LCURLY=79
+LESS=80
+LESSEQUAL=81
+LINE_COMMENT=82
+LOG=83
+LOGN=84
+LPAREN=85
+Letter=86
+ListIdentifier=87
+LogLevel=88
+MARK=89
+MARKFAST=90
+MARKLAST=91
+MARKONCE=92
+MARKSCORE=93
+MARKTABLE=94
+MATCHEDTEXT=95
+MERGE=96
+MINUS=97
+MOFN=98
+NEAR=99
+NOT=100
+NOTEQUAL=101
+OR=102
+OctalEscape=103
+OctalLiteral=104
+OldColor=105
+PARSE=106
+PARTOF=107
+PARTOFNEQ=108
+PERCENT=109
+PLUS=110
+POSITION=111
+PackageString=112
+QUESTION=113
+RBRACK=114
+RCURLY=115
+REGEXP=116
+REMOVE=117
+REMOVEDUPLICATE=118
+REMOVESTRING=119
+REPLACE=120
+RETAINMARKUP=121
+RETAINTYPE=122
+RPAREN=123
+RessourceLiteral=124
+SCORE=125
+SEMI=126
+SETFEATURE=127
+SIN=128
+SIZE=129
+SLASH=130
+STAR=131
+STARTSWITH=132
+STRINGLIST=133
+ScriptString=134
+StringLiteral=135
+StringString=136
+SymbolString=137
+TAN=138
+THEN=139
+TOTALCOUNT=140
+TRANSFER=141
+TRIE=142
+TRUE=143
+TYPELIST=144
+TypeString=145
+TypeSystemString=146
+UNMARK=147
+UNMARKALL=148
+UnicodeEscape=149
+VBAR=150
+VOTE=151
+WORDLIST=152
+WORDTABLE=153
+WS=154
+XOR=155




svn commit: r1187337 - in /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser: TextMarkerLexer.g TextMarkerLexer.tokens

2011-10-21 Thread pkluegl
Author: pkluegl
Date: Fri Oct 21 13:37:15 2011
New Revision: 1187337

URL: http://svn.apache.org/viewvc?rev=1187337view=rev
Log:
UIMA-2272
Added missing token for lexer in IDE

Modified:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.g

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.tokens

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.g
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.g?rev=1187337r1=1187336r2=1187337view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.g
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.g
 Fri Oct 21 13:37:15 2011
@@ -30,7 +30,7 @@ tokens {
  * under the License.
 */
 
-   package org.apache.uima.textmarkeride.core.parser;
+   package org.apache.uima.textmarker.parser;
 }
 
 @lexer::members {
@@ -222,6 +222,10 @@ EXEC
:   'EXEC'
;
 
+CONFIGURE
+   :   'CONFIGURE'
+   ;
+
 ASSIGN
:   'ASSIGN'
;
@@ -251,6 +255,10 @@ EXPAND 
:   'EXPAND' 
;
 
+DYNAMICANCHORING   
+   :   'DYNAMICANCHORING'   
+   ;
+
 BEFORE
:   'BEFORE'
;

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.tokens
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.tokens?rev=1187337r1=1187336r2=1187337view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.tokens
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.tokens
 Fri Oct 21 13:37:15 2011
@@ -1,150 +1,152 @@
-STAR=137
-FloatTypeSuffix=112
-OctalLiteral=110
-FILTERMARKUP=48
-LOG=38
-CONTAINS=8
-REMOVE=66
-GREATEREQUAL=150
-MARKFAST=42
-MATCHEDTEXT=72
-CONDITION=91
-COUNT=14
-LOGN=99
-NOT=64
-Identifier=122
-ACTION=92
-NOTEQUAL=147
-CLEAR=74
-VBAR=139
-DOUBLELIST=95
-ENDSWITH=63
-RPAREN=124
-CREATE=32
-GREATER=142
-SIN=100
-EXP=98
-CURRENTCOUNT=16
-COS=101
-TAN=102
-TYPELIST=97
-LESS=141
-REGEXP=26
-GET=69
-PARTOF=23
-UNMARK=55
-LAST=19
-COMMENT=152
-REMOVEDUPLICATE=67
-UNMARKALL=56
-RBRACK=126
-NEAR=21
-LINE_COMMENT=153
-IntegerTypeSuffix=107
-MARKSCORE=40
-REMOVESTRING=73
-TRANSFER=57
-LCURLY=127
-TRIE=7
-FILTERTYPE=49
-RETAINMARKUP=46
-STRINGLIST=96
-MARKONCE=41
-ScriptString=80
-EngineString=81
-WS=151
-WORDTABLE=11
-WORDLIST=10
-AutomataBlockString=83
-FloatingPointLiteral=113
-INTLIST=94
-OR=22
-JavaIDDigit=121
-CALL=50
-Annotation=5
-FALSE=105
-LESSEQUAL=149
-RessourceLiteral=117
-VOTE=28
-Letter=120
-EscapeSequence=114
-SIZE=71
-BasicAnnotationType=76
-LBRACK=125
-CharacterLiteral=115
-DEL=37
-ATTRIBUTE=35
-TypeString=84
-Exponent=111
-ASSIGN_EQUAL=143
-RETAINTYPE=47
-AND=12
-TypeSystemString=89
-EXPAND=58
-BlockString=82
-IntString=85
-HexDigit=106
-COLOR=36
-LPAREN=123
-POSITION=25
-IF=29
-AT=130
-LogLevel=77
-SLASH=138
-THEN=75
-FILL=34
-COMMA=133
-IS=61
-AMPER=140
-REPLACE=45
-GETLIST=70
-EQUAL=146
-GATHER=33
-INLIST=17
-PLUS=135
-BooleanString=88
-GETFEATURE=54
-DOT=131
-ListIdentifier=6
-PARTOFNEQ=24
-BOOLEANLIST=93
-ADD=65
-MARKTABLE=43
-HexLiteral=108
-XOR=103
-PERCENT=144
-MARK=39
-PARSE=31
-PackageString=79
-OldColor=78
-MARKLAST=44
-MERGE=68
-CONTEXTCOUNT=13
-BEFORE=59
-EXEC=51
-MINUS=136
-AFTER=60
-DecimalLiteral=109
-SEMI=134
-TRUE=104
-FEATURE=30
-SymbolString=90
-COLON=132
-StringLiteral=116
-StringString=87
-SCORE=27
-QUESTION=145
-UnicodeEscape=118
-RCURLY=128
-STARTSWITH=62
-ASSIGN=52
-TOTALCOUNT=15
-DECLARE=9
-DocComment=4
-ISINTAG=18
-MOFN=20
-OctalEscape=119
-SETFEATURE=53
-DoubleString=86
-CIRCUMFLEX=129
-ALT_NOTEQUAL=148
+ACTION=4
+ADD=5
+AFTER=6
+ALT_NOTEQUAL=7
+AMPER=8
+AND=9
+ASSIGN=10
+ASSIGN_EQUAL=11
+AT=12
+ATTRIBUTE=13
+Annotation=14
+AutomataBlockString=15
+BEFORE=16
+BOOLEANLIST=17
+BasicAnnotationType=18
+BlockString=19
+BooleanString=20
+CALL=21
+CIRCUMFLEX=22
+CLEAR=23
+COLON=24
+COLOR=25
+COMMA=26
+COMMENT=27
+CONDITION=28
+CONFIGURE=29
+CONTAINS=30
+CONTEXTCOUNT=31
+COS=32
+COUNT=33
+CREATE=34
+CURRENTCOUNT=35
+CharacterLiteral=36
+DECLARE=37
+DEL=38
+DOT=39
+DOUBLELIST=40
+DYNAMICANCHORING=41

svn commit: r1197166 [2/2] - in /uima: sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/apply/ sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/s

2011-11-03 Thread pkluegl
Modified: 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasDocument.java
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasDocument.java?rev=1197166r1=1197165r2=1197166view=diff
==
--- 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasDocument.java
 (original)
+++ 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasDocument.java
 Thu Nov  3 14:49:30 2011
@@ -28,80 +28,78 @@ import org.apache.uima.cas.text.Annotati
 
 /**
  * The {@link ICasDocument} represents texts with meta information.
- *
- * A {@link ICasDocument} allows manipulation of its meta information
- * the text must not be changed.
- *
+ * 
+ * A {@link ICasDocument} allows manipulation of its meta information the text 
must not be changed.
+ * 
  * Meta information can be retrieved over the {@link CAS} object.
- *
- * Note: All changes to meta information should be done with
- * calls to the manipulation methods of the document.
- * If this is not possible, change the {@link CAS} and after
- * the change call the {@link ICasDocument#changed()} method.
+ * 
+ * Note: All changes to meta information should be done with calls to the 
manipulation methods of
+ * the document. If this is not possible, change the {@link CAS} and after the 
change call the
+ * {@link ICasDocument#changed()} method.
  */
 public interface ICasDocument {
 
   /**
* Adds a given change listener.
-   *
+   * 
* @param listener
*/
   void addChangeListener(ICasDocumentListener listener);
 
   /**
* Removes the given change listener.
-   *
+   * 
* @param listener
*/
   void removeChangeListener(ICasDocumentListener listener);
 
   /**
* Retrieves the CAS.
-   *
+   * 
* @return the CAS
*/
   CAS getCAS();
 
   /**
* Adds a {@link FeatureStructure} to the document.
-   *
-   * @param structure -
-   *  the {@link FeatureStructure} to add.
+   * 
+   * @param structure
+   *  - the {@link FeatureStructure} to add.
*/
   void addFeatureStructure(FeatureStructure structure);
 
   /**
* Adds the {@link FeatureStructure}s.
-   *
+   * 
* @param structures
*/
   void addFeatureStructures(Collection? extends FeatureStructure structures);
 
   /**
* Removes an {@link FeatureStructure} from the Document.
-   *
-   * @param structure -
-   *  the {@link FeatureStructure} to remove.
+   * 
+   * @param structure
+   *  - the {@link FeatureStructure} to remove.
*/
   void removeFeatureStructure(FeatureStructure structure);
 
   /**
* Removes the given {@link FeatureStructure}s.
-   *
+   * 
* @param structuresToRemove
*/
   void removeFeatureStructures(Collection? extends FeatureStructure 
structuresToRemove);
 
   /**
* Updates the given {@link FeatureStructure}.
-   *
+   * 
* @param structure
*/
   void update(FeatureStructure structure);
 
   /**
* Updates the given {@link FeatureStructure}s.
-   *
+   * 
* @param structures
*/
   void updateFeatureStructure(Collection? extends FeatureStructure 
structures);
@@ -113,27 +111,37 @@ public interface ICasDocument {
 
   /**
* Returns all codeAnnotation/codes of the given type.
-   *
-   * @param type -
-   *  type of the requested codeAnnotation/codes.
+   * 
+   * @param type
+   *  - type of the requested codeAnnotation/codes.
* @return - return all codeAnnotation/code of the given type or null if 
no
* codeAnnotation/code of this type exist.
*/
   CollectionAnnotationFS getAnnotations(Type type);
 
   /**
-   * Switches the view of the underlying CAS to the provided
-   * view name.
+   * Switches the view of the underlying CAS to the provided view name.
* 
* @param viewName
*/
   void switchView(String viewName);
-  
+
   /**
* Retrieves the requested type.
-   *
+   * 
* @param type
* @return the type
*/
   Type getType(String type);
+
+  /**
+   * This method is called if an {@link ICasDocument} is exchanged.
+   * 
+   * @param oldDocument
+   *  - the replaced, old document {@link ICasDocument}.
+   * @param newDocument
+   *  - the new, current document {@link ICasDocument}.
+   */
+  void switchCasDocument(ICasDocument oldDocument, ICasDocument newDocument);
+
 }

Modified: 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasDocumentListener.java
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasDocumentListener.java?rev=1197166r1=1197165r2=1197166view=diff
==
--- 

svn commit: r1197208 - /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java

2011-11-03 Thread pkluegl
Author: pkluegl
Date: Thu Nov  3 16:36:07 2011
New Revision: 1197208

URL: http://svn.apache.org/viewvc?rev=1197208view=rev
Log:
UIMA-2273
Reverted and added changes again without new formatting

Modified:

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/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=1197208r1=1197207r2=1197208view=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 Nov  3 16:36:07 2011
@@ -142,28 +142,29 @@ import org.eclipse.ui.views.contentoutli
 /**
  * An editor to annotate text.
  */
-public final class AnnotationEditor extends StatusTextEditor implements 
ICasEditor,
-ISelectionListener {
-
-  private abstract class AbstractAnnotateAction extends Action implements 
ISelectionChangedListener {
-
+public final class AnnotationEditor extends StatusTextEditor implements 
ICasEditor, ISelectionListener {
+  
+  private abstract class AbstractAnnotateAction extends Action
+  implements ISelectionChangedListener {
+  
 public void selectionChanged(SelectionChangedEvent event) {
-  setEnabled(AnnotationEditor.this.getSelection().y - 
AnnotationEditor.this.getSelection().x  0);
+  setEnabled(AnnotationEditor.this.getSelection().y - 
+  AnnotationEditor.this.getSelection().x  0);
 }
   }
-
+  
   /**
* This action annotates the selected text with a defined tag.
*/
   private class QuickAnnotateAction extends AbstractAnnotateAction {
-
+
 private static final String ID = QuickAnnotate;
-
+
 private StyledText mTextWidget;
 
 /**
  * Initializes a new instance.
- * 
+ *
  * @param textWidget
  */
 QuickAnnotateAction(StyledText textWidget) {
@@ -181,7 +182,7 @@ public final class AnnotationEditor exte
 // get old annotations of current type for this area
 // if there is something ... the delete them and add
 CollectionAnnotationFS oldAnnotations = 
getAnnotation(getDocument().getCAS(),
-getAnnotationMode(), new Span(selection.x, selection.y));
+getAnnotationMode(), new Span(selection.x, selection.y));
 
 if (!oldAnnotations.isEmpty()) {
   getDocument().removeFeatureStructures(oldAnnotations);
@@ -207,14 +208,15 @@ public final class AnnotationEditor exte
   private class SmartAnnotateAction extends AbstractAnnotateAction {
 
 private static final String ID = Annotate;
-
+
 @Override
 public void run() {
 
   if (isSomethingSelected()) {
 
-QuickTypeSelectionDialog typeDialog = new 
QuickTypeSelectionDialog(Display.getCurrent()
-.getActiveShell(), AnnotationEditor.this);
+QuickTypeSelectionDialog typeDialog =
+  new QuickTypeSelectionDialog(Display.getCurrent().getActiveShell(),
+  AnnotationEditor.this);
 
 typeDialog.open();
   }
@@ -275,30 +277,29 @@ public final class AnnotationEditor exte
* document with the annotations in eclipse.
*/
   private class DocumentListener extends AbstractAnnotationDocumentListener {
-
+
 /**
  * Adds a collection of annotations.
- * 
+ *
  * @param annotations
  */
 @Override
 public void addedAnnotation(CollectionAnnotationFS annotations) {
-  IAnnotationModelExtension annotationModel = (IAnnotationModelExtension) 
getDocumentProvider()
-  .getAnnotationModel(getEditorInput());
-
+  IAnnotationModelExtension annotationModel = (IAnnotationModelExtension) 
getDocumentProvider().getAnnotationModel(getEditorInput());
+  
   MapAnnotation, Position addAnnotationMap = new HashMapAnnotation, 
Position();
-
+  
   for (AnnotationFS annotation : annotations) {
-addAnnotationMap.put(new EclipseAnnotationPeer(annotation),
-new Position(annotation.getBegin(), annotation.getEnd() - 
annotation.getBegin()));
+addAnnotationMap.put(new EclipseAnnotationPeer(annotation), new 
Position(annotation.getBegin(), 
+annotation.getEnd() - annotation.getBegin()));
   }
-
+  
   annotationModel.replaceAnnotations(null, addAnnotationMap);
 }
 
 /**
  * Removes a collection of annotations.
- * 
+ *
  * @param deletedAnnotations
  */
 @Override
@@ -312,35 +313,32 @@ public final class AnnotationEditor exte
 
   highlight(0, 0); // TODO: only if removed annotation was selected
 
-  IAnnotationModelExtension annotationModel

svn commit: r1197545 - in /uima: sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/apply/ sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/mai

2011-11-04 Thread pkluegl
Author: pkluegl
Date: Fri Nov  4 13:13:43 2011
New Revision: 1197545

URL: http://svn.apache.org/viewvc?rev=1197545view=rev
Log:
UIMA-2273
The notification of views when the cas document is exchanged will now be 
processed by a new listener and controlled by the AnnotationEditor in the 
doSetInput method. Adapted known view. I hope I haven't missed any. The update 
logic should be improved by using setInput (see comments on jira)...

Added:

uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasEditorInputListener.java
Modified:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/apply/ApplyViewPage.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/testing/ui/views/EvaluationViewPage.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/tree/AnnotationTreeContentProvider.java

uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AbstractDocument.java

uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationDocument.java

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/DocumentUimaImpl.java

uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasDocument.java

uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasDocumentListener.java

uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/EditViewPage.java

uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureStructureContentProvider.java

uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserViewPage.java

uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/OutlineContentProviderBase.java

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/apply/ApplyViewPage.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/apply/ApplyViewPage.java?rev=1197545r1=1197544r2=1197545view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/apply/ApplyViewPage.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/apply/ApplyViewPage.java
 Fri Nov  4 13:13:43 2011
@@ -19,15 +19,13 @@
 
 package org.apache.uima.textmarker.explain.apply;
 
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.caseditor.editor.AbstractAnnotationDocumentListener;
 import org.apache.uima.caseditor.editor.AnnotationEditor;
 import org.apache.uima.caseditor.editor.ICasDocument;
 import org.apache.uima.caseditor.editor.ICasDocumentListener;
+import org.apache.uima.caseditor.editor.ICasEditorInputListener;
 import org.apache.uima.textmarker.addons.TextMarkerAddonsPlugin;
 import org.apache.uima.textmarker.explain.ExplainConstants;
 import org.apache.uima.textmarker.explain.tree.ExplainTree;
@@ -45,7 +43,7 @@ import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.part.IPageSite;
 import org.eclipse.ui.part.Page;
 
-public class ApplyViewPage extends Page implements ISelectionListener {
+public class ApplyViewPage extends Page implements ISelectionListener, 
ICasEditorInputListener {
 
   protected TreeViewer viewer;
 
@@ -123,41 +121,7 @@ public class ApplyViewPage extends Page 
 viewer.setInput(tree.getRoot());
 getSite().setSelectionProvider(viewer);
 getSite().getPage().addSelectionListener(this);
-
-listener = new AbstractAnnotationDocumentListener() {
-
-  @Override
-  public void changed() {
-  }
-
-  @Override
-  public void viewChanged(String oldViewName, String newViewName) {
-  }
-
-  @Override
-  protected void addedAnnotation(CollectionAnnotationFS annotations) {
-  }
-
-  @Override
-  protected void removedAnnotation(CollectionAnnotationFS annotations) {
-  }
-
-  @Override
-  protected void updatedAnnotation(CollectionAnnotationFS annotations) {
-  }
-
-  @Override
-  public void casDocumentChanged(ICasDocument oldDocument, ICasDocument 
newDocument) {
-document.removeChangeListener(this);
-document = newDocument;
-document.addChangeListener(this);
-ExplainTree tree = new ExplainTree

svn commit: r1197547 - in /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor: ICasEditor.java editview/FeatureStructureContentProvider.java fsview/FeatureStructureBro

2011-11-04 Thread pkluegl
Author: pkluegl
Date: Fri Nov  4 13:18:24 2011
New Revision: 1197547

URL: http://svn.apache.org/viewvc?rev=1197547view=rev
Log:
UIMA-2273
added listener methods to ICasEditor and removed casts to AnnotationEditor in 
two views

Modified:

uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasEditor.java

uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureStructureContentProvider.java

uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserViewPage.java

Modified: 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasEditor.java
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasEditor.java?rev=1197547r1=1197546r2=1197547view=diff
==
--- 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasEditor.java
 (original)
+++ 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasEditor.java
 Fri Nov  4 13:18:24 2011
@@ -36,4 +36,9 @@ public interface ICasEditor extends IEdi
   CasDocumentProvider getCasDocumentProvider();
   
   void reopenEditorWithNewTypeSystem();
+  
+  void addCasEditorInputListener(ICasEditorInputListener listener);
+  
+  void removeCasEditorInputListener(ICasEditorInputListener listener);
+  
 }

Modified: 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureStructureContentProvider.java
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureStructureContentProvider.java?rev=1197547r1=1197546r2=1197547view=diff
==
--- 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureStructureContentProvider.java
 (original)
+++ 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureStructureContentProvider.java
 Fri Nov  4 13:18:24 2011
@@ -29,7 +29,6 @@ import org.apache.uima.cas.FeatureStruct
 import org.apache.uima.cas.StringArrayFS;
 import org.apache.uima.cas.Type;
 import org.apache.uima.caseditor.editor.AbstractDocumentListener;
-import org.apache.uima.caseditor.editor.AnnotationEditor;
 import org.apache.uima.caseditor.editor.ArrayValue;
 import org.apache.uima.caseditor.editor.CasEditorError;
 import org.apache.uima.caseditor.editor.FeatureValue;
@@ -55,9 +54,7 @@ final class FeatureStructureContentProvi
 if (mDocument == null) {
   throw new IllegalArgumentException(document parameter must not be 
null!);
 }
-if(mEditor instanceof AnnotationEditor) {
-  ((AnnotationEditor)mEditor).addCasEditorInputListener(this);
-}
+ mEditor.addCasEditorInputListener(this);
   }
 
   private int arraySize(FeatureStructure value) {
@@ -123,9 +120,7 @@ final class FeatureStructureContentProvi
 
   public void dispose() {
 mDocument.removeChangeListener(this);
-if(mEditor instanceof AnnotationEditor) {
-  ((AnnotationEditor)mEditor).removeCasEditorInputListener(this);
-}
+mEditor.removeCasEditorInputListener(this);
   }
 
   public void inputChanged(final Viewer viewer, Object oldInput, Object 
newInput) {

Modified: 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserViewPage.java
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserViewPage.java?rev=1197547r1=1197546r2=1197547view=diff
==
--- 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserViewPage.java
 (original)
+++ 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserViewPage.java
 Fri Nov  4 13:18:24 2011
@@ -33,7 +33,6 @@ import org.apache.uima.cas.text.Annotati
 import org.apache.uima.caseditor.CasEditorPlugin;
 import org.apache.uima.caseditor.Images;
 import org.apache.uima.caseditor.editor.AbstractAnnotationDocumentListener;
-import org.apache.uima.caseditor.editor.AnnotationEditor;
 import org.apache.uima.caseditor.editor.FeatureValue;
 import org.apache.uima.caseditor.editor.ICasDocument;
 import org.apache.uima.caseditor.editor.ICasEditor;
@@ -81,9 +80,7 @@ public final class FeatureStructureBrows
 FeatureStructureTreeContentProvider(ICasEditor editor) {
   mEditor = editor;
   mDocument = editor.getDocument();
-  if(mEditor instanceof AnnotationEditor) {
-((AnnotationEditor)mEditor).addCasEditorInputListener

svn commit: r1200299 - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/apply/ uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/te

2011-11-10 Thread pkluegl
Author: pkluegl
Date: Thu Nov 10 12:39:48 2011
New Revision: 1200299

URL: http://svn.apache.org/viewvc?rev=1200299view=rev
Log:
UIMA-2273
adapted TextMarker views to changed casDocumentChanged interface

Modified:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/apply/ApplyViewPage.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/testing/ui/views/EvaluationViewPage.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/tree/AnnotationTreeContentProvider.java

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/apply/ApplyViewPage.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/apply/ApplyViewPage.java?rev=1200299r1=1200298r2=1200299view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/apply/ApplyViewPage.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/apply/ApplyViewPage.java
 Thu Nov 10 12:39:48 2011
@@ -38,6 +38,7 @@ import org.eclipse.swt.events.MouseEvent
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.ISelectionListener;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.part.IPageSite;
@@ -158,13 +159,16 @@ public class ApplyViewPage extends Page 
 
   }
 
+
   @Override
-  public void casDocumentChanged(ICasDocument oldDocument, ICasDocument 
newDocument) {
+  public void casDocumentChanged(IEditorInput oldInput, ICasDocument 
oldDocument,
+  IEditorInput newInput, ICasDocument newDocument) {
 editor.removeCasEditorInputListener(this);
 document = newDocument;
 editor.addCasEditorInputListener(this);
 ExplainTree tree = new ExplainTree(document.getCAS());
 viewer.setInput(tree.getRoot());
 viewer.refresh();
+
   }
 }

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/testing/ui/views/EvaluationViewPage.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/testing/ui/views/EvaluationViewPage.java?rev=1200299r1=1200298r2=1200299view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/testing/ui/views/EvaluationViewPage.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/testing/ui/views/EvaluationViewPage.java
 Thu Nov 10 12:39:48 2011
@@ -39,6 +39,7 @@ import org.eclipse.swt.dnd.Transfer;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.ISelectionListener;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.part.IPageSite;
@@ -170,7 +171,8 @@ public class EvaluationViewPage extends 
   }
 
   @Override
-  public void casDocumentChanged(ICasDocument oldDocument, ICasDocument 
newDocument) {
+  public void casDocumentChanged(IEditorInput oldInput, ICasDocument 
oldDocument,
+  IEditorInput newInput, ICasDocument newDocument) {
 document.removeChangeListener(this);
 document = newDocument;
 document.addChangeListener(this);

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/tree/AnnotationTreeContentProvider.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/tree/AnnotationTreeContentProvider.java?rev=1200299r1=1200298r2=1200299view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/tree/AnnotationTreeContentProvider.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/tree/AnnotationTreeContentProvider.java
 Thu Nov 10 12:39:48 2011
@@ -29,6 +29,7 @@ import org.apache.uima.caseditor.editor.
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IEditorInput;
 
 public class AnnotationTreeContentProvider extends

svn commit: r1200317 - in /uima/uimaj/trunk: uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/ uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/

2011-11-10 Thread pkluegl
Author: pkluegl
Date: Thu Nov 10 13:08:35 2011
New Revision: 1200317

URL: http://svn.apache.org/viewvc?rev=1200317view=rev
Log:
UIMA-2280
added preference and logic. The type system will be remembered in any case, but 
only applied if preference is set.

Modified:

uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java

uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferenceConstants.java

uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferenceInitializer.java

uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferencePage.java

Modified: 
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java?rev=1200317r1=1200316r2=1200317view=diff
==
--- 
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
 (original)
+++ 
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
 Thu Nov 10 13:08:35 2011
@@ -34,6 +34,7 @@ import org.apache.uima.caseditor.CasEdit
 import org.apache.uima.caseditor.core.model.DefaultColors;
 import org.apache.uima.caseditor.core.model.dotcorpus.DotCorpus;
 import org.apache.uima.caseditor.core.model.dotcorpus.DotCorpusSerializer;
+import org.apache.uima.caseditor.editor.AnnotationEditorPreferenceConstants;
 import org.apache.uima.caseditor.editor.AnnotationStyle;
 import org.apache.uima.caseditor.editor.CasDocumentProvider;
 import org.apache.uima.caseditor.editor.DocumentFormat;
@@ -213,10 +214,16 @@ public class DefaultCasDocumentProvider 
   IFile typeSystemFile = null;
 
   // First check if a type system is already known or was
-  // set by the editor for this specific CAS
-  String typeSystemFileString = 
documentToTypeSystemMap.get(casFile.getFullPath()
-  .toPortableString());
-
+  // set by the editor for this specific CAS.
+  // apply that type system only if the setting is active in the 
preferences
+  String typeSystemFileString = null;
+  IPreferenceStore prefStore = 
CasEditorPlugin.getDefault().getPreferenceStore();
+  boolean useLastTypesystem = prefStore
+  
.getBoolean(AnnotationEditorPreferenceConstants.ANNOTATION_EDITOR_REMEMBER_TYPESYSTEM);
+  if (useLastTypesystem) {
+typeSystemFileString = documentToTypeSystemMap
+.get(casFile.getFullPath().toPortableString());
+  }
   if (typeSystemFileString != null)
 typeSystemFile = ResourcesPlugin.getWorkspace().getRoot()
 .getFile(new Path(typeSystemFileString));

Modified: 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferenceConstants.java
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferenceConstants.java?rev=1200317r1=1200316r2=1200317view=diff
==
--- 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferenceConstants.java
 (original)
+++ 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferenceConstants.java
 Thu Nov 10 13:08:35 2011
@@ -28,4 +28,6 @@ public class AnnotationEditorPreferenceC
   
   public static final String EDITOR_LINE_LENGTH_HINT = 
   EDITOR_LINE_LENGTH_HINT;
+
+  public static final String ANNOTATION_EDITOR_REMEMBER_TYPESYSTEM = 
CasEditorPlugin.ID +.rememberTypesystem;
 }

Modified: 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferenceInitializer.java
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferenceInitializer.java?rev=1200317r1=1200316r2=1200317view=diff
==
--- 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferenceInitializer.java
 (original)
+++ 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferenceInitializer.java
 Thu Nov 10 13:08:35 2011
@@ -19,16 +19,16 @@
 
 package org.apache.uima.caseditor.editor;
 
+import org.apache.uima.caseditor.CasEditorPlugin;
 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
 import

svn commit: r1200355 - in /uima/uimaj/trunk: uimaj-ep-cas-editor-ide/ uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/ uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/e

2011-11-10 Thread pkluegl
Author: pkluegl
Date: Thu Nov 10 14:56:31 2011
New Revision: 1200355

URL: http://svn.apache.org/viewvc?rev=1200355view=rev
Log:
UIMA-2280
moved the preference to a new preference page in the ide plugin

Added:

uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferencePage.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml

uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferenceConstants.java

uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferenceInitializer.java

uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java

uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferenceConstants.java

uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferenceInitializer.java

uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferencePage.java

Modified: uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml?rev=1200355r1=1200354r2=1200355view=diff
==
--- uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml (original)
+++ uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml Thu Nov 10 14:56:31 2011
@@ -88,6 +88,12 @@
   id=org.apache.uima.caseditor.ide.AnnotationEditorPreference
   name=UIMA Annotation Editor
 /page
+page
+  category=org.apache.uima.caseditor.ide.AnnotationEditorPreference
+  class=org.apache.uima.caseditor.ide.CasEditorIdePreferencePage
+  id=org.apache.uima.caseditor.ide.CasEditorIdePreference
+  name=Cas Editor Ide
+/page
  /extension
  
 extension

Modified: 
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferenceConstants.java
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferenceConstants.java?rev=1200355r1=1200354r2=1200355view=diff
==
--- 
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferenceConstants.java
 (original)
+++ 
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferenceConstants.java
 Thu Nov 10 14:56:31 2011
@@ -27,4 +27,7 @@ public class CasEditorIdePreferenceConst
   CAS_IMPORT_WIZARD_LAST_USED_LANG;
   
   public static final String CAS_IMPORT_WIZARD_LAST_USED_ENCODINGS = 
CAS_IMPORT_WIZARD_ENCODINGS;
+  
+  public static final String CAS_EDITOR_REMEMBER_TYPESYSTEM = 
CAS_EDITOR_REMEMBER_TYPESYSTEM;
+  
 }

Modified: 
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferenceInitializer.java
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferenceInitializer.java?rev=1200355r1=1200354r2=1200355view=diff
==
--- 
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferenceInitializer.java
 (original)
+++ 
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferenceInitializer.java
 Thu Nov 10 14:56:31 2011
@@ -34,5 +34,8 @@ public class CasEditorIdePreferenceIniti


store.setDefault(CasEditorIdePreferenceConstants.CAS_IMPORT_WIZARD_LAST_USED_ENCODINGS,
Charset.defaultCharset().displayName());
+   
+
store.setDefault(CasEditorIdePreferenceConstants.CAS_EDITOR_REMEMBER_TYPESYSTEM,
 true);
+   
}
 }

Added: 
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferencePage.java
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferencePage.java?rev=1200355view=auto
==
--- 
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferencePage.java
 (added)
+++ 
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferencePage.java
 Thu Nov 10 14:56:31 2011
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional

svn commit: r1200386 - in /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor: AnnotationEditorPreferenceConstants.java AnnotationEditorPreferenceInitializer.java Anno

2011-11-10 Thread pkluegl
Author: pkluegl
Date: Thu Nov 10 15:43:58 2011
New Revision: 1200386

URL: http://svn.apache.org/viewvc?rev=1200386view=rev
Log:
UIMA-2011
Added preference and logic to load CASs leniently. Preference was added to the 
annotation editor preference page since the logic was placed in 
DocumentUimaImpl. Deactivated by default.

Modified:

uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferenceConstants.java

uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferenceInitializer.java

uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferencePage.java

uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/DocumentUimaImpl.java

Modified: 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferenceConstants.java
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferenceConstants.java?rev=1200386r1=1200385r2=1200386view=diff
==
--- 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferenceConstants.java
 (original)
+++ 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferenceConstants.java
 Thu Nov 10 15:43:58 2011
@@ -29,5 +29,7 @@ public class AnnotationEditorPreferenceC
   public static final String EDITOR_LINE_LENGTH_HINT = 
   EDITOR_LINE_LENGTH_HINT;
 
+  public static final String ANNOTATION_EDITOR_PARTIAL_TYPESYSTEM = 
ANNOTATION_EDITOR_PARTIAL_TYPESYSTEM;
+
 
 }

Modified: 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferenceInitializer.java
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferenceInitializer.java?rev=1200386r1=1200385r2=1200386view=diff
==
--- 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferenceInitializer.java
 (original)
+++ 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferenceInitializer.java
 Thu Nov 10 15:43:58 2011
@@ -29,5 +29,6 @@ public class AnnotationEditorPreferenceI
IPreferenceStore store = 
CasEditorPlugin.getDefault().getPreferenceStore();

store.setDefault(AnnotationEditorPreferenceConstants.EDITOR_LINE_LENGTH_HINT, 
80);

store.setDefault(AnnotationEditorPreferenceConstants.ANNOTATION_EDITOR_TEXT_SIZE,
 13);
+
store.setDefault(AnnotationEditorPreferenceConstants.ANNOTATION_EDITOR_PARTIAL_TYPESYSTEM,
 false);
}
 }

Modified: 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferencePage.java
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferencePage.java?rev=1200386r1=1200385r2=1200386view=diff
==
--- 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferencePage.java
 (original)
+++ 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferencePage.java
 Thu Nov 10 15:43:58 2011
@@ -20,6 +20,7 @@
 package org.apache.uima.caseditor.editor;
 
 import org.apache.uima.caseditor.CasEditorPlugin;
+import org.eclipse.jface.preference.BooleanFieldEditor;
 import org.eclipse.jface.preference.FieldEditorPreferencePage;
 import org.eclipse.jface.preference.IntegerFieldEditor;
 import org.eclipse.ui.IWorkbench;
@@ -33,6 +34,7 @@ public class AnnotationEditorPreferenceP
 
   private IntegerFieldEditor mEditorLineLengthHint;
   private IntegerFieldEditor mEditorTextSize;
+  private BooleanFieldEditor mEditorPartialTypeystem;
   
   public AnnotationEditorPreferencePage() {
 setPreferenceStore(CasEditorPlugin.getDefault().getPreferenceStore());
@@ -53,6 +55,13 @@ public class AnnotationEditorPreferenceP
 AnnotationEditorPreferenceConstants.ANNOTATION_EDITOR_TEXT_SIZE,
 Editor Text Size, getFieldEditorParent());
 addField(mEditorTextSize);
+
+// load CAS with partial type system
+mEditorPartialTypeystem = new BooleanFieldEditor(
+
AnnotationEditorPreferenceConstants.ANNOTATION_EDITOR_PARTIAL_TYPESYSTEM,
+Load CAS leniently (WARNING: only for experienced users), 
getFieldEditorParent());
+addField(mEditorPartialTypeystem);
+
   }
 
   public void init(IWorkbench workbench

svn commit: r1200420 - in /uima/uimaj/trunk/uimaj-ep-cas-editor-ide: plugin.xml src/main/java/org/apache/uima/caseditor/ide/CasEditorPreferencePage.java

2011-11-10 Thread pkluegl
Author: pkluegl
Date: Thu Nov 10 16:47:41 2011
New Revision: 1200420

URL: http://svn.apache.org/viewvc?rev=1200420view=rev
Log:
UIMA-2282
Added new parent preference page UIMA Cas Editor for Annotation Editor and 
Cas Editor Ide. The empty implementation of the general page is located in 
the ide plugin for now. 

Added:

uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorPreferencePage.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml

Modified: uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml?rev=1200420r1=1200419r2=1200420view=diff
==
--- uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml (original)
+++ uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml Thu Nov 10 16:47:41 2011
@@ -84,16 +84,22 @@
  
  extension point=org.eclipse.ui.preferencePages
 page
+  category=org.apache.uima.caseditor.ide.CasEditorPreference
   
class=org.apache.uima.caseditor.editor.AnnotationEditorPreferencePage
   id=org.apache.uima.caseditor.ide.AnnotationEditorPreference
-  name=UIMA Annotation Editor
+  name=Annotation Editor
 /page
 page
-  category=org.apache.uima.caseditor.ide.AnnotationEditorPreference
+  category=org.apache.uima.caseditor.ide.CasEditorPreference
   class=org.apache.uima.caseditor.ide.CasEditorIdePreferencePage
   id=org.apache.uima.caseditor.ide.CasEditorIdePreference
   name=Cas Editor Ide
 /page
+page
+  class=org.apache.uima.caseditor.ide.CasEditorPreferencePage
+  id=org.apache.uima.caseditor.ide.CasEditorPreference
+  name=UIMA Cas Editor
+/page
  /extension
  
 extension

Added: 
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorPreferencePage.java
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorPreferencePage.java?rev=1200420view=auto
==
--- 
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorPreferencePage.java
 (added)
+++ 
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorPreferencePage.java
 Thu Nov 10 16:47:41 2011
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.uima.caseditor.ide;
+
+import org.eclipse.jface.preference.FieldEditorPreferencePage;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+
+public class CasEditorPreferencePage extends FieldEditorPreferencePage
+  implements IWorkbenchPreferencePage {
+
+  public CasEditorPreferencePage() {
+// TODO uncomment, if you really want to use this page
+// setPreferenceStore(CasEditorPlugin.getDefault().getPreferenceStore());
+setDescription(General Cas Editor Preferences.);
+  }
+  
+  public void init(IWorkbench arg0) {
+
+  }
+
+  @Override
+  protected void createFieldEditors() {
+
+  }
+
+
+}




svn commit: r1214228 - in /uima/sandbox/trunk/TextMarker/uima-docbook-textmarker: .project src/ src/docbook/ src/docbook/images/ src/docbook/images/tools/ src/docbook/images/tools/tools.textmarker/ sr

2011-12-14 Thread pkluegl
Author: pkluegl
Date: Wed Dec 14 13:06:44 2011
New Revision: 1214228

URL: http://svn.apache.org/viewvc?rev=1214228view=rev
Log:
UIMA-2285
created proxy docbook project for the development of the TextMarker 
documentation

Added:
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/.project
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/

uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/

uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/

uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/tools.textmarker.xml

Added: uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/.project
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/.project?rev=1214228view=auto
==
--- uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/.project (added)
+++ uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/.project Wed Dec 14 
13:06:44 2011
@@ -0,0 +1,11 @@
+?xml version=1.0 encoding=UTF-8?
+projectDescription
+   nameuima-docbook-textmarker/name
+   comment/comment
+   projects
+   /projects
+   buildSpec
+   /buildSpec
+   natures
+   /natures
+/projectDescription

Added: 
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/tools.textmarker.xml
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/tools.textmarker.xml?rev=1214228view=auto
==
--- 
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/tools.textmarker.xml
 (added)
+++ 
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/tools.textmarker.xml
 Wed Dec 14 13:06:44 2011
@@ -0,0 +1,28 @@
+?xml version=1.0 encoding=UTF-8?
+!DOCTYPE chapter PUBLIC -//OASIS//DTD DocBook XML V4.4//EN
+http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd;[
+!ENTITY imgroot images/tools/tools.textmarker/ 
+!ENTITY % uimaents SYSTEM ../../target/docbook-shared/entities.ent   
+%uimaents;
+]
+!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+License); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+--
+
+chapter id=ugr.tools.tm
+/chapter
\ No newline at end of file




svn commit: r1221318 - in /uima/sandbox/trunk/TextMarker/uima-docbook-textmarker: pom.xml src/docbook/images/tools/tools.textmarker/symboltaxo.png src/docbook/proxy-book.xml src/docbook/tools.textmark

2011-12-20 Thread pkluegl
Author: pkluegl
Date: Tue Dec 20 15:32:17 2011
New Revision: 1221318

URL: http://svn.apache.org/viewvc?rev=1221318view=rev
Log:
UIMA-2285
converted to maven project
added a proxy book and old (out-dated) introduction for testing the maven build 
process 

Added:
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/pom.xml

uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/symboltaxo.png
   (with props)

uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/proxy-book.xml
Modified:

uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/tools.textmarker.xml

Added: uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/pom.xml?rev=1221318view=auto
==
--- uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/pom.xml (added)
+++ uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/pom.xml Tue Dec 20 
15:32:17 2011
@@ -0,0 +1,23 @@
+project xmlns=http://maven.apache.org/POM/4.0.0; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;
+  modelVersion4.0.0/modelVersion
+  artifactIduima-docbook-textmarker/artifactId
+  version2.4.1-SNAPSHOT/version
+  packagingpom/packaging
+  parent
+   groupIdorg.apache.uima/groupId
+   artifactIduimaj-parent/artifactId
+   version2.4.1-SNAPSHOT/version
+   relativePath../uimaj-parent/pom.xml/relativePath
+  /parent
+  nameApache UIMA SDK Documentation - TextMarker/name
+  url${uimaWebsiteUrl}/url
+  scm
+   
urlhttp://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/url
+   
connectionscm:svn:http://svn.apache.org/repos/asf/uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/connection
+   
developerConnectionscm:svn:https://svn.apache.org/repos/asf/uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/developerConnection
+  /scm
+  properties
+   uimaScmProject${project.artifactId}/uimaScmProject
+   bookNameRootproxy-book/bookNameRoot
+  /properties
+/project
\ No newline at end of file

Added: 
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/symboltaxo.png
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/symboltaxo.png?rev=1221318view=auto
==
Binary file - no diff available.

Propchange: 
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/symboltaxo.png
--
svn:mime-type = application/octet-stream

Added: 
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/proxy-book.xml
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/proxy-book.xml?rev=1221318view=auto
==
--- 
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/proxy-book.xml
 (added)
+++ 
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/proxy-book.xml
 Tue Dec 20 15:32:17 2011
@@ -0,0 +1,27 @@
+?xml version=1.0 encoding=UTF-8?
+!DOCTYPE book PUBLIC -//OASIS//DTD DocBook XML V4.4//EN
+http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd;
+!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+License); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+--
+book lang=en
+  titleTextMarker Guide and Reference/title
+  xi:include xmlns:xi=http://www.w3.org/2001/XInclude; 
href=../../target/docbook-shared/common_book_info.xml/
+  toc/
+  xi:include xmlns:xi=http://www.w3.org/2001/XInclude; 
href=tools.textmarker.xml/
+/book

Modified: 
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/tools.textmarker.xml
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/tools.textmarker.xml?rev=1221318r1=1221317r2=1221318view=diff

svn commit: r1222674 [1/2] - in /uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook: ./ images/tools/tools.textmarker/

2011-12-23 Thread pkluegl
Author: pkluegl
Date: Fri Dec 23 13:25:01 2011
New Revision: 1222674

URL: http://svn.apache.org/viewvc?rev=1222674view=rev
Log:
UIMA-2285
added remaining old and out-dated documentation.

Added:

uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Query.png
   (with props)

uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Screenshot_Result_TP_desc_close_cut.png
   (with props)

uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Screenshot_all_unavailable.png
   (with props)

uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Screenshot_main.png
   (with props)

uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Screenshot_preferences.png
   (with props)

uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Screenshot_result.png
   (with props)

uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Screenshot_testing_desc_2_resize
 (1).png   (with props)

uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Screenshot_testing_desc_2_resize.png
   (with props)

uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Screenshot_testing_desc_3_resize.png
   (with props)

uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/folder_struc_sep_desc_cut.png
   (with props)
Modified:

uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/tools.textmarker.xml

Added: 
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Query.png
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Query.png?rev=1222674view=auto
==
Binary file - no diff available.

Propchange: 
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Query.png
--
svn:mime-type = application/octet-stream

Added: 
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Screenshot_Result_TP_desc_close_cut.png
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Screenshot_Result_TP_desc_close_cut.png?rev=1222674view=auto
==
Binary file - no diff available.

Propchange: 
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Screenshot_Result_TP_desc_close_cut.png
--
svn:mime-type = application/octet-stream

Added: 
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Screenshot_all_unavailable.png
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Screenshot_all_unavailable.png?rev=1222674view=auto
==
Binary file - no diff available.

Propchange: 
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Screenshot_all_unavailable.png
--
svn:mime-type = application/octet-stream

Added: 
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Screenshot_main.png
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Screenshot_main.png?rev=1222674view=auto
==
Binary file - no diff available.

Propchange: 
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Screenshot_main.png
--
svn:mime-type = application/octet-stream

Added: 
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Screenshot_preferences.png
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Screenshot_preferences.png?rev=1222674view=auto
==
Binary file - no diff available.

Propchange: 
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools

svn commit: r1229085 [3/5] - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/ uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker

2012-01-09 Thread pkluegl
Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.tokens
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.tokens?rev=1229085r1=1229084r2=1229085view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.tokens
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.tokens
 Mon Jan  9 10:22:03 2012
@@ -52,101 +52,103 @@ FEATURE=54
 FILL=55
 FILTERMARKUP=56
 FILTERTYPE=57
-FloatTypeSuffix=58
-FloatingPointLiteral=59
-GATHER=60
-GET=61
-GETFEATURE=62
-GETLIST=63
-GREATER=64
-GREATEREQUAL=65
-HexDigit=66
-HexLiteral=67
-IF=68
-INLIST=69
-INTLIST=70
-IS=71
-ISINTAG=72
-Identifier=73
-IntString=74
-IntegerTypeSuffix=75
-JavaIDDigit=76
-LAST=77
-LBRACK=78
-LCURLY=79
-LESS=80
-LESSEQUAL=81
-LINE_COMMENT=82
-LOG=83
-LOGN=84
-LPAREN=85
-Letter=86
-ListIdentifier=87
-LogLevel=88
-MARK=89
-MARKFAST=90
-MARKLAST=91
-MARKONCE=92
-MARKSCORE=93
-MARKTABLE=94
-MATCHEDTEXT=95
-MERGE=96
-MINUS=97
-MOFN=98
-NEAR=99
-NOT=100
-NOTEQUAL=101
-OR=102
-OctalEscape=103
-OctalLiteral=104
-OldColor=105
-PARSE=106
-PARTOF=107
-PARTOFNEQ=108
-PERCENT=109
-PLUS=110
-POSITION=111
-PackageString=112
-QUESTION=113
-RBRACK=114
-RCURLY=115
-REGEXP=116
-REMOVE=117
-REMOVEDUPLICATE=118
-REMOVESTRING=119
-REPLACE=120
-RETAINMARKUP=121
-RETAINTYPE=122
-RPAREN=123
-RessourceLiteral=124
-SCORE=125
-SEMI=126
-SETFEATURE=127
-SIN=128
-SIZE=129
-SLASH=130
-STAR=131
-STARTSWITH=132
-STRINGLIST=133
-ScriptString=134
-StringLiteral=135
-StringString=136
-SymbolString=137
-TAN=138
-THEN=139
-TOTALCOUNT=140
-TRANSFER=141
-TRIE=142
-TRUE=143
-TYPELIST=144
-TypeString=145
-TypeSystemString=146
-UNMARK=147
-UNMARKALL=148
-UnicodeEscape=149
-VBAR=150
-VOTE=151
-WORDLIST=152
-WORDTABLE=153
-WS=154
-XOR=155
+FLOATLIST=58
+FloatString=59
+FloatTypeSuffix=60
+FloatingPointLiteral=61
+GATHER=62
+GET=63
+GETFEATURE=64
+GETLIST=65
+GREATER=66
+GREATEREQUAL=67
+HexDigit=68
+HexLiteral=69
+IF=70
+INLIST=71
+INTLIST=72
+IS=73
+ISINTAG=74
+Identifier=75
+IntString=76
+IntegerTypeSuffix=77
+JavaIDDigit=78
+LAST=79
+LBRACK=80
+LCURLY=81
+LESS=82
+LESSEQUAL=83
+LINE_COMMENT=84
+LOG=85
+LOGN=86
+LPAREN=87
+Letter=88
+ListIdentifier=89
+LogLevel=90
+MARK=91
+MARKFAST=92
+MARKLAST=93
+MARKONCE=94
+MARKSCORE=95
+MARKTABLE=96
+MATCHEDTEXT=97
+MERGE=98
+MINUS=99
+MOFN=100
+NEAR=101
+NOT=102
+NOTEQUAL=103
+OR=104
+OctalEscape=105
+OctalLiteral=106
+OldColor=107
+PARSE=108
+PARTOF=109
+PARTOFNEQ=110
+PERCENT=111
+PLUS=112
+POSITION=113
+PackageString=114
+QUESTION=115
+RBRACK=116
+RCURLY=117
+REGEXP=118
+REMOVE=119
+REMOVEDUPLICATE=120
+REMOVESTRING=121
+REPLACE=122
+RETAINMARKUP=123
+RETAINTYPE=124
+RPAREN=125
+RessourceLiteral=126
+SCORE=127
+SEMI=128
+SETFEATURE=129
+SIN=130
+SIZE=131
+SLASH=132
+STAR=133
+STARTSWITH=134
+STRINGLIST=135
+ScriptString=136
+StringLiteral=137
+StringString=138
+SymbolString=139
+TAN=140
+THEN=141
+TOTALCOUNT=142
+TRANSFER=143
+TRIE=144
+TRUE=145
+TYPELIST=146
+TypeString=147
+TypeSystemString=148
+UNMARK=149
+UNMARKALL=150
+UnicodeEscape=151
+VBAR=152
+VOTE=153
+WORDLIST=154
+WORDTABLE=155
+WS=156
+XOR=157

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.g
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.g?rev=1229085r1=1229084r2=1229085view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.g
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.g
 Mon Jan  9 10:22:03 2012
@@ -258,6 +258,11 @@ variableDeclaration returns [TextMarkerS
(COMMA {!ownsVariable($blockDeclaration::env, 
input.LT(1).getText())}? id = Identifier {addVariable($blockDeclaration::env, 
id.getText(), type.getText());}
 )* (ASSIGN_EQUAL value2 = numberExpression)? 
{setValue($blockDeclaration::env, id.getText(), value2);} SEMI
|
+   type = FloatString
+   {!ownsVariable($blockDeclaration::env, input.LT(1).getText())}? id = 
Identifier {addVariable($blockDeclaration::env, id.getText(), type.getText());}
+   (COMMA {!ownsVariable($blockDeclaration::env, 
input.LT(1).getText())}? id = Identifier {addVariable($blockDeclaration::env, 
id.getText(), type.getText());}
+)* (ASSIGN_EQUAL value2 = numberExpression)? 
{setValue($blockDeclaration::env, id.getText(), 

svn commit: r1229085 [5/5] - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/ uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker

2012-01-09 Thread pkluegl
Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.tokens
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.tokens?rev=1229085r1=1229084r2=1229085view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.tokens
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.tokens
 Mon Jan  9 10:22:03 2012
@@ -52,101 +52,103 @@ FEATURE=54
 FILL=55
 FILTERMARKUP=56
 FILTERTYPE=57
-FloatTypeSuffix=58
-FloatingPointLiteral=59
-GATHER=60
-GET=61
-GETFEATURE=62
-GETLIST=63
-GREATER=64
-GREATEREQUAL=65
-HexDigit=66
-HexLiteral=67
-IF=68
-INLIST=69
-INTLIST=70
-IS=71
-ISINTAG=72
-Identifier=73
-IntString=74
-IntegerTypeSuffix=75
-JavaIDDigit=76
-LAST=77
-LBRACK=78
-LCURLY=79
-LESS=80
-LESSEQUAL=81
-LINE_COMMENT=82
-LOG=83
-LOGN=84
-LPAREN=85
-Letter=86
-ListIdentifier=87
-LogLevel=88
-MARK=89
-MARKFAST=90
-MARKLAST=91
-MARKONCE=92
-MARKSCORE=93
-MARKTABLE=94
-MATCHEDTEXT=95
-MERGE=96
-MINUS=97
-MOFN=98
-NEAR=99
-NOT=100
-NOTEQUAL=101
-OR=102
-OctalEscape=103
-OctalLiteral=104
-OldColor=105
-PARSE=106
-PARTOF=107
-PARTOFNEQ=108
-PERCENT=109
-PLUS=110
-POSITION=111
-PackageString=112
-QUESTION=113
-RBRACK=114
-RCURLY=115
-REGEXP=116
-REMOVE=117
-REMOVEDUPLICATE=118
-REMOVESTRING=119
-REPLACE=120
-RETAINMARKUP=121
-RETAINTYPE=122
-RPAREN=123
-RessourceLiteral=124
-SCORE=125
-SEMI=126
-SETFEATURE=127
-SIN=128
-SIZE=129
-SLASH=130
-STAR=131
-STARTSWITH=132
-STRINGLIST=133
-ScriptString=134
-StringLiteral=135
-StringString=136
-SymbolString=137
-TAN=138
-THEN=139
-TOTALCOUNT=140
-TRANSFER=141
-TRIE=142
-TRUE=143
-TYPELIST=144
-TypeString=145
-TypeSystemString=146
-UNMARK=147
-UNMARKALL=148
-UnicodeEscape=149
-VBAR=150
-VOTE=151
-WORDLIST=152
-WORDTABLE=153
-WS=154
-XOR=155
+FLOATLIST=58
+FloatString=59
+FloatTypeSuffix=60
+FloatingPointLiteral=61
+GATHER=62
+GET=63
+GETFEATURE=64
+GETLIST=65
+GREATER=66
+GREATEREQUAL=67
+HexDigit=68
+HexLiteral=69
+IF=70
+INLIST=71
+INTLIST=72
+IS=73
+ISINTAG=74
+Identifier=75
+IntString=76
+IntegerTypeSuffix=77
+JavaIDDigit=78
+LAST=79
+LBRACK=80
+LCURLY=81
+LESS=82
+LESSEQUAL=83
+LINE_COMMENT=84
+LOG=85
+LOGN=86
+LPAREN=87
+Letter=88
+ListIdentifier=89
+LogLevel=90
+MARK=91
+MARKFAST=92
+MARKLAST=93
+MARKONCE=94
+MARKSCORE=95
+MARKTABLE=96
+MATCHEDTEXT=97
+MERGE=98
+MINUS=99
+MOFN=100
+NEAR=101
+NOT=102
+NOTEQUAL=103
+OR=104
+OctalEscape=105
+OctalLiteral=106
+OldColor=107
+PARSE=108
+PARTOF=109
+PARTOFNEQ=110
+PERCENT=111
+PLUS=112
+POSITION=113
+PackageString=114
+QUESTION=115
+RBRACK=116
+RCURLY=117
+REGEXP=118
+REMOVE=119
+REMOVEDUPLICATE=120
+REMOVESTRING=121
+REPLACE=122
+RETAINMARKUP=123
+RETAINTYPE=124
+RPAREN=125
+RessourceLiteral=126
+SCORE=127
+SEMI=128
+SETFEATURE=129
+SIN=130
+SIZE=131
+SLASH=132
+STAR=133
+STARTSWITH=134
+STRINGLIST=135
+ScriptString=136
+StringLiteral=137
+StringString=138
+SymbolString=139
+TAN=140
+THEN=141
+TOTALCOUNT=142
+TRANSFER=143
+TRIE=144
+TRUE=145
+TYPELIST=146
+TypeString=147
+TypeSystemString=148
+UNMARK=149
+UNMARKALL=150
+UnicodeEscape=151
+VBAR=152
+VOTE=153
+WORDLIST=154
+WORDTABLE=155
+WS=156
+XOR=157

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/verbalize/ExpressionVerbalizer.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/verbalize/ExpressionVerbalizer.java?rev=1229085r1=1229084r2=1229085view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/verbalize/ExpressionVerbalizer.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/verbalize/ExpressionVerbalizer.java
 Mon Jan  9 10:22:03 2012
@@ -36,12 +36,10 @@ import org.apache.uima.textmarker.expres
 import org.apache.uima.textmarker.expression.list.SimpleNumberListExpression;
 import org.apache.uima.textmarker.expression.list.SimpleStringListExpression;
 import org.apache.uima.textmarker.expression.list.SimpleTypeListExpression;
-import org.apache.uima.textmarker.expression.number.ComposedDoubleExpression;
-import org.apache.uima.textmarker.expression.number.ComposedIntegerExpression;
+import org.apache.uima.textmarker.expression.number.ComposedNumberExpression;
 import org.apache.uima.textmarker.expression.number.NegativeNumberExpression;
 import org.apache.uima.textmarker.expression.number.NumberExpression;
-import org.apache.uima.textmarker.expression.number.ReferenceDoubleExpression;
-import 

svn commit: r1229104 - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/testing/evaluator/ uimaj-ep-textmarker-engine/src/main/java/org/apache/uim

2012-01-09 Thread pkluegl
Author: pkluegl
Date: Mon Jan  9 12:08:45 2012
New Revision: 1229104

URL: http://svn.apache.org/viewvc?rev=1229104view=rev
Log:
UIMA-2319
added constants for primitive types
added keywords for float

Added:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/UIMAConstants.java
Modified:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/testing/evaluator/FeatureCasEvaluator.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/testing/evaluator/StringFeatureCasEvaluator.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/AbstractStructureAction.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/GetFeatureAction.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/MarkTableAction.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/SetFeatureAction.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/condition/FeatureCondition.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/TextMarkerKeywords.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/builder/TextMarkerSimpleBuilder.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/parser/ast/TMTypeConstants.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/validator/TextMarkerTypeChecker.java

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/testing/evaluator/FeatureCasEvaluator.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/testing/evaluator/FeatureCasEvaluator.java?rev=1229104r1=1229103r2=1229104view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/testing/evaluator/FeatureCasEvaluator.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/testing/evaluator/FeatureCasEvaluator.java
 Mon Jan  9 12:08:45 2012
@@ -34,6 +34,7 @@ import org.apache.uima.cas.Type;
 import org.apache.uima.cas.TypeSystem;
 import org.apache.uima.cas.text.AnnotationFS;
 import org.apache.uima.jcas.tcas.Annotation;
+import org.apache.uima.textmarker.UIMAConstants;
 import org.apache.uima.textmarker.engine.TextMarkerEngine;
 
 public class FeatureCasEvaluator implements ICasEvaluator {
@@ -47,7 +48,7 @@ public class FeatureCasEvaluator impleme
 Type truePositiveType = 
run.getTypeSystem().getType(ICasEvaluator.TRUE_POSITIVE);
 Feature feature = 
falsePositiveType.getFeatureByBaseName(ICasEvaluator.ORIGINAL);
 Type annotationType = test.getAnnotationType();
-Type stringType = run.getTypeSystem().getType(uima.cas.String);
+Type stringType = run.getTypeSystem().getType(UIMAConstants.TYPE_STRING);
 Type basicType = run.getTypeSystem().getType(TextMarkerEngine.BASIC_TYPE);
 ListType allTypes = 
test.getTypeSystem().getProperlySubsumedTypes(annotationType);
 ListType types = new ArrayListType();
@@ -208,7 +209,7 @@ public class FeatureCasEvaluator impleme
   }
 }
 
-if (uima.cas.String.equals(range.getName())) {
+if (UIMAConstants.TYPE_STRING.equals(range.getName())) {
   String valueTest = fs.getFeatureValueAsString(feature);
   if (valueTest != null) {
 Feature feature2 = 
newFS.getType().getFeatureByBaseName(feature.getShortName());
@@ -245,7 +246,7 @@ public class FeatureCasEvaluator impleme
   for (Feature feature : features) {
 Type range = feature.getRange();
 if (typeSystem.subsumes(annotationType, range)
-|| uima.cas.String.equals(range.getName())) {
+|| UIMAConstants.TYPE_STRING.equals(range.getName())) {
   result.add(fs);
   break;
 }
@@ -322,7 +323,7 @@ public class FeatureCasEvaluator impleme
 
   }
 
-  if (uima.cas.String.equals(range.getName())) {
+  if (UIMAConstants.TYPE_STRING.equals(range.getName())) {
 
 String name = eachFeature1.getShortName();
 

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/testing/evaluator/StringFeatureCasEvaluator.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org

svn commit: r1229131 [1/3] - in /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide: core/parser/ parser/ast/

2012-01-09 Thread pkluegl
Author: pkluegl
Date: Mon Jan  9 13:02:07 2012
New Revision: 1229131

URL: http://svn.apache.org/viewvc?rev=1229131view=rev
Log:
UIMA-2319
fixed bug/typo in ide parser grammar

Modified:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.tokens

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/parser/ast/StatementFactory.java

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g?rev=1229131r1=1229130r2=1229131view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g
 Mon Jan  9 13:02:07 2012
@@ -1873,7 +1873,7 @@ externalNumberFunction returns [Expressi
 numberVariable returns [Expression expr = null]
:
   ( {isVariableOfType(input.LT(1).getText(), INT)}? numVarRef = 
Identifier //
-| {isVariableOfType(input.LT(1).getText(), DOUBLE)}? numVarRef = 
Identifier)
+| {isVariableOfType(input.LT(1).getText(), DOUBLE)}? numVarRef = 
Identifier
  | {isVariableOfType(input.LT(1).getText(), FLOAT)}? numVarRef = 
Identifier)
 {   expr = 
ExpressionFactory.createNumberVariableReference(numVarRef);}
;




svn commit: r1229131 [3/3] - in /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide: core/parser/ parser/ast/

2012-01-09 Thread pkluegl
Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.tokens
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.tokens?rev=1229131r1=1229130r2=1229131view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.tokens
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.tokens
 Mon Jan  9 13:02:07 2012
@@ -52,101 +52,103 @@ FEATURE=54
 FILL=55
 FILTERMARKUP=56
 FILTERTYPE=57
-FloatTypeSuffix=58
-FloatingPointLiteral=59
-GATHER=60
-GET=61
-GETFEATURE=62
-GETLIST=63
-GREATER=64
-GREATEREQUAL=65
-HexDigit=66
-HexLiteral=67
-IF=68
-INLIST=69
-INTLIST=70
-IS=71
-ISINTAG=72
-Identifier=73
-IntString=74
-IntegerTypeSuffix=75
-JavaIDDigit=76
-LAST=77
-LBRACK=78
-LCURLY=79
-LESS=80
-LESSEQUAL=81
-LINE_COMMENT=82
-LOG=83
-LOGN=84
-LPAREN=85
-Letter=86
-ListIdentifier=87
-LogLevel=88
-MARK=89
-MARKFAST=90
-MARKLAST=91
-MARKONCE=92
-MARKSCORE=93
-MARKTABLE=94
-MATCHEDTEXT=95
-MERGE=96
-MINUS=97
-MOFN=98
-NEAR=99
-NOT=100
-NOTEQUAL=101
-OR=102
-OctalEscape=103
-OctalLiteral=104
-OldColor=105
-PARSE=106
-PARTOF=107
-PARTOFNEQ=108
-PERCENT=109
-PLUS=110
-POSITION=111
-PackageString=112
-QUESTION=113
-RBRACK=114
-RCURLY=115
-REGEXP=116
-REMOVE=117
-REMOVEDUPLICATE=118
-REMOVESTRING=119
-REPLACE=120
-RETAINMARKUP=121
-RETAINTYPE=122
-RPAREN=123
-RessourceLiteral=124
-SCORE=125
-SEMI=126
-SETFEATURE=127
-SIN=128
-SIZE=129
-SLASH=130
-STAR=131
-STARTSWITH=132
-STRINGLIST=133
-ScriptString=134
-StringLiteral=135
-StringString=136
-SymbolString=137
-TAN=138
-THEN=139
-TOTALCOUNT=140
-TRANSFER=141
-TRIE=142
-TRUE=143
-TYPELIST=144
-TypeString=145
-TypeSystemString=146
-UNMARK=147
-UNMARKALL=148
-UnicodeEscape=149
-VBAR=150
-VOTE=151
-WORDLIST=152
-WORDTABLE=153
-WS=154
-XOR=155
+FLOATLIST=58
+FloatString=59
+FloatTypeSuffix=60
+FloatingPointLiteral=61
+GATHER=62
+GET=63
+GETFEATURE=64
+GETLIST=65
+GREATER=66
+GREATEREQUAL=67
+HexDigit=68
+HexLiteral=69
+IF=70
+INLIST=71
+INTLIST=72
+IS=73
+ISINTAG=74
+Identifier=75
+IntString=76
+IntegerTypeSuffix=77
+JavaIDDigit=78
+LAST=79
+LBRACK=80
+LCURLY=81
+LESS=82
+LESSEQUAL=83
+LINE_COMMENT=84
+LOG=85
+LOGN=86
+LPAREN=87
+Letter=88
+ListIdentifier=89
+LogLevel=90
+MARK=91
+MARKFAST=92
+MARKLAST=93
+MARKONCE=94
+MARKSCORE=95
+MARKTABLE=96
+MATCHEDTEXT=97
+MERGE=98
+MINUS=99
+MOFN=100
+NEAR=101
+NOT=102
+NOTEQUAL=103
+OR=104
+OctalEscape=105
+OctalLiteral=106
+OldColor=107
+PARSE=108
+PARTOF=109
+PARTOFNEQ=110
+PERCENT=111
+PLUS=112
+POSITION=113
+PackageString=114
+QUESTION=115
+RBRACK=116
+RCURLY=117
+REGEXP=118
+REMOVE=119
+REMOVEDUPLICATE=120
+REMOVESTRING=121
+REPLACE=122
+RETAINMARKUP=123
+RETAINTYPE=124
+RPAREN=125
+RessourceLiteral=126
+SCORE=127
+SEMI=128
+SETFEATURE=129
+SIN=130
+SIZE=131
+SLASH=132
+STAR=133
+STARTSWITH=134
+STRINGLIST=135
+ScriptString=136
+StringLiteral=137
+StringString=138
+SymbolString=139
+TAN=140
+THEN=141
+TOTALCOUNT=142
+TRANSFER=143
+TRIE=144
+TRUE=145
+TYPELIST=146
+TypeString=147
+TypeSystemString=148
+UNMARK=149
+UNMARKALL=150
+UnicodeEscape=151
+VBAR=152
+VOTE=153
+WORDLIST=154
+WORDTABLE=155
+WS=156
+XOR=157

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/parser/ast/StatementFactory.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/parser/ast/StatementFactory.java?rev=1229131r1=1229130r2=1229131view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/parser/ast/StatementFactory.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/parser/ast/StatementFactory.java
 Mon Jan  9 13:02:07 2012
@@ -123,6 +123,15 @@ public class StatementFactory extends Ab
* @param type
* @return
*/
+  public static Object createFloatVariable(Token id, Token type) {
+return createVariable(id, type, TMTypeConstants.TM_TYPE_F);
+  }
+  
+  /**
+   * @param id
+   * @param type
+   * @return
+   */
   public static TextMarkerVariableDeclaration createDoubleVariable(Token id, 
Token type) {
 return createVariable(id, type, TMTypeConstants.TM_TYPE_D);
   }
@@ -312,4 +321,6 @@ public class StatementFactory extends Ab
 return new ComponentDeclaration(nameBounds[0], nameBounds[1], 
ct.getText());
   }
 
+
+
 }




svn commit: r1229161 - in /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide: ./ src/main/java/org/apache/uima/textmarker/ide/core/ src/main/java/org/apache/uima/textmarker/ide/ui/preferences/

2012-01-09 Thread pkluegl
Author: pkluegl
Date: Mon Jan  9 14:11:11 2012
New Revision: 1229161

URL: http://svn.apache.org/viewvc?rev=1229161view=rev
Log:
UIMA-2322
was not able to find a solution and therefore replaced the complete page by a 
simpler version. Also deactivated TaskTag preferences.

Removed:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/preferences/TextMarkerBuilderConfigurationBlock.java
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/plugin.xml

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/TextMarkerPreferenceInitializer.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/preferences/TextMarkerBuilderPreferencePage.java

Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/plugin.xml
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/plugin.xml?rev=1229161r1=1229160r2=1229161view=diff
==
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/plugin.xml (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/plugin.xml Mon Jan  9 
14:11:11 2012
@@ -195,6 +195,15 @@ under the License.
   initializer
 
class=org.apache.uima.textmarker.ide.core.TextMarkerPreferenceInitializer
   /initializer
+  initializer
+
class=org.apache.uima.textmarker.ide.debug.TextMarkerDebugPreferenceInitializer
+  /initializer
+  initializer
+
class=org.apache.uima.textmarker.ide.ui.preferences.TextMarkerConsolePreferenceInitializer
+  /initializer
+  initializer
+
class=org.apache.uima.textmarker.ide.ui.TextMarkerUIPreferenceInitializer
+  /initializer
/extension
  extension
point=org.eclipse.dltk.core.interpreterContainerExtension
@@ -237,12 +246,6 @@ under the License.
   /requires
 /buildParticipant
   /extension
- extension
- point=org.eclipse.core.runtime.preferences
-  initializer
-
class=org.apache.uima.textmarker.ide.debug.TextMarkerDebugPreferenceInitializer
-  /initializer
-   /extension
extension
  point=org.eclipse.dltk.debug.scriptDebugModel
   debugModel
@@ -251,10 +254,6 @@ under the License.
 
typeFactory=org.apache.uima.textmarker.ide.debug.TextMarkerTypeFactory
   /debugModel
/extension
-   extension point=org.eclipse.core.runtime.preferences
-initializer
-  
class=org.apache.uima.textmarker.ide.ui.preferences.TextMarkerConsolePreferenceInitializer
 /
-  /extension
   
   extension point=org.eclipse.ui.viewActions
 viewContribution
@@ -501,6 +500,82 @@ under the License.
   
class=org.apache.uima.textmarker.ide.ui.preferences.TextMarkerConsolePreferences
   
id=org.apache.uima.textmarker.ide.ui.console.preferences.TextMarkerConsolePreferences
   name=%Console.PreferencePage /
+page
+  category=org.apache.uima.textmarker.ide.preferences.debug.engines
+  
class=org.apache.uima.textmarker.ide.debugger.preferences.TextMarkerDebuggerPreferencePage
+  
id=org.apache.uima.textmarker.ide.preferences.debug.engines.debugger
+  name=%PreferencePage.name
+/page
+  /extension
+  extension
+point=org.eclipse.ui.preferencePages
+ page
+   
class=org.apache.uima.textmarker.ide.ui.preferences.TextMarkerGlobalPreferencePage
+   id=org.apache.uima.textmarker.ide.preferences
+   name=%TextMarkerPreferencePage.name
+ /page
+ page
+   category=org.apache.uima.textmarker.ide.preferences
+   
class=org.apache.uima.textmarker.ide.ui.preferences.TextMarkerEditorPreferencesPage
+   id=org.apache.uima.textmarker.ide.preferences.editor
+   name=%TextMarkerEditorPreferencePage.name
+ /page
+ page
+   category=org.apache.uima.textmarker.ide.preferences.editor
+   
class=org.apache.uima.textmarker.ide.ui.preferences.TextMarkerEditorHoverPreferencePage
+   id=org.apache.uima.textmarker.ide.preferences.editor.hovers
+   name=%TextMarkerEditorHoversPreferencePage.name
+ /page
+ page
+   category=org.apache.uima.textmarker.ide.preferences.editor
+   
class=org.apache.uima.textmarker.ide.ui.templates.TextMarkerCodeTemplatesPreferencePage
+   id=org.apache.uima.textmarker.ide.preferences.templates
+   name=%TextMarkerCodeTemplatesPreferencePage.name
+ /page
+ page
+   category=org.apache.uima.textmarker.ide.preferences.editor
+   
class=org.apache.uima.textmarker.ide.ui.preferences.TextMarkerEditorSyntaxColoringPreferencePage
+   id=org.apache.uima.textmarker.ide.ui.editor.SyntaxColoring
+   name=%TextMarkerEditorSyntaxColoringPreferencePage.name
+ /page
+ page
+   category

svn commit: r1229263 - in /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/builder: TextMarkerBuilder.java TextMarkerProjectUtils.java TextMarke

2012-01-09 Thread pkluegl
Author: pkluegl
Date: Mon Jan  9 17:20:01 2012
New Revision: 1229263

URL: http://svn.apache.org/viewvc?rev=1229263view=rev
Log:
UIMA-2321
added ResourceManager for resolving type systems

Modified:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/builder/TextMarkerBuilder.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/builder/TextMarkerProjectUtils.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/builder/TextMarkerSimpleBuilder.java

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/builder/TextMarkerBuilder.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/builder/TextMarkerBuilder.java?rev=1229263r1=1229262r2=1229263view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/builder/TextMarkerBuilder.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/builder/TextMarkerBuilder.java
 Mon Jan  9 17:20:01 2012
@@ -49,7 +49,6 @@ import org.eclipse.core.runtime.IProgres
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Preferences;
 import org.eclipse.core.runtime.SubProgressMonitor;
 import org.eclipse.dltk.ast.declarations.ModuleDeclaration;
 import org.eclipse.dltk.core.DLTKCore;
@@ -64,6 +63,7 @@ import org.eclipse.dltk.internal.core.bu
 import org.eclipse.dltk.internal.core.builder.Messages;
 import org.eclipse.dltk.internal.core.builder.SourceModuleBuildContext;
 import org.eclipse.dltk.internal.core.builder.StandardScriptBuilder;
+import org.eclipse.jface.preference.IPreferenceStore;
 
 public class TextMarkerBuilder extends StandardScriptBuilder {
 
@@ -259,7 +259,7 @@ public class TextMarkerBuilder extends S
 
 try {
   TextMarkerBuildOptions option = new TextMarkerBuildOptions(language, 
engines);
-  Preferences store = 
TextMarkerIdePlugin.getDefault().getPluginPreferences();
+  IPreferenceStore store = 
TextMarkerIdePlugin.getDefault().getPreferenceStore();
   
option.setImportByName(store.getBoolean(TextMarkerCorePreferences.BUILDER_IMPORT_BY_NAME));
   
option.setResolveImports(store.getBoolean(TextMarkerCorePreferences.BUILDER_RESOLVE_IMPORTS));
   builder.build(sm, typeSystemDest, engineDest, option, mainScript, 
scriptPaths, enginePaths);

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/builder/TextMarkerProjectUtils.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/builder/TextMarkerProjectUtils.java?rev=1229263r1=1229262r2=1229263view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/builder/TextMarkerProjectUtils.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/builder/TextMarkerProjectUtils.java
 Mon Jan  9 17:20:01 2012
@@ -155,10 +155,13 @@ public class TextMarkerProjectUtils {
   }
 
   public static void setProjectDataPath(IProject project, IFolder folder) 
throws CoreException {
+//TODO: what about referenced projects?
 project.setPersistentProperty(new QualifiedName(, CDEdataPath), 
folder.getLocation()
 .toPortableString());
-
   }
+  
+  
+  
 
   public static String getDefaultInputLocation() {
 return input;

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/builder/TextMarkerSimpleBuilder.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/builder/TextMarkerSimpleBuilder.java?rev=1229263r1=1229262r2=1229263view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/builder/TextMarkerSimpleBuilder.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/builder/TextMarkerSimpleBuilder.java
 Mon Jan  9 17:20:01 2012
@@ -42,6 +42,8 @@ import org.apache.uima.cas.CAS;
 import org.apache.uima.cas.Type;
 import org.apache.uima.cas.TypeSystem;
 import org.apache.uima.resource.ResourceInitializationException;
+import

svn commit: r1229282 - in /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser: TextMarkerLexer.g TextMarkerLexer.tokens

2012-01-09 Thread pkluegl
Author: pkluegl
Date: Mon Jan  9 18:23:08 2012
New Revision: 1229282

URL: http://svn.apache.org/viewvc?rev=1229282view=rev
Log:
UIMA-2319
added lexer tokens missed by last commit

Modified:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.g

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.tokens

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.g
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.g?rev=1229282r1=1229281r2=1229282view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.g
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.g
 Mon Jan  9 18:23:08 2012
@@ -1,13 +1,13 @@
 lexer grammar TextMarkerLexer;
 options {
-   language = Java;
+  language = Java;
 }
 
 
 tokens {
-   DocComment;
-   Annotation;
-   ListIdentifier;
+  DocComment;
+  Annotation;
+  ListIdentifier;
 }
 
 @lexer::header {
@@ -30,323 +30,326 @@ tokens {
  * under the License.
 */
 
-   package org.apache.uima.textmarker.parser;
+  package org.apache.uima.textmarker.parser;
 }
 
 @lexer::members {
-   public int implicitLineJoiningLevel = 0;
-   public int startPos=-1;
-   public void emitErrorMessage(String msg) {
-   }
+  public int implicitLineJoiningLevel = 0;
+  public int startPos=-1;
+  public void emitErrorMessage(String msg) {
+  }
 }
 
 
 TRIE
-   :   'TRIE'
-   ;
+  : 'TRIE'
+  ;
 
 CONTAINS
-   :   'CONTAINS'
-   ;
+  : 'CONTAINS'
+  ;
 
 DECLARE
-   :   'DECLARE'
-   ;
+  : 'DECLARE'
+  ;
 
 WORDLIST
-   :   'WORDLIST'
-   ;
+  : 'WORDLIST'
+  ;
 
 WORDTABLE
-   :   'WORDTABLE'
-   ;
+  : 'WORDTABLE'
+  ;
 
 AND
-   :   'AND'
-   ;
+  : 'AND'
+  ;
 
 CONTEXTCOUNT
-   :   'CONTEXTCOUNT'
-   ;
+  : 'CONTEXTCOUNT'
+  ;
 
 COUNT
-   :   'COUNT'
-   ;
+  : 'COUNT'
+  ;
 
 TOTALCOUNT
-   :   'TOTALCOUNT'
-   ;
+  : 'TOTALCOUNT'
+  ;
 
 CURRENTCOUNT
-   :   'CURRENTCOUNT'
-   ;
+  : 'CURRENTCOUNT'
+  ;
 
 INLIST
-   :   'INLIST'
-   ;
+  : 'INLIST'
+  ;
 
 ISINTAG
-   :   'ISINTAG'
-   ;
+  : 'ISINTAG'
+  ;
 
 LAST
-   :   'LAST'
-   ;
+  : 'LAST'
+  ;
 
 MOFN
-   :   'MOFN'
-   ;
+  : 'MOFN'
+  ;
 
 NEAR
-   :   'NEAR'
-   ;
+  : 'NEAR'
+  ;
 
 OR
-   :   'OR'
-   ;
+  : 'OR'
+  ;
 
 PARTOF
-   :   'PARTOF'
-   ;
-   
+  : 'PARTOF'
+  ;
+  
 PARTOFNEQ
-   :   'PARTOFNEQ'
-   ;
+  : 'PARTOFNEQ'
+  ;
 
 POSITION
-   :   'POSITION'
-   ;
+  : 'POSITION'
+  ;
 
 REGEXP
-   :   'REGEXP'
-   ;
+  : 'REGEXP'
+  ;
 
 SCORE
-   :   'SCORE'
-   ;
+  : 'SCORE'
+  ;
 
 VOTE
-   :   'VOTE'
-   ;
+  : 'VOTE'
+  ;
 
 IF
-   :   'IF'
-   ;
+  : 'IF'
+  ;
 
 FEATURE
-   :   'FEATURE'
-   ;
+  : 'FEATURE'
+  ;
 
 PARSE
-   :   'PARSE'
-   ;
+  : 'PARSE'
+  ;
 
 CREATE
-   :   'CREATE'
-   ;
+  : 'CREATE'
+  ;
 
 GATHER
-   :   'GATHER'
-   ;
+  : 'GATHER'
+  ;
 
 FILL
-   :   'FILL'
-   ;
+  : 'FILL'
+  ;
 
 ATTRIBUTE
-   :   'ATTRIBUTE'
-   ;
+  : 'ATTRIBUTE'
+  ;
 
 COLOR
-   :   'COLOR'
-   ;
+  : 'COLOR'
+  ;
 
 DEL
-   :   'DEL'
-   ;
+  : 'DEL'
+  ;
 
 LOG
-   :   'LOG'
-   ;
+  : 'LOG'
+  ;
 
 MARK
-   :   'MARK'
-   ;
+  : 'MARK'
+  ;
 
 MARKSCORE
-   :   'MARKSCORE'
-   ;
+  : 'MARKSCORE'
+  ;
 
 MARKONCE
-   :   'MARKONCE'
-   ;
+  : 'MARKONCE'
+  ;
 
 MARKFAST
-   :   'MARKFAST'
-   ;
-   
+  : 'MARKFAST'
+  ;
+  
 MARKTABLE
-   :   'MARKTABLE'
-   ;
-   
+  : 'MARKTABLE'
+  ;
+  
 MARKLAST
-   :   'MARKLAST'
-   ;
+  : 'MARKLAST'
+  ;
 
 REPLACE
-   :   'REPLACE'
-   ;
+  : 'REPLACE'
+  ;
 
 RETAINMARKUP
-   :   'RETAINMARKUP'
-   ;
+  : 'RETAINMARKUP'
+  ;
 
 RETAINTYPE
-   :   'RETAINTYPE'
-   ;
+  : 'RETAINTYPE'
+  ;
 
 FILTERMARKUP
-   :   'FILTERMARKUP'
-   ;
+  : 'FILTERMARKUP'
+  ;
 
 FILTERTYPE
-   :   'FILTERTYPE'
-   ;
+  : 'FILTERTYPE'
+  ;
 
 CALL
-   :   'CALL'
-   ;
+  : 'CALL'
+  ;
 
 
 EXEC
-   :   'EXEC'
-   ;
+  : 'EXEC'
+  ;
 
 CONFIGURE
-   :   'CONFIGURE'
-   ;
+  : 'CONFIGURE'
+  ;
 
 ASSIGN

svn commit: r1229297 - in /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker: action/ condition/ expression/number/ parser/

2012-01-09 Thread pkluegl
Author: pkluegl
Date: Mon Jan  9 19:02:22 2012
New Revision: 1229297

URL: http://svn.apache.org/viewvc?rev=1229297view=rev
Log:
UIMA-2313
fixed SETFEATURE, FEATURE, GETFEATURE, MARKTABLE and actions based on structure 
(CREATE) for other primitive types. Tested with floats and SETFEATURE. Fixed 
wrong return type in number expressions.

Modified:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/AbstractStructureAction.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/GetFeatureAction.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/MarkTableAction.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/SetFeatureAction.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/condition/FeatureCondition.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/expression/number/AbstractNumberExpression.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/expression/number/ComposedNumberExpression.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/expression/number/NegativeNumberExpression.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/expression/number/NumberExpression.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/expression/number/ReferenceNumberExpression.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/expression/number/SimpleNumberExpression.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.java

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/AbstractStructureAction.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/AbstractStructureAction.java?rev=1229297r1=1229296r2=1229297view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/AbstractStructureAction.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/AbstractStructureAction.java
 Mon Jan  9 19:02:22 2012
@@ -77,14 +77,26 @@ public abstract class AbstractStructureA
 AnnotationFS annotation = annotationsInWindow.get(0);
 structure.setStringValue(targetFeature, 
annotation.getCoveredText());
   }
-} else if (valueObject instanceof NumberExpression
- range.getName().equals(UIMAConstants.TYPE_INTEGER)) {
-  structure.setIntValue(targetFeature,
-  ((NumberExpression) 
valueObject).getIntegerValue(element.getParent()));
-} else if (valueObject instanceof NumberExpression
- range.getName().equals(UIMAConstants.TYPE_DOUBLE)) {
-  structure.setDoubleValue(targetFeature,
-  ((NumberExpression) 
valueObject).getDoubleValue(element.getParent()));
+} else if (valueObject instanceof NumberExpression) {
+  if(range.getName().equals(UIMAConstants.TYPE_INTEGER)) {
+structure.setIntValue(targetFeature,
+((NumberExpression) 
valueObject).getIntegerValue(element.getParent()));
+  } else if(range.getName().equals(UIMAConstants.TYPE_DOUBLE)) {
+structure.setDoubleValue(targetFeature,
+((NumberExpression) 
valueObject).getDoubleValue(element.getParent()));
+  } else if(range.getName().equals(UIMAConstants.TYPE_FLOAT)) {
+structure.setFloatValue(targetFeature,
+((NumberExpression) 
valueObject).getFloatValue(element.getParent()));
+  } else if(range.getName().equals(UIMAConstants.TYPE_BYTE)) {
+structure.setByteValue(targetFeature, (byte)
+((NumberExpression) 
valueObject).getIntegerValue(element.getParent()));
+  } else if(range.getName().equals(UIMAConstants.TYPE_SHORT)) {
+structure.setShortValue(targetFeature, (short)
+((NumberExpression) 
valueObject).getIntegerValue(element.getParent()));
+  } else if(range.getName().equals(UIMAConstants.TYPE_LONG)) {
+structure.setLongValue(targetFeature, (long)
+((NumberExpression) 
valueObject).getIntegerValue(element.getParent()));
+  }
 } else

svn commit: r1229526 [1/2] - in /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker: TextMarkerEnvironment.java action/SetFeatureAction.java parser/TextM

2012-01-10 Thread pkluegl
Author: pkluegl
Date: Tue Jan 10 13:18:50 2012
New Revision: 1229526

URL: http://svn.apache.org/viewvc?rev=1229526view=rev
Log:
UIMA-2325
added functionality to remember and set initial  values of primitive variables.

Modified:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerEnvironment.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/SetFeatureAction.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.g

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.java

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerEnvironment.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerEnvironment.java?rev=1229526r1=1229525r2=1229526view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerEnvironment.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerEnvironment.java
 Tue Jan 10 13:18:50 2012
@@ -36,13 +36,16 @@ import org.apache.uima.jcas.cas.TOP;
 import org.apache.uima.jcas.tcas.DocumentAnnotation;
 import org.apache.uima.textmarker.action.AbstractTextMarkerAction;
 import org.apache.uima.textmarker.condition.AbstractTextMarkerCondition;
+import org.apache.uima.textmarker.expression.bool.BooleanExpression;
 import org.apache.uima.textmarker.expression.list.ListExpression;
 import org.apache.uima.textmarker.expression.list.SimpleBooleanListExpression;
 import org.apache.uima.textmarker.expression.list.SimpleNumberListExpression;
 import org.apache.uima.textmarker.expression.list.SimpleStringListExpression;
 import org.apache.uima.textmarker.expression.list.SimpleTypeListExpression;
+import org.apache.uima.textmarker.expression.number.NumberExpression;
 import 
org.apache.uima.textmarker.expression.resource.LiteralWordListExpression;
 import 
org.apache.uima.textmarker.expression.resource.LiteralWordTableExpression;
+import org.apache.uima.textmarker.expression.string.StringExpression;
 import org.apache.uima.textmarker.resource.CSVTable;
 import org.apache.uima.textmarker.resource.MultiTreeWordList;
 import org.apache.uima.textmarker.resource.TextMarkerTable;
@@ -77,6 +80,8 @@ public class TextMarkerEnvironment {
 
   private CAS cas;
 
+  private MapString, Object initializedVariables;
+
   public TextMarkerEnvironment(TextMarkerBlock owner) {
 super();
 this.owner = owner;
@@ -91,7 +96,7 @@ public class TextMarkerEnvironment {
 availableTypes.put(INT, Integer.class);
 availableTypes.put(STRING, String.class);
 availableTypes.put(DOUBLE, Double.class);
-availableTypes.put(FLOAT, Double.class);
+availableTypes.put(FLOAT, Float.class);
 availableTypes.put(BOOLEAN, Boolean.class);
 availableTypes.put(TYPE, Type.class);
 availableTypes.put(CONDITION, AbstractTextMarkerCondition.class);
@@ -112,6 +117,7 @@ public class TextMarkerEnvironment {
 availableListTypes.put(STRINGLIST, String.class);
 availableListTypes.put(TYPELIST, Type.class);
 resourcePaths = getResourcePaths();
+initializedVariables = new HashMapString, Object();
   }
 
   public void initializeTypes(CAS cas) {
@@ -239,10 +245,14 @@ public class TextMarkerEnvironment {
 if (generic != null) {
   variableGenericTypes.put(name, generic);
 }
-variableValues.put(name, getInitialValue(type));
+variableValues.put(name, getInitialValue(name, type));
   }
 
-  private Object getInitialValue(Class? type) {
+  private Object getInitialValue(String name, Class? type) {
+Object init = initializedVariables.get(name);
+if (init != null) {
+  return init;
+}
 if (Integer.class.equals(type)) {
   return 0;
 } else if (Double.class.equals(type)) {
@@ -262,7 +272,6 @@ public class TextMarkerEnvironment {
 } else if (List.class.equals(type)) {
   return new ArrayListObject();
 }
-
 return null;
   }
 
@@ -322,7 +331,7 @@ public class TextMarkerEnvironment {
 if (containsKey  result == null) {
   // TODO find the problem with the null values!
   // this might now work for word lists in another env.
-  return type.cast(getInitialValue(type));
+  return type.cast(getInitialValue(name, type));
 }
 if (result == annotationTypeDummy) {
   return type.cast(cas.getAnnotationType());
@@ -339,6 +348,42 @@ public class TextMarkerEnvironment {
 return getVariableValue(name, Object.class);
   }
 
+  public Object getLiteralValue(String var, Object value

svn commit: r1230176 [1/3] - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/ uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker

2012-01-11 Thread pkluegl
Author: pkluegl
Date: Wed Jan 11 18:20:10 2012
New Revision: 1230176

URL: http://svn.apache.org/viewvc?rev=1230176view=rev
Log:
UIMA-2233
Seeding annotations and inference annotations are torn apart now. Unit tests 
and a bigger project work correctly with the changes, but the explanation 
component returns unreasonable rule behavior. Either the explanation component 
is broken or the test worked by accident. Further testing is required. Changed 
parameters of engine descriptor. Additionally, removed wrong references to CEV 
plugin in IDE perspective.

Added:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/TokenSeed.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/TokenSeed_Type.java
Removed:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/seed/SourceLexer.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/BasicAnnotation.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/BasicAnnotation_Type.java
Modified:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/FilterManager.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerEnvironment.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerStream.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/BasicEngine.xml

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/BasicTypeSystem.xml

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/TextMarkerEngine.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/seed/DefaultSeeder.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/seed/SeedLexer.flex

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/seed/SeedLexer.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/ALL.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/ALL_Type.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/AMP.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/AMP_Type.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/ANY.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/ANY_Type.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/BREAK.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/BREAK_Type.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/CAP.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/CAP_Type.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/COLON.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/COLON_Type.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/COMMA.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/COMMA_Type.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/CW.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/CW_Type.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugBlockApply.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugBlockApply_Type.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugEvaluatedCondition.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugEvaluatedCondition_Type.java

uima/sandbox/trunk/TextMarker

svn commit: r1230177 - in /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine: BasicEngine.xml BasicTypeSystem.xml

2012-01-11 Thread pkluegl
Author: pkluegl
Date: Wed Jan 11 18:26:47 2012
New Revision: 1230177

URL: http://svn.apache.org/viewvc?rev=1230177view=rev
Log:
UIMA-2233
added license header again to xml descriptors.

Modified:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/BasicEngine.xml

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/BasicTypeSystem.xml

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/BasicEngine.xml
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/BasicEngine.xml?rev=1230177r1=1230176r2=1230177view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/BasicEngine.xml
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/BasicEngine.xml
 Wed Jan 11 18:26:47 2012
@@ -1,4 +1,23 @@
 ?xml version=1.0 encoding=UTF-8?
+!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  License); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+--
+
 analysisEngineDescription xmlns=http://uima.apache.org/resourceSpecifier;
   frameworkImplementationorg.apache.uima.java/frameworkImplementation
   primitivetrue/primitive

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/BasicTypeSystem.xml
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/BasicTypeSystem.xml?rev=1230177r1=1230176r2=1230177view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/BasicTypeSystem.xml
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/BasicTypeSystem.xml
 Wed Jan 11 18:26:47 2012
@@ -1,4 +1,23 @@
 ?xml version=1.0 encoding=UTF-8?
+!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  License); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+--
+
 typeSystemDescription xmlns=http://uima.apache.org/resourceSpecifier;
   nameBasicTypeSystem/name
   description/




svn commit: r1230503 - in /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule: ComposedRuleElementMatch.java RuleMatch.java TextMarkerRuleElement.ja

2012-01-12 Thread pkluegl
Author: pkluegl
Date: Thu Jan 12 12:04:47 2012
New Revision: 1230503

URL: http://svn.apache.org/viewvc?rev=1230503view=rev
Log:
UIMA-2233
restricted creation of alternative matching realities to situations where 
parallel realities are needed, e.g., multiple anchors for rule elements.

Modified:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/ComposedRuleElementMatch.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/RuleMatch.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/TextMarkerRuleElement.java

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/ComposedRuleElementMatch.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/ComposedRuleElementMatch.java?rev=1230503r1=1230502r2=1230503view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/ComposedRuleElementMatch.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/ComposedRuleElementMatch.java
 Thu Jan 12 12:04:47 2012
@@ -168,6 +168,29 @@ public class ComposedRuleElementMatch ex
 return copy;
   }
 
+  public void update(ComposedRuleElementMatch extendedContainerMatch) {
+for (EntryRuleElement, ListRuleElementMatch entry : 
innerMatches.entrySet()) {
+  RuleElement key = entry.getKey();
+  ListRuleElementMatch value = entry.getValue();
+  if (key.equals(extendedContainerMatch.getRuleElement())) {
+extendedContainerMatch.setContainerMatch(this);
+if (value != null) {
+  value.set(value.size() - 1, extendedContainerMatch);
+}
+  } else {
+if (value != null) {
+  for (RuleElementMatch each : value) {
+if (each instanceof ComposedRuleElementMatch) {
+  ((ComposedRuleElementMatch)each).update(extendedContainerMatch);
+}
+  }
+} 
+  }
+}
+  }
+
+  
+  
   public String toString() {
 return CREM + innerMatches.toString();
   }
@@ -194,4 +217,5 @@ public class ComposedRuleElementMatch ex
 
   }
 
+ 
 }

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/RuleMatch.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/RuleMatch.java?rev=1230503r1=1230502r2=1230503view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/RuleMatch.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/RuleMatch.java
 Thu Jan 12 12:04:47 2012
@@ -206,6 +206,14 @@ public class RuleMatch {
 copy.setDelegateApply(newDelegateApply);
 return copy;
   }
+  
+  public void update(ComposedRuleElementMatch extendedContainerMatch) {
+if (extendedContainerMatch.getContainerMatch() == null) {
+  setRootMatch(extendedContainerMatch);
+} else {
+  rootMatch.update(extendedContainerMatch);
+}
+  }
 
   public void setDelegateApply(MapAbstractTextMarkerAction, ScriptApply 
delegateApply) {
 this.delegateApply = delegateApply;

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/TextMarkerRuleElement.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/TextMarkerRuleElement.java?rev=1230503r1=1230502r2=1230503view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/TextMarkerRuleElement.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/TextMarkerRuleElement.java
 Thu Jan 12 12:04:47 2012
@@ -56,13 +56,15 @@ public class TextMarkerRuleElement exten
   InferenceCrowd crowd) {
 CollectionAnnotationFS anchors = getAnchors(stream);
 
-boolean useAlternatives = entryPoint == null; // anchors.size()  1;
+boolean useAlternatives = entryPoint == null  !(anchors.size() == 1);
 for (AnnotationFS eachAnchor : anchors) {
   ComposedRuleElementMatch extendedContainerMatch = containerMatch;
   RuleMatch extendedMatch = ruleMatch;
   if (useAlternatives) {
 extendedContainerMatch = containerMatch.copy();
 extendedMatch = ruleMatch.copy

svn commit: r1230504 [3/3] - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/ uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker

2012-01-12 Thread pkluegl
Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/TextMarkerBasic.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/TextMarkerBasic.java?rev=1230504r1=1230503r2=1230504view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/TextMarkerBasic.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/TextMarkerBasic.java
 Thu Jan 12 12:36:08 2012
@@ -25,16 +25,6 @@ public class TextMarkerBasic extends Ann
 
   private final MapType, SetAnnotationFS endMap = new HashMapType, 
SetAnnotationFS(10);
 
-  public MapString, String tags = new HashMapString, String(20);
-
-  public void setTags(MapString, String tags) {
-this.tags = new HashMapString, String(tags);
-  }
-
-  public MapString, String getTags() {
-return tags;
-  }
-
   public void addPartOf(Type type) {
 partOf.add(type);
   }

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/verbalize/ActionVerbalizer.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/verbalize/ActionVerbalizer.java?rev=1230504r1=1230503r2=1230504view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/verbalize/ActionVerbalizer.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/verbalize/ActionVerbalizer.java
 Thu Jan 12 12:36:08 2012
@@ -30,7 +30,6 @@ import org.apache.uima.textmarker.action
 import org.apache.uima.textmarker.action.DelAction;
 import org.apache.uima.textmarker.action.ExpandAction;
 import org.apache.uima.textmarker.action.FillAction;
-import org.apache.uima.textmarker.action.FilterMarkupAction;
 import org.apache.uima.textmarker.action.FilterTypeAction;
 import org.apache.uima.textmarker.action.GatherAction;
 import org.apache.uima.textmarker.action.GetAction;
@@ -44,7 +43,6 @@ import org.apache.uima.textmarker.action
 import org.apache.uima.textmarker.action.RemoveAction;
 import org.apache.uima.textmarker.action.RemoveDuplicateAction;
 import org.apache.uima.textmarker.action.ReplaceAction;
-import org.apache.uima.textmarker.action.RetainMarkupAction;
 import org.apache.uima.textmarker.action.RetainTypeAction;
 import org.apache.uima.textmarker.action.SetFeatureAction;
 import org.apache.uima.textmarker.action.TransferAction;
@@ -78,8 +76,6 @@ public class ActionVerbalizer {
   return DEL;
 } else if (action instanceof FillAction) {
   return FILL;
-} else if (action instanceof FilterMarkupAction) {
-  return FILTERMARKUP;
 } else if (action instanceof FilterTypeAction) {
   return FILTERTYPE;
 } else if (action instanceof LogAction) {
@@ -100,8 +96,6 @@ public class ActionVerbalizer {
   return MARKLAST;
 } else if (action instanceof ReplaceAction) {
   return REPLACE;
-} else if (action instanceof RetainMarkupAction) {
-  return RETAINMARKUP;
 } else if (action instanceof RetainTypeAction) {
   return RETAINTYPE;
 } else if (action instanceof SetFeatureAction) {
@@ -207,10 +201,6 @@ public class ActionVerbalizer {
 features = features.substring(0, features.length() - 1);
   }
   return FILL( + verbalizer.verbalize(a.getStructureType()) + features + 
);
-} else if (action instanceof FilterMarkupAction) {
-  FilterMarkupAction a = (FilterMarkupAction) action;
-  return a.getMarkup().isEmpty() ? FILTERMARKUP : FILTERMARKUP(
-  + verbalizer.verbalizeExpressionList(a.getMarkup()) + );
 } else if (action instanceof FilterTypeAction) {
   FilterTypeAction a = (FilterTypeAction) action;
   return a.getList().isEmpty() ? FILTERTYPE : FILTERTYPE(
@@ -265,10 +255,6 @@ public class ActionVerbalizer {
 } else if (action instanceof ReplaceAction) {
   ReplaceAction a = (ReplaceAction) action;
   return REPLACE( + verbalizer.verbalize(a.getReplacement()) + );
-} else if (action instanceof RetainMarkupAction) {
-  RetainMarkupAction a = (RetainMarkupAction) action;
-  return a.getMarkup().isEmpty() ? RETAINMARKUP : RETAINMARKUP(
-  + verbalizer.verbalizeExpressionList(a.getMarkup()) + );
 } else if (action instanceof RetainTypeAction) {
   RetainTypeAction a = (RetainTypeAction) action;
   return a.getList().isEmpty() ? RETAINTYPE : RETAINTYPE(

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/verbalize/ConditionVerbalizer.java
URL: 

svn commit: r1230504 [1/3] - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/ uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker

2012-01-12 Thread pkluegl
Author: pkluegl
Date: Thu Jan 12 12:36:08 2012
New Revision: 1230504

URL: http://svn.apache.org/viewvc?rev=1230504view=rev
Log:
UIMA-2233
removed RETAINMARKUP, FILTERMARKUP, ISINTAG since their functionality is not 
supported anymore. Html handling will be introduced by additional seeders in 
future. 

Removed:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/FilterMarkupAction.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/RetainMarkupAction.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/condition/IsInTagCondition.java
Modified:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/FilterManager.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerStream.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/ActionFactory.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/condition/ConditionFactory.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/TextMarkerEngine.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.g

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/TextMarkerBasic.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/verbalize/ActionVerbalizer.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/verbalize/ConditionVerbalizer.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/TextMarkerKeywords.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-textruler/src/main/java/org/apache/uima/textmarker/textruler/core/TextRulerBasicLearner.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-textruler/src/main/java/org/apache/uima/textmarker/textruler/tools/BatchRuleEvaluator.java

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/FilterManager.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/FilterManager.java?rev=1230504r1=1230503r2=1230504view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/FilterManager.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/FilterManager.java
 Thu Jan 12 12:36:08 2012
@@ -26,26 +26,20 @@ import java.util.List;
 import java.util.Set;
 
 import org.apache.uima.cas.CAS;
-import org.apache.uima.cas.CASException;
 import org.apache.uima.cas.ConstraintFactory;
 import org.apache.uima.cas.FSIntConstraint;
 import org.apache.uima.cas.FSIterator;
 import org.apache.uima.cas.FSMatchConstraint;
-import org.apache.uima.cas.FSTypeConstraint;
 import org.apache.uima.cas.FeaturePath;
 import org.apache.uima.cas.Type;
 import org.apache.uima.cas.text.AnnotationFS;
 import org.apache.uima.textmarker.constraint.BasicTypeConstraint;
-import org.apache.uima.textmarker.constraint.MarkupConstraint;
 import org.apache.uima.textmarker.constraint.NotConstraint;
-import org.apache.uima.textmarker.type.MARKUP;
 
 public class FilterManager {
 
   private final CollectionType defaultFilterTypes;
 
-  private final CollectionString defaultRetainTags;
-
   private final FSMatchConstraint additionalWindow;
 
   private final AnnotationFS windowAnnotation;
@@ -56,59 +50,35 @@ public class FilterManager {
 
   private CollectionType currentRetainTypes;
 
-  private CollectionString currentFilterTags;
-
-  private CollectionString currentRetainTags;
-
   private ConstraintFactory cf;
 
-  private Type markupType;
-
-  public FilterManager(CollectionType filterTypes, CollectionString 
filterTags, CAS cas) {
+  public FilterManager(CollectionType filterTypes, CAS cas) {
 super();
 this.defaultFilterTypes = filterTypes;
-this.defaultRetainTags = filterTags;
 
 currentFilterTypes = new ArrayListType();
 currentRetainTypes = new ArrayListType();
-currentFilterTags = new ArrayListString();
-currentRetainTags = new ArrayListString();
 
 cf = cas.getConstraintFactory();
 
 this.windowAnnotation = null;
 this.windowType = null;
 this.additionalWindow = null;
-try {
-  markupType

svn commit: r1230506 [1/5] - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/ uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textma

2012-01-12 Thread pkluegl
Author: pkluegl
Date: Thu Jan 12 12:44:39 2012
New Revision: 1230506

URL: http://svn.apache.org/viewvc?rev=1230506view=rev
Log:
UIMA-2233
removed language support (ide parser and lexer) for RETAINMARKUP, FILTERMARKUP 
and ISINTAG

Modified:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.g

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.tokens

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.g

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.tokens

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.tokens

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.g
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.g?rev=1230506r1=1230505r2=1230506view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.g
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.g
 Thu Jan 12 12:44:39 2012
@@ -85,9 +85,6 @@ INLIST
:   'INLIST'
;
 
-ISINTAG
-   :   'ISINTAG'
-   ;
 
 LAST
:   'LAST'
@@ -197,18 +194,10 @@ REPLACE
:   'REPLACE'
;
 
-RETAINMARKUP
-   :   'RETAINMARKUP'
-   ;
-
 RETAINTYPE
:   'RETAINTYPE'
;
 
-FILTERMARKUP
-   :   'FILTERMARKUP'
-   ;
-
 FILTERTYPE
:   'FILTERTYPE'
;




svn commit: r1230506 [5/5] - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/ uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textma

2012-01-12 Thread pkluegl
Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.tokens
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.tokens?rev=1230506r1=1230505r2=1230506view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.tokens
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.tokens
 Thu Jan 12 12:44:39 2012
@@ -50,105 +50,102 @@ Exponent=52
 FALSE=53
 FEATURE=54
 FILL=55
-FILTERMARKUP=56
-FILTERTYPE=57
-FLOATLIST=58
-FloatString=59
-FloatTypeSuffix=60
-FloatingPointLiteral=61
-GATHER=62
-GET=63
-GETFEATURE=64
-GETLIST=65
-GREATER=66
-GREATEREQUAL=67
-HexDigit=68
-HexLiteral=69
-IF=70
-INLIST=71
-INTLIST=72
-IS=73
-ISINTAG=74
-Identifier=75
-IntString=76
-IntegerTypeSuffix=77
-JavaIDDigit=78
-LAST=79
-LBRACK=80
-LCURLY=81
-LESS=82
-LESSEQUAL=83
-LINE_COMMENT=84
-LOG=85
-LOGN=86
-LPAREN=87
-Letter=88
-ListIdentifier=89
-LogLevel=90
-MARK=91
-MARKFAST=92
-MARKLAST=93
-MARKONCE=94
-MARKSCORE=95
-MARKTABLE=96
-MATCHEDTEXT=97
-MERGE=98
-MINUS=99
-MOFN=100
-NEAR=101
-NOT=102
-NOTEQUAL=103
-OR=104
-OctalEscape=105
-OctalLiteral=106
-OldColor=107
-PARSE=108
-PARTOF=109
-PARTOFNEQ=110
-PERCENT=111
-PLUS=112
-POSITION=113
-PackageString=114
-QUESTION=115
-RBRACK=116
-RCURLY=117
-REGEXP=118
-REMOVE=119
-REMOVEDUPLICATE=120
-REMOVESTRING=121
-REPLACE=122
-RETAINMARKUP=123
-RETAINTYPE=124
-RPAREN=125
-RessourceLiteral=126
-SCORE=127
-SEMI=128
-SETFEATURE=129
-SIN=130
-SIZE=131
-SLASH=132
-STAR=133
-STARTSWITH=134
-STRINGLIST=135
-ScriptString=136
-StringLiteral=137
-StringString=138
-SymbolString=139
-TAN=140
-THEN=141
-TOTALCOUNT=142
-TRANSFER=143
-TRIE=144
-TRUE=145
-TYPELIST=146
-TypeString=147
-TypeSystemString=148
-UNMARK=149
-UNMARKALL=150
-UnicodeEscape=151
-VBAR=152
-VOTE=153
-WORDLIST=154
-WORDTABLE=155
-WS=156
-XOR=157
+FILTERTYPE=56
+FLOATLIST=57
+FloatString=58
+FloatTypeSuffix=59
+FloatingPointLiteral=60
+GATHER=61
+GET=62
+GETFEATURE=63
+GETLIST=64
+GREATER=65
+GREATEREQUAL=66
+HexDigit=67
+HexLiteral=68
+IF=69
+INLIST=70
+INTLIST=71
+IS=72
+Identifier=73
+IntString=74
+IntegerTypeSuffix=75
+JavaIDDigit=76
+LAST=77
+LBRACK=78
+LCURLY=79
+LESS=80
+LESSEQUAL=81
+LINE_COMMENT=82
+LOG=83
+LOGN=84
+LPAREN=85
+Letter=86
+ListIdentifier=87
+LogLevel=88
+MARK=89
+MARKFAST=90
+MARKLAST=91
+MARKONCE=92
+MARKSCORE=93
+MARKTABLE=94
+MATCHEDTEXT=95
+MERGE=96
+MINUS=97
+MOFN=98
+NEAR=99
+NOT=100
+NOTEQUAL=101
+OR=102
+OctalEscape=103
+OctalLiteral=104
+OldColor=105
+PARSE=106
+PARTOF=107
+PARTOFNEQ=108
+PERCENT=109
+PLUS=110
+POSITION=111
+PackageString=112
+QUESTION=113
+RBRACK=114
+RCURLY=115
+REGEXP=116
+REMOVE=117
+REMOVEDUPLICATE=118
+REMOVESTRING=119
+REPLACE=120
+RETAINTYPE=121
+RPAREN=122
+RessourceLiteral=123
+SCORE=124
+SEMI=125
+SETFEATURE=126
+SIN=127
+SIZE=128
+SLASH=129
+STAR=130
+STARTSWITH=131
+STRINGLIST=132
+ScriptString=133
+StringLiteral=134
+StringString=135
+SymbolString=136
+TAN=137
+THEN=138
+TOTALCOUNT=139
+TRANSFER=140
+TRIE=141
+TRUE=142
+TYPELIST=143
+TypeString=144
+TypeSystemString=145
+UNMARK=146
+UNMARKALL=147
+UnicodeEscape=148
+VBAR=149
+VOTE=150
+WORDLIST=151
+WORDTABLE=152
+WS=153
+XOR=154




svn commit: r1230506 [3/5] - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/ uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textma

2012-01-12 Thread pkluegl
Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.tokens
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.tokens?rev=1230506r1=1230505r2=1230506view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.tokens
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.tokens
 Thu Jan 12 12:44:39 2012
@@ -50,105 +50,102 @@ Exponent=52
 FALSE=53
 FEATURE=54
 FILL=55
-FILTERMARKUP=56
-FILTERTYPE=57
-FLOATLIST=58
-FloatString=59
-FloatTypeSuffix=60
-FloatingPointLiteral=61
-GATHER=62
-GET=63
-GETFEATURE=64
-GETLIST=65
-GREATER=66
-GREATEREQUAL=67
-HexDigit=68
-HexLiteral=69
-IF=70
-INLIST=71
-INTLIST=72
-IS=73
-ISINTAG=74
-Identifier=75
-IntString=76
-IntegerTypeSuffix=77
-JavaIDDigit=78
-LAST=79
-LBRACK=80
-LCURLY=81
-LESS=82
-LESSEQUAL=83
-LINE_COMMENT=84
-LOG=85
-LOGN=86
-LPAREN=87
-Letter=88
-ListIdentifier=89
-LogLevel=90
-MARK=91
-MARKFAST=92
-MARKLAST=93
-MARKONCE=94
-MARKSCORE=95
-MARKTABLE=96
-MATCHEDTEXT=97
-MERGE=98
-MINUS=99
-MOFN=100
-NEAR=101
-NOT=102
-NOTEQUAL=103
-OR=104
-OctalEscape=105
-OctalLiteral=106
-OldColor=107
-PARSE=108
-PARTOF=109
-PARTOFNEQ=110
-PERCENT=111
-PLUS=112
-POSITION=113
-PackageString=114
-QUESTION=115
-RBRACK=116
-RCURLY=117
-REGEXP=118
-REMOVE=119
-REMOVEDUPLICATE=120
-REMOVESTRING=121
-REPLACE=122
-RETAINMARKUP=123
-RETAINTYPE=124
-RPAREN=125
-RessourceLiteral=126
-SCORE=127
-SEMI=128
-SETFEATURE=129
-SIN=130
-SIZE=131
-SLASH=132
-STAR=133
-STARTSWITH=134
-STRINGLIST=135
-ScriptString=136
-StringLiteral=137
-StringString=138
-SymbolString=139
-TAN=140
-THEN=141
-TOTALCOUNT=142
-TRANSFER=143
-TRIE=144
-TRUE=145
-TYPELIST=146
-TypeString=147
-TypeSystemString=148
-UNMARK=149
-UNMARKALL=150
-UnicodeEscape=151
-VBAR=152
-VOTE=153
-WORDLIST=154
-WORDTABLE=155
-WS=156
-XOR=157
+FILTERTYPE=56
+FLOATLIST=57
+FloatString=58
+FloatTypeSuffix=59
+FloatingPointLiteral=60
+GATHER=61
+GET=62
+GETFEATURE=63
+GETLIST=64
+GREATER=65
+GREATEREQUAL=66
+HexDigit=67
+HexLiteral=68
+IF=69
+INLIST=70
+INTLIST=71
+IS=72
+Identifier=73
+IntString=74
+IntegerTypeSuffix=75
+JavaIDDigit=76
+LAST=77
+LBRACK=78
+LCURLY=79
+LESS=80
+LESSEQUAL=81
+LINE_COMMENT=82
+LOG=83
+LOGN=84
+LPAREN=85
+Letter=86
+ListIdentifier=87
+LogLevel=88
+MARK=89
+MARKFAST=90
+MARKLAST=91
+MARKONCE=92
+MARKSCORE=93
+MARKTABLE=94
+MATCHEDTEXT=95
+MERGE=96
+MINUS=97
+MOFN=98
+NEAR=99
+NOT=100
+NOTEQUAL=101
+OR=102
+OctalEscape=103
+OctalLiteral=104
+OldColor=105
+PARSE=106
+PARTOF=107
+PARTOFNEQ=108
+PERCENT=109
+PLUS=110
+POSITION=111
+PackageString=112
+QUESTION=113
+RBRACK=114
+RCURLY=115
+REGEXP=116
+REMOVE=117
+REMOVEDUPLICATE=118
+REMOVESTRING=119
+REPLACE=120
+RETAINTYPE=121
+RPAREN=122
+RessourceLiteral=123
+SCORE=124
+SEMI=125
+SETFEATURE=126
+SIN=127
+SIZE=128
+SLASH=129
+STAR=130
+STARTSWITH=131
+STRINGLIST=132
+ScriptString=133
+StringLiteral=134
+StringString=135
+SymbolString=136
+TAN=137
+THEN=138
+TOTALCOUNT=139
+TRANSFER=140
+TRIE=141
+TRUE=142
+TYPELIST=143
+TypeString=144
+TypeSystemString=145
+UNMARK=146
+UNMARKALL=147
+UnicodeEscape=148
+VBAR=149
+VOTE=150
+WORDLIST=151
+WORDTABLE=152
+WS=153
+XOR=154

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.g
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.g?rev=1230506r1=1230505r2=1230506view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.g
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.g
 Thu Jan 12 12:44:39 2012
@@ -85,9 +85,6 @@ INLIST
   : 'INLIST'
   ;
 
-ISINTAG
-  : 'ISINTAG'
-  ;
 
 LAST
   : 'LAST'
@@ -197,18 +194,10 @@ REPLACE
   : 'REPLACE'
   ;
 
-RETAINMARKUP
-  : 'RETAINMARKUP'
-  ;
-
 RETAINTYPE
   : 'RETAINTYPE'
   ;
 
-FILTERMARKUP
-  : 'FILTERMARKUP'
-  ;
-
 FILTERTYPE
   : 'FILTERTYPE'
   ;

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.tokens
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.tokens?rev=1230506r1=1230505r2=1230506view=diff
==
--- 

svn commit: r1230508 - /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/BasicEngine.xml

2012-01-12 Thread pkluegl
Author: pkluegl
Date: Thu Jan 12 12:50:34 2012
New Revision: 1230508

URL: http://svn.apache.org/viewvc?rev=1230508view=rev
Log:
UIMA-2233
removed default markup filter parameter in engine descriptor

Modified:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/BasicEngine.xml

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/BasicEngine.xml
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/BasicEngine.xml?rev=1230508r1=1230507r2=1230508view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/BasicEngine.xml
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/BasicEngine.xml
 Thu Jan 12 12:50:34 2012
@@ -107,12 +107,6 @@
 mandatoryfalse/mandatory
   /configurationParameter
   configurationParameter
-namedefaultFilteredMarkups/name
-typeString/type
-multiValuedtrue/multiValued
-mandatoryfalse/mandatory
-  /configurationParameter
-  configurationParameter
 namemainScript/name
 typeString/type
 multiValuedfalse/multiValued




svn commit: r1230510 [1/3] - in /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser: TextMarkerParser.java TextMarkerParser.tokens

2012-01-12 Thread pkluegl
Author: pkluegl
Date: Thu Jan 12 13:11:11 2012
New Revision: 1230510

URL: http://svn.apache.org/viewvc?rev=1230510view=rev
Log:
UIMA-2233
adapted engine parser to changed lexer tokens

Modified:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.tokens



svn commit: r1230510 [3/3] - in /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser: TextMarkerParser.java TextMarkerParser.tokens

2012-01-12 Thread pkluegl
Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.tokens
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.tokens?rev=1230510r1=1230509r2=1230510view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.tokens
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.tokens
 Thu Jan 12 13:11:11 2012
@@ -50,105 +50,102 @@ Exponent=52
 FALSE=53
 FEATURE=54
 FILL=55
-FILTERMARKUP=56
-FILTERTYPE=57
-FLOATLIST=58
-FloatString=59
-FloatTypeSuffix=60
-FloatingPointLiteral=61
-GATHER=62
-GET=63
-GETFEATURE=64
-GETLIST=65
-GREATER=66
-GREATEREQUAL=67
-HexDigit=68
-HexLiteral=69
-IF=70
-INLIST=71
-INTLIST=72
-IS=73
-ISINTAG=74
-Identifier=75
-IntString=76
-IntegerTypeSuffix=77
-JavaIDDigit=78
-LAST=79
-LBRACK=80
-LCURLY=81
-LESS=82
-LESSEQUAL=83
-LINE_COMMENT=84
-LOG=85
-LOGN=86
-LPAREN=87
-Letter=88
-ListIdentifier=89
-LogLevel=90
-MARK=91
-MARKFAST=92
-MARKLAST=93
-MARKONCE=94
-MARKSCORE=95
-MARKTABLE=96
-MATCHEDTEXT=97
-MERGE=98
-MINUS=99
-MOFN=100
-NEAR=101
-NOT=102
-NOTEQUAL=103
-OR=104
-OctalEscape=105
-OctalLiteral=106
-OldColor=107
-PARSE=108
-PARTOF=109
-PARTOFNEQ=110
-PERCENT=111
-PLUS=112
-POSITION=113
-PackageString=114
-QUESTION=115
-RBRACK=116
-RCURLY=117
-REGEXP=118
-REMOVE=119
-REMOVEDUPLICATE=120
-REMOVESTRING=121
-REPLACE=122
-RETAINMARKUP=123
-RETAINTYPE=124
-RPAREN=125
-RessourceLiteral=126
-SCORE=127
-SEMI=128
-SETFEATURE=129
-SIN=130
-SIZE=131
-SLASH=132
-STAR=133
-STARTSWITH=134
-STRINGLIST=135
-ScriptString=136
-StringLiteral=137
-StringString=138
-SymbolString=139
-TAN=140
-THEN=141
-TOTALCOUNT=142
-TRANSFER=143
-TRIE=144
-TRUE=145
-TYPELIST=146
-TypeString=147
-TypeSystemString=148
-UNMARK=149
-UNMARKALL=150
-UnicodeEscape=151
-VBAR=152
-VOTE=153
-WORDLIST=154
-WORDTABLE=155
-WS=156
-XOR=157
+FILTERTYPE=56
+FLOATLIST=57
+FloatString=58
+FloatTypeSuffix=59
+FloatingPointLiteral=60
+GATHER=61
+GET=62
+GETFEATURE=63
+GETLIST=64
+GREATER=65
+GREATEREQUAL=66
+HexDigit=67
+HexLiteral=68
+IF=69
+INLIST=70
+INTLIST=71
+IS=72
+Identifier=73
+IntString=74
+IntegerTypeSuffix=75
+JavaIDDigit=76
+LAST=77
+LBRACK=78
+LCURLY=79
+LESS=80
+LESSEQUAL=81
+LINE_COMMENT=82
+LOG=83
+LOGN=84
+LPAREN=85
+Letter=86
+ListIdentifier=87
+LogLevel=88
+MARK=89
+MARKFAST=90
+MARKLAST=91
+MARKONCE=92
+MARKSCORE=93
+MARKTABLE=94
+MATCHEDTEXT=95
+MERGE=96
+MINUS=97
+MOFN=98
+NEAR=99
+NOT=100
+NOTEQUAL=101
+OR=102
+OctalEscape=103
+OctalLiteral=104
+OldColor=105
+PARSE=106
+PARTOF=107
+PARTOFNEQ=108
+PERCENT=109
+PLUS=110
+POSITION=111
+PackageString=112
+QUESTION=113
+RBRACK=114
+RCURLY=115
+REGEXP=116
+REMOVE=117
+REMOVEDUPLICATE=118
+REMOVESTRING=119
+REPLACE=120
+RETAINTYPE=121
+RPAREN=122
+RessourceLiteral=123
+SCORE=124
+SEMI=125
+SETFEATURE=126
+SIN=127
+SIZE=128
+SLASH=129
+STAR=130
+STARTSWITH=131
+STRINGLIST=132
+ScriptString=133
+StringLiteral=134
+StringString=135
+SymbolString=136
+TAN=137
+THEN=138
+TOTALCOUNT=139
+TRANSFER=140
+TRIE=141
+TRUE=142
+TYPELIST=143
+TypeString=144
+TypeSystemString=145
+UNMARK=146
+UNMARKALL=147
+UnicodeEscape=148
+VBAR=149
+VOTE=150
+WORDLIST=151
+WORDTABLE=152
+WS=153
+XOR=154




svn commit: r1230537 - in /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker: TextMarkerStream.java engine/TextMarkerEngine.java seed/DefaultSeeder.java

2012-01-12 Thread pkluegl
Author: pkluegl
Date: Thu Jan 12 13:45:58 2012
New Revision: 1230537

URL: http://svn.apache.org/viewvc?rev=1230537view=rev
Log:
UIMA-2233
only add inference annotations if there are none yet. They will be initialized 
anyway. Let seeder return their seeding type in order to be able to remove the 
seeding annotations with the inference annotations if needed.

Modified:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerStream.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/TextMarkerEngine.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/seed/DefaultSeeder.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/seed/TextMarkerAnnotationSeeder.java

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerStream.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerStream.java?rev=1230537r1=1230536r2=1230537view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerStream.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerStream.java
 Thu Jan 12 13:45:58 2012
@@ -132,20 +132,23 @@ public class TextMarkerStream extends FS
   }
 
   public void initalizeBasics() {
+AnnotationIndexAnnotationFS basicIndex = 
cas.getAnnotationIndex(basicType);
 AnnotationIndexAnnotationFS annotationIndex = cas.getAnnotationIndex();
-TreeSetInteger anchors = new TreeSetInteger();
-for (AnnotationFS a : annotationIndex) {
-  anchors.add(a.getBegin());
-  anchors.add(a.getEnd());
-}
-while (anchors.size() = 2) {
-  Integer first = anchors.pollFirst();
-  Integer second = anchors.first();
-  TextMarkerBasic newTMB = new TextMarkerBasic(getJCas(), first, second);
-  beginAnchors.put(first, newTMB);
-  endAnchors.put(second, newTMB);
-  basics.add(newTMB);
-  cas.addFsToIndexes(newTMB);
+if (basicIndex.size() == 0) {
+  TreeSetInteger anchors = new TreeSetInteger();
+  for (AnnotationFS a : annotationIndex) {
+anchors.add(a.getBegin());
+anchors.add(a.getEnd());
+  }
+  while (anchors.size() = 2) {
+Integer first = anchors.pollFirst();
+Integer second = anchors.first();
+TextMarkerBasic newTMB = new TextMarkerBasic(getJCas(), first, second);
+beginAnchors.put(first, newTMB);
+endAnchors.put(second, newTMB);
+basics.add(newTMB);
+cas.addFsToIndexes(newTMB);
+  }
 }
 for (AnnotationFS a : annotationIndex) {
   if (!a.getType().equals(basicType)) {

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/TextMarkerEngine.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/TextMarkerEngine.java?rev=1230537r1=1230536r2=1230537view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/TextMarkerEngine.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/TextMarkerEngine.java
 Thu Jan 12 13:45:58 2012
@@ -39,7 +39,6 @@ import org.apache.uima.analysis_componen
 import org.apache.uima.analysis_engine.AnalysisEngine;
 import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
 import org.apache.uima.cas.CAS;
-import org.apache.uima.cas.FSIterator;
 import org.apache.uima.cas.Feature;
 import org.apache.uima.cas.Type;
 import org.apache.uima.cas.TypeSystem;
@@ -168,7 +167,7 @@ public class TextMarkerEngine extends JC
 
   private boolean initialized = false;
 
-
+  private ListType seedTypes;
 
   @Override
   public void initialize(UimaContext aContext) throws 
ResourceInitializationException {
@@ -259,12 +258,16 @@ public class TextMarkerEngine extends JC
 
 if (removeBasics) {
   ListAnnotationFS toRemove = new ArrayListAnnotationFS();
-  Type type = cas.getTypeSystem().getType(BASIC_TYPE);
-  FSIteratorAnnotationFS iterator = 
cas.getAnnotationIndex(type).iterator();
-  while (iterator.isValid()) {
-AnnotationFS fs = iterator.get();
+  Type basicType = cas.getTypeSystem().getType(BASIC_TYPE);
+  AnnotationIndexAnnotationFS basicIndex = 
cas.getAnnotationIndex(basicType);
+  for (AnnotationFS fs : basicIndex) {
 toRemove.add(fs

svn commit: r1230625 - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/constraint/ uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textm

2012-01-12 Thread pkluegl
Author: pkluegl
Date: Thu Jan 12 16:32:47 2012
New Revision: 1230625

URL: http://svn.apache.org/viewvc?rev=1230625view=rev
Log:
UIMA-2330
Added greedy filtering behavior for rule inference. Added unit tests for basic 
filtering functionality.

Added:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/test/java/org/apache/uima/textmarker/AllTests.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/test/java/org/apache/uima/textmarker/FilteringTest.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/test/resources/org/apache/uima/textmarker/FilteringTest.tm

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/test/resources/org/apache/uima/textmarker/FilteringTest.txt
Modified:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/constraint/BasicTypeConstraint.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/TextMarkerTypeMatcher.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/quantifier/PlusGreedy.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/validator/TextMarkerTypeChecker.java

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/constraint/BasicTypeConstraint.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/constraint/BasicTypeConstraint.java?rev=1230625r1=1230624r2=1230625view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/constraint/BasicTypeConstraint.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/constraint/BasicTypeConstraint.java
 Thu Jan 12 16:32:47 2012
@@ -64,7 +64,7 @@ public class BasicTypeConstraint impleme
   TextMarkerBasic tmb = (TextMarkerBasic) fs;
   if (types != null) {
 for (Type each : types) {
-  result |= tmb.beginsWith(each)  tmb.endsWith(each);
+  result |= tmb.isPartOf(each)|| tmb.beginsWith(each) || 
tmb.endsWith(each);
   if (result)
 break;
 }

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/TextMarkerTypeMatcher.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/TextMarkerTypeMatcher.java?rev=1230625r1=1230624r2=1230625view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/TextMarkerTypeMatcher.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/TextMarkerTypeMatcher.java
 Thu Jan 12 16:32:47 2012
@@ -26,7 +26,6 @@ import java.util.List;
 import java.util.TreeSet;
 
 import org.apache.uima.cas.ConstraintFactory;
-import org.apache.uima.cas.FSIterator;
 import org.apache.uima.cas.FSMatchConstraint;
 import org.apache.uima.cas.Type;
 import org.apache.uima.cas.text.AnnotationFS;
@@ -51,7 +50,8 @@ public class TextMarkerTypeMatcher imple
 
   public CollectionAnnotationFS getMatchingAnnotations(TextMarkerStream 
stream,
   TextMarkerBlock parent) {
-
+// TODO what about the matching direction?
+// TODO this comparator can ignore some annotations?! same offset same type
 CollectionAnnotationFS result = new TreeSetAnnotationFS(comparator);
 ListType types = getTypes(parent, stream);
 for (Type type : types) {
@@ -64,19 +64,18 @@ public class TextMarkerTypeMatcher imple
 result.add(stream.getDocumentAnnotation());
 
   } else {
-FSIteratorAnnotationFS iterator = 
stream.getFilter().createFilteredIterator(
-stream.getCas(), type);
-
-// AnnotationIndexAnnotationFS annotationIndex = 
stream.getCas().getAnnotationIndex(type);
-// stream.getCas().createFilteredIterator(annotationIndex.iterator(),
-// stream.getFilter().createFilteredIterator(null, stream, type));
-// FSMatchConstraint anchorConstraint = 
createAnchorConstraints(parent, stream);
-// FSIteratorAnnotationFS iterator = 
stream.getFilteredBasicIterator(anchorConstraint);
-// iterator.moveToFirst();
-while (iterator.isValid()) {
-  AnnotationFS annotation = iterator.get();
-  result.add(annotation);
-  iterator.moveToNext();
+stream.moveToFirst();
+while (stream.isValid()) {
+  TextMarkerBasic nextBasic = (TextMarkerBasic) stream.get();
+  ListType allTypes

svn commit: r1232523 [2/2] - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-addons/META-INF/ uimaj-ep-textmarker-caseditor/META-INF/ uimaj-ep-textmarker-ide/META-INF/ uimaj-ep-textmarker-ide/s

2012-01-17 Thread pkluegl
Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/text/completion/TextMarkerCompletionProposalCollector.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/text/completion/TextMarkerCompletionProposalCollector.java?rev=1232523r1=1232522r2=1232523view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/text/completion/TextMarkerCompletionProposalCollector.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/text/completion/TextMarkerCompletionProposalCollector.java
 Tue Jan 17 18:21:36 2012
@@ -19,14 +19,13 @@
 
 package org.apache.uima.textmarker.ide.ui.text.completion;
 
+import org.apache.uima.textmarker.ide.core.TextMarkerNature;
 import org.eclipse.dltk.core.CompletionProposal;
 import org.eclipse.dltk.core.IScriptProject;
 import org.eclipse.dltk.core.ISourceModule;
-import org.eclipse.dltk.ui.text.completion.CompletionProposalLabelProvider;
 import org.eclipse.dltk.ui.text.completion.IScriptCompletionProposal;
 import org.eclipse.dltk.ui.text.completion.ScriptCompletionProposal;
 import org.eclipse.dltk.ui.text.completion.ScriptCompletionProposalCollector;
-import 
org.eclipse.dltk.ui.text.completion.ScriptContentAssistInvocationContext;
 import org.eclipse.swt.graphics.Image;
 
 public class TextMarkerCompletionProposalCollector extends 
ScriptCompletionProposalCollector {
@@ -42,23 +41,7 @@ public class TextMarkerCompletionProposa
 super(module);
   }
 
-  // Label provider
-  @Override
-  protected CompletionProposalLabelProvider createLabelProvider() {
-return new TextMarkerCompletionProposalLabelProvider();
-  }
-
-  // Invocation context
-  @Override
-  protected ScriptContentAssistInvocationContext 
createScriptContentAssistInvocationContext(
-  ISourceModule sourceModule) {
-return new ScriptContentAssistInvocationContext(sourceModule) {
-  @Override
-  protected CompletionProposalLabelProvider createLabelProvider() {
-return new TextMarkerCompletionProposalLabelProvider();
-  }
-};
-  }
+ 
 
   // Specific proposals creation. May be use factory?
   @Override
@@ -93,4 +76,9 @@ public class TextMarkerCompletionProposa
 int relevance = computeRelevance(proposal);
 return createScriptCompletionProposal(completion, start, length, img, 
label, relevance);
   }
+
+  @Override
+  protected String getNatureId() {
+return TextMarkerNature.NATURE_ID;
+  }
 }

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/text/completion/TextMarkerCompletionProposalLabelProvider.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/text/completion/TextMarkerCompletionProposalLabelProvider.java?rev=1232523r1=1232522r2=1232523view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/text/completion/TextMarkerCompletionProposalLabelProvider.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/text/completion/TextMarkerCompletionProposalLabelProvider.java
 Tue Jan 17 18:21:36 2012
@@ -32,7 +32,7 @@ public class TextMarkerCompletionProposa
 
 // parameters
 nameBuffer.append('(');
-appendUnboundedParameterList(nameBuffer, methodProposal);
+appendParameterList(nameBuffer, methodProposal);
 nameBuffer.append(')');
 
 return nameBuffer.toString();
@@ -47,7 +47,7 @@ public class TextMarkerCompletionProposa
 
 // parameters
 nameBuffer.append('(');
-appendUnboundedParameterList(nameBuffer, methodProposal);
+appendParameterList(nameBuffer, methodProposal);
 nameBuffer.append()  ); //$NON-NLS-1$
 
 return nameBuffer.toString();

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/text/completion/TextMarkerScriptCompletionProcessor.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/text/completion/TextMarkerScriptCompletionProcessor.java?rev=1232523r1=1232522r2=1232523view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/text/completion/TextMarkerScriptCompletionProcessor.java
 (original)
+++ 

svn commit: r1232859 - in /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide: plugin.xml src/main/java/org/apache/uima/textmarker/ide/core/builder/TextMarkerBuilder.java

2012-01-18 Thread pkluegl
Author: pkluegl
Date: Wed Jan 18 12:39:23 2012
New Revision: 1232859

URL: http://svn.apache.org/viewvc?rev=1232859view=rev
Log:
UIMA-2336
TextMarkerBuilder became a BuildParticipant

Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/plugin.xml

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/builder/TextMarkerBuilder.java

Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/plugin.xml
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/plugin.xml?rev=1232859r1=1232858r2=1232859view=diff
==
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/plugin.xml (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/plugin.xml Wed Jan 18 
12:39:23 2012
@@ -219,15 +219,7 @@ under the License.
 
class=org.apache.uima.textmarker.ide.core.packages.TextMarkerPackagesBuildpathContainerInitializer
 id=org.apache.uima.textmarker.ide.core.PACKAGES
   /buildpathContainerInitializer
-   /extension
-   extension
- id=org.apache.uima.textmarker.ide.core.builder
- point=org.eclipse.dltk.core.builder
-  builder
-
class=org.apache.uima.textmarker.ide.core.builder.TextMarkerBuilder
-nature=org.apache.uima.textmarker.ide.nature
-  /builder
-   /extension
+   /extension
 extension
 point=org.eclipse.dltk.core.buildParticipant
   buildParticipant
@@ -245,6 +237,18 @@ under the License.
 id=org.apache.uima.textmarker.ide.buildParticipant.parser
   /requires
 /buildParticipant
+buildParticipant
+  class=org.apache.uima.textmarker.ide.validator.CheckValidator
+  id=org.apache.uima.textmarker.ide.validator.Checker
+  name=TextMarker Validator
+  nature=org.apache.uima.textmarker.ide.nature
+/buildParticipant
+buildParticipant
+  class=org.apache.uima.textmarker.ide.core.builder.TextMarkerBuilder
+  id=org.apache.uima.textmarker.ide.core.builder
+  name=TextMarker Descriptor Bulider
+  nature=org.apache.uima.textmarker.ide.nature
+/buildParticipant
   /extension
extension
  point=org.eclipse.dltk.debug.scriptDebugModel
@@ -1437,14 +1441,5 @@ under the License.
 id=org.apache.uima.textmarker.ide.validator.checkvalidator
 nature=org.apache.uima.textmarker.ide.nature
   /validatorType
-   /extension
-   extension
- point=org.eclipse.dltk.core.buildParticipant
-  buildParticipant
-class=org.apache.uima.textmarker.ide.validator.CheckValidator
-id=org.apache.uima.textmarker.ide.validator.Checker
-name=TextMarker Validator
-nature=org.apache.uima.textmarker.ide.nature
-  /buildParticipant
/extension
 /plugin

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/builder/TextMarkerBuilder.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/builder/TextMarkerBuilder.java?rev=1232859r1=1232858r2=1232859view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/builder/TextMarkerBuilder.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/builder/TextMarkerBuilder.java
 Wed Jan 18 12:39:23 2012
@@ -19,13 +19,6 @@
 
 package org.apache.uima.textmarker.ide.core.builder;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -51,69 +44,43 @@ import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.SubProgressMonitor;
 import org.eclipse.dltk.ast.declarations.ModuleDeclaration;
 import org.eclipse.dltk.core.DLTKCore;
-import org.eclipse.dltk.core.IDLTKLanguageToolkit;
 import org.eclipse.dltk.core.IScriptProject;
 import org.eclipse.dltk.core.ISourceModule;
 import org.eclipse.dltk.core.ModelException;
+import org.eclipse.dltk.core.builder.AbstractBuildParticipantType;
+import org.eclipse.dltk.core.builder.IBuildChange;
 import org.eclipse.dltk.core.builder.IBuildContext;
 import org.eclipse.dltk.core.builder.IBuildParticipant;
-import org.eclipse.dltk.internal.core.builder.Messages;
-import org.eclipse.dltk.internal.core.builder.StandardScriptBuilder;
+import org.eclipse.dltk.core.builder.IBuildParticipantExtension;
+import org.eclipse.dltk.core.builder.IBuildParticipantExtension2;
+import org.eclipse.dltk.core.builder.IBuildParticipantExtension3;
+import

svn commit: r1232868 [3/4] - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/ uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/tex

2012-01-18 Thread pkluegl
Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/TextMarkerKeywords.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/TextMarkerKeywords.java?rev=1232868r1=1232867r2=1232868view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/TextMarkerKeywords.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/TextMarkerKeywords.java
 Wed Jan 18 12:54:54 2012
@@ -27,8 +27,8 @@ public class TextMarkerKeywords implemen
   AFTER, STARTSWITH, ENDSWITH, PARTOFNEQ, SIZE };
 
   private static String[] declaration = { WORDLIST, DECLARE, BOOLEAN, 
PACKAGE, TYPE,
-  TYPESYSTEM, INT, DOUBLE, FLOAT, STRING, SCRIPT, WORDTABLE, 
ENGINE, ACTION,
-  CONDITION, BLOCK, RULES, BOOLEANLIST, INTLIST, DOUBLELIST, 
FLOATLIST,STRINGLIST,
+  TYPESYSTEM, INT, DOUBLE, FLOAT, STRING, SCRIPT, WORDTABLE, 
ENGINE, 
+  BLOCK, RULES, BOOLEANLIST, INTLIST, DOUBLELIST, 
FLOATLIST,STRINGLIST,
   TYPELIST };
 
   private static String[] action = { DEL, CALL, MARK, MARKSCORE, 
COLOR, LOG, TAG,

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g?rev=1232868r1=1232867r2=1232868view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g
 Wed Jan 18 12:54:54 2012
@@ -423,28 +423,28 @@ variableDeclaration returns [ListStatem
 decls.add(StatementFactory.createVarListVariable(id,type,list, 
TMTypeConstants.TM_TYPE_TL));
 stmts.add(StatementFactory.createDeclarationsStatement(type, decls, 
list));
 }   
-   |
-   stmt = conditionDeclaration {stmts.add(stmt);}
-   |
-   stmt = actionDeclaration {stmts.add(stmt);}
+   //|
+   //stmt = conditionDeclaration {stmts.add(stmt);}
+   //|
+   //stmt = actionDeclaration {stmts.add(stmt);}
;
 
-conditionDeclaration returns [Statement stmt = null]
-:
-declareToken = CONDITION id = Identifier {addVariable(id.getText(), 
declareToken.getText());}
-ASSIGN_EQUAL 
-LPAREN cons = conditions RPAREN SEMI
-{stmt = StatementFactory.createComposedVariableConditionDeclaration(id, 
cons);}
-;
+//conditionDeclaration returns [Statement stmt = null]
+//:
+//declareToken = CONDITION id = Identifier {addVariable(id.getText(), 
declareToken.getText());}
+//ASSIGN_EQUAL 
+//LPAREN cons = conditions RPAREN SEMI
+//{stmt = StatementFactory.createComposedVariableConditionDeclaration(id, 
cons);}
+//;
 
 //TODO added rule
-actionDeclaration returns [Statement stmt = null]
-:
-declareToken = ACTION id = Identifier {addVariable(id.getText(), 
declareToken.getText());}
-ASSIGN_EQUAL
-LPAREN a = actions RPAREN SEMI
-{stmt = StatementFactory.createComposedVariableActionDeclaration(id, a);}
-;
+//actionDeclaration returns [Statement stmt = null]
+//:
+//declareToken = ACTION id = Identifier {addVariable(id.getText(), 
declareToken.getText());}
+//ASSIGN_EQUAL
+//LPAREN a = actions RPAREN SEMI
+//{stmt = StatementFactory.createComposedVariableActionDeclaration(id, a);}
+//;
 
 declaration returns [ListStatement stmts = new ArrayListStatement()]
 @init {
@@ -853,20 +853,21 @@ condition returns [TextMarkerCondition r
| c = conditionPartOfNeq
| c = conditionSize
| (c = externalCondition)= c = externalCondition
-   | c = variableCondition
+   //| c = variableCondition
) {result = c;}
;

 //TODO added rule
-variableCondition returns [TextMarkerCondition condition = null]
-   :   
-   // also create condition for auto-completion
-   //{isVariableOfType(input.LT(1).getText(), CONDITION)}? 
-   id = Identifier
-   {
-   condition = ConditionFactory.createCondition(id);
-   }
-   ;   
+//variableCondition returns [TextMarkerCondition condition = null]
+// :   
+// // also create condition for auto-completion
+// //{isVariableOfType(input.LT(1).getText(), CONDITION)}? 
+// id = Identifier
+// {
+// condition = ConditionFactory.createCondition(id);
+// }
+// ;   
+   

 

svn commit: r1232868 [1/4] - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/ uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/tex

2012-01-18 Thread pkluegl
Author: pkluegl
Date: Wed Jan 18 12:54:54 2012
New Revision: 1232868

URL: http://svn.apache.org/viewvc?rev=1232868view=rev
Log:
UIMA-2335
deactivated variables for conditions and actions in language.

Modified:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/VariableAction.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.g

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/TextMarkerKeywords.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.java

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/VariableAction.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/VariableAction.java?rev=1232868r1=1232867r2=1232868view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/VariableAction.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/VariableAction.java
 Wed Jan 18 12:54:54 2012
@@ -36,7 +36,7 @@ public class VariableAction extends Abst
   @Override
   public void execute(RuleMatch match, RuleElement element, TextMarkerStream 
stream,
   InferenceCrowd crowd) {
-
+// TODO
   }
 
   public String getVar() {

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.g
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.g?rev=1232868r1=1232867r2=1232868view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.g
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.g
 Wed Jan 18 12:54:54 2012
@@ -320,29 +320,29 @@ ListString vars = new ArrayListString
type = TYPELIST 
{!isVariableOfType($blockDeclaration::env, input.LT(1).getText(), 
type.getText())}? 
name = Identifier (ASSIGN_EQUAL tl = typeListExpression)? SEMI 
{addVariable($blockDeclaration::env, name.getText(), type.getText());if(tl != 
null){setValue($blockDeclaration::env, name.getText(), tl);}} 
-   |
-   stmt1 = conditionDeclaration {stmt = stmt1;}
-   |
-   stmt2 = actionDeclaration {stmt = stmt2;}
+   //|
+   //stmt1 = conditionDeclaration {stmt = stmt1;}
+   //|
+   //stmt2 = actionDeclaration {stmt = stmt2;}
;
 
 //TODO added rule
-conditionDeclaration returns [TextMarkerStatement stmt = null]
-:
-type = CONDITION id = Identifier ASSIGN_EQUAL LPAREN cons = conditions 
RPAREN SEMI
-{addVariable($blockDeclaration::env, id.getText(), type.getText());
-AbstractTextMarkerCondition condition = 
ConditionFactory.createConditionAnd(cons,$blockDeclaration::env);
-setValue($blockDeclaration::env, id.getText(), condition);}
-;
+//conditionDeclaration returns [TextMarkerStatement stmt = null]
+  //  :
+//type = CONDITION id = Identifier ASSIGN_EQUAL LPAREN cons = conditions 
RPAREN SEMI
+//{addVariable($blockDeclaration::env, id.getText(), type.getText());
+//AbstractTextMarkerCondition condition = 
ConditionFactory.createConditionAnd(cons,$blockDeclaration::env);
+//setValue($blockDeclaration::env, id.getText(), condition);}
+//;
 
 //TODO added rule
-actionDeclaration returns [TextMarkerStatement stmt = null]
-:
-type = ACTION id = Identifier ASSIGN_EQUAL LPAREN a = actions RPAREN SEMI
-{addVariable($blockDeclaration::env, id.getText(), type.getText());
-AbstractTextMarkerAction action = 
ActionFactory.createComposedAction(a,$blockDeclaration::env);
-setValue($blockDeclaration::env, id.getText(), action);}
-;
+//actionDeclaration returns [TextMarkerStatement stmt = null]
+//:
+//type = ACTION id = Identifier ASSIGN_EQUAL LPAREN a = actions RPAREN SEMI
+//{addVariable($blockDeclaration::env, id.getText(), type.getText());
+//AbstractTextMarkerAction action = 
ActionFactory.createComposedAction(a,$blockDeclaration::env);
+//setValue($blockDeclaration::env

svn commit: r1232930 - /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/basic/

2012-01-18 Thread pkluegl
Author: pkluegl
Date: Wed Jan 18 15:33:52 2012
New Revision: 1232930

URL: http://svn.apache.org/viewvc?rev=1232930view=rev
Log:
UIMA-2287
Removed basic stream view implementation.

Removed:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/basic/



svn commit: r1232934 - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/browser/ uimaj-ep-textmarker-caseditor/src/main/java/org

2012-01-18 Thread pkluegl
Author: pkluegl
Date: Wed Jan 18 15:38:13 2012
New Revision: 1232934

URL: http://svn.apache.org/viewvc?rev=1232934view=rev
Log:
UIMA-2287
TextMarker views now extend CasEditorView. Removed basic stream view.

Modified:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/browser/AnnotationBrowserView.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/selection/SelectionView.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/tree/AnnotationTreeContentProvider.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/ExplainPerspective.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/TextMarkerPerspective.java

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/browser/AnnotationBrowserView.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/browser/AnnotationBrowserView.java?rev=1232934r1=1232933r2=1232934view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/browser/AnnotationBrowserView.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/browser/AnnotationBrowserView.java
 Wed Jan 18 15:38:13 2012
@@ -20,11 +20,12 @@
 package org.apache.uima.textmarker.caseditor.view.browser;
 
 import org.apache.uima.caseditor.editor.AnnotationEditor;
-import org.apache.uima.caseditor.editor.AnnotationEditorView;
+import org.apache.uima.caseditor.editor.CasEditorView;
 import org.apache.uima.caseditor.editor.ICasEditor;
 import org.apache.uima.textmarker.caseditor.view.tree.AnnotationTreeViewPage;
+import org.eclipse.ui.part.IPageBookViewPage;
 
-public class AnnotationBrowserView extends AnnotationEditorView {
+public class AnnotationBrowserView extends CasEditorView {
   public static final String ID = org.apache.uima.caseditor.browser;
 
   public AnnotationBrowserView() {
@@ -32,13 +33,11 @@ public class AnnotationBrowserView exten
   }
 
   @Override
-  protected PageRec doCreatePage(ICasEditor editor) {
-PageRec result = null;
+  protected IPageBookViewPage doCreatePage(ICasEditor editor) {
+IPageBookViewPage result = null;
 if (editor.getDocument() != null  editor instanceof AnnotationEditor) {
   AnnotationTreeViewPage page = new AnnotationTreeViewPage(false, 
(AnnotationEditor) editor);
-  initPage(page);
-  page.createControl(getPageBook());
-  result = new PageRec(editor, page);
+  result = page;
 }
 return result;
   }

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/selection/SelectionView.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/selection/SelectionView.java?rev=1232934r1=1232933r2=1232934view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/selection/SelectionView.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/selection/SelectionView.java
 Wed Jan 18 15:38:13 2012
@@ -20,13 +20,14 @@
 package org.apache.uima.textmarker.caseditor.view.selection;
 
 import org.apache.uima.caseditor.editor.AnnotationEditor;
-import org.apache.uima.caseditor.editor.AnnotationEditorView;
+import org.apache.uima.caseditor.editor.CasEditorView;
 import org.apache.uima.caseditor.editor.ICasEditor;
 import org.apache.uima.textmarker.caseditor.view.tree.AnnotationTreeViewPage;
+import org.eclipse.ui.part.IPageBookViewPage;
 
 /**
  */
-public final class SelectionView extends AnnotationEditorView {
+public final class SelectionView extends CasEditorView {
 
   public static final String ID = org.apache.uima.caseditor.selection;
 
@@ -35,13 +36,11 @@ public final class SelectionView extends
   }
 
   @Override
-  protected PageRec doCreatePage(ICasEditor editor) {
-PageRec result = null;
+  protected IPageBookViewPage doCreatePage(ICasEditor editor) {
+IPageBookViewPage result = null;
 if (editor.getDocument() != null  editor instanceof AnnotationEditor) {
   AnnotationTreeViewPage page = new AnnotationTreeViewPage(true, 
(AnnotationEditor) editor);
-  initPage(page);
-  page.createControl

svn commit: r1232936 - in /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons: ./ src/main/java/org/apache/uima/textmarker/explain/apply/ src/main/java/org/apache/uima/textmarker/explain/element

2012-01-18 Thread pkluegl
Author: pkluegl
Date: Wed Jan 18 15:38:52 2012
New Revision: 1232936

URL: http://svn.apache.org/viewvc?rev=1232936view=rev
Log:
UIMA-2287
TextMarker views now extend CasEditorView. Removed basic stream view.

Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/plugin.xml

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/apply/ApplyView.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/apply/ApplyViewPage.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/element/ElementView.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/failed/FailedView.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/matched/MatchedView.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/rulelist/RuleListView.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/selection/ExplainSelectionView.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/statistics/StatisticsView.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/testing/ui/views/EvaluationViewPage.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/testing/ui/views/fn/FalseNegativeView.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/testing/ui/views/fp/FalsePositiveView.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/testing/ui/views/tp/TruePositiveView.java

Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/plugin.xml
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/plugin.xml?rev=1232936r1=1232935r2=1232936view=diff
==
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/plugin.xml 
(original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/plugin.xml Wed Jan 
18 15:38:52 2012
@@ -486,13 +486,6 @@ under the License.
  point=org.eclipse.ui.views
   view
 category=org.apache.uima.textmarker.ide.ui
-
class=org.apache.uima.textmarker.explain.basic.BasicTokenStreamView
-icon=icons/text_list_numbers.png
-id=org.apache.uima.textmarker.explain.basic
-name=Basic Stream
-  /view
-  view
-category=org.apache.uima.textmarker.ide.ui
 class=org.apache.uima.textmarker.explain.apply.ApplyView
 icon=icons/chart_organisation.png
 id=org.apache.uima.textmarker.explain.apply

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/apply/ApplyView.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/apply/ApplyView.java?rev=1232936r1=1232935r2=1232936view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/apply/ApplyView.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/apply/ApplyView.java
 Wed Jan 18 15:38:52 2012
@@ -20,10 +20,11 @@
 package org.apache.uima.textmarker.explain.apply;
 
 import org.apache.uima.caseditor.editor.AnnotationEditor;
-import org.apache.uima.caseditor.editor.AnnotationEditorView;
+import org.apache.uima.caseditor.editor.CasEditorView;
 import org.apache.uima.caseditor.editor.ICasEditor;
+import org.eclipse.ui.part.IPageBookViewPage;
 
-public class ApplyView extends AnnotationEditorView {
+public class ApplyView extends CasEditorView {
 
   public static final String ID = org.apache.uima.textmarker.explain.apply;
 
@@ -32,13 +33,11 @@ public class ApplyView extends Annotatio
   }
 
   @Override
-  protected PageRec doCreatePage(ICasEditor editor) {
-PageRec result = null;
+  protected IPageBookViewPage doCreatePage(ICasEditor editor) {
+IPageBookViewPage result = null;
 if (editor.getDocument() != null  editor instanceof AnnotationEditor) {
   ApplyViewPage page = new ApplyViewPage((AnnotationEditor) editor);
-  initPage(page);
-  page.createControl(getPageBook());
-  result = new PageRec(editor, page);
+  result = page;
 }
 return result;
   }

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org

svn commit: r1233903 - in /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons: plugin.xml src/main/java/org/apache/uima/textmarker/explain/rulelist/RuleListViewPage.java

2012-01-20 Thread pkluegl
Author: pkluegl
Date: Fri Jan 20 13:27:25 2012
New Revision: 1233903

URL: http://svn.apache.org/viewvc?rev=1233903view=rev
Log:
UIMA-2337
fixed reference of wrong feature for filtering. Renamed Selected Rules view to 
Covering Rules.

Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/plugin.xml

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/rulelist/RuleListViewPage.java

Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/plugin.xml
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/plugin.xml?rev=1233903r1=1233902r2=1233903view=diff
==
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/plugin.xml 
(original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/plugin.xml Fri Jan 
20 13:27:25 2012
@@ -525,7 +525,7 @@ under the License.
 
class=org.apache.uima.textmarker.explain.selection.ExplainSelectionView
 icon=icons/chart_organisation.png
 id=org.apache.uima.textmarker.explain.selection
-name=Selected Rules
+name=Covering Rules
   /view
   view
 category=org.apache.uima.textmarker.ide.ui

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/rulelist/RuleListViewPage.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/rulelist/RuleListViewPage.java?rev=1233903r1=1233902r2=1233903view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/rulelist/RuleListViewPage.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/rulelist/RuleListViewPage.java
 Fri Jan 20 13:27:25 2012
@@ -102,7 +102,7 @@ public class RuleListViewPage extends Ap
 for (IExplainTreeNode each : children) {
   if (each instanceof RuleApplyNode) {
 RuleApplyNode ran = (RuleApplyNode) each;
-Feature f = ruleType.getFeatureByBaseName(ExplainConstants.ELEMENTS);
+Feature f = ruleType.getFeatureByBaseName(ExplainConstants.ELEMENT);
 if (f != null) {
   String v = ran.getFeatureStructure().getStringValue(f);
   if (manualFilter != null  !.equals(manualFilter)  
v.indexOf(manualFilter) == -1) {




svn commit: r1243617 - /uima/sandbox/trunk/TextMarker/uimaj-textmarker/

2012-02-13 Thread pkluegl
Author: pkluegl
Date: Mon Feb 13 17:32:12 2012
New Revision: 1243617

URL: http://svn.apache.org/viewvc?rev=1243617view=rev
Log:
Initial import.

Added:
uima/sandbox/trunk/TextMarker/uimaj-textmarker/



svn commit: r1243624 - in /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine: .classpath .project build.properties marker-file-identifying-eclipse-plugin plugin.xml pom.xml

2012-02-13 Thread pkluegl
Author: pkluegl
Date: Mon Feb 13 17:52:32 2012
New Revision: 1243624

URL: http://svn.apache.org/viewvc?rev=1243624view=rev
Log:
UIMA-2353
uimaj-ep-textmarker-engine became a fetcher plugin for the new uimaj-textmarker 
project

Added:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/marker-file-identifying-eclipse-plugin
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/plugin.xml
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/pom.xml
Removed:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/build.properties
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/.classpath
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/.project

Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/.classpath
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/.classpath?rev=1243624r1=1243623r2=1243624view=diff
==
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/.classpath 
(original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/.classpath Mon Feb 
13 17:52:32 2012
@@ -1,12 +1,10 @@
 ?xml version=1.0 encoding=UTF-8?
 classpath
-   classpathentry exported=true kind=lib 
path=lib/commons-collections-3.2.1.jar/
-   classpathentry exported=true kind=lib 
path=lib/uima-document-annotation.jar/
-   classpathentry exported=true kind=lib path=lib/antlr-3.1.3.jar/
-   classpathentry kind=con 
path=org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6/
+   classpathentry kind=src output=target/classes 
path=src/main/java/
+   classpathentry kind=src output=target/test-classes 
path=src/test/java/
+   classpathentry excluding=** kind=src output=target/test-classes 
path=src/test/resources/
+   classpathentry kind=con 
path=org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5/
+   classpathentry kind=con 
path=org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER/
classpathentry kind=con path=org.eclipse.pde.core.requiredPlugins/
-   classpathentry kind=src path=src/main/java/
-   classpathentry kind=src path=src/test/java/
-   classpathentry kind=src path=src/test/resources/
-   classpathentry kind=output path=bin/
+   classpathentry kind=output path=target/classes/
 /classpath

Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/.project
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/.project?rev=1243624r1=1243623r2=1243624view=diff
==
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/.project (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/.project Mon Feb 
13 17:52:32 2012
@@ -11,17 +11,13 @@
/arguments
/buildCommand
buildCommand
-   nameorg.eclipse.pde.ManifestBuilder/name
-   arguments
-   /arguments
-   /buildCommand
-   buildCommand
-   nameorg.eclipse.pde.SchemaBuilder/name
+   nameorg.eclipse.m2e.core.maven2Builder/name
arguments
/arguments
/buildCommand
/buildSpec
natures
+   natureorg.eclipse.m2e.core.maven2Nature/nature
natureorg.eclipse.pde.PluginNature/nature
natureorg.eclipse.jdt.core.javanature/nature
/natures

Added: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/marker-file-identifying-eclipse-plugin
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/marker-file-identifying-eclipse-plugin?rev=1243624view=auto
==
(empty)

Added: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/plugin.xml
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/plugin.xml?rev=1243624view=auto
==
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/plugin.xml (added)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/plugin.xml Mon Feb 
13 17:52:32 2012
@@ -0,0 +1,26 @@
+?xml version=1.0 encoding=UTF-8?
+?eclipse version=3.0?
+   !--
+***
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under

svn commit: r1243629 - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-addons/.settings/ uimaj-ep-textmarker-caseditor/.settings/ uimaj-ep-textmarker-ide/.settings/ uimaj-ep-textmarker-textrule

2012-02-13 Thread pkluegl
Author: pkluegl
Date: Mon Feb 13 18:06:03 2012
New Revision: 1243629

URL: http://svn.apache.org/viewvc?rev=1243629view=rev
Log:
UIMA-2353
removed .settings

Removed:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/.settings/
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/.settings/
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/.settings/
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-textruler/.settings/



svn commit: r1244445 - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-addons/META-INF/ uimaj-ep-textmarker-caseditor/META-INF/ uimaj-ep-textmarker-engine/ uimaj-ep-textmarker-engine/META-INF/

2012-02-15 Thread pkluegl
Author: pkluegl
Date: Wed Feb 15 11:45:33 2012
New Revision: 125

URL: http://svn.apache.org/viewvc?rev=125view=rev
Log:
UIMA-2353
some pom cleanup and add manifest, still not working

Modified:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/META-INF/MANIFEST.MF

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/META-INF/MANIFEST.MF

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/META-INF/MANIFEST.MF
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/pom.xml
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/META-INF/MANIFEST.MF
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/build.properties
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/pom.xml

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-textruler/META-INF/MANIFEST.MF

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/META-INF/MANIFEST.MF
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/META-INF/MANIFEST.MF?rev=125r1=124r2=125view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/META-INF/MANIFEST.MF 
(original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/META-INF/MANIFEST.MF 
Wed Feb 15 11:45:33 2012
@@ -1,24 +1,270 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: TextMarker IDE Addons
-Bundle-SymbolicName: org.apache.uima.textmarker.addons;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.apache.uima.textmarker.addons.TextMarkerAddonsPlugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.apache.uima.runtime;bundle-version=2.3.1,
- org.apache.uima.textmarker.engine;bundle-version=1.0.0,
- org.eclipse.core.resources,
- org.apache.uima.textmarker.ide;bundle-version=1.0.0,
- org.eclipse.ui.ide,
- org.eclipse.dltk.core;bundle-version=[3.0.0,4.0.0),
- org.eclipse.jface.text,
- org.eclipse.dltk.ui;bundle-version=1.0.2,
- org.eclipse.ui.editors,
- org.eclipse.dltk.launching;bundle-version=[3.0.0,4.0.0),
- org.eclipse.debug.ui;bundle-version=3.5.0,
- org.apache.uima.caseditor;bundle-version=2.4.0,
- org.apache.uima.textmarker.caseditor;bundle-version=1.0.0,
- org.apache.uima.caseditor.ide;bundle-version=2.4.0
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0
+Export-Package: org.apache.uima.textmarker.utils,org.apache.uima.textm
+ arker.caseditor.view.selection;uses:=org.apache.uima.textmarker.case
+ ditor.view.tree,org.apache.uima.textmarker.verbalize;uses:=org.apac
+ he.uima.textmarker.expression.number,org.apache.uima.textmarker.expre
+ ssion,org.apache.uima.textmarker,org.apache.uima.textmarker.expressio
+ n.list,org.apache.uima.textmarker.expression.resource,org.apache.uima
+ .textmarker.expression.type,org.apache.uima.textmarker.action,org.apa
+ che.uima.textmarker.expression.string,org.apache.uima.textmarker.expr
+ ession.bool,org.apache.uima.textmarker.condition,org.apache.uima.text
+ marker.rule.quantifier,org.apache.uima.textmarker.rule,org.apache.uim
+ a.textmarker.extensions,org.apache.uima.textmarker.parser;uses:=org
+ .apache.uima.textmarker,org.apache.uima.textmarker.rule,org.apache.ui
+ ma.textmarker.expression.number,org.apache.uima.textmarker.condition,
+ org.apache.uima.textmarker.expression,org.apache.uima.textmarker.rule
+ .quantifier,org.apache.uima.textmarker.extensions,org.apache.uima.tex
+ tmarker.expression.list,org.apache.uima.textmarker.expression.resourc
+ e,org.apache.uima.textmarker.expression.type,org.apache.uima.textmark
+ er.action,org.apache.uima.textmarker.expression.string,org.apache.uim
+ a.textmarker.expression.bool,org.apache.uima.textmarker.testing.eval
+ uator;uses:=org.apache.uima.textmarker.seed,org.apache.uima.textmar
+ ker.ide.core.packages;uses:=org.apache.uima.textmarker.ide,org.apach
+ e.uima.textmarker.ide.parser.ast,org.apache.uima.textmarker.ide.core
+ ,org.apache.uima.textmarker.testing.ui.handlers;uses:=org.apache.uim
+ a.textmarker.testing.ui.views.evalDataTable,org.apache.uima.textmarke
+ r.testing.ui.views,org.apache.uima.textmarker.testing.evaluator,org.a
+ pache.uima.textmarker.testing.ui.views.util,org.apache.uima.textmarke
+ r.addons,org.apache.uima.textmarker.ide,org.apache.uima.textmarker.id
+ e.core.builder,org.apache.uima.textmarker.type,org.apache.uima.textma
+ rker.testing.preferences,org.apache.uima.textmarker.explain.element;
+ uses:=org.apache.uima.textmarker.explain.tree,org.apache.uima.textma
+ rker.explain.failed,org.apache.uima.textmarker.explain.matched,org.ap
+ ache.uima.textmarker.addons,org.apache.uima.textmarker.testing.ui.vi
+ ews.tp;uses:=org.apache.uima.textmarker.testing.ui.views,org.apache
+ .uima.textmarker.ide.launching;uses:=org.apache.uima.textmarker.ide,
+ org.apache.uima.textmarker.ide.core.builder,org.apache.uima.textmarke
+ r.engine

svn commit: r1244446 - /uima/sandbox/trunk/TextMarker/uimaj-textmarker/pom.xml

2012-02-15 Thread pkluegl
Author: pkluegl
Date: Wed Feb 15 11:46:04 2012
New Revision: 126

URL: http://svn.apache.org/viewvc?rev=126view=rev
Log:
UIMA-2353
some pom cleanup and add manifest, still not working

Modified:
uima/sandbox/trunk/TextMarker/uimaj-textmarker/pom.xml

Modified: uima/sandbox/trunk/TextMarker/uimaj-textmarker/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker/pom.xml?rev=126r1=125r2=126view=diff
==
--- uima/sandbox/trunk/TextMarker/uimaj-textmarker/pom.xml (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-textmarker/pom.xml Wed Feb 15 11:46:04 
2012
@@ -71,4 +71,82 @@
 
connectionscm:svn:http://svn.apache.org/repos/asf/uima/sandbox/trunk/uimaj-textmarker/connection
 
developerConnectionscm:svn:https://svn.apache.org/repos/asf/uima/sandbox/trunk/uimaj-textmarker/developerConnection
   /scm
+build
+finalNameuima-textmarker/finalName
+pluginManagement
+  plugins
+plugin
+  groupIdorg.apache.rat/groupId
+  artifactIdapache-rat-plugin/artifactId
+  executions
+execution
+  iddefault-cli/id
+  configuration
+excludes
+  excluderelease.properties/exclude !-- release generated 
artifact --
+  excludesrc/test/resources/*.*/exclude !-- test data --
+  excludesrc/test/resources/data/moby.txt/exclude
+/excludes  
+  /configuration
+/execution
+  /executions
+/plugin 
+  /plugins
+/pluginManagement
+
+plugins
+
+  !-- filter the template for the version java code
+   to insert the version from properties --
+  plugin
+artifactIdmaven-resources-plugin/artifactId
+executions
+  execution
+idsetVersions/id
+goalsgoalcopy-resources/goal/goals
+phasegenerate-sources/phase
+configuration
+  
outputDirectory${project.build.directory}/generated-sources/releaseVersion/outputDirectory
+  resources
+resource
+  filteringtrue/filtering
+  directorysrc/main/versionJava/directory
+/resource
+  /resources
+  delimiters
+delimiter${*}/delimiter
+  /delimiters
+  useDefaultDelimitersfalse/useDefaultDelimiters
+/configuration
+  /execution
+/executions
+  /plugin
+  
+  !-- add the generated sources to the compile sources --
+  plugin
+groupIdorg.codehaus.mojo/groupId
+artifactIdbuild-helper-maven-plugin/artifactId
+version1.5/version
+executions
+  execution
+idaddVersionSrc/id
+goalsgoaladd-source/goal/goals
+configuration
+  sources
+
source${project.build.directory}/generated-sources/releaseVersion/source
+  /sources
+/configuration
+  /execution
+/executions
+  /plugin
+  
+  plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-surefire-plugin/artifactId
+configuration
+  argLine-Xmx650M/argLine
+/configuration
+  /plugin
+/plugins
+  /build
 /project
\ No newline at end of file




svn commit: r1244447 - /uima/sandbox/trunk/TextMarker/uimaj-textmarker/.classpath

2012-02-15 Thread pkluegl
Author: pkluegl
Date: Wed Feb 15 11:46:19 2012
New Revision: 127

URL: http://svn.apache.org/viewvc?rev=127view=rev
Log:
UIMA-2353
some pom cleanup and add manifest, still not working

Modified:
uima/sandbox/trunk/TextMarker/uimaj-textmarker/.classpath

Modified: uima/sandbox/trunk/TextMarker/uimaj-textmarker/.classpath
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker/.classpath?rev=127r1=126r2=127view=diff
==
--- uima/sandbox/trunk/TextMarker/uimaj-textmarker/.classpath (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-textmarker/.classpath Wed Feb 15 
11:46:19 2012
@@ -5,5 +5,10 @@
classpathentry excluding=** kind=src output=target/test-classes 
path=src/test/resources/
classpathentry kind=con 
path=org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5/
classpathentry kind=con 
path=org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER/
+   classpathentry kind=src output=target/classes 
path=target/generated-sources/releaseVersion
+   attributes
+   attribute name=optional value=true/
+   /attributes
+   /classpathentry
classpathentry kind=output path=target/classes/
 /classpath




svn commit: r1244950 - in /uima/sandbox/trunk/TextMarker/uimaj-textmarker: ./ src/main/java/org/apache/uima/textmarker/rule/ src/test/java/org/apache/uima/textmarker/ src/test/resources/org/apache/uim

2012-02-16 Thread pkluegl
Author: pkluegl
Date: Thu Feb 16 11:57:56 2012
New Revision: 1244950

URL: http://svn.apache.org/viewvc?rev=1244950view=rev
Log:
UIMA-2347
fixed wrong annotation parameter for step back while matching. Added unit test 
for this situation.

Added:

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/RuleInferenceTest2.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/resources/org/apache/uima/textmarker/RuleInferenceTest2.tm

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/resources/org/apache/uima/textmarker/RuleInferenceTest2.txt
Modified:
uima/sandbox/trunk/TextMarker/uimaj-textmarker/pom.xml

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/rule/TextMarkerRuleElement.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/LongGreedyTest.java

Modified: uima/sandbox/trunk/TextMarker/uimaj-textmarker/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker/pom.xml?rev=1244950r1=1244949r2=1244950view=diff
==
--- uima/sandbox/trunk/TextMarker/uimaj-textmarker/pom.xml (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-textmarker/pom.xml Thu Feb 16 11:57:56 
2012
@@ -49,8 +49,8 @@
/dependency
dependency
  groupIdorg.antlr/groupId
- artifactIdantlr-runtime/artifactId
- version3.4/version
+ artifactIdantlr/artifactId
+ version3.1.3/version
  scopecompile/scope
 /dependency
 dependency

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/rule/TextMarkerRuleElement.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/rule/TextMarkerRuleElement.java?rev=1244950r1=1244949r2=1244950view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/rule/TextMarkerRuleElement.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/rule/TextMarkerRuleElement.java
 Thu Feb 16 11:57:56 2012
@@ -128,7 +128,7 @@ public class TextMarkerRuleElement exten
 return;
   }
   if (extendedMatch.matched()) {
-if (quantifier.continueMatch(after, annotation, this, 
extendedMatch,
+if (quantifier.continueMatch(after, eachAnchor, this, 
extendedMatch,
 extendedContainerMatch, stream, crowd)) {
   // continue in while loop
 } else {
@@ -138,7 +138,7 @@ public class TextMarkerRuleElement exten
 }
   } else {
 stopMatching = true;
-stepbackMatch(after, annotation, extendedMatch, ruleApply, 
extendedContainerMatch,
+stepbackMatch(after, eachAnchor, extendedMatch, ruleApply, 
extendedContainerMatch,
 sideStepOrigin, stream, crowd, entryPoint);
   }
 } else {

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/LongGreedyTest.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/LongGreedyTest.java?rev=1244950r1=1244949r2=1244950view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/LongGreedyTest.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/LongGreedyTest.java
 Thu Feb 16 11:57:56 2012
@@ -19,8 +19,6 @@
 
 package org.apache.uima.textmarker;
 
-import static org.junit.Assert.assertEquals;
-
 import org.apache.uima.cas.CAS;
 import org.apache.uima.cas.FSIterator;
 import org.apache.uima.cas.Type;
@@ -36,8 +34,8 @@ public class LongGreedyTest {
 String namespace = 
this.getClass().getPackage().getName().replaceAll(\\., /);
 CAS cas = null;
 try {
-  cas = TextMarkerTestUtils.process(namespace + / + name + .tm, 
namespace + / + name
-  + .txt, 50);
+//  cas = TextMarkerTestUtils.process(namespace + / + name + .tm, 
namespace + / + name
+//  + .txt, 50);
 } catch (Exception e) {
   e.printStackTrace();
   assert (false);
@@ -46,12 +44,12 @@ public class LongGreedyTest {
 AnnotationIndexAnnotationFS ai = null;
 FSIteratorAnnotationFS iterator = null;
 
-t = TextMarkerTestUtils.getTestType(cas, 1);
-ai = cas.getAnnotationIndex(t);
-assertEquals(1, ai.size());
-iterator = ai.iterator();
-String coveredText = iterator.next().getCoveredText();
-assertEquals(64998, coveredText.length());
+//t

svn commit: r1244968 - /uima/sandbox/trunk/TextMarker/uimaj-textmarker-eclipse-feature/

2012-02-16 Thread pkluegl
Author: pkluegl
Date: Thu Feb 16 13:00:49 2012
New Revision: 1244968

URL: http://svn.apache.org/viewvc?rev=1244968view=rev
Log:
Initial import.

Added:
uima/sandbox/trunk/TextMarker/uimaj-textmarker-eclipse-feature/



svn commit: r1244969 - /uima/sandbox/trunk/TextMarker/uimaj-textmarker-eclipse-update-site/

2012-02-16 Thread pkluegl
Author: pkluegl
Date: Thu Feb 16 13:01:10 2012
New Revision: 1244969

URL: http://svn.apache.org/viewvc?rev=1244969view=rev
Log:
Initial import.

Added:
uima/sandbox/trunk/TextMarker/uimaj-textmarker-eclipse-update-site/



svn commit: r1244994 - in /uima/sandbox/trunk/TextMarker/uimaj-textmarker: ./ src/main/java/org/apache/uima/textmarker/rule/ src/test/java/org/apache/uima/textmarker/ src/test/resources/org/apache/uim

2012-02-16 Thread pkluegl
Author: pkluegl
Date: Thu Feb 16 14:22:55 2012
New Revision: 1244994

URL: http://svn.apache.org/viewvc?rev=1244994view=rev
Log:
UIMA-2347
Parameter was still not correct. Changed current annotation to last matched 
one. Added additional unit test that covers this situation.

Added:

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/RuleInferenceTest3.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/resources/org/apache/uima/textmarker/RuleInferenceTest3.tm

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/resources/org/apache/uima/textmarker/RuleInferenceTest3.txt
Modified:
uima/sandbox/trunk/TextMarker/uimaj-textmarker/pom.xml

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/rule/TextMarkerRuleElement.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/AllTests.java

Modified: uima/sandbox/trunk/TextMarker/uimaj-textmarker/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker/pom.xml?rev=1244994r1=1244993r2=1244994view=diff
==
--- uima/sandbox/trunk/TextMarker/uimaj-textmarker/pom.xml (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-textmarker/pom.xml Thu Feb 16 14:22:55 
2012
@@ -64,6 +64,12 @@
   artifactIduimaj-tools/artifactId
   version${project.parent.version}/version
   scopecompile/scope
+/dependency
+dependency
+  groupIdorg.apache.uima/groupId
+  artifactIduimaj-test-util/artifactId
+  version${project.parent.version}/version
+  scopetest/scope
 /dependency 
   /dependencies
   scm

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/rule/TextMarkerRuleElement.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/rule/TextMarkerRuleElement.java?rev=1244994r1=1244993r2=1244994view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/rule/TextMarkerRuleElement.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/rule/TextMarkerRuleElement.java
 Thu Feb 16 14:22:55 2012
@@ -116,12 +116,14 @@ public class TextMarkerRuleElement exten
 if (quantifier.continueMatch(after, annotation, this, ruleMatch, 
containerMatch, stream, crowd)) {
   boolean stopMatching = false;
   AnnotationFS eachAnchor = annotation;
+  AnnotationFS lastAnchor = annotation;
   ComposedRuleElementMatch extendedContainerMatch = containerMatch;
   RuleMatch extendedMatch = ruleMatch;
   extendedMatch.update(extendedContainerMatch);
   while (!stopMatching) {
 CollectionAnnotationFS nextAnnotations = getNextAnnotations(after, 
eachAnchor, stream);
 if (nextAnnotations.size() == 1) {
+  lastAnchor = eachAnchor;
   eachAnchor = nextAnnotations.iterator().next();
   doMatch(eachAnchor, extendedMatch, extendedContainerMatch, false, 
stream, crowd);
   if (this.equals(entryPoint)) {
@@ -138,12 +140,12 @@ public class TextMarkerRuleElement exten
 }
   } else {
 stopMatching = true;
-stepbackMatch(after, eachAnchor, extendedMatch, ruleApply, 
extendedContainerMatch,
+stepbackMatch(after, lastAnchor, extendedMatch, ruleApply, 
extendedContainerMatch,
 sideStepOrigin, stream, crowd, entryPoint);
   }
 } else {
   stopMatching = true;
-  continueMatch(after, eachAnchor, extendedMatch, ruleApply, 
extendedContainerMatch,
+  continueMatch(after, lastAnchor, extendedMatch, ruleApply, 
extendedContainerMatch,
   sideStepOrigin, entryPoint, stream, crowd);
 }
   }

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/AllTests.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/AllTests.java?rev=1244994r1=1244993r2=1244994view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/AllTests.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/AllTests.java
 Thu Feb 16 14:22:55 2012
@@ -6,7 +6,8 @@ import org.junit.runners.Suite.SuiteClas
 
 @RunWith(Suite.class)
 @SuiteClasses({ DynamicAnchoringTest.class, DynamicAnchoringTest2.class, 
FilteringTest.class,
-QuantifierTest1.class, QuantifierTest2.class, RuleInferenceTest.class, 
LongGreedyTest.class })
+QuantifierTest1.class, QuantifierTest2.class

svn commit: r1299712 - /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/tree/AnnotationTreeViewPage.java

2012-03-12 Thread pkluegl
Author: pkluegl
Date: Mon Mar 12 15:32:46 2012
New Revision: 1299712

URL: http://svn.apache.org/viewvc?rev=1299712view=rev
Log:
UIMA-2380
added code to remove listener

Modified:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/tree/AnnotationTreeViewPage.java

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/tree/AnnotationTreeViewPage.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/tree/AnnotationTreeViewPage.java?rev=1299712r1=1299711r2=1299712view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/tree/AnnotationTreeViewPage.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/tree/AnnotationTreeViewPage.java
 Mon Mar 12 15:32:46 2012
@@ -227,6 +227,7 @@ public class AnnotationTreeViewPage exte
   public void dispose() {
 super.dispose();
 getSite().getPage().removeSelectionListener(this);
+editor.removeAnnotationListener(this);
 
editor.getCasDocumentProvider().getTypeSystemPreferenceStore(editor.getEditorInput())
 .removePropertyChangeListener(styleListener);
 overlay.dispose();




svn commit: r1342619 - in /uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker: action/TransferAction.java rule/RuleMatch.java

2012-05-25 Thread pkluegl
Author: pkluegl
Date: Fri May 25 13:35:19 2012
New Revision: 1342619

URL: http://svn.apache.org/viewvc?rev=1342619view=rev
Log:
UIMA-2411
deleted empty method and fixed TRANSFER action

Modified:

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/TransferAction.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/rule/RuleMatch.java

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/TransferAction.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/TransferAction.java?rev=1342619r1=1342618r2=1342619view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/TransferAction.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/TransferAction.java
 Fri May 25 13:35:19 2012
@@ -42,18 +42,20 @@ public class TransferAction extends Type
   @Override
   public void execute(RuleMatch match, RuleElement element, TextMarkerStream 
stream,
   InferenceCrowd crowd) {
-ListRuleElementMatch list = match.getMatchInfos().get(element);
+ListListRuleElementMatch list = match.getMatchInfo(element);
 CAS cas = stream.getCas();
 Type t = type.getType(element.getParent());
-for (RuleElementMatch each : list) {
-  ListAnnotationFS matched = each.getTextsMatched();
-  for (AnnotationFS annotationFS : matched) {
-FeatureStructure createFS = cas.createFS(t);
-copyFeatures(annotationFS, createFS, cas);
-if (createFS instanceof AnnotationFS) {
-  stream.addAnnotation((AnnotationFS) createFS);
+for (ListRuleElementMatch eachList : list) {
+  for (RuleElementMatch each : eachList) {
+ListAnnotationFS matched = each.getTextsMatched();
+for (AnnotationFS annotationFS : matched) {
+  FeatureStructure createFS = cas.createFS(t);
+  copyFeatures(annotationFS, createFS, cas);
+  if (createFS instanceof AnnotationFS) {
+stream.addAnnotation((AnnotationFS) createFS);
+  }
+  cas.addFsToIndexes(createFS);
 }
-cas.addFsToIndexes(createFS);
   }
 }
 

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/rule/RuleMatch.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/rule/RuleMatch.java?rev=1342619r1=1342618r2=1342619view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/rule/RuleMatch.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/rule/RuleMatch.java
 Fri May 25 13:35:19 2012
@@ -239,11 +239,6 @@ public class RuleMatch {
 this.rootMatch = rootMatch;
   }
 
-  public MapRuleElement, ListRuleElementMatch getMatchInfos() {
-assert (false);
-return null;
-  }
-
   public ListListRuleElementMatch getMatchInfo(RuleElement element) {
 return getMatchInfo(rootMatch, element);
   }




svn commit: r1342714 [1/5] - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/ uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/

2012-05-25 Thread pkluegl
Author: pkluegl
Date: Fri May 25 16:26:54 2012
New Revision: 1342714

URL: http://svn.apache.org/viewvc?rev=1342714view=rev
Log:
UIMA-2402
- changed language definition in order to provide new arguments for MARKTABLE
- adapted ast and inference implementation for additional arguments
- some smaller changes in supporting IDE functionality due to changes in ast 
implementation of StructuredAction

Modified:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/formatter/TextMarkerFormattedPrinter.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/parser/ast/ActionFactory.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/parser/ast/TextMarkerStructureAction.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/validator/TextMarkerVarRefChecker.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/ActionFactory.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/MarkTableAction.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.g

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/resource/CSVTable.java

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g?rev=1342714r1=1342713r2=1342714view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g
 Fri May 25 16:26:54 2012
@@ -1197,19 +1197,30 @@ actionCreate returns [TextMarkerAction a
 
 actionMarkTable returns [TextMarkerAction action = null]
 @init {
-List left = new ArrayList();
-List right = new ArrayList();
+ListExpression left = new ArrayListExpression();
+ListExpression right = new ArrayListExpression();
 }
 :
 name = MARKTABLE LPAREN 
 structure = typeExpression COMMA 
 index = numberExpression COMMA
 table = wordTableExpression 
-(COMMA 
-fname = stringExpression ASSIGN_EQUAL obj1 = numberExpression 
{left.add(fname); right.add(obj1);} 
-(COMMA fname = stringExpression ASSIGN_EQUAL obj1 = numberExpression 
{left.add(fname);right.add(obj1);})*
-)? 
-{action = ActionFactory.createStructureAction(name, structure, index, 
table, left, right);}
+   
+(COMMA key=stringExpression ASSIGN_EQUAL value = numberExpression)=(COMMA 
key = stringExpression {left.add(key);} ASSIGN_EQUAL value = 
numberExpression{right.add(value);} )+
+(COMMA ignoreCase = booleanExpression)=(COMMA ignoreCase = 
booleanExpression 
+COMMA ignoreLength = numberExpression 
+COMMA ignoreChar = stringExpression
+COMMA maxIgnoreChar = numberExpression)?
+
+{
+ListExpression args = new ArrayListExpression();
+args.add(index);
+args.add(table);
+   args.add(ignoreCase);
+   args.add(ignoreLength);
+   args.add(ignoreChar);
+   args.add(maxIgnoreChar);
+action = ActionFactory.createStructureAction(name, args, left, right, 
structure);}
 RPAREN
 ;
 
@@ -1539,14 +1550,14 @@ ListExpression right = new ArrayListE
 //TODO cost parameter
 
 {
-List args = new ArrayList();
+ListExpression args = new ArrayListExpression();
args.add(ignoreCase);
args.add(ignoreLength);
args.add(edit);
args.add(distance);
args.add(ignoreChar);
 
-action = ActionFactory.createStructureAction(name, list, args, left, 
right);}
+action = ActionFactory.createStructureAction(name, args, left, right, 
list);}
 RPAREN
 ;   
 




svn commit: r1342714 [3/5] - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/ uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/

2012-05-25 Thread pkluegl
Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/formatter/TextMarkerFormattedPrinter.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/formatter/TextMarkerFormattedPrinter.java?rev=1342714r1=1342713r2=1342714view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/formatter/TextMarkerFormattedPrinter.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/formatter/TextMarkerFormattedPrinter.java
 Fri May 25 16:26:54 2012
@@ -452,11 +452,13 @@ public class TextMarkerFormattedPrinter 
   private void printStructureAction(TextMarkerAction a) {
 TextMarkerStructureAction tmca = (TextMarkerStructureAction) a;
 // structure
-append(tmca.getStructure());
+if (tmca.getStructure() != null) {
+  append(tmca.getStructure());
+}
 append(COMMA);
 append( );
 // number expressions
-ListExpression indices = tmca.getIndices();
+ListExpression indices = tmca.getExpressions();
 if (indices != null) {
   traverseAstNodes(indices);
 }
@@ -515,12 +517,13 @@ public class TextMarkerFormattedPrinter 
   append( );
 }
 // structure
-
-append(tmca.getStructure());
+if (tmca.getStructure() != null) {
+  append(tmca.getStructure());
+}
 append(COMMA);
 append( );
 // number expressions
-ListExpression indices = tmca.getIndices();
+ListExpression indices = tmca.getExpressions();
 if (indices != null) {
   traverseAstNodes(indices);
 }

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/parser/ast/ActionFactory.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/parser/ast/ActionFactory.java?rev=1342714r1=1342713r2=1342714view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/parser/ast/ActionFactory.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/parser/ast/ActionFactory.java
 Fri May 25 16:26:54 2012
@@ -91,32 +91,12 @@ public class ActionFactory extends Abstr
   }
 
   public static TextMarkerAction createStructureAction(Token type, Expression 
structure,
-  List indexes, ListExpression left, ListExpression right) {
-int bounds[] = getBounds(type);
-int nameStart = bounds[0];
-int nameEnd = bounds[1];
-ListExpression numExprs = new ArrayListExpression();
-MapExpression, Expression assignments = new LinkedHashMapExpression, 
Expression();
-filterNullObjsAndSetBounds(indexes, bounds, numExprs);
-if (left != null  right != null) {
-  IteratorExpression keysIt = left.iterator();
-  IteratorExpression valsIt = right.iterator();
-  Expression val = null;
-  while (keysIt.hasNext()) {
-Expression key = keysIt.next();
-if (!valsIt.hasNext()) {
-  break;
-}
-val = valsIt.next();
-assignments.put(key, val);
-  }
-  if (val != null) {
-bounds[1] = val.sourceEnd();
-  }
+  ListExpression indexes, ListExpression left, ListExpression 
right) {
+ListExpression args = new ArrayListExpression();
+if (indexes != null) {
+  args.addAll(indexes);
 }
-return new TextMarkerStructureAction(bounds[0], bounds[1], numExprs,
-ExpressionConstants.USER_EXPRESSION_START + type.getType(), 
type.getText(), nameStart,
-nameEnd, assignments, structure);
+return createStructureAction(type, args, left, right, structure);
   }
 
   /**
@@ -168,6 +148,7 @@ public class ActionFactory extends Abstr
 ListExpression indexes = new ArrayListExpression();
 indexes.add(table);
 indexes.add(index);
+indexes.add(structure);
 filterNullObjsAndSetBounds(indexes, bounds, numExprs);
 if (left != null  right != null) {
   IteratorExpression keysIt = left.iterator();
@@ -218,4 +199,34 @@ public class ActionFactory extends Abstr
 }
 return createAction(name, exprs);
   }
+
+  public static TextMarkerAction createStructureAction(Token name, 
ListExpression args,
+  ListExpression left, ListExpression right, Expression structure) 
{
+int bounds[] = getBounds(name);
+int nameStart = bounds[0];
+int nameEnd = bounds[1];
+ListExpression numExprs = new ArrayListExpression();
+MapExpression, Expression assignments = new LinkedHashMapExpression, 
Expression();
+filterNullObjsAndSetBounds(args, bounds, numExprs);
+if (left != null  right != 

svn commit: r1343865 [1/2] - /uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/tools.textmarker.xml

2012-05-29 Thread pkluegl
Author: pkluegl
Date: Tue May 29 17:30:10 2012
New Revision: 1343865

URL: http://svn.apache.org/viewvc?rev=1343865view=rev
Log:
UIMA-2285
fixed typos for testing svn access

Modified:

uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/tools.textmarker.xml



svn commit: r1343866 - /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/query/ui/QueryComposite.java

2012-05-29 Thread pkluegl
Author: pkluegl
Date: Tue May 29 17:32:14 2012
New Revision: 1343866

URL: http://svn.apache.org/viewvc?rev=1343866view=rev
Log:
UIMA-2413
fixed id, renamed method 

Modified:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/query/ui/QueryComposite.java

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/query/ui/QueryComposite.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/query/ui/QueryComposite.java?rev=1343866r1=1343865r2=1343866view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/query/ui/QueryComposite.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/query/ui/QueryComposite.java
 Tue May 29 17:32:14 2012
@@ -296,7 +296,7 @@ public class QueryComposite extends org.
   if (element instanceof QueryResult) {
 QueryResult data = (QueryResult) element;
 if (data.getFile() != null) {
-  openInCEV(data.getFile());
+  openInCasEditor(data.getFile());
 }
   }
 }
@@ -381,7 +381,7 @@ public class QueryComposite extends org.
 }
   }
 
-  protected void openInCEV(File file) {
+  protected void openInCasEditor(File file) {
 if (file == null) {
   return;
 }
@@ -389,7 +389,7 @@ public class QueryComposite extends org.
 try {
   IWorkbenchPage page = 
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
   IFile ifile = getIFile(absolutePath);
-  page.openEditor(new FileEditorInput(ifile), 
org.apache.uima.cev.editor.CEVViewer);
+  page.openEditor(new FileEditorInput(ifile), 
org.apache.uima.caseditor.editor);
 } catch (PartInitException e) {
   e.printStackTrace();
 }




svn commit: r1357555 - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-addons/ uimaj-ep-textmarker-addons/.settings/ uimaj-ep-textmarker-caseditor/ uimaj-ep-textmarker-caseditor/.settings/ uima

2012-07-05 Thread pkluegl
Author: pkluegl
Date: Thu Jul  5 11:18:33 2012
New Revision: 1357555

URL: http://svn.apache.org/viewvc?rev=1357555view=rev
Log:
UIMA-2424
cleanup: removed .settings folder, target folder, .classpath, .project

Removed:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/.classpath
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/.project
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/.settings/
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/.classpath
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/.project
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/.settings/
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/.classpath
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/.project
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/.settings/
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/target/
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/.classpath
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/.project
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/.settings/
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/target/
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-textruler/.classpath
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-textruler/.project
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-textruler/.settings/
uima/sandbox/trunk/TextMarker/uimaj-textmarker-eclipse-feature/.classpath
uima/sandbox/trunk/TextMarker/uimaj-textmarker-eclipse-feature/.project
uima/sandbox/trunk/TextMarker/uimaj-textmarker-eclipse-feature/.settings/
uima/sandbox/trunk/TextMarker/uimaj-textmarker-eclipse-update-site/.project

uima/sandbox/trunk/TextMarker/uimaj-textmarker-eclipse-update-site/.settings/
uima/sandbox/trunk/TextMarker/uimaj-textmarker/.classpath
uima/sandbox/trunk/TextMarker/uimaj-textmarker/.project



svn commit: r1357758 - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-addons/pom.xml uimaj-ep-textmarker-caseditor/pom.xml uimaj-ep-textmarker-ide/pom.xml uimaj-ep-textmarker-textruler/pom.xml

2012-07-05 Thread pkluegl
Author: pkluegl
Date: Thu Jul  5 17:37:25 2012
New Revision: 1357758

URL: http://svn.apache.org/viewvc?rev=1357758view=rev
Log:
UIMA-2424
- changed dependencies in pom to work with eclipse:to-maven (with stripped 
qualifier)

Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/pom.xml
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/pom.xml
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/pom.xml
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-textruler/pom.xml

Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/pom.xml?rev=1357758r1=1357757r2=1357758view=diff
==
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/pom.xml (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/pom.xml Thu Jul  5 
17:37:25 2012
@@ -28,6 +28,11 @@
/dependency
dependency
groupIdorg.apache.uima/groupId
+   artifactIduimaj-ep-cas-editor-ide/artifactId
+   version${project.parent.version}/version
+   /dependency
+   dependency
+   groupIdorg.apache.uima/groupId
artifactIduimaj-ep-textmarker-engine/artifactId
version${project.parent.version}/version
/dependency
@@ -38,20 +43,20 @@
/dependency
dependency
groupIdorg.eclipse.equinox/groupId
-   artifactIdorg.eclipse.equinox.app/artifactId
+   artifactIdapp/artifactId
version[1.1.0,2.0.0)/version
scopeprovided/scope
/dependency
dependency
-   groupIdorg.eclipse.ui/groupId
-   artifactIdorg.eclipse.ui/artifactId
+   groupIdorg.eclipse/groupId
+   artifactIdui/artifactId
version[3.3.0,4.0.0)/version
scopeprovided/scope
/dependency
dependency
-   groupIdorg.eclipse.swt/groupId
-   
artifactIdorg.eclipse.swt.win32.win32.x86_64/artifactId
-   version[3.3.0,4.0.0)/version
+   groupIdorg.eclipse.swt.win32.win32/groupId
+   artifactIdx86/artifactId
+   version[3.2.0,4.0.0)/version
scopeprovided/scope
/dependency
dependency
@@ -60,6 +65,72 @@
version[3.3.0,4.0.0)/version
scopeprovided/scope
/dependency
+   dependency
+   groupIdorg.eclipse.core/groupId
+   artifactIdresources/artifactId
+   version[3.3.0,4.0.0)/version
+   scopeprovided/scope
+   /dependency
+   dependency
+   groupIdorg.eclipse.ui.workbench/groupId
+   artifactIdtexteditor/artifactId
+   version[3.3.0,4.0.0)/version
+   scopeprovided/scope
+   /dependency
+   dependency
+   groupIdorg.eclipse.core/groupId
+   artifactIdjobs/artifactId
+   version[3.3.0,4.0.0)/version
+   scopeprovided/scope
+   /dependency
+   dependency
+   groupIdorg.eclipse.dltk/groupId
+   artifactIdcore/artifactId
+   version[3.0.0,4.0.0)/version
+   scopeprovided/scope
+   /dependency
+   dependency
+   groupIdorg.eclipse.dltk/groupId
+   artifactIdui/artifactId
+   version[3.0.0,4.0.0)/version
+   scopeprovided/scope
+   /dependency
+   dependency
+   groupIdorg.eclipse.dltk/groupId
+   artifactIddebug/artifactId
+   version[3.0.0,4.0.0)/version
+   scopeprovided/scope
+   /dependency
+   dependency
+   groupIdorg.eclipse.emf/groupId
+   artifactIdecore/artifactId
+   version[2.7.0,3.0.0)/version
+   scopeprovided/scope
+   /dependency
+   dependency
+   groupIdorg.eclipse.emf.ecore/groupId
+   artifactIdxmi/artifactId
+   version[2.7.0,3.0.0)/version
+   scopeprovided/scope
+   /dependency

svn commit: r1357769 - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-addons/META-INF/ uimaj-ep-textmarker-caseditor/META-INF/ uimaj-ep-textmarker-ide/META-INF/ uimaj-ep-textmarker-textruler/M

2012-07-05 Thread pkluegl
Author: pkluegl
Date: Thu Jul  5 17:52:04 2012
New Revision: 1357769

URL: http://svn.apache.org/viewvc?rev=1357769view=rev
Log:
UIMA-2424
cleanup: removed manifests

Removed:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/META-INF/
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/META-INF/
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/META-INF/
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-textruler/META-INF/



svn commit: r1358135 - in /uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker: engine/TextMarkerEngine.java extensions/DefaultEngineLoader.java extensions/TextMark

2012-07-06 Thread pkluegl
Author: pkluegl
Date: Fri Jul  6 11:39:31 2012
New Revision: 1358135

URL: http://svn.apache.org/viewvc?rev=1358135view=rev
Log:
UIMA-2415
added (adapted) changes provided in attached files: loading from input streams

Modified:

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/engine/TextMarkerEngine.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/extensions/DefaultEngineLoader.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/extensions/TextMarkerEngineLoader.java

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/engine/TextMarkerEngine.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/engine/TextMarkerEngine.java?rev=1358135r1=1358134r2=1358135view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/engine/TextMarkerEngine.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/engine/TextMarkerEngine.java
 Fri Jul  6 11:39:31 2012
@@ -20,7 +20,9 @@
 package org.apache.uima.textmarker.engine;
 
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -30,6 +32,7 @@ import java.util.Map;
 import java.util.Set;
 
 import org.antlr.runtime.ANTLRFileStream;
+import org.antlr.runtime.ANTLRInputStream;
 import org.antlr.runtime.CharStream;
 import org.antlr.runtime.CommonTokenStream;
 import org.antlr.runtime.RecognitionException;
@@ -116,7 +119,7 @@ public class TextMarkerEngine extends JC
   public static final String RELOAD_SCRIPT = reloadScript;
 
   public static final String LOW_MEMORY_PROFILE = lowMemoryProfile;
-  
+
   private String[] seeders;
 
   private Boolean createDebugInfo;
@@ -170,7 +173,7 @@ public class TextMarkerEngine extends JC
   private Boolean lowMemoryProfile;
 
   private boolean initialized = false;
-  
+
   private ListType seedTypes;
 
   @Override
@@ -202,7 +205,7 @@ public class TextMarkerEngine extends JC
 dynamicAnchoring = (Boolean) 
aContext.getConfigParameterValue(DYNAMIC_ANCHORING);
 reloadScript = (Boolean) aContext.getConfigParameterValue(RELOAD_SCRIPT);
 lowMemoryProfile = (Boolean) 
aContext.getConfigParameterValue(LOW_MEMORY_PROFILE);
-
+
 removeBasics = removeBasics == null ? false : removeBasics;
 createDebugInfo = createDebugInfo == null ? false : createDebugInfo;
 createDebugOnlyFor = createDebugOnlyFor == null ? new String[0] : 
createDebugOnlyFor;
@@ -215,7 +218,7 @@ public class TextMarkerEngine extends JC
 dynamicAnchoring = dynamicAnchoring == null ? false : dynamicAnchoring;
 reloadScript = reloadScript == null ? false : reloadScript;
 lowMemoryProfile = lowMemoryProfile == null ? false : lowMemoryProfile;
-
+
 this.context = aContext;
 
 factory = new TextMarkerExternalFactory();
@@ -385,7 +388,7 @@ public class TextMarkerEngine extends JC
 Type basicType = typeSystem.getType(BASIC_TYPE);
 seedTypes = seedAnnotations(cas);
 TextMarkerStream stream = new TextMarkerStream(cas, basicType, filter, 
lowMemoryProfile);
-
+
 stream.initalizeBasics();
 return stream;
   }
@@ -418,26 +421,75 @@ public class TextMarkerEngine extends JC
   }
 
   private void initializeScript() throws AnalysisEngineProcessException {
-String scriptLocation = locate(mainScript, scriptPaths, .tm);
-if (scriptLocation == null) {
-  // if someone loads an empty analysis engine and then reconfigures it
+if(mainScript == null) {
   return;
 }
-try {
-  script = loadScript(scriptLocation, null);
-} catch (Exception e) {
-  throw new AnalysisEngineProcessException(e);
+String scriptLocation = locate(mainScript, scriptPaths, .tm);
+if (scriptLocation == null) {
+  try {
+String mainScriptPath = mainScript.replaceAll(\\., /) + .tm;
+script = loadScriptIS(mainScriptPath, null);
+  } catch (IOException e) {
+throw new AnalysisEngineProcessException(new 
FileNotFoundException(Script [ + mainScript
++ ] cannot be found at [ + collectionToString(scriptPaths)
++ ] with extension .tm));
+  } catch (RecognitionException e) {
+throw new AnalysisEngineProcessException(new 
FileNotFoundException(Script [ + mainScript
++ ] cannot be found at [ + collectionToString(scriptPaths)
++ ] with extension .tm));
+  }
+} else {
+  try {
+script = loadScript(scriptLocation, null);
+  } catch (Exception e) {
+throw new AnalysisEngineProcessException(e

svn commit: r1358165 - in /uima/sandbox/trunk/TextMarker/uimaj-textmarker/src: main/java/org/apache/uima/textmarker/condition/ test/java/org/apache/uima/textmarker/ test/java/org/apache/uima/textmarke

2012-07-06 Thread pkluegl
Author: pkluegl
Date: Fri Jul  6 12:37:48 2012
New Revision: 1358165

URL: http://svn.apache.org/viewvc?rev=1358165view=rev
Log:
UIMA-2429
- fixed and added test

Added:

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/condition/

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/condition/CurrentCountTest.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/resources/org/apache/uima/textmarker/condition/

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/resources/org/apache/uima/textmarker/condition/CurrentCountTest.tm

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/resources/org/apache/uima/textmarker/condition/CurrentCountTest.txt
Modified:

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/condition/CurrentCountCondition.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/AllTests.java

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/condition/CurrentCountCondition.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/condition/CurrentCountCondition.java?rev=1358165r1=1358164r2=1358165view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/condition/CurrentCountCondition.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/condition/CurrentCountCondition.java
 Fri Jul  6 12:37:48 2012
@@ -49,11 +49,15 @@ public class CurrentCountCondition exten
   public EvaluatedCondition eval(AnnotationFS annotation, RuleElement element,
   TextMarkerStream stream, InferenceCrowd crowd) {
 int count = 0;
-Iterator? it = 
stream.getJCas().getAnnotationIndex(type.getType(element.getParent()))
+IteratorAnnotationFS it = 
stream.getCas().getAnnotationIndex(type.getType(element.getParent()))
 .iterator();
 while (it.hasNext()) {
-  it.next();
-  count++;
+  AnnotationFS next = it.next();
+  if(next.getBegin()  annotation.getBegin()) {
+count++;
+  } else {
+break;
+  }
 }
 if (var != null) {
   element.getParent().getEnvironment().setVariableValue(var, count);

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/AllTests.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/AllTests.java?rev=1358165r1=1358164r2=1358165view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/AllTests.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/AllTests.java
 Fri Jul  6 12:37:48 2012
@@ -1,6 +1,7 @@
 package org.apache.uima.textmarker;
 
 import org.apache.uima.textmarker.action.PartOfTest;
+import org.apache.uima.textmarker.condition.CurrentCountTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
@@ -8,7 +9,7 @@ import org.junit.runners.Suite.SuiteClas
 @RunWith(Suite.class)
 @SuiteClasses({ DynamicAnchoringTest.class, DynamicAnchoringTest2.class, 
FilteringTest.class,
 QuantifierTest1.class, QuantifierTest2.class, RuleInferenceTest.class,
-RuleInferenceTest2.class, RuleInferenceTest3.class, LongGreedyTest.class, 
PartOfTest.class })
+RuleInferenceTest2.class, RuleInferenceTest3.class, LongGreedyTest.class, 
PartOfTest.class, CurrentCountTest.class })
 public class AllTests {
 
 }

Added: 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/condition/CurrentCountTest.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/condition/CurrentCountTest.java?rev=1358165view=auto
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/condition/CurrentCountTest.java
 (added)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/condition/CurrentCountTest.java
 Fri Jul  6 12:37:48 2012
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License.  You may obtain a copy

svn commit: r1359109 - in /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide: ./ src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/ src/main/java/org/apache/uima/textmarker/ide/core/codea

2012-07-09 Thread pkluegl
Author: pkluegl
Date: Mon Jul  9 12:30:22 2012
New Revision: 1359109

URL: http://svn.apache.org/viewvc?rev=1359109view=rev
Log:
UIMA-2428
- added dummy ast elements for context identification
- added checker for condition and action names
- added parentheses when completing conditions and actions

Added:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.g

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.tokens

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.tokens
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/   (props changed)

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/codeassist/TextMarkerCompletionEngine.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/codeassist/TextMarkerReferenceVisitor.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/formatter/TextMarkerFormatter.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/parser/ast/ActionFactory.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/parser/ast/ConditionFactory.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/parser/ast/ExpressionFactory.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/validator/TextMarkerCheckerProblemFactory.java

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/validator/TextMarkerVarRefChecker.java

Propchange: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/
--
--- svn:ignore (added)
+++ svn:ignore Mon Jul  9 12:30:22 2012
@@ -0,0 +1,5 @@
+.settings
+target
+.classpath
+.project
+META-INF

Added: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.g
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.g?rev=1359109view=auto
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.g
 (added)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.g
 Mon Jul  9 12:30:22 2012
@@ -0,0 +1,519 @@
+lexer grammar TextMarkerLexer;
+options {
+   language = Java;
+}
+
+
+tokens {
+   DocComment;
+   Annotation;
+   ListIdentifier;
+}
+
+@lexer::header {
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+*/
+
+   package org.apache.uima.textmarker.ide.core.parser;
+}
+
+@lexer::members {
+   public int implicitLineJoiningLevel = 0;
+   public int startPos=-1;
+   public void emitErrorMessage(String msg) {
+   }
+}
+
+
+TRIE
+   :   'TRIE'
+   ;
+
+CONTAINS
+   :   'CONTAINS'
+   ;
+
+DECLARE
+   :   'DECLARE'
+   ;
+
+WORDLIST
+   :   'WORDLIST'
+   ;
+
+WORDTABLE
+   :   'WORDTABLE'
+   ;
+
+AND
+   :   'AND'
+   ;
+
+CONTEXTCOUNT
+   :   'CONTEXTCOUNT'
+   ;
+
+COUNT
+   :   'COUNT'
+   ;
+
+TOTALCOUNT
+   :   'TOTALCOUNT'
+   ;
+
+CURRENTCOUNT
+   :   'CURRENTCOUNT'
+   ;
+
+INLIST
+   :   'INLIST'
+   ;
+
+
+LAST
+   :   'LAST'
+   ;
+
+MOFN
+   :   'MOFN'
+   ;
+
+NEAR
+   :   'NEAR

svn commit: r1359133 - in /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons: ./ src/main/java/org/apache/uima/textmarker/utils/apply/AbstractApplyScriptHandlerJob.java

2012-07-09 Thread pkluegl
Author: pkluegl
Date: Mon Jul  9 13:04:49 2012
New Revision: 1359133

URL: http://svn.apache.org/viewvc?rev=1359133view=rev
Log:
UIMA-2359
- replaced method for loading text files

Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/   (props changed)

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/utils/apply/AbstractApplyScriptHandlerJob.java

Propchange: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/
--
--- svn:ignore (added)
+++ svn:ignore Mon Jul  9 13:04:49 2012
@@ -0,0 +1,4 @@
+.settings
+.classpath
+.project
+META-INF

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/utils/apply/AbstractApplyScriptHandlerJob.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/utils/apply/AbstractApplyScriptHandlerJob.java?rev=1359133r1=1359132r2=1359133view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/utils/apply/AbstractApplyScriptHandlerJob.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/utils/apply/AbstractApplyScriptHandlerJob.java
 Mon Jul  9 13:04:49 2012
@@ -37,6 +37,7 @@ import org.apache.uima.resource.Resource
 import org.apache.uima.textmarker.engine.TextMarkerEngine;
 import org.apache.uima.textmarker.ide.TextMarkerIdePlugin;
 import org.apache.uima.textmarker.ide.core.builder.TextMarkerProjectUtils;
+import org.apache.uima.util.FileUtils;
 import org.apache.uima.util.XMLInputSource;
 import org.apache.uima.util.XMLSerializer;
 import org.eclipse.core.commands.ExecutionEvent;
@@ -225,7 +226,7 @@ public abstract class AbstractApplyScrip
 
   private static String getText(String each) {
 try {
-  return org.apache.uima.pear.util.FileUtil.loadTextFile(new File(each), 
UTF-8);
+  return FileUtils.file2String(new File(each), UTF-8);
 } catch (IOException e) {
   DLTKCore.error(e.getMessage(), e);
 }




svn commit: r1359228 - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-caseditor/ uimaj-ep-textmarker-engine/ uimaj-ep-textmarker-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/

2012-07-09 Thread pkluegl
Author: pkluegl
Date: Mon Jul  9 15:45:31 2012
New Revision: 1359228

URL: http://svn.apache.org/viewvc?rev=1359228view=rev
Log:
UIMA-2331
- enabled matching on string literals, also for disjunctive expressions

Added:

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/antlr3/org/apache/uima/textmarker/parser/TextMarkerLexer.tokens

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/rule/TextMarkerDisjunctiveMatcher.java
  - copied, changed from r1357559, 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/rule/TextMarkerDisjunctiveTypeMatcher.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/LiteralStringMatchTest.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/resources/org/apache/uima/textmarker/LiteralStringMatchTest.tm

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/resources/org/apache/uima/textmarker/LiteralStringMatchTest.txt
Removed:

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/rule/TextMarkerDisjunctiveTypeMatcher.java
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/   (props 
changed)
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/   (props changed)

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/formatter/TextMarkerFormatter.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-textruler/   (props 
changed)

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/antlr3/org/apache/uima/textmarker/parser/TextMarkerParser.g

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/TextMarkerScriptFactory.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/TextMarkerStream.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/expression/string/SimpleStringExpression.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/rule/TextMarkerLiteralMatcher.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/verbalize/ScriptVerbalizer.java

Propchange: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/
--
--- svn:ignore (added)
+++ svn:ignore Mon Jul  9 15:45:31 2012
@@ -0,0 +1,4 @@
+.settings
+.classpath
+.project
+META-INF

Propchange: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/
--
--- svn:ignore (added)
+++ svn:ignore Mon Jul  9 15:45:31 2012
@@ -0,0 +1,5 @@
+.settings
+target
+.classpath
+.project
+META-INF

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g?rev=1359228r1=1359227r2=1359228view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g
 Mon Jul  9 15:45:31 2012
@@ -592,9 +592,14 @@ ruleElementComposed returns [ComposedRul
:
LPAREN
 
-   ((ruleElementType VBAR)= re1 = ruleElementType {disjunctive = true; 
res = new ArrayListExpression(); res.add(re1);} 
-   VBAR re2 = ruleElementType {res.add(re2);}
-   (VBAR re3 = ruleElementType {res.add(re3);})*
+   (((ruleElementType | ruleElementLiteral) VBAR)=  (re11 
=ruleElementType| re12 = ruleElementLiteral) 
+   {disjunctive = true; res = new ArrayListExpression(); if(re11!=null) 
res.add(re11);if(re12!=null) res.add(re12);} 
+   VBAR (re21 = ruleElementType| re22 = ruleElementLiteral) 
+   { if(re21!=null) res.add(re21);if(re22!=null) res.add(re22);}
+   (
+   VBAR (re31 = ruleElementType| re32 = ruleElementLiteral) 
+   { if(re31!=null) res.add(re31);if(re32!=null) res.add(re32);}
+   )*
 |(ruleElements)=res = ruleElements)

RPAREN q = quantifierPart? (LCURLY c = conditions? (THEN a = actions)? 
RCURLY)?

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/formatter/TextMarkerFormatter.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org

svn commit: r1359776 - in /uima/sandbox/trunk/TextMarker: uima-docbook-textmarker/.project uimaj-textmarker-eclipse-feature/target/ uimaj-textmarker-eclipse-update-site/target/

2012-07-10 Thread pkluegl
Author: pkluegl
Date: Tue Jul 10 16:49:26 2012
New Revision: 1359776

URL: http://svn.apache.org/viewvc?rev=1359776view=rev
Log:
UIMA-2424
cleanup: removed target folder for feature and update site, removed .project 
file in docbook project

Removed:
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/.project
uima/sandbox/trunk/TextMarker/uimaj-textmarker-eclipse-feature/target/
uima/sandbox/trunk/TextMarker/uimaj-textmarker-eclipse-update-site/target/



svn commit: r1359779 - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-textruler/ uimaj-textmarker-eclipse-feature/ uimaj-textmarker-eclipse-feature/src/main/resources/ uimaj-textmarker-eclipse

2012-07-10 Thread pkluegl
Author: pkluegl
Date: Tue Jul 10 16:54:03 2012
New Revision: 1359779

URL: http://svn.apache.org/viewvc?rev=1359779view=rev
Log:
UIMA-2424
- prepared update site for local snapshot releases
- fixed description in textruler project
- removed textruler plugin temporarily from feature and update site

Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-textruler/pom.xml
uima/sandbox/trunk/TextMarker/uimaj-textmarker-eclipse-feature/feature.xml

uima/sandbox/trunk/TextMarker/uimaj-textmarker-eclipse-feature/src/main/resources/feature.xml
uima/sandbox/trunk/TextMarker/uimaj-textmarker-eclipse-update-site/pom.xml
uima/sandbox/trunk/TextMarker/uimaj-textmarker-eclipse-update-site/site.xml

Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-textruler/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-textruler/pom.xml?rev=1359779r1=1359778r2=1359779view=diff
==
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-textruler/pom.xml 
(original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-textruler/pom.xml Tue Jul 
10 16:54:03 2012
@@ -14,18 +14,14 @@
/properties
nameApache UIMA Eclipse: ${project.artifactId}/name
url${uimaWebsiteUrl}/url
-   descriptionProvides additional views for the CAS Editor/description
-   scm
-   
urlhttp://svn.apache.org/viewvc/uima/sandbox/trunk/uimaj-ep-textmarker-textruler/url
-   
connectionscm:svn:http://svn.apache.org/repos/asf/uima/sandbox/trunk/uimaj-ep-textmarker-textruler/connection
-   
developerConnectionscm:svn:https://svn.apache.org/repos/asf/uima/sandbox/trunk/uimaj-ep-textmarker-textruler/developerConnection
-   /scm
+   descriptionProvides the TextRuler framework with implementations of 
rule learners/description
dependencies
-   dependency
-   groupIdorg.apache.uima/groupId
-   artifactIduimaj-ep-textmarker-engine/artifactId
-   version${project.parent.version}/version
-   /dependency
+dependency
+  groupIdorg.apache.uima/groupId
+  artifactIduimaj-textmarker/artifactId
+  version${project.parent.version}/version
+  scopecompile/scope
+/dependency
dependency
groupIdorg.apache.uima/groupId
artifactIduimaj-ep-textmarker-ide/artifactId
@@ -59,13 +55,13 @@
 dependency
   groupIdorg.eclipse.dltk/groupId
   artifactIdcore/artifactId
-  version[3.0.0,4.0.0)/version
+  version[3.0.1,4.0.0)/version
   scopeprovided/scope
 /dependency
 dependency
   groupIdorg.eclipse.dltk/groupId
   artifactIdui/artifactId
-  version[3.0.0,4.0.0)/version
+  version[3.0.1,4.0.0)/version
   scopeprovided/scope
 /dependency
 dependency
@@ -101,7 +97,7 @@
 dependency
   groupIdorg.eclipse.dltk/groupId
   artifactIddebug/artifactId
-  version[3.0.0,4.0.0)/version
+  version[3.0.1,4.0.0)/version
   scopeprovided/scope
 /dependency
 dependency
@@ -129,6 +125,11 @@
   scopeprovided/scope
 /dependency
/dependencies
+scm
+
urlhttp://svn.apache.org/viewvc/uima/sandbox/trunk/uimaj-ep-textmarker-textruler/url
+
connectionscm:svn:http://svn.apache.org/repos/asf/uima/sandbox/trunk/uimaj-ep-textmarker-textruler/connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/uima/sandbox/trunk/uimaj-ep-textmarker-textruler/developerConnection
+  /scm
build
!-- don't use artifactId as first part of finalName, follow 
instead the 
eclipse convention --
@@ -156,7 +157,6 @@
configuration
excludes

excluderelease.properties/exclude !-- release generated artifact --
-   
excludesrc/test/resources/ManualTests/*/exclude !-- test data --

excludemarker-file-identifying-*/exclude
/excludes
/configuration

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-textmarker-eclipse-feature/feature.xml
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker-eclipse-feature/feature.xml?rev=1359779r1=1359778r2=1359779view=diff
==
--- uima/sandbox/trunk/TextMarker/uimaj-textmarker-eclipse-feature/feature.xml 
(original)
+++ uima/sandbox/trunk/TextMarker/uimaj-textmarker-eclipse-feature/feature.xml 
Tue

svn commit: r1360136 - /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/plugin.xml

2012-07-11 Thread pkluegl
Author: pkluegl
Date: Wed Jul 11 12:11:51 2012
New Revision: 1360136

URL: http://svn.apache.org/viewvc?rev=1360136view=rev
Log:
UIMA-2345
- show TextMarker popup only in Script Explorer
- test on active editor for the popups for applying TextMarker script on 
resources

Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/plugin.xml

Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/plugin.xml
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/plugin.xml?rev=1360136r1=1360135r2=1360136view=diff
==
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/plugin.xml 
(original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/plugin.xml Wed Jul 
11 12:11:51 2012
@@ -311,7 +311,7 @@ under the License.
/extension   extension
  point=org.eclipse.ui.menus
   menuContribution
-locationURI=popup:org.eclipse.ui.popup.any
+
locationURI=popup:org.eclipse.dltk.ui.ScriptExplorer?after=additions
  menu
icon=icons/tm_obj.png
id=org.apache.uima.textmarker.utils.popup.submenu
@@ -331,6 +331,14 @@ under the License.
tooltip=Apply current TextMarker script on folder and keep 
basics
 visibleWhen
   checkEnabled=true
+   and
+  with
+variable=activeEditorId
+ equals
+   
value=org.apache.uima.textmarker.ide.ui.editor.TextMarkerEditor
+ /equals
+  /with
+   /and
 /visibleWhen
  /command
   /menuContribution
@@ -347,6 +355,14 @@ under the License.
tooltip=Apply current TextMarker script on folder
 visibleWhen
   checkEnabled=true
+   and
+  with
+variable=activeEditorId
+ equals
+   
value=org.apache.uima.textmarker.ide.ui.editor.TextMarkerEditor
+ /equals
+  /with
+   /and
 /visibleWhen
  /command
   /menuContribution
@@ -363,6 +379,14 @@ under the License.
tooltip=Apply current TextMarker script on folder
 visibleWhen
   checkEnabled=true
+   and
+  with
+variable=activeEditorId
+ equals
+   
value=org.apache.uima.textmarker.ide.ui.editor.TextMarkerEditor
+ /equals
+  /with
+   /and
 /visibleWhen
  /command
   /menuContribution
@@ -437,17 +461,13 @@ under the License.
   /definition
   definition
 id=org.apache.uima.textmarker.utils.apply.script.definition
- with
-   variable=selection
-and
-   with
- variable=activeEditorId
-  equals
-
value=org.apache.uima.textmarker.ide.ui.editor.TextMarkerEditor
-  /equals
-   /with
-/and
- /with
+ adapt
+   type=org.eclipse.core.resources.IResource
+test
+  property=org.eclipse.core.resources.extension
+  value=tm
+/test
+ /adapt
   /definition
/extension   extension
  point=org.eclipse.ui.bindings




svn commit: r1360586 [3/3] - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-addons/ uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/addons/ uimaj-ep-textmarker-addons/src/m

2012-07-12 Thread pkluegl
Added: 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/visitor/CreatedByVisitor.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/visitor/CreatedByVisitor.java?rev=1360586view=auto
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/visitor/CreatedByVisitor.java
 (added)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/visitor/CreatedByVisitor.java
 Thu Jul 12 08:58:05 2012
@@ -0,0 +1,74 @@
+package org.apache.uima.textmarker.visitor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.uima.cas.CAS;
+import org.apache.uima.cas.Feature;
+import org.apache.uima.cas.FeatureStructure;
+import org.apache.uima.cas.Type;
+import org.apache.uima.cas.text.AnnotationFS;
+import org.apache.uima.textmarker.ScriptApply;
+import org.apache.uima.textmarker.TextMarkerElement;
+import org.apache.uima.textmarker.TextMarkerStream;
+import org.apache.uima.textmarker.rule.RuleMatch;
+import org.apache.uima.textmarker.verbalize.TextMarkerVerbalizer;
+
+public class CreatedByVisitor implements TextMarkerInferenceVisitor {
+
+  public static final String TYPE = 
org.apache.uima.textmarker.type.DebugCreatedBy;
+
+  public static final String FEATURE_RULE = rule;
+
+  public static final String FEATURE_ANNOTATION = annotation;
+
+  public static final String FEATURE_SCRIPT = script;
+
+  public static final String FEATURE_ID = id;
+
+  private ListFeatureStructure fsList = new ArrayListFeatureStructure();
+
+  private TextMarkerVerbalizer verbalizer;
+
+  public CreatedByVisitor(TextMarkerVerbalizer verbalizer) {
+super();
+this.verbalizer = verbalizer;
+  }
+
+  public void beginVisit(TextMarkerElement element, ScriptApply result) {
+  }
+
+  public void endVisit(TextMarkerElement element, ScriptApply result) {
+  }
+
+  public void finished(TextMarkerStream stream, 
ListTextMarkerInferenceVisitor visitors) {
+for (FeatureStructure each : fsList) {
+  each.getCAS().addFsToIndexes(each);
+}
+  }
+
+  public void annotationAdded(AnnotationFS annotation, RuleMatch creator) {
+CAS cas = annotation.getCAS();
+Type t = cas.getTypeSystem().getType(TYPE);
+Feature featureRule = t.getFeatureByBaseName(FEATURE_RULE);
+Feature featureAnnotation = t.getFeatureByBaseName(FEATURE_ANNOTATION);
+Feature featureScript = t.getFeatureByBaseName(FEATURE_SCRIPT);
+Feature featureId = t.getFeatureByBaseName(FEATURE_ID);
+
+String ruleString = provided;
+String ruleScript = ;
+int ruleId = -1;
+if (creator != null) {
+  ruleString = verbalizer.verbalize(creator.getRule());
+  ruleId = creator.getRule().getId();
+  ruleScript = 
creator.getRule().getParent().getScript().getRootBlock().getNamespace();
+}
+FeatureStructure fs = cas.createFS(t);
+fs.setStringValue(featureRule, ruleString);
+fs.setFeatureValue(featureAnnotation, annotation);
+fs.setIntValue(featureId, ruleId);
+fs.setStringValue(featureScript, ruleScript);
+fsList.add(fs);
+  }
+
+}

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/visitor/DebugInfoCollectorVisitor.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/visitor/DebugInfoCollectorVisitor.java?rev=1360586r1=1360585r2=1360586view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/visitor/DebugInfoCollectorVisitor.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/visitor/DebugInfoCollectorVisitor.java
 Thu Jul 12 08:58:05 2012
@@ -25,6 +25,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Stack;
 
+import org.apache.uima.cas.text.AnnotationFS;
 import org.apache.uima.textmarker.BlockApply;
 import org.apache.uima.textmarker.ScriptApply;
 import org.apache.uima.textmarker.TextMarkerBlock;
@@ -33,6 +34,7 @@ import org.apache.uima.textmarker.TextMa
 import org.apache.uima.textmarker.TextMarkerStatement;
 import org.apache.uima.textmarker.TextMarkerStream;
 import org.apache.uima.textmarker.rule.RuleApply;
+import org.apache.uima.textmarker.rule.RuleMatch;
 import org.apache.uima.textmarker.rule.TextMarkerRule;
 import org.apache.uima.textmarker.type.DebugScriptApply;
 import org.apache.uima.textmarker.verbalize.TextMarkerVerbalizer;
@@ -184,4 +186,8 @@ public class DebugInfoCollectorVisitor i
 return null;
   }
 
+  public void annotationAdded(AnnotationFS annotation, RuleMatch creator) {
+
+  }
+
 }

Modified: 

svn commit: r1360588 - /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/ExplainPerspective.java

2012-07-12 Thread pkluegl
Author: pkluegl
Date: Thu Jul 12 09:00:19 2012
New Revision: 1360588

URL: http://svn.apache.org/viewvc?rev=1360588view=rev
Log:
UIMA-2343
- fixed wrong id in explain perspective

Modified:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/ExplainPerspective.java

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/ExplainPerspective.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/ExplainPerspective.java?rev=1360588r1=1360587r2=1360588view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/ExplainPerspective.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/ExplainPerspective.java
 Thu Jul 12 09:00:19 2012
@@ -42,7 +42,7 @@ public class ExplainPerspective implemen
 
   public static final String RULE_LIST = 
org.apache.uima.textmarker.explain.rulelist;
 
-  public static final String CREATED_BY = org.apache.uima.caseditor.browser;
+  public static final String CREATED_BY = 
org.apache.uima.textmarker.explain.createdBy;
 
   public static final String TYPE_BROWSER = 
org.apache.uima.caseditor.browser;
 




svn commit: r1363750 [2/3] - in /uima/sandbox/trunk/TextMarker/uima-docbook-textmarker: ./ src/docbook/

2012-07-20 Thread pkluegl
Added: 
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/tools.textmarker.language.xml
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/tools.textmarker.language.xml?rev=1363750view=auto
==
--- 
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/tools.textmarker.language.xml
 (added)
+++ 
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/tools.textmarker.language.xml
 Fri Jul 20 12:27:14 2012
@@ -0,0 +1,626 @@
+?xml version=1.0 encoding=UTF-8?
+!DOCTYPE chapter PUBLIC -//OASIS//DTD DocBook XML V4.4//EN
+http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd;[
+!ENTITY imgroot images/tools/tools.textmarker/ 
+!ENTITY % uimaents SYSTEM ../../target/docbook-shared/entities.ent   
+%uimaents;
+]
+!-- Licensed to the Apache Software Foundation (ASF) under one or more 
contributor 
+   license agreements. See the NOTICE file distributed with this work for 
additional 
+   information regarding copyright ownership. The ASF licenses this file 
to 
+   you under the Apache License, Version 2.0 (the License); you may not 
use 
+   this file except in compliance with the License. You may obtain a copy 
of 
+   the License at http://www.apache.org/licenses/LICENSE-2.0 Unless 
required 
+   by applicable law or agreed to in writing, software distributed under 
the 
+   License is distributed on an AS IS BASIS, WITHOUT WARRANTIES OR 
CONDITIONS 
+   OF ANY KIND, either express or implied. See the License for the 
specific 
+   language governing permissions and limitations under the License. --
+
+chapter id=ugr.tools.tm.language.language
+   titleTextMarker Language/title
+   para
+
+   /para
+
+   section id=ugr.tools.tm.language.seeding
+   titleBasic Annotations and tokens/title
+   para
+   The TextMarker system uses a JFlex lexer to initially 
create a
+   seed of
+   basic, token annotations.
+   /para
+   /section
+   section id=ugr.tools.tm.language.syntax
+   titleSyntax/title
+   para
+   Structure
+   programlisting![CDATA[
+script - packageDeclaration globalStatements 
statements
+packageDeclaration - PACKAGE DottedIdentifier ;
+globalStatments- globalStatment*   
+globalStatment - (TYPESYSTEM | SCRIPT | ENGINE) 
DottedIdentifier ;
+statements - statement*
+statement  - typeDeclaration | resourceDeclaration | 
variableDeclaration 
+  | blockDeclaration | simpleStatement
+]]/programlisting
+
+   Declarations
+   programlisting![CDATA[
+   typeDeclaration - DECLARE (AnnotationType)? 
Identifier (, Identifier )*
+   | DECLARE AnnotationType Identifier ( ( 
featureDeclaration ) )?
+   featureDeclaration - ( (AnnotationType | 
STRING | INT |
+   DOUBLE | BOOLEAN) Identifier)+
+   resourceDeclaration - (WORDLIST Identifier = 
listExpression | WORDTABLE Identifier
+   = tableExpression) ;
+   variableDeclaration - (TYPE | STRING | 
INT | DOUBLE | BOOLEAN) Identifier
+   ;
+   ]]
+   /programlisting
+   More information about Declarations.
+
+   Statements
+   programlisting![CDATA[
+blockDeclaration   - BLOCK ( Identifier ) 
ruleElementWithType { statements }
+simpleStatement- ruleElements ;
+ruleElements   - ( ruleElementWithLiteral  | 
ruleElementWithType )+
+ruleElementWithLiteral - simpleStringExpression quantifierPart? 
conditionActionPart?
+ruleElementWithType- typeExpression quantifierPart? 
conditionActionPart?
+quantifierPart - * | *? | + | +? | ? | ?? 
+  | [ numberExpression , 
numberExpression ]
+  | [ numberExpression , 
numberExpression ]?
+  
+conditionActionPart- { (condition ( , condition )*)? ( 
- (action( , action)*))? }
+condition  - ConditionName (( argument (, 
argument)* ))?
+action - ActionName (( argument (, argument)* 
))?
+]]/programlisting
+   More information about Quantifiers,
+   Conditions, Actions and Blocks.
+

svn commit: r1363750 [3/3] - in /uima/sandbox/trunk/TextMarker/uima-docbook-textmarker: ./ src/docbook/

2012-07-20 Thread pkluegl
Added: 
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/tools.textmarker.workbench.xml
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/tools.textmarker.workbench.xml?rev=1363750view=auto
==
--- 
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/tools.textmarker.workbench.xml
 (added)
+++ 
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/tools.textmarker.workbench.xml
 Fri Jul 20 12:27:14 2012
@@ -0,0 +1,1483 @@
+?xml version=1.0 encoding=UTF-8?
+!DOCTYPE chapter PUBLIC -//OASIS//DTD DocBook XML V4.4//EN
+http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd;[
+!ENTITY imgroot images/tools/tools.textmarker/ 
+!ENTITY % uimaents SYSTEM ../../target/docbook-shared/entities.ent   
+%uimaents;
+]
+!-- Licensed to the Apache Software Foundation (ASF) under one or more 
contributor 
+   license agreements. See the NOTICE file distributed with this work for 
additional 
+   information regarding copyright ownership. The ASF licenses this file 
to 
+   you under the Apache License, Version 2.0 (the License); you may not 
use 
+   this file except in compliance with the License. You may obtain a copy 
of 
+   the License at http://www.apache.org/licenses/LICENSE-2.0 Unless 
required 
+   by applicable law or agreed to in writing, software distributed under 
the 
+   License is distributed on an AS IS BASIS, WITHOUT WARRANTIES OR 
CONDITIONS 
+   OF ANY KIND, either express or implied. See the License for the 
specific 
+   language governing permissions and limitations under the License. --
+
+chapter id=ugr.tools.tm.workbench
+   titleTextMarker Workbench/title
+   para
+   /para
+
+   section id=ugr.tools.tm.install
+   titleInstallation/title
+   para
+   # Download, install and start an Eclipse 3.5 or Eclipse
+   3.6.
+   #
+   Add the Apache UIMA update site
+   (http://www.apache.org/dist/uima/eclipse-update-site/) 
and the
+   TextMarker update site
+   
(http://ki.informatik.uni-wuerzburg.de/~pkluegl/updatesite/) to the
+   available software sites in your Eclipse installation. 
This can be
+   achived in the Install New Software dialog in the 
help menu of
+   Eclipse.
+   # Eclipse 3.6: TextMarker is currently based on DLTK
+   1.0.
+   Therefore, adding the DLTK 1.0 update site
+   
(http://download.eclipse.org/technology/dltk/updates-dev/1.0/) is
+   required since the Eclipse 3.6 update site only 
supports DLTK 2.0.
+   #
+   Select Install New Software in the help menu of 
Eclipse, if not
+   done yet.
+   # Select the TextMarker update site at Work with,
+   deselect Group
+   items by category and select Contact all update
+   sites during
+   install to find required software
+   # Select the
+   TextMarker feature and continue the dialog. The CEV
+   feature is
+   already contained in the TextMarker feature. Eclipse 
will
+   automatically install the Apache UIMA (version 2.3) 
plugins and the
+   DLTK Core Framework (version 1.X) plugins.
+   # ''(OPTIONAL)'' If
+   additional HTML visualizations are desired, then
+   also install the CEV
+   HTML feature. However, you need to install the
+   XPCom and XULRunner
+   features previously, for example by using an
+   appropriate update site
+   
(http://ftp.mozilla.org/pub/mozilla.org/xulrunner/eclipse/). Please
+   refer to the [CEV installation instruction|CEVInstall] 
for details.
+   # After the successful installation, switch to the 
TextMarker
+   perspective.
+
+   You can also download the TextMarker plugins from
+   
[SourceForge.net|https://sourceforge.net/projects/textmarker/] and
+   install the plugins mentioned above manually.
+   /para
+   /section
+   section id=ugr.tools.tm.project
+   titleTextMarker Projects/title
+   para
+   Similar to Java projects in Eclipse, the TextMarker 
workbench
+   provides the possibility to create TextMarker projects

svn commit: r1366343 - in /uima/sandbox/trunk/TextMarker: uima-docbook-textmarker/ uima-docbook-textmarker/src/docbook/ uimaj-ep-textmarker-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/pars

2012-07-27 Thread pkluegl
Author: pkluegl
Date: Fri Jul 27 11:49:32 2012
New Revision: 1366343

URL: http://svn.apache.org/viewvc?rev=1366343view=rev
Log:
UIMA-2438
- added argument to regexp condition in order to evaluate given pattern on the 
variable value instead of the matched text
- extended grammars
- updated documentation

Modified:
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/   (props changed)

uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/tools.textmarker.conditions.xml

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/antlr3/org/apache/uima/textmarker/parser/TextMarkerParser.g

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/condition/ConditionFactory.java

Propchange: uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/
--
--- svn:ignore (added)
+++ svn:ignore Fri Jul 27 11:49:32 2012
@@ -0,0 +1,2 @@
+target
+.settings

Modified: 
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/tools.textmarker.conditions.xml
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/tools.textmarker.conditions.xml?rev=1366343r1=1366342r2=1366343view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/tools.textmarker.conditions.xml
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/tools.textmarker.conditions.xml
 Fri Jul 27 11:49:32 2012
@@ -726,8 +726,11 @@
titleREGEXP/title
para
The REGEXP condition is fulfilled if the given pattern 
matches on the
-   matched annotation. For more details on the syntax of 
regular
-   expressions, have a look at the
+   matched annotation. However, if a string variable is 
given as the first
+  argument, then the pattern is evaluated on the value of the variable.
+  For more details on the syntax of regular
+  expressions, have a look at
+  the
ulink

url=http://docs.oracle.com/javase/1.4.2/docs/api/java/util/regex/Pattern.html;Java
 API/ulink
. By default the REGEXP condition is case-sensitive. To 
change this
@@ -738,7 +741,7 @@
emphasis role=boldDefinition:/emphasis
/title
para
-   
programlisting![CDATA[REGEXP(StringExpression(,BooleanExpression)?)]]/programlisting
+   
programlisting![CDATA[REGEXP((StringVariable,)? 
StringExpression(,BooleanExpression)?)]]/programlisting
/para
/section
section

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g?rev=1366343r1=1366342r2=1366343view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g
 Fri Jul 27 11:49:32 2012
@@ -1060,8 +1060,8 @@ conditionPosition returns [TextMarkerCon
 ;
 conditionRegExp returns [TextMarkerCondition cond = null]
 :
-name = REGEXP LPAREN pattern = stringExpression (COMMA caseSensitive = 
booleanExpression)? 
-{cond = ConditionFactory.createCondition(name, pattern, caseSensitive);}   
+name = REGEXP LPAREN (v = variable COMMA)? pattern = stringExpression 
(COMMA caseSensitive = booleanExpression)? 
+{cond = ConditionFactory.createCondition(name, v, pattern, 
caseSensitive);}   
 RPAREN 
 ;
 

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/antlr3/org/apache/uima/textmarker/parser/TextMarkerParser.g
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/antlr3/org/apache/uima/textmarker/parser/TextMarkerParser.g?rev=1366343r1=1366342r2=1366343view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/antlr3/org/apache/uima/textmarker/parser/TextMarkerParser.g
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/antlr3/org/apache/uima/textmarker/parser/TextMarkerParser.g
 Fri

svn commit: r1366346 - /uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/AbstractStructureAction.java

2012-07-27 Thread pkluegl
Author: pkluegl
Date: Fri Jul 27 11:54:41 2012
New Revision: 1366346

URL: http://svn.apache.org/viewvc?rev=1366346view=rev
Log:
UIMA-2439
- changed order in if-statement. Second alternative was already covered by 
first one since TypeExpression implements StringExpression for automatic 
conversion

Modified:

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/AbstractStructureAction.java

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/AbstractStructureAction.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/AbstractStructureAction.java?rev=1366346r1=1366345r2=1366346view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/AbstractStructureAction.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/AbstractStructureAction.java
 Fri Jul 27 11:54:41 2012
@@ -65,10 +65,7 @@ public abstract class AbstractStructureA
   Object valueObject = map.get(shortFName);
   Type range = targetFeature.getRange();
   if (valueObject != null) {
-if (valueObject instanceof StringExpression  
range.getName().equals(UIMAConstants.TYPE_STRING)) {
-  structure.setStringValue(targetFeature,
-  ((StringExpression) 
valueObject).getStringValue(element.getParent()));
-} else if (valueObject instanceof TypeExpression
+if (valueObject instanceof TypeExpression
  range.getName().equals(UIMAConstants.TYPE_STRING)) {
   TypeExpression type = (TypeExpression) valueObject;
   ListAnnotationFS annotationsInWindow = 
stream.getAnnotationsInWindow(matchedAnnotation,
@@ -77,25 +74,30 @@ public abstract class AbstractStructureA
 AnnotationFS annotation = annotationsInWindow.get(0);
 structure.setStringValue(targetFeature, 
annotation.getCoveredText());
   }
+} else if (valueObject instanceof StringExpression
+ range.getName().equals(UIMAConstants.TYPE_STRING)) {
+  structure.setStringValue(targetFeature,
+  ((StringExpression) 
valueObject).getStringValue(element.getParent()));
+
 } else if (valueObject instanceof NumberExpression) {
-  if(range.getName().equals(UIMAConstants.TYPE_INTEGER)) {
+  if (range.getName().equals(UIMAConstants.TYPE_INTEGER)) {
 structure.setIntValue(targetFeature,
 ((NumberExpression) 
valueObject).getIntegerValue(element.getParent()));
-  } else if(range.getName().equals(UIMAConstants.TYPE_DOUBLE)) {
+  } else if (range.getName().equals(UIMAConstants.TYPE_DOUBLE)) {
 structure.setDoubleValue(targetFeature,
 ((NumberExpression) 
valueObject).getDoubleValue(element.getParent()));
-  } else if(range.getName().equals(UIMAConstants.TYPE_FLOAT)) {
+  } else if (range.getName().equals(UIMAConstants.TYPE_FLOAT)) {
 structure.setFloatValue(targetFeature,
 ((NumberExpression) 
valueObject).getFloatValue(element.getParent()));
-  } else if(range.getName().equals(UIMAConstants.TYPE_BYTE)) {
-structure.setByteValue(targetFeature, (byte)
-((NumberExpression) 
valueObject).getIntegerValue(element.getParent()));
-  } else if(range.getName().equals(UIMAConstants.TYPE_SHORT)) {
-structure.setShortValue(targetFeature, (short)
-((NumberExpression) 
valueObject).getIntegerValue(element.getParent()));
-  } else if(range.getName().equals(UIMAConstants.TYPE_LONG)) {
-structure.setLongValue(targetFeature, (long)
-((NumberExpression) 
valueObject).getIntegerValue(element.getParent()));
+  } else if (range.getName().equals(UIMAConstants.TYPE_BYTE)) {
+structure.setByteValue(targetFeature,
+(byte) ((NumberExpression) 
valueObject).getIntegerValue(element.getParent()));
+  } else if (range.getName().equals(UIMAConstants.TYPE_SHORT)) {
+structure.setShortValue(targetFeature,
+(short) ((NumberExpression) 
valueObject).getIntegerValue(element.getParent()));
+  } else if (range.getName().equals(UIMAConstants.TYPE_LONG)) {
+structure.setLongValue(targetFeature,
+(long) ((NumberExpression) 
valueObject).getIntegerValue(element.getParent()));
   }
 } else if (valueObject instanceof BooleanExpression
  range.getName().equals(UIMAConstants.TYPE_BOOLEAN)) {




svn commit: r1366364 - in /uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker: TextMarkerStream.java engine/AnnotationWriter.java rule/TextMarkerTypeMatcher.java

2012-07-27 Thread pkluegl
Author: pkluegl
Date: Fri Jul 27 12:28:37 2012
New Revision: 1366364

URL: http://svn.apache.org/viewvc?rev=1366364view=rev
Log:
no jira
- fixed imports in TextMarkerStream
- improved output generation in AnnoationWriter
- added test on null in TextMarkerTypeMatcher

Modified:

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/TextMarkerStream.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/engine/AnnotationWriter.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/rule/TextMarkerTypeMatcher.java

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/TextMarkerStream.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/TextMarkerStream.java?rev=1366364r1=1366363r2=1366364view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/TextMarkerStream.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/TextMarkerStream.java
 Fri Jul 27 12:28:37 2012
@@ -37,7 +37,6 @@ import org.apache.uima.cas.FSIterator;
 import org.apache.uima.cas.FSMatchConstraint;
 import org.apache.uima.cas.FeatureStructure;
 import org.apache.uima.cas.Type;
-import org.apache.uima.cas.TypeSystem;
 import org.apache.uima.cas.impl.FSIteratorImplBase;
 import org.apache.uima.cas.text.AnnotationFS;
 import org.apache.uima.cas.text.AnnotationIndex;
@@ -49,7 +48,6 @@ import org.apache.uima.textmarker.rule.R
 import org.apache.uima.textmarker.type.TextMarkerAnnotation;
 import org.apache.uima.textmarker.type.TextMarkerBasic;
 import org.apache.uima.textmarker.visitor.InferenceCrowd;
-import org.hamcrest.CoreMatchers;
 
 public class TextMarkerStream extends FSIteratorImplBaseAnnotationFS {
 

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/engine/AnnotationWriter.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/engine/AnnotationWriter.java?rev=1366364r1=1366363r2=1366364view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/engine/AnnotationWriter.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/engine/AnnotationWriter.java
 Fri Jul 27 12:28:37 2012
@@ -67,16 +67,14 @@ public class AnnotationWriter extends JC
 Type targetType = cas.getTypeSystem().getType(type);
 FSIteratorAnnotationFS iterator = 
cas.getAnnotationIndex(targetType).iterator();
 
-String newDocument = ;
+StringBuilder newDocument = new StringBuilder();
 while (iterator.isValid()) {
   AnnotationFS fs = iterator.get();
-  newDocument += fs.getCoveredText() + \n\n;
+  newDocument.append(fs.getCoveredText());
+  newDocument.append(\n);
   iterator.moveToNext();
 }
-newDocument = newDocument.trim();
-if (.equals(newDocument)) {
-  newDocument = cas.getDocumentText();
-}
+
 
 Type sdiType = 
cas.getTypeSystem().getType(TextMarkerEngine.SOURCE_DOCUMENT_INFORMATION);
 
@@ -98,7 +96,7 @@ public class AnnotationWriter extends JC
 
 }
 try {
-  FileUtils.saveString2File(newDocument, file, encoding);
+  FileUtils.saveString2File(newDocument.toString(), file, encoding);
 } catch (IOException e) {
   throw new AnalysisEngineProcessException(e);
 }

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/rule/TextMarkerTypeMatcher.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/rule/TextMarkerTypeMatcher.java?rev=1366364r1=1366363r2=1366364view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/rule/TextMarkerTypeMatcher.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/rule/TextMarkerTypeMatcher.java
 Fri Jul 27 12:28:37 2012
@@ -85,6 +85,9 @@ public class TextMarkerTypeMatcher imple
   public CollectionAnnotationFS getAnnotationsAfter(TextMarkerRuleElement 
ruleElement,
   AnnotationFS annotation, TextMarkerStream stream, TextMarkerBlock 
parent) {
 TextMarkerBasic lastBasic = stream.getEndAnchor(annotation.getEnd());
+if(lastBasic== null) {
+  return Collections.emptyList();
+}
 stream.moveTo(lastBasic);
 stream.moveToNext();
 if (stream.isValid()) {
@@ -110,6 +113,9 @@ public class TextMarkerTypeMatcher imple
   public

svn commit: r1367940 - in /uima/sandbox/trunk/TextMarker: uima-docbook-textmarker/ uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/statistics/ uimaj-ep-textmarker-ide/src/main/java

2012-08-01 Thread pkluegl
Author: pkluegl
Date: Wed Aug  1 11:57:02 2012
New Revision: 1367940

URL: http://svn.apache.org/viewvc?rev=1367940view=rev
Log:
UIMA-2424
- moved resources to resources folder
- added hotfix for loading descriptor during testing
- additionally: fixed statistics view

Added:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/resources/

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/resources/org/

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/resources/org/apache/

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/resources/org/apache/uima/

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/resources/org/apache/uima/textmarker/

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/resources/org/apache/uima/textmarker/ide/

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/resources/org/apache/uima/textmarker/ide/core/

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/resources/org/apache/uima/textmarker/ide/core/packages/

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/resources/org/apache/uima/textmarker/ide/core/packages/messages.properties
  - copied unchanged from r1358073, 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/packages/messages.properties

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/resources/org/apache/uima/textmarker/ide/debug/

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/resources/org/apache/uima/textmarker/ide/debug/ui/

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/resources/org/apache/uima/textmarker/ide/debug/ui/messages.properties
  - copied unchanged from r1358073, 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/debug/ui/messages.properties

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/resources/org/apache/uima/textmarker/ide/debug/ui/preferences/

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/resources/org/apache/uima/textmarker/ide/debug/ui/preferences/TextMarkerDebugPreferenceMessages.properties
  - copied unchanged from r1358073, 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/debug/ui/preferences/TextMarkerDebugPreferenceMessages.properties

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/resources/org/apache/uima/textmarker/ide/debugger/

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/resources/org/apache/uima/textmarker/ide/debugger/preferences/

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/resources/org/apache/uima/textmarker/ide/debugger/preferences/PreferenceMessages.properties
  - copied unchanged from r1358073, 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/debugger/preferences/PreferenceMessages.properties

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/resources/org/apache/uima/textmarker/ide/formatter/

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/resources/org/apache/uima/textmarker/ide/formatter/bak_formatPreviewScript.tm
  - copied unchanged from r1358073, 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/formatter/bak_formatPreviewScript.tm

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/resources/org/apache/uima/textmarker/ide/formatter/formatPreviewScript.tm
  - copied unchanged from r1358073, 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/formatter/formatPreviewScript.tm

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/resources/org/apache/uima/textmarker/ide/formatter/messages.properties
  - copied unchanged from r1358073, 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/formatter/messages.properties

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/resources/org/apache/uima/textmarker/ide/formatter/preferences/

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/resources/org/apache/uima/textmarker/ide/formatter/preferences/bak_indentation-preview.tm
  - copied unchanged from r1358073, 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/formatter/preferences/bak_indentation-preview.tm

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/resources/org/apache/uima/textmarker/ide/formatter/preferences/blank-lines-preview.tm
  - copied unchanged from r1358073, 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/formatter/preferences/blank-lines-preview.tm

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src

svn commit: r1368568 - in /uima/sandbox/trunk/TextMarker: uima-docbook-textmarker/src/docbook/ uimaj-ep-textmarker-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/ uimaj-textmarker/src/

2012-08-02 Thread pkluegl
Author: pkluegl
Date: Thu Aug  2 16:05:29 2012
New Revision: 1368568

URL: http://svn.apache.org/viewvc?rev=1368568view=rev
Log:
UIMA-2451
- whitespaces are included in tree structure of word lists
- added parameter for MARKFAST whether whitespaces in dictionary entries should 
be ignored (default = true)
- added test
- updated documentation

Added:

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/action/MarkFastTest.java
  - copied, changed from r1358125, 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/action/PartOfTest.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/condition/PartOfTest.java
  - copied, changed from r1358125, 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/action/PartOfTest.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/resources/org/apache/uima/textmarker/action/MarkFastTest.tm
  - copied, changed from r1358125, 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/resources/org/apache/uima/textmarker/action/PartOfTest.tm

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/resources/org/apache/uima/textmarker/action/MarkFastTest.txt
  - copied, changed from r1358125, 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/resources/org/apache/uima/textmarker/action/PartOfTest.txt

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/resources/org/apache/uima/textmarker/action/MarkFastTestList.txt

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/resources/org/apache/uima/textmarker/condition/PartOfTest.tm

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/resources/org/apache/uima/textmarker/condition/PartOfTest.txt
Removed:

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/action/PartOfTest.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/resources/org/apache/uima/textmarker/action/PartOfTest.tm

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/resources/org/apache/uima/textmarker/action/PartOfTest.txt
Modified:

uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/tools.textmarker.actions.xml

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/antlr3/org/apache/uima/textmarker/parser/TextMarkerParser.g

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/ActionFactory.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/MarkFastAction.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/MarkTableAction.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/condition/InListCondition.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/resource/AnonymousWordList.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/resource/MultiTreeWordList.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/resource/TextMarkerWordList.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/resource/TextNode.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/resource/TreeWordList.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/verbalize/ActionVerbalizer.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/AllTests.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/DynamicAnchoringTest2.java

uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/TextMarkerTestUtils.java

Modified: 
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/tools.textmarker.actions.xml
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/tools.textmarker.actions.xml?rev=1368568r1=1368567r2=1368568view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/tools.textmarker.actions.xml
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/tools.textmarker.actions.xml
 Thu Aug  2 16:05:29 2012
@@ -622,7 +622,9 @@
optional. It defines if the MARKFAST action should 
ignore the case,
whereby its default value is false. The optional fourth 
parameter
specifies a character threshold for the ignorence of 
the case

  1   2   3   4   5   6   7   8   9   10   >