Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault2010-03-02 20:13:19 -0500
committerPascal Rapicault2010-03-02 20:13:19 -0500
commitab39a89c23ea30ff5abe3af682f5c2de273e8829 (patch)
tree949f0d5aefbff6366a610888d0639f7ca222f4d6 /bundles/org.eclipse.equinox.p2.repository
parentdbcdeedc299a1e10a88fd62d5480b3cc3efd7889 (diff)
downloadrt.equinox.p2-ab39a89c23ea30ff5abe3af682f5c2de273e8829.tar.gz
rt.equinox.p2-ab39a89c23ea30ff5abe3af682f5c2de273e8829.tar.xz
rt.equinox.p2-ab39a89c23ea30ff5abe3af682f5c2de273e8829.zip
Removing deprecated methods
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.repository')
-rw-r--r--bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/p2/repository/metadata/IMetadataRepository.java11
-rw-r--r--bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/p2/repository/metadata/IMetadataRepositoryManager.java9
-rw-r--r--bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/p2/repository/metadata/spi/AbstractMetadataRepository.java12
3 files changed, 5 insertions, 27 deletions
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 0c1c7837f..14ec238b4 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
@@ -11,7 +11,6 @@
package org.eclipse.equinox.p2.repository.metadata;
import java.util.Collection;
-import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.equinox.p2.metadata.IInstallableUnit;
import org.eclipse.equinox.p2.repository.IRepository;
import org.eclipse.equinox.p2.repository.IRepositoryReference;
@@ -29,11 +28,6 @@ import org.eclipse.equinox.p2.repository.metadata.spi.AbstractMetadataRepository
*/
public interface IMetadataRepository extends IRepository<IInstallableUnit> {
- /**
- * @deprecated use {@link #addInstallableUnits(Collection)}
- */
- public void addInstallableUnits(IInstallableUnit[] installableUnits);
-
/**
* Add the given installable units to this repository.
*
@@ -60,11 +54,6 @@ public interface IMetadataRepository extends IRepository<IInstallableUnit> {
Collection<IRepositoryReference> getReferences();
/**
- * @deprecated use {@link #removeInstallableUnits(Collection)}
- */
- public boolean removeInstallableUnits(IInstallableUnit[] installableUnits, IProgressMonitor monitor);
-
- /**
* Removes all installable units in the given collection from this repository.
*
* @param installableUnits the installable units to remove
diff --git a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/p2/repository/metadata/IMetadataRepositoryManager.java b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/p2/repository/metadata/IMetadataRepositoryManager.java
index 39ea99b9e..a75359e26 100644
--- a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/p2/repository/metadata/IMetadataRepositoryManager.java
+++ b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/p2/repository/metadata/IMetadataRepositoryManager.java
@@ -13,6 +13,7 @@ package org.eclipse.equinox.p2.repository.metadata;
import java.net.URI;
import java.util.Map;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.equinox.p2.core.ProvisionException;
import org.eclipse.equinox.p2.metadata.IInstallableUnit;
import org.eclipse.equinox.p2.repository.IRepositoryManager;
@@ -59,7 +60,7 @@ public interface IMetadataRepositoryManager extends IRepositoryManager<IInstalla
* <li>A repository already exists at that location.</li>
* </ul>
*/
- public IMetadataRepository createRepository(URI location, String name, String type, Map<String, String> properties) throws ProvisionException;
+ public IMetadataRepository createRepository(URI location, String name, String type, Map<String, String> properties) throws ProvisionException, OperationCanceledException;
/**
* Loads a repository corresponding to the given URL. If a repository has
@@ -82,7 +83,7 @@ public interface IMetadataRepositoryManager extends IRepositoryManager<IInstalla
* <li>The repository at that location could not be read.</li>
* </ul>
*/
- public IMetadataRepository loadRepository(URI location, IProgressMonitor monitor) throws ProvisionException;
+ public IMetadataRepository loadRepository(URI location, IProgressMonitor monitor) throws ProvisionException, OperationCanceledException;
/**
* Loads a repository corresponding to the given URL. If a repository has
@@ -111,7 +112,7 @@ public interface IMetadataRepositoryManager extends IRepositoryManager<IInstalla
* </ul>
* @see IRepositoryManager#REPOSITORY_HINT_MODIFIABLE
*/
- public IMetadataRepository loadRepository(URI location, int flags, IProgressMonitor monitor) throws ProvisionException;
+ public IMetadataRepository loadRepository(URI location, int flags, IProgressMonitor monitor) throws ProvisionException, OperationCanceledException;
/**
* Refreshes the repository corresponding to the given URL. This method discards
@@ -130,6 +131,6 @@ public interface IMetadataRepositoryManager extends IRepositoryManager<IInstalla
* <li>The repository at that location could not be read.</li>
* </ul>
*/
- public IMetadataRepository refreshRepository(URI location, IProgressMonitor monitor) throws ProvisionException;
+ public IMetadataRepository refreshRepository(URI location, IProgressMonitor monitor) throws ProvisionException, OperationCanceledException;
}
diff --git a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/p2/repository/metadata/spi/AbstractMetadataRepository.java b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/p2/repository/metadata/spi/AbstractMetadataRepository.java
index 7a2693d31..ce9bcf149 100644
--- a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/p2/repository/metadata/spi/AbstractMetadataRepository.java
+++ b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/p2/repository/metadata/spi/AbstractMetadataRepository.java
@@ -13,7 +13,6 @@ package org.eclipse.equinox.p2.repository.metadata.spi;
import java.net.URI;
import java.util.Collection;
import java.util.Map;
-import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.equinox.p2.core.IProvisioningAgent;
import org.eclipse.equinox.p2.metadata.IInstallableUnit;
import org.eclipse.equinox.p2.metadata.Version;
@@ -54,11 +53,6 @@ public abstract class AbstractMetadataRepository extends AbstractRepository<IIns
super(agent, name, type, version, location, description, provider, properties);
}
- // TODO remove
- public void addInstallableUnits(IInstallableUnit[] installableUnit) {
- assertModifiable();
- }
-
/* (non-Javadoc)
* @see org.eclipse.equinox.p2.repository.metadata.IMetadataRepository#addInstallableUnits(java.util.Collection)
*/
@@ -80,12 +74,6 @@ public abstract class AbstractMetadataRepository extends AbstractRepository<IIns
assertModifiable();
}
- // TODO remove
- public boolean removeInstallableUnits(IInstallableUnit[] installableUnits, IProgressMonitor monitor) {
- assertModifiable();
- return false;
- }
-
/* (non-Javadoc)
* @see org.eclipse.equinox.p2.repository.metadata.IMetadataRepository#removeInstallableUnits(java.util.Collection)
*/

Back to the top