Merge pull request #191 from virtualsatellite/integration

Release 4.16.0
virtualsatellite · Aug 31, 2023 · 22f97fc · 22f97fc
2 parents 4ac3518 + ee7518f
commit 22f97fc
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 14 deletions.
diff --git a/.mailmap b/.mailmap
@@ -18,5 +18,6 @@ TjorveKujathDLR <tjorve.kujath@dlr.de> Tjorve Kujath <tjorve.kujath@dlr.de>
 dellerDLR <Dennis.Eller@dlr.de> Eller, Dennis <Dennis.Eller@dlr.de>
 dellerDLR <Dennis.Eller@dlr.de> elle_de <elle_de@SC-010259.intra.dlr.de>
 dellerDLR <Dennis.Eller@dlr.de> Dennis Eller <dennis.eller@dlr.de>
+dellerDLR <Dennis.Eller@dlr.de> Dennis Eller <95470420+dellerDLR@users.noreply.github.com>
 
 pchrszon-dlr <Philipp.Chrszon@dlr.de> Chrszon, Philipp <Philipp.Chrszon@dlr.de>
diff --git a/de.dlr.sc.virsat.cef.docs.feature/docs/VirSat_CEF_ReleaseNotes.txt b/de.dlr.sc.virsat.cef.docs.feature/docs/VirSat_CEF_ReleaseNotes.txt
@@ -3,18 +3,8 @@ VirSat CEF Release Notes
 
 VirSat CEF is based on VirSat Core. Please don't forget to read the Release Notes of VirSat Core as well!
 
-Release 4.15.0 (09th August 2022)
-----------------------------------
-
-New Features:
- Migrated to Java 11 #159 Build
- Migrated to Eclipse 2022-03 #160 Build
-
-Release 4.13.0 (27th April 2021)
+Release 4.16.0 (30th August 2023)
 ----------------------------------
-
-New Features:
- CEF concept supports being used on VirSat Server - #140 Feature
 
 Usability Updates:
  Naming of parameters was improved #180
@@ -26,13 +16,19 @@ Fixed Bugs:
  Undo was not working in the tree views
  Ordering of customized navigator views
 
-Release 4.16.0 (30th August 2023)
+Release 4.15.0 (09th August 2022)
 ----------------------------------
 
 New Features:
- CEF concept supports being used on VirSat Server - #140 Feature
+ Migrated to Java 11 #159 Build
+ Migrated to Eclipse 2022-03 #160 Build
 
+Release 4.13.0 (27th April 2021)
+----------------------------------
 
+New Features:
+ CEF concept supports being used on VirSat Server - #140 Feature
+
 Release 4.12.0 (31th July 2020)
 ----------------------------------
 

diff --git a/...extension.cefx.test/src/de/dlr/sc/virsat/model/extension/cefx/util/CefModeHelperTest.java b/...extension.cefx.test/src/de/dlr/sc/virsat/model/extension/cefx/util/CefModeHelperTest.java
@@ -171,10 +171,13 @@ public void testGetModeValue() {
 
  SystemMode systemMode1 = new SystemMode(conceptCEFX);
  SystemMode systemMode2 = new SystemMode(conceptCEFX);
+ systemMode1.setName("MODE_1");
+ systemMode2.setName("MODE_2");
 
  value1.setMode(systemMode1);
  value2.setMode(systemMode2);
 
+
  param.getModeValues().add(value1);
  param.getModeValues().add(value2);
 
@@ -193,6 +196,8 @@ public void testGetModeValueOrDefault() {
 
  SystemMode systemMode1 = new SystemMode(conceptCEFX);
  SystemMode systemMode2 = new SystemMode(conceptCEFX);
+ systemMode1.setName("MODE_1");
+ systemMode2.setName("MODE_2");
 
  value1.setMode(systemMode1);
  value2.setMode(systemMode2);

diff --git a/...ion.cefx.ui/src/de/dlr/sc/virsat/model/extension/cefx/ui/modesview/ModeLabelProvider.java b/...ion.cefx.ui/src/de/dlr/sc/virsat/model/extension/cefx/ui/modesview/ModeLabelProvider.java
@@ -66,6 +66,9 @@ public String getColumnText(Object element, int columnIndex) {
  CefModeHelper cefModeHelper = new CefModeHelper();
 
  List<SystemMode> modes = cefModeHelper.getAllModes(param);
+ if (columnMode >= modes.size()) {
+ return "";
+ }
  SystemMode mode = modes.get(columnMode);
 
  Value modeValue = cefModeHelper.getModeValue(param, mode);

diff --git a/...at.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/util/CefModeHelper.java b/...at.model.extension.cefx/src/de/dlr/sc/virsat/model/extension/cefx/util/CefModeHelper.java
@@ -109,7 +109,7 @@ public Command addModeValue(EditingDomain ed, Parameter parameter, SystemMode sy
  */
  public Value getModeValue(Parameter parameter, SystemMode systemMode) {
  for (Value modeValue : parameter.getModeValues()) {
- if (systemMode.equals(modeValue.getMode())) {
+ if (systemMode.getName().equals(modeValue.getMode().getName())) {
  return modeValue;
  }
  }