Merge branch '3672' of https://git.fortiss.org/af3/af3-rcp.git into 3672

Conflicts:
	org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/.ratings


Signed-off-by: Alexander Diewald <diewald@fortiss.org>

org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/.ratings

 ApplicationActionBarAdvisor.java 3e7c0fd992586e6ca7724b871eb0b2cf59244028 GREEN
 ApplicationWorkbenchAdvisor.java ef25d5783a4f75e88334fd679834a6e0421f8c2f GREEN
 ApplicationWorkbenchWindowAdvisor.java da5cb38300b384579532c678fbc9faa961c2ca6b GREEN
-CurrentObjectiveContributionItem.java ab53e877f1eb57f7904aed39f3c2d5ba8a6b74cd RED
-UpcomingObjectiveContributionItem.java 14429d4c748ad4c0dd0f87b0d194b300e6a5d9fd RED
+CurrentObjectiveContributionItem.java d07dd8672f5e844f42ee5ec8b43f503f86893cd7 RED
+UpcomingObjectiveContributionItem.java 5721c93ac6ea39842af09703ebc2b0f841bc9ed5 RED

org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/CurrentObjectiveContributionItem.java

@@ -41,7 +41,6 @@ import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Point;
 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;
@@ -153,7 +152,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);
 				}

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. */
@@ -151,7 +149,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