Huge exception overhaul: Merged ClusterStorageException with

PersistencyException. Replaced MembershipException with
InvalidCollectionModification CORBA Exception. Made all predef steps
throw more accurate exceptions when they go wrong, and let more
exceptions bubble through from underneath.

1 files changed, 10 insertions, 10 deletions

diff --git a/src/main/java/com/c2kernel/process/resource/Resource.java b/src/main/java/com/c2kernel/process/resource/Resource.java
index 750c690..2a6e41c 100644
--- a/src/main/java/com/c2kernel/process/resource/Resource.java
+++ b/src/main/java/com/c2kernel/process/resource/Resource.java
@@ -27,8 +27,8 @@ import java.util.Enumeration;
 import java.util.HashMap;

 import java.util.Hashtable;

 

-import com.c2kernel.common.InvalidDataException;

-import com.c2kernel.common.ObjectNotFoundException;

+import com.c2kernel.common.InvalidData;

+import com.c2kernel.common.ObjectNotFound;

 import com.c2kernel.utils.FileStringUtility;

 import com.c2kernel.utils.Logger;

 

@@ -44,7 +44,7 @@ public class Resource implements ResourceLoader {
     private final HashMap<String, URL> moduleBaseURLs = new HashMap<String, URL>();

     private final HashMap<String, URL> allBaseURLs = new HashMap<String, URL>();

 

-    public Resource() throws InvalidDataException {

+    public Resource() throws InvalidData {

     	baseURL = getURLorResURL("com/c2kernel/utils/resources/");

     	allBaseURLs.put(null, baseURL);

     }

@@ -89,7 +89,7 @@ public class Resource implements ResourceLoader {
 	 * @see com.c2kernel.utils.ResourceLoader#addModuleBaseURL(java.lang.String, java.lang.String)

 	 */

     @Override

-	public void addModuleBaseURL(String ns, String newBaseURL) throws InvalidDataException {

+	public void addModuleBaseURL(String ns, String newBaseURL) throws InvalidData {

     	addModuleBaseURL(ns, getURLorResURL(newBaseURL));

     }

     

@@ -113,7 +113,7 @@ public class Resource implements ResourceLoader {
         return new URL(moduleBaseURLs.get(ns), resName);

     }

 

-    static private URL getURLorResURL(String newURL) throws InvalidDataException {

+    static private URL getURLorResURL(String newURL) throws InvalidData {

         URL result;

         try {

             result = new URL(newURL);

@@ -124,7 +124,7 @@ public class Resource implements ResourceLoader {
         }

         if (result == null) {

         	Logger.error("URL "+newURL+" could not be found");

-        	throw new InvalidDataException();

+        	throw new InvalidData();

         }

         return result;

     }

@@ -137,7 +137,7 @@ public class Resource implements ResourceLoader {
     	for (String ns : getAllBaseURLs().keySet()) {

     		try {

     			return getTextResource(ns, resName);

-    		} catch (ObjectNotFoundException ex) { }

+    		} catch (ObjectNotFound ex) { }

     	}

         Logger.warning("Text resource '"+resName+"' not found.");

         return null;

@@ -152,7 +152,7 @@ public class Resource implements ResourceLoader {
     	for (String ns : getAllBaseURLs().keySet()) {

         	try {

         		results.put(ns, getTextResource(ns, resName));

-        	} catch (ObjectNotFoundException ex) { }

+        	} catch (ObjectNotFound ex) { }

     	}

     	return results;

     }

@@ -161,7 +161,7 @@ public class Resource implements ResourceLoader {
 	 * @see com.c2kernel.utils.ResourceLoader#getTextResource(java.lang.String, java.lang.String)

 	 */

     @Override

-	public String getTextResource(String ns, String resName) throws ObjectNotFoundException

+	public String getTextResource(String ns, String resName) throws ObjectNotFound

     //        throws IOException

     {

         Logger.msg(8, "Resource::getTextResource() - Getting resource from "+ns+": " + resName);

@@ -184,7 +184,7 @@ public class Resource implements ResourceLoader {
             txtCache.put(ns+'/'+resName, newRes);

             return newRes;

         } catch (Exception e) {

-            throw new ObjectNotFoundException(e.getMessage(),null);

+            throw new ObjectNotFound(e.getMessage());

         }

     }