diff options
author | Krzysztof Daniel | 2013-12-09 18:34:06 +0000 |
---|---|---|
committer | Krzysztof Daniel | 2013-12-09 21:44:18 +0000 |
commit | d7badb5db57e955f940cb43814cb204c71d15985 (patch) | |
tree | 5023b8b87fdc6e1004ed52800e288f97b4de9872 | |
parent | e68ffe41281328dfb97e02f49327bd040d01b7b9 (diff) | |
download | rt.equinox.p2-d7badb5db57e955f940cb43814cb204c71d15985.tar.gz rt.equinox.p2-d7badb5db57e955f940cb43814cb204c71d15985.tar.xz rt.equinox.p2-d7badb5db57e955f940cb43814cb204c71d15985.zip |
bug 418662 - Get rid of compile warnings in official build -
org.eclipse.equinox.p2.discovery.compatibility
Change-Id: Ieaf254570551fef783d1cc6bbf79daf51847d5fa
6 files changed, 11 insertions, 3 deletions
diff --git a/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF index b03a7a64d..93eca1a4d 100644 --- a/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF @@ -41,7 +41,8 @@ Export-Package: org.eclipse.equinox.internal.p2.core;x-friends:="org.eclipse.equ org.eclipse.equinox.p2.updatechecker, org.eclipse.equinox.p2.updatechecker.app, org.eclipse.equinox.p2.updatesite, - org.eclipse.equinox.p2.transport.ecf", + org.eclipse.equinox.p2.transport.ecf, + org.eclipse.equinox.p2.discovery.compatibility", org.eclipse.equinox.internal.provisional.p2.core.eventbus; x-friends:="org.eclipse.equinox.p2.artifact.repository, org.eclipse.equinox.p2.director, diff --git a/bundles/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/BundleDiscoveryStrategy.java b/bundles/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/BundleDiscoveryStrategy.java index 29e11627d..bb4796073 100644 --- a/bundles/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/BundleDiscoveryStrategy.java +++ b/bundles/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/BundleDiscoveryStrategy.java @@ -28,6 +28,7 @@ public class BundleDiscoveryStrategy extends AbstractDiscoveryStrategy { // constructor } + @SuppressWarnings("unused") @Override public void performDiscovery(IProgressMonitor monitor) throws CoreException { if (items == null || categories == null) { diff --git a/bundles/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/DirectoryParser.java b/bundles/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/DirectoryParser.java index 5cac98fd4..76a9fe10b 100644 --- a/bundles/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/DirectoryParser.java +++ b/bundles/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/DirectoryParser.java @@ -60,6 +60,7 @@ public class DirectoryParser { return contentHandler.directory; } + @SuppressWarnings("unused") private class DirectoryContentHandler implements ContentHandler { Directory directory; @@ -68,6 +69,9 @@ public class DirectoryParser { // ignore } + /** + * @throws SAXException + */ public void endDocument() throws SAXException { // ignore } diff --git a/bundles/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/DiscoveryRegistryStrategy.java b/bundles/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/DiscoveryRegistryStrategy.java index c523fb130..edea13a05 100644 --- a/bundles/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/DiscoveryRegistryStrategy.java +++ b/bundles/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/DiscoveryRegistryStrategy.java @@ -155,6 +155,7 @@ class DiscoveryRegistryStrategy extends RegistryStrategy { try { jar.close(); } catch (Exception e) { + // ignore } } jars.clear(); diff --git a/bundles/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF index bc6bf7777..c89afcdbe 100644 --- a/bundles/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF @@ -18,7 +18,8 @@ Export-Package: org.eclipse.equinox.internal.p2.persistence; org.eclipse.equinox.p2.updatesite, org.eclipse.equinox.p2.repository.tools, org.eclipse.equinox.p2.transport.ecf, - org.eclipse.equinox.p2.engine", + org.eclipse.equinox.p2.engine, + org.eclipse.equinox.p2.discovery.compatibility", org.eclipse.equinox.internal.p2.repository.helpers; x-friends:="org.eclipse.equinox.p2.artifact.repository, org.eclipse.equinox.p2.exemplarysetup, diff --git a/bundles/org.eclipse.equinox.p2.transport.ecf/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.transport.ecf/META-INF/MANIFEST.MF index 8dafc6b68..b2b8497e3 100644 --- a/bundles/org.eclipse.equinox.p2.transport.ecf/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.transport.ecf/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.ecf;bundle-version="3.1.0", Service-Component: OSGI-INF/ecfTransport.xml Bundle-Activator: org.eclipse.equinox.internal.p2.transport.ecf.Activator Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.equinox.internal.p2.transport.ecf;x-internal:=true +Export-Package: org.eclipse.equinox.internal.p2.transport.ecf;x-friends:="org.eclipse.equinox.p2.discovery.compatibility" Bundle-Vendor: %providerName Bundle-Localization: plugin Import-Package: org.eclipse.osgi.util;version="1.1.0", |