Repository: ant-ivyde Updated Branches: refs/heads/master f3b18d05c -> fc68846bb
IVYDE-386 Fix ClassCastException Project: http://git-wip-us.apache.org/repos/asf/ant-ivyde/repo Commit: http://git-wip-us.apache.org/repos/asf/ant-ivyde/commit/fc68846b Tree: http://git-wip-us.apache.org/repos/asf/ant-ivyde/tree/fc68846b Diff: http://git-wip-us.apache.org/repos/asf/ant-ivyde/diff/fc68846b Branch: refs/heads/master Commit: fc68846bbd7b18da1bb303db5e8a54f93692a2bd Parents: f3b18d0 Author: Jaikiran Pai <jaikiran....@gmail.com> Authored: Thu Mar 1 10:57:20 2018 +0530 Committer: Jaikiran Pai <jaikiran....@gmail.com> Committed: Thu Mar 1 12:11:47 2018 +0530 ---------------------------------------------------------------------- .../eclipse/ui/menu/IvyMenuContributionItem.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/fc68846b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/menu/IvyMenuContributionItem.java ---------------------------------------------------------------------- diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/menu/IvyMenuContributionItem.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/menu/IvyMenuContributionItem.java index e10d364..043db40 100644 --- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/menu/IvyMenuContributionItem.java +++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/menu/IvyMenuContributionItem.java @@ -111,7 +111,7 @@ public class IvyMenuContributionItem extends CompoundContributionItem implements } } - 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 @@ public class IvyMenuContributionItem extends CompoundContributionItem implements } 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 @@ public class IvyMenuContributionItem extends CompoundContributionItem implements 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 @@ public class IvyMenuContributionItem extends CompoundContributionItem implements } 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 @@ public class IvyMenuContributionItem extends CompoundContributionItem implements } 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 @@ public class IvyMenuContributionItem extends CompoundContributionItem implements } } - 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);