Print

Print


Commit in java/trunk/conditions/src/main/java/org/hps/conditions on MAIN
TestRunConditionsReader.java-50391 removed
deprecated/HpsConditionsReader.java+1-1391 -> 392
+1-51
1 removed + 1 modified, total 2 files
Move TestRunConditionsReader to deprecated package.

java/trunk/conditions/src/main/java/org/hps/conditions
TestRunConditionsReader.java removed after 391
--- java/trunk/conditions/src/main/java/org/hps/conditions/TestRunConditionsReader.java	2014-03-26 23:09:46 UTC (rev 391)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/TestRunConditionsReader.java	2014-03-26 23:28:53 UTC (rev 392)
@@ -1,50 +0,0 @@
-package org.hps.conditions;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.lcsim.conditions.ConditionsManager;
-import org.lcsim.conditions.ConditionsReader;
-
-/**
- * This is a simple extension of {@link org.lcsim.conditions.ConditionsReader} to find
- * text file conditions data for the HPS Test Run 2012.  It basically just checks
- * two resource locations for files and fails if they do not exist.
- * 
- * @author Sho Uemura <[log in to unmask]>
- * @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: TestRunConditionsReader.java,v 1.4 2013/10/17 23:04:19 jeremy Exp $
- */
-public class TestRunConditionsReader extends ConditionsReader {
-
-    private String detectorName = null;
-
-    public TestRunConditionsReader(ConditionsReader reader) {
-    }
-
-    public InputStream open(String name, String type) throws IOException {
-        
-        //System.out.println(this.getClass().getSimpleName() + ".open - " + name + ", " + type);
-        
-        // Check the detector base directory.
-        InputStream in = getClass().getResourceAsStream("/" + detectorName + "/" + name + "." + type);
-        if (in == null) {
-            // Check for embedded jar resources e.g. in hps-java.
-            in = getClass().getResourceAsStream("/org/hps/calib/testrun/" + name + "." + type);
-
-            // If these failed to find conditions, then something went wrong.
-            if (in == null) {
-                throw new IOException("Conditions " + name + " for " + detectorName + " with type " + type + " were not found");
-            }       
-        }
-        return in;
-    }
-
-    public void close() throws IOException {
-    }
-
-    public boolean update(ConditionsManager manager, String detectorName, int run) throws IOException {
-        this.detectorName = detectorName;
-        return true;
-    }
-}

java/trunk/conditions/src/main/java/org/hps/conditions/deprecated
HpsConditionsReader.java 391 -> 392
--- java/trunk/conditions/src/main/java/org/hps/conditions/deprecated/HpsConditionsReader.java	2014-03-26 23:09:46 UTC (rev 391)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/deprecated/HpsConditionsReader.java	2014-03-26 23:28:53 UTC (rev 392)
@@ -23,7 +23,7 @@
     public InputStream open(String name, String type) throws IOException {
         InputStream in = getClass().getResourceAsStream("/" + detectorName + "/" + name + "." + type);
         if (in == null) {
-            in = getClass().getResourceAsStream("/org/lcsim/hps/calib/proposal2014/" + name + "." + type);
+            in = getClass().getResourceAsStream("/org/hps/calib/proposal2014/" + name + "." + type);
             if (in == null) {
                 throw new IOException("Conditions " + name + " for " + detectorName + " with type " + type + " were not found");
             }
SVNspam 0.1