Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2010-07-16 16:18:12 -0400
committerThomas Watson2010-07-16 16:18:12 -0400
commit4221de6fdf63fb9e21744396d699d51d88a8fa85 (patch)
tree921ab4704e60eb64e09092f12b3c8eb06f9f4be7
parentc1ebc886a406cd2396676f481e5d9347b84beafe (diff)
downloadrt.equinox.framework-4221de6fdf63fb9e21744396d699d51d88a8fa85.tar.gz
rt.equinox.framework-4221de6fdf63fb9e21744396d699d51d88a8fa85.tar.xz
rt.equinox.framework-4221de6fdf63fb9e21744396d699d51d88a8fa85.zip
Fix warnings.v20100716
-rw-r--r--bundles/org.eclipse.osgi/.settings/.api_filters157
-rw-r--r--bundles/org.eclipse.osgi/.settings/org.eclipse.jdt.core.prefs4
-rw-r--r--bundles/org.eclipse.osgi/console/src/org/eclipse/osgi/framework/internal/core/ConsoleManager.java8
-rw-r--r--bundles/org.eclipse.osgi/console/src/org/eclipse/osgi/framework/internal/core/FrameworkCommandInterpreter.java6
-rw-r--r--bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/AbstractBundle.java2
-rw-r--r--bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/AliasMapper.java13
-rw-r--r--bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/BundleHost.java2
-rw-r--r--bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/BundleSource.java8
-rw-r--r--bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/EquinoxLauncher.java6
-rw-r--r--bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/ExportedPackageImpl.java8
-rw-r--r--bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/FilterImpl.java4
-rw-r--r--bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Framework.java24
-rw-r--r--bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/ManifestLocalization.java4
-rw-r--r--bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/PackageAdminImpl.java5
-rw-r--r--bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/SystemBundleActivator.java21
-rw-r--r--bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/protocol/MultiplexingFactory.java2
-rw-r--r--bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/loader/SystemBundleLoader.java11
-rw-r--r--bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/permadmin/SecurePermissionStorage.java16
-rw-r--r--bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/permadmin/SecurityAdmin.java2
-rw-r--r--bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/BaseAdaptor.java5
-rw-r--r--bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/BaseData.java3
-rw-r--r--bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/bundlefile/DirZipBundleEntry.java5
-rw-r--r--bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/bundlefile/NestedDirBundleFile.java5
-rw-r--r--bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/loader/ClasspathManager.java6
-rw-r--r--bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/framework/internal/protocol/reference/Handler.java7
-rw-r--r--bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/BasePermissionStorage.java17
-rw-r--r--bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/BaseStorage.java45
-rw-r--r--bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/BaseStorageHook.java24
-rw-r--r--bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/StateManager.java27
-rw-r--r--bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/SystemBundleData.java5
-rw-r--r--bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/EclipseLog.java3
-rw-r--r--bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseAdaptorHook.java15
-rw-r--r--bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseAppLauncher.java6
-rw-r--r--bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseEnvironmentInfo.java16
-rw-r--r--bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseErrorHandler.java15
-rw-r--r--bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseLazyStarter.java11
-rw-r--r--bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseLogHook.java15
-rw-r--r--bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseStorageHook.java9
-rw-r--r--bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java10
-rw-r--r--bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginParser.java46
-rw-r--r--bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/stats/StatsManager.java5
-rw-r--r--bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/ResolverBundle.java4
-rw-r--r--bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/BundleDescriptionImpl.java2
-rw-r--r--bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/ComputeNodeOrder.java20
-rw-r--r--bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/ExportPackageDescriptionImpl.java5
-rw-r--r--bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateBuilder.java10
-rw-r--r--bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateImpl.java7
-rw-r--r--bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateObjectFactoryImpl.java4
-rw-r--r--bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/SystemState.java5
-rw-r--r--bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/UserState.java5
-rw-r--r--bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/VersionConstraintImpl.java4
-rw-r--r--bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/internal/signedcontent/SignedBundleHook.java9
-rw-r--r--bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/internal/signedcontent/SignedStorageHook.java13
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/core/runtime/internal/adaptor/BasicLocation.java6
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFileInputStream.java3
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/ManifestElement.java27
56 files changed, 434 insertions, 293 deletions
diff --git a/bundles/org.eclipse.osgi/.settings/.api_filters b/bundles/org.eclipse.osgi/.settings/.api_filters
index a6308bce2..008608453 100644
--- a/bundles/org.eclipse.osgi/.settings/.api_filters
+++ b/bundles/org.eclipse.osgi/.settings/.api_filters
@@ -4,32 +4,32 @@
<filter id="403767336">
<message_arguments>
<message_argument value="org.osgi.framework.Bundle"/>
-<message_argument value="SIGNERS_TRUSTED"/>
+<message_argument value="SIGNERS_ALL"/>
</message_arguments>
</filter>
<filter id="403767336">
<message_arguments>
<message_argument value="org.osgi.framework.Bundle"/>
-<message_argument value="SIGNERS_ALL"/>
+<message_argument value="SIGNERS_TRUSTED"/>
</message_arguments>
</filter>
<filter id="403804204">
<message_arguments>
<message_argument value="org.osgi.framework.Bundle"/>
-<message_argument value="getVersion()"/>
+<message_argument value="getSignerCertificates(int)"/>
</message_arguments>
</filter>
<filter id="403804204">
<message_arguments>
<message_argument value="org.osgi.framework.Bundle"/>
-<message_argument value="getSignerCertificates(int)"/>
+<message_argument value="getVersion()"/>
</message_arguments>
</filter>
<filter id="1209008130">
<message_arguments>
<message_argument value="1.5"/>
<message_argument value="3.5"/>
-<message_argument value="getSignerCertificates(int)"/>
+<message_argument value="SIGNERS_ALL"/>
</message_arguments>
</filter>
<filter id="1209008130">
@@ -43,7 +43,7 @@
<message_arguments>
<message_argument value="1.5"/>
<message_argument value="3.5"/>
-<message_argument value="SIGNERS_ALL"/>
+<message_argument value="getSignerCertificates(int)"/>
</message_arguments>
</filter>
<filter id="1209008130">
@@ -59,98 +59,98 @@
<message_arguments>
<message_argument value="1.5"/>
<message_argument value="3.5"/>
-<message_argument value="DUPLICATE_BUNDLE_ERROR"/>
+<message_argument value="ACTIVATOR_ERROR"/>
</message_arguments>
</filter>
<filter id="1141899266">
<message_arguments>
<message_argument value="1.5"/>
<message_argument value="3.5"/>
-<message_argument value="STATECHANGE_ERROR"/>
+<message_argument value="BundleException(String, int)"/>
</message_arguments>
</filter>
<filter id="1141899266">
<message_arguments>
<message_argument value="1.5"/>
<message_argument value="3.5"/>
-<message_argument value="NATIVECODE_ERROR"/>
+<message_argument value="BundleException(String, int, Throwable)"/>
</message_arguments>
</filter>
<filter id="1141899266">
<message_arguments>
<message_argument value="1.5"/>
<message_argument value="3.5"/>
-<message_argument value="SECURITY_ERROR"/>
+<message_argument value="DUPLICATE_BUNDLE_ERROR"/>
</message_arguments>
</filter>
<filter id="1141899266">
<message_arguments>
<message_argument value="1.5"/>
<message_argument value="3.5"/>
-<message_argument value="UNSUPPORTED_OPERATION"/>
+<message_argument value="INVALID_OPERATION"/>
</message_arguments>
</filter>
<filter id="1141899266">
<message_arguments>
<message_argument value="1.5"/>
<message_argument value="3.5"/>
-<message_argument value="INVALID_OPERATION"/>
+<message_argument value="MANIFEST_ERROR"/>
</message_arguments>
</filter>
<filter id="1141899266">
<message_arguments>
<message_argument value="1.5"/>
<message_argument value="3.5"/>
-<message_argument value="MANIFEST_ERROR"/>
+<message_argument value="NATIVECODE_ERROR"/>
</message_arguments>
</filter>
<filter id="1141899266">
<message_arguments>
<message_argument value="1.5"/>
<message_argument value="3.5"/>
-<message_argument value="BundleException(String, int)"/>
+<message_argument value="RESOLVE_ERROR"/>
</message_arguments>
</filter>
<filter id="1141899266">
<message_arguments>
<message_argument value="1.5"/>
<message_argument value="3.5"/>
-<message_argument value="RESOLVE_ERROR"/>
+<message_argument value="SECURITY_ERROR"/>
</message_arguments>
</filter>
<filter id="1141899266">
<message_arguments>
<message_argument value="1.5"/>
<message_argument value="3.5"/>
-<message_argument value="ACTIVATOR_ERROR"/>
+<message_argument value="START_TRANSIENT_ERROR"/>
</message_arguments>
</filter>
<filter id="1141899266">
<message_arguments>
<message_argument value="1.5"/>
<message_argument value="3.5"/>
-<message_argument value="START_TRANSIENT_ERROR"/>
+<message_argument value="STATECHANGE_ERROR"/>
</message_arguments>
</filter>
<filter id="1141899266">
<message_arguments>
<message_argument value="1.5"/>
<message_argument value="3.5"/>
-<message_argument value="getType()"/>
+<message_argument value="UNSPECIFIED"/>
</message_arguments>
</filter>
<filter id="1141899266">
<message_arguments>
<message_argument value="1.5"/>
<message_argument value="3.5"/>
-<message_argument value="BundleException(String, int, Throwable)"/>
+<message_argument value="UNSUPPORTED_OPERATION"/>
</message_arguments>
</filter>
<filter id="1141899266">
<message_arguments>
<message_argument value="1.5"/>
<message_argument value="3.5"/>
-<message_argument value="UNSPECIFIED"/>
+<message_argument value="getType()"/>
</message_arguments>
</filter>
</resource>
@@ -167,31 +167,31 @@
<filter id="403767336">
<message_arguments>
<message_argument value="org.osgi.framework.Constants"/>
-<message_argument value="FRAMEWORK_LIBRARY_EXTENSIONS"/>
+<message_argument value="FRAMEWORK_BEGINNING_STARTLEVEL"/>
</message_arguments>
</filter>
<filter id="403767336">
<message_arguments>
<message_argument value="org.osgi.framework.Constants"/>
-<message_argument value="FRAMEWORK_SECURITY"/>
+<message_argument value="FRAMEWORK_BUNDLE_PARENT"/>
</message_arguments>
</filter>
<filter id="403767336">
<message_arguments>
<message_argument value="org.osgi.framework.Constants"/>
-<message_argument value="FRAMEWORK_TRUST_REPOSITORIES"/>
+<message_argument value="FRAMEWORK_BUNDLE_PARENT_APP"/>
</message_arguments>
</filter>
<filter id="403767336">
<message_arguments>
<message_argument value="org.osgi.framework.Constants"/>
-<message_argument value="FRAMEWORK_BUNDLE_PARENT_EXT"/>
+<message_argument value="FRAMEWORK_BUNDLE_PARENT_BOOT"/>
</message_arguments>
</filter>
<filter id="403767336">
<message_arguments>
<message_argument value="org.osgi.framework.Constants"/>
-<message_argument value="FRAMEWORK_SECURITY_OSGI"/>
+<message_argument value="FRAMEWORK_BUNDLE_PARENT_EXT"/>
</message_arguments>
</filter>
<filter id="403767336">
@@ -203,123 +203,123 @@
<filter id="403767336">
<message_arguments>
<message_argument value="org.osgi.framework.Constants"/>
-<message_argument value="FRAMEWORK_STORAGE"/>
+<message_argument value="FRAMEWORK_EXECPERMISSION"/>
</message_arguments>
</filter>
<filter id="403767336">
<message_arguments>
<message_argument value="org.osgi.framework.Constants"/>
-<message_argument value="SERVICE_TYPE"/>
+<message_argument value="FRAMEWORK_LIBRARY_EXTENSIONS"/>
</message_arguments>
</filter>
<filter id="403767336">
<message_arguments>
<message_argument value="org.osgi.framework.Constants"/>
-<message_argument value="FRAMEWORK_BUNDLE_PARENT_APP"/>
+<message_argument value="FRAMEWORK_SECURITY"/>
</message_arguments>
</filter>
<filter id="403767336">
<message_arguments>
<message_argument value="org.osgi.framework.Constants"/>
-<message_argument value="FRAMEWORK_BEGINNING_STARTLEVEL"/>
+<message_argument value="FRAMEWORK_SECURITY_OSGI"/>
</message_arguments>
</filter>
<filter id="403767336">
<message_arguments>
<message_argument value="org.osgi.framework.Constants"/>
-<message_argument value="FRAMEWORK_STORAGE_CLEAN_ONFIRSTINIT"/>
+<message_argument value="FRAMEWORK_STORAGE"/>
</message_arguments>
</filter>
<filter id="403767336">
<message_arguments>
<message_argument value="org.osgi.framework.Constants"/>
-<message_argument value="FRAMEWORK_SYSTEMPACKAGES_EXTRA"/>
+<message_argument value="FRAMEWORK_STORAGE_CLEAN"/>
</message_arguments>
</filter>
<filter id="403767336">
<message_arguments>
<message_argument value="org.osgi.framework.Constants"/>
-<message_argument value="FRAMEWORK_BUNDLE_PARENT"/>
+<message_argument value="FRAMEWORK_STORAGE_CLEAN_ONFIRSTINIT"/>
</message_arguments>
</filter>
<filter id="403767336">
<message_arguments>
<message_argument value="org.osgi.framework.Constants"/>
-<message_argument value="FRAMEWORK_BUNDLE_PARENT_BOOT"/>
+<message_argument value="FRAMEWORK_SYSTEMPACKAGES_EXTRA"/>
</message_arguments>
</filter>
<filter id="403767336">
<message_arguments>
<message_argument value="org.osgi.framework.Constants"/>
-<message_argument value="FRAMEWORK_STORAGE_CLEAN"/>
+<message_argument value="FRAMEWORK_TRUST_REPOSITORIES"/>
</message_arguments>
</filter>
<filter id="403767336">
<message_arguments>
<message_argument value="org.osgi.framework.Constants"/>
-<message_argument value="FRAMEWORK_EXECPERMISSION"/>
+<message_argument value="FRAMEWORK_WINDOWSYSTEM"/>
</message_arguments>
</filter>
<filter id="403767336">
<message_arguments>
<message_argument value="org.osgi.framework.Constants"/>
-<message_argument value="FRAMEWORK_WINDOWSYSTEM"/>
+<message_argument value="SERVICE_TYPE"/>
</message_arguments>
</filter>
<filter id="1209008130">
<message_arguments>
<message_argument value="1.5"/>
<message_argument value="3.5"/>
-<message_argument value="FRAMEWORK_STORAGE_CLEAN_ONFIRSTINIT"/>
+<message_argument value="FRAMEWORK_BEGINNING_STARTLEVEL"/>
</message_arguments>
</filter>
<filter id="1209008130">
<message_arguments>
<message_argument value="1.5"/>
<message_argument value="3.5"/>
-<message_argument value="FRAMEWORK_BUNDLE_PARENT_FRAMEWORK"/>
+<message_argument value="FRAMEWORK_BUNDLE_PARENT"/>
</message_arguments>
</filter>
<filter id="1209008130">
<message_arguments>
<message_argument value="1.5"/>
<message_argument value="3.5"/>
-<message_argument value="FRAMEWORK_STORAGE"/>
+<message_argument value="FRAMEWORK_BUNDLE_PARENT_APP"/>
</message_arguments>
</filter>
<filter id="1209008130">
<message_arguments>
<message_argument value="1.5"/>
<message_argument value="3.5"/>
-<message_argument value="FRAMEWORK_SECURITY_OSGI"/>
+<message_argument value="FRAMEWORK_BUNDLE_PARENT_BOOT"/>
</message_arguments>
</filter>
<filter id="1209008130">
<message_arguments>
<message_argument value="1.5"/>
<message_argument value="3.5"/>
-<message_argument value="FRAMEWORK_SYSTEMPACKAGES_EXTRA"/>
+<message_argument value="FRAMEWORK_BUNDLE_PARENT_EXT"/>
</message_arguments>
</filter>
<filter id="1209008130">
<message_arguments>
<message_argument value="1.5"/>
<message_argument value="3.5"/>
-<message_argument value="SERVICE_TYPE"/>
+<message_argument value="FRAMEWORK_BUNDLE_PARENT_FRAMEWORK"/>
</message_arguments>
</filter>
<filter id="1209008130">
<message_arguments>
<message_argument value="1.5"/>
<message_argument value="3.5"/>
-<message_argument value="FRAMEWORK_BEGINNING_STARTLEVEL"/>
+<message_argument value="FRAMEWORK_EXECPERMISSION"/>
</message_arguments>
</filter>
<filter id="1209008130">
<message_arguments>
<message_argument value="1.5"/>
<message_argument value="3.5"/>
-<message_argument value="FRAMEWORK_TRUST_REPOSITORIES"/>
+<message_argument value="FRAMEWORK_LIBRARY_EXTENSIONS"/>
</message_arguments>
</filter>
<filter id="1209008130">
@@ -333,42 +333,42 @@
<message_arguments>
<message_argument value="1.5"/>
<message_argument value="3.5"/>
-<message_argument value="FRAMEWORK_BUNDLE_PARENT"/>
+<message_argument value="FRAMEWORK_SECURITY_OSGI"/>
</message_arguments>
</filter>
<filter id="1209008130">
<message_arguments>
<message_argument value="1.5"/>
<message_argument value="3.5"/>
-<message_argument value="FRAMEWORK_BUNDLE_PARENT_APP"/>
+<message_argument value="FRAMEWORK_STORAGE"/>
</message_arguments>
</filter>
<filter id="1209008130">
<message_arguments>
<message_argument value="1.5"/>
<message_argument value="3.5"/>
-<message_argument value="FRAMEWORK_EXECPERMISSION"/>
+<message_argument value="FRAMEWORK_STORAGE_CLEAN"/>
</message_arguments>
</filter>
<filter id="1209008130">
<message_arguments>
<message_argument value="1.5"/>
<message_argument value="3.5"/>
-<message_argument value="FRAMEWORK_LIBRARY_EXTENSIONS"/>
+<message_argument value="FRAMEWORK_STORAGE_CLEAN_ONFIRSTINIT"/>
</message_arguments>
</filter>
<filter id="1209008130">
<message_arguments>
<message_argument value="1.5"/>
<message_argument value="3.5"/>
-<message_argument value="FRAMEWORK_STORAGE_CLEAN"/>
+<message_argument value="FRAMEWORK_SYSTEMPACKAGES_EXTRA"/>
</message_arguments>
</filter>
<filter id="1209008130">
<message_arguments>
<message_argument value="1.5"/>
<message_argument value="3.5"/>
-<message_argument value="FRAMEWORK_BUNDLE_PARENT_BOOT"/>
+<message_argument value="FRAMEWORK_TRUST_REPOSITORIES"/>
</message_arguments>
</filter>
<filter id="1209008130">
@@ -382,7 +382,7 @@
<message_arguments>
<message_argument value="1.5"/>
<message_argument value="3.5"/>
-<message_argument value="FRAMEWORK_BUNDLE_PARENT_EXT"/>
+<message_argument value="SERVICE_TYPE"/>
</message_arguments>
</filter>
</resource>
@@ -391,28 +391,28 @@
<message_arguments>
<message_argument value="1.5"/>
<message_argument value="3.5"/>
-<message_argument value="WAIT_TIMEDOUT"/>
+<message_argument value="STOPPED"/>
</message_arguments>
</filter>
<filter id="1141899266">
<message_arguments>
<message_argument value="1.5"/>
<message_argument value="3.5"/>
-<message_argument value="STOPPED"/>
+<message_argument value="STOPPED_BOOTCLASSPATH_MODIFIED"/>
</message_arguments>
</filter>
<filter id="1141899266">
<message_arguments>
<message_argument value="1.5"/>
<message_argument value="3.5"/>
-<message_argument value="STOPPED_BOOTCLASSPATH_MODIFIED"/>
+<message_argument value="STOPPED_UPDATE"/>
</message_arguments>
</filter>
<filter id="1141899266">
<message_arguments>
<message_argument value="1.5"/>
<message_argument value="3.5"/>
-<message_argument value="STOPPED_UPDATE"/>
+<message_argument value="WAIT_TIMEDOUT"/>
</message_arguments>
</filter>
</resource>
@@ -421,14 +421,14 @@
<message_arguments>
<message_argument value="1.5"/>
<message_argument value="3.5"/>
-<message_argument value="matchDistinguishedNameChain(String, List)"/>
+<message_argument value="getBundle(Class)"/>
</message_arguments>
</filter>
<filter id="1141899266">
<message_arguments>
<message_argument value="1.5"/>
<message_argument value="3.5"/>
-<message_argument value="getBundle(Class)"/>
+<message_argument value="matchDistinguishedNameChain(String, List)"/>
</message_arguments>
</filter>
</resource>
@@ -437,14 +437,14 @@
<message_arguments>
<message_argument value="1.5"/>
<message_argument value="3.5"/>
-<message_argument value="PackagePermission(String, Bundle, String)"/>
+<message_argument value="EXPORTONLY"/>
</message_arguments>
</filter>
<filter id="1141899266">
<message_arguments>
<message_argument value="1.5"/>
<message_argument value="3.5"/>
-<message_argument value="EXPORTONLY"/>
+<message_argument value="PackagePermission(String, Bundle, String)"/>
</message_arguments>
</filter>
</resource>
@@ -514,7 +514,7 @@
<filter id="403804204">
<message_arguments>
<message_argument value="org.osgi.service.condpermadmin.ConditionalPermissionAdmin"/>
-<message_argument value="newConditionalPermissionUpdate()"/>
+<message_argument value="newConditionalPermissionInfo(String)"/>
</message_arguments>
</filter>
<filter id="403804204">
@@ -526,14 +526,14 @@
<filter id="403804204">
<message_arguments>
<message_argument value="org.osgi.service.condpermadmin.ConditionalPermissionAdmin"/>
-<message_argument value="newConditionalPermissionInfo(String)"/>
+<message_argument value="newConditionalPermissionUpdate()"/>
</message_arguments>
</filter>
<filter id="1209008130">
<message_arguments>
<message_argument value="1.1"/>
<message_argument value="3.5"/>
-<message_argument value="newConditionalPermissionUpdate()"/>
+<message_argument value="newConditionalPermissionInfo(String)"/>
</message_arguments>
</filter>
<filter id="1209008130">
@@ -547,7 +547,7 @@
<message_arguments>
<message_argument value="1.1"/>
<message_argument value="3.5"/>
-<message_argument value="newConditionalPermissionInfo(String)"/>
+<message_argument value="newConditionalPermissionUpdate()"/>
</message_arguments>
</filter>
</resource>
@@ -555,31 +555,31 @@
<filter id="403767336">
<message_arguments>
<message_argument value="org.osgi.service.condpermadmin.ConditionalPermissionInfo"/>
-<message_argument value="DENY"/>
+<message_argument value="ALLOW"/>
</message_arguments>
</filter>
<filter id="403767336">
<message_arguments>
<message_argument value="org.osgi.service.condpermadmin.ConditionalPermissionInfo"/>
-<message_argument value="ALLOW"/>
+<message_argument value="DENY"/>
</message_arguments>
</filter>
<filter id="403804204">
<message_arguments>
<message_argument value="org.osgi.service.condpermadmin.ConditionalPermissionInfo"/>
-<message_argument value="toString()"/>
+<message_argument value="equals(Object)"/>
</message_arguments>
</filter>
<filter id="403804204">
<message_arguments>
<message_argument value="org.osgi.service.condpermadmin.ConditionalPermissionInfo"/>
-<message_argument value="getEncoded()"/>
+<message_argument value="getAccessDecision()"/>
</message_arguments>
</filter>
<filter id="403804204">
<message_arguments>
<message_argument value="org.osgi.service.condpermadmin.ConditionalPermissionInfo"/>
-<message_argument value="equals(Object)"/>
+<message_argument value="getEncoded()"/>
</message_arguments>
</filter>
<filter id="403804204">
@@ -591,42 +591,42 @@
<filter id="403804204">
<message_arguments>
<message_argument value="org.osgi.service.condpermadmin.ConditionalPermissionInfo"/>
-<message_argument value="getAccessDecision()"/>
+<message_argument value="toString()"/>
</message_arguments>
</filter>
<filter id="1209008130">
<message_arguments>
<message_argument value="1.1"/>
<message_argument value="3.5"/>
-<message_argument value="equals(Object)"/>
+<message_argument value="ALLOW"/>
</message_arguments>
</filter>
<filter id="1209008130">
<message_arguments>
<message_argument value="1.1"/>
<message_argument value="3.5"/>
-<message_argument value="getAccessDecision()"/>
+<message_argument value="DENY"/>
</message_arguments>
</filter>
<filter id="1209008130">
<message_arguments>
<message_argument value="1.1"/>
<message_argument value="3.5"/>
-<message_argument value="DENY"/>
+<message_argument value="equals(Object)"/>
</message_arguments>
</filter>
<filter id="1209008130">
<message_arguments>
<message_argument value="1.1"/>
<message_argument value="3.5"/>
-<message_argument value="getEncoded()"/>
+<message_argument value="getAccessDecision()"/>
</message_arguments>
</filter>
<filter id="1209008130">
<message_arguments>
<message_argument value="1.1"/>
<message_argument value="3.5"/>
-<message_argument value="ALLOW"/>
+<message_argument value="getEncoded()"/>
</message_arguments>
</filter>
<filter id="1209008130">
@@ -671,13 +671,4 @@
</message_arguments>
</filter>
</resource>
-<resource path="supplement/src/org/eclipse/osgi/service/localization/LocaleProvider.java" type="org.eclipse.osgi.service.localization.LocaleProvider">
-<filter id="1108344834">
-<message_arguments>
-<message_argument value="1.1"/>
-<message_argument value="3.6"/>
-<message_argument value="org.eclipse.osgi.service.localization.LocaleProvider"/>
-</message_arguments>
-</filter>
-</resource>
</component>
diff --git a/bundles/org.eclipse.osgi/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.osgi/.settings/org.eclipse.jdt.core.prefs
index 5a56c4312..f14287e85 100644
--- a/bundles/org.eclipse.osgi/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.osgi/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Mon May 03 08:45:46 CDT 2010
+#Fri Jul 16 15:14:09 CDT 2010
eclipse.preferences.version=1
org.eclipse.jdt.core.builder.cleanOutputFolder=clean
org.eclipse.jdt.core.builder.duplicateResourceTask=warning
@@ -37,7 +37,7 @@ org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
diff --git a/bundles/org.eclipse.osgi/console/src/org/eclipse/osgi/framework/internal/core/ConsoleManager.java b/bundles/org.eclipse.osgi/console/src/org/eclipse/osgi/framework/internal/core/ConsoleManager.java
index c4875099c..a40f24e56 100644
--- a/bundles/org.eclipse.osgi/console/src/org/eclipse/osgi/framework/internal/core/ConsoleManager.java
+++ b/bundles/org.eclipse.osgi/console/src/org/eclipse/osgi/framework/internal/core/ConsoleManager.java
@@ -86,7 +86,7 @@ public class ConsoleManager implements ServiceTrackerCustomizer {
public static final String PROP_CONSOLE = "osgi.console"; //$NON-NLS-1$
private static final String PROP_SYSTEM_IN_OUT = "console.systemInOut"; //$NON-NLS-1$
private static final String CONSOLE_NAME = "OSGi Console"; //$NON-NLS-1$
- private final Framework framework;
+ final Framework framework;
private final ServiceTracker cpTracker;
private final ServiceTracker sessions;
private final String consolePort;
@@ -125,11 +125,17 @@ public class ConsoleManager implements ServiceTrackerCustomizer {
}
if (port < 0) {
InputStream in = new FilterInputStream(System.in) {
+ /**
+ * @throws IOException
+ */
public void close() throws IOException {
// We don't want to close System.in
}
};
OutputStream out = new FilterOutputStream(System.out) {
+ /**
+ * @throws IOException
+ */
public void close() throws IOException {
// We don't want to close System.out
}
diff --git a/bundles/org.eclipse.osgi/console/src/org/eclipse/osgi/framework/internal/core/FrameworkCommandInterpreter.java b/bundles/org.eclipse.osgi/console/src/org/eclipse/osgi/framework/internal/core/FrameworkCommandInterpreter.java
index a54f2d813..26d1737c7 100644
--- a/bundles/org.eclipse.osgi/console/src/org/eclipse/osgi/framework/internal/core/FrameworkCommandInterpreter.java
+++ b/bundles/org.eclipse.osgi/console/src/org/eclipse/osgi/framework/internal/core/FrameworkCommandInterpreter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2009 IBM Corporation and others.
+ * Copyright (c) 2003, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -284,7 +284,9 @@ public class FrameworkCommandInterpreter implements CommandInterpreter {
printStackTrace(nested);
}
} catch (IllegalAccessException e) {
+ // nothing
} catch (InvocationTargetException e) {
+ // nothing
}
}
}
@@ -364,6 +366,7 @@ public class FrameworkCommandInterpreter implements CommandInterpreter {
try {
in.close();
} catch (IOException e) {
+ // nothing
}
}
}
@@ -512,6 +515,7 @@ public class FrameworkCommandInterpreter implements CommandInterpreter {
return answer;
}
} catch (NumberFormatException e) {
+ // nothing
}
println(ConsoleMsg.CONSOLE_INVALID_INPUT);
}
diff --git a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/AbstractBundle.java b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/AbstractBundle.java
index 92ea5da56..fab27980d 100644
--- a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/AbstractBundle.java
+++ b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/AbstractBundle.java
@@ -470,7 +470,7 @@ public abstract class AbstractBundle implements Bundle, Comparable, KeyedElement
protected void setStatus(final int mask, final boolean state) {
try {
AccessController.doPrivileged(new PrivilegedExceptionAction() {
- public Object run() throws BundleException, IOException {
+ public Object run() throws IOException {
int status = bundledata.getStatus();
boolean test = ((status & mask) != 0);
if (test != state) {
diff --git a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/AliasMapper.java b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/AliasMapper.java
index e3f0a1292..a623969ec 100644
--- a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/AliasMapper.java
+++ b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/AliasMapper.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
+ * Copyright (c) 2003, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -23,13 +23,6 @@ public class AliasMapper {
private static Hashtable osnameAliasTable;
/**
- * Constructor.
- *
- */
- public AliasMapper() {
- }
-
- /**
* Return the master alias for the processor.
*
* @param processor Input name
@@ -46,6 +39,7 @@ public class AliasMapper {
try {
in.close();
} catch (IOException ee) {
+ // nothing
}
}
}
@@ -76,6 +70,7 @@ public class AliasMapper {
try {
in.close();
} catch (IOException ee) {
+ // nothing
}
}
}
@@ -87,7 +82,7 @@ public class AliasMapper {
if (aliasObject instanceof String) {
osname = (String) aliasObject;
} else {
- return (Vector) aliasObject;
+ return aliasObject;
}
}
return (osname);
diff --git a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/BundleHost.java b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/BundleHost.java
index 0838838fd..3b2f78708 100644
--- a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/BundleHost.java
+++ b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/BundleHost.java
@@ -37,7 +37,7 @@ public class BundleHost extends AbstractBundle {
/** The List of BundleFragments */
protected BundleFragment[] fragments;
- public BundleHost(BundleData bundledata, Framework framework) throws BundleException {
+ public BundleHost(BundleData bundledata, Framework framework) {
super(bundledata, framework);
context = null;
fragments = null;
diff --git a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/BundleSource.java b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/BundleSource.java
index 79a3bbea6..a27e1ee9a 100644
--- a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/BundleSource.java
+++ b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/BundleSource.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
+ * Copyright (c) 2003, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -29,10 +29,16 @@ public class BundleSource extends URLConnection {
this.in = in;
}
+ /**
+ * @throws IOException
+ */
public void connect() throws IOException {
connected = true;
}
+ /**
+ * @throws IOException
+ */
public InputStream getInputStream() throws IOException {
return (in);
}
diff --git a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/EquinoxLauncher.java b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/EquinoxLauncher.java
index 895e04508..5b0d5e598 100644
--- a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/EquinoxLauncher.java
+++ b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/EquinoxLauncher.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
+ * Copyright (c) 2008, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -252,7 +252,7 @@ public class EquinoxLauncher implements org.osgi.framework.launch.Framework {
else
try {
AccessController.doPrivileged(new PrivilegedExceptionAction() {
- public Object run() throws BundleException {
+ public Object run() {
internalStart();
return null;
}
@@ -268,7 +268,7 @@ public class EquinoxLauncher implements org.osgi.framework.launch.Framework {
sm.checkPermission(new AdminPermission(this, actions));
}
- void internalStart() throws BundleException {
+ void internalStart() {
if (getState() == Bundle.ACTIVE)
return;
Framework current = internalInit();
diff --git a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/ExportedPackageImpl.java b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/ExportedPackageImpl.java
index 310ebf010..177689adc 100644
--- a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/ExportedPackageImpl.java
+++ b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/ExportedPackageImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
+ * Copyright (c) 2003, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -10,9 +10,8 @@
*******************************************************************************/
package org.eclipse.osgi.framework.internal.core;
-import org.eclipse.osgi.internal.loader.*;
-
import java.util.ArrayList;
+import org.eclipse.osgi.internal.loader.*;
import org.eclipse.osgi.service.resolver.BundleDescription;
import org.eclipse.osgi.service.resolver.ExportPackageDescription;
import org.osgi.framework.*;
@@ -74,6 +73,9 @@ public class ExportedPackageImpl implements ExportedPackage {
return (Bundle[]) importers.toArray(new Bundle[importers.size()]);
}
+ /**
+ * @deprecated
+ */
public String getSpecificationVersion() {
return specVersion;
}
diff --git a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/FilterImpl.java b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/FilterImpl.java
index 8100014ef..6903b7c4e 100644
--- a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/FilterImpl.java
+++ b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/FilterImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2009 IBM Corporation and others.
+ * Copyright (c) 2003, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -1590,7 +1590,7 @@ public class FilterImpl implements Filter /* since Framework 1.1 */{
int size = operands.size();
if (size == 0) {
- return "";
+ return ""; //$NON-NLS-1$
}
if (size == 1) {
diff --git a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Framework.java b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Framework.java
index fdc75432d..e26888914 100644
--- a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Framework.java
+++ b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Framework.java
@@ -162,12 +162,12 @@ public class Framework implements EventDispatcher, EventPublisher, Runnable {
* by the Framework constructor.
*
*/
- protected void initialize(FrameworkAdaptor adaptor) {
+ protected void initialize(FrameworkAdaptor initAdaptor) {
if (Profile.PROFILE && Profile.STARTUP)
Profile.logEnter("Framework.initialze()", null); //$NON-NLS-1$
long start = System.currentTimeMillis();
- this.adaptor = adaptor;
- delegateHooks = adaptor instanceof BaseAdaptor ? ((BaseAdaptor) adaptor).getHookRegistry().getClassLoaderDelegateHooks() : null;
+ this.adaptor = initAdaptor;
+ delegateHooks = initAdaptor instanceof BaseAdaptor ? ((BaseAdaptor) initAdaptor).getHookRegistry().getClassLoaderDelegateHooks() : null;
active = false;
installSecurityManager();
if (Debug.DEBUG_SECURITY) {
@@ -178,11 +178,11 @@ public class Framework implements EventDispatcher, EventPublisher, Runnable {
// initialize ContextFinder
initializeContextFinder();
/* initialize the adaptor */
- adaptor.initialize(this);
+ initAdaptor.initialize(this);
if (Profile.PROFILE && Profile.STARTUP)
Profile.logTime("Framework.initialze()", "adapter initialized"); //$NON-NLS-1$//$NON-NLS-2$
try {
- adaptor.initializeStorage();
+ initAdaptor.initializeStorage();
} catch (IOException e) /* fatal error */{
throw new RuntimeException(e.getMessage(), e);
}
@@ -192,12 +192,12 @@ public class Framework implements EventDispatcher, EventPublisher, Runnable {
* This must be done before calling any of the framework getProperty
* methods.
*/
- initializeProperties(adaptor.getProperties());
+ initializeProperties(initAdaptor.getProperties());
/* initialize admin objects */
packageAdmin = new PackageAdminImpl(this);
try {
// always create security admin even with security off
- securityAdmin = new SecurityAdmin(null, this, adaptor.getPermissionStorage());
+ securityAdmin = new SecurityAdmin(null, this, initAdaptor.getPermissionStorage());
} catch (IOException e) /* fatal error */{
e.printStackTrace();
throw new RuntimeException(e.getMessage(), e);
@@ -225,13 +225,13 @@ public class Framework implements EventDispatcher, EventPublisher, Runnable {
if (Profile.PROFILE && Profile.STARTUP)
Profile.logTime("Framework.initialze()", "done createSystemBundle"); //$NON-NLS-1$ //$NON-NLS-2$
/* install URLStreamHandlerFactory */
- installURLStreamHandlerFactory(systemBundle.context, adaptor);
+ installURLStreamHandlerFactory(systemBundle.context, initAdaptor);
/* install ContentHandlerFactory for OSGi URLStreamHandler support */
- installContentHandlerFactory(systemBundle.context, adaptor);
+ installContentHandlerFactory(systemBundle.context, initAdaptor);
if (Profile.PROFILE && Profile.STARTUP)
Profile.logTime("Framework.initialze()", "done new URLStream/Content HandlerFactory"); //$NON-NLS-1$//$NON-NLS-2$
/* create bundle objects for all installed bundles. */
- BundleData[] bundleDatas = adaptor.getInstalledBundles();
+ BundleData[] bundleDatas = initAdaptor.getInstalledBundles();
bundles = new BundleRepository(bundleDatas == null ? 10 : bundleDatas.length + 1);
/* add the system bundle to the Bundle Repository */
bundles.add(systemBundle);
@@ -675,7 +675,7 @@ public class Framework implements EventDispatcher, EventPublisher, Runnable {
* set the state of the System Bundle to STOPPING.
* this must be done first according to section 4.19.2 from the OSGi R3 spec.
*/
- systemBundle.state = AbstractBundle.STOPPING;
+ systemBundle.state = Bundle.STOPPING;
publishBundleEvent(BundleEvent.STOPPING, systemBundle); // need to send system bundle stopping event
/* call the FrameworkAdaptor.frameworkStopping method first */
try {
@@ -880,6 +880,8 @@ public class Framework implements EventDispatcher, EventPublisher, Runnable {
/* wait for the reservation to be released */
installLock.wait();
} catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ throw new BundleException("Thread has been interrupted while waiting for the location lock.", e); //$NON-NLS-1$
}
}
}
diff --git a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/ManifestLocalization.java b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/ManifestLocalization.java
index d0067fd2c..f0130d3f9 100644
--- a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/ManifestLocalization.java
+++ b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/ManifestLocalization.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
+ * Copyright (c) 2004, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -188,7 +188,7 @@ public class ManifestLocalization {
}
}
- private class EmptyResouceBundle extends ResourceBundle implements BundleResourceBundle {
+ class EmptyResouceBundle extends ResourceBundle implements BundleResourceBundle {
public Enumeration getKeys() {
return null;
}
diff --git a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/PackageAdminImpl.java b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/PackageAdminImpl.java
index 33c68026d..538609669 100644
--- a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/PackageAdminImpl.java
+++ b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/PackageAdminImpl.java
@@ -126,9 +126,8 @@ public class PackageAdminImpl implements PackageAdmin {
if (result == null) {
result = allExports[i];
} else {
- // TODO not efficient but this is not called very often
- Version curVersion = Version.parseVersion(result.getSpecificationVersion());
- Version newVersion = Version.parseVersion(allExports[i].getSpecificationVersion());
+ Version curVersion = result.getVersion();
+ Version newVersion = allExports[i].getVersion();
if (newVersion.compareTo(curVersion) >= 0)
result = allExports[i];
}
diff --git a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/SystemBundleActivator.java b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/SystemBundleActivator.java
index b8cbd460d..8be6dc762 100644
--- a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/SystemBundleActivator.java
+++ b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/SystemBundleActivator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2009 IBM Corporation and others.
+ * Copyright (c) 2003, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -31,12 +31,9 @@ public class SystemBundleActivator implements BundleActivator {
private ServiceRegistration debugOptions;
private ServiceRegistration contextFinder;
- public SystemBundleActivator() {
- }
-
- public void start(BundleContext context) throws Exception {
- this.context = context;
- bundle = (InternalSystemBundle) context.getBundle();
+ public void start(BundleContext bc) throws Exception {
+ this.context = bc;
+ bundle = (InternalSystemBundle) bc.getBundle();
framework = bundle.framework;
if (framework.packageAdmin != null)
@@ -47,7 +44,7 @@ public class SystemBundleActivator implements BundleActivator {
startLevel = register(new String[] {Constants.OSGI_STARTLEVEL_NAME}, framework.startLevelManager, null);
FrameworkDebugOptions dbgOptions = null;
if ((dbgOptions = FrameworkDebugOptions.getDefault()) != null) {
- dbgOptions.start(context);
+ dbgOptions.start(bc);
debugOptions = register(new String[] {org.eclipse.osgi.service.debug.DebugOptions.class.getName()}, dbgOptions, null);
}
ClassLoader tccl = framework.getContextFinder();
@@ -58,7 +55,7 @@ public class SystemBundleActivator implements BundleActivator {
}
// Always call the adaptor.frameworkStart() at the end of this method.
- framework.adaptor.frameworkStart(context);
+ framework.adaptor.frameworkStart(bc);
// attempt to resolve all bundles
// this is done after the adaptor.frameworkStart has been called
// this should be the first time the resolver State is accessed
@@ -67,9 +64,9 @@ public class SystemBundleActivator implements BundleActivator {
framework.systemBundle.manifestLocalization = null;
}
- public void stop(BundleContext context) throws Exception {
+ public void stop(BundleContext bc) throws Exception {
// Always call the adaptor.frameworkStop() at the begining of this method.
- framework.adaptor.frameworkStop(context);
+ framework.adaptor.frameworkStop(bc);
if (packageAdmin != null)
packageAdmin.unregister();
@@ -80,7 +77,7 @@ public class SystemBundleActivator implements BundleActivator {
if (debugOptions != null) {
FrameworkDebugOptions dbgOptions = FrameworkDebugOptions.getDefault();
if (dbgOptions != null)
- dbgOptions.stop(context);
+ dbgOptions.stop(bc);
debugOptions.unregister();
}
if (contextFinder != null)
diff --git a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/protocol/MultiplexingFactory.java b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/protocol/MultiplexingFactory.java
index 8ebe629e6..4b80e9255 100644
--- a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/protocol/MultiplexingFactory.java
+++ b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/protocol/MultiplexingFactory.java
@@ -29,7 +29,7 @@ public abstract class MultiplexingFactory {
private ServiceTracker packageAdminTracker;
// used to get access to the protected SecurityManager#getClassContext method
- private static class InternalSecurityManager extends SecurityManager {
+ static class InternalSecurityManager extends SecurityManager {
public Class[] getClassContext() {
return super.getClassContext();
}
diff --git a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/loader/SystemBundleLoader.java b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/loader/SystemBundleLoader.java
index 0408149b5..bfefa8ae1 100644
--- a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/loader/SystemBundleLoader.java
+++ b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/loader/SystemBundleLoader.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2009 IBM Corporation and others.
+ * Copyright (c) 2003, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -29,7 +29,7 @@ import org.osgi.framework.BundleException;
*/
public class SystemBundleLoader extends BundleLoader {
public static final String EQUINOX_EE = "x-equinox-ee"; //$NON-NLS-1$
- private final ClassLoader classLoader;
+ final ClassLoader classLoader;
private final HashSet eePackages;
private final HashSet extPackages;
private final ClassLoader extClassLoader;
@@ -175,6 +175,7 @@ public class SystemBundleLoader extends BundleLoader {
/**
* The ClassLoader that loads OSGi framework classes is used to find the resource.
* This method never gets called because there is no BundleClassLoader for the framework.
+ * @throws IOException
*/
public Enumeration findResources(String name) throws IOException {
return findLocalResources(name);
@@ -206,6 +207,9 @@ public class SystemBundleLoader extends BundleLoader {
// nothing
}
+ /**
+ * @throws IOException
+ */
public Enumeration getResources(String name) throws IOException {
return findLocalResources(name);
}
@@ -230,6 +234,9 @@ public class SystemBundleLoader extends BundleLoader {
return getResource(resource);
}
+ /**
+ * @throws ClassNotFoundException
+ */
public Class findLocalClass(String classname) throws ClassNotFoundException {
return SystemBundleLoader.this.findLocalClass(classname);
}
diff --git a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/permadmin/SecurePermissionStorage.java b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/permadmin/SecurePermissionStorage.java
index 39b87d09e..1ebea1a92 100644
--- a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/permadmin/SecurePermissionStorage.java
+++ b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/permadmin/SecurePermissionStorage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
+ * Copyright (c) 2003, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -16,11 +16,11 @@ import java.security.*;
import org.eclipse.osgi.framework.adaptor.PermissionStorage;
/**
- * PermissionStorage privileged action class.
+ * PermissionStorage privileged action class. This class is not thread safe. Callers
+ * must ensure multiple threads do not call methods on this class at the same time.
*/
-
public class SecurePermissionStorage implements PermissionStorage, PrivilegedExceptionAction {
- private PermissionStorage storage;
+ private final PermissionStorage storage;
private String location;
private String[] data;
private String[] infos;
@@ -54,8 +54,8 @@ public class SecurePermissionStorage implements PermissionStorage, PrivilegedExc
throw new UnsupportedOperationException();
}
- public String[] getPermissionData(String location) throws IOException {
- this.location = location;
+ public String[] getPermissionData(String loc) throws IOException {
+ this.location = loc;
this.action = GET;
try {
@@ -87,9 +87,9 @@ public class SecurePermissionStorage implements PermissionStorage, PrivilegedExc
}
}
- public void saveConditionalPermissionInfos(String[] infos) throws IOException {
+ public void saveConditionalPermissionInfos(String[] updatedInfos) throws IOException {
this.action = SAVE_INFOS;
- this.infos = infos;
+ this.infos = updatedInfos;
try {
AccessController.doPrivileged(this);
} catch (PrivilegedActionException e) {
diff --git a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/permadmin/SecurityAdmin.java b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/permadmin/SecurityAdmin.java
index cc369b1d6..3d81df738 100644
--- a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/permadmin/SecurityAdmin.java
+++ b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/permadmin/SecurityAdmin.java
@@ -841,7 +841,7 @@ public final class SecurityAdmin implements PermissionAdmin, ConditionalPermissi
endIndex++;
}
if (endIndex > dnChain.length()) {
- throw new IllegalArgumentException("unterminated escape");
+ throw new IllegalArgumentException("unterminated escape"); //$NON-NLS-1$
}
parsed.add(dnChain.substring(startIndex, endIndex));
startIndex = endIndex + 1;
diff --git a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/BaseAdaptor.java b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/BaseAdaptor.java
index 579908c92..b1222be8e 100644
--- a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/BaseAdaptor.java
+++ b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/BaseAdaptor.java
@@ -115,6 +115,7 @@ public class BaseAdaptor implements FrameworkAdaptor {
}
/**
+ * @throws IOException
* @see FrameworkAdaptor#compactStorage()
*/
public void compactStorage() throws IOException {
@@ -222,6 +223,7 @@ public class BaseAdaptor implements FrameworkAdaptor {
}
/**
+ * @throws IOException
* @see FrameworkAdaptor#getPermissionStorage()
*/
public PermissionStorage getPermissionStorage() throws IOException {
@@ -314,6 +316,9 @@ public class BaseAdaptor implements FrameworkAdaptor {
// do nothing
}
+ /**
+ * @throws IOException
+ */
public void setFile(File newFile, boolean append) throws IOException {
// do nothing
}
diff --git a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/BaseData.java b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/BaseData.java
index 7bebeb8ff..65a6bd25e 100644
--- a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/BaseData.java
+++ b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/BaseData.java
@@ -267,6 +267,9 @@ public class BaseData implements BundleData {
return value;
}
+ /**
+ * @throws IOException
+ */
public void save() throws IOException {
adaptor.getStorage().save(this);
}
diff --git a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/bundlefile/DirZipBundleEntry.java b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/bundlefile/DirZipBundleEntry.java
index 352a67eef..bd216798b 100644
--- a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/bundlefile/DirZipBundleEntry.java
+++ b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/bundlefile/DirZipBundleEntry.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
+ * Copyright (c) 2005, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -38,6 +38,9 @@ public class DirZipBundleEntry extends BundleEntry {
this.bundleFile = bundleFile;
}
+ /**
+ * @throws IOException
+ */
public InputStream getInputStream() throws IOException {
return null;
}
diff --git a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/bundlefile/NestedDirBundleFile.java b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/bundlefile/NestedDirBundleFile.java
index b25f4cbb7..e3b5d13fd 100644
--- a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/bundlefile/NestedDirBundleFile.java
+++ b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/bundlefile/NestedDirBundleFile.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
+ * Copyright (c) 2005, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -76,6 +76,9 @@ public class NestedDirBundleFile extends BundleFile {
return null;
}
+ /**
+ * @throws IOException
+ */
public void open() throws IOException {
// do nothing
}
diff --git a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/loader/ClasspathManager.java b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/loader/ClasspathManager.java
index 5db2b1785..e338dba9b 100644
--- a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/loader/ClasspathManager.java
+++ b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/loader/ClasspathManager.java
@@ -260,12 +260,12 @@ public class ClasspathManager {
return null;
}
- private ClasspathEntry createClassPathEntry(BundleFile bundlefile, ProtectionDomain cpDomain, BaseData data) {
+ private ClasspathEntry createClassPathEntry(BundleFile bundlefile, ProtectionDomain cpDomain, BaseData cpData) {
ClasspathEntry entry = classloader.createClassPathEntry(bundlefile, cpDomain);
- entry.setBaseData(data);
+ entry.setBaseData(cpData);
Object domain = entry.getDomain();
if (domain instanceof BundleProtectionDomain)
- ((BundleProtectionDomain) domain).setBundle(data.getBundle());
+ ((BundleProtectionDomain) domain).setBundle(cpData.getBundle());
return entry;
}
diff --git a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/framework/internal/protocol/reference/Handler.java b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/framework/internal/protocol/reference/Handler.java
index f7b4b81fa..d26175e55 100644
--- a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/framework/internal/protocol/reference/Handler.java
+++ b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/framework/internal/protocol/reference/Handler.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
+ * Copyright (c) 2003, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -27,9 +27,10 @@ import java.net.*;
* </pre>
*/
public class Handler extends URLStreamHandler {
- public Handler() {
- }
+ /**
+ * @throws IOException
+ */
protected URLConnection openConnection(URL url) throws IOException {
return new ReferenceURLConnection(url);
}
diff --git a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/BasePermissionStorage.java b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/BasePermissionStorage.java
index c0deb55c1..bbfff9d88 100644
--- a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/BasePermissionStorage.java
+++ b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/BasePermissionStorage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * Copyright (c) 2005, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -28,6 +28,9 @@ public class BasePermissionStorage implements PermissionStorage {
this.storage = storage;
}
+ /**
+ * @throws IOException
+ */
public String[] getLocations() throws IOException {
synchronized (locations) {
String[] result = new String[locations.size()];
@@ -38,6 +41,9 @@ public class BasePermissionStorage implements PermissionStorage {
}
}
+ /**
+ * @throws IOException
+ */
public String[] getPermissionData(String location) throws IOException {
if (location == null)
return defaultInfos;
@@ -48,6 +54,9 @@ public class BasePermissionStorage implements PermissionStorage {
}
}
+ /**
+ * @throws IOException
+ */
public void setPermissionData(String location, String[] data) throws IOException {
if (location == null) {
defaultInfos = data;
@@ -63,12 +72,18 @@ public class BasePermissionStorage implements PermissionStorage {
storage.requestSave();
}
+ /**
+ * @throws IOException
+ */
public void saveConditionalPermissionInfos(String[] infos) throws IOException {
condPermInfos = infos;
setDirty(true);
storage.requestSave();
}
+ /**
+ * @throws IOException
+ */
public String[] getConditionalPermissionInfos() throws IOException {
return condPermInfos;
}
diff --git a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/BaseStorage.java b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/BaseStorage.java
index 0acf81b0e..daa0a95d9 100644
--- a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/BaseStorage.java
+++ b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/BaseStorage.java
@@ -86,7 +86,7 @@ public class BaseStorage implements SynchronousBundleListener {
private final MRUBundleFileList mruList = new MRUBundleFileList();
- private BaseAdaptor adaptor;
+ BaseAdaptor adaptor;
// assume a file: installURL
private String installPath;
private StorageManager storageManager;
@@ -129,8 +129,8 @@ public class BaseStorage implements SynchronousBundleListener {
addExtURLMethod = findAddURLMethod(getExtClassLoader(), "addURL"); //$NON-NLS-1$
}
- public void initialize(BaseAdaptor adaptor) throws IOException {
- this.adaptor = adaptor;
+ public void initialize(BaseAdaptor initAdaptor) throws IOException {
+ this.adaptor = initAdaptor;
setDebugOptions();
if (Boolean.valueOf(FrameworkProperties.getProperty(BaseStorage.PROP_CLEAN)).booleanValue())
cleanOSGiCache();
@@ -147,7 +147,7 @@ public class BaseStorage implements SynchronousBundleListener {
storageManager = initFileManager(LocationManager.getOSGiConfigurationDir(), readOnlyConfiguration ? "none" : null, readOnlyConfiguration); //$NON-NLS-1$
storageManagerClosed = false;
// initialize the storageHooks
- StorageHook[] hooks = adaptor.getHookRegistry().getStorageHooks();
+ StorageHook[] hooks = initAdaptor.getHookRegistry().getStorageHooks();
for (int i = 0; i < hooks.length; i++)
storageHooks.add(hooks[i]);
}
@@ -231,7 +231,7 @@ public class BaseStorage implements SynchronousBundleListener {
return storageManager.isReadOnly();
}
- public void compact() throws IOException {
+ public void compact() {
if (!isReadOnly())
compact(getBundleStoreRoot());
}
@@ -271,6 +271,9 @@ public class BaseStorage implements SynchronousBundleListener {
}
}
+ /**
+ * @throws IOException
+ */
public long getFreeSpace() throws IOException {
// cannot implement this without native code!
return -1;
@@ -358,12 +361,12 @@ public class BaseStorage implements SynchronousBundleListener {
nextId = in.readLong();
int numStorageHooks = in.readInt();
- StorageHook[] storageHooks = adaptor.getHookRegistry().getStorageHooks();
- if (numStorageHooks != storageHooks.length)
+ StorageHook[] hooks = adaptor.getHookRegistry().getStorageHooks();
+ if (numStorageHooks != hooks.length)
return null; // must have the same number of storagehooks to properly read the data
for (int i = 0; i < numStorageHooks; i++) {
- Object storageKey = storageHooks[i].getKey();
- int storageVersion = storageHooks[i].getStorageVersion();
+ Object storageKey = hooks[i].getKey();
+ int storageVersion = hooks[i].getStorageVersion();
if (!storageKey.equals(in.readUTF()) || storageVersion != in.readInt())
return null; // some storage hooks have changed must throw the data away.
}
@@ -424,7 +427,7 @@ public class BaseStorage implements SynchronousBundleListener {
return null;
}
- private void saveAllData(boolean shutdown) {
+ void saveAllData(boolean shutdown) {
if (Debug.DEBUG_GENERAL)
Debug.println("Saving framework data ..."); //$NON-NLS-1$
if (storageManagerClosed)
@@ -556,11 +559,11 @@ public class BaseStorage implements SynchronousBundleListener {
out.writeInt(initialBundleStartLevel);
out.writeLong(nextId);
- StorageHook[] storageHooks = adaptor.getHookRegistry().getStorageHooks();
- out.writeInt(storageHooks.length);
- for (int i = 0; i < storageHooks.length; i++) {
- out.writeUTF((String) storageHooks[i].getKey());
- out.writeInt(storageHooks[i].getStorageVersion());
+ StorageHook[] hooks = adaptor.getHookRegistry().getStorageHooks();
+ out.writeInt(hooks.length);
+ for (int i = 0; i < hooks.length; i++) {
+ out.writeUTF((String) hooks[i].getKey());
+ out.writeInt(hooks[i].getStorageVersion());
}
Bundle[] bundles = context.getBundles();
@@ -625,7 +628,7 @@ public class BaseStorage implements SynchronousBundleListener {
}
}
- public PermissionStorage getPermissionStorage() throws IOException {
+ public PermissionStorage getPermissionStorage() {
if (permissionStorage == null)
permissionStorage = readPermissionData();
return permissionStorage;
@@ -640,7 +643,7 @@ public class BaseStorage implements SynchronousBundleListener {
requestSave();
}
- public void save(BaseData data) throws IOException {
+ public void save(BaseData data) {
if (data.isDirty()) {
timeStamp--; // Change the value of the timeStamp, as a marker that something changed.
requestSave();
@@ -661,7 +664,7 @@ public class BaseStorage implements SynchronousBundleListener {
return new BundleUninstall(data, this);
}
- protected Object getBundleContent(BaseData bundledata) throws IOException {
+ protected Object getBundleContent(BaseData bundledata) {
BaseStorageHook storageHook = (BaseStorageHook) bundledata.getStorageHook(BaseStorageHook.KEY);
if (storageHook == null)
throw new IllegalStateException();
@@ -832,7 +835,7 @@ public class BaseStorage implements SynchronousBundleListener {
return storageFiles;
}
- public void frameworkStart(BundleContext fwContext) throws BundleException {
+ public void frameworkStart(BundleContext fwContext) {
this.context = fwContext;
// System property can be set to enable state saver or not.
if (Boolean.valueOf(FrameworkProperties.getProperty(BaseStorage.PROP_ENABLE_STATE_SAVER, "true")).booleanValue()) //$NON-NLS-1$
@@ -840,7 +843,7 @@ public class BaseStorage implements SynchronousBundleListener {
}
- public void frameworkStop(BundleContext fwContext) throws BundleException {
+ public void frameworkStop(BundleContext fwContext) {
if (stateSaver != null)
stateSaver.shutdown();
saveAllData(true);
@@ -986,7 +989,7 @@ public class BaseStorage implements SynchronousBundleListener {
addExtensionContent(bundleData, type, getExtClassLoader(), addExtURLMethod);
}
- private void addExtensionContent(BaseData bundleData, byte type, ClassLoader addToLoader, Method addToMethod) throws BundleException {
+ private void addExtensionContent(BaseData bundleData, byte type, ClassLoader addToLoader, Method addToMethod) {
if ((type & (EXTENSION_UNINSTALLED | EXTENSION_UPDATED)) != 0)
// if uninstalled or updated then do nothing framework must be restarted.
return;
diff --git a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/BaseStorageHook.java b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/BaseStorageHook.java
index 0620d0f54..ffe93bc3d 100644
--- a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/BaseStorageHook.java
+++ b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/BaseStorageHook.java
@@ -69,6 +69,9 @@ public class BaseStorageHook implements StorageHook, AdaptorHook {
return STORAGE_VERSION;
}
+ /**
+ * @throws BundleException
+ */
public StorageHook create(BaseData bundledata) throws BundleException {
BaseStorageHook storageHook = new BaseStorageHook(storage);
storageHook.bundleData = bundledata;
@@ -230,19 +233,19 @@ public class BaseStorageHook implements StorageHook, AdaptorHook {
this.nativePaths = installPaths;
}
- public void validateNativePaths(String[] nativePaths) throws BundleException {
- for (int i = 0; i < nativePaths.length; i++) {
- if (nativePaths[i].startsWith(EXTERNAL_LIB_PREFIX)) {
- String path = substituteVars(nativePaths[i].substring(EXTERNAL_LIB_PREFIX.length()));
+ public void validateNativePaths(String[] paths) throws BundleException {
+ for (int i = 0; i < paths.length; i++) {
+ if (paths[i].startsWith(EXTERNAL_LIB_PREFIX)) {
+ String path = substituteVars(paths[i].substring(EXTERNAL_LIB_PREFIX.length()));
File nativeFile = new File(path);
if (!nativeFile.exists())
throw new BundleException(NLS.bind(AdaptorMsg.BUNDLE_NATIVECODE_EXCEPTION, nativeFile.getAbsolutePath()), BundleException.NATIVECODE_ERROR);
continue; // continue to next path
}
// ensure the file exists in the bundle; it will get extracted later on demand
- BundleEntry nativeEntry = bundleData.getBundleFile().getEntry(nativePaths[i]);
+ BundleEntry nativeEntry = bundleData.getBundleFile().getEntry(paths[i]);
if (nativeEntry == null)
- throw new BundleException(NLS.bind(AdaptorMsg.BUNDLE_NATIVECODE_EXCEPTION, nativePaths[i]), BundleException.NATIVECODE_ERROR);
+ throw new BundleException(NLS.bind(AdaptorMsg.BUNDLE_NATIVECODE_EXCEPTION, paths[i]), BundleException.NATIVECODE_ERROR);
}
}
@@ -327,6 +330,9 @@ public class BaseStorageHook implements StorageHook, AdaptorHook {
// do nothing
}
+ /**
+ * @throws BundleException
+ */
public Dictionary getManifest(boolean firstLoad) throws BundleException {
// do nothing
return null;
@@ -346,10 +352,16 @@ public class BaseStorageHook implements StorageHook, AdaptorHook {
// do nothing
}
+ /**
+ * @throws BundleException
+ */
public void frameworkStart(BundleContext context) throws BundleException {
// do nothing
}
+ /**
+ * @throws BundleException
+ */
public void frameworkStop(BundleContext context) throws BundleException {
// do nothing
}
diff --git a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/StateManager.java b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/StateManager.java
index c61c6c501..03d26e10f 100644
--- a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/StateManager.java
+++ b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/StateManager.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2009 IBM Corporation and others.
+ * Copyright (c) 2003, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -99,14 +99,14 @@ public class StateManager implements PlatformAdmin, Runnable {
/**
* Shutsdown the state manager. If the timestamp of the system state has changed
- * @param stateFile
- * @param lazyFile
+ * @param saveStateFile
+ * @param saveLazyFile
* @throws IOException
*/
- public void shutdown(File stateFile, File lazyFile) throws IOException {
+ public void shutdown(File saveStateFile, File saveLazyFile) throws IOException {
BundleDescription[] removalPendings = systemState.getRemovalPendings();
cleanRemovalPendings(removalPendings);
- writeState(systemState, stateFile, lazyFile);
+ writeState(systemState, saveStateFile, saveLazyFile);
stopDataManager();
}
@@ -123,11 +123,11 @@ public class StateManager implements PlatformAdmin, Runnable {
/**
* Update the given target files with the state data in memory.
- * @param stateFile
- * @param lazyFile
+ * @param updateStateFile
+ * @param updateLazyFile
* @throws IOException
*/
- public void update(File stateFile, File lazyFile) throws IOException {
+ public void update(File updateStateFile, File updateLazyFile) throws IOException {
BundleDescription[] removalPendings = systemState.getRemovalPendings();
StateImpl state = systemState;
if (removalPendings.length > 0) {
@@ -136,13 +136,13 @@ public class StateManager implements PlatformAdmin, Runnable {
state.setPlatformProperties(FrameworkProperties.getProperties());
state.resolve(false);
}
- writeState(state, stateFile, lazyFile);
+ writeState(state, updateStateFile, updateLazyFile);
// Need to use the timestamp of the original state here
lastTimeStamp = systemState.getTimeStamp();
// TODO consider updating the state files for lazy loading
}
- private void readSystemState(File stateFile, File lazyFile, long expectedTimeStamp) {
+ private void internalReadSystemState() {
if (stateFile == null || !stateFile.isFile())
return;
if (DEBUG_READER)
@@ -192,13 +192,13 @@ public class StateManager implements PlatformAdmin, Runnable {
dataManagerThread = null;
}
- private void writeState(StateImpl state, File stateFile, File lazyFile) throws IOException {
+ private void writeState(StateImpl state, File saveStateFile, File saveLazyFile) throws IOException {
if (state == null)
return;
if (cachedState && !saveNeeded())
return;
state.fullyLoad(); // make sure we are fully loaded before saving
- factory.writeState(state, stateFile, lazyFile);
+ factory.writeState(state, saveStateFile, saveLazyFile);
}
private boolean initializeSystemState() {
@@ -229,7 +229,7 @@ public class StateManager implements PlatformAdmin, Runnable {
*/
public synchronized State readSystemState() {
if (systemState == null)
- readSystemState(stateFile, lazyFile, expectedTimeStamp);
+ internalReadSystemState();
return systemState;
}
@@ -280,6 +280,7 @@ public class StateManager implements PlatformAdmin, Runnable {
}
/**
+ * @throws BundleException
* @see PlatformAdmin#commit(State)
*/
public synchronized void commit(State state) throws BundleException {
diff --git a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/SystemBundleData.java b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/SystemBundleData.java
index df5b1013d..7723539af 100644
--- a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/SystemBundleData.java
+++ b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/SystemBundleData.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
+ * Copyright (c) 2004, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -161,6 +161,9 @@ public class SystemBundleData extends BaseData {
return null;
}
+ /**
+ * @throws BundleException
+ */
public void installNativeCode(String[] nativepaths) throws BundleException {
// do nothing
}
diff --git a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/EclipseLog.java b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/EclipseLog.java
index 65e8f7610..4bb4bc5d3 100644
--- a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/EclipseLog.java
+++ b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/EclipseLog.java
@@ -328,6 +328,9 @@ public class EclipseLog implements FrameworkLog {
setOutput(null, newWriter, append);
}
+ /**
+ * @throws IOException
+ */
public synchronized void setFile(File newFile, boolean append) throws IOException {
if (newFile != null && !newFile.equals(this.outFile)) {
// If it's a new file, then reset.
diff --git a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseAdaptorHook.java b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseAdaptorHook.java
index e3b0405e5..aa7dd741d 100644
--- a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseAdaptorHook.java
+++ b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseAdaptorHook.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
+ * Copyright (c) 2005, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -49,6 +49,9 @@ public class EclipseAdaptorHook implements AdaptorHook, HookConfigurator {
private boolean noXML = false;
private ArrayList registrations = new ArrayList(10);
+ /**
+ * @throws BundleException
+ */
public void frameworkStart(BundleContext context) throws BundleException {
registrations.clear();
registerEndorsedXMLParser(context);
@@ -153,6 +156,9 @@ public class EclipseAdaptorHook implements AdaptorHook, HookConfigurator {
}
}
+ /**
+ * @throws BundleException
+ */
public void frameworkStop(BundleContext context) throws BundleException {
printStats();
if (!noXML)
@@ -186,6 +192,9 @@ public class EclipseAdaptorHook implements AdaptorHook, HookConfigurator {
// do nothing
}
+ /**
+ * @throws IOException
+ */
public URLConnection mapLocationToURLConnection(String location) throws IOException {
// do nothing
return null;
@@ -200,8 +209,8 @@ public class EclipseAdaptorHook implements AdaptorHook, HookConfigurator {
return null;
}
- public void initialize(BaseAdaptor adaptor) {
- this.adaptor = adaptor;
+ public void initialize(BaseAdaptor initAdaptor) {
+ this.adaptor = initAdaptor;
// EnvironmentInfo has to be initialized first to compute defaults for system context (see bug 88925)
EclipseEnvironmentInfo.getDefault();
setDebugOptions();
diff --git a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseAppLauncher.java b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseAppLauncher.java
index fd545a032..d39e8ad20 100644
--- a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseAppLauncher.java
+++ b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseAppLauncher.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
+ * Copyright (c) 2005, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -118,12 +118,12 @@ public class EclipseAppLauncher implements ApplicationLauncher {
}
}
- public void launch(ParameterizedRunnable app, Object appContext) {
+ public void launch(ParameterizedRunnable app, Object applicationContext) {
waitForAppLock.acquire(-1); // clear out any pending apps notifications
if (!runningLock.acquire(-1)) // check to see if an application is currently running
throw new IllegalStateException("An application is aready running."); //$NON-NLS-1$
this.runnable = app;
- this.appContext = appContext;
+ this.appContext = applicationContext;
waitForAppLock.release(); // notify the main thread to launch an application.
runningLock.release(); // release the running lock
}
diff --git a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseEnvironmentInfo.java b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseEnvironmentInfo.java
index 90a5371c6..0d091d7f4 100644
--- a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseEnvironmentInfo.java
+++ b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseEnvironmentInfo.java
@@ -186,21 +186,21 @@ public class EclipseEnvironmentInfo implements EnvironmentInfo {
EclipseEnvironmentInfo.frameworkArgs = frameworkArgs;
}
- public static String guessWS(String os) {
+ public static String guessWS(String osName) {
// setup default values for known OSes if nothing was specified
- if (os.equals(Constants.OS_WIN32))
+ if (osName.equals(Constants.OS_WIN32))
return Constants.WS_WIN32;
- if (os.equals(Constants.OS_LINUX))
+ if (osName.equals(Constants.OS_LINUX))
return Constants.WS_GTK;
- if (os.equals(Constants.OS_MACOSX))
+ if (osName.equals(Constants.OS_MACOSX))
return Constants.WS_COCOA;
- if (os.equals(Constants.OS_HPUX))
+ if (osName.equals(Constants.OS_HPUX))
return Constants.WS_MOTIF;
- if (os.equals(Constants.OS_AIX))
+ if (osName.equals(Constants.OS_AIX))
return Constants.WS_MOTIF;
- if (os.equals(Constants.OS_SOLARIS))
+ if (osName.equals(Constants.OS_SOLARIS))
return Constants.WS_GTK;
- if (os.equals(Constants.OS_QNX))
+ if (osName.equals(Constants.OS_QNX))
return Constants.WS_PHOTON;
return Constants.WS_UNKNOWN;
}
diff --git a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseErrorHandler.java b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseErrorHandler.java
index c25c5f58a..afad88113 100644
--- a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseErrorHandler.java
+++ b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseErrorHandler.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
+ * Copyright (c) 2005, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -28,10 +28,16 @@ public class EclipseErrorHandler implements AdaptorHook, HookConfigurator {
private static final String PROP_EXITONERROR = "eclipse.exitOnError"; //$NON-NLS-1$
private BaseAdaptor adaptor;
+ /**
+ * @throws BundleException
+ */
public void frameworkStart(BundleContext context) throws BundleException {
// do nothing
}
+ /**
+ * @throws BundleException
+ */
public void frameworkStop(BundleContext context) throws BundleException {
// do nothing
}
@@ -44,6 +50,9 @@ public class EclipseErrorHandler implements AdaptorHook, HookConfigurator {
// do nothing
}
+ /**
+ * @throws IOException
+ */
public URLConnection mapLocationToURLConnection(String location) throws IOException {
// do nothing
return null;
@@ -98,7 +107,7 @@ public class EclipseErrorHandler implements AdaptorHook, HookConfigurator {
return null;
}
- public void initialize(BaseAdaptor adaptor) {
- this.adaptor = adaptor;
+ public void initialize(BaseAdaptor initAdaptor) {
+ this.adaptor = initAdaptor;
}
}
diff --git a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseLazyStarter.java b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseLazyStarter.java
index c76becb87..8da96de7b 100644
--- a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseLazyStarter.java
+++ b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseLazyStarter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
+ * Copyright (c) 2006, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -199,10 +199,16 @@ public class EclipseLazyStarter implements ClassLoadingStatsHook, AdaptorHook, H
return null;
}
+ /**
+ * @throws BundleException
+ */
public void frameworkStart(BundleContext context) throws BundleException {
// nothing
}
+ /**
+ * @throws BundleException
+ */
public void frameworkStop(BundleContext context) throws BundleException {
// nothing
}
@@ -226,6 +232,9 @@ public class EclipseLazyStarter implements ClassLoadingStatsHook, AdaptorHook, H
this.adaptor = baseAdaptor;
}
+ /**
+ * @throws IOException
+ */
public URLConnection mapLocationToURLConnection(String location) throws IOException {
// do nothing
return null;
diff --git a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseLogHook.java b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseLogHook.java
index fbe4dc740..d3f15a4a4 100644
--- a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseLogHook.java
+++ b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseLogHook.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
+ * Copyright (c) 2006, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -34,15 +34,21 @@ public class EclipseLogHook implements HookConfigurator, AdaptorHook {
hookRegistry.addAdaptorHook(this);
}
- public void initialize(BaseAdaptor adaptor) {
- this.adaptor = adaptor;
+ public void initialize(BaseAdaptor initAdaptor) {
+ this.adaptor = initAdaptor;
}
+ /**
+ * @throws BundleException
+ */
public void frameworkStart(BundleContext context) throws BundleException {
AdaptorUtil.register(FrameworkLog.class.getName(), adaptor.getFrameworkLog(), context);
registerPerformanceLog(context);
}
+ /**
+ * @throws BundleException
+ */
public void frameworkStop(BundleContext context) throws BundleException {
// TODO should unregister service registered a frameworkStart
}
@@ -56,6 +62,9 @@ public class EclipseLogHook implements HookConfigurator, AdaptorHook {
// do nothing
}
+ /**
+ * @throws IOException
+ */
public URLConnection mapLocationToURLConnection(String location) throws IOException {
// do nothing
return null;
diff --git a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseStorageHook.java b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseStorageHook.java
index 9a7de5306..4dd929b84 100644
--- a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseStorageHook.java
+++ b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseStorageHook.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
+ * Copyright (c) 2005, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -74,9 +74,12 @@ public final class EclipseStorageHook implements StorageHook, HookConfigurator {
return STORAGE_VERION;
}
- public StorageHook create(BaseData bundledata) throws BundleException {
+ /**
+ * @throws BundleException
+ */
+ public StorageHook create(BaseData data) throws BundleException {
EclipseStorageHook storageHook = new EclipseStorageHook();
- storageHook.bundledata = bundledata;
+ storageHook.bundledata = data;
return storageHook;
}
diff --git a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java
index 531766a21..0b00ea549 100644
--- a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java
+++ b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java
@@ -701,13 +701,13 @@ public class PluginConverterImpl implements PluginConverter {
return result.toString();
}
- public synchronized Dictionary convertManifest(File pluginBaseLocation, boolean compatibility, String target, boolean analyseJars, Dictionary devProperties) throws PluginConversionException {
+ public synchronized Dictionary convertManifest(File pluginBaseLocation, boolean compatibility, String targetVersion, boolean analyseJars, Dictionary devProps) throws PluginConversionException {
long start = System.currentTimeMillis();
if (DEBUG)
System.out.println("Convert " + pluginBaseLocation); //$NON-NLS-1$
init();
- this.target = target == null ? TARGET32 : new Version(target);
- this.devProperties = devProperties;
+ this.target = targetVersion == null ? TARGET32 : new Version(targetVersion);
+ this.devProperties = devProps;
fillPluginInfo(pluginBaseLocation);
fillManifest(compatibility, analyseJars);
if (DEBUG)
@@ -715,8 +715,8 @@ public class PluginConverterImpl implements PluginConverter {
return generatedManifest;
}
- public synchronized File convertManifest(File pluginBaseLocation, File bundleManifestLocation, boolean compatibilityManifest, String target, boolean analyseJars, Dictionary devProperties) throws PluginConversionException {
- convertManifest(pluginBaseLocation, compatibilityManifest, target, analyseJars, devProperties);
+ public synchronized File convertManifest(File pluginBaseLocation, File bundleManifestLocation, boolean compatibilityManifest, String targetVersion, boolean analyseJars, Dictionary devProps) throws PluginConversionException {
+ convertManifest(pluginBaseLocation, compatibilityManifest, targetVersion, analyseJars, devProps);
if (bundleManifestLocation == null) {
String cacheLocation = FrameworkProperties.getProperty(LocationManager.PROP_MANIFEST_CACHE);
bundleManifestLocation = new File(cacheLocation, pluginInfo.getUniqueId() + '_' + pluginInfo.getVersion() + ".MF"); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginParser.java b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginParser.java
index 098a7aafc..fae1ec1ec 100644
--- a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginParser.java
+++ b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginParser.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -31,34 +31,34 @@ public class PluginParser extends DefaultHandler implements IModel {
private PluginInfo manifestInfo = new PluginInfo();
private BundleContext context;
private FrameworkAdaptor adaptor;
- private Version target; // The targeted platform for the given manifest
- private static final Version TARGET21 = new Version(2, 1, 0);
+ Version target; // The targeted platform for the given manifest
+ static final Version TARGET21 = new Version(2, 1, 0);
public class PluginInfo implements IPluginInfo {
- private String schemaVersion;
- private String pluginId;
- private String version;
- private String vendor;
+ String schemaVersion;
+ String pluginId;
+ String version;
+ String vendor;
// an ordered list of library path names.
- private ArrayList libraryPaths;
+ ArrayList libraryPaths;
// TODO Should get rid of the libraries map and just have a
// list of library export statements instead. Library paths must
// preserve order.
- private Map libraries; //represent the libraries and their export statement
- private ArrayList requires;
+ Map libraries; //represent the libraries and their export statement
+ ArrayList requires;
private boolean requiresExpanded = false; //indicates if the requires have been processed.
- private boolean compatibilityFound = false; //set to true is the requirement list contain compatilibity
- private String pluginClass;
- private String masterPluginId;
- private String masterVersion;
- private String masterMatch;
+ boolean compatibilityFound = false; //set to true is the requirement list contain compatilibity
+ String pluginClass;
+ String masterPluginId;
+ String masterVersion;
+ String masterMatch;
private Set filters;
- private String pluginName;
- private boolean singleton;
- private boolean fragment;
+ String pluginName;
+ boolean singleton;
+ boolean fragment;
private final static String TARGET21_STRING = "2.1"; //$NON-NLS-1$
- private boolean hasExtensionExtensionPoints = false;
+ boolean hasExtensionExtensionPoints = false;
public boolean isFragment() {
return fragment;
@@ -231,6 +231,7 @@ public class PluginParser extends DefaultHandler implements IModel {
}
public void endDocument() {
+ // nothing
}
public void endElement(String uri, String elementName, String qName) {
@@ -678,13 +679,16 @@ public class PluginParser extends DefaultHandler implements IModel {
adaptor.getFrameworkLog().log(error);
}
- public void processingInstruction(String target, String data) throws SAXException {
+ /**
+ * @throws SAXException
+ */
+ public void processingInstruction(String instructionTarget, String data) throws SAXException {
// Since 3.0, a processing instruction of the form <?eclipse version="3.0"?> at
// the start of the manifest file is used to indicate the plug-in manifest
// schema version in effect. Pre-3.0 (i.e., 2.1) plug-in manifest files do not
// have one of these, and this is how we can distinguish the manifest of a
// pre-3.0 plug-in from a post-3.0 one (for compatibility tranformations).
- if (target.equalsIgnoreCase("eclipse")) { //$NON-NLS-1$
+ if (instructionTarget.equalsIgnoreCase("eclipse")) { //$NON-NLS-1$
// just the presence of this processing instruction indicates that this
// plug-in is at least 3.0
manifestInfo.schemaVersion = "3.0"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/stats/StatsManager.java b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/stats/StatsManager.java
index 250ff9b9b..62e9d5997 100644
--- a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/stats/StatsManager.java
+++ b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/stats/StatsManager.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -196,6 +196,9 @@ public class StatsManager implements BundleWatcher, HookConfigurator, ClassLoadi
return (BundleStats) bundles.get(new Long(id));
}
+ /**
+ * @throws ClassNotFoundException
+ */
public void preFindLocalClass(String name, ClasspathManager manager) throws ClassNotFoundException {
if (StatsManager.MONITOR_CLASSES) //Support for performance analysis
ClassloaderStats.startLoadingClass(getClassloaderId(manager), name);
diff --git a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/ResolverBundle.java b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/ResolverBundle.java
index d44e4416f..79f1c9f12 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/ResolverBundle.java
+++ b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/ResolverBundle.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
+ * Copyright (c) 2004, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -377,7 +377,7 @@ public class ResolverBundle extends VersionSupplier implements Comparable {
foundEquivalent = true;
}
if (!foundEquivalent) {
- ExportPackageDescription hostExport = factory.createExportPackageDescription(newExports[i].getName(), newExports[i].getVersion(), newExports[i].getDirectives(), newExports[i].getAttributes(), newExports[i].isRoot(), getBundle());
+ ExportPackageDescription hostExport = factory.createExportPackageDescription(newExports[i].getName(), newExports[i].getVersion(), newExports[i].getDirectives(), newExports[i].getAttributes(), true, getBundle());
hostExports.add(new ResolverExport(this, hostExport));
}
}
diff --git a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/BundleDescriptionImpl.java b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/BundleDescriptionImpl.java
index 26e6d1550..76754f81b 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/BundleDescriptionImpl.java
+++ b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/BundleDescriptionImpl.java
@@ -660,7 +660,7 @@ public final class BundleDescriptionImpl extends BaseDescriptionImpl implements
lazyData = new LazyData();
}
- private final class LazyData {
+ final class LazyData {
String location;
String platformFilter;
diff --git a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/ComputeNodeOrder.java b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/ComputeNodeOrder.java
index 6b979c25c..fd91c05b0 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/ComputeNodeOrder.java
+++ b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/ComputeNodeOrder.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
+ * Copyright (c) 2004, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -388,10 +388,9 @@ public class ComputeNodeOrder {
vertex = nextVertex;
state = START_DFS_VISIT;
continue nextStateLoop;
- } else {
- state = NEXT_VERTEX;
- continue nextStateLoop;
}
+ state = NEXT_VERTEX;
+ continue nextStateLoop;
case START_DFS_VISIT :
// on entry, "vertex" contains the vertex to be visited
// top of stack is return code
@@ -421,14 +420,13 @@ public class ComputeNodeOrder {
}
state = NEXT_ADJACENT;
continue nextStateLoop;
- } else {
- // done exploring vertex
- vertex.color = Vertex.BLACK;
- time++;
- vertex.finishTime = time;
- state = ((Integer) stack.remove(stack.size() - 1)).intValue();
- continue nextStateLoop;
}
+ // done exploring vertex
+ vertex.color = Vertex.BLACK;
+ time++;
+ vertex.finishTime = time;
+ state = ((Integer) stack.remove(stack.size() - 1)).intValue();
+ continue nextStateLoop;
case AFTER_NEXTED_DFS_VISIT :
// on entry, stack contains "vertex" and "allAjacent"
vertex = (Vertex) stack.remove(stack.size() - 1);
diff --git a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/ExportPackageDescriptionImpl.java b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/ExportPackageDescriptionImpl.java
index 6d70e4386..bd28951e2 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/ExportPackageDescriptionImpl.java
+++ b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/ExportPackageDescriptionImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
+ * Copyright (c) 2004, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -121,6 +121,9 @@ public class ExportPackageDescriptionImpl extends BaseDescriptionImpl implements
return exporter;
}
+ /**
+ * @deprecated
+ */
public boolean isRoot() {
return true;
}
diff --git a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateBuilder.java b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateBuilder.java
index a4d3d18ec..9f0c994b7 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateBuilder.java
+++ b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateBuilder.java
@@ -220,7 +220,7 @@ class StateBuilder {
return result;
}
- private static ImportPackageSpecification[] createImportPackages(ExportPackageDescription[] exported, ArrayList providedExports, ManifestElement[] imported, ManifestElement[] dynamicImported, int manifestVersion) throws BundleException {
+ private static ImportPackageSpecification[] createImportPackages(ExportPackageDescription[] exported, ArrayList providedExports, ManifestElement[] imported, ManifestElement[] dynamicImported, int manifestVersion) {
ArrayList allImports = null;
if (manifestVersion < 2) {
// add implicit imports for each exported package if manifest verions is less than 2.
@@ -251,7 +251,7 @@ class StateBuilder {
return (ImportPackageSpecification[]) allImports.toArray(new ImportPackageSpecification[allImports.size()]);
}
- private static void addImportPackages(ManifestElement importPackage, ArrayList allImports, int manifestVersion, boolean dynamic) throws BundleException {
+ private static void addImportPackages(ManifestElement importPackage, ArrayList allImports, int manifestVersion, boolean dynamic) {
String[] importNames = importPackage.getValueComponents();
for (int i = 0; i < importNames.length; i++) {
// do not allow for multiple imports of same package of manifest version < 2
@@ -291,7 +291,7 @@ class StateBuilder {
return result;
}
- static ExportPackageDescription[] createExportPackages(ManifestElement[] exported, ManifestElement[] provides, ArrayList providedExports, int manifestVersion, boolean strict) throws BundleException {
+ static ExportPackageDescription[] createExportPackages(ManifestElement[] exported, ManifestElement[] provides, ArrayList providedExports, int manifestVersion, boolean strict) {
int numExports = (exported == null ? 0 : exported.length) + (provides == null ? 0 : provides.length);
if (numExports == 0)
return null;
@@ -304,7 +304,7 @@ class StateBuilder {
return (ExportPackageDescription[]) allExports.toArray(new ExportPackageDescription[allExports.size()]);
}
- private static void addExportPackages(ManifestElement exportPackage, ArrayList allExports, int manifestVersion, boolean strict) throws BundleException {
+ private static void addExportPackages(ManifestElement exportPackage, ArrayList allExports, int manifestVersion, boolean strict) {
String[] exportNames = exportPackage.getValueComponents();
for (int i = 0; i < exportNames.length; i++) {
// if we are in strict mode and the package is marked as internal, skip it.
@@ -328,7 +328,7 @@ class StateBuilder {
}
}
- private static void addProvidePackages(ManifestElement[] provides, ArrayList allExports, ArrayList providedExports) throws BundleException {
+ private static void addProvidePackages(ManifestElement[] provides, ArrayList allExports, ArrayList providedExports) {
ExportPackageDescription[] currentExports = (ExportPackageDescription[]) allExports.toArray(new ExportPackageDescription[allExports.size()]);
for (int i = 0; i < provides.length; i++) {
boolean duplicate = false;
diff --git a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateImpl.java b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateImpl.java
index 327c2581c..8f877b428 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateImpl.java
+++ b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2009 IBM Corporation and others.
+ * Copyright (c) 2003, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -293,6 +293,9 @@ public abstract class StateImpl implements State {
((VersionConstraintImpl) constraint).setSupplier(supplier);
}
+ /**
+ * @deprecated
+ */
public void resolveBundle(BundleDescription bundle, boolean status, BundleDescription[] hosts, ExportPackageDescription[] selectedExports, BundleDescription[] resolvedRequires, ExportPackageDescription[] resolvedImports) {
resolveBundle(bundle, status, hosts, selectedExports, null, resolvedRequires, resolvedImports);
}
@@ -752,7 +755,7 @@ public abstract class StateImpl implements State {
}
}
- private void addSystemExports(ArrayList exports, ManifestElement[] elements, int index) throws BundleException {
+ private void addSystemExports(ArrayList exports, ManifestElement[] elements, int index) {
if (elements == null)
return;
ExportPackageDescription[] systemExports = StateBuilder.createExportPackages(elements, null, null, 2, false);
diff --git a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateObjectFactoryImpl.java b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateObjectFactoryImpl.java
index 7d2dcb55a..3516aa523 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateObjectFactoryImpl.java
+++ b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateObjectFactoryImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
+ * Copyright (c) 2003, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -222,7 +222,7 @@ public class StateObjectFactoryImpl implements StateObjectFactory {
}
public ExportPackageDescription createExportPackageDescription(ExportPackageDescription original) {
- return createExportPackageDescription(original.getName(), original.getVersion(), original.getDirectives(), original.getAttributes(), original.isRoot(), null);
+ return createExportPackageDescription(original.getName(), original.getVersion(), original.getDirectives(), original.getAttributes(), true, null);
}
public ExportPackageDescription createExportPackageDescription(String packageName, Version version, Map directives, Map attributes, boolean root, BundleDescription exporter) {
diff --git a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/SystemState.java b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/SystemState.java
index c7b71168e..ac28976fc 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/SystemState.java
+++ b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/SystemState.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
+ * Copyright (c) 2003, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -18,6 +18,9 @@ import org.osgi.framework.BundleException;
// this class provides synchronous access to resolve and add/remove/update bundle for the framework
public class SystemState extends StateImpl {
+ /**
+ * @throws BundleException
+ */
public StateDelta compare(State state) throws BundleException {
// we don't implement this (no big deal: the system state is private to the framework)
throw new UnsupportedOperationException();
diff --git a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/UserState.java b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/UserState.java
index 69e664996..9fcfdbcb6 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/UserState.java
+++ b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/UserState.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
+ * Copyright (c) 2003, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -37,6 +37,9 @@ public class UserState extends StateImpl {
return true;
}
+ /**
+ * @throws BundleException
+ */
public StateDelta compare(State baseState) throws BundleException {
BundleDescription[] current = this.getBundles();
StateDeltaImpl delta = new StateDeltaImpl(this);
diff --git a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/VersionConstraintImpl.java b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/VersionConstraintImpl.java
index 85807a99f..5d668cb15 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/VersionConstraintImpl.java
+++ b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/VersionConstraintImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
+ * Copyright (c) 2003, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -60,7 +60,7 @@ abstract class VersionConstraintImpl implements VersionConstraint {
}
}
- public boolean isSatisfiedBy(BaseDescription supplier) {
+ public boolean isSatisfiedBy(BaseDescription candidate) {
synchronized (this.monitor) {
return false;
}
diff --git a/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/internal/signedcontent/SignedBundleHook.java b/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/internal/signedcontent/SignedBundleHook.java
index 5b9045376..64fc6ba29 100644
--- a/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/internal/signedcontent/SignedBundleHook.java
+++ b/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/internal/signedcontent/SignedBundleHook.java
@@ -75,6 +75,9 @@ public class SignedBundleHook implements AdaptorHook, BundleFileWrapperFactoryHo
SignedBundleHook.ADAPTOR = adaptor;
}
+ /**
+ * @throws BundleException
+ */
public void frameworkStart(BundleContext context) throws BundleException {
// check if load time authority is enabled
if ((supportSignedBundles & VERIFY_AUTHORITY) != 0) {
@@ -127,6 +130,9 @@ public class SignedBundleHook implements AdaptorHook, BundleFileWrapperFactoryHo
legacyFactoryReg = context.registerService(CertificateVerifierFactory.class.getName(), new LegacyVerifierFactory(this), null);
}
+ /**
+ * @throws BundleException
+ */
public void frameworkStop(BundleContext context) throws BundleException {
if (legacyFactoryReg != null) {
legacyFactoryReg.unregister();
@@ -171,6 +177,9 @@ public class SignedBundleHook implements AdaptorHook, BundleFileWrapperFactoryHo
// do nothing
}
+ /**
+ * @throws IOException
+ */
public URLConnection mapLocationToURLConnection(String location) throws IOException {
return null;
}
diff --git a/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/internal/signedcontent/SignedStorageHook.java b/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/internal/signedcontent/SignedStorageHook.java
index e544e79a1..ed77edcac 100644
--- a/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/internal/signedcontent/SignedStorageHook.java
+++ b/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/internal/signedcontent/SignedStorageHook.java
@@ -37,12 +37,18 @@ public class SignedStorageHook implements StorageHook {
return STORAGE_VERSION;
}
- public StorageHook create(BaseData bundledata) throws BundleException {
+ /**
+ * @throws BundleException
+ */
+ public StorageHook create(BaseData data) throws BundleException {
SignedStorageHook hook = new SignedStorageHook();
- hook.bundledata = bundledata;
+ hook.bundledata = data;
return hook;
}
+ /**
+ * @throws BundleException
+ */
public void initialize(Dictionary manifest) throws BundleException {
// do nothing
}
@@ -202,6 +208,9 @@ public class SignedStorageHook implements StorageHook {
// do nothing
}
+ /**
+ * @throws BundleException
+ */
public Dictionary getManifest(boolean firstLoad) throws BundleException {
// do nothing
return null;
diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/core/runtime/internal/adaptor/BasicLocation.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/core/runtime/internal/adaptor/BasicLocation.java
index d73ef479a..aa5d1f44b 100644
--- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/core/runtime/internal/adaptor/BasicLocation.java
+++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/core/runtime/internal/adaptor/BasicLocation.java
@@ -22,6 +22,9 @@ import org.eclipse.osgi.util.NLS;
*/
public class BasicLocation implements Location {
static class MockLocker implements Locker {
+ /**
+ * @throws IOException
+ */
public boolean lock() throws IOException {
// locking always successful
return true;
@@ -119,6 +122,9 @@ public class BasicLocation implements Location {
return isReadOnly;
}
+ /**
+ * @deprecated
+ */
public boolean setURL(URL value, boolean lock) throws IllegalStateException {
try {
return set(value, lock);
diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFileInputStream.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFileInputStream.java
index a22466d5c..f17745689 100644
--- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFileInputStream.java
+++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFileInputStream.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
+ * Copyright (c) 2003, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -163,6 +163,7 @@ public class ReliableFileInputStream extends FilterInputStream {
/**
* Override default available method.
+ * @throws IOException
* @see FilterInputStream#available()
*/
public synchronized int available() throws IOException {
diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/ManifestElement.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/ManifestElement.java
index 3d780fbd8..b5cbbea64 100644
--- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/ManifestElement.java
+++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/ManifestElement.java
@@ -86,28 +86,29 @@ public class ManifestElement {
/**
* The value of the manifest element.
*/
- protected String value;
+ private final String mainValue;
/**
* The value components of the manifest element.
*/
- protected String[] valueComponents;
+ private final String[] valueComponents;
/**
* The table of attributes for the manifest element.
*/
- protected Hashtable attributes;
+ private Hashtable attributes;
/**
* The table of directives for the manifest element.
*/
- protected Hashtable directives;
+ private Hashtable directives;
/**
* Constructs an empty manifest element with no value or attributes.
*/
- protected ManifestElement() {
- super();
+ private ManifestElement(String value, String[] valueComponents) {
+ this.mainValue = value;
+ this.valueComponents = valueComponents;
}
/**
@@ -126,7 +127,7 @@ public class ManifestElement {
* @return the value of the manifest element.
*/
public String getValue() {
- return value;
+ return mainValue;
}
/**
@@ -201,7 +202,7 @@ public class ManifestElement {
* @param key the key of the attribute
* @param value the value of the attribute
*/
- protected void addAttribute(String key, String value) {
+ private void addAttribute(String key, String value) {
attributes = addTableValue(attributes, key, value);
}
@@ -254,7 +255,7 @@ public class ManifestElement {
* @param key the key of the attribute
* @param value the value of the attribute
*/
- protected void addDirective(String key, String value) {
+ private void addDirective(String key, String value) {
directives = addTableValue(directives, key, value);
}
@@ -380,9 +381,7 @@ public class ManifestElement {
}
}
// found the header value create a manifestElement for it.
- ManifestElement manifestElement = new ManifestElement();
- manifestElement.value = headerValue.toString();
- manifestElement.valueComponents = (String[]) headerValues.toArray(new String[headerValues.size()]);
+ ManifestElement manifestElement = new ManifestElement(headerValue.toString(), (String[]) headerValues.toArray(new String[headerValues.size()]));
// now add any attributes/directives for the manifestElement.
while (c == '=' || c == ':') {
@@ -555,8 +554,8 @@ public class ManifestElement {
Enumeration attrKeys = getKeys();
Enumeration directiveKeys = getDirectiveKeys();
if (attrKeys == null && directiveKeys == null)
- return value;
- StringBuffer result = new StringBuffer(value);
+ return mainValue;
+ StringBuffer result = new StringBuffer(mainValue);
if (attrKeys != null) {
while (attrKeys.hasMoreElements()) {
String key = (String) attrKeys.nextElement();

Back to the top