From 98f5266c451e00cba5ea780b45d7e806b1902571 Mon Sep 17 00:00:00 2001
From: Alexander Diewald <diewald@fortiss.org>
Date: Thu, 3 Oct 2019 09:19:15 +0200
Subject: [PATCH] Fix classcastexception on element selection of objectives
Issue-Ref: 3672
Issue-Url: https://af3-developer.fortiss.org/issues/3672
Signed-off-by: Alexander Diewald <diewald@fortiss.org>
---
.../src/org/fortiss/af3/rcp/application/advisors/.ratings | 4 ++--
.../advisors/CurrentObjectiveContributionItem.java | 3 +--
.../advisors/UpcomingObjectiveContributionItem.java | 4 +---
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/.ratings b/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/.ratings
index d470480..136b656 100644
--- a/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/.ratings
+++ b/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/.ratings
@@ -1,5 +1,5 @@
ApplicationActionBarAdvisor.java 3e7c0fd992586e6ca7724b871eb0b2cf59244028 GREEN
ApplicationWorkbenchAdvisor.java ef25d5783a4f75e88334fd679834a6e0421f8c2f GREEN
ApplicationWorkbenchWindowAdvisor.java da5cb38300b384579532c678fbc9faa961c2ca6b GREEN
-CurrentObjectiveContributionItem.java 1a7fce591786a738c95ecfd79b2c508266a746d6 RED
-UpcomingObjectiveContributionItem.java c4616313fc15b617fc47db2be180cd260ff90b8e RED
+CurrentObjectiveContributionItem.java bc724f03a11456a7e280d243a1c1868a0adefac6 YELLOW
+UpcomingObjectiveContributionItem.java cc286a7ff6741b456404b311f54a9b4b649946b2 YELLOW
diff --git a/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/CurrentObjectiveContributionItem.java b/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/CurrentObjectiveContributionItem.java
index 1a7fce5..bc724f0 100644
--- a/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/CurrentObjectiveContributionItem.java
+++ b/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/CurrentObjectiveContributionItem.java
@@ -40,7 +40,6 @@ import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.RGB;
import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
@@ -130,7 +129,7 @@ class CurrentObjectiveContributionItem extends WorkbenchWindowControlContributio
currentObjectiveCombo.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
- String textInCombo = ((Combo)e.getSource()).getText();
+ String textInCombo = ((CCombo)e.getSource()).getText();
if(!textInCombo.isEmpty()) {
updateObjectiveByName(textInCombo);
}
diff --git a/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/UpcomingObjectiveContributionItem.java b/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/UpcomingObjectiveContributionItem.java
index c461631..cc286a7 100644
--- a/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/UpcomingObjectiveContributionItem.java
+++ b/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/UpcomingObjectiveContributionItem.java
@@ -39,7 +39,6 @@ import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
@@ -92,7 +91,6 @@ public class UpcomingObjectiveContributionItem extends WorkbenchWindowControlCon
Point size = computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
super.setSize(size.x, size.y);
}
-
}
/** The initial upcoming objectives. */
@@ -152,7 +150,7 @@ public class UpcomingObjectiveContributionItem extends WorkbenchWindowControlCon
upcomingObjectiveCombo.addSelectionListener(new SelectionListener() {
@Override
public void widgetSelected(SelectionEvent e) {
- currentObjective.updateObjectiveByName(((Combo)e.getSource()).getText());
+ currentObjective.updateObjectiveByName(((CCombo)e.getSource()).getText());
}
@Override
--
GitLab