date:20111021

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

2011-10-21 Thread joern

Author: joern
Date: Fri Oct 21 09:46:06 2011
New Revision: 1187266

URL: http://svn.apache.org/viewvc?rev=1187266view=rev
Log:
UIMA-2271 Replaced line length hint word wrapping with proper word wrapping.

Added:

uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferenceConstants.java
   (with props)
Modified:

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/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/src/main/java/org/apache/uima/caseditor/editor/AnnotationDocument.java
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationDocument.java?rev=1187266r1=1187265r2=1187266view=diff
==
--- 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationDocument.java
 (original)
+++ 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationDocument.java
 Fri Oct 21 09:46:06 2011
@@ -40,37 +40,11 @@ class AnnotationDocument extends Documen
 
   private ICasDocument mDocument;
 
-  private int lineLengthHint;
-
-  public AnnotationDocument() {
-IPreferenceStore prefStore = 
CasEditorPlugin.getDefault().getPreferenceStore();
-lineLengthHint = 
prefStore.getInt(AnnotationEditorPreferencePage.EDITOR_LINE_LENGTH_HINT);
-
-if (lineLengthHint == 0)
-  lineLengthHint = 80;
-  }
-  
-  private String transformText(String text) {
-   if (lineLengthHint != 0  text != null) {
-   return wrapWords(text, lineLengthHint);
-   } else {
- if (text != null)
-   return text;
- else
-   return ;
-   }
-  }
-  
   /**
* Call is forwarded to the set document.
*
* @return the text
*/
-  private String getText() {
-
-String text = getCAS().getDocumentText();
-return transformText(text);
-  }  
   /**
* Notifies listener about a document change.
*/
@@ -80,17 +54,13 @@ class AnnotationDocument extends Documen
 fireDocumentChanged(ev);
   }
   
-//  public void setLineLengthHint(int lineLengthHint) {
-//this.lineLengthHint = lineLengthHint;
-//  }
-
   /**
* @param element
*/
   public void setDocument(ICasDocument element) {
 mDocument = element;
 
-set(getText());
+set(getCAS().getDocumentText());
   }
 
   public ICasDocument getDocument() {
@@ -262,7 +232,7 @@ class AnnotationDocument extends Documen
  // but without sending out notifications.
  // The stop and resume notification methods do not yield
  // the desired effect
- String text = 
transformText(getCAS().getView(viewName).getDocumentText());
+ String text = getCAS().getView(viewName).getDocumentText();
  getStore().set(text);
  getTracker().set(text);
  

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=1187266r1=1187265r2=1187266view=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
 Fri Oct 21 09:46:06 2011
@@ -630,6 +630,12 @@ public final class AnnotationEditor exte
 
 sourceViewer.addPainter(mPainter);
 
+// UIMA-2271: Set word wrap based on the preferences
+IPreferenceStore preferences = 
CasEditorPlugin.getDefault().getPreferenceStore();
+
+sourceViewer.getTextWidget().setWordWrap(preferences.getBoolean(
+
AnnotationEditorPreferenceConstants.ANNOTATION_EDITOR_ENABLE_WORD_WRAP));
+
 return sourceViewer;
   }
 
@@ -740,24 +746,32 @@ public final class AnnotationEditor exte
   
 // Retrieve font size from preference store, default is 15
 IPreferenceStore prefStore = 
CasEditorPlugin.getDefault().getPreferenceStore();
-int textSize = 
prefStore.getInt(AnnotationEditorPreferencePage.EDITOR_TEXT_SIZE);
+int textSize = prefStore.getInt(
+AnnotationEditorPreferenceConstants.ANNOTATION_EDITOR_TEXT_SIZE);
+
+// TODO: We should use a preference initialize instead ...
 
 if (textSize  0) {
   setTextSize(textSize);
 }

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 [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: r1187355 - in /uima/uimaj/branches/xmlComments/uimaj-core/src/main/java/org/apache/uima: analysis_engine/impl/AnalysisEngineDescription_impl.java resource/metadata/impl/MetaDataObject_impl

2011-10-21 Thread schor

Author: schor
Date: Fri Oct 21 14:07:17 2011
New Revision: 1187355

URL: http://svn.apache.org/viewvc?rev=1187355view=rev
Log:
[UIMA-239] xml comment work

Modified:

uima/uimaj/branches/xmlComments/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_impl.java

uima/uimaj/branches/xmlComments/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MetaDataObject_impl.java

Modified: 
uima/uimaj/branches/xmlComments/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_impl.java
URL: 
http://svn.apache.org/viewvc/uima/uimaj/branches/xmlComments/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_impl.java?rev=1187355r1=1187354r2=1187355view=diff
==
--- 
uima/uimaj/branches/xmlComments/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_impl.java
 (original)
+++ 
uima/uimaj/branches/xmlComments/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_impl.java
 Fri Oct 21 14:07:17 2011
@@ -108,8 +108,10 @@ public class AnalysisEngineDescription_i
 
   private FlowControllerDeclaration mFlowControllerDeclaration;
 
+  // This holds delegates after imports have been resolved
   private MapString, ResourceSpecifier mDelegateAnalysisEngineSpecifiers = 
new HashMapString, ResourceSpecifier();
 
+  // This holds delegates as they come from reading the descriptor, may have 
import elements (unresolved)
   private MapString, MetaDataObject 
mDelegateAnalysisEngineSpecifiersWithImports = new HashMapString, 
MetaDataObject();
 
   private MapString, Import mProcessedImports = new HashMapString, 
Import();

Modified: 
uima/uimaj/branches/xmlComments/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MetaDataObject_impl.java
URL: 
http://svn.apache.org/viewvc/uima/uimaj/branches/xmlComments/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MetaDataObject_impl.java?rev=1187355r1=1187354r2=1187355view=diff
==
--- 
uima/uimaj/branches/xmlComments/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MetaDataObject_impl.java
 (original)
+++ 
uima/uimaj/branches/xmlComments/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MetaDataObject_impl.java
 Fri Oct 21 14:07:17 2011
@@ -61,8 +61,8 @@ import org.xml.sax.helpers.AttributesImp
 
 /**
  * Abstract base class for all MetaDataObjects in the reference 
implementation. Provides basic
- * support for getting and setting property values given their names, by 
storing all attribute
- * values in a HashMap keyed on attribute name.
+ * support for getting and setting property values given their names, by 
referring to Introspected
+ * information for the class (see below).  
  * p
  * Also provides the ability to write objects to XML and build objects from 
their DOM
  * representation, as required to implement the {@link XMLizable} interface, 
which is a
@@ -72,11 +72,21 @@ import org.xml.sax.helpers.AttributesImp
  * 
  * The implementation for getting and setting property values uses the 
JavaBeans introspection API.
  * Therefore subclasses of this class must be valid JavaBeans and either use 
the standard naming
- * conventions for getters and setters or else provide a BeanInfo class. See a
- * href=http://java.sun.com/docs/books/tutorial/javabeans/; The Java Beans 
Tutorial/a for more
+ * conventions for getters and setters. BeanInfo augmentation is ignored; the 
implementation here
+ * uses the flag IGNORE_ALL_BEANINFO. See a 
href=http://java.sun.com/docs/books/tutorial/javabeans/; 
+ * The Java Beans Tutorial/a for more
  * information.
  * 
+ * To support XML Comments, which can occur inbetween any sub-elements, 
including array values,
+ * the data for all objects is stored in a pair of ArrayLists; one holds the 
name of the slot,
+ * the other the value; comments are interspersed within this list where they 
occur.
  * 
+ * To the extent possible, this should be the *only* data storage used for the 
xml element.  
+ * Subclasses should access these elements on demand.  Data will be read into 
/ written from this
+ * representation; Cloning will copy this information.
+ * 
+ *For getters that need to do some special initial processing, a global 
flag will be set whenever
+ *this base code changes the underlying value.
  */
 public abstract class MetaDataObject_impl implements MetaDataObject {
 
@@ -92,6 +102,10 @@ public abstract class MetaDataObject_imp
 
   private transient URL mSourceUrl;
   
+  private transient ListString itemNames = new ArrayList();
+  
+  private transient List? itemValues = new ArrayList();
+  
   /**
* Creates a new codeMetaDataObject_impl/code with null attribute values
*/
@@ -100,8 +114,9 @@ public abstract class MetaDataObject_imp
 
   /**

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

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

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

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

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

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

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

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

svn commit: r1187355 - in /uima/uimaj/branches/xmlComments/uimaj-core/src/main/java/org/apache/uima: analysis_engine/impl/AnalysisEngineDescription_impl.java resource/metadata/impl/MetaDataObject_impl

9 matches

Site Navigation

Mail list logo

Footer information