Author: schor
Date: Sat Jul 13 17:53:46 2013
New Revision: 1502829
URL: http://svn.apache.org/r1502829
Log:
[UIMA-2511]
Modified:
uima/uimaj/trunk/uimaj-tools/src/main/resources/org/apache/uima/tools/jcasgen/jMergeCtl.xml
Modified:
uima/uimaj/trunk/uimaj-tools/src/main/resources/org/apache/uima/tools/jcasgen/jMergeCtl.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-tools/src/main/resources/org/apache/uima/tools/jcasgen/jMergeCtl.xml?rev=1502829&r1=1502828&r2=1502829&view=diff
==============================================================================
---
uima/uimaj/trunk/uimaj-tools/src/main/resources/org/apache/uima/tools/jcasgen/jMergeCtl.xml
(original)
+++
uima/uimaj/trunk/uimaj-tools/src/main/resources/org/apache/uima/tools/jcasgen/jMergeCtl.xml
Sat Jul 13 17:53:46 2013
@@ -19,6 +19,9 @@
* under the License.
***************************************************************
-->
+ <!-- See http://www.ibm.com/developerworks/library/os-ecemf3/
+ for info on this format -->
+
<merge:options
indent=" "
braceStyle="matching"
@@ -26,6 +29,11 @@
xmlns:merge="http://www.eclipse.org/org/eclipse/emf/codegen/jmerge/Options";>
<merge:dictionaryPattern
+ name="featureGetSetMembers"
+ select="Member/getComment"
+ match="^\s*/\*\*\s(?:g|s)(etter)\sfor\s"/>
+
+ <merge:dictionaryPattern
name="generatedMembers"
select="Member/getComment"
match="\s*@\s*(gen)erated\s*\n"/>
@@ -51,7 +59,7 @@
match="\s*@\s*generated\s*(modifiable)\s*\n"/>
<merge:dictionaryPattern
- name="generatedModifiableMembers"
+ name="generatedModifiableMembers1"
select="Member/getComment"
match="\s*@\s*generated\s*(modifiable)\s*\*/"/>
@@ -85,6 +93,12 @@
sourceTransfer="(\* Updated by JCasGen)"
targetMarkup="^gen$"
targetPut="Member/setComment"/>
+
+ <merge:pull
+ sourceMarkup="^etter$"
+ sourceGet="Member/getComment"
+ targetMarkup="^etter$"
+ targetPut="Member/setComment"/>
<merge:pull
sourceGet="Initializer/getBody"
