COMP: rearranged includes. Removed CompontentFactory

Modules/Core/ComponentInterface/include/selxNetworkBuilder.h

@@ -35,7 +35,6 @@
 #include "selxMacro.h"
 #include "selxBlueprint.h"
 #include "selxNetworkContainer.h"
-#include "selxComponentFactory.h"
 #include "selxInterfaces.h"
 #include "selxInterfaceTraits.h"
 

Modules/Core/ComponentInterface/include/selxNetworkBuilderBase.h

@@ -20,8 +20,6 @@
 #ifndef NetworkBuilderBase_h
 #define NetworkBuilderBase_h
 
-#include "selxAnyFileReader.h"
-#include "selxAnyFileWriter.h"
 
 #include <list>
 #include <vector>
@@ -31,12 +29,15 @@
 #include <cstring>
 #include <map>
 
+#include "selxComponentSelector.h"
+#include "selxComponentBase.h"
+#include "selxInterfaces.h"
+#include "selxInterfaceTraits.h"
 #include "selxMacro.h"
 #include "selxBlueprint.h"
 #include "selxNetworkContainer.h"
-#include "selxComponentFactory.h"
-#include "selxInterfaces.h"
-#include "selxInterfaceTraits.h"
+#include "selxAnyFileReader.h"
+#include "selxAnyFileWriter.h"
 
 namespace selx
 {

Modules/Core/Filter/src/selxSuperElastixFilter.cxx

@@ -115,7 +115,8 @@ SuperElastixFilter
       {
         msg << unusedInput << std::endl;
       }
-      itkExceptionMacro( << msg.str() )
+      //itkExceptionMacro( << msg.str() )
+      throw std::runtime_error(msg.str());
     }
   }
 
@@ -143,7 +144,8 @@ SuperElastixFilter
       {
         msg << unusedOutput << std::endl;
       }
-      itkExceptionMacro( << msg.str() )
+      //itkExceptionMacro( << msg.str() )
+      throw std::runtime_error(msg.str());
     }
   }