diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo')
20 files changed, 92 insertions, 59 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/net4j/RecoveringCDOSessionConfiguration.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/net4j/RecoveringCDOSessionConfiguration.html index b176b704a5..13d9e2cf81 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/net4j/RecoveringCDOSessionConfiguration.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/net4j/RecoveringCDOSessionConfiguration.html @@ -118,7 +118,7 @@ var activeTableTab = "activeTableTab"; <pre>public interface <span class="typeNameLabel">RecoveringCDOSessionConfiguration</span> extends <a href="../../../../../org/eclipse/emf/cdo/net4j/CDOSessionConfiguration.html" title="interface in org.eclipse.emf.cdo.net4j">CDOSessionConfiguration</a></pre> <div class="block">A <a href="../../../../../org/eclipse/emf/cdo/net4j/CDONet4jSessionConfiguration.html" title="interface in org.eclipse.emf.cdo.net4j"><code>session configuration</code></a> that uses a <a href="../../../../../../../org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/signal/heartbeat/HeartBeatProtocol.html?is-external=true" title="class or interface in org.eclipse.net4j.signal.heartbeat"><code>heart beat - protocol</code></a> to detect network problems. Subtypes specify the exact behaviour to recover from these problems.</div> + protocol</code></a> to detect network problems. Subtypes specify the exact behavior to recover from these problems.</div> <dl> <dt><span class="simpleTagLabel">Since:</span></dt> <dd>4.0</dd> diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOAutoAttacher.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOAutoAttacher.html index aa6aed414e..f43dfa8f5b 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOAutoAttacher.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOAutoAttacher.html @@ -253,7 +253,7 @@ extends <a href="../../../../../org/eclipse/emf/cdo/transaction/CDODefaultTransa <pre>public void attachingObject(<a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransaction</a> transaction, <a href="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</a> object)</pre> <div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler1.html#attachingObject-org.eclipse.emf.cdo.transaction.CDOTransaction-org.eclipse.emf.cdo.CDOObject-">CDODefaultTransactionHandler1</a></code></span></div> -<div class="block">This implementation does nothing. Clients may override to provide specialized behaviour.</div> +<div class="block">This implementation does nothing. Clients may override to provide specialized behavior.</div> <dl> <dt><span class="overrideSpecifyLabel">Specified by:</span></dt> <dd><code><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html#attachingObject-org.eclipse.emf.cdo.transaction.CDOTransaction-org.eclipse.emf.cdo.CDOObject-">attachingObject</a></code> in interface <code><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransactionHandler1</a></code></dd> @@ -272,7 +272,7 @@ extends <a href="../../../../../org/eclipse/emf/cdo/transaction/CDODefaultTransa <a href="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</a> object, <a href="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOFeatureDelta</a> featureChange)</pre> <div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler1.html#modifyingObject-org.eclipse.emf.cdo.transaction.CDOTransaction-org.eclipse.emf.cdo.CDOObject-org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta-">CDODefaultTransactionHandler1</a></code></span></div> -<div class="block">This implementation does nothing. Clients may override to provide specialized behaviour.</div> +<div class="block">This implementation does nothing. Clients may override to provide specialized behavior.</div> <dl> <dt><span class="overrideSpecifyLabel">Specified by:</span></dt> <dd><code><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html#modifyingObject-org.eclipse.emf.cdo.transaction.CDOTransaction-org.eclipse.emf.cdo.CDOObject-org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta-">modifyingObject</a></code> in interface <code><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransactionHandler1</a></code></dd> diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOAutoLocker.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOAutoLocker.html index c638fa9b5b..376af4c6c9 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOAutoLocker.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOAutoLocker.html @@ -241,7 +241,7 @@ extends <a href="../../../../../org/eclipse/emf/cdo/transaction/CDODefaultTransa <a href="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</a> object, <a href="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOFeatureDelta</a> featureChange)</pre> <div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler1.html#modifyingObject-org.eclipse.emf.cdo.transaction.CDOTransaction-org.eclipse.emf.cdo.CDOObject-org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta-">CDODefaultTransactionHandler1</a></code></span></div> -<div class="block">This implementation does nothing. Clients may override to provide specialized behaviour.</div> +<div class="block">This implementation does nothing. Clients may override to provide specialized behavior.</div> <dl> <dt><span class="overrideSpecifyLabel">Specified by:</span></dt> <dd><code><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html#modifyingObject-org.eclipse.emf.cdo.transaction.CDOTransaction-org.eclipse.emf.cdo.CDOObject-org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta-">modifyingObject</a></code> in interface <code><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransactionHandler1</a></code></dd> diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOConflictResolver.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOConflictResolver.html index ce8a42e3dc..c98da96633 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOConflictResolver.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOConflictResolver.html @@ -118,7 +118,7 @@ var activeTableTab = "activeTableTab"; <hr> <br> <pre>public interface <span class="typeNameLabel">CDOConflictResolver</span></pre> -<div class="block">A strategy used to customize the default conflict resolution behaviour of <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><code>transactions</code></a>.</div> +<div class="block">A strategy used to customize the default conflict resolution behavior of <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><code>transactions</code></a>.</div> <dl> <dt><span class="simpleTagLabel">Since:</span></dt> <dd>2.0</dd> diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOConflictResolver2.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOConflictResolver2.html index e0bb7256a6..b386ed1903 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOConflictResolver2.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOConflictResolver2.html @@ -116,7 +116,7 @@ var activeTableTab = "activeTableTab"; <br> <pre>public interface <span class="typeNameLabel">CDOConflictResolver2</span> extends <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOConflictResolver.html" title="interface in org.eclipse.emf.cdo.transaction">CDOConflictResolver</a></pre> -<div class="block">A strategy used to customize the default conflict resolution behaviour of <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><code>transactions</code></a>.</div> +<div class="block">A strategy used to customize the default conflict resolution behavior of <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><code>transactions</code></a>.</div> <dl> <dt><span class="simpleTagLabel">Since:</span></dt> <dd>4.0</dd> @@ -200,7 +200,7 @@ extends <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOConflictResol <dt><span class="paramLabel">Parameters:</span></dt> <dd><code>conflicts</code> - A map that contains the local objects with conflicts as the keys. Each value in this map is a <a href="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/Pair.html?is-external=true" title="class or interface in org.eclipse.net4j.util.collection"><code>pair</code></a> that <b>optionally</b> contains the old local revision (<i>ancestor</i>) as element1 and the remote delta as element2. Any of the pair elements can be <code>null</code> if it is not possible to determine it - locally (depends on local revision caching and server behaviour regarding transmission of deltas instead + locally (depends on local revision caching and server behavior regarding transmission of deltas instead of invalidations).</dd> </dl> </li> diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOConflictResolver3.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOConflictResolver3.html index 80443a6330..6591303d0e 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOConflictResolver3.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOConflictResolver3.html @@ -111,7 +111,7 @@ var activeTableTab = "activeTableTab"; <br> <pre>public interface <span class="typeNameLabel">CDOConflictResolver3</span> extends <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOConflictResolver.html" title="interface in org.eclipse.emf.cdo.transaction">CDOConflictResolver</a></pre> -<div class="block">A strategy used to customize the default conflict resolution behaviour of <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><code>transactions</code></a>.</div> +<div class="block">A strategy used to customize the default conflict resolution behavior of <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><code>transactions</code></a>.</div> <dl> <dt><span class="simpleTagLabel">Since:</span></dt> <dd>4.4</dd> diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler.html index f81b69a5f8..714bded902 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler.html @@ -249,7 +249,7 @@ implements <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactio <h4>committingTransaction</h4> <pre>public void committingTransaction(<a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransaction</a> transaction, <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOCommitContext.html" title="interface in org.eclipse.emf.cdo.transaction">CDOCommitContext</a> commitContext)</pre> -<div class="block">This implementation does nothing. Clients may override to provide specialized behaviour.</div> +<div class="block">This implementation does nothing. Clients may override to provide specialized behavior.</div> <dl> <dt><span class="overrideSpecifyLabel">Specified by:</span></dt> <dd><code><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html#committingTransaction-org.eclipse.emf.cdo.transaction.CDOTransaction-org.eclipse.emf.cdo.transaction.CDOCommitContext-">committingTransaction</a></code> in interface <code><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransactionHandler2</a></code></dd> @@ -264,7 +264,7 @@ implements <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactio <h4>committedTransaction</h4> <pre>public void committedTransaction(<a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransaction</a> transaction, <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOCommitContext.html" title="interface in org.eclipse.emf.cdo.transaction">CDOCommitContext</a> commitContext)</pre> -<div class="block">This implementation does nothing. Clients may override to provide specialized behaviour.</div> +<div class="block">This implementation does nothing. Clients may override to provide specialized behavior.</div> <dl> <dt><span class="overrideSpecifyLabel">Specified by:</span></dt> <dd><code><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html#committedTransaction-org.eclipse.emf.cdo.transaction.CDOTransaction-org.eclipse.emf.cdo.transaction.CDOCommitContext-">committedTransaction</a></code> in interface <code><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransactionHandler2</a></code></dd> @@ -278,7 +278,7 @@ implements <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactio <li class="blockList"> <h4>rolledBackTransaction</h4> <pre>public void rolledBackTransaction(<a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransaction</a> transaction)</pre> -<div class="block">This implementation does nothing. Clients may override to provide specialized behaviour.</div> +<div class="block">This implementation does nothing. Clients may override to provide specialized behavior.</div> <dl> <dt><span class="overrideSpecifyLabel">Specified by:</span></dt> <dd><code><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html#rolledBackTransaction-org.eclipse.emf.cdo.transaction.CDOTransaction-">rolledBackTransaction</a></code> in interface <code><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransactionHandler2</a></code></dd> diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler1.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler1.html index ae7e370632..3c6cba0f34 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler1.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler1.html @@ -242,7 +242,7 @@ implements <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactio <h4>attachingObject</h4> <pre>public void attachingObject(<a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransaction</a> transaction, <a href="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</a> object)</pre> -<div class="block">This implementation does nothing. Clients may override to provide specialized behaviour.</div> +<div class="block">This implementation does nothing. Clients may override to provide specialized behavior.</div> <dl> <dt><span class="overrideSpecifyLabel">Specified by:</span></dt> <dd><code><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html#attachingObject-org.eclipse.emf.cdo.transaction.CDOTransaction-org.eclipse.emf.cdo.CDOObject-">attachingObject</a></code> in interface <code><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransactionHandler1</a></code></dd> @@ -257,7 +257,7 @@ implements <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactio <h4>detachingObject</h4> <pre>public void detachingObject(<a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransaction</a> transaction, <a href="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</a> object)</pre> -<div class="block">This implementation does nothing. Clients may override to provide specialized behaviour.</div> +<div class="block">This implementation does nothing. Clients may override to provide specialized behavior.</div> <dl> <dt><span class="overrideSpecifyLabel">Specified by:</span></dt> <dd><code><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html#detachingObject-org.eclipse.emf.cdo.transaction.CDOTransaction-org.eclipse.emf.cdo.CDOObject-">detachingObject</a></code> in interface <code><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransactionHandler1</a></code></dd> @@ -273,7 +273,7 @@ implements <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactio <pre>public void modifyingObject(<a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransaction</a> transaction, <a href="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</a> object, <a href="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOFeatureDelta</a> featureChange)</pre> -<div class="block">This implementation does nothing. Clients may override to provide specialized behaviour.</div> +<div class="block">This implementation does nothing. Clients may override to provide specialized behavior.</div> <dl> <dt><span class="overrideSpecifyLabel">Specified by:</span></dt> <dd><code><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html#modifyingObject-org.eclipse.emf.cdo.transaction.CDOTransaction-org.eclipse.emf.cdo.CDOObject-org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta-">modifyingObject</a></code> in interface <code><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransactionHandler1</a></code></dd> diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler2.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler2.html index 75f4fe025e..0294005c50 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler2.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler2.html @@ -229,7 +229,7 @@ implements <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactio <h4>committingTransaction</h4> <pre>public void committingTransaction(<a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransaction</a> transaction, <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOCommitContext.html" title="interface in org.eclipse.emf.cdo.transaction">CDOCommitContext</a> commitContext)</pre> -<div class="block">This implementation does nothing. Clients may override to provide specialized behaviour.</div> +<div class="block">This implementation does nothing. Clients may override to provide specialized behavior.</div> <dl> <dt><span class="overrideSpecifyLabel">Specified by:</span></dt> <dd><code><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html#committingTransaction-org.eclipse.emf.cdo.transaction.CDOTransaction-org.eclipse.emf.cdo.transaction.CDOCommitContext-">committingTransaction</a></code> in interface <code><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransactionHandler2</a></code></dd> @@ -243,7 +243,7 @@ implements <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactio <li class="blockList"> <h4>rolledBackTransaction</h4> <pre>public void rolledBackTransaction(<a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransaction</a> transaction)</pre> -<div class="block">This implementation does nothing. Clients may override to provide specialized behaviour.</div> +<div class="block">This implementation does nothing. Clients may override to provide specialized behavior.</div> <dl> <dt><span class="overrideSpecifyLabel">Specified by:</span></dt> <dd><code><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html#rolledBackTransaction-org.eclipse.emf.cdo.transaction.CDOTransaction-">rolledBackTransaction</a></code> in interface <code><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransactionHandler2</a></code></dd> @@ -258,7 +258,7 @@ implements <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactio <h4>committedTransaction</h4> <pre>public void committedTransaction(<a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransaction</a> transaction, <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOCommitContext.html" title="interface in org.eclipse.emf.cdo.transaction">CDOCommitContext</a> commitContext)</pre> -<div class="block">This implementation does nothing. Clients may override to provide specialized behaviour.</div> +<div class="block">This implementation does nothing. Clients may override to provide specialized behavior.</div> <dl> <dt><span class="overrideSpecifyLabel">Specified by:</span></dt> <dd><code><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html#committedTransaction-org.eclipse.emf.cdo.transaction.CDOTransaction-org.eclipse.emf.cdo.transaction.CDOCommitContext-">committedTransaction</a></code> in interface <code><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransactionHandler2</a></code></dd> diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler3.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler3.html index 8f01da9fe1..58aa609248 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler3.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler3.html @@ -237,7 +237,7 @@ implements <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactio <h4>committingTransaction</h4> <pre>public void committingTransaction(<a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransaction</a> transaction, <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOCommitContext.html" title="interface in org.eclipse.emf.cdo.transaction">CDOCommitContext</a> commitContext)</pre> -<div class="block">This implementation does nothing. Clients may override to provide specialized behaviour.</div> +<div class="block">This implementation does nothing. Clients may override to provide specialized behavior.</div> <dl> <dt><span class="overrideSpecifyLabel">Specified by:</span></dt> <dd><code><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html#committingTransaction-org.eclipse.emf.cdo.transaction.CDOTransaction-org.eclipse.emf.cdo.transaction.CDOCommitContext-">committingTransaction</a></code> in interface <code><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransactionHandler2</a></code></dd> @@ -275,7 +275,7 @@ public void committedTransaction(<a href="../../../../../org/eclipse/e <pre>public void committedTransaction(<a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransaction</a> transaction, <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOCommitContext.html" title="interface in org.eclipse.emf.cdo.transaction">CDOCommitContext</a> commitContext, <a href="../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</a> result)</pre> -<div class="block">This implementation does nothing. Clients may override to provide specialized behaviour.</div> +<div class="block">This implementation does nothing. Clients may override to provide specialized behavior.</div> <dl> <dt><span class="overrideSpecifyLabel">Specified by:</span></dt> <dd><code><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler3.html#committedTransaction-org.eclipse.emf.cdo.transaction.CDOTransaction-org.eclipse.emf.cdo.transaction.CDOCommitContext-org.eclipse.emf.cdo.common.commit.CDOCommitInfo-">committedTransaction</a></code> in interface <code><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler3.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransactionHandler3</a></code></dd> @@ -289,7 +289,7 @@ public void committedTransaction(<a href="../../../../../org/eclipse/e <li class="blockList"> <h4>rolledBackTransaction</h4> <pre>public void rolledBackTransaction(<a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransaction</a> transaction)</pre> -<div class="block">This implementation does nothing. Clients may override to provide specialized behaviour.</div> +<div class="block">This implementation does nothing. Clients may override to provide specialized behavior.</div> <dl> <dt><span class="overrideSpecifyLabel">Specified by:</span></dt> <dd><code><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html#rolledBackTransaction-org.eclipse.emf.cdo.transaction.CDOTransaction-">rolledBackTransaction</a></code> in interface <code><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransactionHandler2</a></code></dd> diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOConflictResolver.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOConflictResolver.html index 2e898aed9e..4daacc073f 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOConflictResolver.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOConflictResolver.html @@ -118,13 +118,13 @@ <tr class="rowColor"> <td class="colFirst"><code>interface </code></td> <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/cdo/transaction/CDOConflictResolver2.html" title="interface in org.eclipse.emf.cdo.transaction">CDOConflictResolver2</a></span></code> -<div class="block">A strategy used to customize the default conflict resolution behaviour of <a href="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><code>transactions</code></a>.</div> +<div class="block">A strategy used to customize the default conflict resolution behavior of <a href="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><code>transactions</code></a>.</div> </td> </tr> <tr class="altColor"> <td class="colFirst"><code>interface </code></td> <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/cdo/transaction/CDOConflictResolver3.html" title="interface in org.eclipse.emf.cdo.transaction">CDOConflictResolver3</a></span></code> -<div class="block">A strategy used to customize the default conflict resolution behaviour of <a href="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><code>transactions</code></a>.</div> +<div class="block">A strategy used to customize the default conflict resolution behavior of <a href="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><code>transactions</code></a>.</div> </td> </tr> </tbody> diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/package-summary.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/package-summary.html index c4dd85aa5f..7f561a3475 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/package-summary.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/package-summary.html @@ -137,7 +137,7 @@ <tr class="rowColor"> <td class="colFirst"><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOConflictResolver.html" title="interface in org.eclipse.emf.cdo.transaction">CDOConflictResolver</a></td> <td class="colLast"> -<div class="block">A strategy used to customize the default conflict resolution behaviour of <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><code>transactions</code></a>.</div> +<div class="block">A strategy used to customize the default conflict resolution behavior of <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><code>transactions</code></a>.</div> </td> </tr> <tr class="altColor"> @@ -149,13 +149,13 @@ <tr class="rowColor"> <td class="colFirst"><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOConflictResolver2.html" title="interface in org.eclipse.emf.cdo.transaction">CDOConflictResolver2</a></td> <td class="colLast"> -<div class="block">A strategy used to customize the default conflict resolution behaviour of <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><code>transactions</code></a>.</div> +<div class="block">A strategy used to customize the default conflict resolution behavior of <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><code>transactions</code></a>.</div> </td> </tr> <tr class="altColor"> <td class="colFirst"><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOConflictResolver3.html" title="interface in org.eclipse.emf.cdo.transaction">CDOConflictResolver3</a></td> <td class="colLast"> -<div class="block">A strategy used to customize the default conflict resolution behaviour of <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><code>transactions</code></a>.</div> +<div class="block">A strategy used to customize the default conflict resolution behavior of <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><code>transactions</code></a>.</div> </td> </tr> <tr class="rowColor"> diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/package-use.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/package-use.html index 34d41875a0..0f7d0acdb9 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/package-use.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/package-use.html @@ -306,7 +306,7 @@ </tr> <tr class="rowColor"> <td class="colOne"><a href="../../../../../org/eclipse/emf/cdo/transaction/class-use/CDOConflictResolver.html#org.eclipse.emf.cdo.transaction">CDOConflictResolver</a> -<div class="block">A strategy used to customize the default conflict resolution behaviour of <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><code>transactions</code></a>.</div> +<div class="block">A strategy used to customize the default conflict resolution behavior of <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><code>transactions</code></a>.</div> </td> </tr> <tr class="altColor"> @@ -507,7 +507,7 @@ </tr> <tr class="rowColor"> <td class="colOne"><a href="../../../../../org/eclipse/emf/cdo/transaction/class-use/CDOConflictResolver.html#org.eclipse.emf.spi.cdo">CDOConflictResolver</a> -<div class="block">A strategy used to customize the default conflict resolution behaviour of <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><code>transactions</code></a>.</div> +<div class="block">A strategy used to customize the default conflict resolution behavior of <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><code>transactions</code></a>.</div> </td> </tr> <tr class="altColor"> @@ -517,7 +517,7 @@ </tr> <tr class="rowColor"> <td class="colOne"><a href="../../../../../org/eclipse/emf/cdo/transaction/class-use/CDOConflictResolver2.html#org.eclipse.emf.spi.cdo">CDOConflictResolver2</a> -<div class="block">A strategy used to customize the default conflict resolution behaviour of <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><code>transactions</code></a>.</div> +<div class="block">A strategy used to customize the default conflict resolution behavior of <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><code>transactions</code></a>.</div> </td> </tr> <tr class="altColor"> diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDOAdapterPolicy.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDOAdapterPolicy.html index 8ed70e4d9b..6651f99553 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDOAdapterPolicy.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDOAdapterPolicy.html @@ -143,20 +143,20 @@ var activeTableTab = "activeTableTab"; <tr class="altColor"> <td class="colFirst"><code>static <a href="../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.html" title="interface in org.eclipse.emf.cdo.view">CDOAdapterPolicy</a></code></td> <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.html#ALL">ALL</a></span></code> -<div class="block">A default adapter policy that always triggers special behaviour.</div> +<div class="block">A default adapter policy that always triggers special behavior.</div> </td> </tr> <tr class="rowColor"> <td class="colFirst"><code>static <a href="../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.html" title="interface in org.eclipse.emf.cdo.view">CDOAdapterPolicy</a></code></td> <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.html#CDO">CDO</a></span></code> -<div class="block">A default adapter policy that only triggers special behaviour if the adapter under test implements +<div class="block">A default adapter policy that only triggers special behavior if the adapter under test implements <a href="../../../../../org/eclipse/emf/cdo/CDOAdapter.html" title="interface in org.eclipse.emf.cdo"><code>CDOAdapter</code></a>.</div> </td> </tr> <tr class="altColor"> <td class="colFirst"><code>static <a href="../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.html" title="interface in org.eclipse.emf.cdo.view">CDOAdapterPolicy</a></code></td> <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.html#NONE">NONE</a></span></code> -<div class="block">A default adapter policy that never triggers any special behaviour.</div> +<div class="block">A default adapter policy that never triggers any special behavior.</div> </td> </tr> </table> @@ -178,7 +178,7 @@ var activeTableTab = "activeTableTab"; <td class="colFirst"><code>boolean</code></td> <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.html#isValid-org.eclipse.emf.ecore.EObject-org.eclipse.emf.common.notify.Adapter-">isValid</a></span>(<a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.11/org/eclipse/emf/ecore/EObject.html?is-external=true" title="class or interface in org.eclipse.emf.ecore">EObject</a> eObject, <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.11/org/eclipse/emf/common/notify/Adapter.html?is-external=true" title="class or interface in org.eclipse.emf.common.notify">Adapter</a> adapter)</code> -<div class="block">Returns <code>true</code> if the given adapter on the given object should trigger a certain operation or behaviour, +<div class="block">Returns <code>true</code> if the given adapter on the given object should trigger a certain operation or behavior, <code>false</code> otherwise.</div> </td> </tr> @@ -204,7 +204,7 @@ var activeTableTab = "activeTableTab"; <li class="blockList"> <h4>NONE</h4> <pre>static final <a href="../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.html" title="interface in org.eclipse.emf.cdo.view">CDOAdapterPolicy</a> NONE</pre> -<div class="block">A default adapter policy that never triggers any special behaviour.</div> +<div class="block">A default adapter policy that never triggers any special behavior.</div> </li> </ul> <a name="CDO"> @@ -214,7 +214,7 @@ var activeTableTab = "activeTableTab"; <li class="blockList"> <h4>CDO</h4> <pre>static final <a href="../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.html" title="interface in org.eclipse.emf.cdo.view">CDOAdapterPolicy</a> CDO</pre> -<div class="block">A default adapter policy that only triggers special behaviour if the adapter under test implements +<div class="block">A default adapter policy that only triggers special behavior if the adapter under test implements <a href="../../../../../org/eclipse/emf/cdo/CDOAdapter.html" title="interface in org.eclipse.emf.cdo"><code>CDOAdapter</code></a>.</div> </li> </ul> @@ -225,7 +225,7 @@ var activeTableTab = "activeTableTab"; <li class="blockList"> <h4>ALL</h4> <pre>static final <a href="../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.html" title="interface in org.eclipse.emf.cdo.view">CDOAdapterPolicy</a> ALL</pre> -<div class="block">A default adapter policy that always triggers special behaviour.</div> +<div class="block">A default adapter policy that always triggers special behavior.</div> </li> </ul> </li> @@ -244,7 +244,7 @@ var activeTableTab = "activeTableTab"; <h4>isValid</h4> <pre>boolean isValid(<a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.11/org/eclipse/emf/ecore/EObject.html?is-external=true" title="class or interface in org.eclipse.emf.ecore">EObject</a> eObject, <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.11/org/eclipse/emf/common/notify/Adapter.html?is-external=true" title="class or interface in org.eclipse.emf.common.notify">Adapter</a> adapter)</pre> -<div class="block">Returns <code>true</code> if the given adapter on the given object should trigger a certain operation or behaviour, +<div class="block">Returns <code>true</code> if the given adapter on the given object should trigger a certain operation or behavior, <code>false</code> otherwise.</div> <dl> <dt><span class="seeLabel">See Also:</span></dt> diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDOInvalidationPolicy.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDOInvalidationPolicy.html index 5d9fba24fe..eb537a1032 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDOInvalidationPolicy.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDOInvalidationPolicy.html @@ -106,7 +106,7 @@ var activeTableTab = "activeTableTab"; <hr> <br> <pre>public interface <span class="typeNameLabel">CDOInvalidationPolicy</span></pre> -<div class="block">A strategy interface to customize the invalidation behaviour of a <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view"><code>view</code></a>.</div> +<div class="block">A strategy interface to customize the invalidation behavior of a <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view"><code>view</code></a>.</div> <dl> <dt><span class="simpleTagLabel">Since:</span></dt> <dd>3.0</dd> diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDORevisionPrefetchingPolicy.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDORevisionPrefetchingPolicy.html index 00e00aa737..43873dd1a9 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDORevisionPrefetchingPolicy.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDORevisionPrefetchingPolicy.html @@ -106,7 +106,7 @@ var activeTableTab = "activeTableTab"; <hr> <br> <pre>public interface <span class="typeNameLabel">CDORevisionPrefetchingPolicy</span></pre> -<div class="block">A strategy interface to customize the <a href="../../../../../org/eclipse/emf/cdo/common/revision/CDORevision.html" title="interface in org.eclipse.emf.cdo.common.revision"><code>revision</code></a> prefetching behaviour of a <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view"><code>view</code></a>.</div> +<div class="block">A strategy interface to customize the <a href="../../../../../org/eclipse/emf/cdo/common/revision/CDORevision.html" title="interface in org.eclipse.emf.cdo.common.revision"><code>revision</code></a> prefetching behavior of a <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view"><code>view</code></a>.</div> <dl> <dt><span class="simpleTagLabel">Since:</span></dt> <dd>2.0</dd> diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDOView.Options.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDOView.Options.html index 0db53bb881..a77128f826 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDOView.Options.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDOView.Options.html @@ -339,7 +339,9 @@ extends <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonView.Options </tr> <tr id="i9" class="rowColor"> <td class="colFirst"><code><a href="../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.html" title="interface in org.eclipse.emf.cdo.view">CDOAdapterPolicy</a></code></td> -<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/view/CDOView.Options.html#getStrongReferencePolicy--">getStrongReferencePolicy</a></span>()</code> </td> +<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/view/CDOView.Options.html#getStrongReferencePolicy--">getStrongReferencePolicy</a></span>()</code> +<div class="block">Returns the strong reference policy in use.</div> +</td> </tr> <tr id="i10" class="altColor"> <td class="colFirst"><code>boolean</code></td> @@ -432,7 +434,8 @@ extends <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonView.Options <tr id="i23" class="rowColor"> <td class="colFirst"><code>void</code></td> <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/view/CDOView.Options.html#setStrongReferencePolicy-org.eclipse.emf.cdo.view.CDOAdapterPolicy-">setStrongReferencePolicy</a></span>(<a href="../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.html" title="interface in org.eclipse.emf.cdo.view">CDOAdapterPolicy</a> policy)</code> -<div class="block">Sets the reference type to be used when an adapter is used to an object.</div> +<div class="block">Sets the policy that determines what object/adapter pairs of this <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view"><code>view</code></a> + are supposed to be protected against garbage collection.</div> </td> </tr> </table> @@ -675,11 +678,12 @@ extends <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonView.Options By activating this feature, each object having at least one adapter that matches the current policy will be registered with the server and will be notified for each change occurring in the scope of any other transaction. <p> - <a href="../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.html#NONE"><code>CDOAdapterPolicy.NONE</code></a> - Ignored. <br> - <a href="../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.html#ALL"><code>CDOAdapterPolicy.ALL</code></a> - Enabled for all adapters used.<br> - <a href="../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.html#CDO"><code>CDOAdapterPolicy.CDO</code></a> - Enabled only for adapters that implement <a href="../../../../../org/eclipse/emf/cdo/CDOAdapter.html" title="interface in org.eclipse.emf.cdo"><code>CDOAdapter</code></a>. <br> - Any other class that implement <a href="../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.html" title="interface in org.eclipse.emf.cdo.view"><code>CDOAdapterPolicy</code></a> will enable for whatever rules defined in that class. - <br> + <ul> + <li><a href="../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.html#NONE"><code>CDOAdapterPolicy.NONE</code></a> - Ignored. + <li><a href="../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.html#ALL"><code>CDOAdapterPolicy.ALL</code></a> - Enabled for all adapters used. + <li><a href="../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.html#CDO"><code>CDOAdapterPolicy.CDO</code></a> - Enabled only for adapters that implement <a href="../../../../../org/eclipse/emf/cdo/CDOAdapter.html" title="interface in org.eclipse.emf.cdo"><code>CDOAdapter</code></a>. + <li>Any other class that implements <a href="../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.html" title="interface in org.eclipse.emf.cdo.view"><code>CDOAdapterPolicy</code></a> will enable for whatever rules defined in that class. + </ul> <p> If <code>myAdapter</code> in the above example matches the current policy, <code>eObject</code> will be registered with the server and you will receive all changes from other transaction. @@ -746,6 +750,11 @@ extends <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonView.Options <li class="blockList"> <h4>getStrongReferencePolicy</h4> <pre><a href="../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.html" title="interface in org.eclipse.emf.cdo.view">CDOAdapterPolicy</a> getStrongReferencePolicy()</pre> +<div class="block">Returns the strong reference policy in use.</div> +<dl> +<dt><span class="seeLabel">See Also:</span></dt> +<dd><a href="../../../../../org/eclipse/emf/cdo/view/CDOView.Options.html#setStrongReferencePolicy-org.eclipse.emf.cdo.view.CDOAdapterPolicy-"><code>setStrongReferencePolicy(CDOAdapterPolicy)</code></a></dd> +</dl> </li> </ul> <a name="setStrongReferencePolicy-org.eclipse.emf.cdo.view.CDOAdapterPolicy-"> @@ -755,11 +764,32 @@ extends <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonView.Options <li class="blockList"> <h4>setStrongReferencePolicy</h4> <pre>void setStrongReferencePolicy(<a href="../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.html" title="interface in org.eclipse.emf.cdo.view">CDOAdapterPolicy</a> policy)</pre> -<div class="block">Sets the reference type to be used when an adapter is used to an object. +<div class="block">Sets the policy that determines what object/adapter pairs of this <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view"><code>view</code></a> + are supposed to be protected against garbage collection. + <p> + A view uses references of the type determined by <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.Options.html#getCacheReferenceType--"><code>getCacheReferenceType()</code></a> to hold on to loaded objects. + If this type is <b>not</b> <a href="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ref/ReferenceType.html?is-external=true#STRONG" title="class or interface in org.eclipse.net4j.util.ref"><code>STRONG</code></a> and the application does <b>not</b> hold other strong + references to an object then this object and possibly any adapters attached to this object are subject to garbage collection. <p> - When <code>CDOView.setStrongReference(CDOAdapterPolicy.ALL)</code> is used, it is possible that the target object - will be GC. In that case, the adapter will never received notifications. By Default the value is at - <code>CDOAdapterPolicy.ALL</code></div> + To avoid automatic garbage collection while specific adapters are attached to an object this view calls the + <a href="../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.html#isValid-org.eclipse.emf.ecore.EObject-org.eclipse.emf.common.notify.Adapter-"><code>CDOAdapterPolicy.isValid()</code></a> + method for all adapters that are attached to this object. + An extra strong reference to this object is maintained if any of these calls return <code>true</code>. + <p> + The following adapter policies can be used as strong reference policies: + <ul> + <li><a href="../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.html#NONE"><code>CDOAdapterPolicy.NONE</code></a> - No adapter will prevent GC. + <li><a href="../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.html#ALL"><code>CDOAdapterPolicy.ALL</code></a> - Any adapter prevent GC. + <li><a href="../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.html#CDO"><code>CDOAdapterPolicy.CDO</code></a> - Only adapters that implement <a href="../../../../../org/eclipse/emf/cdo/CDOAdapter.html" title="interface in org.eclipse.emf.cdo"><code>CDOAdapter</code></a> will prevent GC. + <li>Any other class that implements <a href="../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.html" title="interface in org.eclipse.emf.cdo.view"><code>CDOAdapterPolicy</code></a> will prevent GC according to whatever rules defined + in that class. + </ul> + <p> + The default strong reference policy is <a href="../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.html#ALL"><code>CDOAdapterPolicy.ALL</code></a>, preventing garbage collection for all adapted objects.</div> +<dl> +<dt><span class="seeLabel">See Also:</span></dt> +<dd><a href="../../../../../org/eclipse/emf/cdo/view/CDOView.Options.html#getStrongReferencePolicy--"><code>getStrongReferencePolicy()</code></a></dd> +</dl> </li> </ul> <a name="getStaleReferenceBehaviour--"> diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/class-use/CDOAdapterPolicy.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/class-use/CDOAdapterPolicy.html index 25195e00de..c2bbff93ec 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/class-use/CDOAdapterPolicy.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/class-use/CDOAdapterPolicy.html @@ -112,20 +112,20 @@ <tr class="altColor"> <td class="colFirst"><code>static <a href="../../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.html" title="interface in org.eclipse.emf.cdo.view">CDOAdapterPolicy</a></code></td> <td class="colLast"><span class="typeNameLabel">CDOAdapterPolicy.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.html#ALL">ALL</a></span></code> -<div class="block">A default adapter policy that always triggers special behaviour.</div> +<div class="block">A default adapter policy that always triggers special behavior.</div> </td> </tr> <tr class="rowColor"> <td class="colFirst"><code>static <a href="../../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.html" title="interface in org.eclipse.emf.cdo.view">CDOAdapterPolicy</a></code></td> <td class="colLast"><span class="typeNameLabel">CDOAdapterPolicy.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.html#CDO">CDO</a></span></code> -<div class="block">A default adapter policy that only triggers special behaviour if the adapter under test implements +<div class="block">A default adapter policy that only triggers special behavior if the adapter under test implements <a href="../../../../../../org/eclipse/emf/cdo/CDOAdapter.html" title="interface in org.eclipse.emf.cdo"><code>CDOAdapter</code></a>.</div> </td> </tr> <tr class="altColor"> <td class="colFirst"><code>static <a href="../../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.html" title="interface in org.eclipse.emf.cdo.view">CDOAdapterPolicy</a></code></td> <td class="colLast"><span class="typeNameLabel">CDOAdapterPolicy.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.html#NONE">NONE</a></span></code> -<div class="block">A default adapter policy that never triggers any special behaviour.</div> +<div class="block">A default adapter policy that never triggers any special behavior.</div> </td> </tr> </tbody> @@ -145,7 +145,9 @@ </tr> <tr class="rowColor"> <td class="colFirst"><code><a href="../../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.html" title="interface in org.eclipse.emf.cdo.view">CDOAdapterPolicy</a></code></td> -<td class="colLast"><span class="typeNameLabel">CDOView.Options.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/cdo/view/CDOView.Options.html#getStrongReferencePolicy--">getStrongReferencePolicy</a></span>()</code> </td> +<td class="colLast"><span class="typeNameLabel">CDOView.Options.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/cdo/view/CDOView.Options.html#getStrongReferencePolicy--">getStrongReferencePolicy</a></span>()</code> +<div class="block">Returns the strong reference policy in use.</div> +</td> </tr> </tbody> </table> @@ -171,7 +173,8 @@ <tr class="altColor"> <td class="colFirst"><code>void</code></td> <td class="colLast"><span class="typeNameLabel">CDOView.Options.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/cdo/view/CDOView.Options.html#setStrongReferencePolicy-org.eclipse.emf.cdo.view.CDOAdapterPolicy-">setStrongReferencePolicy</a></span>(<a href="../../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.html" title="interface in org.eclipse.emf.cdo.view">CDOAdapterPolicy</a> policy)</code> -<div class="block">Sets the reference type to be used when an adapter is used to an object.</div> +<div class="block">Sets the policy that determines what object/adapter pairs of this <a href="../../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view"><code>view</code></a> + are supposed to be protected against garbage collection.</div> </td> </tr> </tbody> diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/package-summary.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/package-summary.html index 2aca01511a..af15581355 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/package-summary.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/package-summary.html @@ -141,7 +141,7 @@ <tr class="rowColor"> <td class="colFirst"><a href="../../../../../org/eclipse/emf/cdo/view/CDOInvalidationPolicy.html" title="interface in org.eclipse.emf.cdo.view">CDOInvalidationPolicy</a></td> <td class="colLast"> -<div class="block">A strategy interface to customize the invalidation behaviour of a <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view"><code>view</code></a>.</div> +<div class="block">A strategy interface to customize the invalidation behavior of a <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view"><code>view</code></a>.</div> </td> </tr> <tr class="altColor"> @@ -161,7 +161,7 @@ <tr class="altColor"> <td class="colFirst"><a href="../../../../../org/eclipse/emf/cdo/view/CDORevisionPrefetchingPolicy.html" title="interface in org.eclipse.emf.cdo.view">CDORevisionPrefetchingPolicy</a></td> <td class="colLast"> -<div class="block">A strategy interface to customize the <a href="../../../../../org/eclipse/emf/cdo/common/revision/CDORevision.html" title="interface in org.eclipse.emf.cdo.common.revision"><code>revision</code></a> prefetching behaviour of a <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view"><code>view</code></a>.</div> +<div class="block">A strategy interface to customize the <a href="../../../../../org/eclipse/emf/cdo/common/revision/CDORevision.html" title="interface in org.eclipse.emf.cdo.common.revision"><code>revision</code></a> prefetching behavior of a <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view"><code>view</code></a>.</div> </td> </tr> <tr class="rowColor"> diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/package-use.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/package-use.html index f1641529f2..9cec0c6eaa 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/package-use.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/package-use.html @@ -611,7 +611,7 @@ </tr> <tr class="altColor"> <td class="colOne"><a href="../../../../../org/eclipse/emf/cdo/view/class-use/CDORevisionPrefetchingPolicy.html#org.eclipse.emf.cdo.util">CDORevisionPrefetchingPolicy</a> -<div class="block">A strategy interface to customize the <a href="../../../../../org/eclipse/emf/cdo/common/revision/CDORevision.html" title="interface in org.eclipse.emf.cdo.common.revision"><code>revision</code></a> prefetching behaviour of a <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view"><code>view</code></a>.</div> +<div class="block">A strategy interface to customize the <a href="../../../../../org/eclipse/emf/cdo/common/revision/CDORevision.html" title="interface in org.eclipse.emf.cdo.common.revision"><code>revision</code></a> prefetching behavior of a <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view"><code>view</code></a>.</div> </td> </tr> <tr class="rowColor"> @@ -654,7 +654,7 @@ </tr> <tr class="rowColor"> <td class="colOne"><a href="../../../../../org/eclipse/emf/cdo/view/class-use/CDOInvalidationPolicy.html#org.eclipse.emf.cdo.view">CDOInvalidationPolicy</a> -<div class="block">A strategy interface to customize the invalidation behaviour of a <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view"><code>view</code></a>.</div> +<div class="block">A strategy interface to customize the invalidation behavior of a <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view"><code>view</code></a>.</div> </td> </tr> <tr class="altColor"> @@ -671,7 +671,7 @@ </tr> <tr class="altColor"> <td class="colOne"><a href="../../../../../org/eclipse/emf/cdo/view/class-use/CDORevisionPrefetchingPolicy.html#org.eclipse.emf.cdo.view">CDORevisionPrefetchingPolicy</a> -<div class="block">A strategy interface to customize the <a href="../../../../../org/eclipse/emf/cdo/common/revision/CDORevision.html" title="interface in org.eclipse.emf.cdo.common.revision"><code>revision</code></a> prefetching behaviour of a <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view"><code>view</code></a>.</div> +<div class="block">A strategy interface to customize the <a href="../../../../../org/eclipse/emf/cdo/common/revision/CDORevision.html" title="interface in org.eclipse.emf.cdo.common.revision"><code>revision</code></a> prefetching behavior of a <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view"><code>view</code></a>.</div> </td> </tr> <tr class="rowColor"> |