aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Vogel2013-06-18 10:46:51 (EDT)
committerGerrit Code Review @ Eclipse.org2013-08-12 14:27:56 (EDT)
commit2965a67eaaa70d4c692bd3747e911a3726ccdf08 (patch)
tree13be192b48530acc5e880c0803ddeb834cb7b464
parent328236b655034922fbc2d9774942ab822034fd5c (diff)
downloadeclipse.platform.ui-2965a67eaaa70d4c692bd3747e911a3726ccdf08.zip
eclipse.platform.ui-2965a67eaaa70d4c692bd3747e911a3726ccdf08.tar.gz
eclipse.platform.ui-2965a67eaaa70d4c692bd3747e911a3726ccdf08.tar.bz2
Bug 411027 - Removes raw type warnings for ActionSetsrefs/changes/72/13872/3
Changes only private fields and methods, hence change should be save. Change-Id: I609e334079c66382ef91de097952bd9aff2330d9 Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>
-rw-r--r--bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPage.java13
1 files changed, 7 insertions, 6 deletions
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPage.java
index a639c34..4466423 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPage.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPage.java
@@ -560,7 +560,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements
private IEditorPart topEditor;
- private ArrayList oldActionSets = new ArrayList();
+ private List<IActionSetDescriptor> oldActionSets = new ArrayList<IActionSetDescriptor>();
/**
* Updates the contributions given the new part as the active part.
@@ -625,7 +625,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements
activateContributions(newPart, true);
}
- ArrayList newActionSets = null;
+ List<IActionSetDescriptor> newActionSets = null;
if (isNewPartAnEditor || (activePart == topEditor && newPart == null)) {
newActionSets = calculateActionSets(newPart, null);
} else {
@@ -687,7 +687,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements
activateContributions(newEditor, false);
}
- ArrayList newActionSets = calculateActionSets(activePart, newEditor);
+ List<IActionSetDescriptor> newActionSets = calculateActionSets(activePart, newEditor);
if (!updateActionSets(newActionSets)) {
updateActionBars();
}
@@ -737,8 +737,9 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements
* active part
* @return the new action sets
*/
- private ArrayList calculateActionSets(IWorkbenchPart part, IEditorPart editor) {
- ArrayList newActionSets = new ArrayList();
+ private List<IActionSetDescriptor> calculateActionSets(IWorkbenchPart part,
+ IEditorPart editor) {
+ List<IActionSetDescriptor> newActionSets = new ArrayList<IActionSetDescriptor>();
if (part != null) {
IActionSetDescriptor[] partActionSets = WorkbenchPlugin.getDefault()
.getActionSetRegistry().getActionSetsFor(part.getSite().getId());
@@ -764,7 +765,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements
* the action sets to show
* @return <code>true</code> if the action sets changed
*/
- private boolean updateActionSets(ArrayList newActionSets) {
+ private boolean updateActionSets(List<IActionSetDescriptor> newActionSets) {
if (oldActionSets.equals(newActionSets)) {
return false;
}