diff options
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox')
3 files changed, 4 insertions, 8 deletions
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ElementWrapper.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ElementWrapper.java index c8a5622cd..ed47b934a 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ElementWrapper.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ElementWrapper.java @@ -11,7 +11,6 @@ package org.eclipse.equinox.internal.p2.ui; import java.util.*; -import org.eclipse.equinox.internal.p2.core.helpers.CollectionUtils; import org.eclipse.equinox.p2.query.Collector; /** @@ -40,7 +39,7 @@ public abstract class ElementWrapper { * Gets the collection where the elements are being stored. */ protected Collection<?> getCollection() { - return collection == null ? CollectionUtils.emptyList() : collection; + return collection == null ? Collections.emptyList() : collection; } /** diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/CategoryElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/CategoryElement.java index e76c8ceb4..2fbf9b44f 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/CategoryElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/CategoryElement.java @@ -10,10 +10,8 @@ *******************************************************************************/ package org.eclipse.equinox.internal.p2.ui.model; -import java.util.ArrayList; -import java.util.Collection; +import java.util.*; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.equinox.internal.p2.core.helpers.CollectionUtils; import org.eclipse.equinox.internal.p2.ui.*; import org.eclipse.equinox.p2.metadata.IInstallableUnit; import org.eclipse.equinox.p2.metadata.IRequirement; @@ -104,7 +102,7 @@ public class CategoryElement extends RemoteQueriedElement implements IIUElement public Collection<IRequirement> getRequirements() { if (ius == null || ius.isEmpty()) - return CollectionUtils.emptyList(); + return Collections.<IRequirement> emptyList(); if (requirements == null) { if (ius.size() == 1) requirements = getIU().getRequirements(); diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/QueriedElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/QueriedElement.java index a478e683f..2ae966587 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/QueriedElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/QueriedElement.java @@ -13,7 +13,6 @@ package org.eclipse.equinox.internal.p2.ui.model; import java.util.*; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.equinox.internal.p2.core.helpers.CollectionUtils; import org.eclipse.equinox.internal.p2.ui.ElementQueryDescriptor; import org.eclipse.equinox.internal.p2.ui.QueryProvider; import org.eclipse.equinox.internal.p2.ui.query.IUViewQueryContext; @@ -96,7 +95,7 @@ public abstract class QueriedElement extends ProvElement { } protected Object[] fetchChildren(Object o, IProgressMonitor monitor) { - cachedChildren = CollectionUtils.emptyList(); + cachedChildren = Collections.emptyList(); QueryProvider provider = new QueryProvider(getProvisioningUI()); ElementQueryDescriptor queryDescriptor = provider.getQueryDescriptor(this); if (queryDescriptor == null) |