Author: [log in to unmask]
Date: Thu Jan  1 23:40:08 2015
New Revision: 3470

Log:
Remove ignore run numbers flag as it is not very smart.  Make variables protected instead of private and make fireConditionsChanged protected.

Modified:
    projects/lcsim/trunk/conditions/src/main/java/org/lcsim/conditions/ConditionsManagerImplementation.java
    projects/lcsim/trunk/conditions/src/main/java/org/lcsim/conditions/ConditionsReader.java

Modified: projects/lcsim/trunk/conditions/src/main/java/org/lcsim/conditions/ConditionsManagerImplementation.java
 =============================================================================
--- projects/lcsim/trunk/conditions/src/main/java/org/lcsim/conditions/ConditionsManagerImplementation.java	(original)
+++ projects/lcsim/trunk/conditions/src/main/java/org/lcsim/conditions/ConditionsManagerImplementation.java	Thu Jan  1 23:40:08 2015
@@ -12,16 +12,15 @@
 /**
  * @author Tony Johnson
  */
-
 public class ConditionsManagerImplementation extends ConditionsManager {
-    private Map<Class, ConditionsConverter> converters = new HashMap<Class, ConditionsConverter>();
-    private Map<String, CachedConditions> cache = new HashMap<String, CachedConditions>();
-    private ConditionsReader reader;
-    private String detectorName;
-    private int run;
-    private List<ConditionsListener> listenerList = new ArrayList<ConditionsListener>();
-    private static final Logger logger = Logger.getLogger(ConditionsManagerImplementation.class.getName());
-    boolean ignoreRunNumbers = false;
+    
+    protected Map<Class, ConditionsConverter> converters = new HashMap<Class, ConditionsConverter>();
+    protected Map<String, CachedConditions> cache = new HashMap<String, CachedConditions>();
+    protected ConditionsReader reader;
+    protected String detectorName;
+    protected int run;
+    protected List<ConditionsListener> listenerList = new ArrayList<ConditionsListener>();
+    protected static final Logger logger = Logger.getLogger(ConditionsManagerImplementation.class.getName());
 
     /**
      * The default implementation of ConditionsManager. This implementation does
@@ -35,7 +34,7 @@
     }
 
     public void setDetector(String detectorName, int run) throws ConditionsNotFoundException {
-        if ((!ignoreRunNumbers && this.run != run) || !detectorName.equals(this.detectorName)) {
+        if ((this.run != run) || !detectorName.equals(this.detectorName)) {
             ConditionsReader newReader = null;
             if (reader == null) {
                 newReader = ConditionsReader.create(this, detectorName, run);
@@ -116,7 +115,7 @@
         listenerList.remove(l);
     }
 
-    void fireConditionsChanged() {
+    protected void fireConditionsChanged() {
         ConditionsEvent event = new ConditionsEvent(this);
         ArrayList<ConditionsListener> listeners = new ArrayList<ConditionsListener>(listenerList);
         for (ConditionsListener cl : listeners)
@@ -146,8 +145,4 @@
     protected ConditionsReader getConditionsReader() {
         return reader;
     }
-    
-    public void setIgnoreRunNumbers(boolean ignoreRunNumbers) {
-        this.ignoreRunNumbers = ignoreRunNumbers;
-    }
 }

Modified: projects/lcsim/trunk/conditions/src/main/java/org/lcsim/conditions/ConditionsReader.java
 =============================================================================
--- projects/lcsim/trunk/conditions/src/main/java/org/lcsim/conditions/ConditionsReader.java	(original)
+++ projects/lcsim/trunk/conditions/src/main/java/org/lcsim/conditions/ConditionsReader.java	Thu Jan  1 23:40:08 2015
@@ -149,7 +149,7 @@
             }
 
             name = resolveAlias(detectorName);
-
+              
             if (name.contains(":")) {
                 // Name is a URL.
                 URL url = new URL(name);

########################################################################
Use REPLY-ALL to reply to list

To unsubscribe from the LCDET-SVN list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCDET-SVN&A=1