Commit in lcsim/src/org/lcsim on MAIN
util/loop/DetectorConditionsConverter.java+2-11.2 -> 1.3
conditions/ConditionsManager.java+4-41.7 -> 1.8
+6-5
2 modified files
Throw conditions not found, rather than Runtime exception

lcsim/src/org/lcsim/util/loop
DetectorConditionsConverter.java 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- DetectorConditionsConverter.java	12 Sep 2007 18:43:07 -0000	1.2
+++ DetectorConditionsConverter.java	25 Sep 2007 19:47:57 -0000	1.3
@@ -4,6 +4,7 @@
 
 import org.lcsim.conditions.ConditionsConverter;
 import org.lcsim.conditions.ConditionsManager;
+import org.lcsim.conditions.ConditionsManager.ConditionsSetNotFoundException;
 import org.lcsim.conditions.RawConditions;
 import org.lcsim.geometry.Detector;
 import org.lcsim.geometry.GeometryReader;
@@ -28,7 +29,7 @@
       }
       catch (Exception x)
       {
-         throw new RuntimeException("Error reading detector condition item '"+name+"' for detector '"+manager.getDetector()+"'",x);
+         throw new ConditionsSetNotFoundException("Error reading detector condition item '"+name+"' for detector '"+manager.getDetector()+"'",x);
       }
    }  
 

lcsim/src/org/lcsim/conditions
ConditionsManager.java 1.7 -> 1.8
diff -u -r1.7 -r1.8
--- ConditionsManager.java	3 Apr 2007 18:02:34 -0000	1.7
+++ ConditionsManager.java	25 Sep 2007 19:47:57 -0000	1.8
@@ -105,11 +105,11 @@
     */
    public static class ConditionsNotFoundException extends Exception
    {
-      ConditionsNotFoundException(String name, int run)
+      public ConditionsNotFoundException(String name, int run)
       {
          super("Conditions not found for detector "+name);
       }
-      ConditionsNotFoundException(String name, int run, Throwable t)
+      public ConditionsNotFoundException(String name, int run, Throwable t)
       {
          super("Conditions not found for detector "+name,t);
       }
@@ -120,11 +120,11 @@
     */
    public static class ConditionsSetNotFoundException extends RuntimeException
    {
-      ConditionsSetNotFoundException(String message)
+      public ConditionsSetNotFoundException(String message)
       {
          super(message);
       }
-      ConditionsSetNotFoundException(String message, Throwable t)
+      public ConditionsSetNotFoundException(String message, Throwable t)
       {
          super(message,t);
       }
CVSspam 0.2.8