Integrate Moduli in Sumatra again

See merge request main/Sumatra!1904 sumatra-commit: 18f3ba02cd02403e475899908dd499a92dcd209f
TIGERs-Mannheim · Feb 22, 2025 · e6a0421 · e6a0421
1 parent c9d5877
commit e6a0421
Show file tree

Hide file tree

Showing 73 changed files with 4,367 additions and 50 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -22,11 +22,7 @@ com-fasterxml-jackson-core-jackson-databind = { module = "com.fasterxml.jackson.
 com-github-TIGERs-Mannheim-infonode = "com.github.TIGERs-Mannheim:infonode:1.7.0"
 com-github-TIGERs-Mannheim-jinput = "com.github.TIGERs-Mannheim.jinput:jinput:2.0.10.1"
 com-github-TIGERs-Mannheim-matlabcontrol = "com.github.TIGERs-Mannheim.matlabcontrol:matlabcontrol:4.1.2"
-com-github-TIGERs-Mannheim-moduli = "com.github.TIGERs-Mannheim:moduli:4.1"
 com-github-TIGERs-Mannheim-ssl-game-controller-maven = "com.github.TIGERs-Mannheim:ssl-game-controller-maven:3.12.8.1"
-com-github-g3force-configurable = "com.github.g3force:configurable:3.0"
-com-github-g3force-instanceables = "com.github.g3force:instanceables:5.2"
-com-github-g3force-string2ValueConverter = "com.github.g3force:String2ValueConverter:2.2.1"
 com-google-guava = "com.google.guava:guava:33.4.0-jre"
 com-google-protobuf-protobuf-java = { module = "com.google.protobuf:protobuf-java", version.ref = "com-google-protobuf" }
 com-google-protobuf-protobuf-java-util = { module = "com.google.protobuf:protobuf-java-util", version.ref = "com-google-protobuf" }
@@ -37,6 +33,7 @@ com-miglayout-miglayout-core = { module = "com.miglayout:miglayout-core", versio
 com-miglayout-miglayout-swing = { module = "com.miglayout:miglayout-swing", version.ref = "com-miglayout" }
 commons-cli = "commons-cli:commons-cli:1.9.0"
 commons-codec = "commons-codec:commons-codec:1.17.2"
+commons-collections = "commons-collections:commons-collections:3.2.1"
 commons-configuration = "commons-configuration:commons-configuration:1.10"
 commons-io = "commons-io:commons-io:2.18.0"
 commons-lang = "commons-lang:commons-lang:2.6"
@@ -59,6 +56,7 @@ org-apache-logging-log4j-log4j-slf4j2-impl = { module = "org.apache.logging.log4
 org-assertj-assertj-core = "org.assertj:assertj-core:3.27.2"
 org-hamcrest = "org.hamcrest:hamcrest:3.0"
 org-influxdb-influxdb-java = "org.influxdb:influxdb-java:2.24"
+org-jgraph-jgraph-core = "org.jgrapht:jgrapht-core:1.5.1"
 org-junit-jupiter-junit-jupiter = "org.junit.jupiter:junit-jupiter:5.11.4"
 org-junit-platform-junit-platform-launcher = "org.junit.platform:junit-platform-launcher:1.11.4"
 org-junit-vintage-junit-vintage-engine = "org.junit.vintage:junit-vintage-engine:5.11.4"

diff --git a/modules/autoreferee-gui/build.gradle b/modules/autoreferee-gui/build.gradle
@@ -8,6 +8,7 @@ plugins {
 }
 
 dependencies {
+    implementation project(':common')
     implementation project(':common-math')
     implementation project(':common-gui')
     implementation project(':sumatra-model')
@@ -16,8 +17,7 @@ dependencies {
     implementation project(':moduli-wp')
     implementation project(':moduli-geometry')
 
-    implementation(libs.com.github.TIGERs.mannheim.moduli)
-    implementation(libs.com.github.g3force.configurable)
+    implementation project(':moduli')
 
     implementation(libs.commons.lang)
     implementation(libs.com.miglayout.miglayout.swing)

diff --git a/modules/autoreferee-gui/src/main/java/edu/tigers/autoref/presenter/GameLogPresenter.java b/modules/autoreferee-gui/src/main/java/edu/tigers/autoref/presenter/GameLogPresenter.java
@@ -14,7 +14,7 @@
 import edu.tigers.autoreferee.engine.log.RefereeGameEventGameLogEntry;
 import edu.tigers.autoreferee.engine.log.RefereeGameEventProposalGameLogEntry;
 import edu.tigers.autoreferee.module.AutoRefModule;
-import edu.tigers.moduli.listenerVariables.ModulesState;
+import edu.tigers.moduli.ModulesState;
 import edu.tigers.sumatra.components.EnumCheckBoxPanel;
 import edu.tigers.sumatra.model.SumatraModel;
 import edu.tigers.sumatra.referee.data.GameEventProposalGroup;

diff --git a/modules/common-gui-config/build.gradle b/modules/common-gui-config/build.gradle
@@ -8,11 +8,10 @@ plugins {
 }
 
 dependencies {
+    implementation project(':common')
     implementation project(':common-gui')
     implementation project(':sumatra-model')
 
-    implementation(libs.com.github.g3force.configurable)
-    implementation(libs.com.github.g3force.string2ValueConverter)
 
     implementation(libs.commons.configuration)
 

diff --git a/modules/common-gui/build.gradle b/modules/common-gui/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation project(':moduli-record')
 
     implementation(libs.com.github.TIGERs.mannheim.infonode)
-    api(libs.com.github.TIGERs.mannheim.moduli)
+    api project(':moduli')
 
     implementation(libs.commons.configuration)
 

diff --git a/modules/common-gui/src/main/java/edu/tigers/sumatra/views/ISumatraPresenter.java b/modules/common-gui/src/main/java/edu/tigers/sumatra/views/ISumatraPresenter.java
@@ -5,7 +5,7 @@
 package edu.tigers.sumatra.views;
 
 import edu.tigers.moduli.IModuliStateObserver;
-import edu.tigers.moduli.listenerVariables.ModulesState;
+import edu.tigers.moduli.ModulesState;
 
 import java.util.List;
 

diff --git a/modules/common-math/build.gradle b/modules/common-math/build.gradle
@@ -10,8 +10,6 @@ plugins {
 }
 
 dependencies {
-    implementation(libs.com.github.g3force.string2ValueConverter)
-
     api(libs.org.apache.commons.commons.math3)
     implementation(libs.commons.lang)
 

diff --git a/...c/main/resources/META-INF/services/com.github.g3force.s2vconverter.IString2ValueConverter b/...c/main/resources/META-INF/services/com.github.g3force.s2vconverter.IString2ValueConverter
@@ -2,5 +2,5 @@
 # Copyright (c) 2009 - 2017, DHBW Mannheim - TIGERs Mannheim
 #
 
-edu.tigers.sumatra.math.vector.VectorConverter
-edu.tigers.sumatra.math.pose.PoseConverter
+com.github.g3force.s2vconverter.VectorConverter
+com.github.g3force.s2vconverter.PoseConverter
diff --git a/modules/common/build.gradle b/modules/common/build.gradle
@@ -13,9 +13,9 @@ dependencies {
     api project(':common-math')
 
     implementation(libs.com.github.TIGERs.mannheim.matlabcontrol)
-    implementation(libs.com.github.g3force.string2ValueConverter)
 
     implementation(libs.commons.lang)
+    implementation(libs.commons.configuration)
     implementation(libs.org.apache.commons.commons.math3)
 
     implementation(libs.org.apache.logging.log4j.log4j.api)
@@ -27,7 +27,9 @@ dependencies {
     implementation(libs.com.googlecode.json.simple)
 
     testImplementation(libs.org.hamcrest)
+    testImplementation(libs.org.assertj.assertj.core)
     testImplementation(libs.org.openjdk.jmh.jmh.core)
+    testRuntimeOnly(libs.commons.collections)
     testAnnotationProcessor(libs.org.openjdk.jmh.jmh.generator.annprocess)
 }
 

diff --git a/modules/common/config/read.xml b/modules/common/config/read.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration base="com.github.g3force.configurable.ConfigClass4">
+    <testStoredDifferent>42</testStoredDifferent>
+</configuration>