Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2011-10-12 14:53:07 +0000
committerEike Stepper2011-10-12 14:53:07 +0000
commite5fec2df58d6856fd64a84c93567cc2203dca2ed (patch)
tree77300935e38d377be81a45b9b9d68b73aef8cec9 /plugins
parentb1425f26c598156a711e7f9e5f29b563b49ecefc (diff)
downloadcdo-e5fec2df58d6856fd64a84c93567cc2203dca2ed.tar.gz
cdo-e5fec2df58d6856fd64a84c93567cc2203dca2ed.tar.xz
cdo-e5fec2df58d6856fd64a84c93567cc2203dca2ed.zip
xml snippets
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/images/editor-top-left-java.png (renamed from plugins/org.eclipse.emf.cdo.doc/images/editor-top-left.png)bin689 -> 689 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/images/editor-top-left-xml.pngbin0 -> 640 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/index-all.html34
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/class-use/CDOLock.html9
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/class-use/CDOBranch.html8
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOCommitData.html29
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/package-use.html7
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lock/CDOLockUtil.html19
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lock/class-use/CDOLockState.html83
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lock/package-use.html25
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/impl/CDOResourceFolderImpl.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/impl/CDOResourceNodeImpl.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/impl/AnnotationImpl.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/impl/ModelElementImpl.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/IStoreAccessor.CommitContext.html30
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOCommitContext.html173
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/internal/cdo/CDOObjectImpl.html50
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/images/editor-top-left-java.png (renamed from plugins/org.eclipse.emf.cdo.releng.doc/images/editor-top-left.png)bin689 -> 689 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/images/editor-top-left-xml.pngbin0 -> 640 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecore12
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecorediag132
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ArticleFactory.java16
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ArticlePackage.java271
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/EmbeddableElement.java17
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Formatter.java71
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/JavaFormatter.java18
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Snippet.java30
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/XmlFormatter.java52
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticleFactoryImpl.java28
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticlePackageImpl.java124
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/EmbeddableElementImpl.java55
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/FormatterImpl.java246
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavaFormatterImpl.java113
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/SnippetImpl.java251
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/XmlFormatterImpl.java409
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleAdapterFactory.java63
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleSwitch.java290
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.help/html/Overview.html3
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.help/html/reference/index.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.help/html/writer/examples/CreatingTransportConnections.html8
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.help/html/writer/examples/XmlSnippets.html310
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.help/html/writer/examples/index.html3
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.help/html/writer/index.html3
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.help/images/editor-top-left-java.png (renamed from plugins/org.eclipse.emf.cdo.releng.help/images/editor-top-left.png)bin689 -> 689 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.help/images/editor-top-left-xml.pngbin0 -> 640 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/examples/XmlSnippets.java66
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/help/toc.html1
-rw-r--r--plugins/org.eclipse.emf.cdo.server.product/config/cdo-server.xml2
-rw-r--r--plugins/org.eclipse.net4j.db.doc/images/editor-top-left-java.png (renamed from plugins/org.eclipse.net4j.db.doc/images/editor-top-left.png)bin689 -> 689 bytes
-rw-r--r--plugins/org.eclipse.net4j.db.doc/images/editor-top-left-xml.pngbin0 -> 640 bytes
-rw-r--r--plugins/org.eclipse.net4j.doc/images/editor-top-left-java.png (renamed from plugins/org.eclipse.net4j.doc/images/editor-top-left.png)bin689 -> 689 bytes
-rw-r--r--plugins/org.eclipse.net4j.doc/images/editor-top-left-xml.pngbin0 -> 640 bytes
-rw-r--r--plugins/org.eclipse.net4j.util.doc/images/editor-top-left-java.png (renamed from plugins/org.eclipse.net4j.util.doc/images/editor-top-left.png)bin689 -> 689 bytes
-rw-r--r--plugins/org.eclipse.net4j.util.doc/images/editor-top-left-xml.pngbin0 -> 640 bytes
56 files changed, 2750 insertions, 334 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/images/editor-top-left.png b/plugins/org.eclipse.emf.cdo.doc/images/editor-top-left-java.png
index 3405aff3b1..3405aff3b1 100644
--- a/plugins/org.eclipse.emf.cdo.doc/images/editor-top-left.png
+++ b/plugins/org.eclipse.emf.cdo.doc/images/editor-top-left-java.png
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.doc/images/editor-top-left-xml.png b/plugins/org.eclipse.emf.cdo.doc/images/editor-top-left-xml.png
new file mode 100644
index 0000000000..de44ef29d2
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/images/editor-top-left-xml.png
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/index-all.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/index-all.html
index d8cae9b04d..d754cbad94 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/index-all.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/index-all.html
@@ -1567,6 +1567,9 @@ Method in interface org.eclipse.emf.cdo.common.revision.delta.<A HREF="./org/ecl
<DT><A HREF="./org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.html#copy()"><B>copy()</B></A> -
Method in interface org.eclipse.emf.cdo.common.revision.delta.<A HREF="./org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDORevisionDelta</A>
<DD>&nbsp;
+<DT><A HREF="./org/eclipse/emf/cdo/common/lock/CDOLockUtil.html#copyLockState(org.eclipse.emf.cdo.common.lock.CDOLockState)"><B>copyLockState(CDOLockState)</B></A> -
+Static method in class org.eclipse.emf.cdo.common.lock.<A HREF="./org/eclipse/emf/cdo/common/lock/CDOLockUtil.html" title="class in org.eclipse.emf.cdo.common.lock">CDOLockUtil</A>
+<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/cdo/common/revision/CDORevisionUtil.html#copyRevisable(org.eclipse.emf.cdo.common.revision.CDORevisable)"><B>copyRevisable(CDORevisable)</B></A> -
Static method in class org.eclipse.emf.cdo.common.revision.<A HREF="./org/eclipse/emf/cdo/common/revision/CDORevisionUtil.html" title="class in org.eclipse.emf.cdo.common.revision">CDORevisionUtil</A>
<DD>&nbsp;
@@ -1869,6 +1872,9 @@ Method in class org.eclipse.emf.internal.cdo.<A HREF="./org/eclipse/emf/internal
<DT><A HREF="./org/eclipse/emf/cdo/server/db/mapping/IMappingStrategy.html#createListMapping(org.eclipse.emf.ecore.EClass, org.eclipse.emf.ecore.EStructuralFeature)"><B>createListMapping(EClass, EStructuralFeature)</B></A> -
Method in interface org.eclipse.emf.cdo.server.db.mapping.<A HREF="./org/eclipse/emf/cdo/server/db/mapping/IMappingStrategy.html" title="interface in org.eclipse.emf.cdo.server.db.mapping">IMappingStrategy</A>
<DD>Factory for value mappings of multi-valued-attributes.
+<DT><A HREF="./org/eclipse/emf/internal/cdo/CDOObjectImpl.html#createLock(org.eclipse.emf.spi.cdo.InternalCDOObject, org.eclipse.net4j.util.concurrent.IRWLockManager.LockType)"><B>createLock(InternalCDOObject, IRWLockManager.LockType)</B></A> -
+Static method in class org.eclipse.emf.internal.cdo.<A HREF="./org/eclipse/emf/internal/cdo/CDOObjectImpl.html" title="class in org.eclipse.emf.internal.cdo">CDOObjectImpl</A>
+<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/cdo/common/lock/CDOLockUtil.html#createLockArea(java.lang.String, java.lang.String, org.eclipse.emf.cdo.common.branch.CDOBranchPoint, boolean, java.util.Map)"><B>createLockArea(String, String, CDOBranchPoint, boolean, Map&lt;CDOID, IDurableLockingManager.LockGrade&gt;)</B></A> -
Static method in class org.eclipse.emf.cdo.common.lock.<A HREF="./org/eclipse/emf/cdo/common/lock/CDOLockUtil.html" title="class in org.eclipse.emf.cdo.common.lock">CDOLockUtil</A>
<DD>&nbsp;
@@ -3157,6 +3163,9 @@ Method in interface org.eclipse.emf.cdo.common.lock.<A HREF="./org/eclipse/emf/c
<DT><A HREF="./org/eclipse/emf/cdo/common/revision/CDOIDAndBranch.html#getBranch()"><B>getBranch()</B></A> -
Method in interface org.eclipse.emf.cdo.common.revision.<A HREF="./org/eclipse/emf/cdo/common/revision/CDOIDAndBranch.html" title="interface in org.eclipse.emf.cdo.common.revision">CDOIDAndBranch</A>
<DD>&nbsp;
+<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOCommitContext.html#getBranch()"><B>getBranch()</B></A> -
+Method in interface org.eclipse.emf.cdo.transaction.<A HREF="./org/eclipse/emf/cdo/transaction/CDOCommitContext.html" title="interface in org.eclipse.emf.cdo.transaction">CDOCommitContext</A>
+<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOPushTransaction.html#getBranch()"><B>getBranch()</B></A> -
Method in class org.eclipse.emf.cdo.transaction.<A HREF="./org/eclipse/emf/cdo/transaction/CDOPushTransaction.html" title="class in org.eclipse.emf.cdo.transaction">CDOPushTransaction</A>
<DD>&nbsp;
@@ -3471,6 +3480,9 @@ Method in interface org.eclipse.emf.cdo.common.commit.<A HREF="./org/eclipse/emf
<DT><A HREF="./org/eclipse/emf/cdo/server/IStoreAccessor.CommitContext.html#getCommitComment()"><B>getCommitComment()</B></A> -
Method in interface org.eclipse.emf.cdo.server.<A HREF="./org/eclipse/emf/cdo/server/IStoreAccessor.CommitContext.html" title="interface in org.eclipse.emf.cdo.server">IStoreAccessor.CommitContext</A>
<DD>&nbsp;
+<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOCommitContext.html#getCommitComment()"><B>getCommitComment()</B></A> -
+Method in interface org.eclipse.emf.cdo.transaction.<A HREF="./org/eclipse/emf/cdo/transaction/CDOCommitContext.html" title="interface in org.eclipse.emf.cdo.transaction">CDOCommitContext</A>
+<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOPushTransaction.html#getCommitComment()"><B>getCommitComment()</B></A> -
Method in class org.eclipse.emf.cdo.transaction.<A HREF="./org/eclipse/emf/cdo/transaction/CDOPushTransaction.html" title="class in org.eclipse.emf.cdo.transaction">CDOPushTransaction</A>
<DD>&nbsp;
@@ -3480,6 +3492,9 @@ Method in interface org.eclipse.emf.cdo.transaction.<A HREF="./org/eclipse/emf/c
<DT><A HREF="./org/eclipse/emf/cdo/server/StoreThreadLocal.html#getCommitContext()"><B>getCommitContext()</B></A> -
Static method in class org.eclipse.emf.cdo.server.<A HREF="./org/eclipse/emf/cdo/server/StoreThreadLocal.html" title="class in org.eclipse.emf.cdo.server">StoreThreadLocal</A>
<DD>&nbsp;
+<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOCommitContext.html#getCommitData()"><B>getCommitData()</B></A> -
+Method in interface org.eclipse.emf.cdo.transaction.<A HREF="./org/eclipse/emf/cdo/transaction/CDOCommitContext.html" title="interface in org.eclipse.emf.cdo.transaction">CDOCommitContext</A>
+<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html#getCommitInfo(long)"><B>getCommitInfo(long)</B></A> -
Method in interface org.eclipse.emf.cdo.common.commit.<A HREF="./org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfoManager</A>
<DD>&nbsp;
@@ -4385,6 +4400,16 @@ Method in interface org.eclipse.emf.cdo.common.lock.<A HREF="./org/eclipse/emf/c
<DT><A HREF="./org/eclipse/emf/cdo/common/lock/IDurableLockingManager.LockArea.html#getLocks()"><B>getLocks()</B></A> -
Method in interface org.eclipse.emf.cdo.common.lock.<A HREF="./org/eclipse/emf/cdo/common/lock/IDurableLockingManager.LockArea.html" title="interface in org.eclipse.emf.cdo.common.lock">IDurableLockingManager.LockArea</A>
<DD>&nbsp;
+<DT><A HREF="./org/eclipse/emf/cdo/server/IStoreAccessor.CommitContext.html#getLocksOnNewObjects()"><B>getLocksOnNewObjects()</B></A> -
+Method in interface org.eclipse.emf.cdo.server.<A HREF="./org/eclipse/emf/cdo/server/IStoreAccessor.CommitContext.html" title="interface in org.eclipse.emf.cdo.server">IStoreAccessor.CommitContext</A>
+<DD>Returns an array of the locks on the new objects that are part of the commit operation represented by this
+ <code>CommitContext</code>.
+<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOCommitContext.html#getLocksOnNewObjects()"><B>getLocksOnNewObjects()</B></A> -
+Method in interface org.eclipse.emf.cdo.transaction.<A HREF="./org/eclipse/emf/cdo/transaction/CDOCommitContext.html" title="interface in org.eclipse.emf.cdo.transaction">CDOCommitContext</A>
+<DD>&nbsp;
+<DT><A HREF="./org/eclipse/emf/internal/cdo/CDOObjectImpl.html#getLockState(org.eclipse.emf.spi.cdo.InternalCDOObject)"><B>getLockState(InternalCDOObject)</B></A> -
+Static method in class org.eclipse.emf.internal.cdo.<A HREF="./org/eclipse/emf/internal/cdo/CDOObjectImpl.html" title="class in org.eclipse.emf.internal.cdo">CDOObjectImpl</A>
+<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/cdo/common/lock/CDOLockChangeInfo.html#getLockStates()"><B>getLockStates()</B></A> -
Method in interface org.eclipse.emf.cdo.common.lock.<A HREF="./org/eclipse/emf/cdo/common/lock/CDOLockChangeInfo.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockChangeInfo</A>
<DD>&nbsp;
@@ -5905,6 +5930,9 @@ Method in interface org.eclipse.emf.cdo.server.<A HREF="./org/eclipse/emf/cdo/se
<DT><A HREF="./org/eclipse/emf/cdo/session/remote/CDORemoteSession.html#getUserID()"><B>getUserID()</B></A> -
Method in interface org.eclipse.emf.cdo.session.remote.<A HREF="./org/eclipse/emf/cdo/session/remote/CDORemoteSession.html" title="interface in org.eclipse.emf.cdo.session.remote">CDORemoteSession</A>
<DD>Returns the user ID of this remote session.
+<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOCommitContext.html#getUserID()"><B>getUserID()</B></A> -
+Method in interface org.eclipse.emf.cdo.transaction.<A HREF="./org/eclipse/emf/cdo/transaction/CDOCommitContext.html" title="interface in org.eclipse.emf.cdo.transaction">CDOCommitContext</A>
+<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/cdo/util/CDOURIData.html#getUserName()"><B>getUserName()</B></A> -
Method in class org.eclipse.emf.cdo.util.<A HREF="./org/eclipse/emf/cdo/util/CDOURIData.html" title="class in org.eclipse.emf.cdo.util">CDOURIData</A>
<DD>&nbsp;
@@ -5992,6 +6020,9 @@ Method in interface org.eclipse.emf.cdo.common.<A HREF="./org/eclipse/emf/cdo/co
<DT><A HREF="./org/eclipse/emf/cdo/common/lock/CDOLockOwner.html#getViewID()"><B>getViewID()</B></A> -
Method in interface org.eclipse.emf.cdo.common.lock.<A HREF="./org/eclipse/emf/cdo/common/lock/CDOLockOwner.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockOwner</A>
<DD>&nbsp;
+<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOCommitContext.html#getViewID()"><B>getViewID()</B></A> -
+Method in interface org.eclipse.emf.cdo.transaction.<A HREF="./org/eclipse/emf/cdo/transaction/CDOCommitContext.html" title="interface in org.eclipse.emf.cdo.transaction">CDOCommitContext</A>
+<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOPushTransaction.html#getViewID()"><B>getViewID()</B></A> -
Method in class org.eclipse.emf.cdo.transaction.<A HREF="./org/eclipse/emf/cdo/transaction/CDOPushTransaction.html" title="class in org.eclipse.emf.cdo.transaction">CDOPushTransaction</A>
<DD>&nbsp;
@@ -6388,6 +6419,9 @@ Method in interface org.eclipse.emf.cdo.transaction.<A HREF="./org/eclipse/emf/c
<DT><A HREF="./org/eclipse/emf/cdo/ui/widgets/SessionComposite.html#isAutomaticRegistry()"><B>isAutomaticRegistry()</B></A> -
Method in class org.eclipse.emf.cdo.ui.widgets.<A HREF="./org/eclipse/emf/cdo/ui/widgets/SessionComposite.html" title="class in org.eclipse.emf.cdo.ui.widgets">SessionComposite</A>
<DD>&nbsp;
+<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOCommitContext.html#isAutoReleaseLocks()"><B>isAutoReleaseLocks()</B></A> -
+Method in interface org.eclipse.emf.cdo.transaction.<A HREF="./org/eclipse/emf/cdo/transaction/CDOCommitContext.html" title="interface in org.eclipse.emf.cdo.transaction">CDOCommitContext</A>
+<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/cdo/server/IStoreAccessor.CommitContext.html#isAutoReleaseLocksEnabled()"><B>isAutoReleaseLocksEnabled()</B></A> -
Method in interface org.eclipse.emf.cdo.server.<A HREF="./org/eclipse/emf/cdo/server/IStoreAccessor.CommitContext.html" title="interface in org.eclipse.emf.cdo.server">IStoreAccessor.CommitContext</A>
<DD>&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/class-use/CDOLock.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/class-use/CDOLock.html
index 3ba53df756..8669a8874d 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/class-use/CDOLock.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/class-use/CDOLock.html
@@ -179,6 +179,15 @@ Uses of <A HREF="../../../../../org/eclipse/emf/cdo/CDOLock.html" title="interfa
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;<A HREF="../../../../../org/eclipse/emf/cdo/CDOLock.html" title="interface in org.eclipse.emf.cdo">CDOLock</A></CODE></FONT></TD>
+<TD><CODE><B>CDOObjectImpl.</B><B><A HREF="../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#createLock(org.eclipse.emf.spi.cdo.InternalCDOObject, org.eclipse.net4j.util.concurrent.IRWLockManager.LockType)">createLock</A></B>(org.eclipse.emf.spi.cdo.InternalCDOObject&nbsp;object,
+ <A HREF="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IRWLockManager.LockType.html?is-external=true" title="class or interface in org.eclipse.net4j.util.concurrent">IRWLockManager.LockType</A>&nbsp;type)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
</TABLE>
&nbsp;
<P>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/class-use/CDOBranch.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/class-use/CDOBranch.html
index ab7e7ce4d7..cad64c0d5c 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/class-use/CDOBranch.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/class-use/CDOBranch.html
@@ -890,6 +890,14 @@ Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranc
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;<A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</A></CODE></FONT></TD>
+<TD><CODE><B>CDOCommitContext.</B><B><A HREF="../../../../../../../org/eclipse/emf/cdo/transaction/CDOCommitContext.html#getBranch()">getBranch</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</A></CODE></FONT></TD>
<TD><CODE><B>CDOPushTransaction.</B><B><A HREF="../../../../../../../org/eclipse/emf/cdo/transaction/CDOPushTransaction.html#getBranch()">getBranch</A></B>()</CODE>
<BR>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOCommitData.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOCommitData.html
index c6f47789f5..bb9c9049c1 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOCommitData.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOCommitData.html
@@ -101,6 +101,10 @@ Packages that use <A HREF="../../../../../../../org/eclipse/emf/cdo/common/commi
<TD><A HREF="#org.eclipse.emf.cdo.session"><B>org.eclipse.emf.cdo.session</B></A></TD>
<TD>Client concepts for dealing with sessions to CDO repositories.&nbsp;</TD>
</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><A HREF="#org.eclipse.emf.cdo.transaction"><B>org.eclipse.emf.cdo.transaction</B></A></TD>
+<TD>Client concepts for dealing with transactions, distributed transactions and their save points.&nbsp;</TD>
+</TR>
</TABLE>
&nbsp;
<P>
@@ -197,6 +201,31 @@ Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommi
</TABLE>
&nbsp;
<P>
+<A NAME="org.eclipse.emf.cdo.transaction"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitData</A> in <A HREF="../../../../../../../org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A></FONT></TH>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../../../../org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A> that return <A HREF="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitData</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitData</A></CODE></FONT></TD>
+<TD><CODE><B>CDOCommitContext.</B><B><A HREF="../../../../../../../org/eclipse/emf/cdo/transaction/CDOCommitContext.html#getCommitData()">getCommitData</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
<HR>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/package-use.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/package-use.html
index 51d812b788..f018afc51c 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/package-use.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/package-use.html
@@ -393,6 +393,13 @@ Classes in <A HREF="../../../../../../org/eclipse/emf/cdo/common/commit/package-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Provides consumers with <A HREF="../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetData.html" title="interface in org.eclipse.emf.cdo.common.commit"><CODE>change set data</CODE></A> structures.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../../../../../org/eclipse/emf/cdo/common/commit/class-use/CDOCommitData.html#org.eclipse.emf.cdo.transaction"><B>CDOCommitData</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<A HREF="../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetData.html" title="interface in org.eclipse.emf.cdo.common.commit"><CODE>Change set data</CODE></A> with detailed information about new <A HREF="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitData.html#getNewPackageUnits()"><CODE>package
+ units</CODE></A>.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../../org/eclipse/emf/cdo/common/commit/class-use/CDOCommitInfo.html#org.eclipse.emf.cdo.transaction"><B>CDOCommitInfo</B></A></B>
<BR>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lock/CDOLockUtil.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lock/CDOLockUtil.html
index 6ce99729c1..3e41118812 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lock/CDOLockUtil.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lock/CDOLockUtil.html
@@ -132,6 +132,14 @@ Various static methods that may help with classes related to CDO locks.
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;<A HREF="../../../../../../org/eclipse/emf/cdo/common/lock/CDOLockState.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockState</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/cdo/common/lock/CDOLockUtil.html#copyLockState(org.eclipse.emf.cdo.common.lock.CDOLockState)">copyLockState</A></B>(<A HREF="../../../../../../org/eclipse/emf/cdo/common/lock/CDOLockState.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockState</A>&nbsp;lockState)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>static&nbsp;<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</A></CODE></FONT></TD>
<TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/cdo/common/lock/CDOLockUtil.html#createDurableLockingID()">createDurableLockingID</A></B>()</CODE>
@@ -247,6 +255,17 @@ Various static methods that may help with classes related to CDO locks.
</TR>
</TABLE>
+<A NAME="copyLockState(org.eclipse.emf.cdo.common.lock.CDOLockState)"><!-- --></A><H3>
+copyLockState</H3>
+<PRE>
+public static <A HREF="../../../../../../org/eclipse/emf/cdo/common/lock/CDOLockState.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockState</A> <B>copyLockState</B>(<A HREF="../../../../../../org/eclipse/emf/cdo/common/lock/CDOLockState.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockState</A>&nbsp;lockState)</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
<A NAME="createLockState(java.lang.Object)"><!-- --></A><H3>
createLockState</H3>
<PRE>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lock/class-use/CDOLockState.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lock/class-use/CDOLockState.html
index 0eab5280b4..303dd81524 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lock/class-use/CDOLockState.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lock/class-use/CDOLockState.html
@@ -102,6 +102,14 @@ Packages that use <A HREF="../../../../../../../org/eclipse/emf/cdo/common/lock/
<TD>Common concepts for dealing with protocols and CDO-specific I/O.&nbsp;</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><A HREF="#org.eclipse.emf.cdo.server"><B>org.eclipse.emf.cdo.server</B></A></TD>
+<TD>Server concepts for dealing with repositories and stores.&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><A HREF="#org.eclipse.emf.cdo.transaction"><B>org.eclipse.emf.cdo.transaction</B></A></TD>
+<TD>Client concepts for dealing with transactions, distributed transactions and their save points.&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><A HREF="#org.eclipse.emf.internal.cdo"><B>org.eclipse.emf.internal.cdo</B></A></TD>
<TD>Exposes <A HREF="../../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html" title="class in org.eclipse.emf.internal.cdo"><CODE>CDOObjectImpl</CODE></A> for extension in generated EMF models.&nbsp;</TD>
</TR>
@@ -150,6 +158,14 @@ Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/lock/CDOLockSta
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>static&nbsp;<A HREF="../../../../../../../org/eclipse/emf/cdo/common/lock/CDOLockState.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockState</A></CODE></FONT></TD>
+<TD><CODE><B>CDOLockUtil.</B><B><A HREF="../../../../../../../org/eclipse/emf/cdo/common/lock/CDOLockUtil.html#copyLockState(org.eclipse.emf.cdo.common.lock.CDOLockState)">copyLockState</A></B>(<A HREF="../../../../../../../org/eclipse/emf/cdo/common/lock/CDOLockState.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockState</A>&nbsp;lockState)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;<A HREF="../../../../../../../org/eclipse/emf/cdo/common/lock/CDOLockState.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockState</A></CODE></FONT></TD>
<TD><CODE><B>CDOLockUtil.</B><B><A HREF="../../../../../../../org/eclipse/emf/cdo/common/lock/CDOLockUtil.html#createLockState(java.lang.Object)">createLockState</A></B>(<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A>&nbsp;target)</CODE>
<BR>
@@ -181,6 +197,14 @@ Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/lock/CDOLockSta
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;<A HREF="../../../../../../../org/eclipse/emf/cdo/common/lock/CDOLockState.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockState</A></CODE></FONT></TD>
+<TD><CODE><B>CDOLockUtil.</B><B><A HREF="../../../../../../../org/eclipse/emf/cdo/common/lock/CDOLockUtil.html#copyLockState(org.eclipse.emf.cdo.common.lock.CDOLockState)">copyLockState</A></B>(<A HREF="../../../../../../../org/eclipse/emf/cdo/common/lock/CDOLockState.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockState</A>&nbsp;lockState)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>static&nbsp;<A HREF="../../../../../../../org/eclipse/emf/cdo/common/lock/CDOLockChangeInfo.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockChangeInfo</A></CODE></FONT></TD>
<TD><CODE><B>CDOLockUtil.</B><B><A HREF="../../../../../../../org/eclipse/emf/cdo/common/lock/CDOLockUtil.html#createLockChangeInfo(long, org.eclipse.emf.cdo.common.CDOCommonView, org.eclipse.emf.cdo.common.branch.CDOBranch, org.eclipse.emf.cdo.common.lock.CDOLockChangeInfo.Operation, org.eclipse.net4j.util.concurrent.IRWLockManager.LockType, org.eclipse.emf.cdo.common.lock.CDOLockState[])">createLockChangeInfo</A></B>(long&nbsp;timestamp,
<A HREF="../../../../../../../org/eclipse/emf/cdo/common/CDOCommonView.html" title="interface in org.eclipse.emf.cdo.common">CDOCommonView</A>&nbsp;view,
@@ -249,6 +273,57 @@ Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/lock/CDOLockSta
</TABLE>
&nbsp;
<P>
+<A NAME="org.eclipse.emf.cdo.server"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/lock/CDOLockState.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockState</A> in <A HREF="../../../../../../../org/eclipse/emf/cdo/server/package-summary.html">org.eclipse.emf.cdo.server</A></FONT></TH>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../../../../org/eclipse/emf/cdo/server/package-summary.html">org.eclipse.emf.cdo.server</A> that return <A HREF="../../../../../../../org/eclipse/emf/cdo/common/lock/CDOLockState.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockState</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../../../../../org/eclipse/emf/cdo/common/lock/CDOLockState.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockState</A>[]</CODE></FONT></TD>
+<TD><CODE><B>IStoreAccessor.CommitContext.</B><B><A HREF="../../../../../../../org/eclipse/emf/cdo/server/IStoreAccessor.CommitContext.html#getLocksOnNewObjects()">getLocksOnNewObjects</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns an array of the locks on the new objects that are part of the commit operation represented by this
+ <code>CommitContext</code>.</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+<A NAME="org.eclipse.emf.cdo.transaction"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/lock/CDOLockState.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockState</A> in <A HREF="../../../../../../../org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A></FONT></TH>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../../../../org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A> that return types with arguments of type <A HREF="../../../../../../../org/eclipse/emf/cdo/common/lock/CDOLockState.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockState</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</A>&lt;<A HREF="../../../../../../../org/eclipse/emf/cdo/common/lock/CDOLockState.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockState</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B>CDOCommitContext.</B><B><A HREF="../../../../../../../org/eclipse/emf/cdo/transaction/CDOCommitContext.html#getLocksOnNewObjects()">getLocksOnNewObjects</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
<A NAME="org.eclipse.emf.internal.cdo"><!-- --></A>
<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
@@ -271,6 +346,14 @@ Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/lock/CDOLockSta
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;<A HREF="../../../../../../../org/eclipse/emf/cdo/common/lock/CDOLockState.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockState</A></CODE></FONT></TD>
+<TD><CODE><B>CDOObjectImpl.</B><B><A HREF="../../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#getLockState(org.eclipse.emf.spi.cdo.InternalCDOObject)">getLockState</A></B>(org.eclipse.emf.spi.cdo.InternalCDOObject&nbsp;object)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
</TABLE>
&nbsp;
<P>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lock/package-use.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lock/package-use.html
index d8f814f6e7..d128df7ad1 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lock/package-use.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lock/package-use.html
@@ -110,6 +110,10 @@ Packages that use <A HREF="../../../../../../org/eclipse/emf/cdo/common/lock/pac
<TD>Client concepts for dealing with sessions to CDO repositories.&nbsp;</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><A HREF="#org.eclipse.emf.cdo.transaction"><B>org.eclipse.emf.cdo.transaction</B></A></TD>
+<TD>Client concepts for dealing with transactions, distributed transactions and their save points.&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><A HREF="#org.eclipse.emf.cdo.view"><B>org.eclipse.emf.cdo.view</B></A></TD>
<TD>Client concepts for dealing with views, view sets, queries, CDO objects and EMF resource sets.&nbsp;</TD>
</TR>
@@ -240,6 +244,12 @@ Classes in <A HREF="../../../../../../org/eclipse/emf/cdo/common/lock/package-su
Classes in <A HREF="../../../../../../org/eclipse/emf/cdo/common/lock/package-summary.html">org.eclipse.emf.cdo.common.lock</A> used by <A HREF="../../../../../../org/eclipse/emf/cdo/server/package-summary.html">org.eclipse.emf.cdo.server</A></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../../../../../org/eclipse/emf/cdo/common/lock/class-use/CDOLockState.html#org.eclipse.emf.cdo.server"><B>CDOLockState</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A client-side representation of <i>all</i> the locks on a single CDOObject.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../../org/eclipse/emf/cdo/common/lock/class-use/IDurableLockingManager.html#org.eclipse.emf.cdo.server"><B>IDurableLockingManager</B></A></B>
<BR>
@@ -276,6 +286,21 @@ Classes in <A HREF="../../../../../../org/eclipse/emf/cdo/common/lock/package-su
</TABLE>
&nbsp;
<P>
+<A NAME="org.eclipse.emf.cdo.transaction"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+Classes in <A HREF="../../../../../../org/eclipse/emf/cdo/common/lock/package-summary.html">org.eclipse.emf.cdo.common.lock</A> used by <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../../../../../org/eclipse/emf/cdo/common/lock/class-use/CDOLockState.html#org.eclipse.emf.cdo.transaction"><B>CDOLockState</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A client-side representation of <i>all</i> the locks on a single CDOObject.</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
<A NAME="org.eclipse.emf.cdo.view"><!-- --></A>
<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/impl/CDOResourceFolderImpl.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/impl/CDOResourceFolderImpl.html
index adac1af6f4..c89bb0a7b0 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/impl/CDOResourceFolderImpl.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/impl/CDOResourceFolderImpl.html
@@ -356,7 +356,7 @@ Class CDOResourceFolderImpl</H2>
<TH ALIGN="left"><B>Methods inherited from class org.eclipse.emf.internal.cdo.<A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html" title="class in org.eclipse.emf.internal.cdo">CDOObjectImpl</A></B></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoBasicSettings()">cdoBasicSettings</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoConflict()">cdoConflict</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoDirectResource()">cdoDirectResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoID()">cdoID</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalDynamicFeature(int)">cdoInternalDynamicFeature</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalInstance()">cdoInternalInstance</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostAttach()">cdoInternalPostAttach</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostDetach(boolean)">cdoInternalPostDetach</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostInvalidate()">cdoInternalPostInvalidate</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostLoad()">cdoInternalPostLoad</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostRollback()">cdoInternalPostRollback</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPreCommit()">cdoInternalPreCommit</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPreLoad()">cdoInternalPreLoad</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetID(org.eclipse.emf.cdo.common.id.CDOID)">cdoInternalSetID</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetResource(org.eclipse.emf.cdo.eresource.CDOResource)">cdoInternalSetResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetRevision(org.eclipse.emf.cdo.common.revision.CDORevision)">cdoInternalSetRevision</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetState(org.eclipse.emf.cdo.CDOState)">cdoInternalSetState</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetView(org.eclipse.emf.cdo.view.CDOView)">cdoInternalSetView</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInvalid()">cdoInvalid</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoLockState()">cdoLockState</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoPrefetch(int)">cdoPrefetch</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoReadLock()">cdoReadLock</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoReload()">cdoReload</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoResource()">cdoResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoRevision()">cdoRevision</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoSettings()">cdoSettings</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoState()">cdoState</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoView()">cdoView</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoWriteLock()">cdoWriteLock</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoWriteOption()">cdoWriteOption</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#createFeatureMap(org.eclipse.emf.ecore.EStructuralFeature)">createFeatureMap</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#createList(org.eclipse.emf.ecore.EStructuralFeature)">createList</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#dynamicGet(int)">dynamicGet</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#dynamicSet(int, java.lang.Object)">dynamicSet</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#dynamicUnset(int)">dynamicUnset</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eAdapters()">eAdapters</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eBasicSetContainer(org.eclipse.emf.ecore.InternalEObject, int)">eBasicSetContainer</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eBasicSetContainer(org.eclipse.emf.ecore.InternalEObject, int, org.eclipse.emf.common.notify.NotificationChain)">eBasicSetContainer</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eContainerFeatureID()">eContainerFeatureID</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eDirectResource()">eDirectResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eDynamicIsSet(int, org.eclipse.emf.ecore.EStructuralFeature)">eDynamicIsSet</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eInitializeContainer()">eInitializeContainer</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eInternalContainer()">eInternalContainer</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eInternalResource()">eInternalResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eIsCaching()">eIsCaching</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#equals(java.lang.Object)">equals</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eSetDirectResource(org.eclipse.emf.ecore.resource.Resource.Internal)">eSetDirectResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eSetResource(org.eclipse.emf.ecore.resource.Resource.Internal, org.eclipse.emf.common.notify.NotificationChain)">eSetResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eStore()">eStore</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#hashCode()">hashCode</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#instanceToRevisionFeature(org.eclipse.emf.spi.cdo.InternalCDOView, org.eclipse.emf.spi.cdo.InternalCDOObject, org.eclipse.emf.ecore.EStructuralFeature, java.lang.Object)">instanceToRevisionFeature</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#revisionToInstanceFeature(org.eclipse.emf.spi.cdo.InternalCDOObject, org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision, org.eclipse.emf.ecore.EStructuralFeature)">revisionToInstanceFeature</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#toString()">toString</A></CODE></TD>
+<TD><CODE><A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoBasicSettings()">cdoBasicSettings</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoConflict()">cdoConflict</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoDirectResource()">cdoDirectResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoID()">cdoID</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalDynamicFeature(int)">cdoInternalDynamicFeature</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalInstance()">cdoInternalInstance</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostAttach()">cdoInternalPostAttach</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostDetach(boolean)">cdoInternalPostDetach</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostInvalidate()">cdoInternalPostInvalidate</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostLoad()">cdoInternalPostLoad</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostRollback()">cdoInternalPostRollback</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPreCommit()">cdoInternalPreCommit</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPreLoad()">cdoInternalPreLoad</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetID(org.eclipse.emf.cdo.common.id.CDOID)">cdoInternalSetID</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetResource(org.eclipse.emf.cdo.eresource.CDOResource)">cdoInternalSetResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetRevision(org.eclipse.emf.cdo.common.revision.CDORevision)">cdoInternalSetRevision</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetState(org.eclipse.emf.cdo.CDOState)">cdoInternalSetState</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetView(org.eclipse.emf.cdo.view.CDOView)">cdoInternalSetView</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInvalid()">cdoInvalid</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoLockState()">cdoLockState</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoPrefetch(int)">cdoPrefetch</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoReadLock()">cdoReadLock</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoReload()">cdoReload</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoResource()">cdoResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoRevision()">cdoRevision</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoSettings()">cdoSettings</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoState()">cdoState</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoView()">cdoView</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoWriteLock()">cdoWriteLock</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoWriteOption()">cdoWriteOption</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#createFeatureMap(org.eclipse.emf.ecore.EStructuralFeature)">createFeatureMap</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#createList(org.eclipse.emf.ecore.EStructuralFeature)">createList</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#createLock(org.eclipse.emf.spi.cdo.InternalCDOObject, org.eclipse.net4j.util.concurrent.IRWLockManager.LockType)">createLock</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#dynamicGet(int)">dynamicGet</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#dynamicSet(int, java.lang.Object)">dynamicSet</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#dynamicUnset(int)">dynamicUnset</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eAdapters()">eAdapters</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eBasicSetContainer(org.eclipse.emf.ecore.InternalEObject, int)">eBasicSetContainer</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eBasicSetContainer(org.eclipse.emf.ecore.InternalEObject, int, org.eclipse.emf.common.notify.NotificationChain)">eBasicSetContainer</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eContainerFeatureID()">eContainerFeatureID</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eDirectResource()">eDirectResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eDynamicIsSet(int, org.eclipse.emf.ecore.EStructuralFeature)">eDynamicIsSet</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eInitializeContainer()">eInitializeContainer</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eInternalContainer()">eInternalContainer</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eInternalResource()">eInternalResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eIsCaching()">eIsCaching</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#equals(java.lang.Object)">equals</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eSetDirectResource(org.eclipse.emf.ecore.resource.Resource.Internal)">eSetDirectResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eSetResource(org.eclipse.emf.ecore.resource.Resource.Internal, org.eclipse.emf.common.notify.NotificationChain)">eSetResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eStore()">eStore</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#getLockState(org.eclipse.emf.spi.cdo.InternalCDOObject)">getLockState</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#hashCode()">hashCode</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#instanceToRevisionFeature(org.eclipse.emf.spi.cdo.InternalCDOView, org.eclipse.emf.spi.cdo.InternalCDOObject, org.eclipse.emf.ecore.EStructuralFeature, java.lang.Object)">instanceToRevisionFeature</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#revisionToInstanceFeature(org.eclipse.emf.spi.cdo.InternalCDOObject, org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision, org.eclipse.emf.ecore.EStructuralFeature)">revisionToInstanceFeature</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#toString()">toString</A></CODE></TD>
</TR>
</TABLE>
&nbsp;<A NAME="methods_inherited_from_class_org.eclipse.emf.ecore.impl.EStoreEObjectImpl"><!-- --></A>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.html
index aa97602a40..7f26fbafa5 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.html
@@ -695,7 +695,7 @@ Class CDOResourceImpl</H2>
<TH ALIGN="left"><B>Methods inherited from class org.eclipse.emf.internal.cdo.<A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html" title="class in org.eclipse.emf.internal.cdo">CDOObjectImpl</A></B></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoBasicSettings()">cdoBasicSettings</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoConflict()">cdoConflict</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoDirectResource()">cdoDirectResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoID()">cdoID</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalDynamicFeature(int)">cdoInternalDynamicFeature</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalInstance()">cdoInternalInstance</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostAttach()">cdoInternalPostAttach</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostInvalidate()">cdoInternalPostInvalidate</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostLoad()">cdoInternalPostLoad</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostRollback()">cdoInternalPostRollback</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPreCommit()">cdoInternalPreCommit</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetID(org.eclipse.emf.cdo.common.id.CDOID)">cdoInternalSetID</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetResource(org.eclipse.emf.cdo.eresource.CDOResource)">cdoInternalSetResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetRevision(org.eclipse.emf.cdo.common.revision.CDORevision)">cdoInternalSetRevision</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetState(org.eclipse.emf.cdo.CDOState)">cdoInternalSetState</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetView(org.eclipse.emf.cdo.view.CDOView)">cdoInternalSetView</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInvalid()">cdoInvalid</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoLockState()">cdoLockState</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoPrefetch(int)">cdoPrefetch</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoReadLock()">cdoReadLock</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoReload()">cdoReload</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoResource()">cdoResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoRevision()">cdoRevision</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoSettings()">cdoSettings</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoState()">cdoState</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoView()">cdoView</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoWriteLock()">cdoWriteLock</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoWriteOption()">cdoWriteOption</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#createFeatureMap(org.eclipse.emf.ecore.EStructuralFeature)">createFeatureMap</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#dynamicGet(int)">dynamicGet</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#dynamicSet(int, java.lang.Object)">dynamicSet</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#dynamicUnset(int)">dynamicUnset</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eAdapters()">eAdapters</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eBasicSetContainer(org.eclipse.emf.ecore.InternalEObject, int)">eBasicSetContainer</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eBasicSetContainer(org.eclipse.emf.ecore.InternalEObject, int, org.eclipse.emf.common.notify.NotificationChain)">eBasicSetContainer</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eContainerFeatureID()">eContainerFeatureID</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eDynamicIsSet(int, org.eclipse.emf.ecore.EStructuralFeature)">eDynamicIsSet</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eInitializeContainer()">eInitializeContainer</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eInternalContainer()">eInternalContainer</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eInternalResource()">eInternalResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eIsCaching()">eIsCaching</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#equals(java.lang.Object)">equals</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eSetDirectResource(org.eclipse.emf.ecore.resource.Resource.Internal)">eSetDirectResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eSetResource(org.eclipse.emf.ecore.resource.Resource.Internal, org.eclipse.emf.common.notify.NotificationChain)">eSetResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eStore()">eStore</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#hashCode()">hashCode</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#instanceToRevisionFeature(org.eclipse.emf.spi.cdo.InternalCDOView, org.eclipse.emf.spi.cdo.InternalCDOObject, org.eclipse.emf.ecore.EStructuralFeature, java.lang.Object)">instanceToRevisionFeature</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#revisionToInstanceFeature(org.eclipse.emf.spi.cdo.InternalCDOObject, org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision, org.eclipse.emf.ecore.EStructuralFeature)">revisionToInstanceFeature</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#toString()">toString</A></CODE></TD>
+<TD><CODE><A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoBasicSettings()">cdoBasicSettings</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoConflict()">cdoConflict</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoDirectResource()">cdoDirectResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoID()">cdoID</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalDynamicFeature(int)">cdoInternalDynamicFeature</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalInstance()">cdoInternalInstance</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostAttach()">cdoInternalPostAttach</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostInvalidate()">cdoInternalPostInvalidate</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostLoad()">cdoInternalPostLoad</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostRollback()">cdoInternalPostRollback</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPreCommit()">cdoInternalPreCommit</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetID(org.eclipse.emf.cdo.common.id.CDOID)">cdoInternalSetID</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetResource(org.eclipse.emf.cdo.eresource.CDOResource)">cdoInternalSetResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetRevision(org.eclipse.emf.cdo.common.revision.CDORevision)">cdoInternalSetRevision</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetState(org.eclipse.emf.cdo.CDOState)">cdoInternalSetState</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetView(org.eclipse.emf.cdo.view.CDOView)">cdoInternalSetView</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInvalid()">cdoInvalid</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoLockState()">cdoLockState</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoPrefetch(int)">cdoPrefetch</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoReadLock()">cdoReadLock</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoReload()">cdoReload</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoResource()">cdoResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoRevision()">cdoRevision</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoSettings()">cdoSettings</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoState()">cdoState</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoView()">cdoView</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoWriteLock()">cdoWriteLock</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoWriteOption()">cdoWriteOption</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#createFeatureMap(org.eclipse.emf.ecore.EStructuralFeature)">createFeatureMap</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#createLock(org.eclipse.emf.spi.cdo.InternalCDOObject, org.eclipse.net4j.util.concurrent.IRWLockManager.LockType)">createLock</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#dynamicGet(int)">dynamicGet</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#dynamicSet(int, java.lang.Object)">dynamicSet</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#dynamicUnset(int)">dynamicUnset</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eAdapters()">eAdapters</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eBasicSetContainer(org.eclipse.emf.ecore.InternalEObject, int)">eBasicSetContainer</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eBasicSetContainer(org.eclipse.emf.ecore.InternalEObject, int, org.eclipse.emf.common.notify.NotificationChain)">eBasicSetContainer</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eContainerFeatureID()">eContainerFeatureID</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eDynamicIsSet(int, org.eclipse.emf.ecore.EStructuralFeature)">eDynamicIsSet</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eInitializeContainer()">eInitializeContainer</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eInternalContainer()">eInternalContainer</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eInternalResource()">eInternalResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eIsCaching()">eIsCaching</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#equals(java.lang.Object)">equals</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eSetDirectResource(org.eclipse.emf.ecore.resource.Resource.Internal)">eSetDirectResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eSetResource(org.eclipse.emf.ecore.resource.Resource.Internal, org.eclipse.emf.common.notify.NotificationChain)">eSetResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eStore()">eStore</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#getLockState(org.eclipse.emf.spi.cdo.InternalCDOObject)">getLockState</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#hashCode()">hashCode</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#instanceToRevisionFeature(org.eclipse.emf.spi.cdo.InternalCDOView, org.eclipse.emf.spi.cdo.InternalCDOObject, org.eclipse.emf.ecore.EStructuralFeature, java.lang.Object)">instanceToRevisionFeature</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#revisionToInstanceFeature(org.eclipse.emf.spi.cdo.InternalCDOObject, org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision, org.eclipse.emf.ecore.EStructuralFeature)">revisionToInstanceFeature</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#toString()">toString</A></CODE></TD>
</TR>
</TABLE>
&nbsp;<A NAME="methods_inherited_from_class_org.eclipse.emf.ecore.impl.EStoreEObjectImpl"><!-- --></A>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/impl/CDOResourceNodeImpl.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/impl/CDOResourceNodeImpl.html
index 3172bdee63..30c986f4d3 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/impl/CDOResourceNodeImpl.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/impl/CDOResourceNodeImpl.html
@@ -409,7 +409,7 @@ Class CDOResourceNodeImpl</H2>
<TH ALIGN="left"><B>Methods inherited from class org.eclipse.emf.internal.cdo.<A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html" title="class in org.eclipse.emf.internal.cdo">CDOObjectImpl</A></B></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoBasicSettings()">cdoBasicSettings</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoConflict()">cdoConflict</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoDirectResource()">cdoDirectResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoID()">cdoID</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalDynamicFeature(int)">cdoInternalDynamicFeature</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalInstance()">cdoInternalInstance</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostAttach()">cdoInternalPostAttach</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostDetach(boolean)">cdoInternalPostDetach</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostInvalidate()">cdoInternalPostInvalidate</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostLoad()">cdoInternalPostLoad</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostRollback()">cdoInternalPostRollback</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPreCommit()">cdoInternalPreCommit</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPreLoad()">cdoInternalPreLoad</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetID(org.eclipse.emf.cdo.common.id.CDOID)">cdoInternalSetID</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetResource(org.eclipse.emf.cdo.eresource.CDOResource)">cdoInternalSetResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetRevision(org.eclipse.emf.cdo.common.revision.CDORevision)">cdoInternalSetRevision</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetState(org.eclipse.emf.cdo.CDOState)">cdoInternalSetState</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetView(org.eclipse.emf.cdo.view.CDOView)">cdoInternalSetView</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInvalid()">cdoInvalid</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoLockState()">cdoLockState</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoPrefetch(int)">cdoPrefetch</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoReadLock()">cdoReadLock</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoReload()">cdoReload</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoResource()">cdoResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoRevision()">cdoRevision</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoSettings()">cdoSettings</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoState()">cdoState</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoView()">cdoView</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoWriteLock()">cdoWriteLock</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoWriteOption()">cdoWriteOption</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#createFeatureMap(org.eclipse.emf.ecore.EStructuralFeature)">createFeatureMap</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#createList(org.eclipse.emf.ecore.EStructuralFeature)">createList</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#dynamicGet(int)">dynamicGet</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#dynamicSet(int, java.lang.Object)">dynamicSet</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#dynamicUnset(int)">dynamicUnset</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eAdapters()">eAdapters</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eBasicSetContainer(org.eclipse.emf.ecore.InternalEObject, int)">eBasicSetContainer</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eBasicSetContainer(org.eclipse.emf.ecore.InternalEObject, int, org.eclipse.emf.common.notify.NotificationChain)">eBasicSetContainer</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eContainerFeatureID()">eContainerFeatureID</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eDirectResource()">eDirectResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eDynamicIsSet(int, org.eclipse.emf.ecore.EStructuralFeature)">eDynamicIsSet</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eInitializeContainer()">eInitializeContainer</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eInternalContainer()">eInternalContainer</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eInternalResource()">eInternalResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eIsCaching()">eIsCaching</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#equals(java.lang.Object)">equals</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eSetDirectResource(org.eclipse.emf.ecore.resource.Resource.Internal)">eSetDirectResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eSetResource(org.eclipse.emf.ecore.resource.Resource.Internal, org.eclipse.emf.common.notify.NotificationChain)">eSetResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eStore()">eStore</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#hashCode()">hashCode</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#instanceToRevisionFeature(org.eclipse.emf.spi.cdo.InternalCDOView, org.eclipse.emf.spi.cdo.InternalCDOObject, org.eclipse.emf.ecore.EStructuralFeature, java.lang.Object)">instanceToRevisionFeature</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#revisionToInstanceFeature(org.eclipse.emf.spi.cdo.InternalCDOObject, org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision, org.eclipse.emf.ecore.EStructuralFeature)">revisionToInstanceFeature</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#toString()">toString</A></CODE></TD>
+<TD><CODE><A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoBasicSettings()">cdoBasicSettings</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoConflict()">cdoConflict</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoDirectResource()">cdoDirectResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoID()">cdoID</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalDynamicFeature(int)">cdoInternalDynamicFeature</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalInstance()">cdoInternalInstance</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostAttach()">cdoInternalPostAttach</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostDetach(boolean)">cdoInternalPostDetach</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostInvalidate()">cdoInternalPostInvalidate</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostLoad()">cdoInternalPostLoad</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostRollback()">cdoInternalPostRollback</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPreCommit()">cdoInternalPreCommit</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPreLoad()">cdoInternalPreLoad</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetID(org.eclipse.emf.cdo.common.id.CDOID)">cdoInternalSetID</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetResource(org.eclipse.emf.cdo.eresource.CDOResource)">cdoInternalSetResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetRevision(org.eclipse.emf.cdo.common.revision.CDORevision)">cdoInternalSetRevision</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetState(org.eclipse.emf.cdo.CDOState)">cdoInternalSetState</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetView(org.eclipse.emf.cdo.view.CDOView)">cdoInternalSetView</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInvalid()">cdoInvalid</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoLockState()">cdoLockState</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoPrefetch(int)">cdoPrefetch</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoReadLock()">cdoReadLock</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoReload()">cdoReload</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoResource()">cdoResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoRevision()">cdoRevision</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoSettings()">cdoSettings</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoState()">cdoState</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoView()">cdoView</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoWriteLock()">cdoWriteLock</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoWriteOption()">cdoWriteOption</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#createFeatureMap(org.eclipse.emf.ecore.EStructuralFeature)">createFeatureMap</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#createList(org.eclipse.emf.ecore.EStructuralFeature)">createList</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#createLock(org.eclipse.emf.spi.cdo.InternalCDOObject, org.eclipse.net4j.util.concurrent.IRWLockManager.LockType)">createLock</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#dynamicGet(int)">dynamicGet</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#dynamicSet(int, java.lang.Object)">dynamicSet</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#dynamicUnset(int)">dynamicUnset</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eAdapters()">eAdapters</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eBasicSetContainer(org.eclipse.emf.ecore.InternalEObject, int)">eBasicSetContainer</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eBasicSetContainer(org.eclipse.emf.ecore.InternalEObject, int, org.eclipse.emf.common.notify.NotificationChain)">eBasicSetContainer</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eContainerFeatureID()">eContainerFeatureID</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eDirectResource()">eDirectResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eDynamicIsSet(int, org.eclipse.emf.ecore.EStructuralFeature)">eDynamicIsSet</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eInitializeContainer()">eInitializeContainer</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eInternalContainer()">eInternalContainer</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eInternalResource()">eInternalResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eIsCaching()">eIsCaching</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#equals(java.lang.Object)">equals</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eSetDirectResource(org.eclipse.emf.ecore.resource.Resource.Internal)">eSetDirectResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eSetResource(org.eclipse.emf.ecore.resource.Resource.Internal, org.eclipse.emf.common.notify.NotificationChain)">eSetResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eStore()">eStore</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#getLockState(org.eclipse.emf.spi.cdo.InternalCDOObject)">getLockState</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#hashCode()">hashCode</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#instanceToRevisionFeature(org.eclipse.emf.spi.cdo.InternalCDOView, org.eclipse.emf.spi.cdo.InternalCDOObject, org.eclipse.emf.ecore.EStructuralFeature, java.lang.Object)">instanceToRevisionFeature</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#revisionToInstanceFeature(org.eclipse.emf.spi.cdo.InternalCDOObject, org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision, org.eclipse.emf.ecore.EStructuralFeature)">revisionToInstanceFeature</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#toString()">toString</A></CODE></TD>
</TR>
</TABLE>
&nbsp;<A NAME="methods_inherited_from_class_org.eclipse.emf.ecore.impl.EStoreEObjectImpl"><!-- --></A>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/impl/AnnotationImpl.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/impl/AnnotationImpl.html
index 912e65f14e..3c741906e9 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/impl/AnnotationImpl.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/impl/AnnotationImpl.html
@@ -367,7 +367,7 @@ Class AnnotationImpl</H2>
<TH ALIGN="left"><B>Methods inherited from class org.eclipse.emf.internal.cdo.<A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html" title="class in org.eclipse.emf.internal.cdo">CDOObjectImpl</A></B></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoBasicSettings()">cdoBasicSettings</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoConflict()">cdoConflict</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoDirectResource()">cdoDirectResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoID()">cdoID</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalDynamicFeature(int)">cdoInternalDynamicFeature</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalInstance()">cdoInternalInstance</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostAttach()">cdoInternalPostAttach</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostDetach(boolean)">cdoInternalPostDetach</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostInvalidate()">cdoInternalPostInvalidate</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostLoad()">cdoInternalPostLoad</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostRollback()">cdoInternalPostRollback</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPreCommit()">cdoInternalPreCommit</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPreLoad()">cdoInternalPreLoad</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetID(org.eclipse.emf.cdo.common.id.CDOID)">cdoInternalSetID</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetResource(org.eclipse.emf.cdo.eresource.CDOResource)">cdoInternalSetResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetRevision(org.eclipse.emf.cdo.common.revision.CDORevision)">cdoInternalSetRevision</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetState(org.eclipse.emf.cdo.CDOState)">cdoInternalSetState</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetView(org.eclipse.emf.cdo.view.CDOView)">cdoInternalSetView</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInvalid()">cdoInvalid</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoLockState()">cdoLockState</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoPrefetch(int)">cdoPrefetch</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoReadLock()">cdoReadLock</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoReload()">cdoReload</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoResource()">cdoResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoRevision()">cdoRevision</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoSettings()">cdoSettings</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoState()">cdoState</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoView()">cdoView</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoWriteLock()">cdoWriteLock</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoWriteOption()">cdoWriteOption</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#createFeatureMap(org.eclipse.emf.ecore.EStructuralFeature)">createFeatureMap</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#createList(org.eclipse.emf.ecore.EStructuralFeature)">createList</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#dynamicGet(int)">dynamicGet</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#dynamicSet(int, java.lang.Object)">dynamicSet</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#dynamicUnset(int)">dynamicUnset</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eAdapters()">eAdapters</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eBasicSetContainer(org.eclipse.emf.ecore.InternalEObject, int)">eBasicSetContainer</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eBasicSetContainer(org.eclipse.emf.ecore.InternalEObject, int, org.eclipse.emf.common.notify.NotificationChain)">eBasicSetContainer</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eContainerFeatureID()">eContainerFeatureID</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eDirectResource()">eDirectResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eDynamicIsSet(int, org.eclipse.emf.ecore.EStructuralFeature)">eDynamicIsSet</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eInitializeContainer()">eInitializeContainer</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eInternalContainer()">eInternalContainer</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eInternalResource()">eInternalResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eIsCaching()">eIsCaching</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#equals(java.lang.Object)">equals</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eSetDirectResource(org.eclipse.emf.ecore.resource.Resource.Internal)">eSetDirectResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eSetResource(org.eclipse.emf.ecore.resource.Resource.Internal, org.eclipse.emf.common.notify.NotificationChain)">eSetResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eStore()">eStore</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#hashCode()">hashCode</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#instanceToRevisionFeature(org.eclipse.emf.spi.cdo.InternalCDOView, org.eclipse.emf.spi.cdo.InternalCDOObject, org.eclipse.emf.ecore.EStructuralFeature, java.lang.Object)">instanceToRevisionFeature</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#revisionToInstanceFeature(org.eclipse.emf.spi.cdo.InternalCDOObject, org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision, org.eclipse.emf.ecore.EStructuralFeature)">revisionToInstanceFeature</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#toString()">toString</A></CODE></TD>
+<TD><CODE><A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoBasicSettings()">cdoBasicSettings</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoConflict()">cdoConflict</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoDirectResource()">cdoDirectResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoID()">cdoID</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalDynamicFeature(int)">cdoInternalDynamicFeature</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalInstance()">cdoInternalInstance</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostAttach()">cdoInternalPostAttach</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostDetach(boolean)">cdoInternalPostDetach</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostInvalidate()">cdoInternalPostInvalidate</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostLoad()">cdoInternalPostLoad</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostRollback()">cdoInternalPostRollback</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPreCommit()">cdoInternalPreCommit</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPreLoad()">cdoInternalPreLoad</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetID(org.eclipse.emf.cdo.common.id.CDOID)">cdoInternalSetID</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetResource(org.eclipse.emf.cdo.eresource.CDOResource)">cdoInternalSetResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetRevision(org.eclipse.emf.cdo.common.revision.CDORevision)">cdoInternalSetRevision</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetState(org.eclipse.emf.cdo.CDOState)">cdoInternalSetState</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetView(org.eclipse.emf.cdo.view.CDOView)">cdoInternalSetView</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInvalid()">cdoInvalid</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoLockState()">cdoLockState</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoPrefetch(int)">cdoPrefetch</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoReadLock()">cdoReadLock</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoReload()">cdoReload</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoResource()">cdoResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoRevision()">cdoRevision</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoSettings()">cdoSettings</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoState()">cdoState</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoView()">cdoView</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoWriteLock()">cdoWriteLock</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoWriteOption()">cdoWriteOption</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#createFeatureMap(org.eclipse.emf.ecore.EStructuralFeature)">createFeatureMap</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#createList(org.eclipse.emf.ecore.EStructuralFeature)">createList</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#createLock(org.eclipse.emf.spi.cdo.InternalCDOObject, org.eclipse.net4j.util.concurrent.IRWLockManager.LockType)">createLock</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#dynamicGet(int)">dynamicGet</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#dynamicSet(int, java.lang.Object)">dynamicSet</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#dynamicUnset(int)">dynamicUnset</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eAdapters()">eAdapters</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eBasicSetContainer(org.eclipse.emf.ecore.InternalEObject, int)">eBasicSetContainer</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eBasicSetContainer(org.eclipse.emf.ecore.InternalEObject, int, org.eclipse.emf.common.notify.NotificationChain)">eBasicSetContainer</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eContainerFeatureID()">eContainerFeatureID</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eDirectResource()">eDirectResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eDynamicIsSet(int, org.eclipse.emf.ecore.EStructuralFeature)">eDynamicIsSet</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eInitializeContainer()">eInitializeContainer</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eInternalContainer()">eInternalContainer</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eInternalResource()">eInternalResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eIsCaching()">eIsCaching</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#equals(java.lang.Object)">equals</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eSetDirectResource(org.eclipse.emf.ecore.resource.Resource.Internal)">eSetDirectResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eSetResource(org.eclipse.emf.ecore.resource.Resource.Internal, org.eclipse.emf.common.notify.NotificationChain)">eSetResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eStore()">eStore</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#getLockState(org.eclipse.emf.spi.cdo.InternalCDOObject)">getLockState</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#hashCode()">hashCode</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#instanceToRevisionFeature(org.eclipse.emf.spi.cdo.InternalCDOView, org.eclipse.emf.spi.cdo.InternalCDOObject, org.eclipse.emf.ecore.EStructuralFeature, java.lang.Object)">instanceToRevisionFeature</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#revisionToInstanceFeature(org.eclipse.emf.spi.cdo.InternalCDOObject, org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision, org.eclipse.emf.ecore.EStructuralFeature)">revisionToInstanceFeature</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#toString()">toString</A></CODE></TD>
</TR>
</TABLE>
&nbsp;<A NAME="methods_inherited_from_class_org.eclipse.emf.ecore.impl.EStoreEObjectImpl"><!-- --></A>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/impl/ModelElementImpl.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/impl/ModelElementImpl.html
index a51729a59c..868f5d052c 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/impl/ModelElementImpl.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/impl/ModelElementImpl.html
@@ -323,7 +323,7 @@ Class ModelElementImpl</H2>
<TH ALIGN="left"><B>Methods inherited from class org.eclipse.emf.internal.cdo.<A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html" title="class in org.eclipse.emf.internal.cdo">CDOObjectImpl</A></B></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoBasicSettings()">cdoBasicSettings</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoConflict()">cdoConflict</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoDirectResource()">cdoDirectResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoID()">cdoID</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalDynamicFeature(int)">cdoInternalDynamicFeature</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalInstance()">cdoInternalInstance</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostAttach()">cdoInternalPostAttach</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostDetach(boolean)">cdoInternalPostDetach</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostInvalidate()">cdoInternalPostInvalidate</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostLoad()">cdoInternalPostLoad</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostRollback()">cdoInternalPostRollback</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPreCommit()">cdoInternalPreCommit</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPreLoad()">cdoInternalPreLoad</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetID(org.eclipse.emf.cdo.common.id.CDOID)">cdoInternalSetID</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetResource(org.eclipse.emf.cdo.eresource.CDOResource)">cdoInternalSetResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetRevision(org.eclipse.emf.cdo.common.revision.CDORevision)">cdoInternalSetRevision</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetState(org.eclipse.emf.cdo.CDOState)">cdoInternalSetState</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetView(org.eclipse.emf.cdo.view.CDOView)">cdoInternalSetView</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInvalid()">cdoInvalid</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoLockState()">cdoLockState</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoPrefetch(int)">cdoPrefetch</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoReadLock()">cdoReadLock</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoReload()">cdoReload</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoResource()">cdoResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoRevision()">cdoRevision</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoSettings()">cdoSettings</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoState()">cdoState</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoView()">cdoView</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoWriteLock()">cdoWriteLock</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoWriteOption()">cdoWriteOption</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#createFeatureMap(org.eclipse.emf.ecore.EStructuralFeature)">createFeatureMap</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#createList(org.eclipse.emf.ecore.EStructuralFeature)">createList</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#dynamicGet(int)">dynamicGet</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#dynamicSet(int, java.lang.Object)">dynamicSet</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#dynamicUnset(int)">dynamicUnset</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eAdapters()">eAdapters</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eBasicSetContainer(org.eclipse.emf.ecore.InternalEObject, int)">eBasicSetContainer</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eBasicSetContainer(org.eclipse.emf.ecore.InternalEObject, int, org.eclipse.emf.common.notify.NotificationChain)">eBasicSetContainer</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eContainerFeatureID()">eContainerFeatureID</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eDirectResource()">eDirectResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eDynamicIsSet(int, org.eclipse.emf.ecore.EStructuralFeature)">eDynamicIsSet</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eInitializeContainer()">eInitializeContainer</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eInternalContainer()">eInternalContainer</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eInternalResource()">eInternalResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eIsCaching()">eIsCaching</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#equals(java.lang.Object)">equals</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eSetDirectResource(org.eclipse.emf.ecore.resource.Resource.Internal)">eSetDirectResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eSetResource(org.eclipse.emf.ecore.resource.Resource.Internal, org.eclipse.emf.common.notify.NotificationChain)">eSetResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eStore()">eStore</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#hashCode()">hashCode</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#instanceToRevisionFeature(org.eclipse.emf.spi.cdo.InternalCDOView, org.eclipse.emf.spi.cdo.InternalCDOObject, org.eclipse.emf.ecore.EStructuralFeature, java.lang.Object)">instanceToRevisionFeature</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#revisionToInstanceFeature(org.eclipse.emf.spi.cdo.InternalCDOObject, org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision, org.eclipse.emf.ecore.EStructuralFeature)">revisionToInstanceFeature</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#toString()">toString</A></CODE></TD>
+<TD><CODE><A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoBasicSettings()">cdoBasicSettings</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoConflict()">cdoConflict</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoDirectResource()">cdoDirectResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoID()">cdoID</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalDynamicFeature(int)">cdoInternalDynamicFeature</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalInstance()">cdoInternalInstance</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostAttach()">cdoInternalPostAttach</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostDetach(boolean)">cdoInternalPostDetach</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostInvalidate()">cdoInternalPostInvalidate</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostLoad()">cdoInternalPostLoad</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPostRollback()">cdoInternalPostRollback</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPreCommit()">cdoInternalPreCommit</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalPreLoad()">cdoInternalPreLoad</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetID(org.eclipse.emf.cdo.common.id.CDOID)">cdoInternalSetID</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetResource(org.eclipse.emf.cdo.eresource.CDOResource)">cdoInternalSetResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetRevision(org.eclipse.emf.cdo.common.revision.CDORevision)">cdoInternalSetRevision</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetState(org.eclipse.emf.cdo.CDOState)">cdoInternalSetState</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInternalSetView(org.eclipse.emf.cdo.view.CDOView)">cdoInternalSetView</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoInvalid()">cdoInvalid</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoLockState()">cdoLockState</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoPrefetch(int)">cdoPrefetch</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoReadLock()">cdoReadLock</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoReload()">cdoReload</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoResource()">cdoResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoRevision()">cdoRevision</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoSettings()">cdoSettings</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoState()">cdoState</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoView()">cdoView</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoWriteLock()">cdoWriteLock</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoWriteOption()">cdoWriteOption</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#createFeatureMap(org.eclipse.emf.ecore.EStructuralFeature)">createFeatureMap</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#createList(org.eclipse.emf.ecore.EStructuralFeature)">createList</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#createLock(org.eclipse.emf.spi.cdo.InternalCDOObject, org.eclipse.net4j.util.concurrent.IRWLockManager.LockType)">createLock</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#dynamicGet(int)">dynamicGet</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#dynamicSet(int, java.lang.Object)">dynamicSet</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#dynamicUnset(int)">dynamicUnset</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eAdapters()">eAdapters</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eBasicSetContainer(org.eclipse.emf.ecore.InternalEObject, int)">eBasicSetContainer</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eBasicSetContainer(org.eclipse.emf.ecore.InternalEObject, int, org.eclipse.emf.common.notify.NotificationChain)">eBasicSetContainer</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eContainerFeatureID()">eContainerFeatureID</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eDirectResource()">eDirectResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eDynamicIsSet(int, org.eclipse.emf.ecore.EStructuralFeature)">eDynamicIsSet</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eInitializeContainer()">eInitializeContainer</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eInternalContainer()">eInternalContainer</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eInternalResource()">eInternalResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eIsCaching()">eIsCaching</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#equals(java.lang.Object)">equals</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eSetDirectResource(org.eclipse.emf.ecore.resource.Resource.Internal)">eSetDirectResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eSetResource(org.eclipse.emf.ecore.resource.Resource.Internal, org.eclipse.emf.common.notify.NotificationChain)">eSetResource</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#eStore()">eStore</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#getLockState(org.eclipse.emf.spi.cdo.InternalCDOObject)">getLockState</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#hashCode()">hashCode</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#instanceToRevisionFeature(org.eclipse.emf.spi.cdo.InternalCDOView, org.eclipse.emf.spi.cdo.InternalCDOObject, org.eclipse.emf.ecore.EStructuralFeature, java.lang.Object)">instanceToRevisionFeature</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#revisionToInstanceFeature(org.eclipse.emf.spi.cdo.InternalCDOObject, org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision, org.eclipse.emf.ecore.EStructuralFeature)">revisionToInstanceFeature</A>, <A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#toString()">toString</A></CODE></TD>
</TR>
</TABLE>
&nbsp;<A NAME="methods_inherited_from_class_org.eclipse.emf.ecore.impl.EStoreEObjectImpl"><!-- --></A>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/IStoreAccessor.CommitContext.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/IStoreAccessor.CommitContext.html
index 3bb3196df2..07b45606d4 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/IStoreAccessor.CommitContext.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/IStoreAccessor.CommitContext.html
@@ -125,6 +125,8 @@ Represents the state of a single, logical commit operation which is driven throu
<DD>2.0</DD>
<DT><B>No Implement</B></DT>
<DD>This interface is not intended to be implemented by clients.</DD>
+<DT><B>No Extend</B></DT>
+ <DD>This interface is not intended to be extended by clients.</DD>
</DL>
<HR>
@@ -215,6 +217,15 @@ Represents the state of a single, logical commit operation which is driven throu
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../../../org/eclipse/emf/cdo/common/lock/CDOLockState.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockState</A>[]</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/cdo/server/IStoreAccessor.CommitContext.html#getLocksOnNewObjects()">getLocksOnNewObjects</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns an array of the locks on the new objects that are part of the commit operation represented by this
+ <code>CommitContext</code>.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision[]</CODE></FONT></TD>
<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/cdo/server/IStoreAccessor.CommitContext.html#getNewObjects()">getNewObjects</A></B>()</CODE>
@@ -456,6 +467,25 @@ org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageUnit[] <B>getNewPackageUn
</DL>
<HR>
+<A NAME="getLocksOnNewObjects()"><!-- --></A><H3>
+getLocksOnNewObjects</H3>
+<PRE>
+<A HREF="../../../../../org/eclipse/emf/cdo/common/lock/CDOLockState.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockState</A>[] <B>getLocksOnNewObjects</B>()</PRE>
+<DL>
+<DD>Returns an array of the locks on the new objects that are part of the commit operation represented by this
+ <code>CommitContext</code>.
+<P>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+<DT><B>Since:</B></DT>
+ <DD>4.1</DD>
+</DL>
+</DD>
+</DL>
+<HR>
+
<A NAME="getNewObjects()"><!-- --></A><H3>
getNewObjects</H3>
<PRE>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOCommitContext.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOCommitContext.html
index eceb8faea8..340ccdc910 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOCommitContext.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOCommitContext.html
@@ -131,6 +131,30 @@ Provides a context for commit operations.
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOCommitContext.html#getBranch()">getBranch</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOCommitContext.html#getCommitComment()">getCommitComment</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitData</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOCommitContext.html#getCommitData()">getCommitData</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</A>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</A>,<A HREF="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</A>&gt;</CODE></FONT></TD>
<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOCommitContext.html#getDetachedObjects()">getDetachedObjects</A></B>()</CODE>
@@ -155,6 +179,14 @@ Provides a context for commit operations.
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</A>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/lock/CDOLockState.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockState</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOCommitContext.html#getLocksOnNewObjects()">getLocksOnNewObjects</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</A>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</A>,<A HREF="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</A>&gt;</CODE></FONT></TD>
<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOCommitContext.html#getNewObjects()">getNewObjects</A></B>()</CODE>
@@ -187,6 +219,30 @@ Provides a context for commit operations.
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOCommitContext.html#getUserID()">getUserID</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOCommitContext.html#getViewID()">getViewID</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;boolean</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOCommitContext.html#isAutoReleaseLocks()">isAutoReleaseLocks</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;boolean</CODE></FONT></TD>
<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOCommitContext.html#isPartialCommit()">isPartialCommit</A></B>()</CODE>
@@ -207,6 +263,45 @@ Provides a context for commit operations.
</TR>
</TABLE>
+<A NAME="getUserID()"><!-- --></A><H3>
+getUserID</H3>
+<PRE>
+<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</A> <B>getUserID</B>()</PRE>
+<DL>
+<DD><DL>
+<DT><B>Since:</B></DT>
+ <DD>4.1</DD>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="getViewID()"><!-- --></A><H3>
+getViewID</H3>
+<PRE>
+int <B>getViewID</B>()</PRE>
+<DL>
+<DD><DL>
+<DT><B>Since:</B></DT>
+ <DD>4.1</DD>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="getBranch()"><!-- --></A><H3>
+getBranch</H3>
+<PRE>
+<A HREF="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</A> <B>getBranch</B>()</PRE>
+<DL>
+<DD><DL>
+<DT><B>Since:</B></DT>
+ <DD>4.1</DD>
+</DL>
+</DD>
+</DL>
+<HR>
+
<A NAME="getTransaction()"><!-- --></A><H3>
getTransaction</H3>
<PRE>
@@ -220,6 +315,58 @@ getTransaction</H3>
</DL>
<HR>
+<A NAME="isAutoReleaseLocks()"><!-- --></A><H3>
+isAutoReleaseLocks</H3>
+<PRE>
+boolean <B>isAutoReleaseLocks</B>()</PRE>
+<DL>
+<DD><DL>
+<DT><B>Since:</B></DT>
+ <DD>4.1</DD>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="isPartialCommit()"><!-- --></A><H3>
+isPartialCommit</H3>
+<PRE>
+boolean <B>isPartialCommit</B>()</PRE>
+<DL>
+<DD><DL>
+<DT><B>Since:</B></DT>
+ <DD>4.0</DD>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="getCommitData()"><!-- --></A><H3>
+getCommitData</H3>
+<PRE>
+<A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitData</A> <B>getCommitData</B>()</PRE>
+<DL>
+<DD><DL>
+<DT><B>Since:</B></DT>
+ <DD>4.1</DD>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="getCommitComment()"><!-- --></A><H3>
+getCommitComment</H3>
+<PRE>
+<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</A> <B>getCommitComment</B>()</PRE>
+<DL>
+<DD><DL>
+<DT><B>Since:</B></DT>
+ <DD>4.1</DD>
+</DL>
+</DD>
+</DL>
+<HR>
+
<A NAME="getNewPackageUnits()"><!-- --></A><H3>
getNewPackageUnits</H3>
<PRE>
@@ -233,6 +380,19 @@ getNewPackageUnits</H3>
</DL>
<HR>
+<A NAME="getLocksOnNewObjects()"><!-- --></A><H3>
+getLocksOnNewObjects</H3>
+<PRE>
+<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</A>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/lock/CDOLockState.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockState</A>&gt; <B>getLocksOnNewObjects</B>()</PRE>
+<DL>
+<DD><DL>
+<DT><B>Since:</B></DT>
+ <DD>4.1</DD>
+</DL>
+</DD>
+</DL>
+<HR>
+
<A NAME="getNewObjects()"><!-- --></A><H3>
getNewObjects</H3>
<PRE>
@@ -296,19 +456,6 @@ getLobs</H3>
</DL>
</DD>
</DL>
-<HR>
-
-<A NAME="isPartialCommit()"><!-- --></A><H3>
-isPartialCommit</H3>
-<PRE>
-boolean <B>isPartialCommit</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Since:</B></DT>
- <DD>4.0</DD>
-</DL>
-</DD>
-</DL>
<!-- ========= END OF CLASS DATA ========= -->
<HR>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/internal/cdo/CDOObjectImpl.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/internal/cdo/CDOObjectImpl.html
index fd5eb86a3b..3633d981ee 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/internal/cdo/CDOObjectImpl.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/internal/cdo/CDOObjectImpl.html
@@ -541,6 +541,15 @@ The base class of all <em>native</em> <A HREF="../../../../../org/eclipse/emf/cd
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;<A HREF="../../../../../org/eclipse/emf/cdo/CDOLock.html" title="interface in org.eclipse.emf.cdo">CDOLock</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#createLock(org.eclipse.emf.spi.cdo.InternalCDOObject, org.eclipse.net4j.util.concurrent.IRWLockManager.LockType)">createLock</A></B>(org.eclipse.emf.spi.cdo.InternalCDOObject&nbsp;object,
+ <A HREF="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IRWLockManager.LockType.html?is-external=true" title="class or interface in org.eclipse.net4j.util.concurrent">IRWLockManager.LockType</A>&nbsp;type)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A></CODE></FONT></TD>
<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#dynamicGet(int)">dynamicGet</A></B>(int&nbsp;dynamicFeatureID)</CODE>
@@ -685,6 +694,14 @@ The base class of all <em>native</em> <A HREF="../../../../../org/eclipse/emf/cd
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;<A HREF="../../../../../org/eclipse/emf/cdo/common/lock/CDOLockState.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockState</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#getLockState(org.eclipse.emf.spi.cdo.InternalCDOObject)">getLockState</A></B>(org.eclipse.emf.spi.cdo.InternalCDOObject&nbsp;object)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;int</CODE></FONT></TD>
<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#hashCode()">hashCode</A></B>()</CODE>
@@ -1720,6 +1737,39 @@ public static void <B>instanceToRevisionFeature</B>(org.eclipse.emf.spi.cdo.Inte
</DL>
</DD>
</DL>
+<HR>
+
+<A NAME="createLock(org.eclipse.emf.spi.cdo.InternalCDOObject, org.eclipse.net4j.util.concurrent.IRWLockManager.LockType)"><!-- --></A><H3>
+createLock</H3>
+<PRE>
+public static <A HREF="../../../../../org/eclipse/emf/cdo/CDOLock.html" title="interface in org.eclipse.emf.cdo">CDOLock</A> <B>createLock</B>(org.eclipse.emf.spi.cdo.InternalCDOObject&nbsp;object,
+ <A HREF="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IRWLockManager.LockType.html?is-external=true" title="class or interface in org.eclipse.net4j.util.concurrent">IRWLockManager.LockType</A>&nbsp;type)</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+<DT><B>Since:</B></DT>
+ <DD>4.1</DD>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="getLockState(org.eclipse.emf.spi.cdo.InternalCDOObject)"><!-- --></A><H3>
+getLockState</H3>
+<PRE>
+public static <A HREF="../../../../../org/eclipse/emf/cdo/common/lock/CDOLockState.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockState</A> <B>getLockState</B>(org.eclipse.emf.spi.cdo.InternalCDOObject&nbsp;object)</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+<DT><B>Since:</B></DT>
+ <DD>4.1</DD>
+</DL>
+</DD>
+</DL>
<!-- ========= END OF CLASS DATA ========= -->
<HR>
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.releng.doc/.settings/org.eclipse.jdt.core.prefs
index 1a08a88594..e1b7cecdcc 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,3 @@
-#Fri May 27 22:03:06 CEST 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.codeComplete.argumentPrefixes=
org.eclipse.jdt.core.codeComplete.argumentSuffixes=
@@ -36,6 +35,7 @@ org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
@@ -69,16 +69,21 @@ org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warnin
org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/images/editor-top-left.png b/plugins/org.eclipse.emf.cdo.releng.doc/images/editor-top-left-java.png
index 3405aff3b1..3405aff3b1 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/images/editor-top-left.png
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/images/editor-top-left-java.png
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/images/editor-top-left-xml.png b/plugins/org.eclipse.emf.cdo.releng.doc/images/editor-top-left-xml.png
new file mode 100644
index 0000000000..de44ef29d2
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/images/editor-top-left-xml.png
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecore b/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecore
index 7aff121214..b84a3618af 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecore
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecore
@@ -39,6 +39,8 @@
<eClassifiers xsi:type="ecore:EClass" name="Snippet" eSuperTypes="#//EmbeddableElement">
<eStructuralFeatures xsi:type="ecore:EReference" name="callouts" upperBound="-1"
eType="#//Callout" containment="true" resolveProxies="false" eOpposite="#//Callout/snippet"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="formatter" lowerBound="1"
+ eType="#//Formatter" containment="true" eOpposite="#//Formatter/snippet"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Diagram" eSuperTypes="#//BodyElement"/>
<eClassifiers xsi:type="ecore:EClass" name="Factory" eSuperTypes="#//EmbeddableElement"/>
@@ -78,6 +80,8 @@
<eClassifiers xsi:type="ecore:EClass" name="EmbeddableElement" abstract="true" eSuperTypes="#//Identifiable">
<eStructuralFeatures xsi:type="ecore:EReference" name="documentation" lowerBound="1"
eType="#//Documentation" resolveProxies="false" eOpposite="#//Documentation/embeddableElements"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="doc" lowerBound="1" eType="#//Doc"
+ changeable="false" volatile="true" transient="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ExternalTarget" eSuperTypes="#//LinkTarget">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="url" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
@@ -143,4 +147,12 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="PluginResource" eSuperTypes="#//ExternalArticle"/>
<eClassifiers xsi:type="ecore:EClass" name="Excel" eSuperTypes="#//BodyElement"/>
+ <eClassifiers xsi:type="ecore:EClass" name="Formatter" abstract="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="snippet" lowerBound="1"
+ eType="#//Snippet" eOpposite="#//Snippet/formatter"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="JavaFormatter" eSuperTypes="#//Formatter"/>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlFormatter" eSuperTypes="#//Formatter">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="file" eType="#//File"/>
+ </eClassifiers>
</ecore:EPackage>
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecorediag b/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecorediag
index d18a08bae2..0a3a9b4db4 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecorediag
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecorediag
@@ -110,7 +110,7 @@
</children>
<styles xmi:type="notation:ShapeStyle" xmi:id="_Aoro4dxPEeCpIJpgvmzkYA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
<element xmi:type="ecore:EClass" href="article.ecore#//Snippet"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Aoro4txPEeCpIJpgvmzkYA" x="55" y="561"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Aoro4txPEeCpIJpgvmzkYA" x="55" y="511"/>
</children>
<children xmi:type="notation:Node" xmi:id="_C44w8NxPEeCpIJpgvmzkYA" type="1001">
<children xmi:type="notation:Node" xmi:id="_C44w89xPEeCpIJpgvmzkYA" type="4001"/>
@@ -126,7 +126,7 @@
</children>
<styles xmi:type="notation:ShapeStyle" xmi:id="_C44w8dxPEeCpIJpgvmzkYA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
<element xmi:type="ecore:EClass" href="article.ecore#//Factory"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C44w8txPEeCpIJpgvmzkYA" x="240" y="561"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C44w8txPEeCpIJpgvmzkYA" x="350" y="511"/>
</children>
<children xmi:type="notation:Node" xmi:id="_EOyM4NxPEeCpIJpgvmzkYA" type="1001">
<children xmi:type="notation:Node" xmi:id="_EOyz8NxPEeCpIJpgvmzkYA" type="4001"/>
@@ -215,6 +215,10 @@
<children xmi:type="notation:Node" xmi:id="_bhQRANxTEeCpIJpgvmzkYA" type="1001">
<children xmi:type="notation:Node" xmi:id="_bhQ4ENxTEeCpIJpgvmzkYA" type="4001"/>
<children xmi:type="notation:Node" xmi:id="_bhRfINxTEeCpIJpgvmzkYA" type="5001">
+ <children xmi:type="notation:Node" xmi:id="_Itn5EPSgEeCqzqEG0Xsetg" type="2001">
+ <element xmi:type="ecore:EAttribute" href="article.ecore#//EmbeddableElement/doc"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_Itn5EfSgEeCqzqEG0Xsetg"/>
+ </children>
<styles xmi:type="notation:DrawerStyle" xmi:id="_bhRfIdxTEeCpIJpgvmzkYA"/>
<styles xmi:type="notation:SortingStyle" xmi:id="_bhRfItxTEeCpIJpgvmzkYA"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_bhRfI9xTEeCpIJpgvmzkYA"/>
@@ -226,7 +230,7 @@
</children>
<styles xmi:type="notation:ShapeStyle" xmi:id="_bhQRAdxTEeCpIJpgvmzkYA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
<element xmi:type="ecore:EClass" href="article.ecore#//EmbeddableElement"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bhQRAtxTEeCpIJpgvmzkYA" x="110" y="440" width="158" height="45"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bhQRAtxTEeCpIJpgvmzkYA" x="110" y="380" width="158" height="55"/>
</children>
<children xmi:type="notation:Node" xmi:id="_fQWjgNxUEeCpIJpgvmzkYA" type="1001">
<children xmi:type="notation:Node" xmi:id="_fQXKkNxUEeCpIJpgvmzkYA" type="4001"/>
@@ -552,6 +556,58 @@
<element xmi:type="ecore:EClass" href="article.ecore#//Excel"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_733uM_A3EeCPhdULuX9LcA" x="430" y="896"/>
</children>
+ <children xmi:type="notation:Node" xmi:id="_uXqLkfSXEeCqzqEG0Xsetg" type="1001">
+ <children xmi:type="notation:Node" xmi:id="_uXtO4PSXEeCqzqEG0Xsetg" type="4001"/>
+ <children xmi:type="notation:Node" xmi:id="_uXt18PSXEeCqzqEG0Xsetg" type="5001">
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_uXt18fSXEeCqzqEG0Xsetg"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_uXt18vSXEeCqzqEG0Xsetg"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_uXt18_SXEeCqzqEG0Xsetg"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_uXudAPSXEeCqzqEG0Xsetg" type="5002">
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_uXvEEPSXEeCqzqEG0Xsetg"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_uXvEEfSXEeCqzqEG0Xsetg"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_uXvEEvSXEeCqzqEG0Xsetg"/>
+ </children>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_uXqLkvSXEeCqzqEG0Xsetg" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+ <element xmi:type="ecore:EClass" href="article.ecore#//Formatter"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uXqLk_SXEeCqzqEG0Xsetg" x="235" y="510"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_HumlsPSYEeCqzqEG0Xsetg" type="1001">
+ <children xmi:type="notation:Node" xmi:id="_HunMwPSYEeCqzqEG0Xsetg" type="4001"/>
+ <children xmi:type="notation:Node" xmi:id="_HunMwfSYEeCqzqEG0Xsetg" type="5001">
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_HunMwvSYEeCqzqEG0Xsetg"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_HunMw_SYEeCqzqEG0Xsetg"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_HunMxPSYEeCqzqEG0Xsetg"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_HunMxfSYEeCqzqEG0Xsetg" type="5002">
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_HunMxvSYEeCqzqEG0Xsetg"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_HunMx_SYEeCqzqEG0Xsetg"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_HunMyPSYEeCqzqEG0Xsetg"/>
+ </children>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_HumlsfSYEeCqzqEG0Xsetg" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+ <element xmi:type="ecore:EClass" href="article.ecore#//JavaFormatter"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HumlsvSYEeCqzqEG0Xsetg" x="165" y="600" width="113"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_IzSV0PSYEeCqzqEG0Xsetg" type="1001">
+ <children xmi:type="notation:Node" xmi:id="_IzS84PSYEeCqzqEG0Xsetg" type="4001"/>
+ <children xmi:type="notation:Node" xmi:id="_IzS84fSYEeCqzqEG0Xsetg" type="5001">
+ <children xmi:type="notation:Node" xmi:id="_3N6BQPScEeCqzqEG0Xsetg" type="2001">
+ <element xmi:type="ecore:EAttribute" href="article.ecore#//XmlFormatter/file"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_3N6BQfScEeCqzqEG0Xsetg"/>
+ </children>
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_IzS84vSYEeCqzqEG0Xsetg"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_IzS84_SYEeCqzqEG0Xsetg"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_IzS85PSYEeCqzqEG0Xsetg"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_IzS85fSYEeCqzqEG0Xsetg" type="5002">
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_IzS85vSYEeCqzqEG0Xsetg"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_IzS85_SYEeCqzqEG0Xsetg"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_IzS86PSYEeCqzqEG0Xsetg"/>
+ </children>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_IzSV0fSYEeCqzqEG0Xsetg" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+ <element xmi:type="ecore:EClass" href="article.ecore#//XmlFormatter"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IzSV0vSYEeCqzqEG0Xsetg" x="290" y="600" width="113"/>
+ </children>
<styles xmi:type="notation:DiagramStyle" xmi:id="_x6vqQNxNEeCpIJpgvmzkYA"/>
<element xmi:type="ecore:EPackage" href="article.ecore#/"/>
<edges xmi:type="notation:Edge" xmi:id="_qxw_8NxOEeCpIJpgvmzkYA" type="3002" source="_9P3IYNxNEeCpIJpgvmzkYA" target="_zVqwINxNEeCpIJpgvmzkYA">
@@ -626,7 +682,7 @@
<styles xmi:type="notation:ConnectorStyle" xmi:id="_zvfBgdxREeCpIJpgvmzkYA" routing="Rectilinear" lineColor="4210752"/>
<styles xmi:type="notation:FontStyle" xmi:id="_zvfBgtxREeCpIJpgvmzkYA" fontName="Segoe UI"/>
<element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zvfBg9xREeCpIJpgvmzkYA" points="[-8, -33, -188, 103]$[-8, -63, -188, 73]$[180, -63, 0, 73]$[180, -99, 0, 37]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zvfBg9xREeCpIJpgvmzkYA" points="[-8, -24, -188, 103]$[-8, -54, -188, 73]$[180, -54, 0, 73]$[180, -90, 0, 37]"/>
</edges>
<edges xmi:type="notation:Edge" xmi:id="_W2eZYNxSEeCpIJpgvmzkYA" type="3002" source="_Aoro4NxPEeCpIJpgvmzkYA" target="_VHuYkNxSEeCpIJpgvmzkYA">
<children xmi:type="notation:Node" xmi:id="_W2fAcNxSEeCpIJpgvmzkYA" type="4011">
@@ -660,13 +716,13 @@
<styles xmi:type="notation:ConnectorStyle" xmi:id="_lzWL4dxTEeCpIJpgvmzkYA" routing="Rectilinear" lineColor="4210752"/>
<styles xmi:type="notation:FontStyle" xmi:id="_lzWL4txTEeCpIJpgvmzkYA" fontName="Segoe UI"/>
<element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lzWL49xTEeCpIJpgvmzkYA" points="[14, -20, -101, 90]$[14, -54, -101, 56]$[115, -54, 0, 56]$[115, -79, 0, 31]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lzWL49xTEeCpIJpgvmzkYA" points="[-1, -20, -84, 100]$[-1, -61, -84, 59]$[95, -61, 12, 59]$[95, -98, 12, 22]"/>
</edges>
<edges xmi:type="notation:Edge" xmi:id="_nZNWcNxTEeCpIJpgvmzkYA" type="3003" source="_C44w8NxPEeCpIJpgvmzkYA" target="_bhQRANxTEeCpIJpgvmzkYA">
<styles xmi:type="notation:ConnectorStyle" xmi:id="_nZNWcdxTEeCpIJpgvmzkYA" routing="Rectilinear" lineColor="4210752"/>
<styles xmi:type="notation:FontStyle" xmi:id="_nZNWctxTEeCpIJpgvmzkYA" fontName="Segoe UI"/>
<element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nZNWc9xTEeCpIJpgvmzkYA" points="[-1, -20, 101, 100]$[-1, -61, 101, 59]$[-92, -61, 10, 59]$[-92, -98, 10, 22]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nZNWc9xTEeCpIJpgvmzkYA" points="[5, -20, 217, 100]$[5, -61, 217, 59]$[-200, -61, 12, 59]$[-200, -98, 12, 22]"/>
</edges>
<edges xmi:type="notation:Edge" xmi:id="_AlwecNxUEeCpIJpgvmzkYA" type="3003" source="_EOyM4NxPEeCpIJpgvmzkYA" target="_x5KOgNxQEeCpIJpgvmzkYA">
<styles xmi:type="notation:ConnectorStyle" xmi:id="_AlwecdxUEeCpIJpgvmzkYA" routing="Rectilinear" lineColor="4210752"/>
@@ -690,25 +746,25 @@
<styles xmi:type="notation:ConnectorStyle" xmi:id="_kreS8dxVEeCpIJpgvmzkYA" routing="Rectilinear" lineColor="4210752"/>
<styles xmi:type="notation:FontStyle" xmi:id="_kreS8txVEeCpIJpgvmzkYA" fontName="Segoe UI"/>
<element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kreS89xVEeCpIJpgvmzkYA" points="[12, -21, -358, 391]$[12, -356, -358, 56]$[369, -356, -1, 56]$[369, -387, -1, 25]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kreS89xVEeCpIJpgvmzkYA" points="[12, -21, -358, 341]$[12, -306, -358, 56]$[369, -306, -1, 56]$[369, -337, -1, 25]"/>
</edges>
<edges xmi:type="notation:Edge" xmi:id="_DI4QkNxWEeCpIJpgvmzkYA" type="3002" source="_zVqwINxNEeCpIJpgvmzkYA" target="_bhQRANxTEeCpIJpgvmzkYA">
<children xmi:type="notation:Node" xmi:id="_DI4QlNxWEeCpIJpgvmzkYA" type="4011">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_DI43oNxWEeCpIJpgvmzkYA" x="-40" y="-15"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_DI43oNxWEeCpIJpgvmzkYA" x="-29" y="17"/>
</children>
<children xmi:type="notation:Node" xmi:id="_DI43odxWEeCpIJpgvmzkYA" type="4012">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_DI43otxWEeCpIJpgvmzkYA" x="15" y="15"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_DI43otxWEeCpIJpgvmzkYA" x="25" y="-17"/>
</children>
<styles xmi:type="notation:ConnectorStyle" xmi:id="_DI4QkdxWEeCpIJpgvmzkYA" routing="Rectilinear" lineColor="4210752"/>
<styles xmi:type="notation:FontStyle" xmi:id="_DI4QktxWEeCpIJpgvmzkYA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
<element xmi:type="ecore:EReference" href="article.ecore#//Documentation/embeddableElements"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DI4Qk9xWEeCpIJpgvmzkYA" points="[-77, 0, 292, 4]$[-291, 0, 78, 4]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2RYi4N6IEeCgeMAkr6dR9Q" id="(0.5,0.5)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2RYi4d6IEeCgeMAkr6dR9Q" id="(0.5,0.5)"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DI4Qk9xWEeCpIJpgvmzkYA" points="[-77, -11, 292, 43]$[-184, -11, 185, 43]$[-184, -50, 185, 4]$[-291, -50, 78, 4]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Cz6NUPSYEeCqzqEG0Xsetg" id="(0.5,0.5)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Cz6NUfSYEeCqzqEG0Xsetg" id="(0.5,0.5)"/>
</edges>
<edges xmi:type="notation:Edge" xmi:id="_IkI_YNxWEeCpIJpgvmzkYA" type="3002" source="_bhQRANxTEeCpIJpgvmzkYA" target="_zVqwINxNEeCpIJpgvmzkYA">
<children xmi:type="notation:Node" xmi:id="_IkJmcNxWEeCpIJpgvmzkYA" type="4011">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_IkJmcdxWEeCpIJpgvmzkYA" x="-23" y="-15"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_IkJmcdxWEeCpIJpgvmzkYA" x="-13" y="-14"/>
</children>
<children xmi:type="notation:Node" xmi:id="_IkJmctxWEeCpIJpgvmzkYA" type="4012">
<layoutConstraint xmi:type="notation:Location" xmi:id="_IkJmc9xWEeCpIJpgvmzkYA" x="17" y="15"/>
@@ -716,7 +772,7 @@
<styles xmi:type="notation:ConnectorStyle" xmi:id="_IkI_YdxWEeCpIJpgvmzkYA" routing="Rectilinear" lineColor="4210752"/>
<styles xmi:type="notation:FontStyle" xmi:id="_IkI_YtxWEeCpIJpgvmzkYA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
<element xmi:type="ecore:EReference" href="article.ecore#//EmbeddableElement/documentation"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IkI_Y9xWEeCpIJpgvmzkYA" points="[78, 4, -291, 0]$[292, 4, -77, 0]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IkI_Y9xWEeCpIJpgvmzkYA" points="[78, 4, -291, -50]$[185, 4, -184, -50]$[185, 43, -184, -11]$[292, 43, -77, -11]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0XsdYN6IEeCgeMAkr6dR9Q" id="(0.5,0.5)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0XsdYd6IEeCgeMAkr6dR9Q" id="(0.5,0.5)"/>
</edges>
@@ -731,7 +787,7 @@
<styles xmi:type="notation:ConnectorStyle" xmi:id="_G9qM8dxaEeCpIJpgvmzkYA" routing="Rectilinear" lineColor="4210752"/>
<styles xmi:type="notation:FontStyle" xmi:id="_G9qM8txaEeCpIJpgvmzkYA" fontName="Segoe UI"/>
<element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_G9qM89xaEeCpIJpgvmzkYA" points="[5, -20, 42, 75]$[5, -42, 42, 53]$[-37, -42, 0, 53]$[-37, -70, 0, 25]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_G9qM89xaEeCpIJpgvmzkYA" points="[9, -20, 49, 79]$[9, -43, 49, 56]$[-40, -43, 0, 56]$[-40, -78, 0, 21]"/>
</edges>
<edges xmi:type="notation:Edge" xmi:id="_HbG98NxaEeCpIJpgvmzkYA" type="3003" source="__ov14NxOEeCpIJpgvmzkYA" target="_OGiwoNxZEeCpIJpgvmzkYA">
<styles xmi:type="notation:ConnectorStyle" xmi:id="_HbG98dxaEeCpIJpgvmzkYA" routing="Rectilinear" lineColor="4210752"/>
@@ -761,7 +817,7 @@
<styles xmi:type="notation:ConnectorStyle" xmi:id="_MrPI4dxcEeCpIJpgvmzkYA" routing="Rectilinear" lineColor="4210752"/>
<styles xmi:type="notation:FontStyle" xmi:id="_MrPI4txcEeCpIJpgvmzkYA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
<element xmi:type="ecore:EReference" href="article.ecore#//Embedding/element"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MrPI49xcEeCpIJpgvmzkYA" points="[-1, 21, 43, 476]$[-1, 74, 43, 529]$[-204, 74, -160, 529]$[-204, -450, -160, 5]$[-122, -450, -78, 5]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MrPI49xcEeCpIJpgvmzkYA" points="[-1, 21, 43, 526]$[-1, 49, 43, 554]$[-204, 49, -160, 554]$[-204, -501, -160, 4]$[-122, -501, -78, 4]"/>
</edges>
<edges xmi:type="notation:Edge" xmi:id="_UGQI8NxcEeCpIJpgvmzkYA" type="3003" source="_-69sYNxaEeCpIJpgvmzkYA" target="_yWi_ANxZEeCpIJpgvmzkYA">
<styles xmi:type="notation:ConnectorStyle" xmi:id="_UGQI8dxcEeCpIJpgvmzkYA" routing="Rectilinear" lineColor="4210752"/>
@@ -912,7 +968,7 @@
<styles xmi:type="notation:ConnectorStyle" xmi:id="_YnpCkd6jEeCgeMAkr6dR9Q" routing="Rectilinear" lineColor="4210752"/>
<styles xmi:type="notation:FontStyle" xmi:id="_YnpCkt6jEeCgeMAkr6dR9Q" fontName="Segoe UI"/>
<element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YnpCk96jEeCgeMAkr6dR9Q" points="[17, -20, 75, 128]$[17, -46, 75, 102]$[-50, -46, 8, 102]$[-50, -127, 8, 21]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YnpCk96jEeCgeMAkr6dR9Q" points="[10, -20, 68, 128]$[10, -46, 68, 102]$[-50, -46, 8, 102]$[-50, -127, 8, 21]"/>
</edges>
<edges xmi:type="notation:Edge" xmi:id="_Fv_XwN7-EeCn4588_wNmZw" type="3003" source="_6rOp0N79EeCn4588_wNmZw" target="_-tAmYNxOEeCpIJpgvmzkYA">
<styles xmi:type="notation:ConnectorStyle" xmi:id="_Fv_Xwd7-EeCn4588_wNmZw" routing="Rectilinear" lineColor="4210752"/>
@@ -924,7 +980,7 @@
<styles xmi:type="notation:ConnectorStyle" xmi:id="_jR5PEd8BEeCn4588_wNmZw" routing="Rectilinear" lineColor="4210752"/>
<styles xmi:type="notation:FontStyle" xmi:id="_jR5PEt8BEeCn4588_wNmZw" fontName="Segoe UI"/>
<element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jR5PE98BEeCn4588_wNmZw" points="[15, -20, -55, 108]$[15, -46, -55, 82]$[71, -46, 1, 82]$[71, -127, 1, 1]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jR5PE98BEeCn4588_wNmZw" points="[-1, -20, -71, 108]$[-1, -46, -71, 82]$[71, -46, 1, 82]$[71, -127, 1, 1]"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SIwVgN9REeCn4588_wNmZw" id="(0.5784313725490197,0.9767441860465116)"/>
</edges>
<edges xmi:type="notation:Edge" xmi:id="_06bPkN9PEeCn4588_wNmZw" type="3002" source="_LJYjIN6iEeCgeMAkr6dR9Q" target="_nYaYgN8BEeCn4588_wNmZw">
@@ -986,4 +1042,44 @@
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__i-G8_A3EeCPhdULuX9LcA" points="[-1, -20, 189, 92]$[-1, -51, 189, 61]$[-191, -51, -1, 61]$[-191, -87, -1, 25]"/>
</edges>
+ <edges xmi:type="notation:Edge" xmi:id="_yzIRUPSXEeCqzqEG0Xsetg" type="3002" source="_Aoro4NxPEeCpIJpgvmzkYA" target="_uXqLkfSXEeCqzqEG0Xsetg">
+ <children xmi:type="notation:Node" xmi:id="_yzI4YPSXEeCqzqEG0Xsetg" type="4011">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_yzI4YfSXEeCqzqEG0Xsetg" x="-21" y="-12"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_yzJfcPSXEeCqzqEG0Xsetg" type="4012">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_yzJfcfSXEeCqzqEG0Xsetg" x="-3" y="10"/>
+ </children>
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_yzIRUfSXEeCqzqEG0Xsetg" routing="Rectilinear" lineColor="4210752"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_yzIRUvSXEeCqzqEG0Xsetg" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+ <element xmi:type="ecore:EReference" href="article.ecore#//Snippet/formatter"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_yzIRU_SXEeCqzqEG0Xsetg" points="[50, -1, -130, 0]$[130, -1, -50, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_G7sBYPSgEeCqzqEG0Xsetg" id="(0.5,0.5)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_G7sBYfSgEeCqzqEG0Xsetg" id="(0.5,0.5)"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_KEISoPSYEeCqzqEG0Xsetg" type="3003" source="_HumlsPSYEeCqzqEG0Xsetg" target="_uXqLkfSXEeCqzqEG0Xsetg">
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_KEISofSYEeCqzqEG0Xsetg" routing="Rectilinear" lineColor="4210752"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_KEISovSYEeCqzqEG0Xsetg" fontName="Segoe UI"/>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KEISo_SYEeCqzqEG0Xsetg" points="[2, -20, -63, 70]$[2, -41, -63, 49]$[64, -41, -1, 49]$[64, -69, -1, 21]"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_KhC4IPSYEeCqzqEG0Xsetg" type="3003" source="_IzSV0PSYEeCqzqEG0Xsetg" target="_uXqLkfSXEeCqzqEG0Xsetg">
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_KhC4IfSYEeCqzqEG0Xsetg" routing="Rectilinear" lineColor="4210752"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_KhC4IvSYEeCqzqEG0Xsetg" fontName="Segoe UI"/>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KhC4I_SYEeCqzqEG0Xsetg" points="[-3, -24, 57, 70]$[-3, -45, 57, 49]$[-61, -45, -1, 49]$[-61, -73, -1, 21]"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_vWzawPSfEeCqzqEG0Xsetg" type="3002" source="_uXqLkfSXEeCqzqEG0Xsetg" target="_Aoro4NxPEeCpIJpgvmzkYA">
+ <children xmi:type="notation:Node" xmi:id="_vW0B0PSfEeCqzqEG0Xsetg" type="4011">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_vW0B0fSfEeCqzqEG0Xsetg" x="-10" y="-10"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_vW0B0vSfEeCqzqEG0Xsetg" type="4012">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_vW0B0_SfEeCqzqEG0Xsetg" x="10" y="10"/>
+ </children>
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_vWzawfSfEeCqzqEG0Xsetg" routing="Rectilinear" lineColor="4210752"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_vWzawvSfEeCqzqEG0Xsetg" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+ <element xmi:type="ecore:EReference" href="article.ecore#//Formatter/snippet"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vWzaw_SfEeCqzqEG0Xsetg" points="[-50, 0, 130, -1]$[-130, 0, 50, -1]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yBh7oPSfEeCqzqEG0Xsetg" id="(0.5,0.5)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yBh7ofSfEeCqzqEG0Xsetg" id="(0.5,0.5)"/>
+ </edges>
</notation:Diagram>
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ArticleFactory.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ArticleFactory.java
index 2f443c2195..1f2c1e71a4 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ArticleFactory.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ArticleFactory.java
@@ -217,6 +217,22 @@ public interface ArticleFactory extends EFactory
Excel createExcel();
/**
+ * Returns a new object of class '<em>Java Formatter</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return a new object of class '<em>Java Formatter</em>'.
+ * @generated
+ */
+ JavaFormatter createJavaFormatter();
+
+ /**
+ * Returns a new object of class '<em>Xml Formatter</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return a new object of class '<em>Xml Formatter</em>'.
+ * @generated
+ */
+ XmlFormatter createXmlFormatter();
+
+ /**
* Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @return the package supported by this factory.
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ArticlePackage.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ArticlePackage.java
index ea122b18c3..5224ba251d 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ArticlePackage.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ArticlePackage.java
@@ -831,13 +831,21 @@ public interface ArticlePackage extends EPackage
int EMBEDDABLE_ELEMENT__DOCUMENTATION = IDENTIFIABLE_FEATURE_COUNT + 0;
/**
+ * The feature id for the '<em><b>Doc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int EMBEDDABLE_ELEMENT__DOC = IDENTIFIABLE_FEATURE_COUNT + 1;
+
+ /**
* The number of structural features of the '<em>Embeddable Element</em>' class. <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
* @ordered
*/
- int EMBEDDABLE_ELEMENT_FEATURE_COUNT = IDENTIFIABLE_FEATURE_COUNT + 1;
+ int EMBEDDABLE_ELEMENT_FEATURE_COUNT = IDENTIFIABLE_FEATURE_COUNT + 2;
/**
* The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.SnippetImpl <em>Snippet</em>}'
@@ -867,6 +875,14 @@ public interface ArticlePackage extends EPackage
int SNIPPET__DOCUMENTATION = EMBEDDABLE_ELEMENT__DOCUMENTATION;
/**
+ * The feature id for the '<em><b>Doc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int SNIPPET__DOC = EMBEDDABLE_ELEMENT__DOC;
+
+ /**
* The feature id for the '<em><b>Callouts</b></em>' containment reference list. <!-- begin-user-doc --> <!--
* end-user-doc -->
*
@@ -876,12 +892,21 @@ public interface ArticlePackage extends EPackage
int SNIPPET__CALLOUTS = EMBEDDABLE_ELEMENT_FEATURE_COUNT + 0;
/**
+ * The feature id for the '<em><b>Formatter</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc
+ * -->
+ *
+ * @generated
+ * @ordered
+ */
+ int SNIPPET__FORMATTER = EMBEDDABLE_ELEMENT_FEATURE_COUNT + 1;
+
+ /**
* The number of structural features of the '<em>Snippet</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
* @ordered
*/
- int SNIPPET_FEATURE_COUNT = EMBEDDABLE_ELEMENT_FEATURE_COUNT + 1;
+ int SNIPPET_FEATURE_COUNT = EMBEDDABLE_ELEMENT_FEATURE_COUNT + 2;
/**
* The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.BodyElementImpl
@@ -982,6 +1007,14 @@ public interface ArticlePackage extends EPackage
int FACTORY__DOCUMENTATION = EMBEDDABLE_ELEMENT__DOCUMENTATION;
/**
+ * The feature id for the '<em><b>Doc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int FACTORY__DOC = EMBEDDABLE_ELEMENT__DOC;
+
+ /**
* The number of structural features of the '<em>Factory</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
@@ -1961,13 +1994,101 @@ public interface ArticlePackage extends EPackage
int EXCEL_FEATURE_COUNT = BODY_ELEMENT_FEATURE_COUNT + 0;
/**
+ * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.FormatterImpl <em>Formatter</em>}'
+ * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.cdo.releng.doc.article.impl.FormatterImpl
+ * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getFormatter()
+ * @generated
+ */
+ int FORMATTER = 31;
+
+ /**
+ * The feature id for the '<em><b>Snippet</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int FORMATTER__SNIPPET = 0;
+
+ /**
+ * The number of structural features of the '<em>Formatter</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int FORMATTER_FEATURE_COUNT = 1;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.JavaFormatterImpl
+ * <em>Java Formatter</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.cdo.releng.doc.article.impl.JavaFormatterImpl
+ * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getJavaFormatter()
+ * @generated
+ */
+ int JAVA_FORMATTER = 32;
+
+ /**
+ * The feature id for the '<em><b>Snippet</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int JAVA_FORMATTER__SNIPPET = FORMATTER__SNIPPET;
+
+ /**
+ * The number of structural features of the '<em>Java Formatter</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+ * -->
+ *
+ * @generated
+ * @ordered
+ */
+ int JAVA_FORMATTER_FEATURE_COUNT = FORMATTER_FEATURE_COUNT + 0;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.XmlFormatterImpl
+ * <em>Xml Formatter</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.cdo.releng.doc.article.impl.XmlFormatterImpl
+ * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getXmlFormatter()
+ * @generated
+ */
+ int XML_FORMATTER = 33;
+
+ /**
+ * The feature id for the '<em><b>Snippet</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int XML_FORMATTER__SNIPPET = FORMATTER__SNIPPET;
+
+ /**
+ * The feature id for the '<em><b>File</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int XML_FORMATTER__FILE = FORMATTER_FEATURE_COUNT + 0;
+
+ /**
+ * The number of structural features of the '<em>Xml Formatter</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+ * -->
+ *
+ * @generated
+ * @ordered
+ */
+ int XML_FORMATTER_FEATURE_COUNT = FORMATTER_FEATURE_COUNT + 1;
+
+ /**
* The meta object id for the '<em>Root Doc</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @see com.sun.javadoc.RootDoc
* @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getRootDoc()
* @generated
*/
- int ROOT_DOC = 31;
+ int ROOT_DOC = 34;
/**
* The meta object id for the '<em>File</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -1976,7 +2097,7 @@ public interface ArticlePackage extends EPackage
* @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getFile()
* @generated
*/
- int FILE = 32;
+ int FILE = 35;
/**
* The meta object id for the '<em>Doc</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -1985,7 +2106,7 @@ public interface ArticlePackage extends EPackage
* @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getDoc()
* @generated
*/
- int DOC = 33;
+ int DOC = 36;
/**
* The meta object id for the '<em>Tag</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -1994,7 +2115,7 @@ public interface ArticlePackage extends EPackage
* @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getTag()
* @generated
*/
- int TAG = 34;
+ int TAG = 37;
/**
* Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.Documentation
@@ -2184,6 +2305,18 @@ public interface ArticlePackage extends EPackage
EReference getSnippet_Callouts();
/**
+ * Returns the meta object for the containment reference '
+ * {@link org.eclipse.emf.cdo.releng.doc.article.Snippet#getFormatter <em>Formatter</em>}'. <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the containment reference '<em>Formatter</em>'.
+ * @see org.eclipse.emf.cdo.releng.doc.article.Snippet#getFormatter()
+ * @see #getSnippet()
+ * @generated
+ */
+ EReference getSnippet_Formatter();
+
+ /**
* Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.Diagram <em>Diagram</em>}'. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
@@ -2371,6 +2504,17 @@ public interface ArticlePackage extends EPackage
EReference getEmbeddableElement_Documentation();
/**
+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.doc.article.EmbeddableElement#getDoc
+ * <em>Doc</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the meta object for the attribute '<em>Doc</em>'.
+ * @see org.eclipse.emf.cdo.releng.doc.article.EmbeddableElement#getDoc()
+ * @see #getEmbeddableElement()
+ * @generated
+ */
+ EAttribute getEmbeddableElement_Doc();
+
+ /**
* Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.ExternalTarget
* <em>External Target</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
*
@@ -2755,6 +2899,59 @@ public interface ArticlePackage extends EPackage
EClass getExcel();
/**
+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.Formatter <em>Formatter</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the meta object for class '<em>Formatter</em>'.
+ * @see org.eclipse.emf.cdo.releng.doc.article.Formatter
+ * @generated
+ */
+ EClass getFormatter();
+
+ /**
+ * Returns the meta object for the container reference '
+ * {@link org.eclipse.emf.cdo.releng.doc.article.Formatter#getSnippet <em>Snippet</em>}'. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @return the meta object for the container reference '<em>Snippet</em>'.
+ * @see org.eclipse.emf.cdo.releng.doc.article.Formatter#getSnippet()
+ * @see #getFormatter()
+ * @generated
+ */
+ EReference getFormatter_Snippet();
+
+ /**
+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.JavaFormatter
+ * <em>Java Formatter</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the meta object for class '<em>Java Formatter</em>'.
+ * @see org.eclipse.emf.cdo.releng.doc.article.JavaFormatter
+ * @generated
+ */
+ EClass getJavaFormatter();
+
+ /**
+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.XmlFormatter
+ * <em>Xml Formatter</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the meta object for class '<em>Xml Formatter</em>'.
+ * @see org.eclipse.emf.cdo.releng.doc.article.XmlFormatter
+ * @generated
+ */
+ EClass getXmlFormatter();
+
+ /**
+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.doc.article.XmlFormatter#getFile
+ * <em>File</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the meta object for the attribute '<em>File</em>'.
+ * @see org.eclipse.emf.cdo.releng.doc.article.XmlFormatter#getFile()
+ * @see #getXmlFormatter()
+ * @generated
+ */
+ EAttribute getXmlFormatter_File();
+
+ /**
* Returns the meta object for data type '{@link com.sun.javadoc.RootDoc <em>Root Doc</em>}'. <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -2969,6 +3166,14 @@ public interface ArticlePackage extends EPackage
EReference SNIPPET__CALLOUTS = eINSTANCE.getSnippet_Callouts();
/**
+ * The meta object literal for the '<em><b>Formatter</b></em>' containment reference feature. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference SNIPPET__FORMATTER = eINSTANCE.getSnippet_Formatter();
+
+ /**
* The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.DiagramImpl <em>Diagram</em>}
* ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
*
@@ -3119,6 +3324,14 @@ public interface ArticlePackage extends EPackage
EReference EMBEDDABLE_ELEMENT__DOCUMENTATION = eINSTANCE.getEmbeddableElement_Documentation();
/**
+ * The meta object literal for the '<em><b>Doc</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ */
+ EAttribute EMBEDDABLE_ELEMENT__DOC = eINSTANCE.getEmbeddableElement_Doc();
+
+ /**
* The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.ExternalTargetImpl
* <em>External Target</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
*
@@ -3443,6 +3656,52 @@ public interface ArticlePackage extends EPackage
EClass EXCEL = eINSTANCE.getExcel();
/**
+ * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.FormatterImpl
+ * <em>Formatter</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.cdo.releng.doc.article.impl.FormatterImpl
+ * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getFormatter()
+ * @generated
+ */
+ EClass FORMATTER = eINSTANCE.getFormatter();
+
+ /**
+ * The meta object literal for the '<em><b>Snippet</b></em>' container reference feature. <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference FORMATTER__SNIPPET = eINSTANCE.getFormatter_Snippet();
+
+ /**
+ * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.JavaFormatterImpl
+ * <em>Java Formatter</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.cdo.releng.doc.article.impl.JavaFormatterImpl
+ * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getJavaFormatter()
+ * @generated
+ */
+ EClass JAVA_FORMATTER = eINSTANCE.getJavaFormatter();
+
+ /**
+ * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.XmlFormatterImpl
+ * <em>Xml Formatter</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.cdo.releng.doc.article.impl.XmlFormatterImpl
+ * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getXmlFormatter()
+ * @generated
+ */
+ EClass XML_FORMATTER = eINSTANCE.getXmlFormatter();
+
+ /**
+ * The meta object literal for the '<em><b>File</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ */
+ EAttribute XML_FORMATTER__FILE = eINSTANCE.getXmlFormatter_File();
+
+ /**
* The meta object literal for the '<em>Root Doc</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @see com.sun.javadoc.RootDoc
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/EmbeddableElement.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/EmbeddableElement.java
index 005c00cb62..f8049f37ae 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/EmbeddableElement.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/EmbeddableElement.java
@@ -6,6 +6,8 @@
*/
package org.eclipse.emf.cdo.releng.doc.article;
+import com.sun.javadoc.Doc;
+
import java.io.IOException;
import java.io.PrintWriter;
@@ -55,5 +57,20 @@ public interface EmbeddableElement extends Identifiable
*/
void setDocumentation(Documentation value);
+ /**
+ * Returns the value of the '<em><b>Doc</b></em>' attribute. <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Doc</em>' attribute isn't clear, there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Doc</em>' attribute.
+ * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getEmbeddableElement_Doc()
+ * @model dataType="org.eclipse.emf.cdo.releng.doc.article.Doc" required="true" transient="true" changeable="false"
+ * volatile="true"
+ * @generated
+ */
+ Doc getDoc();
+
void generate(PrintWriter out, Embedding embedder) throws IOException;
} // EmbeddableElement
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Formatter.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Formatter.java
new file mode 100644
index 0000000000..f149b2ed95
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Formatter.java
@@ -0,0 +1,71 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.emf.cdo.releng.doc.article;
+
+import org.eclipse.emf.ecore.EObject;
+
+import com.sun.javadoc.Doc;
+import com.sun.javadoc.SeeTag;
+
+import java.io.PrintWriter;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Formatter</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.releng.doc.article.Formatter#getSnippet <em>Snippet</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getFormatter()
+ * @model abstract="true"
+ * @generated
+ */
+public interface Formatter extends EObject
+{
+
+ /**
+ * Returns the value of the '<em><b>Snippet</b></em>' container reference. It is bidirectional and its opposite is '
+ * {@link org.eclipse.emf.cdo.releng.doc.article.Snippet#getFormatter <em>Formatter</em>}'. <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Snippet</em>' container reference isn't clear, there really should be more of a
+ * description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Snippet</em>' container reference.
+ * @see #setSnippet(Snippet)
+ * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getFormatter_Snippet()
+ * @see org.eclipse.emf.cdo.releng.doc.article.Snippet#getFormatter
+ * @model opposite="formatter" required="true" transient="false"
+ * @generated
+ */
+ Snippet getSnippet();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.emf.cdo.releng.doc.article.Formatter#getSnippet <em>Snippet</em>}'
+ * container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param value
+ * the new value of the '<em>Snippet</em>' container reference.
+ * @see #getSnippet()
+ * @generated
+ */
+ void setSnippet(Snippet value);
+
+ Doc getDoc();
+
+ String getDefaultTitle(SeeTag embedderTag);
+
+ String getTopLeftEditorIcon(String imagePath);
+
+ String getSnippetHtml(PrintWriter out, String id, String title);
+
+ String getCalloutMarker();
+
+} // Formatter
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/JavaFormatter.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/JavaFormatter.java
new file mode 100644
index 0000000000..26a723e552
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/JavaFormatter.java
@@ -0,0 +1,18 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.emf.cdo.releng.doc.article;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Java Formatter</b></em>'. <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getJavaFormatter()
+ * @model
+ * @generated
+ */
+public interface JavaFormatter extends Formatter
+{
+} // JavaFormatter
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Snippet.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Snippet.java
index 010ac81549..c0e914cfb7 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Snippet.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Snippet.java
@@ -14,6 +14,7 @@ import org.eclipse.emf.common.util.EList;
* The following features are supported:
* <ul>
* <li>{@link org.eclipse.emf.cdo.releng.doc.article.Snippet#getCallouts <em>Callouts</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.releng.doc.article.Snippet#getFormatter <em>Formatter</em>}</li>
* </ul>
* </p>
*
@@ -41,4 +42,33 @@ public interface Snippet extends EmbeddableElement
*/
EList<Callout> getCallouts();
+ /**
+ * Returns the value of the '<em><b>Formatter</b></em>' containment reference. It is bidirectional and its opposite is
+ * '{@link org.eclipse.emf.cdo.releng.doc.article.Formatter#getSnippet <em>Snippet</em>}'. <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Formatter</em>' containment reference isn't clear, there really should be more of a
+ * description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Formatter</em>' containment reference.
+ * @see #setFormatter(Formatter)
+ * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getSnippet_Formatter()
+ * @see org.eclipse.emf.cdo.releng.doc.article.Formatter#getSnippet
+ * @model opposite="snippet" containment="true" required="true"
+ * @generated
+ */
+ Formatter getFormatter();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.emf.cdo.releng.doc.article.Snippet#getFormatter <em>Formatter</em>}'
+ * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param value
+ * the new value of the '<em>Formatter</em>' containment reference.
+ * @see #getFormatter()
+ * @generated
+ */
+ void setFormatter(Formatter value);
+
} // Snippet
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/XmlFormatter.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/XmlFormatter.java
new file mode 100644
index 0000000000..90d3415325
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/XmlFormatter.java
@@ -0,0 +1,52 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.emf.cdo.releng.doc.article;
+
+import java.io.File;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Xml Formatter</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.releng.doc.article.XmlFormatter#getFile <em>File</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getXmlFormatter()
+ * @model
+ * @generated
+ */
+public interface XmlFormatter extends Formatter
+{
+
+ /**
+ * Returns the value of the '<em><b>File</b></em>' attribute. <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>File</em>' attribute isn't clear, there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>File</em>' attribute.
+ * @see #setFile(File)
+ * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getXmlFormatter_File()
+ * @model dataType="org.eclipse.emf.cdo.releng.doc.article.File"
+ * @generated
+ */
+ File getFile();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.emf.cdo.releng.doc.article.XmlFormatter#getFile <em>File</em>}'
+ * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param value
+ * the new value of the '<em>File</em>' attribute.
+ * @see #getFile()
+ * @generated
+ */
+ void setFile(File value);
+} // XmlFormatter
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticleFactoryImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticleFactoryImpl.java
index 6f958d12f1..f6cb2d751f 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticleFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticleFactoryImpl.java
@@ -22,6 +22,7 @@ import org.eclipse.emf.cdo.releng.doc.article.ExternalArticle;
import org.eclipse.emf.cdo.releng.doc.article.ExternalTarget;
import org.eclipse.emf.cdo.releng.doc.article.Factory;
import org.eclipse.emf.cdo.releng.doc.article.JavaElement;
+import org.eclipse.emf.cdo.releng.doc.article.JavaFormatter;
import org.eclipse.emf.cdo.releng.doc.article.JavaPackage;
import org.eclipse.emf.cdo.releng.doc.article.Javadoc;
import org.eclipse.emf.cdo.releng.doc.article.Link;
@@ -32,6 +33,7 @@ import org.eclipse.emf.cdo.releng.doc.article.Snippet;
import org.eclipse.emf.cdo.releng.doc.article.SourceCode;
import org.eclipse.emf.cdo.releng.doc.article.Text;
import org.eclipse.emf.cdo.releng.doc.article.Toc;
+import org.eclipse.emf.cdo.releng.doc.article.XmlFormatter;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
@@ -140,6 +142,10 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
return createPluginResource();
case ArticlePackage.EXCEL:
return createExcel();
+ case ArticlePackage.JAVA_FORMATTER:
+ return createJavaFormatter();
+ case ArticlePackage.XML_FORMATTER:
+ return createXmlFormatter();
default:
throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
}
@@ -448,6 +454,28 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
*
* @generated
*/
+ public JavaFormatter createJavaFormatter()
+ {
+ JavaFormatterImpl javaFormatter = new JavaFormatterImpl();
+ return javaFormatter;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public XmlFormatter createXmlFormatter()
+ {
+ XmlFormatterImpl xmlFormatter = new XmlFormatterImpl();
+ return xmlFormatter;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
public File createFileFromString(EDataType eDataType, String initialValue)
{
return (File)super.createFromString(eDataType, initialValue);
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticlePackageImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticlePackageImpl.java
index 6164240fce..afb236e000 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticlePackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticlePackageImpl.java
@@ -25,8 +25,10 @@ import org.eclipse.emf.cdo.releng.doc.article.ExtensionPoint;
import org.eclipse.emf.cdo.releng.doc.article.ExternalArticle;
import org.eclipse.emf.cdo.releng.doc.article.ExternalTarget;
import org.eclipse.emf.cdo.releng.doc.article.Factory;
+import org.eclipse.emf.cdo.releng.doc.article.Formatter;
import org.eclipse.emf.cdo.releng.doc.article.Identifiable;
import org.eclipse.emf.cdo.releng.doc.article.JavaElement;
+import org.eclipse.emf.cdo.releng.doc.article.JavaFormatter;
import org.eclipse.emf.cdo.releng.doc.article.JavaPackage;
import org.eclipse.emf.cdo.releng.doc.article.Javadoc;
import org.eclipse.emf.cdo.releng.doc.article.Link;
@@ -39,6 +41,7 @@ import org.eclipse.emf.cdo.releng.doc.article.SourceCode;
import org.eclipse.emf.cdo.releng.doc.article.StructuralElement;
import org.eclipse.emf.cdo.releng.doc.article.Text;
import org.eclipse.emf.cdo.releng.doc.article.Toc;
+import org.eclipse.emf.cdo.releng.doc.article.XmlFormatter;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
@@ -283,6 +286,27 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
*
* @generated
*/
+ private EClass formatterEClass = null;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ private EClass javaFormatterEClass = null;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ private EClass xmlFormatterEClass = null;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
private EDataType rootDocEDataType = null;
/**
@@ -543,6 +567,16 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
*
* @generated
*/
+ public EReference getSnippet_Formatter()
+ {
+ return (EReference)snippetEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
public EClass getDiagram()
{
return diagramEClass;
@@ -713,6 +747,16 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
*
* @generated
*/
+ public EAttribute getEmbeddableElement_Doc()
+ {
+ return (EAttribute)embeddableElementEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
public EClass getExternalTarget()
{
return externalTargetEClass;
@@ -1073,6 +1117,56 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
*
* @generated
*/
+ public EClass getFormatter()
+ {
+ return formatterEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EReference getFormatter_Snippet()
+ {
+ return (EReference)formatterEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EClass getJavaFormatter()
+ {
+ return javaFormatterEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EClass getXmlFormatter()
+ {
+ return xmlFormatterEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EAttribute getXmlFormatter_File()
+ {
+ return (EAttribute)xmlFormatterEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
public EDataType getRootDoc()
{
return rootDocEDataType;
@@ -1160,6 +1254,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
snippetEClass = createEClass(SNIPPET);
createEReference(snippetEClass, SNIPPET__CALLOUTS);
+ createEReference(snippetEClass, SNIPPET__FORMATTER);
diagramEClass = createEClass(DIAGRAM);
@@ -1184,6 +1279,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
embeddableElementEClass = createEClass(EMBEDDABLE_ELEMENT);
createEReference(embeddableElementEClass, EMBEDDABLE_ELEMENT__DOCUMENTATION);
+ createEAttribute(embeddableElementEClass, EMBEDDABLE_ELEMENT__DOC);
externalTargetEClass = createEClass(EXTERNAL_TARGET);
createEAttribute(externalTargetEClass, EXTERNAL_TARGET__URL);
@@ -1239,6 +1335,14 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
excelEClass = createEClass(EXCEL);
+ formatterEClass = createEClass(FORMATTER);
+ createEReference(formatterEClass, FORMATTER__SNIPPET);
+
+ javaFormatterEClass = createEClass(JAVA_FORMATTER);
+
+ xmlFormatterEClass = createEClass(XML_FORMATTER);
+ createEAttribute(xmlFormatterEClass, XML_FORMATTER__FILE);
+
// Create data types
rootDocEDataType = createEDataType(ROOT_DOC);
fileEDataType = createEDataType(FILE);
@@ -1300,6 +1404,8 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
tocEClass.getESuperTypes().add(this.getBodyElement());
pluginResourceEClass.getESuperTypes().add(this.getExternalArticle());
excelEClass.getESuperTypes().add(this.getBodyElement());
+ javaFormatterEClass.getESuperTypes().add(this.getFormatter());
+ xmlFormatterEClass.getESuperTypes().add(this.getFormatter());
// Initialize classes and features; add operations and parameters
initEClass(documentationEClass, Documentation.class, "Documentation", !IS_ABSTRACT, !IS_INTERFACE,
@@ -1344,6 +1450,9 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
initEReference(getSnippet_Callouts(), this.getCallout(), this.getCallout_Snippet(), "callouts", null, 0, -1,
Snippet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getSnippet_Formatter(), this.getFormatter(), this.getFormatter_Snippet(), "formatter", null, 1, 1,
+ Snippet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+ IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(diagramEClass, Diagram.class, "Diagram", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -1393,6 +1502,8 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
this.getDocumentation_EmbeddableElements(), "documentation", null, 1, 1, EmbeddableElement.class,
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
+ initEAttribute(getEmbeddableElement_Doc(), this.getDoc(), "doc", null, 1, 1, EmbeddableElement.class, IS_TRANSIENT,
+ IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(externalTargetEClass, ExternalTarget.class, "ExternalTarget", !IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
@@ -1484,6 +1595,19 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
initEClass(excelEClass, Excel.class, "Excel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEClass(formatterEClass, Formatter.class, "Formatter", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getFormatter_Snippet(), this.getSnippet(), this.getSnippet_Formatter(), "snippet", null, 1, 1,
+ Formatter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(javaFormatterEClass, JavaFormatter.class, "JavaFormatter", !IS_ABSTRACT, !IS_INTERFACE,
+ IS_GENERATED_INSTANCE_CLASS);
+
+ initEClass(xmlFormatterEClass, XmlFormatter.class, "XmlFormatter", !IS_ABSTRACT, !IS_INTERFACE,
+ IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getXmlFormatter_File(), this.getFile(), "file", null, 0, 1, XmlFormatter.class, !IS_TRANSIENT,
+ !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
// Initialize data types
initEDataType(rootDocEDataType, RootDoc.class, "RootDoc", !IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
initEDataType(fileEDataType, File.class, "File", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/EmbeddableElementImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/EmbeddableElementImpl.java
index 53855ab56a..455a58da26 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/EmbeddableElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/EmbeddableElementImpl.java
@@ -18,6 +18,8 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
import org.eclipse.emf.ecore.util.EcoreUtil;
+import com.sun.javadoc.Doc;
+
/**
* <!-- begin-user-doc --> An implementation of the model object '<em><b>Embeddable Element</b></em>'. <!-- end-user-doc
* -->
@@ -44,6 +46,17 @@ public abstract class EmbeddableElementImpl extends EObjectImpl implements Embed
protected static final Object ID_EDEFAULT = null;
/**
+ * The default value of the '{@link #getDoc() <em>Doc</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see #getDoc()
+ * @generated
+ * @ordered
+ */
+ protected static final Doc DOC_EDEFAULT = null;
+
+ private Doc doc;
+
+ /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
@@ -53,6 +66,13 @@ public abstract class EmbeddableElementImpl extends EObjectImpl implements Embed
super();
}
+ public EmbeddableElementImpl(Documentation documentation, Doc doc)
+ {
+ this.doc = doc;
+ setDocumentation(documentation);
+ documentation.getContext().register(getId(), this);
+ }
+
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
@@ -69,7 +89,10 @@ public abstract class EmbeddableElementImpl extends EObjectImpl implements Embed
*
* @generated NOT
*/
- public abstract Object getId();
+ public Object getId()
+ {
+ return doc;
+ }
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -79,7 +102,9 @@ public abstract class EmbeddableElementImpl extends EObjectImpl implements Embed
public Documentation getDocumentation()
{
if (eContainerFeatureID() != ArticlePackage.EMBEDDABLE_ELEMENT__DOCUMENTATION)
+ {
return null;
+ }
return (Documentation)eContainer();
}
@@ -102,23 +127,43 @@ public abstract class EmbeddableElementImpl extends EObjectImpl implements Embed
public void setDocumentation(Documentation newDocumentation)
{
if (newDocumentation != eInternalContainer()
- || (eContainerFeatureID() != ArticlePackage.EMBEDDABLE_ELEMENT__DOCUMENTATION && newDocumentation != null))
+ || eContainerFeatureID() != ArticlePackage.EMBEDDABLE_ELEMENT__DOCUMENTATION && newDocumentation != null)
{
if (EcoreUtil.isAncestor(this, newDocumentation))
+ {
throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+ }
NotificationChain msgs = null;
if (eInternalContainer() != null)
+ {
msgs = eBasicRemoveFromContainer(msgs);
+ }
if (newDocumentation != null)
+ {
msgs = ((InternalEObject)newDocumentation).eInverseAdd(this, ArticlePackage.DOCUMENTATION__EMBEDDABLE_ELEMENTS,
Documentation.class, msgs);
+ }
msgs = basicSetDocumentation(newDocumentation, msgs);
if (msgs != null)
+ {
msgs.dispatch();
+ }
}
else if (eNotificationRequired())
+ {
eNotify(new ENotificationImpl(this, Notification.SET, ArticlePackage.EMBEDDABLE_ELEMENT__DOCUMENTATION,
newDocumentation, newDocumentation));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated NOT
+ */
+ public Doc getDoc()
+ {
+ return doc;
}
/**
@@ -133,7 +178,9 @@ public abstract class EmbeddableElementImpl extends EObjectImpl implements Embed
{
case ArticlePackage.EMBEDDABLE_ELEMENT__DOCUMENTATION:
if (eInternalContainer() != null)
+ {
msgs = eBasicRemoveFromContainer(msgs);
+ }
return basicSetDocumentation((Documentation)otherEnd, msgs);
}
return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -186,6 +233,8 @@ public abstract class EmbeddableElementImpl extends EObjectImpl implements Embed
return getId();
case ArticlePackage.EMBEDDABLE_ELEMENT__DOCUMENTATION:
return getDocumentation();
+ case ArticlePackage.EMBEDDABLE_ELEMENT__DOC:
+ return getDoc();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -238,6 +287,8 @@ public abstract class EmbeddableElementImpl extends EObjectImpl implements Embed
return ID_EDEFAULT == null ? getId() != null : !ID_EDEFAULT.equals(getId());
case ArticlePackage.EMBEDDABLE_ELEMENT__DOCUMENTATION:
return getDocumentation() != null;
+ case ArticlePackage.EMBEDDABLE_ELEMENT__DOC:
+ return DOC_EDEFAULT == null ? getDoc() != null : !DOC_EDEFAULT.equals(getDoc());
}
return super.eIsSet(featureID);
}
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/FormatterImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/FormatterImpl.java
new file mode 100644
index 0000000000..df623304d8
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/FormatterImpl.java
@@ -0,0 +1,246 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.emf.cdo.releng.doc.article.impl;
+
+import org.eclipse.emf.cdo.releng.doc.article.ArticlePackage;
+import org.eclipse.emf.cdo.releng.doc.article.Formatter;
+import org.eclipse.emf.cdo.releng.doc.article.Snippet;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+
+import com.sun.javadoc.Doc;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Formatter</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.releng.doc.article.impl.FormatterImpl#getSnippet <em>Snippet</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public abstract class FormatterImpl extends EObjectImpl implements Formatter
+{
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected FormatterImpl()
+ {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass()
+ {
+ return ArticlePackage.Literals.FORMATTER;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public Snippet getSnippet()
+ {
+ if (eContainerFeatureID() != ArticlePackage.FORMATTER__SNIPPET)
+ {
+ return null;
+ }
+ return (Snippet)eContainer();
+ }
+
+ public Doc getDoc()
+ {
+ Snippet snippet = getSnippet();
+ if (snippet == null)
+ {
+ return null;
+ }
+
+ return snippet.getDoc();
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public NotificationChain basicSetSnippet(Snippet newSnippet, NotificationChain msgs)
+ {
+ msgs = eBasicSetContainer((InternalEObject)newSnippet, ArticlePackage.FORMATTER__SNIPPET, msgs);
+ return msgs;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public void setSnippet(Snippet newSnippet)
+ {
+ if (newSnippet != eInternalContainer() || eContainerFeatureID() != ArticlePackage.FORMATTER__SNIPPET
+ && newSnippet != null)
+ {
+ if (EcoreUtil.isAncestor(this, newSnippet))
+ {
+ throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+ }
+ NotificationChain msgs = null;
+ if (eInternalContainer() != null)
+ {
+ msgs = eBasicRemoveFromContainer(msgs);
+ }
+ if (newSnippet != null)
+ {
+ msgs = ((InternalEObject)newSnippet).eInverseAdd(this, ArticlePackage.SNIPPET__FORMATTER, Snippet.class, msgs);
+ }
+ msgs = basicSetSnippet(newSnippet, msgs);
+ if (msgs != null)
+ {
+ msgs.dispatch();
+ }
+ }
+ else if (eNotificationRequired())
+ {
+ eNotify(new ENotificationImpl(this, Notification.SET, ArticlePackage.FORMATTER__SNIPPET, newSnippet, newSnippet));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+ {
+ switch (featureID)
+ {
+ case ArticlePackage.FORMATTER__SNIPPET:
+ if (eInternalContainer() != null)
+ {
+ msgs = eBasicRemoveFromContainer(msgs);
+ }
+ return basicSetSnippet((Snippet)otherEnd, msgs);
+ }
+ return super.eInverseAdd(otherEnd, featureID, msgs);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+ {
+ switch (featureID)
+ {
+ case ArticlePackage.FORMATTER__SNIPPET:
+ return basicSetSnippet(null, msgs);
+ }
+ return super.eInverseRemove(otherEnd, featureID, msgs);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs)
+ {
+ switch (eContainerFeatureID())
+ {
+ case ArticlePackage.FORMATTER__SNIPPET:
+ return eInternalContainer().eInverseRemove(this, ArticlePackage.SNIPPET__FORMATTER, Snippet.class, msgs);
+ }
+ return super.eBasicRemoveFromContainerFeature(msgs);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType)
+ {
+ switch (featureID)
+ {
+ case ArticlePackage.FORMATTER__SNIPPET:
+ return getSnippet();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue)
+ {
+ switch (featureID)
+ {
+ case ArticlePackage.FORMATTER__SNIPPET:
+ setSnippet((Snippet)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID)
+ {
+ switch (featureID)
+ {
+ case ArticlePackage.FORMATTER__SNIPPET:
+ setSnippet((Snippet)null);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID)
+ {
+ switch (featureID)
+ {
+ case ArticlePackage.FORMATTER__SNIPPET:
+ return getSnippet() != null;
+ }
+ return super.eIsSet(featureID);
+ }
+
+} // FormatterImpl
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavaFormatterImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavaFormatterImpl.java
new file mode 100644
index 0000000000..7a1c27a01d
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavaFormatterImpl.java
@@ -0,0 +1,113 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.emf.cdo.releng.doc.article.impl;
+
+import org.eclipse.emf.cdo.releng.doc.article.ArticlePackage;
+import org.eclipse.emf.cdo.releng.doc.article.JavaFormatter;
+
+import org.eclipse.emf.ecore.EClass;
+
+import com.sun.javadoc.ClassDoc;
+import com.sun.javadoc.Doc;
+import com.sun.javadoc.SeeTag;
+
+import java.io.PrintWriter;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Java Formatter</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public class JavaFormatterImpl extends FormatterImpl implements JavaFormatter
+{
+ private static Constructor<?> snippet;
+
+ private static Method getHtml;
+
+ static
+ {
+ try
+ {
+ Class<?> c = Class.forName("de.escnet.CodeSnippet");
+ snippet = c.getConstructor(Doc.class, Map.class);
+ getHtml = c.getMethod("getHtml");
+ }
+ catch (Throwable ex)
+ {
+ ex.printStackTrace();
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected JavaFormatterImpl()
+ {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass()
+ {
+ return ArticlePackage.Literals.JAVA_FORMATTER;
+ }
+
+ public String getDefaultTitle(SeeTag embedderTag)
+ {
+ return embedderTag.text() + ".java";
+ }
+
+ public String getTopLeftEditorIcon(String imagePath)
+ {
+ return imagePath + "editor-top-left-java.png";
+ }
+
+ public String getSnippetHtml(PrintWriter out, String id, String title)
+ {
+ Map<String, Object> options = new HashMap<String, Object>();
+ options.put("id", id);
+ options.put("title", title);
+ options.put("includeSignature", getDoc() instanceof ClassDoc);
+
+ try
+ {
+ Object instance = snippet.newInstance(getDoc(), options);
+ return (String)getHtml.invoke(instance);
+ }
+ catch (Error ex)
+ {
+ throw ex;
+ }
+ catch (RuntimeException ex)
+ {
+ throw ex;
+ }
+ catch (Exception ex)
+ {
+ throw new RuntimeException(ex);
+ }
+ }
+
+ public String getCalloutMarker()
+ {
+ return "<font color=\"#3f7f5f\">/*&nbsp;callout&nbsp;*/</font>";
+ }
+
+} // JavaFormatterImpl
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/SnippetImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/SnippetImpl.java
index 46236166bd..d7652a9438 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/SnippetImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/SnippetImpl.java
@@ -11,31 +11,30 @@ import org.eclipse.emf.cdo.releng.doc.article.BodyElementContainer;
import org.eclipse.emf.cdo.releng.doc.article.Callout;
import org.eclipse.emf.cdo.releng.doc.article.Documentation;
import org.eclipse.emf.cdo.releng.doc.article.Embedding;
+import org.eclipse.emf.cdo.releng.doc.article.Formatter;
import org.eclipse.emf.cdo.releng.doc.article.Snippet;
import org.eclipse.emf.cdo.releng.doc.article.StructuralElement;
+import org.eclipse.emf.cdo.releng.doc.article.XmlFormatter;
import org.eclipse.emf.cdo.releng.doc.article.util.ArticleException;
import org.eclipse.emf.cdo.releng.doc.article.util.ArticleUtil;
+import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
import org.eclipse.emf.ecore.util.InternalEList;
-import com.sun.javadoc.ClassDoc;
import com.sun.javadoc.Doc;
import com.sun.javadoc.SeeTag;
-import com.sun.javadoc.SourcePosition;
import com.sun.javadoc.Tag;
+import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
import java.util.regex.Pattern;
/**
@@ -44,6 +43,7 @@ import java.util.regex.Pattern;
* The following features are implemented:
* <ul>
* <li>{@link org.eclipse.emf.cdo.releng.doc.article.impl.SnippetImpl#getCallouts <em>Callouts</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.releng.doc.article.impl.SnippetImpl#getFormatter <em>Formatter</em>}</li>
* </ul>
* </p>
*
@@ -51,14 +51,8 @@ import java.util.regex.Pattern;
*/
public class SnippetImpl extends EmbeddableElementImpl implements Snippet
{
- private static final String CALLOUT = "<font color=\"#3f7f5f\">/*&nbsp;callout&nbsp;*/</font>";
-
private static final Pattern PATTERN = Pattern.compile("<[^>]+?>", Pattern.MULTILINE | Pattern.DOTALL);
- private static Constructor<?> snippet;
-
- private static Method getHtml;
-
/**
* The cached value of the '{@link #getCallouts() <em>Callouts</em>}' containment reference list. <!-- begin-user-doc
* --> <!-- end-user-doc -->
@@ -69,7 +63,15 @@ public class SnippetImpl extends EmbeddableElementImpl implements Snippet
*/
protected EList<Callout> callouts;
- private Doc doc;
+ /**
+ * The cached value of the '{@link #getFormatter() <em>Formatter</em>}' containment reference. <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getFormatter()
+ * @generated
+ * @ordered
+ */
+ protected Formatter formatter;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -83,10 +85,70 @@ public class SnippetImpl extends EmbeddableElementImpl implements Snippet
SnippetImpl(Documentation documentation, Doc doc)
{
- setDocumentation(documentation);
- this.doc = doc;
- documentation.getContext().register(getId(), this);
+ super(documentation, doc);
+ initFormatter(doc);
+ initCallouts(doc);
+ }
+
+ private void initFormatter(Doc doc)
+ {
+ Tag[] tags = doc.tags("@snippet");
+ if (tags.length > 1)
+ {
+ throw new ArticleException("More than one format not allowed: " + ArticleUtil.makeConsoleLink(doc));
+ }
+ if (tags.length == 1)
+ {
+ String text = tags[0].text();
+ if (text.length() != 0)
+ {
+ String format;
+ String args;
+
+ int pos = text.indexOf(' ');
+ if (pos != -1)
+ {
+ format = text.substring(0, pos).trim().toLowerCase();
+ args = text.substring(pos + 1).trim();
+ }
+ else
+ {
+ format = text;
+ args = "";
+ }
+
+ format = format.trim().toLowerCase();
+ args = args.trim();
+
+ if (format.equals("xml"))
+ {
+ try
+ {
+ File folder = doc.position().file().getParentFile();
+ File file = new File(folder, args).getCanonicalFile();
+
+ XmlFormatter formatter = new XmlFormatterImpl();
+ formatter.setFile(file);
+
+ setFormatter(formatter);
+ }
+ catch (IOException ex)
+ {
+ ex.printStackTrace();
+ }
+ }
+ }
+ }
+
+ if (getFormatter() == null)
+ {
+ setFormatter(new JavaFormatterImpl());
+ }
+ }
+
+ private void initCallouts(Doc doc)
+ {
int index = 0;
for (Tag tag : doc.tags("@callout"))
{
@@ -125,6 +187,74 @@ public class SnippetImpl extends EmbeddableElementImpl implements Snippet
*
* @generated
*/
+ public Formatter getFormatter()
+ {
+ return formatter;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public NotificationChain basicSetFormatter(Formatter newFormatter, NotificationChain msgs)
+ {
+ Formatter oldFormatter = formatter;
+ formatter = newFormatter;
+ if (eNotificationRequired())
+ {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ArticlePackage.SNIPPET__FORMATTER,
+ oldFormatter, newFormatter);
+ if (msgs == null)
+ {
+ msgs = notification;
+ }
+ else
+ {
+ msgs.add(notification);
+ }
+ }
+ return msgs;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public void setFormatter(Formatter newFormatter)
+ {
+ if (newFormatter != formatter)
+ {
+ NotificationChain msgs = null;
+ if (formatter != null)
+ {
+ msgs = ((InternalEObject)formatter).eInverseRemove(this, ArticlePackage.FORMATTER__SNIPPET, Formatter.class,
+ msgs);
+ }
+ if (newFormatter != null)
+ {
+ msgs = ((InternalEObject)newFormatter).eInverseAdd(this, ArticlePackage.FORMATTER__SNIPPET, Formatter.class,
+ msgs);
+ }
+ msgs = basicSetFormatter(newFormatter, msgs);
+ if (msgs != null)
+ {
+ msgs.dispatch();
+ }
+ }
+ else if (eNotificationRequired())
+ {
+ eNotify(new ENotificationImpl(this, Notification.SET, ArticlePackage.SNIPPET__FORMATTER, newFormatter,
+ newFormatter));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
@SuppressWarnings("unchecked")
@Override
public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs)
@@ -133,6 +263,13 @@ public class SnippetImpl extends EmbeddableElementImpl implements Snippet
{
case ArticlePackage.SNIPPET__CALLOUTS:
return ((InternalEList<InternalEObject>)(InternalEList<?>)getCallouts()).basicAdd(otherEnd, msgs);
+ case ArticlePackage.SNIPPET__FORMATTER:
+ if (formatter != null)
+ {
+ msgs = ((InternalEObject)formatter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+ - ArticlePackage.SNIPPET__FORMATTER, null, msgs);
+ }
+ return basicSetFormatter((Formatter)otherEnd, msgs);
}
return super.eInverseAdd(otherEnd, featureID, msgs);
}
@@ -149,6 +286,8 @@ public class SnippetImpl extends EmbeddableElementImpl implements Snippet
{
case ArticlePackage.SNIPPET__CALLOUTS:
return ((InternalEList<?>)getCallouts()).basicRemove(otherEnd, msgs);
+ case ArticlePackage.SNIPPET__FORMATTER:
+ return basicSetFormatter(null, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -165,6 +304,8 @@ public class SnippetImpl extends EmbeddableElementImpl implements Snippet
{
case ArticlePackage.SNIPPET__CALLOUTS:
return getCallouts();
+ case ArticlePackage.SNIPPET__FORMATTER:
+ return getFormatter();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -184,6 +325,9 @@ public class SnippetImpl extends EmbeddableElementImpl implements Snippet
getCallouts().clear();
getCallouts().addAll((Collection<? extends Callout>)newValue);
return;
+ case ArticlePackage.SNIPPET__FORMATTER:
+ setFormatter((Formatter)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -201,6 +345,9 @@ public class SnippetImpl extends EmbeddableElementImpl implements Snippet
case ArticlePackage.SNIPPET__CALLOUTS:
getCallouts().clear();
return;
+ case ArticlePackage.SNIPPET__FORMATTER:
+ setFormatter((Formatter)null);
+ return;
}
super.eUnset(featureID);
}
@@ -217,19 +364,17 @@ public class SnippetImpl extends EmbeddableElementImpl implements Snippet
{
case ArticlePackage.SNIPPET__CALLOUTS:
return callouts != null && !callouts.isEmpty();
+ case ArticlePackage.SNIPPET__FORMATTER:
+ return formatter != null;
}
return super.eIsSet(featureID);
}
- @Override
- public Object getId()
- {
- return doc;
- }
-
public void generate(PrintWriter out, Embedding embedder) throws IOException
{
- String id = doc.name();
+ Formatter formatter = getFormatter();
+
+ String id = getDoc().name();
int lastDot = id.lastIndexOf('.');
if (lastDot != -1)
{
@@ -243,19 +388,19 @@ public class SnippetImpl extends EmbeddableElementImpl implements Snippet
String title = embedderTag.label();
if (title == null || title.length() == 0)
{
- title = embedderTag.text() + ".java";
+ title = formatter.getDefaultTitle(embedderTag);
}
out.write("\n\n");
- String html = getCodeSnippetHtml(out, id, title);
+ String html = formatter.getSnippetHtml(out, id, title);
html = processCallouts(id, html, imagePath);
out.write("<div class=\"snippet\" style=\"margin-left:24px;\" align=\"left\">\n");
out.write(" <a name=\"snippet_" + id + "\"></a>\n");
out.write(" <table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n");
out.write(" <tr>\n");
- out.write(" <td><img src=\"" + imagePath + "editor-top-left.png\"></td>\n");
+ out.write(" <td><img src=\"" + formatter.getTopLeftEditorIcon(imagePath) + "\"></td>\n");
out.write(" <td style=\"background-image:url(" + imagePath
+ "editor-top1.png); background-repeat:repeat-x;\" width=\"1px\"><font face=\"Segoe UI,Arial\" size=\"-1\">"
+ title + "</font></td>\n");
@@ -325,41 +470,17 @@ public class SnippetImpl extends EmbeddableElementImpl implements Snippet
throw new ArticleException(ArticleUtil.makeConsoleLink("Nested embedding in ", embedder.getTag().position()));
}
- private String getCodeSnippetHtml(PrintWriter out, String id, String title)
- {
- Map<String, Object> options = new HashMap<String, Object>();
- options.put("id", id);
- options.put("title", title);
- options.put("includeSignature", doc instanceof ClassDoc);
-
- try
- {
- Object instance = snippet.newInstance(doc, options);
- return (String)getHtml.invoke(instance);
- }
- catch (Error ex)
- {
- throw ex;
- }
- catch (RuntimeException ex)
- {
- throw ex;
- }
- catch (Exception ex)
- {
- throw new RuntimeException(ex);
- }
- }
-
private String processCallouts(String id, String html, String imagePath)
{
EList<Callout> callouts = getCallouts();
int size = callouts.size();
int callout = 0;
+ String calloutMarker = getFormatter().getCalloutMarker();
+
for (;;)
{
- int pos = html.indexOf(CALLOUT);
+ int pos = html.indexOf(calloutMarker);
if (pos == -1)
{
break;
@@ -368,7 +489,7 @@ public class SnippetImpl extends EmbeddableElementImpl implements Snippet
++callout;
String start = html.substring(0, pos);
- String rest = html.substring(pos + CALLOUT.length());
+ String rest = html.substring(pos + calloutMarker.length());
if (!rest.startsWith("&nbsp;"))
{
rest = "&nbsp;" + rest;
@@ -391,16 +512,15 @@ public class SnippetImpl extends EmbeddableElementImpl implements Snippet
if (callout != size)
{
- Tag tag = callouts.get(size - 1).getTag();
- SourcePosition position = tag.position();
- String link = ArticleUtil.makeConsoleLink(tag.holder(), position);
-
if (callout < size)
{
+ Tag tag = callouts.get(size).getTag();
+ String link = ArticleUtil.makeConsoleLink(tag.holder(), tag.position());
System.err.println("Too many callout descriptions: " + link);
}
- else if (callout > size)
+ else
{
+ String link = ArticleUtil.makeConsoleLink(getDoc(), getDoc().position());
System.err.println("Callout descriptions missing: " + link);
}
}
@@ -424,17 +544,4 @@ public class SnippetImpl extends EmbeddableElementImpl implements Snippet
+ alt + "\">" + image + "</a>";
}
- static
- {
- try
- {
- Class<?> c = Class.forName("de.escnet.CodeSnippet");
- snippet = c.getConstructor(Doc.class, Map.class);
- getHtml = c.getMethod("getHtml");
- }
- catch (Throwable ex)
- {
- ex.printStackTrace();
- }
- }
} // SnippetImpl
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/XmlFormatterImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/XmlFormatterImpl.java
new file mode 100644
index 0000000000..6a28e56137
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/XmlFormatterImpl.java
@@ -0,0 +1,409 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.emf.cdo.releng.doc.article.impl;
+
+import org.eclipse.emf.cdo.releng.doc.article.ArticlePackage;
+import org.eclipse.emf.cdo.releng.doc.article.XmlFormatter;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import com.sun.javadoc.SeeTag;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.ext.LexicalHandler;
+import org.xml.sax.helpers.DefaultHandler;
+
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
+import java.io.File;
+import java.io.PrintWriter;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Xml Formatter</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.releng.doc.article.impl.XmlFormatterImpl#getFile <em>File</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class XmlFormatterImpl extends FormatterImpl implements XmlFormatter
+{
+ private static final String CALLOUT = "callout";
+
+ private static final String CALLOUT_MARKER = "<!--" + CALLOUT + "-->";
+
+ private static final SAXParserFactory FACTORY = SAXParserFactory.newInstance();
+
+ /**
+ * The default value of the '{@link #getFile() <em>File</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+ * -->
+ *
+ * @see #getFile()
+ * @generated
+ * @ordered
+ */
+ protected static final File FILE_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getFile() <em>File</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see #getFile()
+ * @generated
+ * @ordered
+ */
+ protected File file = FILE_EDEFAULT;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected XmlFormatterImpl()
+ {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass()
+ {
+ return ArticlePackage.Literals.XML_FORMATTER;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public File getFile()
+ {
+ return file;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public void setFile(File newFile)
+ {
+ File oldFile = file;
+ file = newFile;
+ if (eNotificationRequired())
+ {
+ eNotify(new ENotificationImpl(this, Notification.SET, ArticlePackage.XML_FORMATTER__FILE, oldFile, file));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType)
+ {
+ switch (featureID)
+ {
+ case ArticlePackage.XML_FORMATTER__FILE:
+ return getFile();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue)
+ {
+ switch (featureID)
+ {
+ case ArticlePackage.XML_FORMATTER__FILE:
+ setFile((File)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID)
+ {
+ switch (featureID)
+ {
+ case ArticlePackage.XML_FORMATTER__FILE:
+ setFile(FILE_EDEFAULT);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID)
+ {
+ switch (featureID)
+ {
+ case ArticlePackage.XML_FORMATTER__FILE:
+ return FILE_EDEFAULT == null ? file != null : !FILE_EDEFAULT.equals(file);
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public String toString()
+ {
+ if (eIsProxy())
+ {
+ return super.toString();
+ }
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (file: ");
+ result.append(file);
+ result.append(')');
+ return result.toString();
+ }
+
+ public String getDefaultTitle(SeeTag embedderTag)
+ {
+ return file.getName();
+ }
+
+ public String getTopLeftEditorIcon(String imagePath)
+ {
+ return imagePath + "editor-top-left-xml.png";
+ }
+
+ public String getSnippetHtml(PrintWriter out, String id, String title)
+ {
+ XmlHandler handler = new XmlHandler();
+
+ try
+ {
+ SAXParser parser = FACTORY.newSAXParser();
+ parser.setProperty("http://xml.org/sax/properties/lexical-handler", handler);
+ parser.parse(file, handler);
+ }
+ catch (RuntimeException ex)
+ {
+ throw ex;
+ }
+ catch (Exception ex)
+ {
+ throw new RuntimeException(ex);
+ }
+
+ return handler.getHtml();
+ }
+
+ public String getCalloutMarker()
+ {
+ return CALLOUT_MARKER;
+ }
+
+ /**
+ * @author Eike Stepper
+ */
+ private static final class XmlHandler extends DefaultHandler implements LexicalHandler
+ {
+ StringBuilder builder = new StringBuilder();
+
+ StringBuilder element;
+
+ public XmlHandler()
+ {
+ }
+
+ public String getHtml()
+ {
+ return builder.toString();
+ }
+
+ @Override
+ public void startDocument() throws SAXException
+ {
+ builder
+ .append("<font color=\"#0000e1\">&lt;?xml version=<font color=\"#000080\">'1.0'</font> encoding=<font color=\"#000080\">'UTF-8'</font>?&gt;</font><br/>\n");
+ }
+
+ @Override
+ public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException
+ {
+ appendElement(false);
+
+ element = new StringBuilder();
+ element.append("&lt;");
+ element.append(qName);
+
+ for (int i = 0; i < attributes.getLength(); i++)
+ {
+ String name = attributes.getQName(i);
+ String value = attributes.getValue(i);
+
+ element.append("&nbsp;");
+ element.append(name);
+
+ element.append("<font color=\"#000080\">");
+ element.append("=\"");
+ element.append(value);
+ element.append("\"");
+ element.append("</font>");
+ }
+ }
+
+ @Override
+ public void endElement(String uri, String localName, String qName) throws SAXException
+ {
+ if (!appendElement(true))
+ {
+ builder.append("<font color=\"#0000e1\">");
+ builder.append("&lt;/");
+ builder.append(qName);
+ builder.append("&gt;");
+ builder.append("</font>");
+ }
+ }
+
+ @Override
+ public void characters(char ch[], int start, int length) throws SAXException
+ {
+ appendElement(false);
+ appendCharacters(ch, start, length);
+ }
+
+ @Override
+ public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException
+ {
+ appendElement(false);
+ appendCharacters(ch, start, length);
+ }
+
+ public void comment(char[] ch, int start, int length) throws SAXException
+ {
+ appendElement(false);
+
+ String comment = new String(ch, start, length).trim();
+ if (comment.equals(CALLOUT))
+ {
+ builder.append(CALLOUT_MARKER);
+ }
+ else
+ {
+ builder.append("<font color=\"#3f7f5f\">&lt;!--");
+ appendCharacters(ch, start, length);
+ builder.append("--&gt;</font>");
+ }
+ }
+
+ private boolean appendElement(boolean end)
+ {
+ if (element != null)
+ {
+ builder.append("<font color=\"#0000e1\">");
+ builder.append(element.toString());
+
+ if (end)
+ {
+ builder.append("/");
+ }
+
+ builder.append("&gt;");
+ builder.append("</font>");
+
+ element = null;
+ return true;
+ }
+
+ return false;
+ }
+
+ private void appendCharacters(char[] ch, int start, int length)
+ {
+ for (int i = start; length > 0; i++, length--)
+ {
+ String c = convert(ch[i]);
+ builder.append(c);
+ }
+ }
+
+ private String convert(char c)
+ {
+ switch (c)
+ {
+ case '&':
+ return "&amp;";
+
+ case '<':
+ return "&lt;";
+
+ case '>':
+ return "&gt;";
+
+ case ' ':
+ return "&nbsp;";
+
+ case '\n':
+ return "<br/>\n";
+ }
+
+ return new String(new char[] { c });
+ }
+
+ public void startDTD(String name, String publicId, String systemId) throws SAXException
+ {
+ }
+
+ public void endDTD() throws SAXException
+ {
+ }
+
+ public void startEntity(String name) throws SAXException
+ {
+ }
+
+ public void endEntity(String name) throws SAXException
+ {
+ }
+
+ public void startCDATA() throws SAXException
+ {
+ }
+
+ public void endCDATA() throws SAXException
+ {
+ }
+ }
+
+} // XmlFormatterImpl
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleAdapterFactory.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleAdapterFactory.java
index 2e9aa12b85..bef5820142 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleAdapterFactory.java
@@ -24,8 +24,10 @@ import org.eclipse.emf.cdo.releng.doc.article.ExtensionPoint;
import org.eclipse.emf.cdo.releng.doc.article.ExternalArticle;
import org.eclipse.emf.cdo.releng.doc.article.ExternalTarget;
import org.eclipse.emf.cdo.releng.doc.article.Factory;
+import org.eclipse.emf.cdo.releng.doc.article.Formatter;
import org.eclipse.emf.cdo.releng.doc.article.Identifiable;
import org.eclipse.emf.cdo.releng.doc.article.JavaElement;
+import org.eclipse.emf.cdo.releng.doc.article.JavaFormatter;
import org.eclipse.emf.cdo.releng.doc.article.JavaPackage;
import org.eclipse.emf.cdo.releng.doc.article.Javadoc;
import org.eclipse.emf.cdo.releng.doc.article.Link;
@@ -38,6 +40,7 @@ import org.eclipse.emf.cdo.releng.doc.article.SourceCode;
import org.eclipse.emf.cdo.releng.doc.article.StructuralElement;
import org.eclipse.emf.cdo.releng.doc.article.Text;
import org.eclipse.emf.cdo.releng.doc.article.Toc;
+import org.eclipse.emf.cdo.releng.doc.article.XmlFormatter;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
@@ -289,6 +292,24 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
}
@Override
+ public Adapter caseFormatter(Formatter object)
+ {
+ return createFormatterAdapter();
+ }
+
+ @Override
+ public Adapter caseJavaFormatter(JavaFormatter object)
+ {
+ return createJavaFormatterAdapter();
+ }
+
+ @Override
+ public Adapter caseXmlFormatter(XmlFormatter object)
+ {
+ return createXmlFormatterAdapter();
+ }
+
+ @Override
public Adapter defaultCase(EObject object)
{
return createEObjectAdapter();
@@ -747,6 +768,48 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
}
/**
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.Formatter
+ * <em>Formatter</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore
+ * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+ *
+ * @return the new adapter.
+ * @see org.eclipse.emf.cdo.releng.doc.article.Formatter
+ * @generated
+ */
+ public Adapter createFormatterAdapter()
+ {
+ return null;
+ }
+
+ /**
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.JavaFormatter
+ * <em>Java Formatter</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+ * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+ *
+ * @return the new adapter.
+ * @see org.eclipse.emf.cdo.releng.doc.article.JavaFormatter
+ * @generated
+ */
+ public Adapter createJavaFormatterAdapter()
+ {
+ return null;
+ }
+
+ /**
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.XmlFormatter
+ * <em>Xml Formatter</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+ * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+ *
+ * @return the new adapter.
+ * @see org.eclipse.emf.cdo.releng.doc.article.XmlFormatter
+ * @generated
+ */
+ public Adapter createXmlFormatterAdapter()
+ {
+ return null;
+ }
+
+ /**
* Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!--
* end-user-doc -->
*
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleSwitch.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleSwitch.java
index 832d3d0b29..810052bb89 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleSwitch.java
@@ -24,8 +24,10 @@ import org.eclipse.emf.cdo.releng.doc.article.ExtensionPoint;
import org.eclipse.emf.cdo.releng.doc.article.ExternalArticle;
import org.eclipse.emf.cdo.releng.doc.article.ExternalTarget;
import org.eclipse.emf.cdo.releng.doc.article.Factory;
+import org.eclipse.emf.cdo.releng.doc.article.Formatter;
import org.eclipse.emf.cdo.releng.doc.article.Identifiable;
import org.eclipse.emf.cdo.releng.doc.article.JavaElement;
+import org.eclipse.emf.cdo.releng.doc.article.JavaFormatter;
import org.eclipse.emf.cdo.releng.doc.article.JavaPackage;
import org.eclipse.emf.cdo.releng.doc.article.Javadoc;
import org.eclipse.emf.cdo.releng.doc.article.Link;
@@ -38,6 +40,7 @@ import org.eclipse.emf.cdo.releng.doc.article.SourceCode;
import org.eclipse.emf.cdo.releng.doc.article.StructuralElement;
import org.eclipse.emf.cdo.releng.doc.article.Text;
import org.eclipse.emf.cdo.releng.doc.article.Toc;
+import org.eclipse.emf.cdo.releng.doc.article.XmlFormatter;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
@@ -100,9 +103,11 @@ public class ArticleSwitch<T>
{
return doSwitch(theEClass.getClassifierID(), theEObject);
}
-
- List<EClass> eSuperTypes = theEClass.getESuperTypes();
- return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject);
+ else
+ {
+ List<EClass> eSuperTypes = theEClass.getESuperTypes();
+ return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject);
+ }
}
/**
@@ -121,21 +126,13 @@ public class ArticleSwitch<T>
Documentation documentation = (Documentation)theEObject;
T result = caseDocumentation(documentation);
if (result == null)
- {
result = caseStructuralElement(documentation);
- }
if (result == null)
- {
result = caseLinkTarget(documentation);
- }
if (result == null)
- {
result = caseIdentifiable(documentation);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case ArticlePackage.CONTEXT:
@@ -143,9 +140,7 @@ public class ArticleSwitch<T>
Context context = (Context)theEObject;
T result = caseContext(context);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case ArticlePackage.CATEGORY:
@@ -153,29 +148,17 @@ public class ArticleSwitch<T>
Category category = (Category)theEObject;
T result = caseCategory(category);
if (result == null)
- {
result = caseBody(category);
- }
if (result == null)
- {
result = caseStructuralElement(category);
- }
if (result == null)
- {
result = caseBodyElementContainer(category);
- }
if (result == null)
- {
result = caseLinkTarget(category);
- }
if (result == null)
- {
result = caseIdentifiable(category);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case ArticlePackage.ARTICLE:
@@ -183,33 +166,19 @@ public class ArticleSwitch<T>
Article article = (Article)theEObject;
T result = caseArticle(article);
if (result == null)
- {
result = caseChapter(article);
- }
if (result == null)
- {
result = caseBody(article);
- }
if (result == null)
- {
result = caseStructuralElement(article);
- }
if (result == null)
- {
result = caseBodyElementContainer(article);
- }
if (result == null)
- {
result = caseLinkTarget(article);
- }
if (result == null)
- {
result = caseIdentifiable(article);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case ArticlePackage.CHAPTER:
@@ -217,29 +186,17 @@ public class ArticleSwitch<T>
Chapter chapter = (Chapter)theEObject;
T result = caseChapter(chapter);
if (result == null)
- {
result = caseBody(chapter);
- }
if (result == null)
- {
result = caseStructuralElement(chapter);
- }
if (result == null)
- {
result = caseBodyElementContainer(chapter);
- }
if (result == null)
- {
result = caseLinkTarget(chapter);
- }
if (result == null)
- {
result = caseIdentifiable(chapter);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case ArticlePackage.SNIPPET:
@@ -247,17 +204,11 @@ public class ArticleSwitch<T>
Snippet snippet = (Snippet)theEObject;
T result = caseSnippet(snippet);
if (result == null)
- {
result = caseEmbeddableElement(snippet);
- }
if (result == null)
- {
result = caseIdentifiable(snippet);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case ArticlePackage.DIAGRAM:
@@ -265,13 +216,9 @@ public class ArticleSwitch<T>
Diagram diagram = (Diagram)theEObject;
T result = caseDiagram(diagram);
if (result == null)
- {
result = caseBodyElement(diagram);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case ArticlePackage.FACTORY:
@@ -279,17 +226,11 @@ public class ArticleSwitch<T>
Factory factory = (Factory)theEObject;
T result = caseFactory(factory);
if (result == null)
- {
result = caseEmbeddableElement(factory);
- }
if (result == null)
- {
result = caseIdentifiable(factory);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case ArticlePackage.JAVA_ELEMENT:
@@ -297,17 +238,11 @@ public class ArticleSwitch<T>
JavaElement javaElement = (JavaElement)theEObject;
T result = caseJavaElement(javaElement);
if (result == null)
- {
result = caseLinkTarget(javaElement);
- }
if (result == null)
- {
result = caseIdentifiable(javaElement);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case ArticlePackage.STRUCTURAL_ELEMENT:
@@ -315,17 +250,11 @@ public class ArticleSwitch<T>
StructuralElement structuralElement = (StructuralElement)theEObject;
T result = caseStructuralElement(structuralElement);
if (result == null)
- {
result = caseLinkTarget(structuralElement);
- }
if (result == null)
- {
result = caseIdentifiable(structuralElement);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case ArticlePackage.LINK_TARGET:
@@ -333,13 +262,9 @@ public class ArticleSwitch<T>
LinkTarget linkTarget = (LinkTarget)theEObject;
T result = caseLinkTarget(linkTarget);
if (result == null)
- {
result = caseIdentifiable(linkTarget);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case ArticlePackage.CALLOUT:
@@ -347,13 +272,9 @@ public class ArticleSwitch<T>
Callout callout = (Callout)theEObject;
T result = caseCallout(callout);
if (result == null)
- {
result = caseBodyElementContainer(callout);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case ArticlePackage.EMBEDDABLE_ELEMENT:
@@ -361,13 +282,9 @@ public class ArticleSwitch<T>
EmbeddableElement embeddableElement = (EmbeddableElement)theEObject;
T result = caseEmbeddableElement(embeddableElement);
if (result == null)
- {
result = caseIdentifiable(embeddableElement);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case ArticlePackage.EXTERNAL_TARGET:
@@ -375,17 +292,11 @@ public class ArticleSwitch<T>
ExternalTarget externalTarget = (ExternalTarget)theEObject;
T result = caseExternalTarget(externalTarget);
if (result == null)
- {
result = caseLinkTarget(externalTarget);
- }
if (result == null)
- {
result = caseIdentifiable(externalTarget);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case ArticlePackage.IDENTIFIABLE:
@@ -393,9 +304,7 @@ public class ArticleSwitch<T>
Identifiable identifiable = (Identifiable)theEObject;
T result = caseIdentifiable(identifiable);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case ArticlePackage.BODY:
@@ -403,25 +312,15 @@ public class ArticleSwitch<T>
Body body = (Body)theEObject;
T result = caseBody(body);
if (result == null)
- {
result = caseStructuralElement(body);
- }
if (result == null)
- {
result = caseBodyElementContainer(body);
- }
if (result == null)
- {
result = caseLinkTarget(body);
- }
if (result == null)
- {
result = caseIdentifiable(body);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case ArticlePackage.BODY_ELEMENT_CONTAINER:
@@ -429,9 +328,7 @@ public class ArticleSwitch<T>
BodyElementContainer bodyElementContainer = (BodyElementContainer)theEObject;
T result = caseBodyElementContainer(bodyElementContainer);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case ArticlePackage.BODY_ELEMENT:
@@ -439,9 +336,7 @@ public class ArticleSwitch<T>
BodyElement bodyElement = (BodyElement)theEObject;
T result = caseBodyElement(bodyElement);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case ArticlePackage.TEXT:
@@ -449,13 +344,9 @@ public class ArticleSwitch<T>
Text text = (Text)theEObject;
T result = caseText(text);
if (result == null)
- {
result = caseBodyElement(text);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case ArticlePackage.LINK:
@@ -463,13 +354,9 @@ public class ArticleSwitch<T>
Link link = (Link)theEObject;
T result = caseLink(link);
if (result == null)
- {
result = caseBodyElement(link);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case ArticlePackage.EMBEDDING:
@@ -477,13 +364,9 @@ public class ArticleSwitch<T>
Embedding embedding = (Embedding)theEObject;
T result = caseEmbedding(embedding);
if (result == null)
- {
result = caseBodyElement(embedding);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case ArticlePackage.SOURCE_CODE:
@@ -491,21 +374,13 @@ public class ArticleSwitch<T>
SourceCode sourceCode = (SourceCode)theEObject;
T result = caseSourceCode(sourceCode);
if (result == null)
- {
result = caseExternalTarget(sourceCode);
- }
if (result == null)
- {
result = caseLinkTarget(sourceCode);
- }
if (result == null)
- {
result = caseIdentifiable(sourceCode);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case ArticlePackage.PLUGIN:
@@ -513,9 +388,7 @@ public class ArticleSwitch<T>
Plugin plugin = (Plugin)theEObject;
T result = casePlugin(plugin);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case ArticlePackage.JAVA_PACKAGE:
@@ -523,9 +396,7 @@ public class ArticleSwitch<T>
JavaPackage javaPackage = (JavaPackage)theEObject;
T result = caseJavaPackage(javaPackage);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case ArticlePackage.JAVADOC:
@@ -533,33 +404,19 @@ public class ArticleSwitch<T>
Javadoc javadoc = (Javadoc)theEObject;
T result = caseJavadoc(javadoc);
if (result == null)
- {
result = caseCategory(javadoc);
- }
if (result == null)
- {
result = caseBody(javadoc);
- }
if (result == null)
- {
result = caseStructuralElement(javadoc);
- }
if (result == null)
- {
result = caseBodyElementContainer(javadoc);
- }
if (result == null)
- {
result = caseLinkTarget(javadoc);
- }
if (result == null)
- {
result = caseIdentifiable(javadoc);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case ArticlePackage.EXTERNAL_ARTICLE:
@@ -567,37 +424,21 @@ public class ArticleSwitch<T>
ExternalArticle externalArticle = (ExternalArticle)theEObject;
T result = caseExternalArticle(externalArticle);
if (result == null)
- {
result = caseArticle(externalArticle);
- }
if (result == null)
- {
result = caseChapter(externalArticle);
- }
if (result == null)
- {
result = caseBody(externalArticle);
- }
if (result == null)
- {
result = caseStructuralElement(externalArticle);
- }
if (result == null)
- {
result = caseBodyElementContainer(externalArticle);
- }
if (result == null)
- {
result = caseLinkTarget(externalArticle);
- }
if (result == null)
- {
result = caseIdentifiable(externalArticle);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case ArticlePackage.SCHEMADOC:
@@ -605,33 +446,19 @@ public class ArticleSwitch<T>
Schemadoc schemadoc = (Schemadoc)theEObject;
T result = caseSchemadoc(schemadoc);
if (result == null)
- {
result = caseCategory(schemadoc);
- }
if (result == null)
- {
result = caseBody(schemadoc);
- }
if (result == null)
- {
result = caseStructuralElement(schemadoc);
- }
if (result == null)
- {
result = caseBodyElementContainer(schemadoc);
- }
if (result == null)
- {
result = caseLinkTarget(schemadoc);
- }
if (result == null)
- {
result = caseIdentifiable(schemadoc);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case ArticlePackage.EXTENSION_POINT:
@@ -639,9 +466,7 @@ public class ArticleSwitch<T>
ExtensionPoint extensionPoint = (ExtensionPoint)theEObject;
T result = caseExtensionPoint(extensionPoint);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case ArticlePackage.TOC:
@@ -649,13 +474,9 @@ public class ArticleSwitch<T>
Toc toc = (Toc)theEObject;
T result = caseToc(toc);
if (result == null)
- {
result = caseBodyElement(toc);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case ArticlePackage.PLUGIN_RESOURCE:
@@ -663,41 +484,23 @@ public class ArticleSwitch<T>
PluginResource pluginResource = (PluginResource)theEObject;
T result = casePluginResource(pluginResource);
if (result == null)
- {
result = caseExternalArticle(pluginResource);
- }
if (result == null)
- {
result = caseArticle(pluginResource);
- }
if (result == null)
- {
result = caseChapter(pluginResource);
- }
if (result == null)
- {
result = caseBody(pluginResource);
- }
if (result == null)
- {
result = caseStructuralElement(pluginResource);
- }
if (result == null)
- {
result = caseBodyElementContainer(pluginResource);
- }
if (result == null)
- {
result = caseLinkTarget(pluginResource);
- }
if (result == null)
- {
result = caseIdentifiable(pluginResource);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case ArticlePackage.EXCEL:
@@ -705,13 +508,37 @@ public class ArticleSwitch<T>
Excel excel = (Excel)theEObject;
T result = caseExcel(excel);
if (result == null)
- {
result = caseBodyElement(excel);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
+ return result;
+ }
+ case ArticlePackage.FORMATTER:
+ {
+ Formatter formatter = (Formatter)theEObject;
+ T result = caseFormatter(formatter);
+ if (result == null)
+ result = defaultCase(theEObject);
+ return result;
+ }
+ case ArticlePackage.JAVA_FORMATTER:
+ {
+ JavaFormatter javaFormatter = (JavaFormatter)theEObject;
+ T result = caseJavaFormatter(javaFormatter);
+ if (result == null)
+ result = caseFormatter(javaFormatter);
+ if (result == null)
+ result = defaultCase(theEObject);
+ return result;
+ }
+ case ArticlePackage.XML_FORMATTER:
+ {
+ XmlFormatter xmlFormatter = (XmlFormatter)theEObject;
+ T result = caseXmlFormatter(xmlFormatter);
+ if (result == null)
+ result = caseFormatter(xmlFormatter);
+ if (result == null)
+ result = defaultCase(theEObject);
return result;
}
default:
@@ -1186,6 +1013,51 @@ public class ArticleSwitch<T>
}
/**
+ * Returns the result of interpreting the object as an instance of '<em>Formatter</em>'. <!-- begin-user-doc --> This
+ * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+ *
+ * @param object
+ * the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>Formatter</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseFormatter(Formatter object)
+ {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>Java Formatter</em>'. <!-- begin-user-doc -->
+ * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+ *
+ * @param object
+ * the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>Java Formatter</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseJavaFormatter(JavaFormatter object)
+ {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>Xml Formatter</em>'. <!-- begin-user-doc -->
+ * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+ *
+ * @param object
+ * the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>Xml Formatter</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseXmlFormatter(XmlFormatter object)
+ {
+ return null;
+ }
+
+ /**
* Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This
* implementation returns null; returning a non-null result will terminate the switch, but this is the last case
* anyway. <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/html/Overview.html b/plugins/org.eclipse.emf.cdo.releng.help/html/Overview.html
index 3198bcdd8d..d585c6859b 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/html/Overview.html
+++ b/plugins/org.eclipse.emf.cdo.releng.help/html/Overview.html
@@ -69,6 +69,9 @@ function windowTitle()
<tr><td></td><td></td><td></td><td>3&nbsp;</td><td colspan="4"><a href="writer/examples/CreatingTransportConnections.html#AddConfigurationParameters" title="Chapter in CDO Release Engineering Documentation">Add Configuration Parameters</a></td></tr>
<tr><td></td><td></td><td></td><td></td><td>3.1&nbsp;</td><td colspan="3"><a href="writer/examples/CreatingTransportConnections.html#SetBufferCapacity" title="Chapter in CDO Release Engineering Documentation">Set the Buffer Capacity</a></td></tr>
<tr><td></td><td></td><td></td><td></td><td>3.2&nbsp;</td><td colspan="3"><a href="writer/examples/CreatingTransportConnections.html#SetConnectionTimeout" title="Chapter in CDO Release Engineering Documentation">Set the Connection Timeout</a></td></tr>
+<tr><td></td><td></td><td><img src="../images/article.gif">&nbsp;</td><td colspan="5"><a href="writer/examples/XmlSnippets.html" title="Article in CDO Release Engineering Documentation">Embedding XML Snippets</a></td></tr>
+<tr><td></td><td></td><td></td><td>1&nbsp;</td><td colspan="4"><a href="writer/examples/XmlSnippets.html#XmlExample" title="Chapter in CDO Release Engineering Documentation">XML Example with a Callout</a></td></tr>
+<tr><td></td><td></td><td></td><td>2&nbsp;</td><td colspan="4"><a href="writer/examples/XmlSnippets.html#XmiExample" title="Chapter in CDO Release Engineering Documentation">XMI Example</a></td></tr>
<tr><td><img src="../images/category.gif">&nbsp;</td><td colspan="7"><a href="reference/index.html" title="Category in CDO Release Engineering Documentation">Reference</a></td></tr>
<tr><td></td><td><img src="../images/category.gif">&nbsp;</td><td colspan="6"><a href="../javadoc/overview-summary.html" title="Category in CDO Release Engineering Documentation">API Reference</a></td></tr>
<tr><td><img src="../images/category.gif">&nbsp;</td><td colspan="7"><a href="online/index.html" title="Category in CDO Release Engineering Documentation">Online Docs</a></td></tr>
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/html/reference/index.html b/plugins/org.eclipse.emf.cdo.releng.help/html/reference/index.html
index 8edc52ca8f..1a7d6f34b0 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/html/reference/index.html
+++ b/plugins/org.eclipse.emf.cdo.releng.help/html/reference/index.html
@@ -23,7 +23,7 @@ function windowTitle()
<table border="0">
<tr>
<td width="100%"><h1>Reference</h1></td>
- <td align="right" valign="middle" nowrap><a href="../writer/examples/CreatingTransportConnections.html" title="Backward to Creating Transport Connections"><img src="../../images/backward.png" border="0"></a>&nbsp;<a href="../../javadoc/overview-summary.html" title="Forward to API Reference"><img src="../../images/forward.png" border="0"></a></td>
+ <td align="right" valign="middle" nowrap><a href="../writer/examples/XmlSnippets.html" title="Backward to Embedding XML Snippets"><img src="../../images/backward.png" border="0"></a>&nbsp;<a href="../../javadoc/overview-summary.html" title="Forward to API Reference"><img src="../../images/forward.png" border="0"></a></td>
</tr>
</table>
<p>
@@ -34,7 +34,7 @@ function windowTitle()
<p align="right">
-<a href="../writer/examples/CreatingTransportConnections.html" title="Backward to Creating Transport Connections"><img src="../../images/backward.png" border="0"></a>&nbsp;<a href="../../javadoc/overview-summary.html" title="Forward to API Reference"><img src="../../images/forward.png" border="0"></a></p>
+<a href="../writer/examples/XmlSnippets.html" title="Backward to Embedding XML Snippets"><img src="../../images/backward.png" border="0"></a>&nbsp;<a href="../../javadoc/overview-summary.html" title="Forward to API Reference"><img src="../../images/forward.png" border="0"></a></p>
<HR>
<i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.</i>
</BODY>
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/html/writer/examples/CreatingTransportConnections.html b/plugins/org.eclipse.emf.cdo.releng.help/html/writer/examples/CreatingTransportConnections.html
index bc8274bf64..4ff735f242 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/html/writer/examples/CreatingTransportConnections.html
+++ b/plugins/org.eclipse.emf.cdo.releng.help/html/writer/examples/CreatingTransportConnections.html
@@ -23,7 +23,7 @@ function windowTitle()
<table border="0">
<tr>
<td width="100%"><h1>Creating Transport Connections</h1></td>
- <td align="right" valign="middle" nowrap><a href="ConnectingToRepositories.html" title="Backward to Connecting To Repositories"><img src="../../../images/backward.png" border="0"></a>&nbsp;<a href="../../reference/index.html" title="Forward to Reference"><img src="../../../images/forward.png" border="0"></a></td>
+ <td align="right" valign="middle" nowrap><a href="ConnectingToRepositories.html" title="Backward to Connecting To Repositories"><img src="../../../images/backward.png" border="0"></a>&nbsp;<a href="XmlSnippets.html" title="Forward to Embedding XML Snippets"><img src="../../../images/forward.png" border="0"></a></td>
</tr>
</table>
<p>
@@ -72,7 +72,7 @@ function windowTitle()
<a name="snippet_snippet1"></a>
<table border="0" cellspacing="0" cellpadding="0">
<tr>
- <td><img src="../../../images/editor-top-left.png"></td>
+ <td><img src="../../../images/editor-top-left-java.png"></td>
<td style="background-image:url(../../../images/editor-top1.png); background-repeat:repeat-x;" width="1px"><font face="Segoe UI,Arial" size="-1">ContainerSetup.java</font></td>
<td width="1px"><img src="../../../images/editor-close.png"></td>
<td style="background-image:url(../../../images/editor-top2.png); background-repeat:repeat-x;">&nbsp;</td>
@@ -150,7 +150,7 @@ function windowTitle()
<a name="snippet_JMSConnector"></a>
<table border="0" cellspacing="0" cellpadding="0">
<tr>
- <td><img src="../../../images/editor-top-left.png"></td>
+ <td><img src="../../../images/editor-top-left-java.png"></td>
<td style="background-image:url(../../../images/editor-top1.png); background-repeat:repeat-x;" width="1px"><font face="Segoe UI,Arial" size="-1">JMSConnector.java</font></td>
<td width="1px"><img src="../../../images/editor-close.png"></td>
<td style="background-image:url(../../../images/editor-top2.png); background-repeat:repeat-x;">&nbsp;</td>
@@ -205,7 +205,7 @@ function windowTitle()
Sed a viverra metus.
<p align="right">
-<a href="ConnectingToRepositories.html" title="Backward to Connecting To Repositories"><img src="../../../images/backward.png" border="0"></a>&nbsp;<a href="../../reference/index.html" title="Forward to Reference"><img src="../../../images/forward.png" border="0"></a></p>
+<a href="ConnectingToRepositories.html" title="Backward to Connecting To Repositories"><img src="../../../images/backward.png" border="0"></a>&nbsp;<a href="XmlSnippets.html" title="Forward to Embedding XML Snippets"><img src="../../../images/forward.png" border="0"></a></p>
<HR>
<i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.</i>
</BODY>
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/html/writer/examples/XmlSnippets.html b/plugins/org.eclipse.emf.cdo.releng.help/html/writer/examples/XmlSnippets.html
new file mode 100644
index 0000000000..cc12cf81c6
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.help/html/writer/examples/XmlSnippets.html
@@ -0,0 +1,310 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+
+<HEAD>
+<TITLE>Embedding XML Snippets (CDO Release Engineering Documentation)</TITLE>
+
+<LINK REL="STYLESHEET" HREF="../../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="Embedding XML Snippets (CDO Release Engineering Documentation)";
+ }
+}
+</SCRIPT>
+<NOSCRIPT></NOSCRIPT>
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+<!-- <div class="help_breadcrumbs"><a href="../../Overview.html" title="CDO Release Engineering Documentation">CDO Release Engineering Documentation</a> > <a href="../index.html" title="Category in CDO Release Engineering Documentation">Technical Writer's Guide</a> > <a href="index.html" title="Category in CDO Release Engineering Documentation">Examples</a></div> -->
+
+<table border="0">
+ <tr>
+ <td width="100%"><h1>Embedding XML Snippets</h1></td>
+ <td align="right" valign="middle" nowrap><a href="CreatingTransportConnections.html" title="Backward to Creating Transport Connections"><img src="../../../images/backward.png" border="0"></a>&nbsp;<a href="../../reference/index.html" title="Forward to Reference"><img src="../../../images/forward.png" border="0"></a></td>
+ </tr>
+</table>
+<p>
+ <p>
+<table border="0">
+<tr><td>1&nbsp;</td><td colspan="3"><a href="XmlSnippets.html#XmlExample" title="Chapter in CDO Release Engineering Documentation">XML Example with a Callout</a></td></tr>
+<tr><td>2&nbsp;</td><td colspan="3"><a href="XmlSnippets.html#XmiExample" title="Chapter in CDO Release Engineering Documentation">XMI Example</a></td></tr>
+</table>
+</p>
+
+
+<h2><a name="XmlExample"></a>1&nbsp;&nbsp;XML Example with a Callout</h2>
+<p>
+
+
+<div class="snippet" style="margin-left:24px;" align="left">
+ <a name="snippet_cdoServerXml"></a>
+ <table border="0" cellspacing="0" cellpadding="0">
+ <tr>
+ <td><img src="../../../images/editor-top-left-xml.png"></td>
+ <td style="background-image:url(../../../images/editor-top1.png); background-repeat:repeat-x;" width="1px"><font face="Segoe UI,Arial" size="-1">cdo-server.xml</font></td>
+ <td width="1px"><img src="../../../images/editor-close.png"></td>
+ <td style="background-image:url(../../../images/editor-top2.png); background-repeat:repeat-x;">&nbsp;</td>
+ <td><img src="../../../images/editor-top-right.png"></td>
+ </tr>
+ <tr>
+ <td style="background-image:url(../../../images/editor-left.png); background-repeat:repeat-y;">&nbsp;</td>
+ <td colspan="3" align="left" valign="top" nowrap>
+ <div style="margin:10px 0px 10px 0px;">
+ <code>
+<font color="#0000e1">&lt;?xml version=<font color="#000080">'1.0'</font> encoding=<font color="#000080">'UTF-8'</font>?&gt;</font><br/>
+<font color="#0000e1">&lt;cdoServer&gt;</font><br/>
+<br/>
+&nbsp;&nbsp;<font color="#3f7f5f">&lt;!--&nbsp;==============================================================&nbsp;--&gt;</font><br/>
+&nbsp;&nbsp;<font color="#3f7f5f">&lt;!--&nbsp;See&nbsp;http://wiki.eclipse.org/CDO/Server_Configuration_Reference&nbsp;--&gt;</font><br/>
+&nbsp;&nbsp;<font color="#3f7f5f">&lt;!--&nbsp;==============================================================&nbsp;--&gt;</font><br/>
+<br/>
+&nbsp;&nbsp;<font color="#0000e1">&lt;acceptor&nbsp;type<font color="#000080">="tcp"</font>&nbsp;listenAddr<font color="#000080">="0.0.0.0"</font>&nbsp;port<font color="#000080">="2036"</font>/&gt;</font><br/>
+<br/>
+&nbsp;&nbsp;<font color="#3f7f5f">&lt;!--&nbsp;Examples:<br/>
+&nbsp;&nbsp;&lt;acceptor&nbsp;type="ssl"&nbsp;listenAddr="0.0.0.0"&nbsp;port="2036"/&gt;<br/>
+&nbsp;&nbsp;&lt;acceptor&nbsp;type="http"/&gt;<br/>
+&nbsp;&nbsp;--&gt;</font><br/>
+<br/>
+&nbsp;&nbsp;<font color="#0000e1">&lt;repository&nbsp;name<font color="#000080">="repo1"</font>&gt;</font><br/>
+<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;property&nbsp;name<font color="#000080">="overrideUUID"</font>&nbsp;value<font color="#000080">=""</font>/&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;property&nbsp;name<font color="#000080">="supportingAudits"</font>&nbsp;value<font color="#000080">="true"</font>/&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;property&nbsp;name<font color="#000080">="supportingBranches"</font>&nbsp;value<font color="#000080">="true"</font>/&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;property&nbsp;name<font color="#000080">="supportingEcore"</font>&nbsp;value<font color="#000080">="false"</font>/&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;property&nbsp;name<font color="#000080">="ensureReferentialIntegrity"</font>&nbsp;value<font color="#000080">="false"</font>/&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;property&nbsp;name<font color="#000080">="allowInterruptRunningQueries"</font>&nbsp;value<font color="#000080">="true"</font>/&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;property&nbsp;name<font color="#000080">="idGenerationLocation"</font>&nbsp;value<font color="#000080">="STORE"</font>/&gt;</font>&nbsp;<font color="#3f7f5f">&lt;!--&nbsp;Possible&nbsp;values:&nbsp;STORE&nbsp;|&nbsp;CLIENT&nbsp;--&gt;</font><br/>
+<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#3f7f5f">&lt;!--&nbsp;Example&nbsp;(see&nbsp;https://bugs.eclipse.org/bugs/show_bug.cgi?id=302775):<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&lt;userManager&nbsp;type="file"&nbsp;description="_database/repo1.users"/&gt;<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;--&gt;</font><br/>
+<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#3f7f5f">&lt;!--&nbsp;Example&nbsp;(see&nbsp;https://bugs.eclipse.org/bugs/show_bug.cgi?id=345835):<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&lt;userManager&nbsp;type="TestRepository"&nbsp;description="repo1"/&gt;<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;--&gt;</font><br/>
+<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#3f7f5f">&lt;!--&nbsp;Example&nbsp;(see&nbsp;https://bugs.eclipse.org/bugs/show_bug.cgi?id=345431):<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&lt;initialPackage&nbsp;nsURI="http://www.eclipse.org/emf/CDO/examples/company/1.0.0"/&gt;<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;--&gt;</font><br/>
+<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;store&nbsp;type<font color="#000080">="db"</font>&gt;</font><br/>
+<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<font color="#3f7f5f">&lt;!--&nbsp;Period&nbsp;at&nbsp;which&nbsp;to&nbsp;execute&nbsp;an&nbsp;SQL&nbsp;statement&nbsp;to&nbsp;keep&nbsp;DB&nbsp;connection&nbsp;alive,&nbsp;in&nbsp;minutes&nbsp;--&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;property&nbsp;name<font color="#000080">="connectionKeepAlivePeriod"</font>&nbsp;value<font color="#000080">="60"</font>/&gt;</font><br/>
+<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;mappingStrategy&nbsp;type<font color="#000080">="horizontal"</font>&gt;</font>&nbsp;<a name="callout_cdoServerXml_1_code" href="#callout_cdoServerXml_1" alt="The mapping strategy &quot;horizontal&quot; delegates to a mapping strategy chosen to match the repository
+ properties supportingAudits and supportingBranches." title="The mapping strategy &quot;horizontal&quot; delegates to a mapping strategy chosen to match the repository
+ properties supportingAudits and supportingBranches."><img src="../../../images/callout-1.png" width="16" height="16" border="0" align="top"></a>&nbsp;<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;property&nbsp;name<font color="#000080">="qualifiedNames"</font>&nbsp;value<font color="#000080">="true"</font>/&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;property&nbsp;name<font color="#000080">="toManyReferences"</font>&nbsp;value<font color="#000080">="ONE_TABLE_PER_REFERENCE"</font>/&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;property&nbsp;name<font color="#000080">="toOneReferences"</font>&nbsp;value<font color="#000080">="LIKE_ATTRIBUTES"</font>/&gt;</font><br/>
+<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<font color="#3f7f5f">&lt;!--<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Per&nbsp;default,&nbsp;the&nbsp;objectTypeCache&nbsp;is&nbsp;in-memory&nbsp;and&nbsp;contains<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;100,000&nbsp;cache&nbsp;entries.&nbsp;If&nbsp;you&nbsp;want&nbsp;to&nbsp;change&nbsp;the&nbsp;size,<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uncomment&nbsp;the&nbsp;following&nbsp;line&nbsp;and&nbsp;set&nbsp;the&nbsp;desired&nbsp;size.<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The&nbsp;cache&nbsp;can&nbsp;be&nbsp;disabled&nbsp;by&nbsp;setting&nbsp;a&nbsp;size&nbsp;of&nbsp;0.<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;--&gt;</font><br/>
+<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<font color="#3f7f5f">&lt;!--&nbsp;Optional:&nbsp;<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;property&nbsp;name="objectTypeCacheSize"&nbsp;value="100000"&nbsp;/&gt;<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;--&gt;</font><br/>
+<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;/mappingStrategy&gt;</font><br/>
+<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;dbAdapter&nbsp;name<font color="#000080">="h2"</font>/&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;dataSource&nbsp;class<font color="#000080">="org.h2.jdbcx.JdbcDataSource"</font>&nbsp;uRL<font color="#000080">="jdbc:h2:database/repo1"</font>/&gt;</font><br/>
+<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<font color="#3f7f5f">&lt;!--&nbsp;Example:<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;dbAdapter&nbsp;name="derby-embedded"/&gt;<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;dataSource&nbsp;class="org.apache.derby.jdbc.EmbeddedDataSource"<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;databaseName="/temp/repo1"<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;createDatabase="create"/&gt;<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;--&gt;</font><br/>
+<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<font color="#3f7f5f">&lt;!--&nbsp;Example:<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;dbAdapter&nbsp;name="hsqldb"/&gt;<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;dataSource&nbsp;class="org.eclipse.net4j.db.hsqldb.HSQLDBDataSource"<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;database="jdbc:hsqldb:mem:repo1"<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;user="sa"/&gt;<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;--&gt;</font><br/>
+<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<font color="#3f7f5f">&lt;!--&nbsp;Example:<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;dbAdapter&nbsp;name="mysql"/&gt;<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;dataSource&nbsp;class="com.mysql.jdbc.jdbc2.optional.MysqlDataSource"<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;url="jdbc:mysql://localhost/repo1"<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;user="sa"/&gt;<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;--&gt;</font><br/>
+<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<font color="#3f7f5f">&lt;!--&nbsp;Example:<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;dbAdapter&nbsp;name="postgresql"/&gt;<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;dataSource&nbsp;class="org.postgresql.ds.PGSimpleDataSource"<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;url="jdbc:postgresql://localhost:5432/repo1"<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;databaseName="repo1"<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;user="cdo"<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;password="cdo"/&gt;<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;--&gt;</font><br/>
+<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;/store&gt;</font><br/>
+<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#3f7f5f">&lt;!--&nbsp;ONLY&nbsp;THE&nbsp;FIRST&nbsp;CONFIGURED&nbsp;STORE&nbsp;IS&nbsp;USED&nbsp;FOR&nbsp;THE&nbsp;REPOSITORY!!!&nbsp;--&gt;</font><br/>
+<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;store&nbsp;type<font color="#000080">="mongodb"</font>&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;property&nbsp;name<font color="#000080">="uri"</font>&nbsp;value<font color="#000080">="mongodb://localhost"</font>/&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;property&nbsp;name<font color="#000080">="db"</font>&nbsp;value<font color="#000080">="cdodb"</font>/&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<font color="#3f7f5f">&lt;!--&nbsp;Optional:<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;property&nbsp;name="drop"&nbsp;value="true"/&gt;<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;--&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;/store&gt;</font><br/>
+<br/>
+&nbsp;&nbsp;<font color="#0000e1">&lt;/repository&gt;</font><br/>
+<br/>
+&nbsp;&nbsp;<font color="#3f7f5f">&lt;!--&nbsp;Example&nbsp;of&nbsp;a&nbsp;DB4O&nbsp;repo/store:<br/>
+&nbsp;&nbsp;&lt;repository&nbsp;name="repo1"&gt;<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&lt;property&nbsp;name="supportingAudits"&nbsp;value="false"/&gt;<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&lt;property&nbsp;name="supportingBranches"&nbsp;value="false"/&gt;<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&lt;store&nbsp;type="db4o"&gt;<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;property&nbsp;name="path"&nbsp;value="/tmp/cdodb4.db4o"/&gt;<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;property&nbsp;name="port"&nbsp;value="50032"/&gt;<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&lt;/store&gt;<br/>
+&nbsp;&nbsp;&lt;/repository&gt;<br/>
+&nbsp;&nbsp;--&gt;</font>&nbsp;&nbsp;<br/>
+<br/>
+<font color="#0000e1">&lt;/cdoServer&gt;</font>
+ </code>
+ </div>
+ </td>
+ <td style="background-image:url(../../../images/editor-right.png); background-repeat:repeat-y;">&nbsp;</td>
+ </tr>
+ <tr>
+ <td><img src="../../../images/editor-bottom-left.png"></td>
+ <td style="background-image:url(../../../images/editor-bottom.png); background-repeat:repeat-x;" colspan="3">&nbsp;</td>
+ <td><img src="../../../images/editor-bottom-right.png"></td>
+ </tr>
+ </table>
+</div>
+<p>
+<div style="margin-left:24px;"><a name="callout_cdoServerXml_1" href="#callout_cdoServerXml_1_code" alt="Jump to snippet..." title="Jump to snippet..."><img src="../../../images/callout-1.png" width="16" height="16" border="0" align="top"></a>&nbsp;The mapping strategy "horizontal" delegates to a mapping strategy chosen to match the repository
+ properties <i>supportingAudits</i> and <i>supportingBranches</i>.
+
+</div>
+<p>
+
+
+<h2><a name="XmiExample"></a>2&nbsp;&nbsp;XMI Example</h2>
+<p>
+
+
+<div class="snippet" style="margin-left:24px;" align="left">
+ <a name="snippet_companyEcore"></a>
+ <table border="0" cellspacing="0" cellpadding="0">
+ <tr>
+ <td><img src="../../../images/editor-top-left-xml.png"></td>
+ <td style="background-image:url(../../../images/editor-top1.png); background-repeat:repeat-x;" width="1px"><font face="Segoe UI,Arial" size="-1">company.ecore</font></td>
+ <td width="1px"><img src="../../../images/editor-close.png"></td>
+ <td style="background-image:url(../../../images/editor-top2.png); background-repeat:repeat-x;">&nbsp;</td>
+ <td><img src="../../../images/editor-top-right.png"></td>
+ </tr>
+ <tr>
+ <td style="background-image:url(../../../images/editor-left.png); background-repeat:repeat-y;">&nbsp;</td>
+ <td colspan="3" align="left" valign="top" nowrap>
+ <div style="margin:10px 0px 10px 0px;">
+ <code>
+<font color="#0000e1">&lt;?xml version=<font color="#000080">'1.0'</font> encoding=<font color="#000080">'UTF-8'</font>?&gt;</font><br/>
+<font color="#0000e1">&lt;ecore:EPackage&nbsp;xmi:version<font color="#000080">="2.0"</font>&nbsp;xmlns:xmi<font color="#000080">="http://www.omg.org/XMI"</font>&nbsp;xmlns:xsi<font color="#000080">="http://www.w3.org/2001/XMLSchema-instance"</font>&nbsp;xmlns:ecore<font color="#000080">="http://www.eclipse.org/emf/2002/Ecore"</font>&nbsp;name<font color="#000080">="company"</font>&nbsp;nsURI<font color="#000080">="http://www.eclipse.org/emf/CDO/examples/company/1.0.0"</font>&nbsp;nsPrefix<font color="#000080">="company"</font>&gt;</font><br/>
+&nbsp;&nbsp;<font color="#0000e1">&lt;eAnnotations&nbsp;source<font color="#000080">="teneo.jpa"</font>&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;details&nbsp;key<font color="#000080">="value"</font>&nbsp;value<font color="#000080">="@hbGenericGenerators({@GenericGenerator(name="system-uuid", strategy = "org.eclipse.emf.cdo.examples.hibernate.server.CDOExampleUUIDHexGenerator")})"</font>/&gt;</font><br/>
+&nbsp;&nbsp;<font color="#0000e1">&lt;/eAnnotations&gt;</font><br/>
+&nbsp;&nbsp;<font color="#0000e1">&lt;eClassifiers&nbsp;xsi:type<font color="#000080">="ecore:EClass"</font>&nbsp;name<font color="#000080">="Addressable"</font>&nbsp;abstract<font color="#000080">="true"</font>&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;eStructuralFeatures&nbsp;xsi:type<font color="#000080">="ecore:EAttribute"</font>&nbsp;name<font color="#000080">="name"</font>&nbsp;eType<font color="#000080">="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"</font>/&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;eStructuralFeatures&nbsp;xsi:type<font color="#000080">="ecore:EAttribute"</font>&nbsp;name<font color="#000080">="street"</font>&nbsp;eType<font color="#000080">="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"</font>/&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;eStructuralFeatures&nbsp;xsi:type<font color="#000080">="ecore:EAttribute"</font>&nbsp;name<font color="#000080">="city"</font>&nbsp;eType<font color="#000080">="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"</font>/&gt;</font><br/>
+&nbsp;&nbsp;<font color="#0000e1">&lt;/eClassifiers&gt;</font><br/>
+&nbsp;&nbsp;<font color="#0000e1">&lt;eClassifiers&nbsp;xsi:type<font color="#000080">="ecore:EClass"</font>&nbsp;name<font color="#000080">="Company"</font>&nbsp;eSuperTypes<font color="#000080">="#//Addressable"</font>&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;eStructuralFeatures&nbsp;xsi:type<font color="#000080">="ecore:EReference"</font>&nbsp;name<font color="#000080">="categories"</font>&nbsp;upperBound<font color="#000080">="-1"</font>&nbsp;eType<font color="#000080">="#//Category"</font>&nbsp;containment<font color="#000080">="true"</font>/&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;eStructuralFeatures&nbsp;xsi:type<font color="#000080">="ecore:EReference"</font>&nbsp;name<font color="#000080">="suppliers"</font>&nbsp;upperBound<font color="#000080">="-1"</font>&nbsp;eType<font color="#000080">="#//Supplier"</font>&nbsp;containment<font color="#000080">="true"</font>/&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;eStructuralFeatures&nbsp;xsi:type<font color="#000080">="ecore:EReference"</font>&nbsp;name<font color="#000080">="customers"</font>&nbsp;upperBound<font color="#000080">="-1"</font>&nbsp;eType<font color="#000080">="#//Customer"</font>&nbsp;containment<font color="#000080">="true"</font>/&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;eStructuralFeatures&nbsp;xsi:type<font color="#000080">="ecore:EReference"</font>&nbsp;name<font color="#000080">="purchaseOrders"</font>&nbsp;upperBound<font color="#000080">="-1"</font>&nbsp;eType<font color="#000080">="#//PurchaseOrder"</font>&nbsp;containment<font color="#000080">="true"</font>/&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;eStructuralFeatures&nbsp;xsi:type<font color="#000080">="ecore:EReference"</font>&nbsp;name<font color="#000080">="salesOrders"</font>&nbsp;upperBound<font color="#000080">="-1"</font>&nbsp;eType<font color="#000080">="#//SalesOrder"</font>&nbsp;containment<font color="#000080">="true"</font>/&gt;</font><br/>
+&nbsp;&nbsp;<font color="#0000e1">&lt;/eClassifiers&gt;</font><br/>
+&nbsp;&nbsp;<font color="#0000e1">&lt;eClassifiers&nbsp;xsi:type<font color="#000080">="ecore:EClass"</font>&nbsp;name<font color="#000080">="Supplier"</font>&nbsp;eSuperTypes<font color="#000080">="#//Addressable"</font>&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;eStructuralFeatures&nbsp;xsi:type<font color="#000080">="ecore:EReference"</font>&nbsp;name<font color="#000080">="purchaseOrders"</font>&nbsp;upperBound<font color="#000080">="-1"</font>&nbsp;eType<font color="#000080">="#//PurchaseOrder"</font>&nbsp;eOpposite<font color="#000080">="#//PurchaseOrder/supplier"</font>/&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;eStructuralFeatures&nbsp;xsi:type<font color="#000080">="ecore:EAttribute"</font>&nbsp;name<font color="#000080">="preferred"</font>&nbsp;eType<font color="#000080">="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"</font>&nbsp;defaultValueLiteral<font color="#000080">="true"</font>/&gt;</font><br/>
+&nbsp;&nbsp;<font color="#0000e1">&lt;/eClassifiers&gt;</font><br/>
+&nbsp;&nbsp;<font color="#0000e1">&lt;eClassifiers&nbsp;xsi:type<font color="#000080">="ecore:EClass"</font>&nbsp;name<font color="#000080">="Customer"</font>&nbsp;eSuperTypes<font color="#000080">="#//Addressable"</font>&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;eStructuralFeatures&nbsp;xsi:type<font color="#000080">="ecore:EReference"</font>&nbsp;name<font color="#000080">="salesOrders"</font>&nbsp;upperBound<font color="#000080">="-1"</font>&nbsp;eType<font color="#000080">="#//SalesOrder"</font>&nbsp;eOpposite<font color="#000080">="#//SalesOrder/customer"</font>/&gt;</font><br/>
+&nbsp;&nbsp;<font color="#0000e1">&lt;/eClassifiers&gt;</font><br/>
+&nbsp;&nbsp;<font color="#0000e1">&lt;eClassifiers&nbsp;xsi:type<font color="#000080">="ecore:EClass"</font>&nbsp;name<font color="#000080">="Order"</font>&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;eAnnotations&nbsp;source<font color="#000080">="teneo.jpa"</font>&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;details&nbsp;key<font color="#000080">="value"</font>&nbsp;value<font color="#000080">="@Entity(name="BaseOrder")"</font>/&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;/eAnnotations&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;eStructuralFeatures&nbsp;xsi:type<font color="#000080">="ecore:EReference"</font>&nbsp;name<font color="#000080">="orderDetails"</font>&nbsp;upperBound<font color="#000080">="-1"</font>&nbsp;eType<font color="#000080">="#//OrderDetail"</font>&nbsp;containment<font color="#000080">="true"</font>&nbsp;eOpposite<font color="#000080">="#//OrderDetail/order"</font>/&gt;</font><br/>
+&nbsp;&nbsp;<font color="#0000e1">&lt;/eClassifiers&gt;</font><br/>
+&nbsp;&nbsp;<font color="#0000e1">&lt;eClassifiers&nbsp;xsi:type<font color="#000080">="ecore:EClass"</font>&nbsp;name<font color="#000080">="OrderDetail"</font>&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;eStructuralFeatures&nbsp;xsi:type<font color="#000080">="ecore:EReference"</font>&nbsp;name<font color="#000080">="order"</font>&nbsp;lowerBound<font color="#000080">="1"</font>&nbsp;eType<font color="#000080">="#//Order"</font>&nbsp;eOpposite<font color="#000080">="#//Order/orderDetails"</font>/&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;eStructuralFeatures&nbsp;xsi:type<font color="#000080">="ecore:EReference"</font>&nbsp;name<font color="#000080">="product"</font>&nbsp;eType<font color="#000080">="#//Product"</font>&nbsp;eOpposite<font color="#000080">="#//Product/orderDetails"</font>/&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;eStructuralFeatures&nbsp;xsi:type<font color="#000080">="ecore:EAttribute"</font>&nbsp;name<font color="#000080">="price"</font>&nbsp;eType<font color="#000080">="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloat"</font>/&gt;</font><br/>
+&nbsp;&nbsp;<font color="#0000e1">&lt;/eClassifiers&gt;</font><br/>
+&nbsp;&nbsp;<font color="#0000e1">&lt;eClassifiers&nbsp;xsi:type<font color="#000080">="ecore:EClass"</font>&nbsp;name<font color="#000080">="PurchaseOrder"</font>&nbsp;eSuperTypes<font color="#000080">="#//Order"</font>&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;eStructuralFeatures&nbsp;xsi:type<font color="#000080">="ecore:EAttribute"</font>&nbsp;name<font color="#000080">="date"</font>&nbsp;eType<font color="#000080">="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"</font>/&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;eStructuralFeatures&nbsp;xsi:type<font color="#000080">="ecore:EReference"</font>&nbsp;name<font color="#000080">="supplier"</font>&nbsp;lowerBound<font color="#000080">="1"</font>&nbsp;eType<font color="#000080">="#//Supplier"</font>&nbsp;eOpposite<font color="#000080">="#//Supplier/purchaseOrders"</font>/&gt;</font><br/>
+&nbsp;&nbsp;<font color="#0000e1">&lt;/eClassifiers&gt;</font><br/>
+&nbsp;&nbsp;<font color="#0000e1">&lt;eClassifiers&nbsp;xsi:type<font color="#000080">="ecore:EClass"</font>&nbsp;name<font color="#000080">="SalesOrder"</font>&nbsp;eSuperTypes<font color="#000080">="#//Order"</font>&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;eStructuralFeatures&nbsp;xsi:type<font color="#000080">="ecore:EAttribute"</font>&nbsp;name<font color="#000080">="id"</font>&nbsp;eType<font color="#000080">="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"</font>/&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;eStructuralFeatures&nbsp;xsi:type<font color="#000080">="ecore:EReference"</font>&nbsp;name<font color="#000080">="customer"</font>&nbsp;lowerBound<font color="#000080">="1"</font>&nbsp;eType<font color="#000080">="#//Customer"</font>&nbsp;eOpposite<font color="#000080">="#//Customer/salesOrders"</font>/&gt;</font><br/>
+&nbsp;&nbsp;<font color="#0000e1">&lt;/eClassifiers&gt;</font><br/>
+&nbsp;&nbsp;<font color="#0000e1">&lt;eClassifiers&nbsp;xsi:type<font color="#000080">="ecore:EClass"</font>&nbsp;name<font color="#000080">="Category"</font>&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;eStructuralFeatures&nbsp;xsi:type<font color="#000080">="ecore:EAttribute"</font>&nbsp;name<font color="#000080">="name"</font>&nbsp;eType<font color="#000080">="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"</font>&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;eAnnotations&nbsp;source<font color="#000080">="teneo.jpa"</font>&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;details&nbsp;key<font color="#000080">="value"</font>&nbsp;value<font color="#000080">="@Id @GeneratedValue(generator="system-uuid")"</font>/&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;/eAnnotations&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;/eStructuralFeatures&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;eStructuralFeatures&nbsp;xsi:type<font color="#000080">="ecore:EReference"</font>&nbsp;name<font color="#000080">="categories"</font>&nbsp;upperBound<font color="#000080">="-1"</font>&nbsp;eType<font color="#000080">="#//Category"</font>&nbsp;containment<font color="#000080">="true"</font>/&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;eStructuralFeatures&nbsp;xsi:type<font color="#000080">="ecore:EReference"</font>&nbsp;name<font color="#000080">="products"</font>&nbsp;upperBound<font color="#000080">="-1"</font>&nbsp;eType<font color="#000080">="#//Product"</font>&nbsp;containment<font color="#000080">="true"</font>/&gt;</font><br/>
+&nbsp;&nbsp;<font color="#0000e1">&lt;/eClassifiers&gt;</font><br/>
+&nbsp;&nbsp;<font color="#0000e1">&lt;eClassifiers&nbsp;xsi:type<font color="#000080">="ecore:EClass"</font>&nbsp;name<font color="#000080">="Product"</font>&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;eStructuralFeatures&nbsp;xsi:type<font color="#000080">="ecore:EAttribute"</font>&nbsp;name<font color="#000080">="name"</font>&nbsp;eType<font color="#000080">="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"</font>&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;eAnnotations&nbsp;source<font color="#000080">="teneo.jpa"</font>&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;details&nbsp;key<font color="#000080">="value"</font>&nbsp;value<font color="#000080">="@Id"</font>/&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;/eAnnotations&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;/eStructuralFeatures&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;eStructuralFeatures&nbsp;xsi:type<font color="#000080">="ecore:EReference"</font>&nbsp;name<font color="#000080">="orderDetails"</font>&nbsp;upperBound<font color="#000080">="-1"</font>&nbsp;eType<font color="#000080">="#//OrderDetail"</font>&nbsp;eOpposite<font color="#000080">="#//OrderDetail/product"</font>/&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;eStructuralFeatures&nbsp;xsi:type<font color="#000080">="ecore:EAttribute"</font>&nbsp;name<font color="#000080">="vat"</font>&nbsp;eType<font color="#000080">="#//VAT"</font>&nbsp;defaultValueLiteral<font color="#000080">="vat15"</font>&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;eAnnotations&nbsp;source<font color="#000080">="teneo.jpa"</font>&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;details&nbsp;key<font color="#000080">="value"</font>&nbsp;value<font color="#000080">="@Basic(optional=false)
+@Column(nullable=false)"</font>/&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;/eAnnotations&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;/eStructuralFeatures&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;eStructuralFeatures&nbsp;xsi:type<font color="#000080">="ecore:EAttribute"</font>&nbsp;name<font color="#000080">="description"</font>&nbsp;eType<font color="#000080">="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"</font>&nbsp;transient<font color="#000080">="true"</font>/&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;eStructuralFeatures&nbsp;xsi:type<font color="#000080">="ecore:EAttribute"</font>&nbsp;name<font color="#000080">="price"</font>&nbsp;eType<font color="#000080">="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloat"</font>/&gt;</font><br/>
+&nbsp;&nbsp;<font color="#0000e1">&lt;/eClassifiers&gt;</font><br/>
+&nbsp;&nbsp;<font color="#0000e1">&lt;eClassifiers&nbsp;xsi:type<font color="#000080">="ecore:EEnum"</font>&nbsp;name<font color="#000080">="VAT"</font>&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;eLiterals&nbsp;name<font color="#000080">="vat0"</font>/&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;eLiterals&nbsp;name<font color="#000080">="vat7"</font>&nbsp;value<font color="#000080">="7"</font>/&gt;</font><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;<font color="#0000e1">&lt;eLiterals&nbsp;name<font color="#000080">="vat15"</font>&nbsp;value<font color="#000080">="15"</font>/&gt;</font><br/>
+&nbsp;&nbsp;<font color="#0000e1">&lt;/eClassifiers&gt;</font><br/>
+<font color="#0000e1">&lt;/ecore:EPackage&gt;</font>
+ </code>
+ </div>
+ </td>
+ <td style="background-image:url(../../../images/editor-right.png); background-repeat:repeat-y;">&nbsp;</td>
+ </tr>
+ <tr>
+ <td><img src="../../../images/editor-bottom-left.png"></td>
+ <td style="background-image:url(../../../images/editor-bottom.png); background-repeat:repeat-x;" colspan="3">&nbsp;</td>
+ <td><img src="../../../images/editor-bottom-right.png"></td>
+ </tr>
+ </table>
+</div>
+<p>
+
+
+<p align="right">
+<a href="CreatingTransportConnections.html" title="Backward to Creating Transport Connections"><img src="../../../images/backward.png" border="0"></a>&nbsp;<a href="../../reference/index.html" title="Forward to Reference"><img src="../../../images/forward.png" border="0"></a></p>
+<HR>
+<i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.</i>
+</BODY>
+</HTML>
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/html/writer/examples/index.html b/plugins/org.eclipse.emf.cdo.releng.help/html/writer/examples/index.html
index 2094c2aaf0..df7e0118a4 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/html/writer/examples/index.html
+++ b/plugins/org.eclipse.emf.cdo.releng.help/html/writer/examples/index.html
@@ -37,6 +37,9 @@ function windowTitle()
<tr><td></td><td>3&nbsp;</td><td colspan="4"><a href="CreatingTransportConnections.html#AddConfigurationParameters" title="Chapter in CDO Release Engineering Documentation">Add Configuration Parameters</a></td></tr>
<tr><td></td><td></td><td>3.1&nbsp;</td><td colspan="3"><a href="CreatingTransportConnections.html#SetBufferCapacity" title="Chapter in CDO Release Engineering Documentation">Set the Buffer Capacity</a></td></tr>
<tr><td></td><td></td><td>3.2&nbsp;</td><td colspan="3"><a href="CreatingTransportConnections.html#SetConnectionTimeout" title="Chapter in CDO Release Engineering Documentation">Set the Connection Timeout</a></td></tr>
+<tr><td><img src="../../../images/article.gif">&nbsp;</td><td colspan="5"><a href="XmlSnippets.html" title="Article in CDO Release Engineering Documentation">Embedding XML Snippets</a></td></tr>
+<tr><td></td><td>1&nbsp;</td><td colspan="4"><a href="XmlSnippets.html#XmlExample" title="Chapter in CDO Release Engineering Documentation">XML Example with a Callout</a></td></tr>
+<tr><td></td><td>2&nbsp;</td><td colspan="4"><a href="XmlSnippets.html#XmiExample" title="Chapter in CDO Release Engineering Documentation">XMI Example</a></td></tr>
</table>
</p>
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/html/writer/index.html b/plugins/org.eclipse.emf.cdo.releng.help/html/writer/index.html
index b70fc2bfcb..c2271e631c 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/html/writer/index.html
+++ b/plugins/org.eclipse.emf.cdo.releng.help/html/writer/index.html
@@ -44,6 +44,9 @@ function windowTitle()
<tr><td></td><td></td><td>3&nbsp;</td><td colspan="4"><a href="examples/CreatingTransportConnections.html#AddConfigurationParameters" title="Chapter in CDO Release Engineering Documentation">Add Configuration Parameters</a></td></tr>
<tr><td></td><td></td><td></td><td>3.1&nbsp;</td><td colspan="3"><a href="examples/CreatingTransportConnections.html#SetBufferCapacity" title="Chapter in CDO Release Engineering Documentation">Set the Buffer Capacity</a></td></tr>
<tr><td></td><td></td><td></td><td>3.2&nbsp;</td><td colspan="3"><a href="examples/CreatingTransportConnections.html#SetConnectionTimeout" title="Chapter in CDO Release Engineering Documentation">Set the Connection Timeout</a></td></tr>
+<tr><td></td><td><img src="../../images/article.gif">&nbsp;</td><td colspan="5"><a href="examples/XmlSnippets.html" title="Article in CDO Release Engineering Documentation">Embedding XML Snippets</a></td></tr>
+<tr><td></td><td></td><td>1&nbsp;</td><td colspan="4"><a href="examples/XmlSnippets.html#XmlExample" title="Chapter in CDO Release Engineering Documentation">XML Example with a Callout</a></td></tr>
+<tr><td></td><td></td><td>2&nbsp;</td><td colspan="4"><a href="examples/XmlSnippets.html#XmiExample" title="Chapter in CDO Release Engineering Documentation">XMI Example</a></td></tr>
</table>
</p>
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/images/editor-top-left.png b/plugins/org.eclipse.emf.cdo.releng.help/images/editor-top-left-java.png
index 3405aff3b1..3405aff3b1 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/images/editor-top-left.png
+++ b/plugins/org.eclipse.emf.cdo.releng.help/images/editor-top-left-java.png
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/images/editor-top-left-xml.png b/plugins/org.eclipse.emf.cdo.releng.help/images/editor-top-left-xml.png
new file mode 100644
index 0000000000..de44ef29d2
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.help/images/editor-top-left-xml.png
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/examples/XmlSnippets.java b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/examples/XmlSnippets.java
new file mode 100644
index 0000000000..7919552f48
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/examples/XmlSnippets.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
+ */
+package org.eclipse.emf.cdo.releng.help.writer.examples;
+
+/**
+ * Embedding XML Snippets
+ * <p>
+ * {@toc}
+ */
+public class XmlSnippets
+{
+ /**
+ * XML Example with a Callout
+ * <p>
+ * {@link #cdoServerXml()}
+ */
+ public class XmlExample
+ {
+ /**
+ * @snippet xml ../../../../../../../../../../org.eclipse.emf.cdo.server.product/config/cdo-server.xml
+ * @callout The mapping strategy "horizontal" delegates to a mapping strategy chosen to match the repository
+ * properties <i>supportingAudits</i> and <i>supportingBranches</i>.
+ */
+ public void cdoServerXml()
+ {
+ }
+ }
+
+ /**
+ * XMI Example
+ * <p>
+ * {@link #companyEcore()}
+ */
+ public class XmiExample
+ {
+ /**
+ * @snippet xml ../../../../../../../../../../org.eclipse.emf.cdo.examples.company/model/company.ecore
+ */
+ public void companyEcore()
+ {
+ }
+ }
+
+ // /**
+ // * HTML Example
+ // * <p>
+ // * {@link #aboutHtml()}
+ // */
+ // public class HtmlExample
+ // {
+ // /**
+ // * @snippet xml ../../../../../../../../../about.html
+ // */
+ // public void aboutHtml()
+ // {
+ // }
+ // }
+}
diff --git a/plugins/org.eclipse.emf.cdo.releng/help/toc.html b/plugins/org.eclipse.emf.cdo.releng/help/toc.html
index 8cff2c8c9a..f0c8721486 100644
--- a/plugins/org.eclipse.emf.cdo.releng/help/toc.html
+++ b/plugins/org.eclipse.emf.cdo.releng/help/toc.html
@@ -68,6 +68,7 @@
<div id="org_eclipse_emf_cdo_releng_help_11" style="display:none; margin-left:20px;">
<div class="te"><span><img src="empty.gif"><img src="article.gif"><a href="org.eclipse.emf.cdo.releng.help/html/writer/examples/ConnectingToRepositories.html" target="content">Connecting&nbsp;To&nbsp;Repositories</a></span></div>
<div class="te"><span><img src="empty.gif"><img src="article.gif"><a href="org.eclipse.emf.cdo.releng.help/html/writer/examples/CreatingTransportConnections.html" target="content">Creating&nbsp;Transport&nbsp;Connections</a></span></div>
+ <div class="te"><span><img src="empty.gif"><img src="article.gif"><a href="org.eclipse.emf.cdo.releng.help/html/writer/examples/XmlSnippets.html" target="content">Embedding&nbsp;XML&nbsp;Snippets</a></span></div>
</div>
</div>
<div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_releng_help_12')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_releng_help_12"></a><img src="category.gif"><a href="org.eclipse.emf.cdo.releng.help/html/reference/index.html" target="content">Reference</a></span></div>
diff --git a/plugins/org.eclipse.emf.cdo.server.product/config/cdo-server.xml b/plugins/org.eclipse.emf.cdo.server.product/config/cdo-server.xml
index 6649c450bf..baaf3e35be 100644
--- a/plugins/org.eclipse.emf.cdo.server.product/config/cdo-server.xml
+++ b/plugins/org.eclipse.emf.cdo.server.product/config/cdo-server.xml
@@ -39,7 +39,7 @@
<!-- Period at which to execute an SQL statement to keep DB connection alive, in minutes -->
<property name="connectionKeepAlivePeriod" value="60"/>
- <mappingStrategy type="horizontal">
+ <mappingStrategy type="horizontal"> <!-- callout -->
<property name="qualifiedNames" value="true"/>
<property name="toManyReferences" value="ONE_TABLE_PER_REFERENCE"/>
<property name="toOneReferences" value="LIKE_ATTRIBUTES"/>
diff --git a/plugins/org.eclipse.net4j.db.doc/images/editor-top-left.png b/plugins/org.eclipse.net4j.db.doc/images/editor-top-left-java.png
index 3405aff3b1..3405aff3b1 100644
--- a/plugins/org.eclipse.net4j.db.doc/images/editor-top-left.png
+++ b/plugins/org.eclipse.net4j.db.doc/images/editor-top-left-java.png
Binary files differ
diff --git a/plugins/org.eclipse.net4j.db.doc/images/editor-top-left-xml.png b/plugins/org.eclipse.net4j.db.doc/images/editor-top-left-xml.png
new file mode 100644
index 0000000000..de44ef29d2
--- /dev/null
+++ b/plugins/org.eclipse.net4j.db.doc/images/editor-top-left-xml.png
Binary files differ
diff --git a/plugins/org.eclipse.net4j.doc/images/editor-top-left.png b/plugins/org.eclipse.net4j.doc/images/editor-top-left-java.png
index 3405aff3b1..3405aff3b1 100644
--- a/plugins/org.eclipse.net4j.doc/images/editor-top-left.png
+++ b/plugins/org.eclipse.net4j.doc/images/editor-top-left-java.png
Binary files differ
diff --git a/plugins/org.eclipse.net4j.doc/images/editor-top-left-xml.png b/plugins/org.eclipse.net4j.doc/images/editor-top-left-xml.png
new file mode 100644
index 0000000000..de44ef29d2
--- /dev/null
+++ b/plugins/org.eclipse.net4j.doc/images/editor-top-left-xml.png
Binary files differ
diff --git a/plugins/org.eclipse.net4j.util.doc/images/editor-top-left.png b/plugins/org.eclipse.net4j.util.doc/images/editor-top-left-java.png
index 3405aff3b1..3405aff3b1 100644
--- a/plugins/org.eclipse.net4j.util.doc/images/editor-top-left.png
+++ b/plugins/org.eclipse.net4j.util.doc/images/editor-top-left-java.png
Binary files differ
diff --git a/plugins/org.eclipse.net4j.util.doc/images/editor-top-left-xml.png b/plugins/org.eclipse.net4j.util.doc/images/editor-top-left-xml.png
new file mode 100644
index 0000000000..de44ef29d2
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/images/editor-top-left-xml.png
Binary files differ

Back to the top