From e55ba98eadc7e7d9d1e8630ad48187a62546b230 Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Tue, 24 Oct 2023 23:13:26 +0200 Subject: [PATCH] Revert "Add IInstallableUnitQueryable interface to allow easier adaption" This reverts commit 9005901168a05471b8ceb94b977b60d7b045c204, respectively https://github.com/eclipse-equinox/p2/pull/348 --- .../metadata/IInstallableUnitQueryable.java | 28 ------------------- .../metadata/IMetadataRepository.java | 3 +- 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IInstallableUnitQueryable.java diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IInstallableUnitQueryable.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IInstallableUnitQueryable.java deleted file mode 100644 index 4148ec85b6..0000000000 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IInstallableUnitQueryable.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2023 Christoph Läubrich and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Christoph Läubrich - initial API and implementation - *******************************************************************************/ -package org.eclipse.equinox.p2.metadata; - -import org.eclipse.equinox.p2.query.IQueryable; - -/** - * A {@link IQueryable} for {@link IInstallableUnit}s, this interface is manly - * to allow adaption in a context where the generic {@link IQueryable} would not - * be applicable as the type information can not be preserved otherwise. - * - * @since 2.8 - * - */ -public interface IInstallableUnitQueryable extends IQueryable { - -} diff --git a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/p2/repository/metadata/IMetadataRepository.java b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/p2/repository/metadata/IMetadataRepository.java index 47eac1c27b..b7e5ec1999 100644 --- a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/p2/repository/metadata/IMetadataRepository.java +++ b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/p2/repository/metadata/IMetadataRepository.java @@ -18,7 +18,6 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.equinox.p2.core.IPool; import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.IInstallableUnitQueryable; import org.eclipse.equinox.p2.repository.*; import org.eclipse.equinox.p2.repository.metadata.spi.AbstractMetadataRepository; @@ -32,7 +31,7 @@ * @noimplement This interface is not intended to be implemented by clients. Instead subclass {@link AbstractMetadataRepository} * @since 2.0 */ -public interface IMetadataRepository extends IRepository, IInstallableUnitQueryable { +public interface IMetadataRepository extends IRepository { /** * Add the given installable units to this repository.