Bug 486317 - Adapt to ListenerList changes [with patch]
Change-Id: I8cdb1bb98b0ca1e89c4de976dcbf3a95fa2af221
Signed-off-by: Dani Megert <daniel_megert@ch.ibm.com>
diff --git a/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF
index ad83d22..26306e9 100644
--- a/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-SymbolicName: org.eclipse.equinox.p2.ui;singleton:=true
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 2.4.100.qualifier
Bundle-Activator: org.eclipse.equinox.internal.p2.ui.ProvUIActivator
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.equinox.p2.ui/pom.xml b/bundles/org.eclipse.equinox.p2.ui/pom.xml
index 6607f77..89247fa 100644
--- a/bundles/org.eclipse.equinox.p2.ui/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.ui/pom.xml
@@ -19,6 +19,6 @@
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.p2.ui</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java
index d2263fc..8d08101 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2011 IBM Corporation and others.
+ * Copyright (c) 2009, 2016 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -66,7 +66,7 @@
ProvisioningUI ui;
IUViewQueryContext queryContext;
- ListenerList listeners = new ListenerList();
+ ListenerList<IRepositorySelectionListener> listeners = new ListenerList<IRepositorySelectionListener>();
Combo repoCombo;
Link repoManipulatorLink;
@@ -647,9 +647,8 @@
repoLocation = comboRepos[selection];
}
- Object[] selectionListeners = listeners.getListeners();
- for (int i = 0; i < selectionListeners.length; i++) {
- ((IRepositorySelectionListener) selectionListeners[i]).repositorySelectionChanged(repoChoice, repoLocation);
+ for (IRepositorySelectionListener listener : listeners) {
+ listener.repositorySelectionChanged(repoChoice, repoLocation);
}
}
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/viewers/DeferredQueryContentProvider.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/viewers/DeferredQueryContentProvider.java
index 485e635..2de2199 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/viewers/DeferredQueryContentProvider.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/viewers/DeferredQueryContentProvider.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2010 IBM Corporation and others.
+ * Copyright (c) 2007, 2016 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -33,7 +33,7 @@
HashMap<Object, Object> alreadyQueried = new HashMap<Object, Object>();
HashSet<Object> queryCompleted = new HashSet<Object>();
AbstractTreeViewer viewer = null;
- ListenerList listeners = new ListenerList();
+ ListenerList<IInputChangeListener> listeners = new ListenerList<IInputChangeListener>();
boolean synchronous = false;
/**
@@ -74,9 +74,8 @@
alreadyQueried = new HashMap<Object, Object>();
queryCompleted = new HashSet<Object>();
currentInput = newInput;
- Object[] inputListeners = listeners.getListeners();
- for (int i = 0; i < inputListeners.length; i++) {
- ((IInputChangeListener) inputListeners[i]).inputChanged(v, oldInput, newInput);
+ for (IInputChangeListener listener : listeners) {
+ listener.inputChanged(v, oldInput, newInput);
}
}
