[Releng] Make clearer where CDOResourceNodeNotFoundException is thrown

5 files changed, 27 insertions, 24 deletions

diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOPushTransaction.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOPushTransaction.java
index fc05c3b246..c13a8017e8 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOPushTransaction.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOPushTransaction.java
@@ -24,6 +24,7 @@ import org.eclipse.emf.cdo.common.lock.CDOLockState;
 import org.eclipse.emf.cdo.common.revision.CDORevision;
 import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta;
 import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta;
+import org.eclipse.emf.cdo.common.util.CDOResourceNodeNotFoundException;
 import org.eclipse.emf.cdo.eresource.CDOBinaryResource;
 import org.eclipse.emf.cdo.eresource.CDOResource;
 import org.eclipse.emf.cdo.eresource.CDOResourceFolder;
@@ -521,17 +522,17 @@ public class CDOPushTransaction extends Notifier implements CDOTransaction
     return delegate.getOrCreateResourceFolder(path);
   }
 
-  public CDOResource getResource(String path, boolean loadOnDemand)
+  public CDOResource getResource(String path, boolean loadOnDemand) throws CDOResourceNodeNotFoundException
   {
     return delegate.getResource(path, loadOnDemand);
   }
 
-  public CDOResource getResource(String path)
+  public CDOResource getResource(String path) throws CDOResourceNodeNotFoundException
   {
     return delegate.getResource(path);
   }
 
-  public CDOResourceNode getResourceNode(String path)
+  public CDOResourceNode getResourceNode(String path) throws CDOResourceNodeNotFoundException
   {
     return delegate.getResourceNode(path);
   }
@@ -571,7 +572,7 @@ public class CDOPushTransaction extends Notifier implements CDOTransaction
   /**
    * @since 4.2
    */
-  public CDOTextResource getTextResource(String path)
+  public CDOTextResource getTextResource(String path) throws CDOResourceNodeNotFoundException
   {
     return delegate.getTextResource(path);
   }
@@ -579,7 +580,7 @@ public class CDOPushTransaction extends Notifier implements CDOTransaction
   /**
    * @since 4.2
    */
-  public CDOBinaryResource getBinaryResource(String path)
+  public CDOBinaryResource getBinaryResource(String path) throws CDOResourceNodeNotFoundException
   {
     return delegate.getBinaryResource(path);
   }
@@ -587,7 +588,7 @@ public class CDOPushTransaction extends Notifier implements CDOTransaction
   /**
    * @since 4.2
    */
-  public CDOResourceFolder getResourceFolder(String path)
+  public CDOResourceFolder getResourceFolder(String path) throws CDOResourceNodeNotFoundException
   {
     return delegate.getResourceFolder(path);
   }
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransaction.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransaction.java
index 5dcc4b2eef..28cbbfcc05 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransaction.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransaction.java
@@ -25,6 +25,7 @@ import org.eclipse.emf.cdo.common.commit.CDOChangeSetDataProvider;
 import org.eclipse.emf.cdo.common.commit.CDOCommitInfo;
 import org.eclipse.emf.cdo.common.id.CDOID;
 import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta;
+import org.eclipse.emf.cdo.common.util.CDOResourceNodeNotFoundException;
 import org.eclipse.emf.cdo.eresource.CDOBinaryResource;
 import org.eclipse.emf.cdo.eresource.CDOResource;
 import org.eclipse.emf.cdo.eresource.CDOResourceFolder;
@@ -121,7 +122,7 @@ public interface CDOTransaction extends CDOView, CDOCommonTransaction, CDOUserTr
   /**
    * @since 4.0
    */
-  public CDOResourceFolder createResourceFolder(String path);
+  public CDOResourceFolder createResourceFolder(String path) throws CDOResourceNodeNotFoundException;
 
   /**
    * @since 4.0
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 ca028353b8..5bc6660c57 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
@@ -27,6 +27,7 @@ import org.eclipse.emf.cdo.common.id.CDOID;
 import org.eclipse.emf.cdo.common.lock.CDOLockState;
 import org.eclipse.emf.cdo.common.revision.CDORevision;
 import org.eclipse.emf.cdo.common.util.CDOException;
+import org.eclipse.emf.cdo.common.util.CDOResourceNodeNotFoundException;
 import org.eclipse.emf.cdo.eresource.CDOBinaryResource;
 import org.eclipse.emf.cdo.eresource.CDOFileResource;
 import org.eclipse.emf.cdo.eresource.CDOResource;
@@ -262,24 +263,24 @@ public interface CDOView extends CDOCommonView, CDOUpdatable, CDOCommitHistory.P
   /**
    * @see ResourceSet#getResource(URI, boolean)
    */
-  public CDOResource getResource(String path, boolean loadOnDemand);
+  public CDOResource getResource(String path, boolean loadOnDemand) throws CDOResourceNodeNotFoundException;
 
   /**
    * Same as {@link #getResource(String, boolean) getResource(String, true)}.
    *
    * @see ResourceSet#getResource(URI, boolean)
    */
-  public CDOResource getResource(String path);
+  public CDOResource getResource(String path) throws CDOResourceNodeNotFoundException;
 
   /**
    * @since 4.2
    */
-  public CDOTextResource getTextResource(String path);
+  public CDOTextResource getTextResource(String path) throws CDOResourceNodeNotFoundException;
 
   /**
    * @since 4.2
    */
-  public CDOBinaryResource getBinaryResource(String path);
+  public CDOBinaryResource getBinaryResource(String path) throws CDOResourceNodeNotFoundException;
 
   /**
    * Returns the resource node with the given path.
@@ -288,12 +289,12 @@ public interface CDOView extends CDOCommonView, CDOUpdatable, CDOCommitHistory.P
    * @throws CDOException
    *           if no such resource node exists.
    */
-  public CDOResourceNode getResourceNode(String path) throws CDOException;
+  public CDOResourceNode getResourceNode(String path) throws CDOResourceNodeNotFoundException;
 
   /**
    * @since 4.2
    */
-  public CDOResourceFolder getResourceFolder(String path);
+  public CDOResourceFolder getResourceFolder(String path) throws CDOResourceNodeNotFoundException;
 
   /**
    * Returns the root resource of the repository.
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
index de8eea7c16..5311d463c4 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
@@ -987,7 +987,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
     return idGenerator.generateCDOID(object);
   }
 
-  public CDOResourceFolder createResourceFolder(String path)
+  public CDOResourceFolder createResourceFolder(String path) throws CDOResourceNodeNotFoundException
   {
     synchronized (getViewMonitor())
     {
@@ -1445,7 +1445,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
    * @since 2.0
    */
   @Override
-  protected CDOID getRootOrTopLevelResourceNodeID(String name)
+  protected CDOID getRootOrTopLevelResourceNodeID(String name) throws CDOResourceNodeNotFoundException
   {
     synchronized (getViewMonitor())
     {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java
index 4c991641ac..5869873147 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java
@@ -978,7 +978,7 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
     }
   }
 
-  public CDOResourceNode getResourceNode(String path)
+  public CDOResourceNode getResourceNode(String path) throws CDOResourceNodeNotFoundException
   {
     synchronized (getViewMonitor())
     {
@@ -1140,7 +1140,7 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
   /**
    * @return never <code>null</code>
    */
-  private CDOID getResourceNodeIDChecked(CDOID folderID, String name)
+  private CDOID getResourceNodeIDChecked(CDOID folderID, String name) throws CDOResourceNodeNotFoundException
   {
     CDOID id = getResourceNodeID(folderID, name);
     if (id == null)
@@ -1154,7 +1154,7 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
   /**
    * @return never <code>null</code>
    */
-  protected CDOResourceNode getResourceNode(CDOID folderID, String name)
+  protected CDOResourceNode getResourceNode(CDOID folderID, String name) throws CDOResourceNodeNotFoundException
   {
     synchronized (getViewMonitor())
     {
@@ -1245,7 +1245,7 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
     }
   }
 
-  protected CDOID getRootOrTopLevelResourceNodeID(String name)
+  protected CDOID getRootOrTopLevelResourceNodeID(String name) throws CDOResourceNodeNotFoundException
   {
     if (name == null)
     {
@@ -1355,12 +1355,12 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
     }
   }
 
-  public CDOResource getResource(String path)
+  public CDOResource getResource(String path) throws CDOResourceNodeNotFoundException
   {
     return getResource(path, true);
   }
 
-  public CDOResource getResource(String path, boolean loadOnDemand)
+  public CDOResource getResource(String path, boolean loadOnDemand) throws CDOResourceNodeNotFoundException
   {
     checkActive();
     synchronized (getViewMonitor())
@@ -1400,17 +1400,17 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
     }
   }
 
-  public CDOTextResource getTextResource(String path)
+  public CDOTextResource getTextResource(String path) throws CDOResourceNodeNotFoundException
   {
     return (CDOTextResource)getResourceNode(path);
   }
 
-  public CDOBinaryResource getBinaryResource(String path)
+  public CDOBinaryResource getBinaryResource(String path) throws CDOResourceNodeNotFoundException
   {
     return (CDOBinaryResource)getResourceNode(path);
   }
 
-  public CDOResourceFolder getResourceFolder(String path)
+  public CDOResourceFolder getResourceFolder(String path) throws CDOResourceNodeNotFoundException
   {
     return (CDOResourceFolder)getResourceNode(path);
   }