From b68ea0f2b12c4c5189c5fc7c182a1b242dc63579 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Fri, 3 Oct 2014 23:18:47 +0200
Subject: Rolled back the renaming of existing exceptions.

---
 .../java/com/c2kernel/utils/LocalObjectLoader.java | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/main/java/com/c2kernel/utils/LocalObjectLoader.java')

diff --git a/src/main/java/com/c2kernel/utils/LocalObjectLoader.java b/src/main/java/com/c2kernel/utils/LocalObjectLoader.java
index 434c24d..186b599 100644
--- a/src/main/java/com/c2kernel/utils/LocalObjectLoader.java
+++ b/src/main/java/com/c2kernel/utils/LocalObjectLoader.java
@@ -22,8 +22,8 @@ package com.c2kernel.utils;
 
 import java.util.Iterator;
 
-import com.c2kernel.common.InvalidData;
-import com.c2kernel.common.ObjectNotFound;
+import com.c2kernel.common.InvalidDataException;
+import com.c2kernel.common.ObjectNotFoundException;
 import com.c2kernel.common.PersistencyException;
 import com.c2kernel.entity.proxy.ItemProxy;
 import com.c2kernel.lifecycle.ActivityDef;
@@ -40,22 +40,22 @@ public class LocalObjectLoader {
 	private static StateMachineCache smCache = new StateMachineCache();
 
 	static public ItemProxy loadLocalObjectDef(String root, String name)
-		throws ObjectNotFound
+		throws ObjectNotFoundException
 	{
 		DomainPath defRoot = new DomainPath(root);
 	    Iterator<Path> e = Gateway.getLookup().search(defRoot, name);
 	    if (e.hasNext()) {
 	    	DomainPath defPath = (DomainPath)e.next();
-		    if (e.hasNext()) throw new ObjectNotFound("Too many matches for "+name+" in "+root);
+		    if (e.hasNext()) throw new ObjectNotFoundException("Too many matches for "+name+" in "+root);
 		    return Gateway.getProxyManager().getProxy(defPath);
 	    }
 	    else {
-	    	throw new ObjectNotFound("No match for "+name+" in "+root);
+	    	throw new ObjectNotFoundException("No match for "+name+" in "+root);
 	    }
 
 	}
 
-	static public String getScript(String scriptName, int scriptVersion) throws ObjectNotFound {
+	static public String getScript(String scriptName, int scriptVersion) throws ObjectNotFoundException {
 	    Logger.msg(5, "Loading script "+scriptName+" v"+scriptVersion);
 	    try {
 	    	ItemProxy script = loadLocalObjectDef("/desc/Script/", scriptName);
@@ -63,12 +63,12 @@ public class LocalObjectLoader {
 	    	return scriptView.getOutcome().getData();
 	    } catch (PersistencyException ex) {
 	    	Logger.error(ex);
-	        throw new ObjectNotFound("Error loading script " + scriptName + " version " + scriptVersion);
+	        throw new ObjectNotFoundException("Error loading script " + scriptName + " version " + scriptVersion);
 	    }
 
 	}
 
-	static public Schema getSchema(String schemaName, int schemaVersion) throws ObjectNotFound {
+	static public Schema getSchema(String schemaName, int schemaVersion) throws ObjectNotFoundException {
 		Logger.msg(5, "Loading schema "+schemaName+" v"+schemaVersion);
 	    
 	    String docType = schemaName;
@@ -85,7 +85,7 @@ public class LocalObjectLoader {
         	schemaData = schemaView.getOutcome().getData();
         } catch (PersistencyException ex) {
         	Logger.error(ex);
-        	throw new ObjectNotFound("Problem loading schema "+schemaName+" v"+schemaVersion+": "+ex.getMessage());
+        	throw new ObjectNotFoundException("Problem loading schema "+schemaName+" v"+schemaVersion+": "+ex.getMessage());
         }
 	    return new Schema(docType, docVersion, schemaData);
 	}
@@ -96,14 +96,14 @@ public class LocalObjectLoader {
 	 * @param actName - activity name
 	 * @param version - named version (String)
 	 * @return ActivityDef
-	 * @throws ObjectNotFound - When activity or version does not exist
+	 * @throws ObjectNotFoundException - When activity or version does not exist
 	 */
-	static public ActivityDef getActDef(String actName, int actVersion) throws ObjectNotFound, InvalidData {
+	static public ActivityDef getActDef(String actName, int actVersion) throws ObjectNotFoundException, InvalidDataException {
 		Logger.msg(5, "Loading activity def "+actName+" v"+actVersion);
 		return actCache.get(actName, actVersion);
 	}
 	
-	static public StateMachine getStateMachine(String smName, int smVersion) throws ObjectNotFound, InvalidData {
+	static public StateMachine getStateMachine(String smName, int smVersion) throws ObjectNotFoundException, InvalidDataException {
 		Logger.msg(5, "Loading activity def "+smName+" v"+smVersion);
 		return smCache.get(smName, smVersion);
 	}
-- 
cgit v1.2.3