Rolled back the renaming of existing exceptions.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/main/java/com/c2kernel/utils/ActDefCache.java b/src/main/java/com/c2kernel/utils/ActDefCache.java
index da171da..785a50d 100644
--- a/src/main/java/com/c2kernel/utils/ActDefCache.java
+++ b/src/main/java/com/c2kernel/utils/ActDefCache.java
@@ -23,8 +23,8 @@
  */

 package com.c2kernel.utils;

 

-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;

@@ -41,7 +41,7 @@ public class ActDefCache extends DescriptionObjectCache<ActivityDef> {
 	}

 	

 	@Override

-	public ActivityDef loadObject(String name, int version, ItemProxy proxy) throws ObjectNotFound, InvalidData {

+	public ActivityDef loadObject(String name, int version, ItemProxy proxy) throws ObjectNotFoundException, InvalidDataException {

 		ActivityDef thisActDef;

         String actType = proxy.getProperty("Complexity");

         Viewpoint actView = (Viewpoint)proxy.getObject(ClusterStorage.VIEWPOINT + "/" + actType + "ActivityDef/" + version);

@@ -50,14 +50,14 @@ public class ActDefCache extends DescriptionObjectCache<ActivityDef> {
 			marshalledAct = actView.getOutcome().getData();

 		} catch (PersistencyException ex) {

 			Logger.error(ex);

-			throw new ObjectNotFound("Problem loading "+name+" v"+version+": "+ex.getMessage());

+			throw new ObjectNotFoundException("Problem loading "+name+" v"+version+": "+ex.getMessage());

 		}

 		try {

 			thisActDef = (ActivityDef)Gateway.getMarshaller().unmarshall(marshalledAct);

 			thisActDef.getProperties().put("Version", version);

 		} catch (Exception ex) {

 			Logger.error(ex);

-			throw new InvalidData("Could not unmarshall '"+name+"' v"+version+": "+ex.getMessage());

+			throw new InvalidDataException("Could not unmarshall '"+name+"' v"+version+": "+ex.getMessage());

 		}

         thisActDef.setName(name);

         thisActDef.setVersion(version);