IVYDE-386 Fix ClassCastException

apache · Mar 1, 2018 · fc68846 · fc68846 · twogee · Mar 1, 2018
1 parent f3b18d0
commit fc68846
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/...e.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/menu/IvyMenuContributionItem.java b/...e.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/menu/IvyMenuContributionItem.java
@@ -111,7 +111,7 @@ protected IContributionItem[] getContributionItems() {
             }
         }
 
-        List<MenuManager> items;
+        List<IContributionItem> items;
         MenuManager menuManager;
         if (onlyContainers) {
             // we we have only containers, no need to have a root menu entry
@@ -120,7 +120,7 @@ protected IContributionItem[] getContributionItems() {
         } else {
             menuManager = new MenuManager("Ivy", IvyPlugin
                     .getImageDescriptor("icons/logo16x16.gif"), "org.apache.ivyde.eclipse.menu");
-            items = Collections.singletonList(menuManager);
+            items = Collections.<IContributionItem>singletonList(menuManager);
         }
 
         // add resolve, refresh, reload settings
@@ -181,19 +181,19 @@ protected IContributionItem[] getContributionItems() {
         return items.toArray(new IContributionItem[items.size()]);
     }
 
-    private void addCommand(MenuManager menuManager, List<MenuManager> items,
+    private void addCommand(MenuManager menuManager, List<IContributionItem> items,
             String commandId) {
         CommandContributionItemParameter parm = new CommandContributionItemParameter(
                 serviceLocator, null, commandId, CommandContributionItem.STYLE_PUSH);
         fillMenu(menuManager, items, new CommandContributionItem(parm));
     }
 
-    private void fillMenu(MenuManager menuManager, List<MenuManager> items,
+    private void fillMenu(MenuManager menuManager, List<IContributionItem> items,
             IContributionItem commandContributionItem) {
         if (menuManager != null) {
             menuManager.add(commandContributionItem);
         } else {
-            items.add((MenuManager) commandContributionItem);
+            items.add(commandContributionItem);
         }
     }
 
@@ -252,7 +252,7 @@ private void doCollectContainer(Map<IProject, Set<IvyClasspathContainer>> contai
     }
 
     private void addCleanableForSingleContainer(MenuManager menuManager,
-            List<MenuManager> items, Ivy ivy) {
+            List<IContributionItem> items, Ivy ivy) {
         List<Cleanable> allCleanables = new ArrayList<>();
         List<Cleanable> repositoryCleanables = new ArrayList<>();
         List<Cleanable> resolutionCleanables = new ArrayList<>();
@@ -273,7 +273,7 @@ private void addCleanableForSingleContainer(MenuManager menuManager,
     }
 
     private void addCleanableForManyContainers(MenuManager menuManager,
-            List<MenuManager> items, Collection<Set<IvyClasspathContainer>> containerSets) {
+            List<IContributionItem> items, Collection<Set<IvyClasspathContainer>> containerSets) {
         List<Cleanable> allCleanables = new ArrayList<>();
         List<Cleanable> repositoryCleanables = new ArrayList<>();
         List<Cleanable> resolutionCleanables = new ArrayList<>();
@@ -306,7 +306,7 @@ private void addRepositoryCleanable(List<Cleanable> cleanables, Ivy ivy) {
         }
     }
 
-    public void addCleanable(MenuManager menuManager, List<MenuManager> items,
+    private void addCleanable(MenuManager menuManager, List<IContributionItem> items,
             String name, List<Cleanable> cleanables) {
         CleanCacheAction action = new CleanCacheAction(name, cleanables);
         action.setText(name);