You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by pk...@apache.org on 2012/11/22 17:22:12 UTC
svn commit: r1412604 - in /uima/sandbox/trunk/TextMarker:
uimaj-ep-textmarker-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/
uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/
uimaj-textmarker/src/main/antlr3/or...
Author: pkluegl
Date: Thu Nov 22 16:22:08 2012
New Revision: 1412604
URL: http://svn.apache.org/viewvc?rev=1412604&view=rev
Log:
UIMA-2501
- renamed action in grammars, keywords, implementation and verbalization
Added:
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/ShiftAction.java
- copied, changed from r1411692, uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/ExpandAction.java
Removed:
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/ExpandAction.java
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.g
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.tokens
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/TextMarkerKeywords.java
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/antlr3/org/apache/uima/textmarker/parser/TextMarkerLexer.g
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/antlr3/org/apache/uima/textmarker/parser/TextMarkerLexer.tokens
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/antlr3/org/apache/uima/textmarker/parser/TextMarkerParser.g
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/ActionFactory.java
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/verbalize/ActionVerbalizer.java
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.g
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.g?rev=1412604&r1=1412603&r2=1412604&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.g (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.g Thu Nov 22 16:22:08 2012
@@ -240,8 +240,8 @@ TRANSFER
;
-EXPAND
- : 'EXPAND'
+SHIFT
+ : 'SHIFT'
;
DYNAMICANCHORING
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/antlr3/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/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.tokens?rev=1412604&r1=1412603&r2=1412604&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.tokens (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.tokens Thu Nov 22 16:22:08 2012
@@ -1,151 +1,151 @@
-STAR=138
-FloatTypeSuffix=113
-OctalLiteral=111
-LOG=37
-CONTAINS=8
-REMOVE=65
-GREATEREQUAL=151
-MARKFAST=41
-MATCHEDTEXT=71
-CONDITION=91
-COUNT=14
-LOGN=100
-DYNAMICANCHORING=57
-NOT=63
-Identifier=123
-ACTION=92
-NOTEQUAL=148
-CLEAR=73
-VBAR=140
-DOUBLELIST=95
-ENDSWITH=62
-RPAREN=125
-CREATE=31
-GREATER=143
-SIN=101
-EXP=99
-CURRENTCOUNT=16
-COS=102
-TAN=103
-TYPELIST=98
-FloatString=86
-LESS=142
-REGEXP=25
-GET=68
-PARTOF=22
-UNMARK=53
-LAST=18
-COMMENT=153
-REMOVEDUPLICATE=66
-UNMARKALL=54
-RBRACK=127
-NEAR=20
-LINE_COMMENT=154
-IntegerTypeSuffix=108
-MARKSCORE=39
-REMOVESTRING=72
-TRANSFER=55
-LCURLY=128
-TRIE=7
-FILTERTYPE=46
-STRINGLIST=97
-MARKONCE=40
-ScriptString=79
-EngineString=80
-WS=152
-WORDTABLE=11
-WORDLIST=10
-AutomataBlockString=82
-FloatingPointLiteral=114
-INTLIST=94
-OR=21
-JavaIDDigit=122
-FLOATLIST=96
-CALL=47
-Annotation=5
-FALSE=106
-LESSEQUAL=150
-RessourceLiteral=118
-VOTE=27
-Letter=121
-EscapeSequence=115
-SIZE=70
-BasicAnnotationType=75
-LBRACK=126
-CharacterLiteral=116
-DEL=36
-ATTRIBUTE=34
-TypeString=83
-Exponent=112
-ASSIGN_EQUAL=144
-RETAINTYPE=45
-AND=12
-TypeSystemString=89
-EXPAND=56
-BlockString=81
-IntString=84
-HexDigit=107
-COLOR=35
-LPAREN=124
-POSITION=24
-IF=28
-AT=131
-LogLevel=76
-CONFIGURE=49
-SLASH=139
-THEN=74
-FILL=33
-COMMA=134
-IS=60
-AMPER=141
-REPLACE=44
-GETLIST=69
-EQUAL=147
-GATHER=32
-INLIST=17
-PLUS=136
-BooleanString=88
-GETFEATURE=52
-DOT=132
-ListIdentifier=6
-PARTOFNEQ=23
-BOOLEANLIST=93
-ADD=64
-MARKTABLE=42
-HexLiteral=109
-XOR=104
-PERCENT=145
-MARK=38
-PARSE=30
-PackageString=78
-OldColor=77
-MARKLAST=43
-MERGE=67
-CONTEXTCOUNT=13
-BEFORE=58
-EXEC=48
-MINUS=137
-AFTER=59
-DecimalLiteral=110
-SEMI=135
-TRUE=105
-FEATURE=29
-SymbolString=90
-COLON=133
-StringLiteral=117
-StringString=87
-SCORE=26
-QUESTION=146
-UnicodeEscape=119
-RCURLY=129
-STARTSWITH=61
-ASSIGN=50
-TOTALCOUNT=15
-DECLARE=9
-DocComment=4
-MOFN=19
-OctalEscape=120
-SETFEATURE=51
-DoubleString=85
-CIRCUMFLEX=130
-ALT_NOTEQUAL=149
+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
+DecimalLiteral=42
+DocComment=43
+DoubleString=44
+ENDSWITH=45
+EQUAL=46
+EXEC=47
+EXP=48
+EngineString=49
+EscapeSequence=50
+Exponent=51
+FALSE=52
+FEATURE=53
+FILL=54
+FILTERTYPE=55
+FLOATLIST=56
+FloatString=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
+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
+RETAINTYPE=120
+RPAREN=121
+RessourceLiteral=122
+SCORE=123
+SEMI=124
+SETFEATURE=125
+SHIFT=126
+SIN=127
+SIZE=128
+SLASH=129
+STAR=130
+STARTSWITH=131
+STRINGLIST=132
+ScriptString=133
+StringLiteral=134
+StringString=135
+SymbolString=136
+TAN=137
+THEN=138
+TOTALCOUNT=139
+TRANSFER=140
+TRIE=141
+TRUE=142
+TYPELIST=143
+TypeString=144
+TypeSystemString=145
+UNMARK=146
+UNMARKALL=147
+UnicodeEscape=148
+VBAR=149
+VOTE=150
+WORDLIST=151
+WORDTABLE=152
+WS=153
+XOR=154
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g?rev=1412604&r1=1412603&r2=1412604&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/antlr3/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g Thu Nov 22 16:22:08 2012
@@ -1186,7 +1186,7 @@ result = ActionFactory.createEmptyAction
| a = actionGetList
| a = actionMatchedText
| a = actionClear
- | a = actionExpand
+ | a = actionShift
| a = actionConfigure
| a = actionDynamicAnchoring
| (a = externalAction)=> a = externalAction
@@ -1350,12 +1350,12 @@ List<Expression> list = new ArrayList<Ex
RPAREN
;
-actionExpand returns [TextMarkerAction action = null]
+actionShift returns [TextMarkerAction action = null]
@init {
List<Expression> list = new ArrayList<Expression>();
}
:
- name = EXPAND LPAREN
+ name = SHIFT LPAREN
type = typeExpression
{list.add(type);}
(
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=1412604&r1=1412603&r2=1412604&view=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 Thu Nov 22 16:22:08 2012
@@ -36,7 +36,7 @@ public class TextMarkerKeywords implemen
"ATTRIBUTE", "MARKFAST", "FILTERTYPE", "CREATE", "FILL", "MARKTABLE",
"UNMARK", "TRANSFER", "MARKONCE", "TRIE", "GATHER", "EXEC", "MARKLAST", "ADD", "REMOVE",
"MERGE", "GET", "GETLIST", "REMOVEDUPLICATE", "GETFEATURE", "MATCHEDTEXT", "CLEAR",
- "UNMARKALL", "EXPAND", "CONFIGURE", "DYNAMICANCHORING" };
+ "UNMARKALL", "SHIFT", "CONFIGURE", "DYNAMICANCHORING" };
private static String[] basic = { "ALL", "ANY", "AMP", "BREAK", "W", "NUM", "PM", "Document",
"MARKUP", "SW", "CW", "CAP", "PERIOD", "NBSP", "SENTENCEEND", "COLON", "COMMA", "SEMICOLON",
Modified: uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/antlr3/org/apache/uima/textmarker/parser/TextMarkerLexer.g
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/antlr3/org/apache/uima/textmarker/parser/TextMarkerLexer.g?rev=1412604&r1=1412603&r2=1412604&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/antlr3/org/apache/uima/textmarker/parser/TextMarkerLexer.g (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/antlr3/org/apache/uima/textmarker/parser/TextMarkerLexer.g Thu Nov 22 16:22:08 2012
@@ -240,8 +240,8 @@ TRANSFER
;
-EXPAND
- : 'EXPAND'
+SHIFT
+ : 'SHIFT'
;
DYNAMICANCHORING
Modified: uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/antlr3/org/apache/uima/textmarker/parser/TextMarkerLexer.tokens
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/antlr3/org/apache/uima/textmarker/parser/TextMarkerLexer.tokens?rev=1412604&r1=1412603&r2=1412604&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/antlr3/org/apache/uima/textmarker/parser/TextMarkerLexer.tokens (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/antlr3/org/apache/uima/textmarker/parser/TextMarkerLexer.tokens Thu Nov 22 16:22:08 2012
@@ -1,151 +1,151 @@
-STAR=138
-FloatTypeSuffix=113
-OctalLiteral=111
-LOG=37
-CONTAINS=8
-REMOVE=65
-GREATEREQUAL=151
-MARKFAST=41
-MATCHEDTEXT=71
-CONDITION=91
-COUNT=14
-LOGN=100
-DYNAMICANCHORING=57
-NOT=63
-Identifier=123
-ACTION=92
-NOTEQUAL=148
-CLEAR=73
-VBAR=140
-DOUBLELIST=95
-ENDSWITH=62
-RPAREN=125
-CREATE=31
-GREATER=143
-SIN=101
-EXP=99
-CURRENTCOUNT=16
-COS=102
-TAN=103
-TYPELIST=98
-FloatString=86
-LESS=142
-REGEXP=25
-GET=68
-PARTOF=22
-UNMARK=53
-LAST=18
-COMMENT=153
-REMOVEDUPLICATE=66
-UNMARKALL=54
-RBRACK=127
-NEAR=20
-LINE_COMMENT=154
-IntegerTypeSuffix=108
-MARKSCORE=39
-REMOVESTRING=72
-TRANSFER=55
-LCURLY=128
-TRIE=7
-FILTERTYPE=46
-STRINGLIST=97
-MARKONCE=40
-ScriptString=79
-EngineString=80
-WS=152
-WORDTABLE=11
-WORDLIST=10
-AutomataBlockString=82
-FloatingPointLiteral=114
-INTLIST=94
-OR=21
-JavaIDDigit=122
-FLOATLIST=96
-CALL=47
-Annotation=5
-FALSE=106
-LESSEQUAL=150
-RessourceLiteral=118
-VOTE=27
-Letter=121
-EscapeSequence=115
-SIZE=70
-BasicAnnotationType=75
-LBRACK=126
-CharacterLiteral=116
-DEL=36
-ATTRIBUTE=34
-TypeString=83
-Exponent=112
-ASSIGN_EQUAL=144
-RETAINTYPE=45
-AND=12
-TypeSystemString=89
-EXPAND=56
-BlockString=81
-IntString=84
-HexDigit=107
-COLOR=35
-LPAREN=124
-POSITION=24
-IF=28
-AT=131
-LogLevel=76
-CONFIGURE=49
-SLASH=139
-THEN=74
-FILL=33
-COMMA=134
-IS=60
-AMPER=141
-REPLACE=44
-GETLIST=69
-EQUAL=147
-GATHER=32
-INLIST=17
-PLUS=136
-BooleanString=88
-GETFEATURE=52
-DOT=132
-ListIdentifier=6
-PARTOFNEQ=23
-BOOLEANLIST=93
-ADD=64
-MARKTABLE=42
-HexLiteral=109
-XOR=104
-PERCENT=145
-MARK=38
-PARSE=30
-PackageString=78
-OldColor=77
-MARKLAST=43
-MERGE=67
-CONTEXTCOUNT=13
-BEFORE=58
-EXEC=48
-MINUS=137
-AFTER=59
-DecimalLiteral=110
-SEMI=135
-TRUE=105
-FEATURE=29
-SymbolString=90
-COLON=133
-StringLiteral=117
-StringString=87
-SCORE=26
-QUESTION=146
-UnicodeEscape=119
-RCURLY=129
-STARTSWITH=61
-ASSIGN=50
-TOTALCOUNT=15
-DECLARE=9
-DocComment=4
-MOFN=19
-OctalEscape=120
-SETFEATURE=51
-DoubleString=85
-CIRCUMFLEX=130
-ALT_NOTEQUAL=149
+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
+DecimalLiteral=42
+DocComment=43
+DoubleString=44
+ENDSWITH=45
+EQUAL=46
+EXEC=47
+EXP=48
+EngineString=49
+EscapeSequence=50
+Exponent=51
+FALSE=52
+FEATURE=53
+FILL=54
+FILTERTYPE=55
+FLOATLIST=56
+FloatString=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
+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
+RETAINTYPE=120
+RPAREN=121
+RessourceLiteral=122
+SCORE=123
+SEMI=124
+SETFEATURE=125
+SHIFT=126
+SIN=127
+SIZE=128
+SLASH=129
+STAR=130
+STARTSWITH=131
+STRINGLIST=132
+ScriptString=133
+StringLiteral=134
+StringString=135
+SymbolString=136
+TAN=137
+THEN=138
+TOTALCOUNT=139
+TRANSFER=140
+TRIE=141
+TRUE=142
+TYPELIST=143
+TypeString=144
+TypeSystemString=145
+UNMARK=146
+UNMARKALL=147
+UnicodeEscape=148
+VBAR=149
+VOTE=150
+WORDLIST=151
+WORDTABLE=152
+WS=153
+XOR=154
Modified: uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/antlr3/org/apache/uima/textmarker/parser/TextMarkerParser.g
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/antlr3/org/apache/uima/textmarker/parser/TextMarkerParser.g?rev=1412604&r1=1412603&r2=1412604&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/antlr3/org/apache/uima/textmarker/parser/TextMarkerParser.g (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/antlr3/org/apache/uima/textmarker/parser/TextMarkerParser.g Thu Nov 22 16:22:08 2012
@@ -1112,7 +1112,7 @@ action returns [AbstractTextMarkerActio
| a = actionGetList
| a = actionMatchedText
| a = actionClear
- | a = actionExpand
+ | a = actionShift
| a = actionConfigure
| a = actionDynamicAnchoring
| (a = externalAction)=> a = externalAction
@@ -1252,12 +1252,12 @@ List<NumberExpression> list = new ArrayL
{action = ActionFactory.createMarkAction(null, type, list, $blockDeclaration::env);}
;
-actionExpand returns [AbstractTextMarkerAction action = null]
+actionShift returns [AbstractTextMarkerAction action = null]
@init {
List<NumberExpression> list = new ArrayList<NumberExpression>();
}
:
- EXPAND LPAREN
+ SHIFT LPAREN
type = typeExpression
(
COMMA (index = numberExpression) => index = numberExpression
@@ -1265,7 +1265,7 @@ List<NumberExpression> list = new ArrayL
)*
RPAREN
- {action = ActionFactory.createExpandAction(type, list,$blockDeclaration::env);}
+ {action = ActionFactory.createShiftAction(type, list,$blockDeclaration::env);}
;
Modified: uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/ActionFactory.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/ActionFactory.java?rev=1412604&r1=1412603&r2=1412604&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/ActionFactory.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/ActionFactory.java Thu Nov 22 16:22:08 2012
@@ -229,9 +229,9 @@ public class ActionFactory {
return new ClearAction(var == null ? null : var.getText());
}
- public static AbstractTextMarkerAction createExpandAction(TypeExpression type,
+ public static AbstractTextMarkerAction createShiftAction(TypeExpression type,
List<NumberExpression> list, TextMarkerBlock env) {
- return new ExpandAction(type, list);
+ return new ShiftAction(type, list);
}
public static AbstractTextMarkerAction createDynamicAnchoringAction(BooleanExpression active,
Copied: uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/ShiftAction.java (from r1411692, uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/ExpandAction.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/ShiftAction.java?p2=uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/ShiftAction.java&p1=uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/ExpandAction.java&r1=1411692&r2=1412604&rev=1412604&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/ExpandAction.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/ShiftAction.java Thu Nov 22 16:22:08 2012
@@ -29,9 +29,9 @@ import org.apache.uima.textmarker.rule.R
import org.apache.uima.textmarker.rule.RuleMatch;
import org.apache.uima.textmarker.visitor.InferenceCrowd;
-public class ExpandAction extends MarkAction {
+public class ShiftAction extends MarkAction {
- public ExpandAction(TypeExpression type, List<NumberExpression> list) {
+ public ShiftAction(TypeExpression type, List<NumberExpression> list) {
super(type, null, list);
}
Modified: uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/verbalize/ActionVerbalizer.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/verbalize/ActionVerbalizer.java?rev=1412604&r1=1412603&r2=1412604&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/verbalize/ActionVerbalizer.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/verbalize/ActionVerbalizer.java Thu Nov 22 16:22:08 2012
@@ -28,7 +28,7 @@ import org.apache.uima.textmarker.action
import org.apache.uima.textmarker.action.ColorAction;
import org.apache.uima.textmarker.action.CreateAction;
import org.apache.uima.textmarker.action.DelAction;
-import org.apache.uima.textmarker.action.ExpandAction;
+import org.apache.uima.textmarker.action.ShiftAction;
import org.apache.uima.textmarker.action.FillAction;
import org.apache.uima.textmarker.action.FilterTypeAction;
import org.apache.uima.textmarker.action.GatherAction;
@@ -81,8 +81,8 @@ public class ActionVerbalizer {
return "LOG";
} else if (action instanceof MarkOnceAction) {
return "MARKONCE";
- } else if (action instanceof ExpandAction) {
- return "EXPAND";
+ } else if (action instanceof ShiftAction) {
+ return "SHIFT";
} else if (action instanceof MarkAction) {
MarkAction a = (MarkAction) action;
if (a.getScore() != null) {
@@ -218,13 +218,13 @@ public class ActionVerbalizer {
string = "," + verbalizer.verbalizeExpressionList(a.getList());
}
return "MARKONCE(" + verbalizer.verbalize(a.getType()) + string + ")";
- } else if (action instanceof ExpandAction) {
- ExpandAction a = (ExpandAction) action;
+ } else if (action instanceof ShiftAction) {
+ ShiftAction a = (ShiftAction) action;
String string = "";
if (a.getList() != null && !a.getList().isEmpty()) {
string = "," + verbalizer.verbalizeExpressionList(a.getList());
}
- return "EXPAND(" + verbalizer.verbalize(a.getType()) + string + ")";
+ return "SHIFT(" + verbalizer.verbalize(a.getType()) + string + ")";
} else if (action instanceof MarkAction) {
MarkAction a = (MarkAction) action;
if (a.getScore() != null) {