Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDani Megert2016-01-22 13:56:58 +0000
committerThomas Watson2016-01-22 14:10:52 +0000
commitd83a5dc622ffa4b2d0c2668bc1fc679e41906f5b (patch)
treedf28ea964667369242a8141b13a2b10c580963dd
parent3aa9b70be9c30b38b83b46c86ae249150c0dbeae (diff)
downloadrt.equinox.p2-I20160127-0800.tar.gz
rt.equinox.p2-I20160127-0800.tar.xz
rt.equinox.p2-I20160127-0800.zip
Change-Id: I8cdb1bb98b0ca1e89c4de976dcbf3a95fa2af221 Signed-off-by: Dani Megert <daniel_megert@ch.ibm.com>
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java9
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/viewers/DeferredQueryContentProvider.java9
4 files changed, 10 insertions, 12 deletions
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 ad83d22be..26306e9bb 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 @@ Manifest-Version: 1.0
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 6607f77c3..89247faa0 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 d2263fc2f..8d0810169 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 @@ public class RepositorySelectionGroup {
ProvisioningUI ui;
IUViewQueryContext queryContext;
- ListenerList listeners = new ListenerList();
+ ListenerList<IRepositorySelectionListener> listeners = new ListenerList<IRepositorySelectionListener>();
Combo repoCombo;
Link repoManipulatorLink;
@@ -647,9 +647,8 @@ public class RepositorySelectionGroup {
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 485e635e8..2de2199b7 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 @@ public class DeferredQueryContentProvider extends ProvElementContentProvider {
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 @@ public class DeferredQueryContentProvider extends ProvElementContentProvider {
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);
}
}

Back to the top