Print

Print


Commit in lcsim/src/org/lcsim/util/lcio on MAIN
AbstractBlockHandler.java+1-51.5 -> 1.6
SIOLCParameters.java+5-11.2 -> 1.3
+6-6
2 modified files
Fix for older LCIO files (like those produced by LeLaps)

lcsim/src/org/lcsim/util/lcio
AbstractBlockHandler.java 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- AbstractBlockHandler.java	2 Aug 2005 17:18:06 -0000	1.5
+++ AbstractBlockHandler.java	26 Aug 2005 00:26:56 -0000	1.6
@@ -27,11 +27,7 @@
       
       int flags = in.readInt();
       
-      SIOLCParameters colParameters = null;
-      if( version > 1001  )
-      {
-         colParameters = new SIOLCParameters(in) ;
-      }
+      SIOLCParameters colParameters = version > 1001 ? new SIOLCParameters(in) : new SIOLCParameters();
       int n = in.readInt();
       LCIOCollection collection = new LCIOCollection(getClassForType(), flags, n, colParameters);
       event.put(block.getBlockName(),collection);

lcsim/src/org/lcsim/util/lcio
SIOLCParameters.java 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- SIOLCParameters.java	26 Jul 2005 14:44:35 -0000	1.2
+++ SIOLCParameters.java	26 Aug 2005 00:26:56 -0000	1.3
@@ -12,7 +12,7 @@
 /**
  *
  * @author Frank Gaede
- * @version $Id: SIOLCParameters.java,v 1.2 2005/07/26 14:44:35 tonyj Exp $
+ * @version $Id: SIOLCParameters.java,v 1.3 2005/08/26 00:26:56 tonyj Exp $
  */
 class SIOLCParameters
 {
@@ -33,6 +33,10 @@
    {
       return _stringMap;
    }
+   SIOLCParameters()
+   {
+      
+   }
    SIOLCParameters(SIOInputStream in) throws IOException
    {
       int nIntParameters =  in.readInt();
CVSspam 0.2.8