Remove dynamic exceptions from files (#2)

.travis-ci.d/compile_and_test.sh

@@ -7,6 +7,6 @@ cd /Package
 mkdir build
 cd build
 cmake -GNinja -DUSE_CXX11=ON -DBUILD_ROOTDICT=ON -DCMAKE_CXX_FLAGS="-fdiagnostics-color=always" .. && \
-ninja && \
+ninja  -k 0 && \
 ninja install && \
 ctest --output-on-failure

cmake/lcio_namespaces.h.in

@@ -12,6 +12,7 @@
 #include "EVENT/LCIO.h"
 #include "IOIMPL/LCFactory.h"
 #include "IMPL/LCIOExceptionHandler.h"
+#include "Exceptions.h"
 
 
 /** \mainpage <a href="http://lcio.desy.de">LCIO</a> (v@LCIO_VERSION_MAJOR@-@LCIO_VERSION_MINOR@-@LCIO_VERSION_PATCH@)

src/aid/EVENT/LCCollection.aid

@@ -83,15 +83,22 @@ public interface LCCollection
      *
      * @throws ReadOnlyException
      */
+@ifdef cpp
+    public void addElement(LCObject* obj) ;
+@else
     public void addElement(LCObject* obj) throws ReadOnlyException ;
-    
+@endif
 
     /** Removes the i-th element from the collection. Throws an exception 
      * if the collection (event) is 'read only'.
      *
      * @throws ReadOnlyException
      */
+@ifdef cpp
+    public void removeElementAt(int i) ;
+@else
     public void removeElementAt(int i) throws ReadOnlyException ;
+@endif
 
 
     /** Set the flag word. This is allowed in 'read only' mode.

src/aid/EVENT/LCEvent.aid

@@ -46,7 +46,11 @@ public interface LCEvent {
      *
      * @throws DataNotAvailableException
      */
-     public LCCollection* getCollection(const String& name) const throws DataNotAvailableException ;
+@ifdef cpp
+    public LCCollection* getCollection(const String& name) const ;
+@else
+    public LCCollection* getCollection(const String& name) const throws DataNotAvailableException ;
+@endif
 
 @ifdef cpp
     /** Returns the collection for the given name and transfers the ownership of the collection
@@ -57,7 +61,7 @@ public interface LCEvent {
      *  Use with care!
      * @throws DataNotAvailableException
      */
-     public LCCollection* takeCollection(const String& name) const throws DataNotAvailableException ;
+     public LCCollection* takeCollection(const String& name) const ;
 @endif
 
     /** Adds a collection with the given name (has to be a valid C/C++ variable name). 
@@ -66,15 +70,24 @@ public interface LCEvent {
      *
      *@see validateCollectionName
      *@throws EventException
-     */ 
+     */
+@ifdef cpp
+    public void addCollection(LCCollection* col ,const  String& name ) ;
+@else
     public void addCollection(LCCollection* col ,const  String& name ) throws EventException ;
+@endif
+
 
     /** Removes (and deletes) the collection with name (if it exists in the event). 
      * Throws an exception if the event is 'read only' as defined by the read mode in LCReader.
      *
      *@throws ReadOnlyException
-     */ 
+     */
+@ifdef cpp
+    public void removeCollection(const  String& name ) ;
+@else
     public void removeCollection(const  String& name ) throws ReadOnlyException ;
+@endif
 
     /** Parameters defined for this event.
      */

src/aid/IO/LCReader.aid

@@ -24,7 +24,12 @@ public interface LCReader {
      *
      * @throws IOException
      */
+@ifdef cpp
+    public void open(const String& filename) ;
+@else
     public void open(const String& filename) throws IOException  ;
+@endif
+
 
 
     /** Opens a list of files for reading (read-only). All subsequent
@@ -34,50 +39,72 @@ public interface LCReader {
      *
      * @throws IOException
      */
+@ifdef cpp
+    public void open(const String[]& filenames) ;
+@else
     public void open(const String[]& filenames) throws IOException  ;
+@endif
+
 
 
     /** Reads the next run header from the file. Returns NULL if
      * 'EOF' read. 
      *
      * @throws IOException
      */
+@ifdef cpp
+    public LCRunHeader* readNextRunHeader() ;
+@else
     public LCRunHeader* readNextRunHeader() throws IOException ;
+@endif
 
     /** Same as readNextRunHeader() but allows to set the access mode 
      *  LCIO::READ_ONLY (default) or LCIO::Update. 
      *
      * @throws IOException
      */
+@ifdef cpp
+    public LCRunHeader* readNextRunHeader(int accessMode) ;
+@else
     public LCRunHeader* readNextRunHeader(int accessMode) throws IOException ;
+@endif
 
     /** Reads the next event from the file. Returns NULL if
      * 'EOF' read. 
      *
      * @throws IOException
      */
+@ifdef cpp
+    public LCEvent* readNextEvent() ;
+@else
     public LCEvent* readNextEvent() throws IOException ;
+@endif
 
     /** Same as readNextEvent() but allows to set the access mode 
      *  LCIO::READ_ONLY (default) or LCIO::Update. 
      *
      * @throws IOException
      */
+@ifdef cpp
+    public LCEvent* readNextEvent(int accessMode) ;
+@else
     public LCEvent* readNextEvent(int accessMode) throws IOException ;
+@endif
+
 
     @ifdef cpp
 
     /** Return the number of events in the file - the file has to be open. In
      *  case several input files are specified in the open() method - 
      *  the number of events in the file that is currently open is returned. 
      */
-     public int getNumberOfEvents() throws IOException;
+     public int getNumberOfEvents() ;
 
     /** Return the number of runs (run headers) in the file - the file has to be open. In
      *  case several input files are specified in the open() method - 
      *  the number of runs (run headers) in the file that is currently open is returned. 
      */
-     public int getNumberOfRuns() throws IOException;
+     public int getNumberOfRuns() ;
 
     /** Return the run numbers of the runs (run headers) in the file - the file has to be open. In
      *  case several input files are specified in the open() method - 
@@ -105,41 +132,65 @@ public interface LCReader {
   /** Skips the next n events from the current position.
      * @throws IOException
      */
+@ifdef cpp
+    public void skipNEvents(int n) ;
+@else
     public void skipNEvents(int n) throws IOException;
+@endif
 
     /** Reads the specified runHeader from file. Returns NULL if
      *  the specified runHeader hasn't been found in the file.
      *
      * @throws IOException
      */
+@ifdef cpp
+    public LCRunHeader* readRunHeader(int runNumber ) ;
+@else
     public LCRunHeader* readRunHeader(int runNumber ) throws IOException  ;
+@endif
 
     /** Same as LCEvent* readRunHeader(int runNumber) 
      *  allowing to set the access mode LCIO::READ_ONLY (default) or LCIO::Update.
      *
      * @throws IOException
      */
+@ifdef cpp
+    public LCRunHeader* readRunHeader(int runNumber, int accessMode) ;
+@else
     public LCRunHeader* readRunHeader(int runNumber, int accessMode) throws IOException  ;
+@endif
 
     /** Reads the specified event from file. Returns NULL if
      *  the specified event hasn't been found in the file.
      *
      * @throws IOException
      */
+@ifdef cpp
+    public LCEvent* readEvent(int runNumber, int evtNumber) ;
+@else
     public LCEvent* readEvent(int runNumber, int evtNumber) throws IOException  ;
+@endif
 
     /** Same as LCEvent* readEvent(int runNumber, int evtNumber) 
      *  allowing to set the access mode LCIO::READ_ONLY (default) or LCIO::Update.
      *
      * @throws IOException
      */
+@ifdef cpp
+    public LCEvent* readEvent(int runNumber, int evtNumber, int accessMode) ;
+@else
     public LCEvent* readEvent(int runNumber, int evtNumber, int accessMode) throws IOException  ;
+@endif
 
     /** Closes the output file/stream etc.
      *
      * @throws IOException
      */
+@ifdef cpp
+    public void close() ;
+@else
     public void close() throws IOException ;
+@endif
 
 
     /** Registers a listener for reading LCEvents from a stream.
@@ -164,13 +215,21 @@ public interface LCReader {
      *
      * @throws IOException
      */
+@ifdef cpp
+    public void readStream() ;
+@else
     public void readStream() throws IOException ;
+@endif
 
     /** Reads maxRecord from the input stream and notifies registered 
      * listeners according to the object type found in the stream.
      * An exception is thrown if less than maxRecord where read from the file.
      *
      * @throws IOException
      */
+@ifdef cpp
+    public void readStream(int maxRecord) ;
+@else
     public void readStream(int maxRecord) throws IOException ;
+@endif
 }

src/aid/IO/LCWriter.aid

@@ -19,15 +19,23 @@ public interface LCWriter {
      *
      *@throws IOException
      */
+@ifdef cpp
+    public void open(const String& filename ) ;
+@else
     public void open(const String& filename ) throws IOException ;
+@endif
 
     /** Opens a file for writing.
      * Possible write modes are: LCIO::WRITE_NEW
      * (existing files are replaced) and LCIO::WRITE_APPEND. 
      *
      *@throws IOException
      */
+@ifdef cpp
+    public void open(const String& filename , int writeMode ) ;
+@else
     public void open(const String& filename , int writeMode ) throws IOException ;
+@endif
 
 
     /** Set the compression level - needs to be called before open() otherwise
@@ -53,23 +61,39 @@ public interface LCWriter {
      *
      *@throws IOException
      */
+@ifdef cpp
+    public void writeRunHeader(const LCRunHeader*  hdr) ;
+@else
     public void writeRunHeader(const LCRunHeader*  hdr) throws IOException ;
+@endif
 
     /** Writes the given event to file.
      *
      *@throws IOException
      */
+@ifdef cpp
+    public void writeEvent(const LCEvent*  evt) ;
+@else
     public void writeEvent(const LCEvent*  evt) throws IOException ;
+@endif
 
     /** Closes the output file/stream.
      *
      *@throws IOException
      */
+@ifdef cpp
+    public void close() ;
+@else
     public void close() throws IOException ;
+@endif
 
     /** Flushes the output file/stream.
      *
      *@throws IOException
      */
-    public void flush() throws IOException ;    
+@ifdef cpp
+    public void flush() ;
+@else
+    public void flush() throws IOException ;
+@endif
 }

src/cpp/include/IMPL/AccessChecked.h

@@ -27,8 +27,8 @@ namespace IMPL {
   protected:
     virtual void setReadOnly( bool readOnly ) ;
 
-    void checkAccess() throw ( EVENT::ReadOnlyException ) ;
-    void checkAccess(const char* what) throw ( EVENT::ReadOnlyException ) ;
+    void checkAccess()  ;
+    void checkAccess(const char* what)  ;
 
   protected: 
     bool _readOnly{false} ;

src/cpp/include/IMPL/LCCollectionVec.h

@@ -125,14 +125,14 @@ namespace IMPL {
      *
      * @throws ReadOnlyException
      */
-    virtual void addElement(EVENT::LCObject * obj) throw (EVENT::ReadOnlyException) ;
+    virtual void addElement(EVENT::LCObject * obj)  ;
 
     /** Removes the i-th element from the collection. Throws an exception 
      * if the collection (event) is 'read only'.
      *
      * @throws ReadOnlyException
      */
-    virtual void removeElementAt(int i) throw (EVENT::ReadOnlyException) ;
+    virtual void removeElementAt(int i)  ;
 
     /** Parameters defined for this run.
      */

src/cpp/include/IMPL/LCEventImpl.h

@@ -70,7 +70,7 @@ namespace IMPL{
      * @throws DataNotAvailableException
      */
     virtual EVENT::LCCollection * getCollection(const std::string & name) const 
-     throw (EVENT::DataNotAvailableException, std::exception) ;
+      ;
 
     /** Returns the collection for the given name and transfers the ownership of the collection
      *  to the caller. The caller is responsible for deleting the collection _after_ the Event is 
@@ -81,7 +81,7 @@ namespace IMPL{
      * @throws DataNotAvailableException
      */
     virtual EVENT::LCCollection * takeCollection(const std::string & name) const 
-      throw (EVENT::DataNotAvailableException, std::exception ) ;
+       ;
 
     /** Adds a collection with the given name (has to be a valid C/C++ variable name). 
      *	Throws an exception if the name already
@@ -91,14 +91,14 @@ namespace IMPL{
      *@throws EventException
      */ 
     virtual void addCollection(EVENT::LCCollection * col, const std::string & name)  
-      throw (EVENT::EventException, std::exception) ;
+       ;
 
     /** Removes (and deletes) the collection with name (if it exists in the event). 
      * Throws an exception if the event is 'read only' as defined by the read mode in LCReader.
      *
      *@throws ReadOnlyException
      */ 
-    virtual void removeCollection(const std::string & name) throw (EVENT::ReadOnlyException, std::exception)  ;
+    virtual void removeCollection(const std::string & name)   ;
 
 
 //     //fg20040528:   added relations to the event