added javadoc

5 files changed, 53 insertions, 12 deletions

diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ServerCDOView.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ServerCDOView.java
index f463f4a583..f551a61840 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ServerCDOView.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ServerCDOView.java
@@ -321,13 +321,25 @@ public class ServerCDOView extends AbstractCDOView implements org.eclipse.emf.cd
     throw new UnsupportedOperationException();
   }
 
+  @Deprecated
   public CDOStaleReferencePolicy getStaleReferenceBehaviour()
   {
-    return CDOStaleReferencePolicy.EXCEPTION;
+    return getStaleReferencePolicy();
   }
 
+  @Deprecated
   public void setStaleReferenceBehaviour(CDOStaleReferencePolicy policy)
   {
+    setStaleReferencePolicy(policy);
+  }
+
+  public CDOStaleReferencePolicy getStaleReferencePolicy()
+  {
+    return CDOStaleReferencePolicy.EXCEPTION;
+  }
+
+  public void setStaleReferencePolicy(CDOStaleReferencePolicy policy)
+  {
     throw new UnsupportedOperationException();
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_279982_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_279982_Test.java
index 6676145bb1..ec8dfcbce6 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_279982_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_279982_Test.java
@@ -40,7 +40,7 @@ public class Bugzilla_279982_Test extends AbstractCDOTest
     CDOSession session = openSession();
     CDOTransaction tx = session.openTransaction();
     CDOResource res = tx.getOrCreateResource(getResourcePath("/resource1"));
-    tx.options().setStaleReferenceBehaviour(CDOStaleReferencePolicy.PROXY);
+    tx.options().setStaleReferencePolicy(CDOStaleReferencePolicy.PROXY);
     GenRefSingleContained container = getModel4Factory().createGenRefSingleContained();
     GenRefSingleNonContained reference = getModel4Factory().createGenRefSingleNonContained();
     GenRefSingleNonContained contained = getModel4Factory().createGenRefSingleNonContained();
@@ -71,7 +71,7 @@ public class Bugzilla_279982_Test extends AbstractCDOTest
       fail("Should have an ObjectNotFoundException");
     }
 
-    tx.options().setStaleReferenceBehaviour(CDOStaleReferencePolicy.EXCEPTION);
+    tx.options().setStaleReferencePolicy(CDOStaleReferencePolicy.EXCEPTION);
 
     try
     {
@@ -107,7 +107,7 @@ public class Bugzilla_279982_Test extends AbstractCDOTest
     CDOSession session = openSession();
     CDOTransaction tx = session.openTransaction();
     CDOResource res = tx.getOrCreateResource(getResourcePath("/resource1"));
-    tx.options().setStaleReferenceBehaviour(CDOStaleReferencePolicy.PROXY);
+    tx.options().setStaleReferencePolicy(CDOStaleReferencePolicy.PROXY);
     GenRefSingleContained container = getModel4Factory().createGenRefSingleContained();
     GenRefMultiNonContained reference = getModel4Factory().createGenRefMultiNonContained();
     GenRefSingleNonContained contained = getModel4Factory().createGenRefSingleNonContained();
@@ -122,7 +122,7 @@ public class Bugzilla_279982_Test extends AbstractCDOTest
     assertNull(container.getElement());
     assertNotNull(reference.getElements().get(0));
 
-    tx.options().setStaleReferenceBehaviour(CDOStaleReferencePolicy.EXCEPTION);
+    tx.options().setStaleReferencePolicy(CDOStaleReferencePolicy.EXCEPTION);
 
     try
     {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java
index b79b77dec8..55de501db1 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java
@@ -72,7 +72,6 @@ import java.util.Set;
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
  * @apiviz.landmark
- * @apiviz.has {@link org.eclipse.emf.cdo.common.branch.CDOBranchPoint} oneway - - target
  * @apiviz.has {@link CDOView.Options}
  * @apiviz.owns {@link CDOObjectHandler}
  * @apiviz.uses {@link CDOQuery} - - creates
@@ -412,11 +411,11 @@ public interface CDOView extends CDOCommonView, CDOUpdatable, INotifier
    * @author Simon McDuff
    * @noextend This interface is not intended to be extended by clients.
    * @noimplement This interface is not intended to be implemented by clients.
-   * @apiviz.has {@link org.eclipse.net4j.util.ref.ReferenceType} oneway - - cacheReferenceType
+   * @apiviz.has {@link org.eclipse.net4j.util.ref.ReferenceType} oneway - - cacheReferences
    * @apiviz.has {@link org.eclipse.emf.cdo.view.CDOInvalidationPolicy}
-   * @apiviz.composedOf {@link org.eclipse.emf.cdo.view.CDOAdapterPolicy} - - changeSubscriptionPolicies
-   * @apiviz.has {@link org.eclipse.emf.cdo.view.CDOAdapterPolicy} oneway - - strongReferencePolicy
-   * @apiviz.has {@link org.eclipse.emf.cdo.view.CDOStaleReferencePolicy} oneway - - staleReferenceBehaviour
+   * @apiviz.composedOf {@link org.eclipse.emf.cdo.view.CDOAdapterPolicy} - - changeSubscriptions
+   * @apiviz.has {@link org.eclipse.emf.cdo.view.CDOAdapterPolicy} oneway - - strongReferences
+   * @apiviz.has {@link org.eclipse.emf.cdo.view.CDOStaleReferencePolicy} oneway - - staleReferences
    * @apiviz.has {@link org.eclipse.emf.cdo.view.CDORevisionPrefetchingPolicy}
    * @apiviz.uses {@link CDOView.Options.CacheReferenceTypeEvent} - - fires
    * @apiviz.uses {@link CDOView.Options.StrongReferencePolicyEvent} - - fires
@@ -551,17 +550,35 @@ public interface CDOView extends CDOCommonView, CDOUpdatable, INotifier
      * Returns the CDOStaleReferencePolicy in use.
      * 
      * @since 3.0
+     * @deprecated Use {@link #getStaleReferencePolicy()}
      */
+    @Deprecated
     public CDOStaleReferencePolicy getStaleReferenceBehaviour();
 
     /**
      * Sets a policy on how to deal with stale references.
      * 
      * @since 3.0
+     * @deprecated Use {@link #setStaleReferencePolicy(CDOStaleReferencePolicy)}
      */
+    @Deprecated
     public void setStaleReferenceBehaviour(CDOStaleReferencePolicy policy);
 
     /**
+     * Returns the CDOStaleReferencePolicy in use.
+     * 
+     * @since 4.1
+     */
+    public CDOStaleReferencePolicy getStaleReferencePolicy();
+
+    /**
+     * Sets a policy on how to deal with stale references.
+     * 
+     * @since 4.1
+     */
+    public void setStaleReferencePolicy(CDOStaleReferencePolicy policy);
+
+    /**
      * Returns the CDORevisionPrefetchingPolicy in use.
      */
     public CDORevisionPrefetchingPolicy getRevisionPrefetchingPolicy();
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOStoreImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOStoreImpl.java
index 50b662595f..9884c90267 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOStoreImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOStoreImpl.java
@@ -671,7 +671,7 @@ public final class CDOStoreImpl implements CDOStore
     {
       if (value instanceof CDOID)
       {
-        value = view.options().getStaleReferenceBehaviour().processStaleReference(eObject, feature, index, ex.getID());
+        value = view.options().getStaleReferencePolicy().processStaleReference(eObject, feature, index, ex.getID());
       }
     }
 
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java
index b1dc5c1069..a82b4134bb 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java
@@ -1643,15 +1643,27 @@ public class CDOViewImpl extends AbstractCDOView
       fireEvent(event);
     }
 
+    @Deprecated
     public CDOStaleReferencePolicy getStaleReferenceBehaviour()
     {
+      return getStaleReferencePolicy();
+    }
+
+    @Deprecated
+    public void setStaleReferenceBehaviour(CDOStaleReferencePolicy policy)
+    {
+      setStaleReferencePolicy(policy);
+    }
+
+    public CDOStaleReferencePolicy getStaleReferencePolicy()
+    {
       synchronized (CDOViewImpl.this)
       {
         return staleReferencePolicy;
       }
     }
 
-    public void setStaleReferenceBehaviour(CDOStaleReferencePolicy policy)
+    public void setStaleReferencePolicy(CDOStaleReferencePolicy policy)
     {
       if (policy == null)
       {