Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Arthorne2008-04-23 10:59:54 -0400
committerJohn Arthorne2008-04-23 10:59:54 -0400
commit79b06c24495f6731a8ae235cf09b0e661b02b569 (patch)
treeedf49c4ddeb06e6c7b50478911cc138bfe7f781e /bundles
parent18be005aed89140ad668810ac9c1bd1c92b54e58 (diff)
downloadrt.equinox.p2-79b06c24495f6731a8ae235cf09b0e661b02b569.tar.gz
rt.equinox.p2-79b06c24495f6731a8ae235cf09b0e661b02b569.tar.xz
rt.equinox.p2-79b06c24495f6731a8ae235cf09b0e661b02b569.zip
Renamed getEnabled to isEnabledBefore_patches_merge
Diffstat (limited to 'bundles')
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/ArtifactRepositoryManager.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/IArtifactRepositoryManager.java38
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/MetadataRepositoryManager.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/provisional/p2/metadata/repository/IMetadataRepositoryManager.java39
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/ProvisioningUtil.java4
5 files changed, 44 insertions, 41 deletions
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/ArtifactRepositoryManager.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/ArtifactRepositoryManager.java
index f2e4c86a8..567ae4e2a 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/ArtifactRepositoryManager.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/ArtifactRepositoryManager.java
@@ -355,7 +355,7 @@ public class ArtifactRepositoryManager extends AbstractRepositoryManager impleme
* (non-Javadoc)
* @see org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager#getEnabled(java.net.URL)
*/
- public boolean getEnabled(URL location) {
+ public boolean isEnabled(URL location) {
synchronized (repositoryLock) {
if (repositories == null)
restoreRepositories();
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/IArtifactRepositoryManager.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/IArtifactRepositoryManager.java
index 1025c653d..e08eac88d 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/IArtifactRepositoryManager.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/IArtifactRepositoryManager.java
@@ -176,6 +176,25 @@ public interface IArtifactRepositoryManager {
public String getRepositoryProperty(URL location, String key);
/**
+ * Returns the enablement value of a repository. Disabled repositories are known
+ * to the repository manager, but are never used in the context of provisioning
+ * operation. Disabled repositories are useful as a form of bookmark to indicate that a
+ * repository location is of interest, but not currently used.
+ * <p>
+ * Note that enablement is a property of the repository manager and not a property
+ * of the affected repository. The enablement of the repository is discarded when
+ * a repository is removed from the repository manager.
+ *
+ * @param location The location of the repository whose enablement is requested
+ * @return <code>true</code> if the repository is enabled, and
+ * <code>false</code> if it is not enabled, or if the repository location
+ * is not known to the repository manager.
+ * @see #REPOSITORIES_DISABLED
+ * @see #setEnabled(URL, boolean)
+ */
+ public boolean isEnabled(URL location);
+
+ /**
* Loads the repository at the given location. The location is expected to contain
* data that describes a valid artifact repository of a known type. If this manager
* already knows a repository at the given location then that repository is returned.
@@ -228,24 +247,6 @@ public interface IArtifactRepositoryManager {
public boolean removeRepository(URL location);
/**
- * Returns the enablement value of a repository. Disabled repositories are known
- * to the repository manager, but are never used in the context of provisioning
- * operation. Disabled repositories are useful as a form of bookmark to indicate that a
- * repository location is of interest, but not currently used.
- * <p>
- * Note that enablement is a property of the repository manager and not a property
- * of the affected repository. The enablement of the repository is discarded when
- * a repository is removed from the repository manager.
- *
- * @param location The location of the repository whose enablement is requested
- * @return <code>true</code> if the repository is enabled, and
- * <code>false</code> if it is not enabled, or if the repository location
- * is not known to the repository manager.
- * @see #REPOSITORIES_DISABLED
- */
- public boolean getEnabled(URL location);
-
- /**
* Sets the enablement of a repository. Disabled repositories are known
* to the repository manager, but are never used in the context of provisioning
* operation. Disabled repositories are useful as a form of bookmark to indicate that a
@@ -262,6 +263,7 @@ public interface IArtifactRepositoryManager {
* @param enablement <code>true</code>to enable the repository, and
* <code>false</code> to disable the repository
* @see #REPOSITORIES_DISABLED
+ * @see #isEnabled(URL)
*/
public void setEnabled(URL location, boolean enablement);
} \ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/MetadataRepositoryManager.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/MetadataRepositoryManager.java
index 0d8754663..8d4073fa8 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/MetadataRepositoryManager.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/MetadataRepositoryManager.java
@@ -372,7 +372,7 @@ public class MetadataRepositoryManager implements IMetadataRepositoryManager, Pr
* (non-Javadoc)
* @see org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager#getEnabled(java.net.URL)
*/
- public boolean getEnabled(URL location) {
+ public boolean isEnabled(URL location) {
synchronized (repositoryLock) {
if (repositories == null)
restoreRepositories();
diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/provisional/p2/metadata/repository/IMetadataRepositoryManager.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/provisional/p2/metadata/repository/IMetadataRepositoryManager.java
index 927026058..167a6f93e 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/provisional/p2/metadata/repository/IMetadataRepositoryManager.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/provisional/p2/metadata/repository/IMetadataRepositoryManager.java
@@ -144,11 +144,29 @@ public interface IMetadataRepositoryManager extends IQueryable {
*
* @see #loadRepository(URL, IProgressMonitor)
* @see IRepository#getProperties()
- *
*/
public String getRepositoryProperty(URL location, String key);
/**
+ * Returns the enablement value of a repository. Disabled repositories are known
+ * to the repository manager, but are never used in the context of provisioning
+ * operation. Disabled repositories are useful as a form of bookmark to indicate that a
+ * repository location is of interest, but not currently used.
+ * <p>
+ * Note that enablement is a property of the repository manager and not a property
+ * of the affected repository. The enablement of the repository is discarded when
+ * a repository is removed from the repository manager.
+ *
+ * @param location The location of the repository whose enablement is requested
+ * @return <code>true</code> if the repository is enabled, and
+ * <code>false</code> if it is not enabled, or if the repository location
+ * is not known to the repository manager.
+ * @see #REPOSITORIES_DISABLED
+ * @see #setEnabled(URL, boolean)
+ */
+ public boolean isEnabled(URL location);
+
+ /**
* Loads a repository corresponding to the given URL. If a repository has
* previously been loaded at the given location, the same cached repository
* may be returned.
@@ -202,24 +220,6 @@ public interface IMetadataRepositoryManager extends IQueryable {
public boolean removeRepository(URL location);
/**
- * Returns the enablement value of a repository. Disabled repositories are known
- * to the repository manager, but are never used in the context of provisioning
- * operation. Disabled repositories are useful as a form of bookmark to indicate that a
- * repository location is of interest, but not currently used.
- * <p>
- * Note that enablement is a property of the repository manager and not a property
- * of the affected repository. The enablement of the repository is discarded when
- * a repository is removed from the repository manager.
- *
- * @param location The location of the repository whose enablement is requested
- * @return <code>true</code> if the repository is enabled, and
- * <code>false</code> if it is not enabled, or if the repository location
- * is not known to the repository manager.
- * @see #REPOSITORIES_DISABLED
- */
- public boolean getEnabled(URL location);
-
- /**
* Sets the enablement of a repository. Disabled repositories are known
* to the repository manager, but are never used in the context of provisioning
* operation. Disabled repositories are useful as a form of bookmark to indicate that a
@@ -236,6 +236,7 @@ public interface IMetadataRepositoryManager extends IQueryable {
* @param enablement <code>true</code>to enable the repository, and
* <code>false</code> to disable the repository
* @see #REPOSITORIES_DISABLED
+ * @see #isEnabled(URL)
*/
public void setEnabled(URL location, boolean enablement);
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/ProvisioningUtil.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/ProvisioningUtil.java
index 8b8abf70b..59f5ef357 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/ProvisioningUtil.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/ProvisioningUtil.java
@@ -54,14 +54,14 @@ public class ProvisioningUtil {
IMetadataRepositoryManager manager = (IMetadataRepositoryManager) ServiceHelper.getService(ProvUIActivator.getContext(), IMetadataRepositoryManager.class.getName());
if (manager == null)
return false;
- return manager.getEnabled(location);
+ return manager.isEnabled(location);
}
public static boolean getArtifactRepositoryEnablement(URL location) {
IArtifactRepositoryManager manager = (IArtifactRepositoryManager) ServiceHelper.getService(ProvUIActivator.getContext(), IArtifactRepositoryManager.class.getName());
if (manager == null)
return false;
- return manager.getEnabled(location);
+ return manager.isEnabled(location);
}
public static IMetadataRepository loadMetadataRepository(URL location, IProgressMonitor monitor) throws ProvisionException {

Back to the top