Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 154541 Details for
Bug 292691
PDE's use of p2 API
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
PDE Core and UI Patch
pdecore_ui.patch (text/plain), 10.52 KB, created by
Ian Bull
on 2009-12-16 02:04:20 EST
(
hide
)
Description:
PDE Core and UI Patch
Filename:
MIME Type:
Creator:
Ian Bull
Created:
2009-12-16 02:04:20 EST
Size:
10.52 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.pde.core >Index: src/org/eclipse/pde/internal/core/target/IUBundleContainer.java >=================================================================== >RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/IUBundleContainer.java,v >retrieving revision 1.5.2.7 >diff -u -r1.5.2.7 IUBundleContainer.java >--- src/org/eclipse/pde/internal/core/target/IUBundleContainer.java 8 Dec 2009 15:46:46 -0000 1.5.2.7 >+++ src/org/eclipse/pde/internal/core/target/IUBundleContainer.java 16 Dec 2009 07:04:47 -0000 >@@ -24,6 +24,7 @@ > import org.eclipse.equinox.p2.engine.*; > import org.eclipse.equinox.p2.metadata.IArtifactKey; > import org.eclipse.equinox.p2.metadata.IInstallableUnit; >+import org.eclipse.equinox.p2.metadata.query.IQueryResult; > import org.eclipse.equinox.p2.repository.IRepositoryManager; > import org.eclipse.equinox.p2.repository.artifact.IArtifactRepositoryManager; > import org.eclipse.equinox.p2.repository.artifact.IFileArtifactRepository; >@@ -247,7 +248,7 @@ > > // query for bundles > OSGiBundleQuery query = new OSGiBundleQuery(); >- Collector collector = slice.query(query, new SubProgressMonitor(subMonitor, 10)); >+ IQueryResult queryResult = slice.query(query, new SubProgressMonitor(subMonitor, 10)); > > if (subMonitor.isCanceled()) { > return new IResolvedBundle[0]; >@@ -255,7 +256,7 @@ > > Map bundles = new LinkedHashMap(); > IFileArtifactRepository repo = getBundlePool(profile); >- Iterator iterator = collector.iterator(); >+ Iterator iterator = queryResult.iterator(); > while (iterator.hasNext()) { > IInstallableUnit unit = (IInstallableUnit) iterator.next(); > IArtifactKey[] artifacts = unit.getArtifacts(); >@@ -362,14 +363,14 @@ > slicer = new PermissiveSlicer(allMetadata, props, true, false, false, true, false); > } > IQueryable slice = slicer.slice(units, new SubProgressMonitor(subMonitor, 10)); >- Collector collector = slice.query(InstallableUnitQuery.ANY, new SubProgressMonitor(subMonitor, 10)); >+ IQueryResult queryResult = slice.query(InstallableUnitQuery.ANY, new SubProgressMonitor(subMonitor, 10)); > >- if (subMonitor.isCanceled() || collector.isEmpty()) { >+ if (subMonitor.isCanceled() || queryResult.isEmpty()) { > return new IResolvedBundle[0]; > } > >- ArrayList operands = new ArrayList(collector.size()); >- Iterator itor = collector.iterator(); >+ ArrayList operands = new ArrayList(queryResult.size()); >+ Iterator itor = queryResult.iterator(); > while (itor.hasNext()) { > operands.add(new InstallableUnitOperand(null, (IInstallableUnit) itor.next())); > } >@@ -404,7 +405,7 @@ > } > > // query for bundles >- collector = slice.query(new OSGiBundleQuery(), new SubProgressMonitor(subMonitor, 10)); >+ queryResult = slice.query(new OSGiBundleQuery(), new SubProgressMonitor(subMonitor, 10)); > > if (subMonitor.isCanceled()) { > return new IResolvedBundle[0]; >@@ -412,7 +413,7 @@ > > Map bundles = new LinkedHashMap(); > IFileArtifactRepository repo = getBundlePool(profile); >- Iterator iterator = collector.iterator(); >+ Iterator iterator = queryResult.iterator(); > while (iterator.hasNext()) { > IInstallableUnit unit = (IInstallableUnit) iterator.next(); > IArtifactKey[] artifacts = unit.getArtifacts(); >@@ -469,24 +470,24 @@ > fUnits = new IInstallableUnit[fIds.length]; > for (int i = 0; i < fIds.length; i++) { > InstallableUnitQuery query = new InstallableUnitQuery(fIds[i], fVersions[i]); >- Collector collector = profile.query(query, null); >- if (collector.isEmpty()) { >+ IQueryResult queryResult = profile.query(query, null); >+ if (queryResult.isEmpty()) { > // try repositories > URI[] repositories = resolveRepositories(); > for (int j = 0; j < repositories.length; j++) { > IMetadataRepository repository = getRepository(repositories[j]); >- collector = repository.query(query, null); >- if (!collector.isEmpty()) { >+ queryResult = repository.query(query, null); >+ if (!queryResult.isEmpty()) { > break; > } > } > } >- if (collector.isEmpty()) { >+ if (queryResult.isEmpty()) { > // not found > fUnits = null; > throw new CoreException(new Status(IStatus.ERROR, PDECore.PLUGIN_ID, NLS.bind(Messages.IUBundleContainer_1, fIds[i]))); > } >- fUnits[i] = (IInstallableUnit) collector.iterator().next(); >+ fUnits[i] = (IInstallableUnit) queryResult.iterator().next(); > } > } > return fUnits; >Index: src/org/eclipse/pde/internal/core/target/TargetDefinition.java >=================================================================== >RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetDefinition.java,v >retrieving revision 1.6.2.3 >diff -u -r1.6.2.3 TargetDefinition.java >--- src/org/eclipse/pde/internal/core/target/TargetDefinition.java 8 Dec 2009 15:46:46 -0000 1.6.2.3 >+++ src/org/eclipse/pde/internal/core/target/TargetDefinition.java 16 Dec 2009 07:04:47 -0000 >@@ -18,11 +18,11 @@ > import org.eclipse.debug.core.DebugPlugin; > import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo; > import org.eclipse.equinox.internal.provisional.p2.metadata.Version; >-import org.eclipse.equinox.internal.provisional.p2.metadata.query.Collector; > import org.eclipse.equinox.p2.engine.IProfile; > import org.eclipse.equinox.p2.engine.IProfileRegistry; > import org.eclipse.equinox.p2.engine.query.IUProfilePropertyQuery; > import org.eclipse.equinox.p2.metadata.IInstallableUnit; >+import org.eclipse.equinox.p2.metadata.query.IQueryResult; > import org.eclipse.pde.internal.core.PDECore; > import org.eclipse.pde.internal.core.target.provisional.*; > import org.xml.sax.SAXException; >@@ -663,8 +663,8 @@ > // still in the profile, we need to recreate (rather than uninstall) > IUProfilePropertyQuery propertyQuery = new IUProfilePropertyQuery(AbstractTargetHandle.PROP_INSTALLED_IU, Boolean.toString(true)); > propertyQuery.setProfile(profile); >- Collector collector = profile.query(propertyQuery, null); >- Iterator iterator = collector.iterator(); >+ IQueryResult queryResult = profile.query(propertyQuery, null); >+ Iterator iterator = queryResult.iterator(); > if (iterator.hasNext()) { > Set installedIUs = new HashSet(); > while (iterator.hasNext()) { >#P org.eclipse.pde.ui >Index: src/org/eclipse/pde/internal/ui/build/RuntimeInstallJob.java >=================================================================== >RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/RuntimeInstallJob.java,v >retrieving revision 1.16.2.9 >diff -u -r1.16.2.9 RuntimeInstallJob.java >--- src/org/eclipse/pde/internal/ui/build/RuntimeInstallJob.java 8 Dec 2009 15:46:44 -0000 1.16.2.9 >+++ src/org/eclipse/pde/internal/ui/build/RuntimeInstallJob.java 16 Dec 2009 07:04:48 -0000 >@@ -21,11 +21,13 @@ > import org.eclipse.equinox.internal.provisional.p2.metadata.*; > import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription; > import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitPatchDescription; >-import org.eclipse.equinox.internal.provisional.p2.metadata.query.*; >+import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery; >+import org.eclipse.equinox.internal.provisional.p2.metadata.query.MatchQuery; > import org.eclipse.equinox.p2.engine.IProfile; > import org.eclipse.equinox.p2.engine.IProfileRegistry; > import org.eclipse.equinox.p2.metadata.IInstallableUnit; > import org.eclipse.equinox.p2.metadata.IRequirement; >+import org.eclipse.equinox.p2.metadata.query.IQueryResult; > import org.eclipse.equinox.p2.operations.*; > import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository; > import org.eclipse.equinox.p2.ui.ProvisioningUI; >@@ -123,7 +125,7 @@ > > // Check if the right version exists in the new meta repo > Version newVersion = Version.parseVersion(version); >- Collector queryMatches = metaRepo.query(new InstallableUnitQuery(id, newVersion), monitor); >+ IQueryResult queryMatches = metaRepo.query(new InstallableUnitQuery(id, newVersion), monitor); > if (queryMatches.size() == 0) { > return new Status(IStatus.ERROR, PDEPlugin.getPluginId(), NLS.bind(PDEUIMessages.RuntimeInstallJob_ErrorCouldNotFindUnitInRepo, new String[] {id, version})); > } >@@ -199,7 +201,7 @@ > iuPatchDescription.setApplicabilityScope(new IRequirement[0][0]); > > // Add lifecycle requirement on a changed bundle, if it gets updated, then we should uninstall the patch >- Collector queryMatches = profile.query(new MatchQuery() { >+ IQueryResult queryMatches = profile.query(new MatchQuery() { > public boolean isMatch(Object candidate) { > if (candidate instanceof IInstallableUnit) { > IRequirement[] reqs = ((IInstallableUnit) candidate).getRequiredCapabilities(); >#P org.eclipse.pde.ui.tests >Index: src/org/eclipse/pde/ui/tests/target/IUBundleContainerTests.java >=================================================================== >RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/IUBundleContainerTests.java,v >retrieving revision 1.6.2.4 >diff -u -r1.6.2.4 IUBundleContainerTests.java >--- src/org/eclipse/pde/ui/tests/target/IUBundleContainerTests.java 8 Dec 2009 15:46:45 -0000 1.6.2.4 >+++ src/org/eclipse/pde/ui/tests/target/IUBundleContainerTests.java 16 Dec 2009 07:04:49 -0000 >@@ -10,8 +10,6 @@ > *******************************************************************************/ > package org.eclipse.pde.ui.tests.target; > >-import org.eclipse.equinox.p2.metadata.IInstallableUnit; >- > import java.io.*; > import java.net.URI; > import java.net.URL; >@@ -21,8 +19,9 @@ > import junit.framework.TestSuite; > import org.eclipse.core.filesystem.URIUtil; > import org.eclipse.core.runtime.*; >-import org.eclipse.equinox.internal.provisional.p2.metadata.query.Collector; > import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery; >+import org.eclipse.equinox.p2.metadata.IInstallableUnit; >+import org.eclipse.equinox.p2.metadata.query.IQueryResult; > import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository; > import org.eclipse.equinox.p2.repository.metadata.IMetadataRepositoryManager; > import org.eclipse.pde.internal.core.PDECore; >@@ -74,7 +73,7 @@ > * @return installable unit > */ > protected IInstallableUnit getUnit(String id, IMetadataRepository repository) { >- Collector result = repository.query(new InstallableUnitQuery(id), null); >+ IQueryResult result = repository.query(new InstallableUnitQuery(id), null); > IInstallableUnit[] units = (IInstallableUnit[]) result.toArray(IInstallableUnit.class); > if (units.length == 1) { > return units[0];
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 292691
:
152095
|
152205
|
152362
|
152365
|
152504
|
152544
|
152984
|
152986
|
153141
|
153282
|
153349
|
153895
|
153988
|
154541
|
154542
|
154883
|
155120
|
155154
|
155466
|
155547
|
155813
|
155814
|
155879
|
155912
|
155913
|
155979