From ce31e59e21a606dc97b969490b1e3cf19f170287 Mon Sep 17 00:00:00 2001 From: KarenBaliero Date: Wed, 19 Mar 2025 16:23:52 -0300 Subject: [PATCH 1/5] Edit mv plansubsystemmodule init --- .../unicamp/cst/util/viewer/MindViewer.java | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/src/main/java/br/unicamp/cst/util/viewer/MindViewer.java b/src/main/java/br/unicamp/cst/util/viewer/MindViewer.java index ead7754..18b4199 100644 --- a/src/main/java/br/unicamp/cst/util/viewer/MindViewer.java +++ b/src/main/java/br/unicamp/cst/util/viewer/MindViewer.java @@ -119,6 +119,27 @@ public MindViewer(Mind mind, String windowName, List behavioralCodelets Logger.getLogger("javax.swing").setLevel(Level.OFF); } + /** + * Creates new form WorldObjectViewer + * + * @param mind A Mind object + * @param windowName Name to be used by MindViewer + * @param behavioralCodelets A list of behavioral codelets + * @param jSoarCodelet A jSoarCodelet + */ + public MindViewer(Mind mind, String windowName, List behavioralCodelets, JSoarCodelet jSoarCodelet) { + this(mind, windowName,behavioralCodelets); + plansSubsystemModule.setjSoarCodelet(jSoarCodelet); + buildPlanModulePanel(); + } + + private void buildPlanModulePanel(){ + if(plansSubsystemModule.verifyExistCodelets()){ + plansSubsystemViewer = new PlansSubsystemViewer(Long.parseLong(txtRefreshTime.getText()), this); + tbControl.add("Plans Subsystem", plansSubsystemViewer); + } + } + private void buildMindModulePanels(Mind mind){ if(mind.getCodeletGroupsNumber() > 0) { @@ -129,11 +150,6 @@ private void buildMindModulePanels(Mind mind){ } } } - - if(plansSubsystemModule.verifyExistCodelets()){ - plansSubsystemViewer = new PlansSubsystemViewer(Long.parseLong(txtRefreshTime.getText()), this); - tbControl.add("Plans Subsystem", plansSubsystemViewer); - } } /** From f6ede87d06944369e9829d475614ba376c607307 Mon Sep 17 00:00:00 2001 From: KarenBaliero Date: Fri, 21 Mar 2025 12:09:49 -0300 Subject: [PATCH 2/5] Update module panel to search planning codelet --- .../unicamp/cst/util/viewer/MindViewer.java | 36 +++++++------------ 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/src/main/java/br/unicamp/cst/util/viewer/MindViewer.java b/src/main/java/br/unicamp/cst/util/viewer/MindViewer.java index 18b4199..021a3d4 100644 --- a/src/main/java/br/unicamp/cst/util/viewer/MindViewer.java +++ b/src/main/java/br/unicamp/cst/util/viewer/MindViewer.java @@ -119,28 +119,6 @@ public MindViewer(Mind mind, String windowName, List behavioralCodelets Logger.getLogger("javax.swing").setLevel(Level.OFF); } - /** - * Creates new form WorldObjectViewer - * - * @param mind A Mind object - * @param windowName Name to be used by MindViewer - * @param behavioralCodelets A list of behavioral codelets - * @param jSoarCodelet A jSoarCodelet - */ - public MindViewer(Mind mind, String windowName, List behavioralCodelets, JSoarCodelet jSoarCodelet) { - this(mind, windowName,behavioralCodelets); - plansSubsystemModule.setjSoarCodelet(jSoarCodelet); - buildPlanModulePanel(); - } - - private void buildPlanModulePanel(){ - if(plansSubsystemModule.verifyExistCodelets()){ - plansSubsystemViewer = new PlansSubsystemViewer(Long.parseLong(txtRefreshTime.getText()), this); - tbControl.add("Plans Subsystem", plansSubsystemViewer); - } - } - - private void buildMindModulePanels(Mind mind){ if(mind.getCodeletGroupsNumber() > 0) { if (mind.getCodeletGroupList("Motivational") != null) { @@ -148,8 +126,20 @@ private void buildMindModulePanels(Mind mind){ motivationalModuleViewer = new MotivationalSubsystemViewer(Long.parseLong(txtRefreshTime.getText()), mind); tbModules.add("Motivational Subsystem", motivationalModuleViewer); } - } + } + if (mind.getCodeletGroupList("Planning") != null) { + if (mind.getCodeletGroupList("Planning").size() > 0) { + JSoarCodelet jSoarCodelet = (JSoarCodelet) mind.getCodeletGroupList("Planning").get(0); + plansSubsystemModule.setjSoarCodelet(jSoarCodelet); + if(plansSubsystemModule.verifyExistCodelets()){ + plansSubsystemViewer = new PlansSubsystemViewer(Long.parseLong(txtRefreshTime.getText()), this); + tbControl.add("Plans Subsystem", plansSubsystemViewer); + } + } + } } + + } /** From d8684e3c004de0aa0a15aaca96e995a01920d1ed Mon Sep 17 00:00:00 2001 From: KarenBaliero Date: Fri, 21 Mar 2025 12:17:29 -0300 Subject: [PATCH 3/5] Update bindings version accept null value idea input link --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 52436ce..e9991cb 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ configurations { dependencies { //api('com.github.CST-Group:cst:e93dc57') - api('com.github.CST-Group:cst-bindings:1.1.0') + api('com.github.CST-Group:cst-bindings:ad26312') //api ':cst-bindings:1.0.6-full' api group: 'org.jfree', name: 'jfreechart', version: '1.0.19' api 'com.soartech:jsoar-core:4.1.3' From 1d2f211dbe223ba66dc474c085fb1df825e88d2a Mon Sep 17 00:00:00 2001 From: KarenBaliero Date: Sat, 19 Jul 2025 14:12:35 -0300 Subject: [PATCH 4/5] Update bindings to f5eb368 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e9991cb..9c65689 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ configurations { dependencies { //api('com.github.CST-Group:cst:e93dc57') - api('com.github.CST-Group:cst-bindings:ad26312') + api('com.github.CST-Group:cst-bindings:f5eb368') //api ':cst-bindings:1.0.6-full' api group: 'org.jfree', name: 'jfreechart', version: '1.0.19' api 'com.soartech:jsoar-core:4.1.3' From 9b67b7d13e3201310aa4cea2974051d0dc0775e3 Mon Sep 17 00:00:00 2001 From: KarenBaliero Date: Fri, 19 Sep 2025 15:02:43 -0300 Subject: [PATCH 5/5] Update gradle dependencies --- build.gradle | 48 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/build.gradle b/build.gradle index 9c65689..2f8e710 100644 --- a/build.gradle +++ b/build.gradle @@ -8,8 +8,20 @@ group = 'com.github.CST-Group' description = "CST-Desktop" -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +java { + //sourceCompatibility = JavaVersion.VERSION_11 + //targetCompatibility = JavaVersion.VERSION_11 + //sourceCompatibility = JavaVersion.VERSION_1_8 + //targetCompatibility = JavaVersion.VERSION_1_8 + + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + version = '1.1.0' repositories { @@ -18,12 +30,15 @@ repositories { } mavenCentral() maven { - url "https://github.com/rosjava/rosjava_mvn_repo/raw/master" + url = "https://github.com/rosjava/rosjava_mvn_repo/raw/master" } maven { - url "https://artifacts.camunda.com/artifactory/public/" + url = "https://artifacts.camunda.com/artifactory/public/" + } + maven { url = 'https://jitpack.io' } + maven { + url = 'https://cst-group.github.io/cst-dependencies/maven-repo/' } - maven { url 'https://jitpack.io' } } configurations { @@ -31,27 +46,20 @@ configurations { } dependencies { - //api('com.github.CST-Group:cst:e93dc57') api('com.github.CST-Group:cst-bindings:f5eb368') - //api ':cst-bindings:1.0.6-full' api group: 'org.jfree', name: 'jfreechart', version: '1.0.19' api 'com.soartech:jsoar-core:4.1.3' api 'com.soartech:jsoar-debugger:4.1.3' - //api 'org.ros.rosjava_core:rosjava:0.3.6' - //implementation 'com.github.rosjava:rosjava_core:0.3.7' api group: 'net.sf.jung', name: 'jung-algorithms', version: '2.0.1' api group: 'net.sf.jung', name: 'jung-graph-impl', version: '2.0.1' api group: 'net.sf.jung', name: 'jung-visualization', version: '2.0.1' api group: 'net.sf.jung', name: 'jung-api', version: '2.0.1' - api 'com.github.rosjava:rosjava_core:0.3.7' - api 'org.ros.rosjava_bootstrap:message_generation:0.3.3' testImplementation 'com.github.CST-Group:cst:e93dc57' testImplementation 'com.1stleg:jnativehook:2.1.0' - testImplementation group: 'junit', name: 'junit', version: '4.12' - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2' - testImplementation 'org.ros.rosjava_messages:std_msgs:0.5.11' - testImplementation 'org.ros.rosjava_messages:rosjava_test_msgs:0.3.0' + // These are necessary for JUnit5 tests + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.0' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.0' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } task javadocJar(type: Jar) { @@ -97,3 +105,11 @@ jacocoTestReport { xml.required = true } } + +uberJar { + dependsOn jar +} + +test { + useJUnitPlatform() +} \ No newline at end of file