bug 413524: Toolbar buttons not full featured
https://bugs.eclipse.org/bugs/show_bug.cgi?id=413524
diff --git a/org.eclipse.scout.sdk.test/resources/emptyProject/empty.project.ui.swt/src/empty/project/ui/swt/application/menu/DesktopMenuBar.java b/org.eclipse.scout.sdk.test/resources/emptyProject/empty.project.ui.swt/src/empty/project/ui/swt/application/menu/DesktopMenuBar.java
index 30b4cec..b27ee73 100644
--- a/org.eclipse.scout.sdk.test/resources/emptyProject/empty.project.ui.swt/src/empty/project/ui/swt/application/menu/DesktopMenuBar.java
+++ b/org.eclipse.scout.sdk.test/resources/emptyProject/empty.project.ui.swt/src/empty/project/ui/swt/application/menu/DesktopMenuBar.java
@@ -8,13 +8,13 @@
import org.eclipse.scout.rt.client.ui.action.menu.IMenu;
import org.eclipse.scout.rt.ui.swt.ISwtEnvironment;
import org.eclipse.scout.rt.ui.swt.SwtMenuUtility;
-import org.eclipse.scout.rt.ui.swt.menu.SwtScoutMenuContributionItem;
+import org.eclipse.scout.rt.ui.swt.action.SwtScoutMenuContributionItem;
import org.eclipse.ui.actions.CompoundContributionItem;
-
import empty.project.ui.swt.Activator;
public class DesktopMenuBar extends CompoundContributionItem {
+
@Override
protected IContributionItem[] getContributionItems() {
ISwtEnvironment env = Activator.getDefault().getEnvironment();
@@ -22,7 +22,7 @@
if (env.getClientSession() != null && env.getClientSession().getDesktop() != null) {
List<IMenu> menus = env.getClientSession().getDesktop().getMenus();
List<IMenu> consolidatedMenus = SwtMenuUtility.consolidateMenus(menus);
- List<IContributionItem> swtContributionItems = new ArrayList<IContributionItem>(consolidatedMenus.size());
+ List<IContributionItem> swtContributionItems = new ArrayList<IContributionItem>();
for (IMenu menu : consolidatedMenus) {
swtContributionItems.add(new SwtScoutMenuContributionItem(menu, env));
}
diff --git a/org.eclipse.scout.sdk.test/resources/operation/sampleProject/sample.ui.swt/src/sample/ui/swt/application/menu/DesktopMenuBar.java b/org.eclipse.scout.sdk.test/resources/operation/sampleProject/sample.ui.swt/src/sample/ui/swt/application/menu/DesktopMenuBar.java
index 1d44d6f..9f7c5d0 100644
--- a/org.eclipse.scout.sdk.test/resources/operation/sampleProject/sample.ui.swt/src/sample/ui/swt/application/menu/DesktopMenuBar.java
+++ b/org.eclipse.scout.sdk.test/resources/operation/sampleProject/sample.ui.swt/src/sample/ui/swt/application/menu/DesktopMenuBar.java
@@ -8,7 +8,7 @@
import org.eclipse.scout.rt.client.ui.action.menu.IMenu;
import org.eclipse.scout.rt.ui.swt.ISwtEnvironment;
import org.eclipse.scout.rt.ui.swt.SwtMenuUtility;
-import org.eclipse.scout.rt.ui.swt.menu.SwtScoutMenuContributionItem;
+import org.eclipse.scout.rt.ui.swt.action.SwtScoutMenuContributionItem;
import org.eclipse.ui.actions.CompoundContributionItem;
import sample.ui.swt.Activator;
@@ -22,7 +22,7 @@
if (env.getClientSession() != null && env.getClientSession().getDesktop() != null) {
List<IMenu> menus = env.getClientSession().getDesktop().getMenus();
List<IMenu> consolidatedMenus = SwtMenuUtility.consolidateMenus(menus);
- List<IContributionItem> swtContributionItems = new ArrayList<IContributionItem>(consolidatedMenus.size());
+ List<IContributionItem> swtContributionItems = new ArrayList<IContributionItem>();
for (IMenu menu : consolidatedMenus) {
swtContributionItems.add(new SwtScoutMenuContributionItem(menu, env));
}
