Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpelder2007-05-09 10:04:22 -0400
committerpelder2007-05-09 10:04:22 -0400
commitae7ecbc6e4e2f6559b37696db329830b621ef1fa (patch)
tree8155dff7169d34164d63635e3093a32d6e11604d /doc/org.eclipse.jet.doc/references
parent269b1296015b580d2ead157245a5bc42e922b999 (diff)
downloadorg.eclipse.jet-ae7ecbc6e4e2f6559b37696db329830b621ef1fa.tar.gz
org.eclipse.jet-ae7ecbc6e4e2f6559b37696db329830b621ef1fa.tar.xz
org.eclipse.jet-ae7ecbc6e4e2f6559b37696db329830b621ef1fa.zip
[176402] <java:merge> tag NPE's when attempting to merging Java 5 code
Diffstat (limited to 'doc/org.eclipse.jet.doc/references')
-rw-r--r--doc/org.eclipse.jet.doc/references/taglibs/javaTags/mergeTag.html6
1 files changed, 5 insertions, 1 deletions
diff --git a/doc/org.eclipse.jet.doc/references/taglibs/javaTags/mergeTag.html b/doc/org.eclipse.jet.doc/references/taglibs/javaTags/mergeTag.html
index 1fb457f..bb27b58 100644
--- a/doc/org.eclipse.jet.doc/references/taglibs/javaTags/mergeTag.html
+++ b/doc/org.eclipse.jet.doc/references/taglibs/javaTags/mergeTag.html
@@ -33,7 +33,7 @@
<TR>
<TD width="10%">full tag</TD>
<TD><SPAN style="font-family: monospace">
- &lt;java:merge rules=&quot;<I>value</I>&quot; rulesContext=&quot;<I>value</I>&quot;/&gt;<br>
+ &lt;java:merge rules=&quot;<I>value</I>&quot; rulesContext=&quot;<I>value</I>&quot; facade=&quot;<I>value</I>&quot;/&gt;<br>
</SPAN></TD>
</TR>
</TBODY>
@@ -52,6 +52,10 @@
<TD width="10%">rulesContext</TD>
<TD><BR> The context for resolving relative 'rules' URLs. Possible values are 'transform' or 'workspace'. If the value is 'transform', then the 'rules' URL is treated as a JET project relative path. If the value is 'workspace', then the 'rules' URL is treated as an Eclipse workspace relative path. The default is 'transform'.<BR> </TD>
</TR>
+ <TR>
+ <TD width="10%">facade</TD>
+ <TD><BR> Specify the merge facade class to use. Default is for EMF 2.2 is org.eclipse.emf.codegen.merge.java.facade.jdom.JDOMFacadeHelper. For EMF 2.3 and later, the default is org.eclipse.emf.codegen.merge.java.facade.ast.ASTFacadeHelper.<BR> </TD>
+ </TR>
</TBODY>
</TABLE>
<HR>

Back to the top