Skip to content

Commit b98fcaf

Browse files
committed
Adds fix for enumerations
1 parent 0b58700 commit b98fcaf

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

sdk/consumer-test-tool/src/main/java/esa/mo/nmf/ctt/windows/element/Entry.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
*/
2121
package esa.mo.nmf.ctt.windows.element;
2222

23+
import java.awt.Component;
2324
import java.lang.reflect.Field;
2425
import java.util.logging.Level;
2526
import java.util.logging.Logger;
@@ -157,7 +158,8 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
157158

158159
private void nullCBActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_nullCBActionPerformed
159160
for (int i = 0; i < this.middlePanel.getComponentCount(); i++) {
160-
this.middlePanel.getComponent(i).setEnabled(!this.middlePanel.getComponent(i).isEnabled());
161+
Component component = this.middlePanel.getComponent(i);
162+
component.setEnabled(!component.isEnabled());
161163
}
162164

163165
this.fieldSelectableAttribute.setEnabled(!this.fieldSelectableAttribute.isEnabled());

sdk/consumer-test-tool/src/main/java/esa/mo/nmf/ctt/windows/element/EnumerationEntry.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ public EnumerationEntry(String fieldNameIn, Element obj, boolean editable, boole
4444
Enumeration enumeration = (Enumeration) obj;
4545
Field[] fields = enumeration.getClass().getDeclaredFields();
4646

47-
Field field = fields[fields.length - 2]; // Get the string enumerations
47+
Field field = fields[fields.length - 1]; // Get the string enumerations
4848
field.setAccessible(true);
4949

5050
try {
51-
String[] enumerationStrings = (String[]) field.get(enumeration);
51+
Enumeration[] enumerationStrings = (Enumeration[]) field.get(enumeration);
5252

53-
for (String enumerationString : enumerationStrings) {
54-
this.comboBox.addItem(enumerationString); // Set the text
53+
for (Enumeration e : enumerationStrings) {
54+
this.comboBox.addItem(e.toString()); // Set the text
5555
}
5656

5757
// Set the selected index;
@@ -79,7 +79,7 @@ public Object getObject() {
7979

8080
int index = this.comboBox.getSelectedIndex();
8181

82-
Field field = fields[8 + index * 3]; // Calculation to get the correct enumeration
82+
Field field = fields[4 + index * 2]; // Calculation to get the correct enumeration
8383
field.setAccessible(true);
8484

8585
try {

0 commit comments

Comments
 (0)