Moved domain conversion classes to europa core

Moved the utilities allowing conversion from/to TREX domains to/from their europa counterpart to europa_core instead of the plugin so they can be used externally
fredpy · Jun 16, 2015 · ae2294a · ae2294a
1 parent d271c61
commit ae2294a
Show file tree

Hide file tree

Showing 8 changed files with 139 additions and 138 deletions.
diff --git a/extra/europa/CMakeLists.txt b/extra/europa/CMakeLists.txt
@@ -88,8 +88,6 @@ if(WITH_EUROPA)
 
   trex_plugin(europa europa_plugin.cc
     EuropaReactor.cc
-    europa_convert.cc
-    EuropaDomain.cc  
     extensions/Bind.cc
     extensions/DoNotMatchFilter.cc
     extensions/extensions.cc
@@ -99,8 +97,6 @@ if(WITH_EUROPA)
     extensions/Trigonometry.cc
     # headers
     EuropaReactor.hh
-    bits/europa_convert.hh
-    EuropaEntity.hh
     extensions/Bind.hh
     extensions/DoNotMatchFilter.hh
     extensions/EarliestFirstFlawManager.hh

diff --git a/extra/europa/EuropaReactor.cc b/extra/europa/EuropaReactor.cc
@@ -33,7 +33,7 @@
  */
 #include "EuropaReactor.hh"
 
-#include "bits/europa_convert.hh"
+#include <trex/europa/bits/europa_convert.hh>
 #include "core/private/CurrentState.hh"
 
 #include <trex/utils/chrono_helper.hh>

diff --git a/extra/europa/core/CMakeLists.txt b/extra/europa/core/CMakeLists.txt
@@ -45,17 +45,21 @@ add_library(TREXeuropa_core SHARED
   Assembly.cc
   core.cc
   CurrentState.cc
+  EuropaDomain.cc
   TrexThreatDecisionPoint.cc
   DeliberationFilter.cc
+  europa_convert.cc
   europa_helpers.cc
   ModeConstraints.cc
   ReactorConstraints.cc
   Schema.cc
   SynchronizationManager.cc
   TimeConstraints.cc
-  # headers 
+  # headers
+  private/EuropaDomain.hh
   ../trex/europa/Assembly.hh
   ../trex/europa/DeliberationFilter.hh
+  ../trex/europa/EuropaEntity.hh
   ../trex/europa/EuropaException.hh
   ../trex/europa/EuropaPlugin.hh
   ../trex/europa/ModeConstraints.hh
@@ -64,6 +68,7 @@ add_library(TREXeuropa_core SHARED
   ../trex/europa/SynchronizationManager.hh
   ../trex/europa/TimeConstraints.hh
   ../trex/europa/TrexThreatDecisionPoint.hh
+  ../trex/europa/bits/europa_convert.hh
   ../trex/europa/bits/europa_helpers.hh
   ../trex/europa/config.hh
 )
@@ -72,7 +77,7 @@ source_group("Header\ Files\\bits" FILES
   ../trex/europa/bits/europa_helpers.hh
 )
 
-target_link_libraries(TREXeuropa_core ${EUROPA_LIBRARIES} TREXutils 
+target_link_libraries(TREXeuropa_core ${EUROPA_LIBRARIES} TREXdomain
   ${Boost_REGEX_LIBRARY})
 
 trex_lib(TREXeuropa_core extra)

diff --git a/extra/europa/EuropaDomain.cc → extra/europa/core/EuropaDomain.cc b/extra/europa/EuropaDomain.cc → extra/europa/core/EuropaDomain.cc
@@ -32,9 +32,9 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "EuropaEntity.hh"
+#include <trex/europa/EuropaEntity.hh>
 #include "private/EuropaDomain.hh"
-#include "bits/europa_convert.hh"
+#include <trex/europa/bits/europa_convert.hh>
 
 using namespace TREX::europa;
 using namespace TREX;

diff --git a/extra/europa/europa_convert.cc → extra/europa/core/europa_convert.cc b/extra/europa/europa_convert.cc → extra/europa/core/europa_convert.cc
@@ -31,11 +31,11 @@
  *  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-#include "bits/europa_convert.hh"
+#include <trex/europa/bits/europa_convert.hh>
 
 
 #include <trex/europa/EuropaException.hh>
-#include "EuropaEntity.hh"
+#include <trex/europa/EuropaEntity.hh>
 #include "private/EuropaDomain.hh"
 
 #include <trex/domain/BooleanDomain.hh>

diff --git a/extra/europa/private/EuropaDomain.hh → extra/europa/core/private/EuropaDomain.hh b/extra/europa/private/EuropaDomain.hh → extra/europa/core/private/EuropaDomain.hh
diff --git a/extra/europa/EuropaEntity.hh → extra/europa/trex/europa/EuropaEntity.hh b/extra/europa/EuropaEntity.hh → extra/europa/trex/europa/EuropaEntity.hh