diff options
18 files changed, 64 insertions, 20 deletions
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonView.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonView.java index fc6f689211..462368ad04 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonView.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonView.java @@ -60,7 +60,7 @@ public interface CDOCommonView extends CDOBranchPoint, CDORevisionProvider, IOpt * @noextend This interface is not intended to be extended by clients. * @noimplement This interface is not intended to be implemented by clients. * @since 4.1 - * @apiviz.has {@link CDOCommonView.Options.LockNotificationEvent} + * @apiviz.uses {@link CDOCommonView.Options.LockNotificationEvent} - - fires */ public interface Options extends IOptions { @@ -82,7 +82,13 @@ public interface CDOCommonView extends CDOBranchPoint, CDORevisionProvider, IOpt public void setLockNotificationEnabled(boolean enabled); /** + * An {@link IOptionsEvent options event} fired from common view {@link CDOCommonView#options() options} when the + * {@link Options#setLockNotificationEnabled(boolean) lock notification enabled} option has changed. + * * @author Caspar De Groot + * @noextend This interface is not intended to be extended by clients. + * @noimplement This interface is not intended to be implemented by clients. + * @since 4.1 */ public interface LockNotificationEvent extends IOptionsEvent { diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/IDurableLockingManager.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/IDurableLockingManager.java index 919cd41f58..ec1e7caf8f 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/IDurableLockingManager.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/IDurableLockingManager.java @@ -118,6 +118,8 @@ public interface IDurableLockingManager }
/**
+ * Exception occurs when attempting to create a durable {@link LockArea} that already exists.
+ *
* @author Caspar De Groot
* @since 4.1
*/
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOType.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOType.java index a2844f3132..c040f03e7e 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOType.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOType.java @@ -21,6 +21,8 @@ import org.eclipse.emf.ecore.EStructuralFeature; import java.io.IOException; /** + * Provides access to all CDO-supported data types. + * * @author Eike Stepper * @noimplement This interface is not intended to be implemented by clients. * @since 2.0 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 119a958abe..27e9520967 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/index-all.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/index-all.html @@ -972,7 +972,8 @@ Constructor for class org.eclipse.emf.cdo.common.util.<A HREF="./org/eclipse/emf CDO session.<DT><A HREF="./org/eclipse/emf/cdo/common/CDOCommonSession.Options.LockNotificationModeEvent.html" title="interface in org.eclipse.emf.cdo.common"><B>CDOCommonSession.Options.LockNotificationModeEvent</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/package-summary.html">org.eclipse.emf.cdo.common</A><DD>An <A HREF="../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/options/IOptionsEvent.html?is-external=true" title="class or interface in org.eclipse.net4j.util.options"><CODE>options event</CODE></A> fired when the <A HREF="./org/eclipse/emf/cdo/common/CDOCommonSession.Options.LockNotificationMode.html" title="enum in org.eclipse.emf.cdo.common"><CODE>lock notification mode</CODE></A> of a
CDO session has changed.<DT><A HREF="./org/eclipse/emf/cdo/common/CDOCommonSession.Options.PassiveUpdateEvent.html" title="interface in org.eclipse.emf.cdo.common"><B>CDOCommonSession.Options.PassiveUpdateEvent</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/package-summary.html">org.eclipse.emf.cdo.common</A><DD>An <A HREF="../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/options/IOptionsEvent.html?is-external=true" title="class or interface in org.eclipse.net4j.util.options"><CODE>options event</CODE></A> fired when the <A HREF="./org/eclipse/emf/cdo/common/CDOCommonSession.Options.PassiveUpdateMode.html" title="enum in org.eclipse.emf.cdo.common"><CODE>passive update mode</CODE></A> of a CDO
session has changed.<DT><A HREF="./org/eclipse/emf/cdo/common/CDOCommonSession.Options.PassiveUpdateMode.html" title="enum in org.eclipse.emf.cdo.common"><B>CDOCommonSession.Options.PassiveUpdateMode</B></A> - Enum in <A HREF="./org/eclipse/emf/cdo/common/package-summary.html">org.eclipse.emf.cdo.common</A><DD>Enumerates the possible <A HREF="./org/eclipse/emf/cdo/common/CDOCommonSession.Options.html#getPassiveUpdateMode()"><CODE>passive update modes</CODE></A> of a CDO
- session.<DT><A HREF="./org/eclipse/emf/cdo/common/CDOCommonTransaction.html" title="interface in org.eclipse.emf.cdo.common"><B>CDOCommonTransaction</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/package-summary.html">org.eclipse.emf.cdo.common</A><DD>Abstracts the information about CDO transactions that is common to both client and server side.<DT><A HREF="./org/eclipse/emf/cdo/common/util/CDOCommonUtil.html" title="class in org.eclipse.emf.cdo.common.util"><B>CDOCommonUtil</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/common/util/package-summary.html">org.eclipse.emf.cdo.common.util</A><DD> <DT><A HREF="./org/eclipse/emf/cdo/common/CDOCommonView.html" title="interface in org.eclipse.emf.cdo.common"><B>CDOCommonView</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/package-summary.html">org.eclipse.emf.cdo.common</A><DD>Abstracts the information about CDO views that is common to both client and server side.<DT><A HREF="./org/eclipse/emf/cdo/common/CDOCommonView.Options.html" title="interface in org.eclipse.emf.cdo.common"><B>CDOCommonView.Options</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/package-summary.html">org.eclipse.emf.cdo.common</A><DD>Encapsulates the configuration options of CDO views that are common to both client and server side.<DT><A HREF="./org/eclipse/emf/cdo/common/CDOCommonView.Options.LockNotificationEvent.html" title="interface in org.eclipse.emf.cdo.common"><B>CDOCommonView.Options.LockNotificationEvent</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/package-summary.html">org.eclipse.emf.cdo.common</A><DD> <DT><A HREF="./org/eclipse/emf/cdo/CDOObject.html#cdoConflict()"><B>cdoConflict()</B></A> -
+ session.<DT><A HREF="./org/eclipse/emf/cdo/common/CDOCommonTransaction.html" title="interface in org.eclipse.emf.cdo.common"><B>CDOCommonTransaction</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/package-summary.html">org.eclipse.emf.cdo.common</A><DD>Abstracts the information about CDO transactions that is common to both client and server side.<DT><A HREF="./org/eclipse/emf/cdo/common/util/CDOCommonUtil.html" title="class in org.eclipse.emf.cdo.common.util"><B>CDOCommonUtil</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/common/util/package-summary.html">org.eclipse.emf.cdo.common.util</A><DD> <DT><A HREF="./org/eclipse/emf/cdo/common/CDOCommonView.html" title="interface in org.eclipse.emf.cdo.common"><B>CDOCommonView</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/package-summary.html">org.eclipse.emf.cdo.common</A><DD>Abstracts the information about CDO views that is common to both client and server side.<DT><A HREF="./org/eclipse/emf/cdo/common/CDOCommonView.Options.html" title="interface in org.eclipse.emf.cdo.common"><B>CDOCommonView.Options</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/package-summary.html">org.eclipse.emf.cdo.common</A><DD>Encapsulates the configuration options of CDO views that are common to both client and server side.<DT><A HREF="./org/eclipse/emf/cdo/common/CDOCommonView.Options.LockNotificationEvent.html" title="interface in org.eclipse.emf.cdo.common"><B>CDOCommonView.Options.LockNotificationEvent</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/package-summary.html">org.eclipse.emf.cdo.common</A><DD>An <A HREF="../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/options/IOptionsEvent.html?is-external=true" title="class or interface in org.eclipse.net4j.util.options"><CODE>options event</CODE></A> fired from common view <A HREF="./org/eclipse/emf/cdo/common/CDOCommonView.html#options()"><CODE>options</CODE></A> when the
+ <A HREF="./org/eclipse/emf/cdo/common/CDOCommonView.Options.html#setLockNotificationEnabled(boolean)"><CODE>lock notification enabled</CODE></A> option has changed.<DT><A HREF="./org/eclipse/emf/cdo/CDOObject.html#cdoConflict()"><B>cdoConflict()</B></A> -
Method in interface org.eclipse.emf.cdo.<A HREF="./org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</A>
<DD>Returns <code>true</code> if this object contains local changes that are conflicting with recognized remote
changes, <code>false</code> otherwise.
@@ -1579,7 +1580,7 @@ Method in class org.eclipse.emf.internal.cdo.<A HREF="./org/eclipse/emf/internal been committed or rolled back.<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOTransactionHandler3.html" title="interface in org.eclipse.emf.cdo.transaction"><B>CDOTransactionHandler3</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>A call-back interface that is called by a <A HREF="./org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transcation</CODE></A> when it is about to be committed, has
been committed or rolled back.<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOTransactionHandlerBase.html" title="interface in org.eclipse.emf.cdo.transaction"><B>CDOTransactionHandlerBase</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>A marker interface for use with <A HREF="./org/eclipse/emf/cdo/transaction/CDOTransaction.html#addTransactionHandler(org.eclipse.emf.cdo.transaction.CDOTransactionHandlerBase)"><CODE>CDOTransaction.addTransactionHandler()</CODE></A> and
<A HREF="./org/eclipse/emf/cdo/transaction/CDOTransaction.html#removeTransactionHandler(org.eclipse.emf.cdo.transaction.CDOTransactionHandlerBase)"><CODE>CDOTransaction.removeTransactionHandler()</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOTransactionStartedEvent.html" title="interface in org.eclipse.emf.cdo.transaction"><B>CDOTransactionStartedEvent</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>A <A HREF="./org/eclipse/emf/cdo/view/CDOViewEvent.html" title="interface in org.eclipse.emf.cdo.view"><CODE>view event</CODE></A> fired from a <A HREF="./org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transaction</CODE></A> when it first becomes
- <A HREF="./org/eclipse/emf/cdo/transaction/CDOTransaction.html#isDirty()"><CODE>dirty</CODE></A>.<DT><A HREF="./org/eclipse/emf/spi/cdo/CDOTransactionStrategy.html" title="interface in org.eclipse.emf.spi.cdo"><B>CDOTransactionStrategy</B></A> - Interface in <A HREF="./org/eclipse/emf/spi/cdo/package-summary.html">org.eclipse.emf.spi.cdo</A><DD> <DT><A HREF="./org/eclipse/emf/cdo/common/model/CDOType.html" title="interface in org.eclipse.emf.cdo.common.model"><B>CDOType</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/model/package-summary.html">org.eclipse.emf.cdo.common.model</A><DD> <DT><A HREF="./org/eclipse/emf/cdo/common/revision/delta/CDOUnsetFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta"><B>CDOUnsetFeatureDelta</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/revision/delta/package-summary.html">org.eclipse.emf.cdo.common.revision.delta</A><DD>A <A HREF="./org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta"><CODE>feature delta</CODE></A> that represents the <em>unsetting</em> of the value of a
+ <A HREF="./org/eclipse/emf/cdo/transaction/CDOTransaction.html#isDirty()"><CODE>dirty</CODE></A>.<DT><A HREF="./org/eclipse/emf/spi/cdo/CDOTransactionStrategy.html" title="interface in org.eclipse.emf.spi.cdo"><B>CDOTransactionStrategy</B></A> - Interface in <A HREF="./org/eclipse/emf/spi/cdo/package-summary.html">org.eclipse.emf.spi.cdo</A><DD> <DT><A HREF="./org/eclipse/emf/cdo/common/model/CDOType.html" title="interface in org.eclipse.emf.cdo.common.model"><B>CDOType</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/model/package-summary.html">org.eclipse.emf.cdo.common.model</A><DD>Provides access to all CDO-supported data types.<DT><A HREF="./org/eclipse/emf/cdo/common/revision/delta/CDOUnsetFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta"><B>CDOUnsetFeatureDelta</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/revision/delta/package-summary.html">org.eclipse.emf.cdo.common.revision.delta</A><DD>A <A HREF="./org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta"><CODE>feature delta</CODE></A> that represents the <em>unsetting</em> of the value of a
<A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.7.0/org/eclipse/emf/ecore/EStructuralFeature.html?is-external=true" title="class or interface in org.eclipse.emf.ecore"><CODE>feature</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/util/CDOUpdatable.html" title="interface in org.eclipse.emf.cdo.util"><B>CDOUpdatable</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/util/package-summary.html">org.eclipse.emf.cdo.util</A><DD> <DT><A HREF="./org/eclipse/emf/cdo/util/CDOURIData.html" title="class in org.eclipse.emf.cdo.util"><B>CDOURIData</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/util/package-summary.html">org.eclipse.emf.cdo.util</A><DD> <DT><A HREF="./org/eclipse/emf/cdo/util/CDOURIData.html#CDOURIData()"><B>CDOURIData()</B></A> -
Constructor for 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>
@@ -8492,7 +8493,7 @@ Static method in class org.eclipse.emf.cdo.spi.server.<A HREF="./org/eclipse/emf <DD>
<DT><A HREF="./org/eclipse/emf/cdo/common/lock/IDurableLockingManager.html" title="interface in org.eclipse.emf.cdo.common.lock"><B>IDurableLockingManager</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/lock/package-summary.html">org.eclipse.emf.cdo.common.lock</A><DD>Manages all aspects of durable CDO views like persisting informations like <A HREF="./org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch"><CODE>branch point</CODE></A> and
acquired locks.<DT><A HREF="./org/eclipse/emf/cdo/common/lock/IDurableLockingManager.LockArea.html" title="interface in org.eclipse.emf.cdo.common.lock"><B>IDurableLockingManager.LockArea</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/lock/package-summary.html">org.eclipse.emf.cdo.common.lock</A><DD>Encapsulates the persistable information about a single durable CDO view like <A HREF="./org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch"><CODE>branch point</CODE></A>
- and acquired locks.<DT><A HREF="./org/eclipse/emf/cdo/common/lock/IDurableLockingManager.LockArea.Handler.html" title="interface in org.eclipse.emf.cdo.common.lock"><B>IDurableLockingManager.LockArea.Handler</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/lock/package-summary.html">org.eclipse.emf.cdo.common.lock</A><DD>A call-back interface for <em>handling</em> <A HREF="./org/eclipse/emf/cdo/common/lock/IDurableLockingManager.LockArea.html" title="interface in org.eclipse.emf.cdo.common.lock"><CODE>lock area</CODE></A> objects.<DT><A HREF="./org/eclipse/emf/cdo/common/lock/IDurableLockingManager.LockAreaAlreadyExistsException.html" title="class in org.eclipse.emf.cdo.common.lock"><B>IDurableLockingManager.LockAreaAlreadyExistsException</B></A> - Exception in <A HREF="./org/eclipse/emf/cdo/common/lock/package-summary.html">org.eclipse.emf.cdo.common.lock</A><DD> <DT><A HREF="./org/eclipse/emf/cdo/common/lock/IDurableLockingManager.LockAreaAlreadyExistsException.html#IDurableLockingManager.LockAreaAlreadyExistsException(java.lang.String)"><B>IDurableLockingManager.LockAreaAlreadyExistsException(String)</B></A> -
+ and acquired locks.<DT><A HREF="./org/eclipse/emf/cdo/common/lock/IDurableLockingManager.LockArea.Handler.html" title="interface in org.eclipse.emf.cdo.common.lock"><B>IDurableLockingManager.LockArea.Handler</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/lock/package-summary.html">org.eclipse.emf.cdo.common.lock</A><DD>A call-back interface for <em>handling</em> <A HREF="./org/eclipse/emf/cdo/common/lock/IDurableLockingManager.LockArea.html" title="interface in org.eclipse.emf.cdo.common.lock"><CODE>lock area</CODE></A> objects.<DT><A HREF="./org/eclipse/emf/cdo/common/lock/IDurableLockingManager.LockAreaAlreadyExistsException.html" title="class in org.eclipse.emf.cdo.common.lock"><B>IDurableLockingManager.LockAreaAlreadyExistsException</B></A> - Exception in <A HREF="./org/eclipse/emf/cdo/common/lock/package-summary.html">org.eclipse.emf.cdo.common.lock</A><DD>Exception occurs when attempting to create a durable <A HREF="./org/eclipse/emf/cdo/common/lock/IDurableLockingManager.LockArea.html" title="interface in org.eclipse.emf.cdo.common.lock"><CODE>IDurableLockingManager.LockArea</CODE></A> that already exists.<DT><A HREF="./org/eclipse/emf/cdo/common/lock/IDurableLockingManager.LockAreaAlreadyExistsException.html#IDurableLockingManager.LockAreaAlreadyExistsException(java.lang.String)"><B>IDurableLockingManager.LockAreaAlreadyExistsException(String)</B></A> -
Constructor for exception org.eclipse.emf.cdo.common.lock.<A HREF="./org/eclipse/emf/cdo/common/lock/IDurableLockingManager.LockAreaAlreadyExistsException.html" title="class in org.eclipse.emf.cdo.common.lock">IDurableLockingManager.LockAreaAlreadyExistsException</A>
<DD>
<DT><A HREF="./org/eclipse/emf/cdo/common/lock/IDurableLockingManager.LockAreaNotFoundException.html" title="class in org.eclipse.emf.cdo.common.lock"><B>IDurableLockingManager.LockAreaNotFoundException</B></A> - Exception in <A HREF="./org/eclipse/emf/cdo/common/lock/package-summary.html">org.eclipse.emf.cdo.common.lock</A><DD>Thrown if a <A HREF="./org/eclipse/emf/cdo/common/lock/IDurableLockingManager.LockArea.html" title="interface in org.eclipse.emf.cdo.common.lock"><CODE>lock area</CODE></A> is spcified that does not exist in a CDO <A HREF="./org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common"><CODE>repository</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/common/lock/IDurableLockingManager.LockAreaNotFoundException.html#IDurableLockingManager.LockAreaNotFoundException(java.lang.String)"><B>IDurableLockingManager.LockAreaNotFoundException(String)</B></A> -
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/CDOCommonView.Options.LockNotificationEvent.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/CDOCommonView.Options.LockNotificationEvent.html index ce1b718af6..cf6cb7e0df 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/CDOCommonView.Options.LockNotificationEvent.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/CDOCommonView.Options.LockNotificationEvent.html @@ -100,9 +100,9 @@ Interface CDOCommonView.Options.LockNotificationEvent</H2> <DL>
<DT><PRE>public static interface <B>CDOCommonView.Options.LockNotificationEvent</B><DT>extends <A HREF="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/options/IOptionsEvent.html?is-external=true" title="class or interface in org.eclipse.net4j.util.options">IOptionsEvent</A></DL>
</PRE><map id="APIVIZ" name="APIVIZ">
-<area shape="rect" id="node1" title="«interface» IOptionsEvent (org.eclipse.net4j.util.options)" alt="" coords="5,6,197,61"/>
-<area shape="rect" id="node2" href="CDOCommonView.Options.LockNotificationEvent.html" title="«interface» CDOCommonView.Options.LockNotificationEvent" alt="" coords="55,100,361,140"/>
-<area shape="rect" id="node3" href="CDOCommonView.Options.html" title="«interface» CDOCommonView.Options" alt="" coords="227,13,405,53"/>
+<area shape="rect" id="node1" title="«interface» IOptionsEvent (org.eclipse.net4j.util.options)" alt="" coords="63,6,255,61"/>
+<area shape="rect" id="node2" href="CDOCommonView.Options.LockNotificationEvent.html" title="«interface» CDOCommonView.Options.LockNotificationEvent" alt="" coords="5,104,312,144"/>
+<area shape="rect" id="node3" href="CDOCommonView.Options.html" title="«interface» CDOCommonView.Options" alt="" coords="69,200,248,240"/>
</map>
<CENTER><IMG SRC="CDOCommonView.Options.LockNotificationEvent.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
@@ -110,6 +110,19 @@ Interface CDOCommonView.Options.LockNotificationEvent</H2> <P>
+An <A HREF="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/options/IOptionsEvent.html?is-external=true" title="class or interface in org.eclipse.net4j.util.options"><CODE>options event</CODE></A> fired from common view <A HREF="../../../../../org/eclipse/emf/cdo/common/CDOCommonView.html#options()"><CODE>options</CODE></A> when the
+ <A HREF="../../../../../org/eclipse/emf/cdo/common/CDOCommonView.Options.html#setLockNotificationEnabled(boolean)"><CODE>lock notification enabled</CODE></A> option has changed.
+<P>
+
+<P>
+<DL>
+<DT><B>Since:</B></DT>
+ <DD>4.1</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>
<P>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/CDOCommonView.Options.LockNotificationEvent.png b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/CDOCommonView.Options.LockNotificationEvent.png Binary files differindex d56ad44d04..e80f82f3fc 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/CDOCommonView.Options.LockNotificationEvent.png +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/CDOCommonView.Options.LockNotificationEvent.png diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/CDOCommonView.Options.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/CDOCommonView.Options.html index 18e32304aa..4c230fa644 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/CDOCommonView.Options.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/CDOCommonView.Options.html @@ -103,11 +103,11 @@ Interface CDOCommonView.Options</H2> <DL>
<DT><PRE>public static interface <B>CDOCommonView.Options</B><DT>extends <A HREF="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/options/IOptions.html?is-external=true" title="class or interface in org.eclipse.net4j.util.options">IOptions</A></DL>
</PRE><map id="APIVIZ" name="APIVIZ">
-<area shape="rect" id="node1" title="«interface» IOptions (org.eclipse.net4j.util.options)" alt="" coords="33,6,225,61"/>
-<area shape="rect" id="node2" href="../view/CDOView.Options.html" title="«interface» CDOView.Options (org.eclipse.emf.cdo.view)" alt="" coords="5,179,176,234"/>
-<area shape="rect" id="node3" href="CDOCommonView.Options.LockNotificationEvent.html" title="«interface» CDOCommonView.Options.LockNotificationEvent" alt="" coords="205,187,512,227"/>
-<area shape="rect" id="node4" href="CDOCommonView.Options.html" title="«interface» CDOCommonView.Options" alt="" coords="135,100,313,140"/>
-<area shape="rect" id="node5" href="CDOCommonView.html" title="«interface» CDOCommonView" alt="" coords="255,13,385,53"/>
+<area shape="rect" id="node1" title="«interface» IOptions (org.eclipse.net4j.util.options)" alt="" coords="5,6,197,61"/>
+<area shape="rect" id="node2" href="../view/CDOView.Options.html" title="«interface» CDOView.Options (org.eclipse.emf.cdo.view)" alt="" coords="295,201,465,255"/>
+<area shape="rect" id="node3" href="CDOCommonView.Options.LockNotificationEvent.html" title="«interface» CDOCommonView.Options.LockNotificationEvent" alt="" coords="227,13,533,53"/>
+<area shape="rect" id="node4" href="CDOCommonView.Options.html" title="«interface» CDOCommonView.Options" alt="" coords="291,117,469,157"/>
+<area shape="rect" id="node5" href="CDOCommonView.html" title="«interface» CDOCommonView" alt="" coords="563,13,693,53"/>
</map>
<CENTER><IMG SRC="CDOCommonView.Options.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
@@ -144,7 +144,8 @@ Encapsulates the configuration options of CDO views that are common to both clie <TD><CODE><B><A HREF="../../../../../org/eclipse/emf/cdo/common/CDOCommonView.Options.LockNotificationEvent.html" title="interface in org.eclipse.emf.cdo.common">CDOCommonView.Options.LockNotificationEvent</A></B></CODE>
<BR>
- </TD>
+ An <A HREF="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/options/IOptionsEvent.html?is-external=true" title="class or interface in org.eclipse.net4j.util.options"><CODE>options event</CODE></A> fired from common view <A HREF="../../../../../org/eclipse/emf/cdo/common/CDOCommonView.html#options()"><CODE>options</CODE></A> when the
+ <A HREF="../../../../../org/eclipse/emf/cdo/common/CDOCommonView.Options.html#setLockNotificationEnabled(boolean)"><CODE>lock notification enabled</CODE></A> option has changed.</TD>
</TR>
</TABLE>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/CDOCommonView.Options.png b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/CDOCommonView.Options.png Binary files differindex 8d0dbfe574..ac715e7c8d 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/CDOCommonView.Options.png +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/CDOCommonView.Options.png diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lock/IDurableLockingManager.LockAreaAlreadyExistsException.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lock/IDurableLockingManager.LockAreaAlreadyExistsException.html index 3445a7af5a..adf7a43849 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lock/IDurableLockingManager.LockAreaAlreadyExistsException.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lock/IDurableLockingManager.LockAreaAlreadyExistsException.html @@ -117,6 +117,10 @@ Class IDurableLockingManager.LockAreaAlreadyExistsException</H2> <P>
+Exception occurs when attempting to create a durable <A HREF="../../../../../../org/eclipse/emf/cdo/common/lock/IDurableLockingManager.LockArea.html" title="interface in org.eclipse.emf.cdo.common.lock"><CODE>IDurableLockingManager.LockArea</CODE></A> that already exists.
+<P>
+
+<P>
<DL>
<DT><B>Since:</B></DT>
<DD>4.1</DD>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lock/IDurableLockingManager.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lock/IDurableLockingManager.html index a5f0b0f5fd..63980d7750 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lock/IDurableLockingManager.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lock/IDurableLockingManager.html @@ -144,7 +144,7 @@ Manages all aspects of durable CDO views like persisting informations like <A HR <TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/cdo/common/lock/IDurableLockingManager.LockAreaAlreadyExistsException.html" title="class in org.eclipse.emf.cdo.common.lock">IDurableLockingManager.LockAreaAlreadyExistsException</A></B></CODE>
<BR>
- </TD>
+ Exception occurs when attempting to create a durable <A HREF="../../../../../../org/eclipse/emf/cdo/common/lock/IDurableLockingManager.LockArea.html" title="interface in org.eclipse.emf.cdo.common.lock"><CODE>IDurableLockingManager.LockArea</CODE></A> that already exists.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lock/package-summary.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lock/package-summary.html index 8d31eb680c..959c822af1 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lock/package-summary.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lock/package-summary.html @@ -185,7 +185,7 @@ Common concepts for dealing with durable locks and views. </TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../../org/eclipse/emf/cdo/common/lock/IDurableLockingManager.LockAreaAlreadyExistsException.html" title="class in org.eclipse.emf.cdo.common.lock">IDurableLockingManager.LockAreaAlreadyExistsException</A></B></TD>
-<TD> </TD>
+<TD>Exception occurs when attempting to create a durable <A HREF="../../../../../../org/eclipse/emf/cdo/common/lock/IDurableLockingManager.LockArea.html" title="interface in org.eclipse.emf.cdo.common.lock"><CODE>IDurableLockingManager.LockArea</CODE></A> that already exists.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../../org/eclipse/emf/cdo/common/lock/IDurableLockingManager.LockAreaNotFoundException.html" title="class in org.eclipse.emf.cdo.common.lock">IDurableLockingManager.LockAreaNotFoundException</A></B></TD>
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 a8c8290b8d..d07b01b6c7 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 @@ -197,7 +197,7 @@ Classes in <A HREF="../../../../../../org/eclipse/emf/cdo/common/lock/package-su <TD><B><A HREF="../../../../../../org/eclipse/emf/cdo/common/lock/class-use/IDurableLockingManager.LockAreaAlreadyExistsException.html#org.eclipse.emf.cdo.common.lock"><B>IDurableLockingManager.LockAreaAlreadyExistsException</B></A></B>
<BR>
- </TD>
+ Exception occurs when attempting to create a durable <A HREF="../../../../../../org/eclipse/emf/cdo/common/lock/IDurableLockingManager.LockArea.html" title="interface in org.eclipse.emf.cdo.common.lock"><CODE>IDurableLockingManager.LockArea</CODE></A> that already exists.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../../org/eclipse/emf/cdo/common/lock/class-use/IDurableLockingManager.LockAreaNotFoundException.html#org.eclipse.emf.cdo.common.lock"><B>IDurableLockingManager.LockAreaNotFoundException</B></A></B>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOType.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOType.html index 782cf0c6d6..2033819603 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOType.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/CDOType.html @@ -103,6 +103,10 @@ Interface CDOType</H2> <P>
+Provides access to all CDO-supported data types.
+<P>
+
+<P>
<DL>
<DT><B>Since:</B></DT>
<DD>2.0</DD>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/package-summary.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/package-summary.html index f87aaeaa98..b7fdc9f1c3 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/package-summary.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/package-summary.html @@ -149,7 +149,7 @@ Common concepts for dealing with models and types. </TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../../org/eclipse/emf/cdo/common/model/CDOType.html" title="interface in org.eclipse.emf.cdo.common.model">CDOType</A></B></TD>
-<TD> </TD>
+<TD>Provides access to all CDO-supported data types.</TD>
</TR>
</TABLE>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/package-use.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/package-use.html index 62b1309b34..55b6840d7a 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/package-use.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/package-use.html @@ -275,7 +275,7 @@ Classes in <A HREF="../../../../../../org/eclipse/emf/cdo/common/model/package-s <TD><B><A HREF="../../../../../../org/eclipse/emf/cdo/common/model/class-use/CDOType.html#org.eclipse.emf.cdo.common.model"><B>CDOType</B></A></B>
<BR>
- </TD>
+ Provides access to all CDO-supported data types.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../../org/eclipse/emf/cdo/common/model/class-use/EMFUtil.ExtResourceSet.html#org.eclipse.emf.cdo.common.model"><B>EMFUtil.ExtResourceSet</B></A></B>
@@ -329,7 +329,7 @@ Classes in <A HREF="../../../../../../org/eclipse/emf/cdo/common/model/package-s <TD><B><A HREF="../../../../../../org/eclipse/emf/cdo/common/model/class-use/CDOType.html#org.eclipse.emf.cdo.common.protocol"><B>CDOType</B></A></B>
<BR>
- </TD>
+ Provides access to all CDO-supported data types.</TD>
</TR>
</TABLE>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/package-summary.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/package-summary.html index 980fe3ae6b..7aa7ddfb35 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/package-summary.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/package-summary.html @@ -155,7 +155,8 @@ Common concepts that are differently extended in clients and servers. </TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/cdo/common/CDOCommonView.Options.LockNotificationEvent.html" title="interface in org.eclipse.emf.cdo.common">CDOCommonView.Options.LockNotificationEvent</A></B></TD>
-<TD> </TD>
+<TD>An <A HREF="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/options/IOptionsEvent.html?is-external=true" title="class or interface in org.eclipse.net4j.util.options"><CODE>options event</CODE></A> fired from common view <A HREF="../../../../../org/eclipse/emf/cdo/common/CDOCommonView.html#options()"><CODE>options</CODE></A> when the
+ <A HREF="../../../../../org/eclipse/emf/cdo/common/CDOCommonView.Options.html#setLockNotificationEnabled(boolean)"><CODE>lock notification enabled</CODE></A> option has changed.</TD>
</TR>
</TABLE>
diff --git a/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/SortListItems.java b/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/SortListItems.java index edb98bc195..c9a951f895 100644 --- a/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/SortListItems.java +++ b/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/SortListItems.java @@ -22,7 +22,9 @@ import java.util.List; /**
* @author Eike Stepper
+ * @deprecated Does not catch all problems with tree generation.
*/
+@Deprecated
public class SortListItems
{
private static final String NL = System.getProperty("line.separator");
diff --git a/plugins/org.eclipse.emf.cdo/.settings/.api_filters b/plugins/org.eclipse.emf.cdo/.settings/.api_filters index 19ffeb033c..db1dc5a552 100644 --- a/plugins/org.eclipse.emf.cdo/.settings/.api_filters +++ b/plugins/org.eclipse.emf.cdo/.settings/.api_filters @@ -193,6 +193,14 @@ </message_arguments>
</filter>
</resource>
+ <resource path="src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java" type="org.eclipse.emf.internal.cdo.view.CDOViewImpl$OptionsImpl$LockNotificationEventImpl">
+ <filter id="574619656">
+ <message_arguments>
+ <message_argument value="LockNotificationEvent"/>
+ <message_argument value="LockNotificationEventImpl"/>
+ </message_arguments>
+ </filter>
+ </resource>
<resource path="src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java" type="org.eclipse.emf.spi.cdo.CDOSessionProtocol">
<filter id="571473929">
<message_arguments>
|
