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);
-  

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: 

svn commit: r1232944 - /uima/uimacpp/tags/uimacpp-2.4.0-rc2/

2012-01-18 Thread bhavani
Author: bhavani
Date: Wed Jan 18 16:11:08 2012
New Revision: 1232944

URL: http://svn.apache.org/viewvc?rev=1232944view=rev
Log:
removing rc2

Removed:
uima/uimacpp/tags/uimacpp-2.4.0-rc2/



svn commit: r1232945 - /uima/uimacpp/tags/uimacpp-2.4.0-rc2/

2012-01-18 Thread bhavani
Author: bhavani
Date: Wed Jan 18 16:12:10 2012
New Revision: 1232945

URL: http://svn.apache.org/viewvc?rev=1232945view=rev
Log:
release candidate 2 recreated

Added:
uima/uimacpp/tags/uimacpp-2.4.0-rc2/
  - copied from r1232944, uima/uimacpp/trunk/



svn commit: r1232989 - /uima/uimacpp/trunk/docs/overview_and_setup.html

2012-01-18 Thread schor
Author: schor
Date: Wed Jan 18 18:36:32 2012
New Revision: 1232989

URL: http://svn.apache.org/viewvc?rev=1232989view=rev
Log:
[UIMA-2346] add trademark, also fix title to include UIMA, and some typos

Modified:
uima/uimacpp/trunk/docs/overview_and_setup.html

Modified: uima/uimacpp/trunk/docs/overview_and_setup.html
URL: 
http://svn.apache.org/viewvc/uima/uimacpp/trunk/docs/overview_and_setup.html?rev=1232989r1=1232988r2=1232989view=diff
==
--- uima/uimacpp/trunk/docs/overview_and_setup.html (original)
+++ uima/uimacpp/trunk/docs/overview_and_setup.html Wed Jan 18 18:36:32 2012
@@ -21,7 +21,7 @@
 html
  head
meta http-equiv=Content-Type content=text/html; charset=ISO-8859-1
-   titleApache C++ Overview and Setup/title
+   titleApache UIMA C++ Overview and Setup/title
link rel=stylesheet href=css/stylesheet.css type=text/css
  /head
 body bgcolor=white text=black link=#FF vlink=#840084 
alink=#FFdiv class=book lang=en id=d0e2div 
class=titlepagedivdivh1 class=titlea name=d0e2/aApache UIMA 
C++ Overview and Setup/h1/divdivdiv class=authorgrouph3 
class=corpauthorAuthors: The Apache UIMA Development 
Community/h3/div/divdivp class=releaseinfoVersion 
2.4.0/p/divdivp class=copyrightCopyright copy; 2006, 2007 The Apache 
Software Foundation/p/divdivp class=copyrightCopyright copy; 2004, 
2006 International Business Machines Corporation/p/divdivdiv 
class=legalnoticea name=d0e15/ap /p  
@@ -48,8 +48,8 @@
 
 
 h21.0 Apache UIMA C++ Overview/h2
-pThe Apache UIMA C++ framework allows the creation of UIMA compliant 
-analysis engines from analytics written in C++ and several scripting langauges 
that
+pThe Apache UIMA#8482; C++ framework allows the creation of UIMA compliant 
+analysis engines from analytics written in C++ and several scripting languages 
that
 can utilize C++ libraries. A rich set of standard UIMA interface methods 
minimizes
 the effort to extract input data from a CAS and then update the CAS with the 
analytic results.
 The UIMA framework transparently moves the CAS between Java and C++ components 
and between 
@@ -67,7 +67,7 @@ and can be aggregated with other UIMA-co
 For C++ applications the UIMA C++ framework has APIs to 
 parse component descriptors, then instantiate and call analysis engines.
 A C++ test driver is available so that a UIMA C++ analytic can be developed 
and tested with 
-standard native programming tools; no programing in Java is required.
+standard native programming tools; no programming in Java is required.
 On the other hand, for a more consistent development environment,
 Eclipse can provide a single IDE for both Java and C++ components
 using the a href=http://www.eclipse.org/cdt/;CDT/a.
@@ -80,7 +80,7 @@ engine is used; in this case a Java prox
 framework though the JNI. Note that if more than one C++ component is
 used in the same JVM, they must share the same native
 environment. Using UIMA AS, a C++ component can be started as a separate
-process, and therefor each component can have different native environments, if
+process, and therefore each component can have different native environments, 
if
 desired. When C++ is launched automatically from Java, logging and JMX 
monitoring
 of the annotator is done via the JVM.
 /p
@@ -223,10 +223,13 @@ To test the interoperability with UIMA J
 The runAE driver will process all files in the data directory and DaveDetector 
should find Dave in some of them.
 
 h32.3 Testing Interoperability with UIMA AS/h3
-UIMA AS is an add-on to the core UIMA package; it must be separately 
downloaded and installed. To test interoperability with UIMA AS, make sure 
UIMA_HOME is set to the location of the combined SDK, and that its bin 
directory is in the PATH. Run the C++ MeetingAnnotator as follows:
+UIMA AS is an add-on to the core UIMA package; it must be separately 
downloaded and installed. 
+To test interoperability with UIMA AS, make sure UIMA_HOME is set to the 
location of the combined SDK, 
+and that its bin directory is in the PATH. Run the C++ MeetingAnnotator as 
follows:
 h42.3.1 Adjust example Deployment Descriptor/h4
 The UIMA AS example C++ deployment descriptor includes specifications for the 
UIMACPP environment.
-Following the convention for UIMA examples, this descriptor specifies paths 
starting with C:/Program Files/apache-uima. This path prefix must be changed 
in the descriptor to be the parent directory of UIMACPP.
+Following the convention for UIMA examples, this descriptor specifies paths 
starting with C:/Program Files/apache-uima. 
+This path prefix must be changed in the descriptor to be the parent directory 
of UIMACPP.
 h42.3.2 On Linux/h4
 ul
 code




svn commit: r1233002 - /uima/build/trunk/parent-pom/pom.xml

2012-01-18 Thread schor
Author: schor
Date: Wed Jan 18 19:07:59 2012
New Revision: 1233002

URL: http://svn.apache.org/viewvc?rev=1233002view=rev
Log:
[UIMA-2346] depend on 4-SNAPSHOT version of uima-build-resources

Modified:
uima/build/trunk/parent-pom/pom.xml

Modified: uima/build/trunk/parent-pom/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/build/trunk/parent-pom/pom.xml?rev=1233002r1=1233001r2=1233002view=diff
==
--- uima/build/trunk/parent-pom/pom.xml (original)
+++ uima/build/trunk/parent-pom/pom.xml Wed Jan 18 19:07:59 2012
@@ -167,7 +167,7 @@
   We specify something here, because if accidentally left blank, it 
   generates a giant request for all changes --
 jiraVersion12316057/jiraVersion  !-- for parent-pom-3 change for each 
release --
-uimaBuildResourcesVersion3/uimaBuildResourcesVersion
+uimaBuildResourcesVersion4-SNAPSHOT/uimaBuildResourcesVersion
 uimaWebsiteUrlhttp://uima.apache.org/uimaWebsiteUrl
 
uimaWebsiteDistributionUrlscp://people.apache.org/www/uima.apache.org//uimaWebsiteDistributionUrl
 maven.build.timestamp.formatyyMMdd_HHmm/maven.build.timestamp.format




svn commit: r1233003 - in /uima/build/trunk/uima-build-resources/src/main/resources/docbook-shared: common_book_info.xml common_book_info_ibm_c.xml

2012-01-18 Thread schor
Author: schor
Date: Wed Jan 18 19:08:40 2012
New Revision: 1233003

URL: http://svn.apache.org/viewvc?rev=1233003view=rev
Log:
[UIMA-2346] add trademark to place near top of doc, in a common spot

Modified:

uima/build/trunk/uima-build-resources/src/main/resources/docbook-shared/common_book_info.xml

uima/build/trunk/uima-build-resources/src/main/resources/docbook-shared/common_book_info_ibm_c.xml

Modified: 
uima/build/trunk/uima-build-resources/src/main/resources/docbook-shared/common_book_info.xml
URL: 
http://svn.apache.org/viewvc/uima/build/trunk/uima-build-resources/src/main/resources/docbook-shared/common_book_info.xml?rev=1233003r1=1233002r2=1233003view=diff
==
--- 
uima/build/trunk/uima-build-resources/src/main/resources/docbook-shared/common_book_info.xml
 (original)
+++ 
uima/build/trunk/uima-build-resources/src/main/resources/docbook-shared/common_book_info.xml
 Wed Jan 18 19:08:40 2012
@@ -26,7 +26,7 @@ under the License.
 productnameUIMA/productname
 
 authorgroup
-  corpauthorWritten and maintained by the Apache UIMA Development 
Community/corpauthor
+  corpauthorWritten and maintained by the Apache UIMA#8482; Development 
Community/corpauthor
 /authorgroup
 
  !--

Modified: 
uima/build/trunk/uima-build-resources/src/main/resources/docbook-shared/common_book_info_ibm_c.xml
URL: 
http://svn.apache.org/viewvc/uima/build/trunk/uima-build-resources/src/main/resources/docbook-shared/common_book_info_ibm_c.xml?rev=1233003r1=1233002r2=1233003view=diff
==
--- 
uima/build/trunk/uima-build-resources/src/main/resources/docbook-shared/common_book_info_ibm_c.xml
 (original)
+++ 
uima/build/trunk/uima-build-resources/src/main/resources/docbook-shared/common_book_info_ibm_c.xml
 Wed Jan 18 19:08:40 2012
@@ -26,7 +26,7 @@ under the License.
 productnameUIMA/productname
 
 authorgroup
-  corpauthorWritten and maintained by the Apache UIMA Development 
Community/corpauthor
+  corpauthorWritten and maintained by the Apache UIMA#8482; Development 
Community/corpauthor
 /authorgroup
 
  !--




svn commit: r1233004 - /uima/uimaj/trunk/uimaj-parent/pom.xml

2012-01-18 Thread schor
Author: schor
Date: Wed Jan 18 19:09:40 2012
New Revision: 1233004

URL: http://svn.apache.org/viewvc?rev=1233004view=rev
Log:
[UIMA-2346] make parent pom depend on 4-SNAPSHOT of common parent pom to pick 
up trademark change

Modified:
uima/uimaj/trunk/uimaj-parent/pom.xml

Modified: uima/uimaj/trunk/uimaj-parent/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-parent/pom.xml?rev=1233004r1=1233003r2=1233004view=diff
==
--- uima/uimaj/trunk/uimaj-parent/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-parent/pom.xml Wed Jan 18 19:09:40 2012
@@ -31,7 +31,7 @@
   parent
 groupIdorg.apache.uima/groupId
 artifactIdparent-pom/artifactId
-version3/version
+version4-SNAPSHOT/version
 relativePath /
   /parent
 
@@ -139,7 +139,6 @@
   properties
 uimaScmRootuimaj/uimaScmRoot
 uimaScmProject${project.artifactId}/uimaScmProject
-uimaBuildResourcesVersion3/uimaBuildResourcesVersion
   /properties
 
 /project