Author: pkluegl
Date: Wed Mar 20 13:11:11 2013
New Revision: 1458817
URL: http://svn.apache.org/r1458817
Log:
UIMA-2759
- removed BasicAnnotationType, because it caused grammar problems in types with
namespace
- removed strange/old workaround
- added workaround for assigning types when there is no cas/type system yet.
Needed for initial value of type variables
- removed tokens files that is not needed
Removed:
uima/sandbox/textmarker/trunk/textmarker-core/src/main/antlr3/org/apache/uima/textmarker/parser/TextMarkerLexer.tokens
Modified:
uima/sandbox/textmarker/trunk/textmarker-core/src/main/antlr3/org/apache/uima/textmarker/parser/TextMarkerLexer.g
uima/sandbox/textmarker/trunk/textmarker-core/src/main/antlr3/org/apache/uima/textmarker/parser/TextMarkerParser.g
uima/sandbox/textmarker/trunk/textmarker-core/src/main/java/org/apache/uima/textmarker/TextMarkerEnvironment.java
uima/sandbox/textmarker/trunk/textmarker-ep-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.g
uima/sandbox/textmarker/trunk/textmarker-ep-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.tokens
uima/sandbox/textmarker/trunk/textmarker-ep-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g
uima/sandbox/textmarker/trunk/textmarker-ep-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.tokens
uima/sandbox/textmarker/trunk/textmarker-ep-ide/src/main/java/org/apache/uima/textmarker/ide/validator/TextMarkerTypeChecker.java
Modified:
uima/sandbox/textmarker/trunk/textmarker-core/src/main/antlr3/org/apache/uima/textmarker/parser/TextMarkerLexer.g
URL:
http://svn.apache.org/viewvc/uima/sandbox/textmarker/trunk/textmarker-core/src/main/antlr3/org/apache/uima/textmarker/parser/TextMarkerLexer.g?rev=1458817&r1=1458816&r2=1458817&view=diff
==============================================================================
---
uima/sandbox/textmarker/trunk/textmarker-core/src/main/antlr3/org/apache/uima/textmarker/parser/TextMarkerLexer.g
(original)
+++
uima/sandbox/textmarker/trunk/textmarker-core/src/main/antlr3/org/apache/uima/textmarker/parser/TextMarkerLexer.g
Wed Mar 20 13:11:11 2013
@@ -308,10 +308,6 @@ THEN
: '->'
;
-BasicAnnotationType
- : 'COLON'| 'SW' | 'MARKUP' | 'PERIOD' | 'CW'| 'NUM' | 'QUESTION' |
'SPECIAL' | 'CAP' | 'COMMA' | 'EXCLAMATION' | 'SEMICOLON' | 'NBSP'| 'AMP' |
- '_' | 'SENTENCEEND' | 'W' | 'PM' | 'ANY' | 'ALL' | 'SPACE' | 'BREAK'
- ;
LogLevel:
'finest' | 'finer' | 'fine' | 'config' | 'info' | 'warning' | 'severe'
Modified:
uima/sandbox/textmarker/trunk/textmarker-core/src/main/antlr3/org/apache/uima/textmarker/parser/TextMarkerParser.g
URL:
http://svn.apache.org/viewvc/uima/sandbox/textmarker/trunk/textmarker-core/src/main/antlr3/org/apache/uima/textmarker/parser/TextMarkerParser.g?rev=1458817&r1=1458816&r2=1458817&view=diff
==============================================================================
---
uima/sandbox/textmarker/trunk/textmarker-core/src/main/antlr3/org/apache/uima/textmarker/parser/TextMarkerParser.g
(original)
+++
uima/sandbox/textmarker/trunk/textmarker-core/src/main/antlr3/org/apache/uima/textmarker/parser/TextMarkerParser.g
Wed Mar 20 13:11:11 2013
@@ -286,7 +286,7 @@ List<String> vars = new ArrayList<String
type = TypeString
{!ownsVariable($blockDeclaration::env, input.LT(1).getText())}? id =
Identifier {vars.add(id.getText());addVariable($blockDeclaration::env,
id.getText(), type.getText());}
(COMMA {!ownsVariable($blockDeclaration::env,
input.LT(1).getText())}? id = Identifier
{vars.add(id.getText());addVariable($blockDeclaration::env, id.getText(),
type.getText());}
- )* (ASSIGN_EQUAL value5 = annotationType)?
{setValue($blockDeclaration::env, vars, value5);} SEMI
+ )* (ASSIGN_EQUAL value5 = typeExpression)?
{setValue($blockDeclaration::env, vars, value5);} SEMI
|
type = WORDLIST
{!isVariableOfType($blockDeclaration::env, input.LT(1).getText(),
type.getText())}?
@@ -1669,9 +1669,6 @@ dottedId returns [Token token = null ]
annotationType returns [Token ref = null]
:
(
- //{isType($blockDeclaration::env, input.LT(1).getText())}?
- token = BasicAnnotationType {ref = token;}
- |
did = dottedId {ref = did;}
)
;
Modified:
uima/sandbox/textmarker/trunk/textmarker-core/src/main/java/org/apache/uima/textmarker/TextMarkerEnvironment.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/textmarker/trunk/textmarker-core/src/main/java/org/apache/uima/textmarker/TextMarkerEnvironment.java?rev=1458817&r1=1458816&r2=1458817&view=diff
==============================================================================
---
uima/sandbox/textmarker/trunk/textmarker-core/src/main/java/org/apache/uima/textmarker/TextMarkerEnvironment.java
(original)
+++
uima/sandbox/textmarker/trunk/textmarker-core/src/main/java/org/apache/uima/textmarker/TextMarkerEnvironment.java
Wed Mar 20 13:11:11 2013
@@ -32,6 +32,7 @@ import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.antlr.runtime.CommonToken;
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.CASException;
import org.apache.uima.cas.Type;
@@ -361,6 +362,12 @@ public class TextMarkerEnvironment {
public <T> T getVariableValue(String name, Class<T> type) {
boolean containsKey = variableValues.containsKey(name);
Object result = variableValues.get(name);
+
+ if(result instanceof String && type.equals(Type.class)) {
+ // "cast" string to type, because initial values were set when there was
no cas/type system yet
+ result = types.get(result);
+ }
+
if (containsKey && result == null) {
// TODO find the problem with the null values!
// this might now work for word lists in another env.
@@ -422,6 +429,9 @@ public class TextMarkerEnvironment {
} else if (clazz.equals(List.class) && value instanceof ListExpression) {
List list = getList((ListExpression) value);
return list;
+ } else if (clazz.equals(Type.class) && value instanceof CommonToken) {
+ String typeName = ((CommonToken) value).getText();
+ return typeName;
}
return null;
Modified:
uima/sandbox/textmarker/trunk/textmarker-ep-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.g
URL:
http://svn.apache.org/viewvc/uima/sandbox/textmarker/trunk/textmarker-ep-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.g?rev=1458817&r1=1458816&r2=1458817&view=diff
==============================================================================
---
uima/sandbox/textmarker/trunk/textmarker-ep-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.g
(original)
+++
uima/sandbox/textmarker/trunk/textmarker-ep-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.g
Wed Mar 20 13:11:11 2013
@@ -308,10 +308,6 @@ THEN
: '->'
;
-BasicAnnotationType
- : 'COLON'| 'SW' | 'MARKUP' | 'PERIOD' | 'CW'| 'NUM' | 'QUESTION' |
'SPECIAL' | 'CAP' | 'COMMA' | 'EXCLAMATION' | 'SEMICOLON' | 'NBSP'| 'AMP' |
- '_' | 'SENTENCEEND' | 'W' | 'PM' | 'ANY' | 'ALL' | 'SPACE' | 'BREAK'
- ;
LogLevel:
'finest' | 'finer' | 'fine' | 'config' | 'info' | 'warning' | 'severe'
Modified:
uima/sandbox/textmarker/trunk/textmarker-ep-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.tokens
URL:
http://svn.apache.org/viewvc/uima/sandbox/textmarker/trunk/textmarker-ep-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.tokens?rev=1458817&r1=1458816&r2=1458817&view=diff
==============================================================================
---
uima/sandbox/textmarker/trunk/textmarker-ep-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.tokens
(original)
+++
uima/sandbox/textmarker/trunk/textmarker-ep-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.tokens
Wed Mar 20 13:11:11 2013
@@ -1,156 +1,155 @@
-ACTION=4
-ADD=5
-ADDFILTERTYPE=6
-ADDRETAINTYPE=7
-AFTER=8
-ALT_NOTEQUAL=9
-AMPER=10
-AND=11
-ASSIGN=12
-ASSIGN_EQUAL=13
-AT=14
-ATTRIBUTE=15
-Annotation=16
-AutomataBlockString=17
-BEFORE=18
-BOOLEANLIST=19
-BasicAnnotationType=20
-BlockString=21
-BooleanString=22
-CALL=23
-CIRCUMFLEX=24
-CLEAR=25
-COLON=26
-COLOR=27
-COMMA=28
-COMMENT=29
-CONDITION=30
-CONFIGURE=31
-CONTAINS=32
-CONTEXTCOUNT=33
-COS=34
-COUNT=35
-CREATE=36
-CURRENTCOUNT=37
-CharacterLiteral=38
-DECLARE=39
-DEL=40
-DOT=41
-DOUBLELIST=42
-DYNAMICANCHORING=43
-DecimalLiteral=44
-DocComment=45
-DoubleString=46
-ENDSWITH=47
-EQUAL=48
-EXEC=49
-EXP=50
-EngineString=51
-EscapeSequence=52
-Exponent=53
-FALSE=54
-FEATURE=55
-FILL=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
-Identifier=74
-IntString=75
-IntegerTypeSuffix=76
-JavaIDDigit=77
-LAST=78
-LBRACK=79
-LCURLY=80
-LESS=81
-LESSEQUAL=82
-LINE_COMMENT=83
-LOG=84
-LOGN=85
-LPAREN=86
-Letter=87
-ListIdentifier=88
-LogLevel=89
-MARK=90
-MARKFAST=91
-MARKLAST=92
-MARKONCE=93
-MARKSCORE=94
-MARKTABLE=95
-MATCHEDTEXT=96
-MERGE=97
-MINUS=98
-MOFN=99
-NEAR=100
-NOT=101
-NOTEQUAL=102
-OR=103
-OctalEscape=104
-OctalLiteral=105
-OldColor=106
-PARSE=107
-PARTOF=108
-PARTOFNEQ=109
-PERCENT=110
-PLUS=111
-POSITION=112
-PackageString=113
-QUESTION=114
-RBRACK=115
-RCURLY=116
-REGEXP=117
-REMOVE=118
-REMOVEDUPLICATE=119
-REMOVEFILTERTYPE=120
-REMOVERETAINTYPE=121
-REMOVESTRING=122
-REPLACE=123
-RETAINTYPE=124
-RPAREN=125
-RessourceLiteral=126
-SCORE=127
-SEMI=128
-SETFEATURE=129
-SHIFT=130
-SIN=131
-SIZE=132
-SLASH=133
-STAR=134
-STARTSWITH=135
-STRINGLIST=136
-ScriptString=137
-StringLiteral=138
-StringString=139
-SymbolString=140
-TAN=141
-THEN=142
-TOTALCOUNT=143
-TRANSFER=144
-TRIE=145
-TRIM=146
-TRUE=147
-TYPELIST=148
-TypeString=149
-TypeSystemString=150
-UNMARK=151
-UNMARKALL=152
-UnicodeEscape=153
-VBAR=154
-VOTE=155
-WORDLIST=156
-WORDTABLE=157
-WS=158
-XOR=159
+STAR=142
+FloatTypeSuffix=117
+OctalLiteral=115
+LOG=37
+CONTAINS=8
+REMOVE=70
+GREATEREQUAL=155
+MARKFAST=41
+CONDITION=95
+MATCHEDTEXT=76
+COUNT=14
+LOGN=104
+DYNAMICANCHORING=57
+NOT=68
+Identifier=127
+ACTION=96
+NOTEQUAL=152
+CLEAR=78
+VBAR=144
+DOUBLELIST=99
+ENDSWITH=63
+RPAREN=129
+CREATE=31
+GREATER=147
+SIN=105
+EXP=103
+CURRENTCOUNT=16
+COS=106
+TAN=107
+TYPELIST=102
+FloatString=90
+LESS=146
+REGEXP=25
+GET=73
+PARTOF=22
+UNMARK=53
+LAST=18
+COMMENT=157
+REMOVEDUPLICATE=71
+UNMARKALL=54
+RBRACK=131
+NEAR=20
+LINE_COMMENT=158
+IntegerTypeSuffix=112
+MARKSCORE=39
+REMOVESTRING=77
+TRANSFER=55
+LCURLY=132
+TRIE=7
+FILTERTYPE=46
+STRINGLIST=101
+MARKONCE=40
+ScriptString=83
+EngineString=84
+WS=156
+WORDTABLE=11
+WORDLIST=10
+AutomataBlockString=86
+FloatingPointLiteral=118
+INTLIST=98
+OR=21
+TRIM=58
+JavaIDDigit=126
+FLOATLIST=100
+CALL=47
+Annotation=5
+FALSE=110
+LESSEQUAL=154
+RessourceLiteral=122
+VOTE=27
+Letter=125
+EscapeSequence=119
+SIZE=75
+REMOVEFILTERTYPE=67
+LBRACK=130
+CharacterLiteral=120
+DEL=36
+ATTRIBUTE=34
+TypeString=87
+SHIFT=56
+Exponent=116
+ASSIGN_EQUAL=148
+RETAINTYPE=45
+TypeSystemString=93
+AND=12
+ADDFILTERTYPE=66
+BlockString=85
+IntString=88
+HexDigit=111
+COLOR=35
+LPAREN=128
+POSITION=24
+IF=28
+AT=135
+LogLevel=80
+CONFIGURE=49
+SLASH=143
+THEN=79
+FILL=33
+COMMA=138
+IS=61
+AMPER=145
+REPLACE=44
+GETLIST=74
+EQUAL=151
+GATHER=32
+INLIST=17
+PLUS=140
+BooleanString=92
+GETFEATURE=52
+DOT=136
+ListIdentifier=6
+PARTOFNEQ=23
+BOOLEANLIST=97
+ADD=69
+MARKTABLE=42
+HexLiteral=113
+XOR=108
+PERCENT=149
+MARK=38
+PARSE=30
+PackageString=82
+OldColor=81
+MARKLAST=43
+MERGE=72
+CONTEXTCOUNT=13
+BEFORE=59
+EXEC=48
+MINUS=141
+AFTER=60
+DecimalLiteral=114
+SEMI=139
+TRUE=109
+FEATURE=29
+SymbolString=94
+COLON=137
+StringLiteral=121
+StringString=91
+SCORE=26
+QUESTION=150
+ADDRETAINTYPE=64
+UnicodeEscape=123
+RCURLY=133
+STARTSWITH=62
+ASSIGN=50
+REMOVERETAINTYPE=65
+TOTALCOUNT=15
+DECLARE=9
+DocComment=4
+MOFN=19
+OctalEscape=124
+SETFEATURE=51
+DoubleString=89
+CIRCUMFLEX=134
+ALT_NOTEQUAL=153
Modified:
uima/sandbox/textmarker/trunk/textmarker-ep-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g
URL:
http://svn.apache.org/viewvc/uima/sandbox/textmarker/trunk/textmarker-ep-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g?rev=1458817&r1=1458816&r2=1458817&view=diff
==============================================================================
---
uima/sandbox/textmarker/trunk/textmarker-ep-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g
(original)
+++
uima/sandbox/textmarker/trunk/textmarker-ep-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g
Wed Mar 20 13:11:11 2013
@@ -364,7 +364,7 @@ variableDeclaration returns [List<Statem
|
type = TypeString id = Identifier {addVariable(id.getText(),
type.getText());decls.add(StatementFactory.createTypeVariable(id,type));}
(COMMA id = Identifier {addVariable(id.getText(),
type.getText());decls.add(StatementFactory.createTypeVariable(id,type));}
- )* (ASSIGN_EQUAL init = annotationType)? SEMI
+ )* (ASSIGN_EQUAL init = typeExpression)? SEMI
{
stmts.add(StatementFactory.createDeclarationsStatement(type,
decls, init));
}
@@ -1891,7 +1891,6 @@ annotationType returns [Expression at =
:
(
atRef = annotationTypeVariableReference {at = atRef;}
- | basicAT = BasicAnnotationType {at =
ExpressionFactory.createAnnotationTypeConstantReference(basicAT);}
)
;
Modified:
uima/sandbox/textmarker/trunk/textmarker-ep-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.tokens
URL:
http://svn.apache.org/viewvc/uima/sandbox/textmarker/trunk/textmarker-ep-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.tokens?rev=1458817&r1=1458816&r2=1458817&view=diff
==============================================================================
---
uima/sandbox/textmarker/trunk/textmarker-ep-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.tokens
(original)
+++
uima/sandbox/textmarker/trunk/textmarker-ep-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.tokens
Wed Mar 20 13:11:11 2013
@@ -1,152 +1,155 @@
-STAR=139
-FloatTypeSuffix=114
-OctalLiteral=112
+STAR=142
+FloatTypeSuffix=117
+OctalLiteral=115
LOG=37
CONTAINS=8
-REMOVE=66
-GREATEREQUAL=152
+REMOVE=70
+GREATEREQUAL=155
MARKFAST=41
-CONDITION=92
-MATCHEDTEXT=72
+CONDITION=95
+MATCHEDTEXT=76
COUNT=14
-LOGN=101
+LOGN=104
DYNAMICANCHORING=57
-NOT=64
-Identifier=124
-ACTION=93
-CLEAR=74
-NOTEQUAL=149
+NOT=68
+Identifier=127
+ACTION=96
+CLEAR=78
+NOTEQUAL=152
ENDSWITH=63
-DOUBLELIST=96
-VBAR=141
-RPAREN=126
+DOUBLELIST=99
+VBAR=144
+RPAREN=129
CREATE=31
-GREATER=144
-SIN=102
-EXP=100
+GREATER=147
+SIN=105
+EXP=103
CURRENTCOUNT=16
-COS=103
-TAN=104
-TYPELIST=99
-FloatString=87
-LESS=143
+COS=106
+TAN=107
+TYPELIST=102
+FloatString=90
+LESS=146
REGEXP=25
-GET=69
+GET=73
UNMARK=53
PARTOF=22
LAST=18
-COMMENT=154
-REMOVEDUPLICATE=67
+COMMENT=157
+REMOVEDUPLICATE=71
UNMARKALL=54
-RBRACK=128
+RBRACK=131
NEAR=20
-LINE_COMMENT=155
-IntegerTypeSuffix=109
+LINE_COMMENT=158
+IntegerTypeSuffix=112
MARKSCORE=39
-REMOVESTRING=73
+REMOVESTRING=77
TRANSFER=55
-LCURLY=129
+LCURLY=132
TRIE=7
FILTERTYPE=46
-STRINGLIST=98
+STRINGLIST=101
MARKONCE=40
-ScriptString=80
-EngineString=81
-WS=153
+ScriptString=83
+EngineString=84
+WS=156
WORDTABLE=11
WORDLIST=10
-AutomataBlockString=83
-FloatingPointLiteral=115
-INTLIST=95
+AutomataBlockString=86
+FloatingPointLiteral=118
+INTLIST=98
OR=21
TRIM=58
-JavaIDDigit=123
-FLOATLIST=97
+JavaIDDigit=126
+FLOATLIST=100
CALL=47
Annotation=5
-FALSE=107
-LESSEQUAL=151
-RessourceLiteral=119
+FALSE=110
+LESSEQUAL=154
+RessourceLiteral=122
VOTE=27
-Letter=122
-EscapeSequence=116
-SIZE=71
-BasicAnnotationType=76
-LBRACK=127
-CharacterLiteral=117
+Letter=125
+EscapeSequence=119
+SIZE=75
+REMOVEFILTERTYPE=67
+LBRACK=130
+CharacterLiteral=120
DEL=36
ATTRIBUTE=34
-TypeString=84
+TypeString=87
SHIFT=56
-Exponent=113
-ASSIGN_EQUAL=145
+Exponent=116
+ASSIGN_EQUAL=148
RETAINTYPE=45
+TypeSystemString=93
AND=12
-TypeSystemString=90
-BlockString=82
-IntString=85
-HexDigit=108
+ADDFILTERTYPE=66
+BlockString=85
+IntString=88
+HexDigit=111
COLOR=35
POSITION=24
-LPAREN=125
+LPAREN=128
IF=28
-AT=132
-LogLevel=77
+AT=135
+LogLevel=80
CONFIGURE=49
-SLASH=140
-THEN=75
+SLASH=143
+THEN=79
FILL=33
-COMMA=135
+COMMA=138
IS=61
-GETLIST=70
+GETLIST=74
REPLACE=44
-AMPER=142
-EQUAL=148
+AMPER=145
+EQUAL=151
GATHER=32
INLIST=17
-PLUS=137
-BooleanString=89
+PLUS=140
+BooleanString=92
GETFEATURE=52
-DOT=133
+DOT=136
ListIdentifier=6
PARTOFNEQ=23
-ADD=65
-BOOLEANLIST=94
+ADD=69
+BOOLEANLIST=97
MARKTABLE=42
-HexLiteral=110
-XOR=105
+HexLiteral=113
+XOR=108
MARK=38
-PERCENT=146
-PackageString=79
+PERCENT=149
+PackageString=82
PARSE=30
-OldColor=78
-MERGE=68
+OldColor=81
+MERGE=72
MARKLAST=43
CONTEXTCOUNT=13
BEFORE=59
EXEC=48
AFTER=60
-MINUS=138
-DecimalLiteral=111
-TRUE=106
-SEMI=136
+MINUS=141
+DecimalLiteral=114
+TRUE=109
+SEMI=139
FEATURE=29
-SymbolString=91
-StringString=88
-StringLiteral=118
-COLON=134
+SymbolString=94
+StringString=91
+StringLiteral=121
+COLON=137
SCORE=26
-QUESTION=147
-UnicodeEscape=120
+QUESTION=150
+ADDRETAINTYPE=64
+UnicodeEscape=123
STARTSWITH=62
-RCURLY=130
+RCURLY=133
ASSIGN=50
+REMOVERETAINTYPE=65
TOTALCOUNT=15
DECLARE=9
DocComment=4
MOFN=19
SETFEATURE=51
-OctalEscape=121
-DoubleString=86
-CIRCUMFLEX=131
-ALT_NOTEQUAL=150
+OctalEscape=124
+DoubleString=89
+CIRCUMFLEX=134
+ALT_NOTEQUAL=153
Modified:
uima/sandbox/textmarker/trunk/textmarker-ep-ide/src/main/java/org/apache/uima/textmarker/ide/validator/TextMarkerTypeChecker.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/textmarker/trunk/textmarker-ep-ide/src/main/java/org/apache/uima/textmarker/ide/validator/TextMarkerTypeChecker.java?rev=1458817&r1=1458816&r2=1458817&view=diff
==============================================================================
---
uima/sandbox/textmarker/trunk/textmarker-ep-ide/src/main/java/org/apache/uima/textmarker/ide/validator/TextMarkerTypeChecker.java
(original)
+++
uima/sandbox/textmarker/trunk/textmarker-ep-ide/src/main/java/org/apache/uima/textmarker/ide/validator/TextMarkerTypeChecker.java
Wed Mar 20 13:11:11 2013
@@ -584,20 +584,7 @@ public class TextMarkerTypeChecker imple
typeSysDescr.resolveImports(resMgr);
for (TypeDescription each : typeSysDescr.getTypes()) {
String name = each.getName();
- String[] nameSpace = name.split("[.]");
- // types.add(nameSpace[nameSpace.length - 1]);
- StringBuffer fullName = new StringBuffer();
- if (nameSpace.length > 0) {
- fullName.append(nameSpace[0]);
- }
- for (int i = 1; i < nameSpace.length; i++) {
- // TODO fix workaround
- if (!nameSpace[i].equals("type")) {
- fullName.append('.');
- fullName.append(nameSpace[i]);
- }
- }
- types.add(fullName.toString());
+ types.add(name);
}
return types;
}
