Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2020-02-07 21:24:31 +0000
committerThomas Watson2020-02-07 21:56:04 +0000
commit5beb53f68349d191433725fc28426cc83af1cff0 (patch)
treecf241ec98b12af446169c119a5d6a83f10ddb8fb
parentcc47623ee22bc697e67dd7697e21a27087b57983 (diff)
downloadrt.equinox.framework-5beb53f68349d191433725fc28426cc83af1cff0.tar.gz
rt.equinox.framework-5beb53f68349d191433725fc28426cc83af1cff0.tar.xz
rt.equinox.framework-5beb53f68349d191433725fc28426cc83af1cff0.zip
bundles Change-Id: I349e141aac1259d952661b543e01449e6eb7dd47 Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
-rw-r--r--bundles/org.eclipse.equinox.launcher/src/org/eclipse/core/launcher/Main.java6
-rw-r--r--bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/internal/launcher/Constants.java4
-rw-r--r--bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/JNIBridge.java12
-rw-r--r--bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java172
-rw-r--r--bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/WebStartMain.java22
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/Activator.java2
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/PlatformAdminImpl.java4
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/PlatformBundleListener.java2
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/StateConverter.java2
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/BundleConstraint.java2
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/CompositeResolveHelper.java2
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/CompositeResolveHelperRegistry.java2
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/GenericCapability.java2
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/GenericConstraint.java2
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/GroupingChecker.java8
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/MappedList.java2
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverBundle.java8
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverConstraint.java2
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverExport.java2
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverImpl.java8
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverImport.java2
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/VersionSupplier.java6
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/BaseDescriptionImpl.java2
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/BundleDeltaImpl.java2
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/BundleDescriptionImpl.java4
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/BundleSpecificationImpl.java2
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/ExportPackageDescriptionImpl.java2
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/GenericDescriptionImpl.java2
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/GenericSpecificationImpl.java4
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/HostSpecificationImpl.java2
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/ImportPackageSpecificationImpl.java2
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/NativeCodeDescriptionImpl.java2
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/NativeCodeSpecificationImpl.java2
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/ResolverErrorImpl.java2
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateBuilder.java2
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateHelperImpl.java22
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateImpl.java22
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateMsg.java2
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateObjectFactoryImpl.java2
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateReader.java6
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateWriter.java2
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/UserState.java4
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/VersionConstraintImpl.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/bundles_src/ext.framework.b/ext/framework/b/TestCondition.java2
-rwxr-xr-xbundles/org.eclipse.osgi.tests/bundles_src/wrapper.hooks.a/org/eclipse/osgi/tests/wrapper/hooks/a/TestHookConfigurator.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/AllTests.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/ExtendedLogServiceTest.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogReaderServiceTest.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogServiceTest.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/TestListener2.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/OSGiTest.java4
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/OSGiTestsActivator.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/AllTests.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/ApplicationAdminTest.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/ExitValueApp.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/FailedApp.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/SimpleApp.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/DiscardBundleTests.java6
-rwxr-xr-xbundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/PersistedBundleTests.java8
-rwxr-xr-xbundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java6
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/AllTests.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/EclipseStarterConfigIniTest.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/EclipseStarterConfigurationAreaTest.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/MovableConfigurationAreaTest.java8
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/ReadOnlyConfigurationAreaTest.java14
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/AbstractTest.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/AllTests.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/ResolutionReportTest.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/TestModuleContainer.java16
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyCollisionHook.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyContainerAdaptor.java2
-rwxr-xr-xbundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyDebugOptions.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyModule.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyModuleDatabase.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummySystemModule.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/UnresolvedProviderEntryBuilder.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/debugoptions/DebugOptionsTestCase.java20
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/eclipseadaptor/AllTests.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/eclipseadaptor/EnvironmentInfoTest.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/eclipseadaptor/FilePathTest.java4
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/AllFrameworkHookTests.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/StorageHookTests.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/internal/plugins/InstallTests.java16
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/listeners/ExceptionHandlerTests.java34
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/AllTests.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/BasePerformanceTest.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/CaseMapPerformanceTest.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/StatePerformanceTest.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/StateUsesPerformanceTest.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestAttributes_001.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestBSN_001.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_001.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_002.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_003.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_004.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_005.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_006.java12
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_001.java16
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_002.java18
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_003.java18
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_004.java18
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_005.java18
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_006.java20
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGenerated_001.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_001.java12
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_002.java12
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_003.java14
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_006.java12
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_008.java14
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestOptional_001.java12
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestOptional_002.java12
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestPropagation_001.java12
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestPropagation_003.java12
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_001.java12
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_002.java14
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_003.java14
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_004.java14
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_005.java14
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_006.java14
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_007.java14
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestVersion_001.java12
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestVersion_002.java12
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestVersion_003.java12
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/AbstractResourceTest.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/AllTests.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/BasicTest.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/ResolverHookTests.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/BaseSecurityTest.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/KeyStoreTrustEngineTest.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/OSGiAPICertificateTest.java4
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/SecurityTestSuite.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/SignedBundleTest.java18
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/securityadmin/SecurityAdminUnitTests.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/securityadmin/SecurityManagerTests.java6
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/serviceregistry/ServiceExceptionTests.java8
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/serviceregistry/ServiceRegistryTests.java4
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/AllTests.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/BasicLocationTests.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/FileManagerTests.java18
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/LocationAreaSessionTest.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/SimpleTests.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/StreamManagerTests.java4
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/AbstractStateTest.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/AllTests.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/DevModeTest.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/DisabledInfoTest.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/GenericCapabilityTest.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/NewResolverTest.java18
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/OSGiCapabilityTest.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/PlatformAdminTest.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/R4ResolverTest.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/StateComparisonTest.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/StateCycleTest.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/StateResolverTest.java6
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/SubstitutableExportsTest.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/VersionRangeTests.java6
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/XFriendsInternalResolverTest.java22
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/util/BidiTextProcessorTestCase.java14
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/util/LatinTextProcessorTestCase.java22
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/util/TextProcessorSessionTest.java2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/util/TextProcessorTestCase.java16
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java138
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/ConsoleManager.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/DefaultStartupMonitor.java8
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseAppLauncher.java10
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/Module.java8
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleCapability.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleCollisionHook.java10
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainer.java30
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainerAdaptor.java12
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleDatabase.java20
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleLoader.java4
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRequirement.java4
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java14
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevision.java10
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevisionBuilder.java8
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevisions.java10
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleWire.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleWiring.java6
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/SystemModule.java6
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/builders/OSGiManifestBuilderFactory.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/namespaces/EclipsePlatformNamespace.java6
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/namespaces/EquinoxFragmentNamespace.java8
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/namespaces/EquinoxModuleDataNamespace.java26
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/CaseInsensitiveDictionaryMap.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/FilePath.java42
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/Headers.java4
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/KeyedElement.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/ObjectPool.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/SecureAction.java8
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/ThreadInfoReport.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/cds/CDSBundleEntry.java6
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/cds/CDSBundleFile.java18
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/cds/CDSHookImpls.java4
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/AtomicLazyInitializer.java6
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/Capabilities.java8
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/ComputeNodeOrder.java32
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/InternalUtils.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/LockSet.java4
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/Debug.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/EclipseDebugTrace.java58
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/FrameworkDebugOptions.java4
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/FrameworkDebugTraceEntry.java38
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/BundleContextImpl.java16
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/ContextFinder.java8
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/DTOBuilder.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxBundle.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java24
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxContainer.java4
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxContainerAdaptor.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxEventPublisher.java8
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/FilterImpl.java38
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/OSGiFrameworkHooks.java8
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/StorageSaver.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/XMLParsingServiceFactory.java8
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/legacy/PackageAdminImpl.java4
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/legacy/StartLevelImpl.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/BundleFileWrapperFactoryHook.java6
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/ClassLoaderHook.java52
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/FrameworkUtilHelper.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/HookRegistry.java14
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/StorageHookFactory.java30
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hooks/DevClassLoadingHook.java4
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hooks/EclipseLazyStarter.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/BundleLoader.java18
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/BundleLoaderSources.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/ModuleClassLoader.java18
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/SystemBundleLoader.java6
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/DependentPolicy.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/IBuddyPolicy.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/PolicyHandler.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/RegisteredPolicy.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/SystemPolicy.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathEntry.java6
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathManager.java34
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ManifestPackageAttributes.java4
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/TitleVersionVendor.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/FilteredSourcePackage.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/MultiSourcePackage.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/PackageSource.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/SingleSourcePackage.java2
-rwxr-xr-xbundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/BasicLocation.java2
-rwxr-xr-xbundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java24
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ConfigAdminListener.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EquinoxLogFactory.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EquinoxLogServices.java6
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EquinoxLogWriter.java16
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EventAdminAdapter.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ExtendedLogReaderServiceFactory.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ExtendedLogReaderServiceImpl.java2
-rwxr-xr-xbundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/LoggerContextTargetMap.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/BundlePermissions.java8
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/EquinoxSecurityManager.java10
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/PermissionAdminTable.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/PermissionInfoCollection.java4
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityAdmin.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityRow.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityRowSnapShot.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityTable.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityTableUpdate.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/service/security/AuthorizationEngine.java12
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/service/security/AuthorizationEvent.java6
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/service/security/AuthorizationListener.java4
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/service/security/AuthorizationStatus.java4
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/verifier/CertificateChain.java4
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/verifier/CertificateTrustAuthority.java6
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/verifier/CertificateVerifier.java16
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/verifier/CertificateVerifierFactory.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/service/security/KeyStoreTrustEngine.java6
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/FilteredServiceListener.java18
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/HookContext.java6
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ModifiedServiceEvent.java14
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/PrototypeServiceFactoryUse.java18
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceConsumer.java10
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceFactoryUse.java22
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceObjectsImpl.java20
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceProperties.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceReferenceImpl.java38
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceRegistrationImpl.java18
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceRegistry.java130
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceUse.java24
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ShrinkableCollection.java6
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ShrinkableValueCollectionMap.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/BERProcessor.java10
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/Base64.java8
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/DigestedInputStream.java14
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/PKCS7DateParser.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/PKCS7Processor.java26
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignatureBlockProcessor.java26
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedContentConstants.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedContentFile.java6
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedContentImpl.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedContentMessages.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignedStorageHook.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignerInfoImpl.java4
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/TrustEngineListener.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/ContentHandlerFactoryImpl.java4
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/ContentHandlerProxy.java8
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/EquinoxFactoryManager.java8
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingContentHandler.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingFactory.java6
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/NullURLStreamHandlerService.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerFactoryImpl.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/URLStreamHandlerProxy.java22
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/weaving/DynamicImportList.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/launch/Equinox.java4
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/launch/EquinoxFactory.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/pluginconversion/PluginConversionException.java12
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/pluginconversion/PluginConverter.java42
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/BaseDescription.java16
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/BundleDelta.java26
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/BundleDescription.java36
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/BundleSpecification.java10
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/DisabledInfo.java6
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/ExportPackageDescription.java4
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/GenericDescription.java12
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/GenericSpecification.java4
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/HostSpecification.java4
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/ImportPackageSpecification.java6
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/NativeCodeDescription.java8
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/NativeCodeSpecification.java14
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/PlatformAdmin.java42
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/Resolver.java28
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/ResolverError.java18
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/ResolverHookException.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/State.java156
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/StateDelta.java8
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/StateHelper.java94
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/StateObjectFactory.java124
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/StateWire.java4
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/VersionConstraint.java42
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/VersionRange.java18
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/security/TrustEngine.java16
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/signedcontent/InvalidContentException.java8
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/signedcontent/SignedContent.java16
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/signedcontent/SignedContentEntry.java6
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/signedcontent/SignedContentFactory.java4
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/signedcontent/SignerInfo.java6
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/BundleInfo.java18
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/BundleLocalizationImpl.java8
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/FrameworkExtensionInstaller.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/ManifestLocalization.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/PermissionData.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java14
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/StorageUtil.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/SystemBundleFile.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/BundleEntry.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/BundleFile.java26
-rwxr-xr-xbundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/BundleFileWrapper.java14
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/BundleFileWrapperChain.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/CloseableBundleFile.java8
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/DirZipBundleEntry.java4
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/MRUBundleFileList.java6
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/NestedDirBundleFile.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/ZipBundleEntry.java4
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/ZipBundleFile.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/BundleResourceHandler.java4
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/BundleURLConverter.java4
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/reference/Handler.java4
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/reference/ReferenceURLConnection.java10
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/util/TextProcessor.java34
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/ExtendedLogEntry.java14
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/ExtendedLogReaderService.java4
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/ExtendedLogService.java10
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/LogPermission.java6
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/Logger.java14
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/console/CommandInterpreter.java2
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/console/ConsoleSession.java20
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/CopyOnWriteIdentityMap.java42
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/EventDispatcher.java2
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/EventListeners.java10
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/EventManager.java76
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/ListenerQueue.java6
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFile.java44
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFileInputStream.java14
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/log/FrameworkLog.java30
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/log/FrameworkLogEntry.java16
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/LocationHelper.java6
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker.java2
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/messages/Msg.java2
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/util/SupplementDebug.java2
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/report/resolution/ResolutionReport.java18
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/datalocation/Location.java68
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/debug/DebugOptions.java70
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/debug/DebugOptionsListener.java24
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/debug/DebugTrace.java42
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java8
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/EnvironmentInfo.java36
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/localization/BundleLocalization.java6
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/localization/LocaleProvider.java24
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/runnable/ApplicationLauncher.java10
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/runnable/ParameterizedRunnable.java10
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/runnable/StartupMonitor.java30
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/urlconversion/URLConverter.java8
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/ManagedOutputStream.java14
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/StorageManager.java116
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/ManifestElement.java86
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/NLS.java28
399 files changed, 2321 insertions, 2321 deletions
diff --git a/bundles/org.eclipse.equinox.launcher/src/org/eclipse/core/launcher/Main.java b/bundles/org.eclipse.equinox.launcher/src/org/eclipse/core/launcher/Main.java
index 9035c2b3f..3d2e56402 100644
--- a/bundles/org.eclipse.equinox.launcher/src/org/eclipse/core/launcher/Main.java
+++ b/bundles/org.eclipse.equinox.launcher/src/org/eclipse/core/launcher/Main.java
@@ -19,13 +19,13 @@ package org.eclipse.core.launcher;
* <p>
* <b>Note:</b> This class should not be referenced programmatically by
* other Java code. This class exists only for the purpose of launching Eclipse
- * from the command line. To launch Eclipse programmatically, use
+ * from the command line. To launch Eclipse programmatically, use
* org.eclipse.core.runtime.adaptor.EclipseStarter. The fields and methods
* on this class are not API.
* @noextend This class is not intended to be subclassed by clients.
* @noinstantiate This class is not intended to be instantiated by clients.
* @noreference This class is not intended to be referenced by clients.
- *
+ *
* @deprecated
*
* This API is planned to be deleted, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=544262
@@ -36,7 +36,7 @@ public class Main {
/**
* Pass our args along to the real Main class.
- *
+ *
* @param args the given arguments
* @noreference This method is not intended to be referenced by clients.
*/
diff --git a/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/internal/launcher/Constants.java b/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/internal/launcher/Constants.java
index 1a0a79dd6..805a538c6 100644
--- a/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/internal/launcher/Constants.java
+++ b/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/internal/launcher/Constants.java
@@ -3,11 +3,11 @@
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
+ * which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* Andrew Niefer - IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/JNIBridge.java b/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/JNIBridge.java
index c06d8e077..9eba8fd37 100644
--- a/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/JNIBridge.java
+++ b/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/JNIBridge.java
@@ -3,11 +3,11 @@
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
+ * which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Rapicorp, Inc - Default the configuration to Application Support (bug 461725)
@@ -17,7 +17,7 @@ package org.eclipse.equinox.launcher;
/**
* <b>Note:</b> This class should not be referenced programmatically by
* other Java code. This class exists only for the purpose of interacting with
- * a native launcher. To launch Eclipse programmatically, use
+ * a native launcher. To launch Eclipse programmatically, use
* org.eclipse.core.runtime.adaptor.EclipseStarter. This class is not API.
*
* @noextend This class is not intended to be subclassed by clients.
@@ -48,7 +48,7 @@ public class JNIBridge {
/**
* @noreference This constructor is not intended to be referenced by clients.
- *
+ *
* @param library the given library
*/
public JNIBridge(String library) {
@@ -155,10 +155,10 @@ public class JNIBridge {
}
/**
- * Whether or not we loaded the shared library here from java.
+ * Whether or not we loaded the shared library here from java.
* False does not imply the library is not available, it could have
* been loaded natively by the executable.
- *
+ *
* @return boolean
*/
boolean isLibraryLoadedByJava() {
diff --git a/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java b/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java
index 456943ac4..144571914 100644
--- a/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java
+++ b/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java
@@ -33,13 +33,13 @@ import org.eclipse.equinox.internal.launcher.Constants;
/**
* The launcher for Eclipse.
- *
+ *
* <b>Note:</b> This class should not be referenced programmatically by
* other Java code. This class exists only for the purpose of launching Eclipse
- * from the command line. To launch Eclipse programmatically, use
+ * from the command line. To launch Eclipse programmatically, use
* org.eclipse.core.runtime.adaptor.EclipseStarter. The fields and methods
* on this class are not API.
- *
+ *
* @noextend This class is not intended to be subclassed by clients.
* @noinstantiate This class is not intended to be instantiated by clients.
*/
@@ -172,7 +172,7 @@ public class Main {
private static final String STARTER = "org.eclipse.core.runtime.adaptor.EclipseStarter"; //$NON-NLS-1$
private static final String PLATFORM_URL = "platform:/base/"; //$NON-NLS-1$
private static final String ECLIPSE_PROPERTIES = "eclipse.properties"; //$NON-NLS-1$
- private static final String FILE_SCHEME = "file:"; //$NON-NLS-1$
+ private static final String FILE_SCHEME = "file:"; //$NON-NLS-1$
protected static final String REFERENCE_SCHEME = "reference:"; //$NON-NLS-1$
protected static final String JAR_SCHEME = "jar:"; //$NON-NLS-1$
@@ -208,7 +208,7 @@ public class Main {
private static final String PROP_FRAMEWORK_PARENT_CLASSLOADER = "osgi.frameworkParentClassloader"; //$NON-NLS-1$
private static final String PROP_NL = "osgi.nl"; //$NON-NLS-1$
static final String PROP_NOSHUTDOWN = "osgi.noShutdown"; //$NON-NLS-1$
- private static final String PROP_DEBUG = "osgi.debug"; //$NON-NLS-1$
+ private static final String PROP_DEBUG = "osgi.debug"; //$NON-NLS-1$
private static final String PROP_OS = "osgi.os"; //$NON-NLS-1$
private static final String PROP_WS = "osgi.ws"; //$NON-NLS-1$
private static final String PROP_ARCH = "osgi.arch"; //$NON-NLS-1$
@@ -265,7 +265,7 @@ public class Main {
/**
* A structured form for a version identifier.
- *
+ *
* @see "http://www.oracle.com/technetwork/java/javase/versioning-naming-139433.html for information on valid version strings"
* @see "http://openjdk.java.net/jeps/223 for information on the JavaSE-9 version JEP 223"
*/
@@ -301,13 +301,13 @@ public class Main {
service = Integer.parseInt(tokenizer.nextToken());
} catch (NumberFormatException nfe) {
// ignore the minor and service qualifiers in that case and default to 0
- // this will allow us to tolerate other non-conventional version numbers
+ // this will allow us to tolerate other non-conventional version numbers
}
}
/**
* Returns true if this id is considered to be greater than or equal to the given baseline.
- * e.g.
+ * e.g.
* 1.2.9 >= 1.3.1 -> false
* 1.3.0 >= 1.3.1 -> false
* 1.3.1 >= 1.3.1 -> true
@@ -545,7 +545,7 @@ public class Main {
/**
* Executes the launch.
- *
+ *
* @param args command-line arguments
* @exception Exception thrown if a problem occurs during the launch
*/
@@ -567,7 +567,7 @@ public class Main {
}
// need to ensure that getInstallLocation is called at least once to initialize the value.
// Do this AFTER processing the configuration to allow the configuration to set
- // the install location.
+ // the install location.
getInstallLocation();
// locate boot plugin (may return -dev mode variations)
@@ -576,7 +576,7 @@ public class Main {
//Set up the JNI bridge. We need to know the install location to find the shared library
setupJNI(bootPath);
- //ensure minimum Java version, do this after JNI is set up so that we can write an error message
+ //ensure minimum Java version, do this after JNI is set up so that we can write an error message
//with exitdata if we fail.
if (!checkVersion(System.getProperty("java.version"), System.getProperty(PROP_REQUIRED_JAVA_VERSION))) //$NON-NLS-1$
return;
@@ -667,11 +667,11 @@ public class Main {
}
/**
- * Checks whether the given available version is greater or equal to the
+ * Checks whether the given available version is greater or equal to the
* given required version.
* <p>Will set PROP_EXITCODE/PROP_EXITDATA accordingly if check fails.</p>
- *
- * @return a boolean indicating whether the checking passed
+ *
+ * @return a boolean indicating whether the checking passed
*/
private boolean checkVersion(String availableVersion, String requiredVersion) {
if (requiredVersion == null || availableVersion == null)
@@ -681,7 +681,7 @@ public class Main {
Identifier available = new Identifier(availableVersion);
boolean compatible = available.isGreaterEqualTo(required);
if (!compatible) {
- // any non-zero value should do it - 14 used to be used for version incompatibility in Eclipse 2.1
+ // any non-zero value should do it - 14 used to be used for version incompatibility in Eclipse 2.1
System.setProperty(PROP_EXITCODE, "14"); //$NON-NLS-1$
System.setProperty(PROP_EXITDATA, "<title>Incompatible JVM</title>Version " + availableVersion + " of the JVM is not suitable for this product. Version: " + requiredVersion + " or greater is required."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
@@ -700,9 +700,9 @@ public class Main {
* If the system property "osgi.configuration.area.readOnly" is set
* the check always succeeds.
* <p>Will set PROP_EXITCODE/PROP_EXITDATA accordingly if check fails.</p>
- *
+ *
* @param locationUrl configuration area URL, may be <code>null</code>
- * @return a boolean indicating whether the checking passed
+ * @return a boolean indicating whether the checking passed
*/
private boolean checkConfigurationLocation(URL locationUrl) {
if (locationUrl == null || !"file".equals(locationUrl.getProtocol())) //$NON-NLS-1$
@@ -738,7 +738,7 @@ public class Main {
*/
protected String decode(String urlString) {
try {
- //first encode '+' characters, because URLDecoder incorrectly converts
+ //first encode '+' characters, because URLDecoder incorrectly converts
//them to spaces on certain class library implementations.
if (urlString.indexOf('+') >= 0) {
int len = urlString.length();
@@ -760,7 +760,7 @@ public class Main {
/**
* Returns the result of converting a list of comma-separated tokens into an array
- *
+ *
* @return the array of string tokens
* @param prop the initial comma-separated string
*/
@@ -781,7 +781,7 @@ public class Main {
/**
* Returns the <code>URL</code>-based class path describing where the boot classes
* are located when running in development mode.
- *
+ *
* @return the url-based class path
* @param base the base location
* @exception MalformedURLException if a problem occurs computing the class path
@@ -961,7 +961,7 @@ public class Main {
/**
* Returns the <code>URL</code>-based class path describing where the boot classes are located.
- *
+ *
* @return the url-based class path
* @param base the base location
* @exception MalformedURLException if a problem occurs computing the class path
@@ -1000,7 +1000,7 @@ public class Main {
/**
* Searches for the given target directory starting in the "plugins" subdirectory
* of the given location.
- *
+ *
* @return the location where target directory was found, <code>null</code> otherwise
* @param start the location to begin searching
*/
@@ -1102,7 +1102,7 @@ public class Main {
}
/**
- * Compares version strings.
+ * Compares version strings.
* @return result of comparison, as integer;
* <code><0</code> if left < right;
* <code>0</code> if left == right;
@@ -1192,7 +1192,7 @@ public class Main {
/**
* Resolve the given file against osgi.install.area.
* If osgi.install.area is not set, or the file is not relative, then
- * the file is returned as is.
+ * the file is returned as is.
*/
private static File resolveFile(File toAdjust) {
if (!toAdjust.isAbsolute()) {
@@ -1219,7 +1219,7 @@ public class Main {
URL result = null;
String location = System.getProperty(property);
System.clearProperty(property);
- // if the instance location is not set, predict where the workspace will be and
+ // if the instance location is not set, predict where the workspace will be and
// put the instance area inside the workspace meta area.
try {
if (location == null)
@@ -1256,18 +1256,18 @@ public class Main {
return value + source.substring(var.length());
}
- /**
+ /**
* Retuns the default file system path for the configuration location.
* By default the configuration information is in the installation directory
* if this is writeable. Otherwise it is located somewhere in the user.home
- * area relative to the current product.
+ * area relative to the current product.
* @return the default file system path for the configuration information
*/
private String computeDefaultConfigurationLocation() {
// 1) We store the config state relative to the 'eclipse' directory if possible
- // 2) If this directory is read-only
- // we store the state in <user.home>/.eclipse/<application-id>_<version> where <user.home>
- // is unique for each local user, and <application-id> is the one
+ // 2) If this directory is read-only
+ // we store the state in <user.home>/.eclipse/<application-id>_<version> where <user.home>
+ // is unique for each local user, and <application-id> is the one
// defined in .eclipseproduct marker file. If .eclipseproduct does not
// exist, use "eclipse" as the application-id.
@@ -1298,8 +1298,8 @@ public class Main {
* product and the given appendage
*/
private String computeDefaultUserAreaLocation(String pathAppendage) {
- // we store the state in <user.home>/.eclipse/<application-id>_<version> where <user.home>
- // is unique for each local user, and <application-id> is the one
+ // we store the state in <user.home>/.eclipse/<application-id>_<version> where <user.home>
+ // is unique for each local user, and <application-id> is the one
// defined in .eclipseproduct marker file. If .eclipseproduct does not
// exist, use "eclipse" as the application-id.
URL installURL = getInstallLocation();
@@ -1332,7 +1332,7 @@ public class Main {
appVersion = ""; //$NON-NLS-1$
appName += File.separator + appId + "_" + appVersion + "_" + installDirHash; //$NON-NLS-1$ //$NON-NLS-2$
} catch (IOException e) {
- // Do nothing if we get an exception. We will default to a standard location
+ // Do nothing if we get an exception. We will default to a standard location
// in the user's home dir.
// add the hash to help prevent collisions
appName += File.separator + installDirHash;
@@ -1389,7 +1389,7 @@ public class Main {
/**
* Runs this launcher with the arguments specified in the given string.
- *
+ *
* @param argString the arguments string
*/
public static void main(String argString) {
@@ -1410,7 +1410,7 @@ public class Main {
* Clients wishing to run the platform without a following <code>System.exit</code>
* call should use <code>run()</code>.
* </p>
- *
+ *
* @param args the command line arguments
* @see #run(String[])
*/
@@ -1452,8 +1452,8 @@ public class Main {
result = 17;
}
} catch (Throwable e) {
- // only log the exceptions if they have not been caught by the
- // EclipseStarter (i.e., if the exitCode is not 13)
+ // only log the exceptions if they have not been caught by the
+ // EclipseStarter (i.e., if the exitCode is not 13)
if (!"13".equals(System.getProperty(PROP_EXITCODE))) { //$NON-NLS-1$
log("Exception launching the Eclipse Platform:"); //$NON-NLS-1$
log(e);
@@ -1502,7 +1502,7 @@ public class Main {
* consume the arguments and leave them to be processed by Eclipse proper.
* There are a few args which are directed towards main() and a few others
* which we need to know about. Very few should actually be consumed here.
- *
+ *
* @return the arguments to pass through to the launched application
* @param args the command line arguments
*/
@@ -1547,7 +1547,7 @@ public class Main {
}
// check if development mode should be enabled for the entire platform
- // If this is the last arg or there is a following arg (i.e., arg+1 has a leading -),
+ // If this is the last arg or there is a following arg (i.e., arg+1 has a leading -),
// simply enable development mode. Otherwise, assume that that the following arg is
// actually some additional development time class path entries. This will be processed below.
if (args[i].equalsIgnoreCase(DEV) && ((i + 1 == args.length) || ((i + 1 < args.length) && (args[i + 1].startsWith("-"))))) { //$NON-NLS-1$
@@ -1577,7 +1577,7 @@ public class Main {
}
}
- // done checking for args. Remember where an arg was found
+ // done checking for args. Remember where an arg was found
if (found) {
configArgs[configArgIndex++] = i;
continue;
@@ -1604,7 +1604,7 @@ public class Main {
continue;
String arg = args[++i];
- // look for the development mode and class path entries.
+ // look for the development mode and class path entries.
if (args[i - 1].equalsIgnoreCase(DEV)) {
inDevelopmentMode = true;
devClassPathProps = processDevArg(arg);
@@ -1624,7 +1624,7 @@ public class Main {
if (args[i - 1].equalsIgnoreCase(OS)) {
os = arg;
- // passed thru this arg
+ // passed thru this arg
continue;
}
@@ -1639,16 +1639,16 @@ public class Main {
}
// look for explicitly set install root
- // Consume the arg here to ensure that the launcher and Eclipse get the
- // same value as each other.
+ // Consume the arg here to ensure that the launcher and Eclipse get the
+ // same value as each other.
if (args[i - 1].equalsIgnoreCase(INSTALL)) {
System.setProperty(PROP_INSTALL_AREA, arg);
found = true;
}
- // look for the configuration to use.
- // Consume the arg here to ensure that the launcher and Eclipse get the
- // same value as each other.
+ // look for the configuration to use.
+ // Consume the arg here to ensure that the launcher and Eclipse get the
+ // same value as each other.
if (args[i - 1].equalsIgnoreCase(CONFIGURATION)) {
System.setProperty(PROP_CONFIG_AREA, arg);
found = true;
@@ -1665,7 +1665,7 @@ public class Main {
found = true;
}
- // look for the startup jar used
+ // look for the startup jar used
if (args[i - 1].equalsIgnoreCase(STARTUP)) {
//not doing anything with this right now, but still consume it
//startup = arg;
@@ -1703,7 +1703,7 @@ public class Main {
found = true;
}
- // done checking for args. Remember where an arg was found
+ // done checking for args. Remember where an arg was found
if (found) {
configArgs[configArgIndex++] = i - 1;
configArgs[configArgIndex++] = i;
@@ -1759,7 +1759,7 @@ public class Main {
// if the configuration area is not already defined, discover the config area by
// trying to find a base config area. This is either defined in a system property or
// is computed relative to the install location.
- // Note that the config info read here is only used to determine a value
+ // Note that the config info read here is only used to determine a value
// for the user configuration area
URL baseConfigurationLocation = null;
Properties baseConfiguration = null;
@@ -1781,7 +1781,7 @@ public class Main {
}
baseConfiguration = loadConfiguration(baseConfigurationLocation);
if (baseConfiguration != null) {
- // if the base sets the install area then use that value if the property. We know the
+ // if the base sets the install area then use that value if the property. We know the
// property is not already set.
String location = baseConfiguration.getProperty(PROP_CONFIG_AREA);
if (location != null)
@@ -1797,11 +1797,11 @@ public class Main {
// Now we know where the base configuration is supposed to be. Go ahead and load
// it and merge into the System properties. Then, if cascaded, read the parent configuration.
- // Note that in a cascaded situation, the user configuration may be ignored if the parent
- // configuration has changed since the user configuration has been written.
- // Note that the parent may or may not be the same parent as we read above since the
+ // Note that in a cascaded situation, the user configuration may be ignored if the parent
+ // configuration has changed since the user configuration has been written.
+ // Note that the parent may or may not be the same parent as we read above since the
// base can define its parent. The first parent we read was either defined by the user
- // on the command line or was the one in the install dir.
+ // on the command line or was the one in the install dir.
// if the config or parent we are about to read is the same as the base config we read above,
// just reuse the base
Properties configuration = baseConfiguration;
@@ -1826,8 +1826,8 @@ public class Main {
if (sharedConfigURL != null) {
if (sharedConfigURL.equals(getConfigurationLocation())) {
//After all we are not in a shared configuration setup.
- // - remove the property to show that we do not have a parent
- // - merge configuration with the system properties
+ // - remove the property to show that we do not have a parent
+ // - merge configuration with the system properties
System.clearProperty(PROP_SHARED_CONFIG_AREA);
mergeWithSystemProperties(configuration, null);
} else {
@@ -1905,7 +1905,7 @@ public class Main {
/**
* Ensures the value for a system property is an absolute URL. Relative URLs are translated to
* absolute URLs by taking the install URL as reference.
- *
+ *
* @param locationProperty the key for a system property containing a URL
*/
private void ensureAbsolute(String locationProperty) {
@@ -1978,7 +1978,7 @@ public class Main {
path = file.toString().replace('\\', '/');
// TODO need a better test for windows
// If on Windows then canonicalize the drive letter to be lowercase.
- // remember that there may be UNC paths
+ // remember that there may be UNC paths
if (File.separatorChar == '\\')
if (Character.isUpperCase(path.charAt(0))) {
char[] chars = path.toCharArray();
@@ -1987,20 +1987,20 @@ public class Main {
}
if (path.toLowerCase().endsWith(".jar")) //$NON-NLS-1$
path = path.substring(0, path.lastIndexOf('/') + 1);
- if (path.toLowerCase().endsWith("/plugins/")) //$NON-NLS-1$
+ if (path.toLowerCase().endsWith("/plugins/")) //$NON-NLS-1$
path = path.substring(0, path.length() - "/plugins/".length()); //$NON-NLS-1$
try {
try {
- // create a file URL (via File) to normalize the form (e.g., put
+ // create a file URL (via File) to normalize the form (e.g., put
// the leading / on if necessary)
path = new File(path).toURL().getFile();
} catch (MalformedURLException e1) {
- // will never happen. The path is straight from a URL.
+ // will never happen. The path is straight from a URL.
}
installLocation = new URL(result.getProtocol(), result.getHost(), result.getPort(), path);
System.setProperty(PROP_INSTALL_AREA, installLocation.toExternalForm());
} catch (MalformedURLException e) {
- // TODO Very unlikely case. log here.
+ // TODO Very unlikely case. log here.
}
if (debug)
System.out.println("Install location:\n " + installLocation); //$NON-NLS-1$
@@ -2054,7 +2054,7 @@ public class Main {
}
/*
- * Load the configuration
+ * Load the configuration
*/
private Properties load(URL url, String suffix) throws IOException {
// figure out what we will be loading
@@ -2083,22 +2083,22 @@ public class Main {
/*
* Handle splash screen.
* The splash screen is displayed natively. Whether or not the splash screen
- * was displayed by the launcher, we invoke JNIBridge.showSplash() and the
+ * was displayed by the launcher, we invoke JNIBridge.showSplash() and the
* native code handles the case of the splash screen already existing.
- *
+ *
* The -showsplash argument may indicate the bitmap used by the native launcher,
* or the bitmap location may be extracted from the config.ini
- *
+ *
* We pass a handler (Runnable) to the platform which is called as a result of the
- * launched application calling Platform.endSplash(). This handle calls
+ * launched application calling Platform.endSplash(). This handle calls
* JNIBridge.takeDownSplash and the native code will close the splash screen.
- *
+ *
* The -endsplash argument is longer used and has the same result as -nosplash
- *
+ *
* @param defaultPath search path for the boot plugin
*/
private void handleSplash(URL[] defaultPath) {
- // run without splash if we are initializing or nosplash
+ // run without splash if we are initializing or nosplash
// was specified (splashdown = true)
if (initialize || splashDown || bridge == null) {
showSplash = false;
@@ -2107,7 +2107,7 @@ public class Main {
}
if (showSplash || endSplash != null) {
- // Register the endSplashHandler to be run at VM shutdown. This hook will be
+ // Register the endSplashHandler to be run at VM shutdown. This hook will be
// removed once the splash screen has been taken down.
try {
Runtime.getRuntime().addShutdownHook(splashHandler);
@@ -2147,7 +2147,7 @@ public class Main {
}
/*
- * Take down the splash screen.
+ * Take down the splash screen.
*/
protected void takeDownSplash() {
if (splashDown || bridge == null) // splash is already down
@@ -2242,7 +2242,7 @@ public class Main {
}
/*
- * Look for the specified spash file in the given JAR and extract it to the config
+ * Look for the specified spash file in the given JAR and extract it to the config
* area for caching purposes.
*/
private String extractFromJAR(String jarPath, String jarEntry) {
@@ -2312,9 +2312,9 @@ public class Main {
/*
* Build an array of path suffixes based on the given NL which is suitable
- * for splash path searching. The returned array contains paths in order
- * from most specific to most generic. So, in the FR_fr locale, it will return
- * "nl/fr/FR/splash.bmp", then "nl/fr/splash.bmp", and finally "splash.bmp".
+ * for splash path searching. The returned array contains paths in order
+ * from most specific to most generic. So, in the FR_fr locale, it will return
+ * "nl/fr/FR/splash.bmp", then "nl/fr/splash.bmp", and finally "splash.bmp".
* (we always search the root)
*/
private static String[] buildNLVariants(String locale) {
@@ -2514,13 +2514,13 @@ public class Main {
String value = source.getProperty(key);
// Check to see if we are supposed to override existing values from the user configuraiton.
- // This is done only in the case of shared install where we have already set the user values
+ // This is done only in the case of shared install where we have already set the user values
// but want to override them with values from the shared location's config.
if (userConfiguration != null && !key.endsWith(EXT_OVERRIDE_USER)) {
// check all levels to see if the "override" property was set
final String overrideKey = key + EXT_OVERRIDE_USER;
boolean shouldOverride = System.getProperty(overrideKey) != null || source.getProperty(overrideKey) != null;
- // only set the value if the user specified the override property and if the
+ // only set the value if the user specified the override property and if the
// original property wasn't set by a commad-line arg
if (shouldOverride && !userConfiguration.contains(key)) {
System.setProperty(key, value);
@@ -2558,13 +2558,13 @@ public class Main {
* NOTE: It is ok here for EclipsePolicy to use 1.4 methods because the methods
* that it calls them from don't exist in Foundation so they will never be called. A more
* detailed explanation from Tom:
- *
- * They will never get called because in a pre 1.4 VM the methods
- * getPermissions(CodeSource) and implies(ProtectionDomain, Permission) are
- * undefined on the Policy class which is what EclipsePolicy extends. EclipsePolicy
- * implements these two methods so it can proxy them to the parent Policy.
- * But since these methods are not actually defined on Policy in a pre-1.4 VM
- * nobody will actually call them (unless they casted the policy to EclipsePolicy and
+ *
+ * They will never get called because in a pre 1.4 VM the methods
+ * getPermissions(CodeSource) and implies(ProtectionDomain, Permission) are
+ * undefined on the Policy class which is what EclipsePolicy extends. EclipsePolicy
+ * implements these two methods so it can proxy them to the parent Policy.
+ * But since these methods are not actually defined on Policy in a pre-1.4 VM
+ * nobody will actually call them (unless they casted the policy to EclipsePolicy and
* called our methods)
*/
private class EclipsePolicy extends Policy {
diff --git a/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/WebStartMain.java b/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/WebStartMain.java
index bacaac58a..341bc68f1 100644
--- a/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/WebStartMain.java
+++ b/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/WebStartMain.java
@@ -23,23 +23,23 @@ import java.util.jar.Manifest;
import java.util.zip.ZipFile;
/**
- * The launcher to start eclipse using webstart. To use this launcher, the client
+ * The launcher to start eclipse using webstart. To use this launcher, the client
* must accept to give all security permissions.
* <p>
* <b>Note:</b> This class should not be referenced programmatically by
* other Java code. This class exists only for the purpose of launching Eclipse
- * using Java webstart. To launch Eclipse programmatically, use
+ * using Java webstart. To launch Eclipse programmatically, use
* org.eclipse.core.runtime.adaptor.EclipseStarter. The fields and methods
* on this class are not API.
- *
+ *
* @noextend This class is not intended to be subclassed by clients.
* @noinstantiate This class is not intended to be instantiated by clients.
* @noreference This class is not intended to be referenced by clients.
- *
+ *
* @deprecated Java WebStart is removed in Java 11.
- *
+ *
* This API is planned to be deleted, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=544262
- *
+ *
*/
//The bundles are discovered by finding all the jars on the classpath. Then they are added with their full path to the osgi.bundles list.
@Deprecated
@@ -50,7 +50,7 @@ public class WebStartMain extends Main {
private static final String PROP_CHECK_CONFIG = "osgi.checkConfiguration"; //$NON-NLS-1$
private Map<String, List<BundleInfo>> allBundles = null; // Map of all the bundles found on the classpath. Id -> ArrayList of BundleInfo
- private List<BundleInfo> bundleList = null; //The list of bundles found on the osgi.bundle list
+ private List<BundleInfo> bundleList = null; //The list of bundles found on the osgi.bundle list
protected class BundleInfo {
String bsn;
@@ -63,7 +63,7 @@ public class WebStartMain extends Main {
* @noreference This method is not intended to be referenced by clients.
*/
public static void main(String[] args) {
- System.setSecurityManager(null); //TODO Hack so that when the classloader loading the fwk is created we don't have funny permissions. This should be revisited.
+ System.setSecurityManager(null); //TODO Hack so that when the classloader loading the fwk is created we don't have funny permissions. This should be revisited.
int result = new WebStartMain().run(args);
if (!Boolean.getBoolean(PROP_NOSHUTDOWN))
System.exit(result);
@@ -100,7 +100,7 @@ public class WebStartMain extends Main {
}
/*
- * Null out all the fields containing data
+ * Null out all the fields containing data
*/
private void cleanup() {
allBundles = null;
@@ -163,7 +163,7 @@ public class WebStartMain extends Main {
return removeMatch ? matches.remove(highest) : matches.get(highest);
}
- /*
+ /*
* Get all the bundles available on the webstart classpath
*/
private void discoverBundles() {
@@ -306,7 +306,7 @@ public class WebStartMain extends Main {
return null;
}
- //Build the osgi bundle list. The allbundles data structure is changed during the process.
+ //Build the osgi bundle list. The allbundles data structure is changed during the process.
private void buildOSGiBundleList() {
StringBuilder finalBundleList = new StringBuilder(allBundles.size() * 30);
//First go through all the bundles of the bundle
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/Activator.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/Activator.java
index 482489ae1..52bdd31e5 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/Activator.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/Activator.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors: IBM - Initial API and implementation
******************************************************************************/
package org.eclipse.osgi.compatibility.state;
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/PlatformAdminImpl.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/PlatformAdminImpl.java
index e6be607b9..0cd736a7f 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/PlatformAdminImpl.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/PlatformAdminImpl.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
******************************************************************************/
@@ -130,7 +130,7 @@ public class PlatformAdminImpl implements PlatformAdmin {
}
/**
- * @throws BundleException
+ * @throws BundleException
*/
@Override
public void commit(State state) throws BundleException {
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/PlatformBundleListener.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/PlatformBundleListener.java
index c6e1d8a58..6d881341b 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/PlatformBundleListener.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/PlatformBundleListener.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/StateConverter.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/StateConverter.java
index ccd7de19f..a7792db47 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/StateConverter.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/StateConverter.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/BundleConstraint.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/BundleConstraint.java
index 62bb1e928..8f43f963a 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/BundleConstraint.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/BundleConstraint.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/CompositeResolveHelper.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/CompositeResolveHelper.java
index 7867ad7c6..6d997458b 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/CompositeResolveHelper.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/CompositeResolveHelper.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/CompositeResolveHelperRegistry.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/CompositeResolveHelperRegistry.java
index 557dc52a4..69dcd5789 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/CompositeResolveHelperRegistry.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/CompositeResolveHelperRegistry.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/GenericCapability.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/GenericCapability.java
index 6e706dd72..3adb006e8 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/GenericCapability.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/GenericCapability.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Karsten Thoms (itemis) - Consider devmode for effective status computation
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/GenericConstraint.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/GenericConstraint.java
index a2992364c..ca4fadf32 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/GenericConstraint.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/GenericConstraint.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Karsten Thoms (itemis) - Consider devmode for effective status computation
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/GroupingChecker.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/GroupingChecker.java
index 8988c1bf6..9d4248b3b 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/GroupingChecker.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/GroupingChecker.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
package org.eclipse.osgi.internal.module;
@@ -124,7 +124,7 @@ public class GroupingChecker {
/*
* Verifies the uses constraint consistency for the importingBundle with the possible dynamic matching export.
* If an inconsistency is found the export returned; otherwise null is returned.
- * Dynamic imports must perform extra checks to ensure that existing wires to package roots are
+ * Dynamic imports must perform extra checks to ensure that existing wires to package roots are
* consistent with the possible matching dynamic export.
*/
public PackageRoots[][] isDynamicConsistent(ResolverBundle importingBundle, ResolverExport matchingExport) {
@@ -188,7 +188,7 @@ public class GroupingChecker {
visited.add(bundle); // prevent endless cycles
// check imports
if (bundle.getBundleDescription().isResolved()) {
- // must check resolved imports to get any dynamically resolved imports
+ // must check resolved imports to get any dynamically resolved imports
ExportPackageDescription[] imports = bundle.getBundleDescription().getResolvedImports();
for (ExportPackageDescription importPkg : imports) {
if (importPkg.getExporter() == bundle.getBundleDescription() || !importPkg.getName().equals(packageName))
@@ -297,7 +297,7 @@ public class GroupingChecker {
roots = new ResolverExport[] {export};
return;
}
- // need to do an extra check to make sure we are not adding the same package name
+ // need to do an extra check to make sure we are not adding the same package name
// from multiple versions of the same bundle
String exportBSN = export.getExporter().getName();
if (exportBSN != null) {
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/MappedList.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/MappedList.java
index 611bd436f..8d4bb5b41 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/MappedList.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/MappedList.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverBundle.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverBundle.java
index 5f66a27fe..a92888b7c 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverBundle.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverBundle.java
@@ -7,10 +7,10 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
- * Karsten Thoms (itemis) - Consider devmode for generic capabilities
+ * Karsten Thoms (itemis) - Consider devmode for generic capabilities
* & constraints
*******************************************************************************/
package org.eclipse.osgi.internal.module;
@@ -502,7 +502,7 @@ public class ResolverBundle extends VersionSupplier implements Comparable<Resolv
resolver.getState().addResolverError(fragment, ResolverError.FRAGMENT_CONFLICT, newRequire.toString(), newRequire);
}
}
- // generic constraints cannot conflict;
+ // generic constraints cannot conflict;
// only check that a fragment does not add generic constraints to an already resolved host
if (isResolved() && newGenericRequires != null) {
for (GenericSpecification genericSpecification : newGenericRequires) {
@@ -556,7 +556,7 @@ public class ResolverBundle extends VersionSupplier implements Comparable<Resolv
initFragments();
// must save off old imports and requires before we remove the fragment;
- // this will be used to merge the constraints of the same name from the remaining fragments
+ // this will be used to merge the constraints of the same name from the remaining fragments
ResolverImport[] oldImports = getImportPackages();
BundleConstraint[] oldRequires = getRequires();
if (!fragments.remove(fragment))
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverConstraint.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverConstraint.java
index d08c79de5..55122ea59 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverConstraint.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverConstraint.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
package org.eclipse.osgi.internal.module;
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverExport.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverExport.java
index c3210790d..8885c30b8 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverExport.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverExport.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverImpl.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverImpl.java
index fb14b6a4b..6bb5d8774 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverImpl.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverImpl.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Danail Nachev - ProSyst - bug 218625
@@ -589,7 +589,7 @@ public class ResolverImpl implements Resolver {
private BundleDescription[] addDevConstraints(BundleDescription[] reRefresh) {
if (!developmentMode)
return reRefresh; // we don't care about this unless we are in development mode
- // when in develoment mode we need to reRefresh hosts of unresolved fragments that add new constraints
+ // when in develoment mode we need to reRefresh hosts of unresolved fragments that add new constraints
// and reRefresh and unresolved bundles that have dependents
Set<BundleDescription> additionalRefresh = new HashSet<>();
ResolverBundle[] allUnresolved = unresolvedBundles.toArray(new ResolverBundle[unresolvedBundles.size()]);
@@ -915,7 +915,7 @@ public class ResolverImpl implements Resolver {
List<ResolverConstraint> initialConflicts = getConflicts(bundles, packageConstraints, bundleConstraints, multiRequirementWithMultiSuppliers);
if (initialConflicts == null || "tryFirst".equals(usesMode) || usesCalculationTimeout) { //$NON-NLS-1$
groupingChecker.clear();
- // the first combination have no conflicts or
+ // the first combination have no conflicts or
// we only are trying the first combination or
// we have timed out the calculation; return without iterating over all combinations
return initialConflicts;
@@ -962,7 +962,7 @@ public class ResolverImpl implements Resolver {
}
private List<ResolverConstraint> findBestCombination(ResolverBundle[] bundles, ResolverConstraint[][] multipleSuppliers, int[] bestCombination, List<ResolverConstraint> bestConflicts) {
- // now iterate over every possible combination until either zero conflicts are found
+ // now iterate over every possible combination until either zero conflicts are found
// or we have run out of combinations
// if all combinations are tried then return the combination with the lowest number of conflicts
long initialTime = System.currentTimeMillis();
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverImport.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverImport.java
index 936373e79..108196767 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverImport.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/ResolverImport.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/VersionSupplier.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/VersionSupplier.java
index 3460575ad..1f64d35fa 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/VersionSupplier.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/module/VersionSupplier.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -48,7 +48,7 @@ public abstract class VersionSupplier {
return substitute;
}
- // sets the dropped status. This should only be called by the VersionHashMap
+ // sets the dropped status. This should only be called by the VersionHashMap
// when VersionSuppliers are removed
void setSubstitute(VersionSupplier substitute) {
this.substitute = substitute;
@@ -60,7 +60,7 @@ public abstract class VersionSupplier {
abstract public BundleDescription getBundleDescription();
/*
- * returns the ResolverBundle which supplies this VersionSupplier
+ * returns the ResolverBundle which supplies this VersionSupplier
*/
abstract ResolverBundle getResolverBundle();
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/BaseDescriptionImpl.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/BaseDescriptionImpl.java
index 7c084214f..de34540e7 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/BaseDescriptionImpl.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/BaseDescriptionImpl.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Rob Harrop - SpringSource Inc. (bug 247522)
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/BundleDeltaImpl.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/BundleDeltaImpl.java
index c7b1bf071..293af6a87 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/BundleDeltaImpl.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/BundleDeltaImpl.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Rob Harrop - SpringSource Inc. (bug 247522)
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/BundleDescriptionImpl.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/BundleDescriptionImpl.java
index 93053366d..6b0768bbe 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/BundleDescriptionImpl.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/BundleDescriptionImpl.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Danail Nachev - ProSyst - bug 218625
@@ -65,7 +65,7 @@ public final class BundleDescriptionImpl extends BaseDescriptionImpl implements
private DescriptionWiring bundleWiring;
public BundleDescriptionImpl() {
- //
+ //
}
public long getBundleId() {
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/BundleSpecificationImpl.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/BundleSpecificationImpl.java
index ee40e1b00..d0e449f3d 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/BundleSpecificationImpl.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/BundleSpecificationImpl.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Rob Harrop - SpringSource Inc. (bug 247522)
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/ExportPackageDescriptionImpl.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/ExportPackageDescriptionImpl.java
index d2e4c78cd..7f5b3295f 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/ExportPackageDescriptionImpl.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/ExportPackageDescriptionImpl.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Rob Harrop - SpringSource Inc. (bug 247522)
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/GenericDescriptionImpl.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/GenericDescriptionImpl.java
index 57be3021d..aba9d629c 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/GenericDescriptionImpl.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/GenericDescriptionImpl.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Rob Harrop - SpringSource Inc. (bug 247522)
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/GenericSpecificationImpl.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/GenericSpecificationImpl.java
index cef6d8798..086e921df 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/GenericSpecificationImpl.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/GenericSpecificationImpl.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Rob Harrop - SpringSource Inc. (bug 247522)
@@ -28,7 +28,7 @@ public class GenericSpecificationImpl extends VersionConstraintImpl implements G
private Map<String, Object> attributes;
private Map<String, String> arbitraryDirectives;
/*
- * Indicates that a generic constraint was from converting the BREE header
+ * Indicates that a generic constraint was from converting the BREE header
*/
public static final int RESOLUTION_FROM_BREE = 0x04;
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/HostSpecificationImpl.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/HostSpecificationImpl.java
index f3f1ce008..0ae911cf8 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/HostSpecificationImpl.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/HostSpecificationImpl.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Rob Harrop - SpringSource Inc. (bug 247522)
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/ImportPackageSpecificationImpl.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/ImportPackageSpecificationImpl.java
index 7c99f29df..47c9f1c09 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/ImportPackageSpecificationImpl.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/ImportPackageSpecificationImpl.java
@@ -109,7 +109,7 @@ public class ImportPackageSpecificationImpl extends VersionConstraintImpl implem
ExportPackageDescriptionImpl pkgDes = (ExportPackageDescriptionImpl) supplier;
// If we are in strict mode, check to see if the export specifies friends.
- // If it does, are we one of the friends
+ // If it does, are we one of the friends
String[] friends = (String[]) pkgDes.getDirective(StateImpl.FRIENDS_DIRECTIVE);
Boolean internal = (Boolean) pkgDes.getDirective(StateImpl.INTERNAL_DIRECTIVE);
if (internal.booleanValue() || friends != null) {
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/NativeCodeDescriptionImpl.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/NativeCodeDescriptionImpl.java
index 3bd8b580a..8f6a1939f 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/NativeCodeDescriptionImpl.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/NativeCodeDescriptionImpl.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Rob Harrop - SpringSource Inc. (bug 247522)
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/NativeCodeSpecificationImpl.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/NativeCodeSpecificationImpl.java
index 292ef0e91..5877f1040 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/NativeCodeSpecificationImpl.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/NativeCodeSpecificationImpl.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Rob Harrop - SpringSource Inc. (bug 247522)
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/ResolverErrorImpl.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/ResolverErrorImpl.java
index 3839cea0a..1b7b19de2 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/ResolverErrorImpl.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/ResolverErrorImpl.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Rob Harrop - SpringSource Inc. (bug 247522)
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateBuilder.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateBuilder.java
index 37c43f786..391f738af 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateBuilder.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateBuilder.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Danail Nachev - ProSyst - bug 218625
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateHelperImpl.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateHelperImpl.java
index dcd27ff74..5f04b6683 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateHelperImpl.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateHelperImpl.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Rob Harrop - SpringSource Inc. (bug 247522)
@@ -147,7 +147,7 @@ public final class StateHelperImpl implements StateHelper {
for (BaseDescription baseDescription : satisfied) {
if (!baseDescription.getSupplier().isResolved() && !bundleList.contains(baseDescription.getSupplier())) {
bundleList.add(baseDescription.getSupplier());
- // TODO only add the first supplier that is not resolved;
+ // TODO only add the first supplier that is not resolved;
// this is the previous behavior before the fix for bug 333071; should consider adding all unresolved
break;
}
@@ -539,18 +539,18 @@ public final class StateHelperImpl implements StateHelper {
}
/*
- * This class is used to encapsulate the import packages of a bundle used by getVisiblePackages(). If the method is called with the option
- * VISIBLE_INCLUDE_ALL_HOST_WIRES, it uses resolved import packages to find all visible packages by a bundle. Called without this option,
- * it uses imported packages instead of resolved imported packages and does not consider resolved dynamic imports.
+ * This class is used to encapsulate the import packages of a bundle used by getVisiblePackages(). If the method is called with the option
+ * VISIBLE_INCLUDE_ALL_HOST_WIRES, it uses resolved import packages to find all visible packages by a bundle. Called without this option,
+ * it uses imported packages instead of resolved imported packages and does not consider resolved dynamic imports.
* ImportsHolder serves to hide which of these is used, so that the body of getVisiblePackages() does not become full of checks.
- *
+ *
*/
class ImportsHolder {
private final ImportPackageSpecification[] importedPackages;
private final ExportPackageDescription[] resolvedImports;
private final boolean isUsingResolved;
- // Depending on the options used, either importedPackages or resolvedImports is initialize, but not both.
+ // Depending on the options used, either importedPackages or resolvedImports is initialize, but not both.
ImportsHolder(BundleDescription bundle, int options) {
isUsingResolved = (options & StateHelper.VISIBLE_INCLUDE_ALL_HOST_WIRES) != 0;
if (isUsingResolved) {
@@ -582,10 +582,10 @@ class ImportsHolder {
}
/*
- * This class is used to encapsulate the required bundles by a bundle, used by getVisiblePackages(). If the method is called with the option
- * VISIBLE_INCLUDE_ALL_HOST_WIRES, it uses resolved required bundles to find all visible packages by a bundle. Called without this option,
- * it uses required bundles instead of resolved required bundles and does not consider the constraints from fragments.
- * RequiresHolder serves to hide which of these is used.
+ * This class is used to encapsulate the required bundles by a bundle, used by getVisiblePackages(). If the method is called with the option
+ * VISIBLE_INCLUDE_ALL_HOST_WIRES, it uses resolved required bundles to find all visible packages by a bundle. Called without this option,
+ * it uses required bundles instead of resolved required bundles and does not consider the constraints from fragments.
+ * RequiresHolder serves to hide which of these is used.
*/
class RequiresHolder {
private final BundleSpecification[] requiredBundles;
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateImpl.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateImpl.java
index b81df4c2c..5973a2ce0 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateImpl.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateImpl.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Danail Nachev - ProSyst - bug 218625
@@ -70,13 +70,13 @@ public abstract class StateImpl implements State {
public static final String ECLIPSE_PLATFORMFILTER = "Eclipse-PlatformFilter"; //$NON-NLS-1$
public static final String Eclipse_JREBUNDLE = "Eclipse-JREBundle"; //$NON-NLS-1$
/**
- * Manifest Export-Package directive indicating that the exported package should only
+ * Manifest Export-Package directive indicating that the exported package should only
* be made available when the resolver is not in strict mode.
*/
public static final String INTERNAL_DIRECTIVE = "x-internal"; //$NON-NLS-1$
/**
- * Manifest Export-Package directive indicating that the exported package should only
+ * Manifest Export-Package directive indicating that the exported package should only
* be made available to friends of the exporting bundle.
*/
public static final String FRIENDS_DIRECTIVE = "x-friends"; //$NON-NLS-1$
@@ -103,7 +103,7 @@ public abstract class StateImpl implements State {
* by the required bundle must be reprovided by the requiring bundle.
* The default value is <tt>false</tt>.
* <p>
- * The attribute value is encoded in the Require-Bundle manifest
+ * The attribute value is encoded in the Require-Bundle manifest
* header like:
* <pre>
* Require-Bundle: com.acme.module.test; reprovide="true"
@@ -119,11 +119,11 @@ public abstract class StateImpl implements State {
* Manifest header attribute (named &quot;optional&quot;)
* for Require-Bundle
* identifying that a required bundle is optional and that
- * the requiring bundle can be resolved if there is no
+ * the requiring bundle can be resolved if there is no
* suitable required bundle.
* The default value is <tt>false</tt>.
*
- * <p>The attribute value is encoded in the Require-Bundle manifest
+ * <p>The attribute value is encoded in the Require-Bundle manifest
* header like:
* <pre>
* Require-Bundle: com.acme.module.test; optional="true"
@@ -177,7 +177,7 @@ public abstract class StateImpl implements State {
final Object monitor = new Object();
- // to prevent extra-package instantiation
+ // to prevent extra-package instantiation
protected StateImpl() {
// always add the default platform property keys.
addPlatformPropertyKeys(PROPS);
@@ -436,7 +436,7 @@ public abstract class StateImpl implements State {
if (!resolving)
throw new IllegalStateException(); // TODO need error message here!
BundleDescriptionImpl modifiable = (BundleDescriptionImpl) bundle;
- // must record the change before setting the resolve state to
+ // must record the change before setting the resolve state to
// accurately record if a change has happened.
getDelta().recordBundleResolved(modifiable, status);
// force the new resolution data to stay in memory; we will not read this from disk anymore
@@ -556,7 +556,7 @@ public abstract class StateImpl implements State {
if (resolved && reResolve == null)
return new StateDeltaImpl(this);
if (developmentMode) {
- // in dev mode we need to aggressively flush removal pendings
+ // in dev mode we need to aggressively flush removal pendings
if (removalPendings.size() > 0) {
BundleDescription[] removed = internalGetRemovalPending();
reResolve = mergeBundles(reResolve, removed);
@@ -945,7 +945,7 @@ public abstract class StateImpl implements State {
addSystemExports(exports, ManifestElement.parseHeader(Constants.EXPORT_PACKAGE, (String) platformProperties[i].get(Constants.FRAMEWORK_SYSTEMPACKAGES)), i);
addSystemExports(exports, ManifestElement.parseHeader(Constants.EXPORT_PACKAGE, (String) platformProperties[i].get(Constants.FRAMEWORK_SYSTEMPACKAGES_EXTRA)), i);
} catch (BundleException e) {
- // TODO consider throwing this...
+ // TODO consider throwing this...
}
}
@@ -983,7 +983,7 @@ public abstract class StateImpl implements State {
addSystemCapabilities(capabilities, ManifestElement.parseHeader(Constants.PROVIDE_CAPABILITY, (String) platformProperties[i].get(Constants.FRAMEWORK_SYSTEMCAPABILITIES_EXTRA)), i);
checkOSGiEE(capabilities, (String) platformProperties[i].get(Constants.FRAMEWORK_EXECUTIONENVIRONMENT), i);
} catch (BundleException e) {
- // TODO consider throwing this...
+ // TODO consider throwing this...
}
}
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateMsg.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateMsg.java
index 6c1ed9f7f..ad6f9eaa4 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateMsg.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateMsg.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateObjectFactoryImpl.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateObjectFactoryImpl.java
index 5bb5123c9..c3f095acb 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateObjectFactoryImpl.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateObjectFactoryImpl.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateReader.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateReader.java
index 385921444..ddb8d4128 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateReader.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateReader.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Rob Harrop - SpringSource Inc. (bug 247522)
@@ -755,7 +755,7 @@ final class StateReader {
/**
* expectedTimestamp is the expected value for the timestamp. or -1, if
- * no checking should be performed
+ * no checking should be performed
*/
public synchronized boolean loadStateDeprecated(StateImpl state, DataInputStream input, long expectedTimestamp) throws IOException {
try {
@@ -767,7 +767,7 @@ final class StateReader {
/**
* expectedTimestamp is the expected value for the timestamp. or -1, if
- * no checking should be performed
+ * no checking should be performed
*/
public synchronized boolean loadState(StateImpl state, long expectedTimestamp) throws IOException {
return readState(state, expectedTimestamp);
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateWriter.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateWriter.java
index 8d2d12bba..af183df49 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateWriter.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateWriter.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Rob Harrop - SpringSource Inc. (bug 247522)
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/UserState.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/UserState.java
index 988535293..0919cdbed 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/UserState.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/UserState.java
@@ -19,7 +19,7 @@ import org.eclipse.osgi.service.resolver.*;
import org.osgi.framework.BundleException;
/**
- * This implementation of State does a bookkeeping of all added/removed
+ * This implementation of State does a bookkeeping of all added/removed
*/
public class UserState extends StateImpl {
// TODO this is not an accurate way to record updates
@@ -43,7 +43,7 @@ public class UserState extends StateImpl {
}
/**
- * @throws BundleException
+ * @throws BundleException
*/
public StateDelta compare(State baseState) throws BundleException {
BundleDescription[] currentBundles = this.getBundles();
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/VersionConstraintImpl.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/VersionConstraintImpl.java
index 3fad96067..16de53159 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/VersionConstraintImpl.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/VersionConstraintImpl.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Danail Nachev - ProSyst - bug 218625
diff --git a/bundles/org.eclipse.osgi.tests/bundles_src/ext.framework.b/ext/framework/b/TestCondition.java b/bundles/org.eclipse.osgi.tests/bundles_src/ext.framework.b/ext/framework/b/TestCondition.java
index f114215c0..e7d356254 100644
--- a/bundles/org.eclipse.osgi.tests/bundles_src/ext.framework.b/ext/framework/b/TestCondition.java
+++ b/bundles/org.eclipse.osgi.tests/bundles_src/ext.framework.b/ext/framework/b/TestCondition.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/bundles_src/wrapper.hooks.a/org/eclipse/osgi/tests/wrapper/hooks/a/TestHookConfigurator.java b/bundles/org.eclipse.osgi.tests/bundles_src/wrapper.hooks.a/org/eclipse/osgi/tests/wrapper/hooks/a/TestHookConfigurator.java
index 9566e1de6..ad8a83f7c 100755
--- a/bundles/org.eclipse.osgi.tests/bundles_src/wrapper.hooks.a/org/eclipse/osgi/tests/wrapper/hooks/a/TestHookConfigurator.java
+++ b/bundles/org.eclipse.osgi.tests/bundles_src/wrapper.hooks.a/org/eclipse/osgi/tests/wrapper/hooks/a/TestHookConfigurator.java
@@ -57,7 +57,7 @@ public class TestHookConfigurator implements HookConfigurator {
}
/**
- * @throws IOException
+ * @throws IOException
*/
@Override
public InputStream getInputStream() throws IOException {
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/AllTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/AllTests.java
index 6cbe74473..5f95abd31 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/AllTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/AllTests.java
@@ -7,7 +7,7 @@ s This
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors: IBM Corporation - initial API and implementation
*******************************************************************************/
package org.eclipse.equinox.log.test;
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/ExtendedLogServiceTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/ExtendedLogServiceTest.java
index 08b8508ee..4e8c52268 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/ExtendedLogServiceTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/ExtendedLogServiceTest.java
@@ -7,7 +7,7 @@ s This
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors: IBM Corporation - initial API and implementation
*******************************************************************************/
package org.eclipse.equinox.log.test;
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogReaderServiceTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogReaderServiceTest.java
index ae1aba7ec..301d7aa33 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogReaderServiceTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogReaderServiceTest.java
@@ -7,7 +7,7 @@ s This
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors: IBM Corporation - initial API and implementation
*******************************************************************************/
package org.eclipse.equinox.log.test;
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogServiceTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogServiceTest.java
index e69d4903b..497cfbeb1 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogServiceTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogServiceTest.java
@@ -7,7 +7,7 @@ s This
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors: IBM Corporation - initial API and implementation
*******************************************************************************/
package org.eclipse.equinox.log.test;
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/TestListener2.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/TestListener2.java
index a18c4382a..dfd038b70 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/TestListener2.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/TestListener2.java
@@ -31,7 +31,7 @@ public class TestListener2 extends TestCase implements LogListener {
@Override
public void logged(LogEntry entry) {
- //logged is never called in parallel. Added a check to see if two threads are accessing the logged method at the same time.
+ //logged is never called in parallel. Added a check to see if two threads are accessing the logged method at the same time.
assertTrue(flag.compareAndSet(0, 1));
if (entry.getBundle().getSymbolicName().equals("org.eclipse.osgi")) {
list.add(entry.getMessage());
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/OSGiTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/OSGiTest.java
index 1010e09b9..0434180f8 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/OSGiTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/OSGiTest.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -30,7 +30,7 @@ public class OSGiTest extends CoreTest {
public OSGiTest(String name) {
super(name);
}
-
+
public BundleContext getContext() {
return OSGiTestsActivator.getContext();
}
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/OSGiTestsActivator.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/OSGiTestsActivator.java
index ce830c17b..8c8480702 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/OSGiTestsActivator.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/OSGiTestsActivator.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/AllTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/AllTests.java
index 7bb049cef..37a0e7283 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/AllTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/AllTests.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/ApplicationAdminTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/ApplicationAdminTest.java
index 3fc7203bc..b84b956df 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/ApplicationAdminTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/ApplicationAdminTest.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/ExitValueApp.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/ExitValueApp.java
index 545b18a69..e41b669d1 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/ExitValueApp.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/ExitValueApp.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/FailedApp.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/FailedApp.java
index 5553fa763..e86048c20 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/FailedApp.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/FailedApp.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/SimpleApp.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/SimpleApp.java
index 6ed8538d6..ca5a95a41 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/SimpleApp.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/SimpleApp.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/DiscardBundleTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/DiscardBundleTests.java
index 0908f9227..6821483fc 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/DiscardBundleTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/DiscardBundleTests.java
@@ -29,11 +29,11 @@ import org.osgi.framework.Constants;
import org.osgi.framework.FrameworkEvent;
/*
- * The framework must discard a persisted bundle when the
+ * The framework must discard a persisted bundle when the
* osgi.checkConfiguration configuration property is specified and equal to
* true.
- *
- * On a related note, if the osgi.dev configuration property is specified but
+ *
+ * On a related note, if the osgi.dev configuration property is specified but
* the osgi.checkConfiguration configuration property is not specified, the
* framework must specify the osgi.checkConfiguration configuration property
* with a value equal to true.
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/PersistedBundleTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/PersistedBundleTests.java
index eb40f940e..7c1289d29 100755
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/PersistedBundleTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/PersistedBundleTests.java
@@ -19,14 +19,14 @@ import junit.framework.TestSuite;
import org.eclipse.osgi.launch.Equinox;
/*
- * The framework must persist data according to the value of the
+ * The framework must persist data according to the value of the
* eclipse.stateSaveDelayInterval property. The value is of type long and
* represents the number of milliseconds between persists. A positive value
* represents the number of milliseconds between persists. A value of zero
* indicates data should be immediately persisted with each update. A negative
- * value disables persistence on update altogether (but data will still be
+ * value disables persistence on update altogether (but data will still be
* persisted on shutdown).
- *
+ *
*/
public class PersistedBundleTests extends AbstractBundleTests {
@@ -130,7 +130,7 @@ public class PersistedBundleTests extends AbstractBundleTests {
initAndStart(equinox2);
try {
// The bundle should not have been persisted and therefore be
- // unknown to the second equinox instance. This check must
+ // unknown to the second equinox instance. This check must
// happen before the first period elapses.
assertNull("Bundle exists", equinox2.getBundleContext().getBundle(getName()));
stopQuietly(equinox2);
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java
index 2a1f278be..c1c089deb 100755
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java
@@ -1225,7 +1225,7 @@ public class SystemBundleTests extends AbstractBundleTests {
assertNotNull("No manifest for: " + bundle, bundle.getEntry("/META-INF/MANIFEST.MF"));
}
} catch (Throwable t) {
- // An exception used to get thrown here when we tried to close
+ // An exception used to get thrown here when we tried to close
// the least used bundle file
fail("Failed to get bundle entries", t);
}
@@ -1593,7 +1593,7 @@ public class SystemBundleTests extends AbstractBundleTests {
bundle.getHeaders(); //$NON-NLS-1$
}
} catch (Throwable t) {
- // An exception used to get thrown here when we tried to close
+ // An exception used to get thrown here when we tried to close
// the least used bundle file
fail("Failed to get bundle entries", t);
}
@@ -1819,7 +1819,7 @@ public class SystemBundleTests extends AbstractBundleTests {
List packages1 = wiring1.getRequiredWires(BundleRevision.PACKAGE_NAMESPACE);
List packages2 = wiring2.getRequiredWires(BundleRevision.PACKAGE_NAMESPACE);
- // could make this a more complete check, but with the bug the dynamic wires
+ // could make this a more complete check, but with the bug the dynamic wires
// are missing altogether because we fail to save the resolver state cache.
assertEquals("Wrong number of wires for wiring1", 1, packages1.size());
assertEquals("Wrong number of wires for wiring2", 1, packages2.size());
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/AllTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/AllTests.java
index 763accadb..aa0e32981 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/AllTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/AllTests.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/EclipseStarterConfigIniTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/EclipseStarterConfigIniTest.java
index eff971fd9..9dad285dd 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/EclipseStarterConfigIniTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/EclipseStarterConfigIniTest.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/EclipseStarterConfigurationAreaTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/EclipseStarterConfigurationAreaTest.java
index ededca5ab..9ae34fe75 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/EclipseStarterConfigurationAreaTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/EclipseStarterConfigurationAreaTest.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/MovableConfigurationAreaTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/MovableConfigurationAreaTest.java
index 0e8eb97fa..4b7f8b3ae 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/MovableConfigurationAreaTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/MovableConfigurationAreaTest.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -96,7 +96,7 @@ public class MovableConfigurationAreaTest extends OSGiTest {
*/
public void testAfterMoving() throws MalformedURLException, IOException, BundleException {
// try to install plug-in
- // ensure it is not installed
+ // ensure it is not installed
Bundle installed = null;
try {
installed = BundleTestingHelper.installBundle(getContext(), OSGiTestsActivator.TEST_FILES_ROOT + "configuration/bundle02");
@@ -106,13 +106,13 @@ public class MovableConfigurationAreaTest extends OSGiTest {
// success
} finally {
if (installed != null)
- // clean-up - only runs if we end-up accepting an invalid manifest
+ // clean-up - only runs if we end-up accepting an invalid manifest
installed.uninstall();
}
}
public void testInitialization() throws MalformedURLException, IOException {
- // initialization session
+ // initialization session
try {
Bundle installed = BundleTestingHelper.installBundle("1.0", getContext(), OSGiTestsActivator.TEST_FILES_ROOT + "configuration/bundle01");
// not read-only yet, should work fine
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/ReadOnlyConfigurationAreaTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/ReadOnlyConfigurationAreaTest.java
index 778b956f2..ddd9a9b55 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/ReadOnlyConfigurationAreaTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/ReadOnlyConfigurationAreaTest.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -43,7 +43,7 @@ public class ReadOnlyConfigurationAreaTest extends OSGiTest {
}
public void test0thSession() throws MalformedURLException, IOException {
- // initialization session
+ // initialization session
try {
Bundle installed = BundleTestingHelper.installBundle("1.0", getContext(), OSGiTestsActivator.TEST_FILES_ROOT + "configuration/bundle01");
// not read-only yet, should work fine
@@ -83,7 +83,7 @@ public class ReadOnlyConfigurationAreaTest extends OSGiTest {
*/
public void test2ndSession() throws BundleException, IOException {
// try to install plug-in
- // ensure it is not installed
+ // ensure it is not installed
Bundle installed = null;
try {
installed = BundleTestingHelper.installBundle(getContext(), OSGiTestsActivator.TEST_FILES_ROOT + "configuration/bundle02");
@@ -93,7 +93,7 @@ public class ReadOnlyConfigurationAreaTest extends OSGiTest {
// success
} finally {
if (installed != null)
- // clean-up - only runs if we end-up accepting an invalid manifest
+ // clean-up - only runs if we end-up accepting an invalid manifest
installed.uninstall();
}
}
@@ -112,17 +112,17 @@ public class ReadOnlyConfigurationAreaTest extends OSGiTest {
*/
public void test3rdSession() throws BundleException, IOException {
// install plug-in
- // ensure it is not installed
+ // ensure it is not installed
Bundle installed = null;
try {
installed = BundleTestingHelper.installBundle(getContext(), OSGiTestsActivator.TEST_FILES_ROOT + "configuration/bundle03");
// should have failed - cannot install a bundle in read-only mode
fail("1.0");
} catch (BundleException be) {
- // success
+ // success
} finally {
if (installed != null)
- // clean-up - only runs if we end-up accepting an invalid manifest
+ // clean-up - only runs if we end-up accepting an invalid manifest
installed.uninstall();
}
}
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/AbstractTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/AbstractTest.java
index 061c86bc4..1835dd104 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/AbstractTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/AbstractTest.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/AllTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/AllTests.java
index 5ab001242..df5439bae 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/AllTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/AllTests.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/ResolutionReportTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/ResolutionReportTest.java
index 5bf087635..14e98c9d4 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/ResolutionReportTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/ResolutionReportTest.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/TestModuleContainer.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/TestModuleContainer.java
index 161841eaf..1d2739c90 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/TestModuleContainer.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/TestModuleContainer.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -984,7 +984,7 @@ public class TestModuleContainer extends AbstractTest {
Module f = installDummyModule("sub.f.MF", "f", container);
Module e = installDummyModule("sub.e.MF", "e", container);
- // resolve order does matter so that transitive dependencies are pulled in
+ // resolve order does matter so that transitive dependencies are pulled in
// and cause substitution to happen in a certain way
container.resolve(Arrays.asList(g, f, e), true);
@@ -1017,7 +1017,7 @@ public class TestModuleContainer extends AbstractTest {
installDummyModule("sub.j.MF", "j", container);
Module k = installDummyModule("sub.k.MF", "k", container);
- // resolve order does matter so that transitive dependencies are pulled in
+ // resolve order does matter so that transitive dependencies are pulled in
// and cause substitution to happen in a certain way
container.resolve(Arrays.asList(k), true);
@@ -1558,7 +1558,7 @@ public class TestModuleContainer extends AbstractTest {
// make sure h1 is not resolved
ModuleWiring h1Wiring = h1.getCurrentRevision().getWiring();
Assert.assertNull("h1 got resolved somehow.", h1Wiring);
- // do not resolve the host first; make sure it gets pulled in while attempting to resolve
+ // do not resolve the host first; make sure it gets pulled in while attempting to resolve
// to a fragment capability.
ModuleWire dynamicWire = container.resolveDynamic("f1.a", dynamic2.getCurrentRevision());
Assert.assertNotNull("Dynamic wire not found.", dynamicWire);
@@ -2178,13 +2178,13 @@ public class TestModuleContainer extends AbstractTest {
Map<String, String> nativeCodeManifest = new HashMap<>();
nativeCodeManifest.put(Constants.BUNDLE_MANIFESTVERSION, "2");
nativeCodeManifest.put(Constants.BUNDLE_SYMBOLICNAME, "importer");
- nativeCodeManifest.put(Constants.BUNDLE_NATIVECODE, //
+ nativeCodeManifest.put(Constants.BUNDLE_NATIVECODE, //
"/lib/mylib.dll; osname=\"win32\"; osname=\"Windows NT (unknown)\"," + //
"/lib/mylib.lib; osname=\"Linux\"");
Module nativeCodeModule = installDummyModule(nativeCodeManifest, "nativeCodeBundle", container);
- // unsatisfied optional and dynamic imports do not fail a resolve.
+ // unsatisfied optional and dynamic imports do not fail a resolve.
report = container.resolve(Arrays.asList(nativeCodeModule), true);
Assert.assertNull("Failed to resolve nativeCodeBundle.", report.getResolutionException());
}
@@ -2229,7 +2229,7 @@ public class TestModuleContainer extends AbstractTest {
optionalImporterManifest.put(Constants.DYNAMICIMPORT_PACKAGE, "exporter");
Module optionalImporterModule = installDummyModule(optionalImporterManifest, "optionalImporter", container);
- // unsatisfied optional and dynamic imports do not fail a resolve.
+ // unsatisfied optional and dynamic imports do not fail a resolve.
report = container.resolve(Arrays.asList(optionalImporterModule), true);
Assert.assertNull("Failed to resolve system.bundle.", report.getResolutionException());
@@ -2276,7 +2276,7 @@ public class TestModuleContainer extends AbstractTest {
optionalImporterManifest.put(Constants.DYNAMICIMPORT_PACKAGE, "exporter");
Module optionalImporterModule = installDummyModule(optionalImporterManifest, "optionalImporter", container);
- // unsatisfied optional and dynamic imports do not fail a resolve.
+ // unsatisfied optional and dynamic imports do not fail a resolve.
report = container.resolve(Arrays.asList(optionalImporterModule), true);
Assert.assertNull("Failed to resolve system.bundle.", report.getResolutionException());
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyCollisionHook.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyCollisionHook.java
index 2a5329ff2..fd53226fa 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyCollisionHook.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyCollisionHook.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyContainerAdaptor.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyContainerAdaptor.java
index 01b10aafa..e51114a07 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyContainerAdaptor.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyContainerAdaptor.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyDebugOptions.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyDebugOptions.java
index dc19465f8..68ed2efb8 100755
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyDebugOptions.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyDebugOptions.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyModule.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyModule.java
index c63cebd22..8e7e7de21 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyModule.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyModule.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyModuleDatabase.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyModuleDatabase.java
index faf66c737..d2fc71689 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyModuleDatabase.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyModuleDatabase.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummySystemModule.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummySystemModule.java
index 93cde3dd6..a6430ecac 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummySystemModule.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummySystemModule.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/UnresolvedProviderEntryBuilder.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/UnresolvedProviderEntryBuilder.java
index f58e2fdca..8529fb409 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/UnresolvedProviderEntryBuilder.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/UnresolvedProviderEntryBuilder.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/debugoptions/DebugOptionsTestCase.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/debugoptions/DebugOptionsTestCase.java
index e2af36bc5..79d66e0cd 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/debugoptions/DebugOptionsTestCase.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/debugoptions/DebugOptionsTestCase.java
@@ -98,7 +98,7 @@ public class DebugOptionsTestCase extends CoreTest {
* Test that a new {@link FrameworkDebugTraceEntry} object created without a trace class
* has 'org.eclipse.osgi.tests.debugoptions.DebugOptionsTestCase' as the class name and
* 'testTracingEntry01' as the method name that it determined as the caller of it.
- *
+ *
* This test mimics the tracing framework to ensure that the correct class name and method name
* are returned and written to the trace file.
*/
@@ -110,7 +110,7 @@ public class DebugOptionsTestCase extends CoreTest {
FrameworkDebugTraceEntry traceEntry = new FrameworkDebugTraceEntry(bundleName, optionPath, message, null);
String correctClassName = "org.eclipse.osgi.tests.debugoptions.DebugOptionsTestCase"; //$NON-NLS-1$
String correctMethodName = "testTracingEntry01"; //$NON-NLS-1$
- assertEquals("The class calling the trace API does not match the expected value.", correctClassName, traceEntry.getClassName()); //$NON-NLS-1$
+ assertEquals("The class calling the trace API does not match the expected value.", correctClassName, traceEntry.getClassName()); //$NON-NLS-1$
assertEquals("The method calling the trace API does not match the expected value.", correctMethodName, traceEntry.getMethodName()); //$NON-NLS-1$
}
@@ -118,7 +118,7 @@ public class DebugOptionsTestCase extends CoreTest {
* Test that a new {@link FrameworkDebugTraceEntry} object created with a trace class
* of 'org.eclipse.osgi.tests.debugoptions.DebugOptionsTestCase' has the correct class name and
* method name of the caller.
- *
+ *
* This test mimics the tracing framework to ensure that the correct class name and method name
* are returned and written to the trace file.
*/
@@ -127,7 +127,7 @@ public class DebugOptionsTestCase extends CoreTest {
String correctClassName = Runner1.class.getName();
String correctMethodName = "run"; //$NON-NLS-1$
FrameworkDebugTraceEntry traceEntry = new Runner1().run();
- assertEquals("The class calling the trace API does not match the expected value.", correctClassName, traceEntry.getClassName()); //$NON-NLS-1$
+ assertEquals("The class calling the trace API does not match the expected value.", correctClassName, traceEntry.getClassName()); //$NON-NLS-1$
assertEquals("The method calling the trace API does not match the expected value.", correctMethodName, traceEntry.getMethodName()); //$NON-NLS-1$
}
@@ -229,7 +229,7 @@ public class DebugOptionsTestCase extends CoreTest {
assertNull("Found bad value: " + listener.getIncorrectValue(), listener.getIncorrectValue()); //$NON-NLS-1$
listener.clear();
- checkValues.put(getName() + "/debug", null); //$NON-NLS-1$
+ checkValues.put(getName() + "/debug", null); //$NON-NLS-1$
listener.setCheckValues(checkValues);
debugOptions.setDebugEnabled(false);
assertFalse("Debug is enabled", debugOptions.isDebugEnabled()); //$NON-NLS-1$
@@ -560,7 +560,7 @@ public class DebugOptionsTestCase extends CoreTest {
expectedThrowableText1.append(exceptionMessage1);
expectedThrowableText1.append(DebugOptionsTestCase.LINE_SEPARATOR);
expectedThrowableText1.append(DebugOptionsTestCase.TAB_CHARACTER);
- expectedThrowableText1.append("at org.eclipse.osgi.tests.debugoptions.DebugOptionsTestCase.testVerboseDebugging(DebugOptionsTestCase.java:"); //$NON-NLS-1$
+ expectedThrowableText1.append("at org.eclipse.osgi.tests.debugoptions.DebugOptionsTestCase.testVerboseDebugging(DebugOptionsTestCase.java:"); //$NON-NLS-1$
if (!traceOutput[0].getThrowableText().startsWith(expectedThrowableText1.toString())) {
final StringBuilder errorMessage = new StringBuilder("The expected throwable text does not start with the actual throwable text."); //$NON-NLS-1$
errorMessage.append(DebugOptionsTestCase.LINE_SEPARATOR);
@@ -659,7 +659,7 @@ public class DebugOptionsTestCase extends CoreTest {
final String exceptionMessage2 = "An error 2"; //$NON-NLS-1$
final String exceptionMessage3 = "An error 3"; //$NON-NLS-1$
try {
- debugTrace.trace("/debug", "testing 1", new Exception(exceptionMessage1)); //$NON-NLS-1$ //$NON-NLS-2$
+ debugTrace.trace("/debug", "testing 1", new Exception(exceptionMessage1)); //$NON-NLS-1$ //$NON-NLS-2$
debugTrace.trace("/notset", "testing 2", new Exception(exceptionMessage2)); //$NON-NLS-1$ //$NON-NLS-2$
debugTrace.trace("/debug", "testing 3", new Exception(exceptionMessage3)); //$NON-NLS-1$ //$NON-NLS-2$
traceOutput = readTraceFile(traceFile); // Note: this call will also delete the trace file
@@ -671,7 +671,7 @@ public class DebugOptionsTestCase extends CoreTest {
expectedThrowableText1.append(exceptionMessage1);
expectedThrowableText1.append(DebugOptionsTestCase.LINE_SEPARATOR);
expectedThrowableText1.append(DebugOptionsTestCase.TAB_CHARACTER);
- expectedThrowableText1.append("at org.eclipse.osgi.tests.debugoptions.DebugOptionsTestCase.testTraceFile02(DebugOptionsTestCase.java:"); //$NON-NLS-1$
+ expectedThrowableText1.append("at org.eclipse.osgi.tests.debugoptions.DebugOptionsTestCase.testTraceFile02(DebugOptionsTestCase.java:"); //$NON-NLS-1$
assertEquals("Wrong number of trace entries", 2, traceOutput.length); //$NON-NLS-1$
assertEquals("Thread name is incorrect", Thread.currentThread().getName(), traceOutput[0].getThreadName()); //$NON-NLS-1$
@@ -706,7 +706,7 @@ public class DebugOptionsTestCase extends CoreTest {
expectedThrowableText2.append(exceptionMessage3);
expectedThrowableText2.append(DebugOptionsTestCase.LINE_SEPARATOR);
expectedThrowableText2.append(DebugOptionsTestCase.TAB_CHARACTER);
- expectedThrowableText2.append("at org.eclipse.osgi.tests.debugoptions.DebugOptionsTestCase.testTraceFile02(DebugOptionsTestCase.java:"); //$NON-NLS-1$
+ expectedThrowableText2.append("at org.eclipse.osgi.tests.debugoptions.DebugOptionsTestCase.testTraceFile02(DebugOptionsTestCase.java:"); //$NON-NLS-1$
assertEquals("Thread name is incorrect", Thread.currentThread().getName(), traceOutput[1].getThreadName()); //$NON-NLS-1$
assertEquals("Bundle name is incorrect", getName(), traceOutput[1].getBundleSymbolicName()); //$NON-NLS-1$
@@ -1179,7 +1179,7 @@ public class DebugOptionsTestCase extends CoreTest {
/**
* The date and time when the trace occurred.
- *
+ *
*/
private final long timestamp;
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/eclipseadaptor/AllTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/eclipseadaptor/AllTests.java
index 9d7b9b935..f37b5beac 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/eclipseadaptor/AllTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/eclipseadaptor/AllTests.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/eclipseadaptor/EnvironmentInfoTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/eclipseadaptor/EnvironmentInfoTest.java
index a2f536833..a2eeadc45 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/eclipseadaptor/EnvironmentInfoTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/eclipseadaptor/EnvironmentInfoTest.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/eclipseadaptor/FilePathTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/eclipseadaptor/FilePathTest.java
index 332701e67..9e105d6e2 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/eclipseadaptor/FilePathTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/eclipseadaptor/FilePathTest.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -42,7 +42,7 @@ public class FilePathTest extends OSGiTest {
assertEquals("3.2", "a", segments[1]);
return;
}
- // this runs on non-Windows platforms
+ // this runs on non-Windows platforms
assertTrue("1.0", path.isAbsolute());
assertNull("2.0", path.getDevice());
String[] segments = path.getSegments();
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/AllFrameworkHookTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/AllFrameworkHookTests.java
index d86f3efd9..dc6c57004 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/AllFrameworkHookTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/AllFrameworkHookTests.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/StorageHookTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/StorageHookTests.java
index 15d5b49c9..49677072a 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/StorageHookTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/StorageHookTests.java
@@ -56,7 +56,7 @@ public class StorageHookTests extends AbstractFrameworkHookTests {
private String location;
/*
- * Bundles must be discarded if a storage hook throws an
+ * Bundles must be discarded if a storage hook throws an
* IllegalStateException during validation.
*/
public void testBundleDiscardedWhenClasspathStorageHookInvalidates() throws Exception {
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/internal/plugins/InstallTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/internal/plugins/InstallTests.java
index aba0f318c..8fb4483b3 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/internal/plugins/InstallTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/internal/plugins/InstallTests.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -51,7 +51,7 @@ public class InstallTests extends CoreTest {
fail("1.0"); //$NON-NLS-1$
} finally {
if (installed != null)
- // clean-up - only runs if we end-up accepting an invalid manifest
+ // clean-up - only runs if we end-up accepting an invalid manifest
installed.uninstall();
}
}
@@ -70,7 +70,7 @@ public class InstallTests extends CoreTest {
assertEquals("Expected manifest error", BundleException.MANIFEST_ERROR, be.getType()); //$NON-NLS-1$
} finally {
if (installed != null)
- // clean-up - only runs if we end-up accepting an invalid manifest
+ // clean-up - only runs if we end-up accepting an invalid manifest
installed.uninstall();
}
}
@@ -89,7 +89,7 @@ public class InstallTests extends CoreTest {
assertEquals("Expected manifest error", BundleException.MANIFEST_ERROR, be.getType()); //$NON-NLS-1$
} finally {
if (installed != null)
- // clean-up - only runs if we end-up accepting an invalid manifest
+ // clean-up - only runs if we end-up accepting an invalid manifest
installed.uninstall();
}
}
@@ -108,7 +108,7 @@ public class InstallTests extends CoreTest {
assertEquals("Expected manifest error", BundleException.MANIFEST_ERROR, be.getType()); //$NON-NLS-1$
} finally {
if (installed != null)
- // clean-up - only runs if we end-up accepting an invalid manifest
+ // clean-up - only runs if we end-up accepting an invalid manifest
installed.uninstall();
}
}
@@ -127,7 +127,7 @@ public class InstallTests extends CoreTest {
assertEquals("Expected manifest error", BundleException.MANIFEST_ERROR, be.getType()); //$NON-NLS-1$
} finally {
if (installed != null)
- // clean-up - only runs if we end-up accepting an invalid manifest
+ // clean-up - only runs if we end-up accepting an invalid manifest
installed.uninstall();
}
}
@@ -156,7 +156,7 @@ public class InstallTests extends CoreTest {
} finally {
if (installed != null)
- // clean-up - only runs if we end-up accepting an invalid manifest
+ // clean-up - only runs if we end-up accepting an invalid manifest
installed.uninstall();
}
}
@@ -213,7 +213,7 @@ public class InstallTests extends CoreTest {
assertEquals("Expected unsupported error", BundleException.UNSUPPORTED_OPERATION, be.getType()); //$NON-NLS-1$
} finally {
if (installed != null)
- // clean-up - only runs if we end-up accepting an invalid manifest
+ // clean-up - only runs if we end-up accepting an invalid manifest
installed.uninstall();
}
}
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/listeners/ExceptionHandlerTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/listeners/ExceptionHandlerTests.java
index 157f8304e..8ca3854ff 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/listeners/ExceptionHandlerTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/listeners/ExceptionHandlerTests.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -23,20 +23,20 @@ import org.osgi.framework.*;
public class ExceptionHandlerTests extends TestCase {
//These tests exercise the code change for bug 73111.
-
+
class FrameworkEventListenerWithResult implements FrameworkListener {
FrameworkEvent event = null;
-
+
public synchronized void frameworkEvent(FrameworkEvent newEvent) {
if (newEvent.getType() != FrameworkEvent.ERROR)
return;
-
+
if (this.event != null)
return;
event = newEvent;
notify();
}
-
+
public synchronized FrameworkEvent getResult(long timeout) {
if (event != null) {
FrameworkEvent tmp = event;
@@ -53,13 +53,13 @@ public class ExceptionHandlerTests extends TestCase {
}
}
-
+
protected void setUp() throws Exception {
super.setUp();
}
-
-
- public void testNonFatalException() {
+
+
+ public void testNonFatalException() {
FrameworkEventListenerWithResult fwkListener = new FrameworkEventListenerWithResult();
OSGiTestsActivator.getContext().addFrameworkListener(fwkListener);
@@ -67,9 +67,9 @@ public class ExceptionHandlerTests extends TestCase {
public void bundleChanged(BundleEvent event) {
throw new NullPointerException("Generated exception");
}
- };
+ };
OSGiTestsActivator.getContext().addBundleListener(npeGenerator);
-
+
try {
BundleTestingHelper.installBundle(OSGiTestsActivator.getContext(), OSGiTestsActivator.TEST_FILES_ROOT + "internal/plugins/installTests/bundle09");
FrameworkEvent eventReceived = fwkListener.getResult(60000);
@@ -85,9 +85,9 @@ public class ExceptionHandlerTests extends TestCase {
OSGiTestsActivator.getContext().removeFrameworkListener(fwkListener);
OSGiTestsActivator.getContext().removeBundleListener(npeGenerator);
}
-
-
- public void testFatalException() {
+
+
+ public void testFatalException() {
FrameworkEventListenerWithResult fwkListener = new FrameworkEventListenerWithResult();
OSGiTestsActivator.getContext().addFrameworkListener(fwkListener);
@@ -97,8 +97,8 @@ public class ExceptionHandlerTests extends TestCase {
}
};
OSGiTestsActivator.getContext().addBundleListener(fatalException);
-
-
+
+
try {
System.setProperty("eclipse.exitOnError","false"); //Here we set the value to false, because otherwise we would simply exit
BundleTestingHelper.installBundle(OSGiTestsActivator.getContext(), OSGiTestsActivator.TEST_FILES_ROOT + "internal/plugins/installTests/bundle10");
@@ -116,5 +116,5 @@ public class ExceptionHandlerTests extends TestCase {
OSGiTestsActivator.getContext().removeFrameworkListener(fwkListener);
OSGiTestsActivator.getContext().removeBundleListener(fatalException);
}
-
+
} \ No newline at end of file
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/AllTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/AllTests.java
index 628d2ab20..bf83368f8 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/AllTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/AllTests.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/BasePerformanceTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/BasePerformanceTest.java
index 9e096165c..1ba65b2a9 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/BasePerformanceTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/BasePerformanceTest.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/CaseMapPerformanceTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/CaseMapPerformanceTest.java
index 378be6498..eb798a9ba 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/CaseMapPerformanceTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/CaseMapPerformanceTest.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/StatePerformanceTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/StatePerformanceTest.java
index 5675064a0..8b25576c9 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/StatePerformanceTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/StatePerformanceTest.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/StateUsesPerformanceTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/StateUsesPerformanceTest.java
index 799f36109..6da9d9a44 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/StateUsesPerformanceTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/StateUsesPerformanceTest.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestAttributes_001.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestAttributes_001.java
index 64059a48c..843296662 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestAttributes_001.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestAttributes_001.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestBSN_001.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestBSN_001.java
index 4057e05b2..680566a54 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestBSN_001.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestBSN_001.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_001.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_001.java
index b65a5fdd9..bb23bb294 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_001.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_001.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_002.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_002.java
index 1426390e4..0c4e54ada 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_002.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_002.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_003.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_003.java
index 7f47d3a2f..00aad6c06 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_003.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_003.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_004.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_004.java
index ebdb45b59..11fab2276 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_004.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_004.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_005.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_005.java
index 3d5e1f8b7..c3235594f 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_005.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_005.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_006.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_006.java
index c6cb09612..42567868a 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_006.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_006.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -29,7 +29,7 @@ public class TestCycle_006 extends AbstractStateTest {
BundleDescription bundle_2 = null;
BundleDescription bundle_3 = null;
-
+
public void testTest_003() {
State state = buildEmptyState();
StateObjectFactory sof = StateObjectFactory.defaultFactory;
@@ -54,7 +54,7 @@ public class TestCycle_006 extends AbstractStateTest {
checkWiring_a();
} // end of method
-
+
public void checkWiringState_1() {
} // end method
@@ -71,7 +71,7 @@ public class TestCycle_006 extends AbstractStateTest {
checkWiringState_3();
} // end method
-
+
public void addBundlesToState_a(State state) {
boolean added = false;
added = state.addBundle(bundle_1);
@@ -82,14 +82,14 @@ public class TestCycle_006 extends AbstractStateTest {
assertTrue("failed to add bundle ", added);
} // end method
-
+
public void checkBundlesResolved_a() {
assertTrue("unexpected bundle resolution state", !bundle_1.isResolved());
assertTrue("unexpected bundle resolution state", !bundle_2.isResolved());
assertTrue("unexpected bundle resolution state", bundle_3.isResolved());
} // end method
-
+
public BundleDescription create_bundle_1(StateObjectFactory sof) {
java.util.Dictionary dictionary_1 = new java.util.Properties();
BundleDescription bundle = null;
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_001.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_001.java
index f1b737091..c71e611d6 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_001.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_001.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -29,7 +29,7 @@ public class TestDynamic_001 extends AbstractStateTest {
BundleDescription bundle_1 = null;
BundleDescription bundle_2 = null;
-
+
public void testTest_001() {
State state = buildEmptyState();
StateObjectFactory sof = StateObjectFactory.defaultFactory;
@@ -56,23 +56,23 @@ public class TestDynamic_001 extends AbstractStateTest {
ExportPackageDescription exp = state.linkDynamicImport(bundle_1, "p");
assertNotNull("Package [p] is not wired when it should be ", exp);
assertEquals("Package [p] is wired incorrectly ", exp.getExporter(), bundle_2);
-
+
} // end of method
-
+
public void checkWiringState_1() {
} // end method
public void checkWiringState_2() {
} // end method
-
+
public void checkWiring_a() {
checkWiringState_1();
checkWiringState_2();
} // end method
-
+
public void addBundlesToState_a(State state) {
boolean added = false;
added = state.addBundle(bundle_1);
@@ -81,13 +81,13 @@ public class TestDynamic_001 extends AbstractStateTest {
assertTrue("failed to add bundle ", added);
} // end method
-
+
public void checkBundlesResolved_a() {
assertTrue("unexpected bundle resolution state", bundle_1.isResolved());
assertTrue("unexpected bundle resolution state", bundle_2.isResolved());
} // end method
-
+
public BundleDescription create_bundle_1(StateObjectFactory sof) {
java.util.Dictionary dictionary_1 = new java.util.Properties();
BundleDescription bundle = null;
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_002.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_002.java
index 842593b84..7102c2149 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_002.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_002.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -30,7 +30,7 @@ public class TestDynamic_002 extends AbstractStateTest {
BundleDescription bundle_2 = null;
BundleDescription bundle_3 = null;
-
+
public void testTest_002() {
State state = buildEmptyState();
StateObjectFactory sof = StateObjectFactory.defaultFactory;
@@ -53,14 +53,14 @@ public class TestDynamic_002 extends AbstractStateTest {
}
checkBundlesResolved_a();
checkWiring_a();
-
+
// Dynamics
ExportPackageDescription exp = state.linkDynamicImport(bundle_1, "r");
assertNull("Package [r] is wired when it should not be ", exp);
-
+
} // end of method
-
+
public void checkWiringState_1() {
ExportPackageDescription[] exports = bundle_1.getResolvedImports();
assertNotNull("export array is unexpectedly null", exports);
@@ -83,7 +83,7 @@ public class TestDynamic_002 extends AbstractStateTest {
public void checkWiringState_3() {
} // end method
-
+
public void checkWiring_a() {
checkWiringState_1();
@@ -91,7 +91,7 @@ public class TestDynamic_002 extends AbstractStateTest {
checkWiringState_3();
} // end method
-
+
public void addBundlesToState_a(State state) {
boolean added = false;
added = state.addBundle(bundle_1);
@@ -102,14 +102,14 @@ public class TestDynamic_002 extends AbstractStateTest {
assertTrue("failed to add bundle ", added);
} // end method
-
+
public void checkBundlesResolved_a() {
assertTrue("unexpected bundle resolution state", bundle_1.isResolved());
assertTrue("unexpected bundle resolution state", bundle_2.isResolved());
assertTrue("unexpected bundle resolution state", bundle_3.isResolved());
} // end method
-
+
public BundleDescription create_bundle_1(StateObjectFactory sof) {
java.util.Dictionary dictionary_1 = new java.util.Properties();
BundleDescription bundle = null;
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_003.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_003.java
index 2accc37f6..b9ecc0eb7 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_003.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_003.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -30,7 +30,7 @@ public class TestDynamic_003 extends AbstractStateTest {
BundleDescription bundle_2 = null;
BundleDescription bundle_3 = null;
-
+
public void testTest_003() {
State state = buildEmptyState();
StateObjectFactory sof = StateObjectFactory.defaultFactory;
@@ -53,15 +53,15 @@ public class TestDynamic_003 extends AbstractStateTest {
}
checkBundlesResolved_a();
checkWiring_a();
-
+
// Dynamics
ExportPackageDescription exp = state.linkDynamicImport(bundle_1, "r");
assertNotNull("Package [r] is not wired when it should be ", exp);
assertEquals("Package [r] is wired incorrectly ", exp.getExporter(), bundle_3);
-
+
} // end of method
-
+
public void checkWiringState_1() {
ExportPackageDescription[] exports = bundle_1.getResolvedImports();
assertNotNull("export array is unexpectedly null", exports);
@@ -84,7 +84,7 @@ public class TestDynamic_003 extends AbstractStateTest {
public void checkWiringState_3() {
} // end method
-
+
public void checkWiring_a() {
checkWiringState_1();
@@ -92,7 +92,7 @@ public class TestDynamic_003 extends AbstractStateTest {
checkWiringState_3();
} // end method
-
+
public void addBundlesToState_a(State state) {
boolean added = false;
added = state.addBundle(bundle_1);
@@ -103,14 +103,14 @@ public class TestDynamic_003 extends AbstractStateTest {
assertTrue("failed to add bundle ", added);
} // end method
-
+
public void checkBundlesResolved_a() {
assertTrue("unexpected bundle resolution state", bundle_1.isResolved());
assertTrue("unexpected bundle resolution state", bundle_2.isResolved());
assertTrue("unexpected bundle resolution state", bundle_3.isResolved());
} // end method
-
+
public BundleDescription create_bundle_1(StateObjectFactory sof) {
java.util.Dictionary dictionary_1 = new java.util.Properties();
BundleDescription bundle = null;
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_004.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_004.java
index a6ebf7147..9a13a526e 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_004.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_004.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -31,7 +31,7 @@ public class TestDynamic_004 extends AbstractStateTest {
BundleDescription bundle_3 = null;
BundleDescription bundle_4 = null;
-
+
public void testTest_003() {
State state = buildEmptyState();
StateObjectFactory sof = StateObjectFactory.defaultFactory;
@@ -55,15 +55,15 @@ public class TestDynamic_004 extends AbstractStateTest {
}
checkBundlesResolved_a();
checkWiring_a();
-
+
// Dynamics
ExportPackageDescription exp = state.linkDynamicImport(bundle_1, "q");
assertNotNull("Package [q] is not wired when it should be ", exp);
assertEquals("Package [q] is wired incorrectly ", exp.getExporter(), bundle_3);
-
+
} // end of method
-
+
public void checkWiringState_1() {
ExportPackageDescription[] exports = bundle_1.getResolvedImports();
assertNotNull("export array is unexpectedly null", exports);
@@ -98,7 +98,7 @@ public class TestDynamic_004 extends AbstractStateTest {
public void checkWiringState_4() {
} // end method
-
+
public void checkWiring_a() {
checkWiringState_1();
checkWiringState_2();
@@ -106,7 +106,7 @@ public class TestDynamic_004 extends AbstractStateTest {
checkWiringState_4();
} // end method
-
+
public void addBundlesToState_a(State state) {
boolean added = false;
added = state.addBundle(bundle_1);
@@ -119,7 +119,7 @@ public class TestDynamic_004 extends AbstractStateTest {
assertTrue("failed to add bundle ", added);
} // end method
-
+
public void checkBundlesResolved_a() {
assertTrue("unexpected bundle resolution state", bundle_1.isResolved());
assertTrue("unexpected bundle resolution state", bundle_2.isResolved());
@@ -127,7 +127,7 @@ public class TestDynamic_004 extends AbstractStateTest {
assertTrue("unexpected bundle resolution state", bundle_4.isResolved());
} // end method
-
+
public BundleDescription create_bundle_1(StateObjectFactory sof) {
java.util.Dictionary dictionary_1 = new java.util.Properties();
BundleDescription bundle = null;
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_005.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_005.java
index 1c3a877c6..82d8f1468 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_005.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_005.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -30,7 +30,7 @@ public class TestDynamic_005 extends AbstractStateTest {
BundleDescription bundle_2 = null;
BundleDescription bundle_3 = null;
-
+
public void testTest_005() {
State state = buildEmptyState();
StateObjectFactory sof = StateObjectFactory.defaultFactory;
@@ -53,15 +53,15 @@ public class TestDynamic_005 extends AbstractStateTest {
}
checkBundlesResolved_a();
checkWiring_a();
-
+
// Dynamics
ExportPackageDescription exp = state.linkDynamicImport(bundle_1, "q");
assertNotNull("Package [q] is not wired when it should be ", exp);
assertEquals("Package [q] is wired incorrectly ", exp.getExporter(), bundle_3);
-
+
} // end of method
-
+
public void checkWiringState_1() {
} // end method
@@ -71,14 +71,14 @@ public class TestDynamic_005 extends AbstractStateTest {
public void checkWiringState_3() {
} // end method
-
+
public void checkWiring_a() {
checkWiringState_1();
checkWiringState_2();
checkWiringState_3();
} // end method
-
+
public void addBundlesToState_a(State state) {
boolean added = false;
added = state.addBundle(bundle_1);
@@ -89,14 +89,14 @@ public class TestDynamic_005 extends AbstractStateTest {
assertTrue("failed to add bundle ", added);
} // end method
-
+
public void checkBundlesResolved_a() {
assertTrue("unexpected bundle resolution state", bundle_1.isResolved());
assertTrue("unexpected bundle resolution state", bundle_2.isResolved());
assertTrue("unexpected bundle resolution state", bundle_3.isResolved());
} // end method
-
+
public BundleDescription create_bundle_1(StateObjectFactory sof) {
java.util.Dictionary dictionary_1 = new java.util.Properties();
BundleDescription bundle = null;
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_006.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_006.java
index 79449bcde..0f8a52af9 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_006.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_006.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -30,11 +30,11 @@ public class TestDynamic_006 extends AbstractStateTest {
BundleDescription bundle_2 = null;
BundleDescription bundle_3 = null;
-
+
public void testTest_005() {
State state = buildEmptyState();
StateObjectFactory sof = StateObjectFactory.defaultFactory;
-
+
bundle_1 = create_bundle_1(sof);
bundle_2 = create_bundle_2(sof);
bundle_3 = create_bundle_3(sof);
@@ -53,15 +53,15 @@ public class TestDynamic_006 extends AbstractStateTest {
}
checkBundlesResolved_a();
checkWiring_a();
-
+
// Dynamics
ExportPackageDescription exp = state.linkDynamicImport(bundle_1, "p.b");
assertNotNull("Package [p.b] is not wired when it should be ", exp);
assertEquals("Package [p.b] is wired incorrectly ", exp.getExporter(), bundle_3);
-
+
} // end of method
-
+
public void checkWiringState_1() {
} // end method
@@ -71,14 +71,14 @@ public class TestDynamic_006 extends AbstractStateTest {
public void checkWiringState_3() {
} // end method
-
+
public void checkWiring_a() {
checkWiringState_1();
checkWiringState_2();
checkWiringState_3();
} // end method
-
+
public void addBundlesToState_a(State state) {
boolean added = false;
added = state.addBundle(bundle_1);
@@ -89,14 +89,14 @@ public class TestDynamic_006 extends AbstractStateTest {
assertTrue("failed to add bundle ", added);
} // end method
-
+
public void checkBundlesResolved_a() {
assertTrue("unexpected bundle resolution state", bundle_1.isResolved());
assertTrue("unexpected bundle resolution state", bundle_2.isResolved());
assertTrue("unexpected bundle resolution state", bundle_3.isResolved());
} // end method
-
+
public BundleDescription create_bundle_1(StateObjectFactory sof) {
java.util.Dictionary dictionary_1 = new java.util.Properties();
BundleDescription bundle = null;
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGenerated_001.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGenerated_001.java
index 9b90fb7d5..0fbf39c0a 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGenerated_001.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGenerated_001.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_001.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_001.java
index 51a804a7d..5414ba6d2 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_001.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_001.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -30,7 +30,7 @@ public class TestGrouping_001 extends AbstractStateTest {
BundleDescription bundle_2 = null;
BundleDescription bundle_3 = null;
-
+
public void testTest_001() {
State state = buildEmptyState();
StateObjectFactory sof = StateObjectFactory.defaultFactory;
@@ -55,7 +55,7 @@ public class TestGrouping_001 extends AbstractStateTest {
checkWiring_a();
} // end of method
-
+
public void checkWiringState_1() {
ExportPackageDescription[] exports = bundle_1.getResolvedImports();
assertNotNull("export array is unexpectedly null", exports);
@@ -86,7 +86,7 @@ public class TestGrouping_001 extends AbstractStateTest {
checkWiringState_3();
} // end method
-
+
public void addBundlesToState_a(State state) {
boolean added = false;
added = state.addBundle(bundle_1);
@@ -97,14 +97,14 @@ public class TestGrouping_001 extends AbstractStateTest {
assertTrue("failed to add bundle ", added);
} // end method
-
+
public void checkBundlesResolved_a() {
assertTrue("unexpected bundle resolution state", bundle_1.isResolved());
assertTrue("unexpected bundle resolution state", bundle_2.isResolved());
assertTrue("unexpected bundle resolution state", bundle_3.isResolved());
} // end method
-
+
public BundleDescription create_bundle_1(StateObjectFactory sof) {
java.util.Dictionary dictionary_1 = new java.util.Properties();
BundleDescription bundle = null;
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_002.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_002.java
index 1767488c2..0a2b0636b 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_002.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_002.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -29,7 +29,7 @@ public class TestGrouping_002 extends AbstractStateTest {
BundleDescription bundle_2 = null;
BundleDescription bundle_3 = null;
-
+
public void testTest_002() {
State state = buildEmptyState();
StateObjectFactory sof = StateObjectFactory.defaultFactory;
@@ -54,7 +54,7 @@ public class TestGrouping_002 extends AbstractStateTest {
checkWiring_a();
} // end of method
-
+
public void checkWiringState_1() {
} // end method
@@ -71,7 +71,7 @@ public class TestGrouping_002 extends AbstractStateTest {
checkWiringState_3();
} // end method
-
+
public void addBundlesToState_a(State state) {
boolean added = false;
added = state.addBundle(bundle_1);
@@ -82,14 +82,14 @@ public class TestGrouping_002 extends AbstractStateTest {
assertTrue("failed to add bundle ", added);
} // end method
-
+
public void checkBundlesResolved_a() {
assertTrue("unexpected bundle resolution state", !bundle_1.isResolved());
assertTrue("unexpected bundle resolution state", bundle_2.isResolved());
assertTrue("unexpected bundle resolution state", bundle_3.isResolved());
} // end method
-
+
public BundleDescription create_bundle_1(StateObjectFactory sof) {
java.util.Dictionary dictionary_1 = new java.util.Properties();
BundleDescription bundle = null;
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_003.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_003.java
index 053ff320b..d22487cb0 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_003.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_003.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -32,7 +32,7 @@ public class TestGrouping_003 extends AbstractStateTest {
BundleDescription bundle_4 = null;
BundleDescription bundle_5 = null;
-
+
public void testTest_003() {
State state = buildEmptyState();
StateObjectFactory sof = StateObjectFactory.defaultFactory;
@@ -59,7 +59,7 @@ public class TestGrouping_003 extends AbstractStateTest {
checkWiring_a();
} // end of method
-
+
public void checkWiringState_1() {
ExportPackageDescription[] exports = bundle_1.getResolvedImports();
assertNotNull("export array is unexpectedly null", exports);
@@ -102,7 +102,7 @@ public class TestGrouping_003 extends AbstractStateTest {
public void checkWiringState_5() {
} // end method
-
+
public void checkWiring_a() {
checkWiringState_1();
@@ -112,7 +112,7 @@ public class TestGrouping_003 extends AbstractStateTest {
checkWiringState_5();
} // end method
-
+
public void addBundlesToState_a(State state) {
boolean added = false;
added = state.addBundle(bundle_1);
@@ -127,7 +127,7 @@ public class TestGrouping_003 extends AbstractStateTest {
assertTrue("failed to add bundle ", added);
} // end method
-
+
public void checkBundlesResolved_a() {
assertTrue("unexpected bundle resolution state", bundle_1.isResolved());
assertTrue("unexpected bundle resolution state", bundle_2.isResolved());
@@ -136,7 +136,7 @@ public class TestGrouping_003 extends AbstractStateTest {
assertTrue("unexpected bundle resolution state", bundle_5.isResolved());
} // end method
-
+
public BundleDescription create_bundle_1(StateObjectFactory sof) {
java.util.Dictionary dictionary_1 = new java.util.Properties();
BundleDescription bundle = null;
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_006.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_006.java
index 2861ad3f4..fb3aee63d 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_006.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_006.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -29,7 +29,7 @@ public class TestGrouping_006 extends AbstractStateTest {
BundleDescription bundle_2 = null;
BundleDescription bundle_3 = null;
-
+
public void testTest_001() {
State state = buildEmptyState();
StateObjectFactory sof = StateObjectFactory.defaultFactory;
@@ -54,7 +54,7 @@ public class TestGrouping_006 extends AbstractStateTest {
checkWiring_a();
} // end of method
-
+
public void checkWiringState_1() {
} // end method
@@ -71,7 +71,7 @@ public class TestGrouping_006 extends AbstractStateTest {
checkWiringState_3();
} // end method
-
+
public void addBundlesToState_a(State state) {
boolean added = false;
added = state.addBundle(bundle_1);
@@ -82,14 +82,14 @@ public class TestGrouping_006 extends AbstractStateTest {
assertTrue("failed to add bundle ", added);
} // end method
-
+
public void checkBundlesResolved_a() {
assertTrue("unexpected bundle resolution state", !bundle_1.isResolved());
assertTrue("unexpected bundle resolution state", bundle_2.isResolved());
assertTrue("unexpected bundle resolution state", bundle_3.isResolved());
} // end method
-
+
public BundleDescription create_bundle_1(StateObjectFactory sof) {
java.util.Dictionary dictionary_1 = new java.util.Properties();
BundleDescription bundle = null;
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_008.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_008.java
index 26cf3494b..08879aa8e 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_008.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_008.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -30,7 +30,7 @@ public class TestGrouping_008 extends AbstractStateTest {
BundleDescription bundle_2 = null;
BundleDescription bundle_3 = null;
-
+
public void testTest_008() {
State state = buildEmptyState();
StateObjectFactory sof = StateObjectFactory.defaultFactory;
@@ -55,7 +55,7 @@ public class TestGrouping_008 extends AbstractStateTest {
checkWiring_a();
} // end of method
-
+
public void checkWiringState_1() {
BundleDescription[] requires = bundle_1.getResolvedRequires();
assertNotNull("requires array is unexpectedly null", requires);
@@ -87,7 +87,7 @@ public class TestGrouping_008 extends AbstractStateTest {
public void checkWiringState_3() {
} // end method
-
+
public void checkWiring_a() {
checkWiringState_1();
@@ -95,7 +95,7 @@ public class TestGrouping_008 extends AbstractStateTest {
checkWiringState_3();
} // end method
-
+
public void addBundlesToState_a(State state) {
boolean added = false;
added = state.addBundle(bundle_1);
@@ -106,14 +106,14 @@ public class TestGrouping_008 extends AbstractStateTest {
assertTrue("failed to add bundle ", added);
} // end method
-
+
public void checkBundlesResolved_a() {
assertTrue("unexpected bundle resolution state", bundle_1.isResolved());
assertTrue("unexpected bundle resolution state", bundle_2.isResolved());
assertTrue("unexpected bundle resolution state", bundle_3.isResolved());
} // end method
-
+
public BundleDescription create_bundle_1(StateObjectFactory sof) {
java.util.Dictionary dictionary_1 = new java.util.Properties();
BundleDescription bundle = null;
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestOptional_001.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestOptional_001.java
index 68c1d853a..611d4f141 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestOptional_001.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestOptional_001.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -30,7 +30,7 @@ public class TestOptional_001 extends AbstractStateTest {
BundleDescription bundle_2 = null;
BundleDescription bundle_3 = null;
-
+
public void testTest_002() {
State state = buildEmptyState();
StateObjectFactory sof = StateObjectFactory.defaultFactory;
@@ -55,7 +55,7 @@ public class TestOptional_001 extends AbstractStateTest {
checkWiring_a();
} // end of method
-
+
public void checkWiringState_1() {
ExportPackageDescription[] exports = bundle_1.getResolvedImports();
assertNotNull("export array is unexpectedly null", exports);
@@ -88,7 +88,7 @@ public class TestOptional_001 extends AbstractStateTest {
checkWiringState_3();
} // end method
-
+
public void addBundlesToState_a(State state) {
boolean added = false;
added = state.addBundle(bundle_1);
@@ -99,14 +99,14 @@ public class TestOptional_001 extends AbstractStateTest {
assertTrue("failed to add bundle ", added);
} // end method
-
+
public void checkBundlesResolved_a() {
assertTrue("unexpected bundle resolution state", bundle_1.isResolved());
assertTrue("unexpected bundle resolution state", bundle_2.isResolved());
assertTrue("unexpected bundle resolution state", bundle_3.isResolved());
} // end method
-
+
public BundleDescription create_bundle_1(StateObjectFactory sof) {
java.util.Dictionary dictionary_1 = new java.util.Properties();
BundleDescription bundle = null;
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestOptional_002.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestOptional_002.java
index 536ced13c..68e1f4ea6 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestOptional_002.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestOptional_002.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -30,7 +30,7 @@ public class TestOptional_002 extends AbstractStateTest {
BundleDescription bundle_2 = null;
BundleDescription bundle_3 = null;
-
+
public void testTest_002() {
State state = buildEmptyState();
StateObjectFactory sof = StateObjectFactory.defaultFactory;
@@ -55,7 +55,7 @@ public class TestOptional_002 extends AbstractStateTest {
checkWiring_a();
} // end of method
-
+
public void checkWiringState_1() {
ExportPackageDescription[] exports = bundle_1.getResolvedImports();
assertNotNull("export array is unexpectedly null", exports);
@@ -88,7 +88,7 @@ public class TestOptional_002 extends AbstractStateTest {
checkWiringState_3();
} // end method
-
+
public void addBundlesToState_a(State state) {
boolean added = false;
added = state.addBundle(bundle_1);
@@ -99,14 +99,14 @@ public class TestOptional_002 extends AbstractStateTest {
assertTrue("failed to add bundle ", added);
} // end method
-
+
public void checkBundlesResolved_a() {
assertTrue("unexpected bundle resolution state", bundle_1.isResolved());
assertTrue("unexpected bundle resolution state", bundle_2.isResolved());
assertTrue("unexpected bundle resolution state", bundle_3.isResolved());
} // end method
-
+
public BundleDescription create_bundle_1(StateObjectFactory sof) {
java.util.Dictionary dictionary_1 = new java.util.Properties();
BundleDescription bundle = null;
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestPropagation_001.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestPropagation_001.java
index 10b24a77f..13558be6c 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestPropagation_001.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestPropagation_001.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -31,7 +31,7 @@ public class TestPropagation_001 extends AbstractStateTest {
BundleDescription bundle_3 = null;
BundleDescription bundle_4 = null;
-
+
public void testTest_001() {
State state = buildEmptyState();
StateObjectFactory sof = StateObjectFactory.defaultFactory;
@@ -57,7 +57,7 @@ public class TestPropagation_001 extends AbstractStateTest {
checkWiring_a();
} // end of method
-
+
public void checkWiringState_1() {
ExportPackageDescription[] exports = bundle_1.getResolvedImports();
assertNotNull("export array is unexpectedly null", exports);
@@ -103,7 +103,7 @@ public class TestPropagation_001 extends AbstractStateTest {
checkWiringState_4();
} // end method
-
+
public void addBundlesToState_a(State state) {
boolean added = false;
added = state.addBundle(bundle_1);
@@ -116,7 +116,7 @@ public class TestPropagation_001 extends AbstractStateTest {
assertTrue("failed to add bundle ", added);
} // end method
-
+
public void checkBundlesResolved_a() {
assertTrue("unexpected bundle resolution state", bundle_1.isResolved());
assertTrue("unexpected bundle resolution state", bundle_2.isResolved());
@@ -124,7 +124,7 @@ public class TestPropagation_001 extends AbstractStateTest {
assertTrue("unexpected bundle resolution state", bundle_4.isResolved());
} // end method
-
+
public BundleDescription create_bundle_1(StateObjectFactory sof) {
java.util.Dictionary dictionary_1 = new java.util.Properties();
BundleDescription bundle = null;
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestPropagation_003.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestPropagation_003.java
index 2c184e876..9b38077ce 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestPropagation_003.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestPropagation_003.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -31,7 +31,7 @@ public class TestPropagation_003 extends AbstractStateTest {
BundleDescription bundle_3 = null;
BundleDescription bundle_4 = null;
-
+
public void testTest_001() {
State state = buildEmptyState();
StateObjectFactory sof = StateObjectFactory.defaultFactory;
@@ -57,7 +57,7 @@ public class TestPropagation_003 extends AbstractStateTest {
checkWiring_a();
} // end of method
-
+
public void checkWiringState_1() {
} // end method
@@ -89,7 +89,7 @@ public class TestPropagation_003 extends AbstractStateTest {
checkWiringState_4();
} // end method
-
+
public void addBundlesToState_a(State state) {
boolean added = false;
added = state.addBundle(bundle_1);
@@ -102,7 +102,7 @@ public class TestPropagation_003 extends AbstractStateTest {
assertTrue("failed to add bundle ", added);
} // end method
-
+
public void checkBundlesResolved_a() {
assertTrue("unexpected bundle resolution state", !bundle_1.isResolved());
assertTrue("unexpected bundle resolution state", bundle_2.isResolved());
@@ -110,7 +110,7 @@ public class TestPropagation_003 extends AbstractStateTest {
assertTrue("unexpected bundle resolution state", bundle_4.isResolved());
} // end method
-
+
public BundleDescription create_bundle_1(StateObjectFactory sof) {
java.util.Dictionary dictionary_1 = new java.util.Properties();
BundleDescription bundle = null;
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_001.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_001.java
index 86d5dd125..1498cb38d 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_001.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_001.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -30,7 +30,7 @@ public class TestRFC79_001 extends AbstractStateTest {
BundleDescription bundle_2 = null;
BundleDescription bundle_3 = null;
-
+
public void testTest_001() {
State state = buildEmptyState();
StateObjectFactory sof = StateObjectFactory.defaultFactory;
@@ -55,7 +55,7 @@ public class TestRFC79_001 extends AbstractStateTest {
checkWiring_a();
} // end of method
-
+
public void checkWiringState_1() {
ExportPackageDescription[] exports = bundle_1.getResolvedImports();
assertNotNull("export array is unexpectedly null", exports);
@@ -105,7 +105,7 @@ public class TestRFC79_001 extends AbstractStateTest {
checkWiringState_3();
} // end method
-
+
public void addBundlesToState_a(State state) {
boolean added = false;
added = state.addBundle(bundle_1);
@@ -116,14 +116,14 @@ public class TestRFC79_001 extends AbstractStateTest {
assertTrue("failed to add bundle ", added);
} // end method
-
+
public void checkBundlesResolved_a() {
assertTrue("unexpected bundle resolution state", bundle_1.isResolved());
assertTrue("unexpected bundle resolution state", bundle_2.isResolved());
assertTrue("unexpected bundle resolution state", bundle_3.isResolved());
} // end method
-
+
public BundleDescription create_bundle_1(StateObjectFactory sof) {
java.util.Dictionary dictionary_1 = new java.util.Properties();
BundleDescription bundle = null;
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_002.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_002.java
index 9922c9f5a..c45da1b4b 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_002.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_002.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -32,7 +32,7 @@ public class TestRFC79_002 extends AbstractStateTest {
BundleDescription bundle_4 = null;
BundleDescription bundle_5 = null;
-
+
public void testTest_002() {
State state = buildEmptyState();
StateObjectFactory sof = StateObjectFactory.defaultFactory;
@@ -59,7 +59,7 @@ public class TestRFC79_002 extends AbstractStateTest {
checkWiring_a();
} // end of method
-
+
public void checkWiringState_1() {
ExportPackageDescription[] exports = bundle_1.getResolvedImports();
assertNotNull("export array is unexpectedly null", exports);
@@ -135,7 +135,7 @@ public class TestRFC79_002 extends AbstractStateTest {
}
} // end for
} // end method
-
+
public void checkWiring_a() {
checkWiringState_1();
@@ -145,7 +145,7 @@ public class TestRFC79_002 extends AbstractStateTest {
checkWiringState_5();
} // end method
-
+
public void addBundlesToState_a(State state) {
boolean added = false;
added = state.addBundle(bundle_1);
@@ -160,7 +160,7 @@ public class TestRFC79_002 extends AbstractStateTest {
assertTrue("failed to add bundle ", added);
} // end method
-
+
public void checkBundlesResolved_a() {
assertTrue("unexpected bundle resolution state", bundle_1.isResolved());
assertTrue("unexpected bundle resolution state", bundle_2.isResolved());
@@ -169,7 +169,7 @@ public class TestRFC79_002 extends AbstractStateTest {
assertTrue("unexpected bundle resolution state", bundle_5.isResolved());
} // end method
-
+
public BundleDescription create_bundle_1(StateObjectFactory sof) {
java.util.Dictionary dictionary_1 = new java.util.Properties();
BundleDescription bundle = null;
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_003.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_003.java
index bc7f55415..d116a1624 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_003.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_003.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -31,7 +31,7 @@ public class TestRFC79_003 extends AbstractStateTest {
BundleDescription bundle_3 = null;
BundleDescription bundle_4 = null;
-
+
public void testTest_003() {
State state = buildEmptyState();
StateObjectFactory sof = StateObjectFactory.defaultFactory;
@@ -57,7 +57,7 @@ public class TestRFC79_003 extends AbstractStateTest {
checkWiring_a();
} // end of method
-
+
public void checkWiringState_1() {
ExportPackageDescription[] exports = bundle_1.getResolvedImports();
assertNotNull("export array is unexpectedly null", exports);
@@ -120,7 +120,7 @@ public class TestRFC79_003 extends AbstractStateTest {
} // end for
} // end method
-
+
public void checkWiring_a() {
checkWiringState_1();
@@ -129,7 +129,7 @@ public class TestRFC79_003 extends AbstractStateTest {
checkWiringState_4();
} // end method
-
+
public void addBundlesToState_a(State state) {
boolean added = false;
added = state.addBundle(bundle_1);
@@ -142,7 +142,7 @@ public class TestRFC79_003 extends AbstractStateTest {
assertTrue("failed to add bundle ", added);
} // end method
-
+
public void checkBundlesResolved_a() {
assertTrue("unexpected bundle resolution state", bundle_1.isResolved());
assertTrue("unexpected bundle resolution state", bundle_2.isResolved());
@@ -150,7 +150,7 @@ public class TestRFC79_003 extends AbstractStateTest {
assertTrue("unexpected bundle resolution state", bundle_4.isResolved());
} // end method
-
+
public BundleDescription create_bundle_1(StateObjectFactory sof) {
java.util.Dictionary dictionary_1 = new java.util.Properties();
BundleDescription bundle = null;
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_004.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_004.java
index e53a8e6a4..b04b78319 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_004.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_004.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -31,7 +31,7 @@ public class TestRFC79_004 extends AbstractStateTest {
BundleDescription bundle_3 = null;
BundleDescription bundle_4 = null;
-
+
public void testTest_004() {
State state = buildEmptyState();
StateObjectFactory sof = StateObjectFactory.defaultFactory;
@@ -57,7 +57,7 @@ public class TestRFC79_004 extends AbstractStateTest {
checkWiring_a();
} // end of method
-
+
public void checkWiringState_1() {
ExportPackageDescription[] exports = bundle_1.getResolvedImports();
assertNotNull("export array is unexpectedly null", exports);
@@ -98,7 +98,7 @@ public class TestRFC79_004 extends AbstractStateTest {
public void checkWiringState_4() {
} // end method
-
+
public void checkWiring_a() {
checkWiringState_1();
@@ -107,7 +107,7 @@ public class TestRFC79_004 extends AbstractStateTest {
checkWiringState_4();
} // end method
-
+
public void addBundlesToState_a(State state) {
boolean added = false;
added = state.addBundle(bundle_1);
@@ -120,7 +120,7 @@ public class TestRFC79_004 extends AbstractStateTest {
assertTrue("failed to add bundle ", added);
} // end method
-
+
public void checkBundlesResolved_a() {
assertTrue("unexpected bundle resolution state", bundle_1.isResolved());
assertTrue("unexpected bundle resolution state", bundle_2.isResolved());
@@ -128,7 +128,7 @@ public class TestRFC79_004 extends AbstractStateTest {
assertTrue("unexpected bundle resolution state", bundle_4.isResolved());
} // end method
-
+
public BundleDescription create_bundle_1(StateObjectFactory sof) {
java.util.Dictionary dictionary_1 = new java.util.Properties();
BundleDescription bundle = null;
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_005.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_005.java
index e8bd44a6e..8a5bbad82 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_005.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_005.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -30,7 +30,7 @@ public class TestRFC79_005 extends AbstractStateTest {
BundleDescription bundle_2 = null;
BundleDescription bundle_3 = null;
-
+
public void testTest_005() {
State state = buildEmptyState();
StateObjectFactory sof = StateObjectFactory.defaultFactory;
@@ -55,7 +55,7 @@ public class TestRFC79_005 extends AbstractStateTest {
checkWiring_a();
} // end of method
-
+
public void checkWiringState_1() {
ExportPackageDescription[] exports = bundle_1.getResolvedImports();
assertNotNull("export array is unexpectedly null", exports);
@@ -86,7 +86,7 @@ public class TestRFC79_005 extends AbstractStateTest {
public void checkWiringState_3() {
} // end method
-
+
public void checkWiring_a() {
checkWiringState_1();
@@ -94,7 +94,7 @@ public class TestRFC79_005 extends AbstractStateTest {
checkWiringState_3();
} // end method
-
+
public void addBundlesToState_a(State state) {
boolean added = false;
added = state.addBundle(bundle_1);
@@ -105,14 +105,14 @@ public class TestRFC79_005 extends AbstractStateTest {
assertTrue("failed to add bundle ", added);
} // end method
-
+
public void checkBundlesResolved_a() {
assertTrue("unexpected bundle resolution state", bundle_1.isResolved());
assertTrue("unexpected bundle resolution state", bundle_2.isResolved());
assertTrue("unexpected bundle resolution state", !bundle_3.isResolved());
} // end method
-
+
public BundleDescription create_bundle_1(StateObjectFactory sof) {
java.util.Dictionary dictionary_1 = new java.util.Properties();
BundleDescription bundle = null;
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_006.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_006.java
index db803468e..6b2d9b0c5 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_006.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_006.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -33,7 +33,7 @@ public class TestRFC79_006 extends AbstractStateTest {
BundleDescription bundle_5 = null;
BundleDescription bundle_6 = null;
-
+
public void testTest_006() {
State state = buildEmptyState();
StateObjectFactory sof = StateObjectFactory.defaultFactory;
@@ -61,7 +61,7 @@ public class TestRFC79_006 extends AbstractStateTest {
checkWiring_a();
} // end of method
-
+
public void checkWiringState_1() {
ExportPackageDescription[] exports = bundle_1.getResolvedImports();
assertNotNull("export array is unexpectedly null", exports);
@@ -120,7 +120,7 @@ public class TestRFC79_006 extends AbstractStateTest {
checkWiringState_6();
} // end method
-
+
public void addBundlesToState_a(State state) {
boolean added = false;
added = state.addBundle(bundle_1);
@@ -137,7 +137,7 @@ public class TestRFC79_006 extends AbstractStateTest {
assertTrue("failed to add bundle ", added);
} // end method
-
+
public void checkBundlesResolved_a() {
assertTrue("unexpected bundle resolution state", bundle_1.isResolved());
assertTrue("unexpected bundle resolution state", !bundle_2.isResolved());
@@ -147,7 +147,7 @@ public class TestRFC79_006 extends AbstractStateTest {
assertTrue("unexpected bundle resolution state", bundle_6.isResolved());
} // end method
-
+
public BundleDescription create_bundle_1(StateObjectFactory sof) {
java.util.Dictionary dictionary_1 = new java.util.Properties();
BundleDescription bundle = null;
@@ -232,5 +232,5 @@ public class TestRFC79_006 extends AbstractStateTest {
}
return bundle;
} // end of method
-
+
} // end of testcase
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_007.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_007.java
index ee34e7d41..9fe9e5a81 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_007.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_007.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -32,7 +32,7 @@ public class TestRFC79_007 extends AbstractStateTest {
BundleDescription bundle_4 = null;
BundleDescription bundle_5 = null;
-
+
public void testTest_007() {
State state = buildEmptyState();
StateObjectFactory sof = StateObjectFactory.defaultFactory;
@@ -59,7 +59,7 @@ public class TestRFC79_007 extends AbstractStateTest {
checkWiring_a();
} // end of method
-
+
public void checkWiringState_1() {
ExportPackageDescription[] exports = bundle_1.getResolvedImports();
assertNotNull("export array is unexpectedly null", exports);
@@ -109,7 +109,7 @@ public class TestRFC79_007 extends AbstractStateTest {
checkWiringState_5();
} // end method
-
+
public void addBundlesToState_a(State state) {
boolean added = false;
added = state.addBundle(bundle_1);
@@ -124,7 +124,7 @@ public class TestRFC79_007 extends AbstractStateTest {
assertTrue("failed to add bundle ", added);
} // end method
-
+
public void checkBundlesResolved_a() {
assertTrue("unexpected bundle resolution state", bundle_1.isResolved());
assertTrue("unexpected bundle resolution state", bundle_2.isResolved());
@@ -133,7 +133,7 @@ public class TestRFC79_007 extends AbstractStateTest {
assertTrue("unexpected bundle resolution state", bundle_5.isResolved());
} // end method
-
+
public BundleDescription create_bundle_1(StateObjectFactory sof) {
java.util.Dictionary dictionary_1 = new java.util.Properties();
BundleDescription bundle = null;
@@ -204,5 +204,5 @@ public class TestRFC79_007 extends AbstractStateTest {
}
return bundle;
} // end of method
-
+
} // end of testcase
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestVersion_001.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestVersion_001.java
index bf8ca3f88..dad687e0a 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestVersion_001.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestVersion_001.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -30,7 +30,7 @@ public class TestVersion_001 extends AbstractStateTest {
BundleDescription bundle_2 = null;
BundleDescription bundle_3 = null;
-
+
public void testTest_001() {
State state = buildEmptyState();
StateObjectFactory sof = StateObjectFactory.defaultFactory;
@@ -55,7 +55,7 @@ public class TestVersion_001 extends AbstractStateTest {
checkWiring_a();
} // end of method
-
+
public void checkWiringState_1() {
ExportPackageDescription[] exports = bundle_1.getResolvedImports();
assertNotNull("export array is unexpectedly null", exports);
@@ -105,7 +105,7 @@ public class TestVersion_001 extends AbstractStateTest {
checkWiringState_3();
} // end method
-
+
public void addBundlesToState_a(State state) {
boolean added = false;
added = state.addBundle(bundle_1);
@@ -116,14 +116,14 @@ public class TestVersion_001 extends AbstractStateTest {
assertTrue("failed to add bundle ", added);
} // end method
-
+
public void checkBundlesResolved_a() {
assertTrue("unexpected bundle resolution state", bundle_1.isResolved());
assertTrue("unexpected bundle resolution state", bundle_2.isResolved());
assertTrue("unexpected bundle resolution state", bundle_3.isResolved());
} // end method
-
+
public BundleDescription create_bundle_1(StateObjectFactory sof) {
java.util.Dictionary dictionary_1 = new java.util.Properties();
BundleDescription bundle = null;
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestVersion_002.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestVersion_002.java
index 11f3dce8d..1609bebcd 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestVersion_002.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestVersion_002.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -30,7 +30,7 @@ public class TestVersion_002 extends AbstractStateTest {
BundleDescription bundle_2 = null;
BundleDescription bundle_3 = null;
-
+
public void testTest_002() {
State state = buildEmptyState();
StateObjectFactory sof = StateObjectFactory.defaultFactory;
@@ -55,7 +55,7 @@ public class TestVersion_002 extends AbstractStateTest {
checkWiring_a();
} // end of method
-
+
public void checkWiringState_1() {
ExportPackageDescription[] exports = bundle_1.getResolvedImports();
assertNotNull("export array is unexpectedly null", exports);
@@ -94,7 +94,7 @@ public class TestVersion_002 extends AbstractStateTest {
checkWiringState_3();
} // end method
-
+
public void addBundlesToState_a(State state) {
boolean added = false;
added = state.addBundle(bundle_1);
@@ -105,14 +105,14 @@ public class TestVersion_002 extends AbstractStateTest {
assertTrue("failed to add bundle ", added);
} // end method
-
+
public void checkBundlesResolved_a() {
assertTrue("unexpected bundle resolution state", bundle_1.isResolved());
assertTrue("unexpected bundle resolution state", bundle_2.isResolved());
assertTrue("unexpected bundle resolution state", bundle_3.isResolved());
} // end method
-
+
public BundleDescription create_bundle_1(StateObjectFactory sof) {
java.util.Dictionary dictionary_1 = new java.util.Properties();
BundleDescription bundle = null;
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestVersion_003.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestVersion_003.java
index 4640d7a0e..ec5f65f5b 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestVersion_003.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestVersion_003.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -30,7 +30,7 @@ public class TestVersion_003 extends AbstractStateTest {
BundleDescription bundle_2 = null;
BundleDescription bundle_3 = null;
-
+
public void testTest_003() {
State state = buildEmptyState();
StateObjectFactory sof = StateObjectFactory.defaultFactory;
@@ -55,7 +55,7 @@ public class TestVersion_003 extends AbstractStateTest {
checkWiring_a();
} // end of method
-
+
public void checkWiringState_1() {
ExportPackageDescription[] exports = bundle_1.getResolvedImports();
assertNotNull("export array is unexpectedly null", exports);
@@ -83,7 +83,7 @@ public class TestVersion_003 extends AbstractStateTest {
checkWiringState_3();
} // end method
-
+
public void addBundlesToState_a(State state) {
boolean added = false;
added = state.addBundle(bundle_1);
@@ -94,14 +94,14 @@ public class TestVersion_003 extends AbstractStateTest {
assertTrue("failed to add bundle ", added);
} // end method
-
+
public void checkBundlesResolved_a() {
assertTrue("unexpected bundle resolution state", bundle_1.isResolved());
assertTrue("unexpected bundle resolution state", !bundle_2.isResolved());
assertTrue("unexpected bundle resolution state", bundle_3.isResolved());
} // end method
-
+
public BundleDescription create_bundle_1(StateObjectFactory sof) {
java.util.Dictionary dictionary_1 = new java.util.Properties();
BundleDescription bundle = null;
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/AbstractResourceTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/AbstractResourceTest.java
index 53b1d7812..01ea6f2dd 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/AbstractResourceTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/AbstractResourceTest.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/AllTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/AllTests.java
index af04fdd40..4070be33e 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/AllTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/AllTests.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/BasicTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/BasicTest.java
index 79e85f1cb..2857c0e19 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/BasicTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/BasicTest.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/ResolverHookTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/ResolverHookTests.java
index a63919583..128fa0fbe 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/ResolverHookTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/ResolverHookTests.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/BaseSecurityTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/BaseSecurityTest.java
index a3d356d17..4ea5ea5d6 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/BaseSecurityTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/BaseSecurityTest.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/KeyStoreTrustEngineTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/KeyStoreTrustEngineTest.java
index aea0a0f61..7d37dbe52 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/KeyStoreTrustEngineTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/KeyStoreTrustEngineTest.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/OSGiAPICertificateTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/OSGiAPICertificateTest.java
index 1f4122b3e..fa4d097c5 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/OSGiAPICertificateTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/OSGiAPICertificateTest.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -275,7 +275,7 @@ public class OSGiAPICertificateTest extends BaseSecurityTest {
}
public void testAdminPermission03() {
- // test trusted cert with exact match pattern + ! operation
+ // test trusted cert with exact match pattern + ! operation
try {
getTrustEngine().addTrustAnchor(getTestCertificate("ca1_leafa"), "ca1_leafa"); //$NON-NLS-1$ //$NON-NLS-2$
Bundle testBundle = installBundle(getTestJarPath("signed")); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/SecurityTestSuite.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/SecurityTestSuite.java
index f8bc0d8b5..cec31c667 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/SecurityTestSuite.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/SecurityTestSuite.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/SignedBundleTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/SignedBundleTest.java
index fbce8b108..12ea547a8 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/SignedBundleTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/SignedBundleTest.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -31,7 +31,7 @@ public class SignedBundleTest extends BaseSecurityTest {
/*
private static Test[] s_tests = {
- // positive tests
+ // positive tests
new SignedBundleTest("testSignedContent01", "unsigned", new String[] {}) {
public void runTest() {
testSignedContent01();
@@ -55,19 +55,19 @@ public class SignedBundleTest extends BaseSecurityTest {
n/a n/a n/a = positive, unsigned ('unsigned.jar')
yes n/a yes = positive, 1 signer ('signed.jar','ca1_leafa')
yes yes yes = positive, 2 signers ('multiply_signed.jar','ca1_leafa,'ca1_leafb')
-
+
//negative = untrusted tests
- no n/a yes = negative, 1 signer, 1 untrusted ('signed.jar')
+ no n/a yes = negative, 1 signer, 1 untrusted ('signed.jar')
no no yes = negative, 2 signers, 2 untrusted ('multiply_signed.jar')
yes no yes = negative, 2 signers, 1 untrusted ('multiply_signed.jar', 'ca1_leafa')
-
+
//negative = validity tests
yes n/a no = negative, 1 signer, 1 corrupt ('signed_with_corrupt.jar','ca1_leafa')
yes yes no = negative, 2 signers, 2 corrupt
-
+
//TODO: OSGi-specific partial signer cases
//TODO: TSA tests (w/TSA signer trusted, untrusted, etc)
- //TODO: More? NESTED JARS?
+ //TODO: More? NESTED JARS?
*/
//private String jarName;
@@ -97,11 +97,11 @@ public class SignedBundleTest extends BaseSecurityTest {
registerEclipseTrustEngine();
/*
TrustEngine engine = getTrustEngine();
-
+
if (supportStore == null) {
fail("Could not open keystore with test certificates!");
}
-
+
// get the certs from the support store and add
for (int i = 0; i < aliases.length; i++) {
Certificate cert = supportStore.getCertificate(aliases[i]);
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/securityadmin/SecurityAdminUnitTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/securityadmin/SecurityAdminUnitTests.java
index 447c80c95..83d7aba52 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/securityadmin/SecurityAdminUnitTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/securityadmin/SecurityAdminUnitTests.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/securityadmin/SecurityManagerTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/securityadmin/SecurityManagerTests.java
index 6d217656b..8068ca031 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/securityadmin/SecurityManagerTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/securityadmin/SecurityManagerTests.java
@@ -215,7 +215,7 @@ public class SecurityManagerTests extends AbstractBundleTests {
BundleContext systemContext = equinox.getBundleContext();
assertNotNull("System context is null", systemContext); //$NON-NLS-1$
- // try installing a bundle to tests bug
+ // try installing a bundle to tests bug
String locationSecurityA = installer.getBundleLocation("security.a"); //$NON-NLS-1$
// set the security for the bundle
ConditionalPermissionAdmin ca = (ConditionalPermissionAdmin) systemContext.getService(systemContext.getServiceReference(ConditionalPermissionAdmin.class.getName()));
@@ -284,7 +284,7 @@ public class SecurityManagerTests extends AbstractBundleTests {
BundleContext systemContext = equinox.getBundleContext();
assertNotNull("System context is null", systemContext); //$NON-NLS-1$
- // try installing a bundle to tests bug
+ // try installing a bundle to tests bug
String locationLinkA = installer.getBundleLocation("test.link.a"); //$NON-NLS-1$
String locationLinkAClient = installer.getBundleLocation("test.link.a.client"); //$NON-NLS-1$
@@ -354,7 +354,7 @@ public class SecurityManagerTests extends AbstractBundleTests {
BundleContext systemContext = equinox.getBundleContext();
assertNotNull("System context is null", systemContext); //$NON-NLS-1$
- // try installing a bundle to tests bug
+ // try installing a bundle to tests bug
String locationLinkA = installer.getBundleLocation("test.link.a"); //$NON-NLS-1$
String locationLinkAClient = installer.getBundleLocation("test.link.a.client"); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/serviceregistry/ServiceExceptionTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/serviceregistry/ServiceExceptionTests.java
index b50dabb09..0917cf4be 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/serviceregistry/ServiceExceptionTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/serviceregistry/ServiceExceptionTests.java
@@ -30,7 +30,7 @@ public class ServiceExceptionTests extends AbstractBundleTests {
// test a service factory which returns wrong object types
ServiceExceptionServiceFactory wrongObjectFactory = new ServiceExceptionServiceFactory("A String"); //$NON-NLS-1$
Hashtable props = new Hashtable();
- props.put("name", testMethodName); //$NON-NLS-1$
+ props.put("name", testMethodName); //$NON-NLS-1$
ServiceRegistration reg = OSGiTestsActivator.getContext().registerService(Runnable.class.getName(), wrongObjectFactory, props);
ServiceExceptionFrameworkListener listener = new ServiceExceptionFrameworkListener(OSGiTestsActivator.getContext().getBundle(), null, ServiceException.FACTORY_ERROR);
OSGiTestsActivator.getContext().addFrameworkListener(listener);
@@ -68,7 +68,7 @@ public class ServiceExceptionTests extends AbstractBundleTests {
// test a service factory which returns null objects
ServiceExceptionServiceFactory nullObjectFactory = new ServiceExceptionServiceFactory(null);
Hashtable props = new Hashtable();
- props.put("name", testMethodName); //$NON-NLS-1$
+ props.put("name", testMethodName); //$NON-NLS-1$
ServiceRegistration reg = OSGiTestsActivator.getContext().registerService(Runnable.class.getName(), nullObjectFactory, props);
ServiceExceptionFrameworkListener listener = new ServiceExceptionFrameworkListener(OSGiTestsActivator.getContext().getBundle(), null, ServiceException.FACTORY_ERROR);
OSGiTestsActivator.getContext().addFrameworkListener(listener);
@@ -107,7 +107,7 @@ public class ServiceExceptionTests extends AbstractBundleTests {
RuntimeException cause = new RuntimeException(testMethodName);
ServiceExceptionServiceFactory runtimeExceptionFactory = new ServiceExceptionServiceFactory(cause);
Hashtable props = new Hashtable();
- props.put("name", testMethodName); //$NON-NLS-1$
+ props.put("name", testMethodName); //$NON-NLS-1$
ServiceRegistration reg = OSGiTestsActivator.getContext().registerService(Runnable.class.getName(), runtimeExceptionFactory, props);
ServiceExceptionFrameworkListener listener = new ServiceExceptionFrameworkListener(OSGiTestsActivator.getContext().getBundle(), cause, ServiceException.FACTORY_EXCEPTION);
OSGiTestsActivator.getContext().addFrameworkListener(listener);
@@ -146,7 +146,7 @@ public class ServiceExceptionTests extends AbstractBundleTests {
Error cause = new Error(testMethodName);
ServiceExceptionServiceFactory errorFactory = new ServiceExceptionServiceFactory(cause);
Hashtable props = new Hashtable();
- props.put("name", testMethodName); //$NON-NLS-1$
+ props.put("name", testMethodName); //$NON-NLS-1$
ServiceRegistration reg = OSGiTestsActivator.getContext().registerService(Runnable.class.getName(), errorFactory, props);
ServiceExceptionFrameworkListener listener = new ServiceExceptionFrameworkListener(OSGiTestsActivator.getContext().getBundle(), cause, ServiceException.FACTORY_EXCEPTION);
OSGiTestsActivator.getContext().addFrameworkListener(listener);
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/serviceregistry/ServiceRegistryTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/serviceregistry/ServiceRegistryTests.java
index 04940a559..0e4e0c5ef 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/serviceregistry/ServiceRegistryTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/serviceregistry/ServiceRegistryTests.java
@@ -367,7 +367,7 @@ public class ServiceRegistryTests extends AbstractBundleTests {
}
};
Hashtable props = new Hashtable();
- props.put("name", testMethodName); //$NON-NLS-1$
+ props.put("name", testMethodName); //$NON-NLS-1$
props.put(Constants.SERVICE_DESCRIPTION, "min value"); //$NON-NLS-1$
props.put(Constants.SERVICE_RANKING, Integer.valueOf(Integer.MIN_VALUE));
ServiceRegistration reg1 = OSGiTestsActivator.getContext().registerService(Runnable.class.getName(), runIt, props);
@@ -422,7 +422,7 @@ public class ServiceRegistryTests extends AbstractBundleTests {
}
};
Hashtable props = new Hashtable();
- props.put("name", testMethodName); //$NON-NLS-1$
+ props.put("name", testMethodName); //$NON-NLS-1$
props.put(Constants.SERVICE_DESCRIPTION, "min value"); //$NON-NLS-1$
props.put(Constants.SERVICE_RANKING, Integer.valueOf(Integer.MIN_VALUE));
ServiceRegistration reg1 = OSGiTestsActivator.getContext().registerService(Runnable.class.getName(), runIt, props);
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/AllTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/AllTests.java
index ce5c67d72..0ac39c4c9 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/AllTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/AllTests.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/BasicLocationTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/BasicLocationTests.java
index a655f7ca5..21de7feae 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/BasicLocationTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/BasicLocationTests.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/FileManagerTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/FileManagerTests.java
index 729f1b127..d1e3cc960 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/FileManagerTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/FileManagerTests.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -153,9 +153,9 @@ public class FileManagerTests extends OSGiTest {
}
/**
- * This tests a FM update where the a specific file is managed with a
+ * This tests a FM update where the a specific file is managed with a
* revision number of (n) and an update is requested while there already
- * exists a file with revision number (n+1). FM should skip that generation
+ * exists a file with revision number (n+1). FM should skip that generation
* number and update the database with file version set to (n+2). This test is
* possible if a power loss occurs between FM rename() and FM save().
*/
@@ -219,7 +219,7 @@ public class FileManagerTests extends OSGiTest {
/**
* This tests that FM apis throw exceptions if FM has not yet been opened
- * or if FM has been closed.
+ * or if FM has been closed.
*/
public void testNotOpen() {
String permanentFile = "testNotOpen.txt";
@@ -314,10 +314,10 @@ public class FileManagerTests extends OSGiTest {
* This tests FM remove() then add(). On a remove(), the file can not be deleted as it may
* be in use by another FM. Then add() the file back and see if the version number written to
* is (n+1) where (n) is the version when remove() called. This is likely if framework uses
- * -clean where on clean we remove the file, then on exit we add the file back. Make sure
+ * -clean where on clean we remove the file, then on exit we add the file back. Make sure
* this is orderly.
- *
- * Currently is is a known issues that remove() will never delete any old manager contents.
+ *
+ * Currently is is a known issues that remove() will never delete any old manager contents.
*/
public void testRemoveThenAdd() {
String fileName = "testRemoveThenAdd.txt";
@@ -384,7 +384,7 @@ public class FileManagerTests extends OSGiTest {
*/
public void testMultipleFileManagers() {
// This test relies on a file lock to fail if the same process already
- // holds a file lock. This is true on Win32 but not on Linux/Mac unless using Java 6.
+ // holds a file lock. This is true on Win32 but not on Linux/Mac unless using Java 6.
// So run this test for windows only.
String ee = System.getProperty(Constants.FRAMEWORK_EXECUTIONENVIRONMENT);
if (!"win32".equalsIgnoreCase(System.getProperty("osgi.os")) && ee.indexOf("JavaSE-1.6") == -1)
@@ -545,7 +545,7 @@ public class FileManagerTests extends OSGiTest {
assertTrue(file3.toString(), file3.exists());
// This test relies on a file lock to fail if the same process already
- // holds a file lock. This is true on Win32 but not on Linux/Mac unless using Java 6.
+ // holds a file lock. This is true on Win32 but not on Linux/Mac unless using Java 6.
// So run this test for windows only or Java 6 or higher.
String ee = System.getProperty(Constants.FRAMEWORK_EXECUTIONENVIRONMENT);
if ("win32".equalsIgnoreCase(System.getProperty("osgi.os")) || ee.indexOf("JavaSE-1.6") != -1) {
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/LocationAreaSessionTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/LocationAreaSessionTest.java
index 7112de0f4..5fb03b8ab 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/LocationAreaSessionTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/LocationAreaSessionTest.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/SimpleTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/SimpleTests.java
index bcc898ff6..b3b4b85e3 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/SimpleTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/SimpleTests.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/StreamManagerTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/StreamManagerTests.java
index 3faa6b2e2..290119fd2 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/StreamManagerTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/StreamManagerTests.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -107,7 +107,7 @@ public class StreamManagerTests extends OSGiTest {
/**
* This tests that FM will keep a backup version of a reliableFile and that
* corrupting the reliableFile will recover the previous contents.
- *
+ *
*/
public void testReliableFile() {
String fileName = "testReliableFile.txt";
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/AbstractStateTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/AbstractStateTest.java
index b3686144f..1cda30de3 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/AbstractStateTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/AbstractStateTest.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/AllTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/AllTests.java
index 6f32c940d..3a286a6c9 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/AllTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/AllTests.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/DevModeTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/DevModeTest.java
index e8c914a3f..da3243f60 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/DevModeTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/DevModeTest.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/DisabledInfoTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/DisabledInfoTest.java
index 649b60e7f..7372a97b2 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/DisabledInfoTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/DisabledInfoTest.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/GenericCapabilityTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/GenericCapabilityTest.java
index 918450858..74d36cb71 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/GenericCapabilityTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/GenericCapabilityTest.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/NewResolverTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/NewResolverTest.java
index 97a143505..33c42d169 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/NewResolverTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/NewResolverTest.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -24,7 +24,7 @@ public class NewResolverTest extends AbstractStateTest {
public NewResolverTest(String testName) {
super(testName);
}
-
+
public static Test suite() {
return new TestSuite(NewResolverTest.class);
}
@@ -33,28 +33,28 @@ public class NewResolverTest extends AbstractStateTest {
State state = buildEmptyState();
state.resolve();
}
-
+
public void testBasicScenario1() throws BundleException {
State state = buildEmptyState();
-
- final String MAN_A = "Bundle-SymbolicName: A\n" +
+
+ final String MAN_A = "Bundle-SymbolicName: A\n" +
"Export-Package: servlet; specification-version=2.1";
BundleDescription bA = state.getFactory().createBundleDescription(parseManifest(MAN_A),
"org.eclipse.basic1A", 0);
state.addBundle(bA);
-
- final String MAN_B = "Bundle-SymbolicName: B\n" +
+
+ final String MAN_B = "Bundle-SymbolicName: B\n" +
"Import-Package: servlet; specification-version=2.1";
BundleDescription bB = state.getFactory().createBundleDescription(parseManifest(MAN_B),
"org.eclipse.basic1B", 1);
state.addBundle(bB);
state.resolve();
-
+
BundleDescription b0 = state.getBundle(0);
assertNotNull("0.1", b0);
assertFullyResolved("0.2", b0);
-
+
BundleDescription b1 = state.getBundle(1);
assertNotNull("0.3", b1);
assertFullyResolved("0.4", b1);
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/OSGiCapabilityTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/OSGiCapabilityTest.java
index c58438767..e5d4f9fb8 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/OSGiCapabilityTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/OSGiCapabilityTest.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/PlatformAdminTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/PlatformAdminTest.java
index eb1c2d1d5..1e31fffc1 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/PlatformAdminTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/PlatformAdminTest.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/R4ResolverTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/R4ResolverTest.java
index e5473ec5f..97aac139c 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/R4ResolverTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/R4ResolverTest.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/StateComparisonTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/StateComparisonTest.java
index d5dd5967f..b65390b96 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/StateComparisonTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/StateComparisonTest.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/StateCycleTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/StateCycleTest.java
index c5b70f438..0c19c67b3 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/StateCycleTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/StateCycleTest.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/StateResolverTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/StateResolverTest.java
index 3715242c6..4c3fc82cc 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/StateResolverTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/StateResolverTest.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -66,7 +66,7 @@ public class StateResolverTest extends AbstractStateTest {
* Tests adding 3 new bundles to an already resolved state and then
* resolving only one of the bundles. The result should be all 3 added
* bundles being resolved.
- *
+ *
*/
public void testAdd3Resolve1() throws BundleException {
State state = buildInitialState();
@@ -455,7 +455,7 @@ public class StateResolverTest extends AbstractStateTest {
* resolving only one of the bundles. The result should be all 3 added
* bundles being resolved. Then re-resolving the same bundle. The result
* should be only the one bundle being resolved.
- *
+ *
*/
public void testReresolveBundle() throws BundleException {
State state = buildInitialState();
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/SubstitutableExportsTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/SubstitutableExportsTest.java
index f9a7c014c..58deafa69 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/SubstitutableExportsTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/SubstitutableExportsTest.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/VersionRangeTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/VersionRangeTests.java
index 3f450a59f..501e6b51a 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/VersionRangeTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/VersionRangeTests.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -43,7 +43,7 @@ public class VersionRangeTests extends TestCase {
}
public void testGreaterThan() {
- // any version equal or greater than 1.0 is ok
+ // any version equal or greater than 1.0 is ok
VersionRange lowerBound = new VersionRange("1.0.0"); //$NON-NLS-1$
assertTrue("1.0", !lowerBound.isIncluded(Version.parseVersion("0.9"))); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue("1.1", lowerBound.isIncluded(Version.parseVersion("1.0"))); //$NON-NLS-1$ //$NON-NLS-2$
@@ -52,7 +52,7 @@ public class VersionRangeTests extends TestCase {
}
public void testLowerThan() {
- // any version lower than 2.0 is ok
+ // any version lower than 2.0 is ok
VersionRange upperBound = new VersionRange("[0,2.0)"); //$NON-NLS-1$
assertTrue("1.0", upperBound.isIncluded(Version.parseVersion("0.0"))); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue("1.1", upperBound.isIncluded(Version.parseVersion("0.9"))); //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/XFriendsInternalResolverTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/XFriendsInternalResolverTest.java
index 6fcc03acd..c30c48499 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/XFriendsInternalResolverTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/XFriendsInternalResolverTest.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -31,7 +31,7 @@ public class XFriendsInternalResolverTest extends AbstractStateTest {
/**
* Tests the x-friends directive. A bundle should not be allowed to import a package which
* declares an x-friends directive and the importer is not a friend. When a bundle requires
- * anther bundle which exports packages which declare an x-friends directive it should not
+ * anther bundle which exports packages which declare an x-friends directive it should not
* have access to the packages unless the requiring bundle is a friend.
* @throws BundleException
*/
@@ -44,7 +44,7 @@ public class XFriendsInternalResolverTest extends AbstractStateTest {
manifest.put(Constants.BUNDLE_MANIFESTVERSION, "2");
manifest.put(Constants.BUNDLE_SYMBOLICNAME, "test.exporter");
manifest.put(Constants.BUNDLE_VERSION, "1.0");
- manifest.put(Constants.EXPORT_PACKAGE,
+ manifest.put(Constants.EXPORT_PACKAGE,
"test.exporter.foo1; x-friends:=\"test.importer1, test.requirer1\"," +
"test.exporter.foo2; x-friends:=\"test.importer2, test.requirer2\"," +
"test.exporter.bar1; x-friends:=\"test.importer1, test.requirer1\"," +
@@ -55,7 +55,7 @@ public class XFriendsInternalResolverTest extends AbstractStateTest {
manifest.put(Constants.BUNDLE_MANIFESTVERSION, "2");
manifest.put(Constants.BUNDLE_SYMBOLICNAME, "test.importer1");
manifest.put(Constants.BUNDLE_VERSION, "1.0");
- manifest.put(Constants.IMPORT_PACKAGE,
+ manifest.put(Constants.IMPORT_PACKAGE,
"test.exporter.foo1," +
"test.exporter.bar1," +
"test.exporter.foo2; resolution:=optional," +
@@ -66,7 +66,7 @@ public class XFriendsInternalResolverTest extends AbstractStateTest {
manifest.put(Constants.BUNDLE_MANIFESTVERSION, "2");
manifest.put(Constants.BUNDLE_SYMBOLICNAME, "test.importer2");
manifest.put(Constants.BUNDLE_VERSION, "1.0");
- manifest.put(Constants.IMPORT_PACKAGE,
+ manifest.put(Constants.IMPORT_PACKAGE,
"test.exporter.foo1; resolution:=optional," +
"test.exporter.bar1; resolution:=optional," +
"test.exporter.foo2," +
@@ -77,7 +77,7 @@ public class XFriendsInternalResolverTest extends AbstractStateTest {
manifest.put(Constants.BUNDLE_MANIFESTVERSION, "2");
manifest.put(Constants.BUNDLE_SYMBOLICNAME, "test.importer3");
manifest.put(Constants.BUNDLE_VERSION, "1.0");
- manifest.put(Constants.IMPORT_PACKAGE,
+ manifest.put(Constants.IMPORT_PACKAGE,
"test.exporter.foo1," +
"test.exporter.bar1," +
"test.exporter.foo2; resolution:=optional," +
@@ -200,7 +200,7 @@ public class XFriendsInternalResolverTest extends AbstractStateTest {
manifest.put(Constants.BUNDLE_MANIFESTVERSION, "2");
manifest.put(Constants.BUNDLE_SYMBOLICNAME, "test.base.exporter");
manifest.put(Constants.BUNDLE_VERSION, "1.0");
- manifest.put(Constants.EXPORT_PACKAGE,
+ manifest.put(Constants.EXPORT_PACKAGE,
"test.base; base.exporter=split; mandatory:=base.exporter");
BundleDescription baseExporter = state.getFactory().createBundleDescription(state, manifest, (String) manifest.get(Constants.BUNDLE_SYMBOLICNAME), bundleID++);
@@ -209,7 +209,7 @@ public class XFriendsInternalResolverTest extends AbstractStateTest {
manifest.put(Constants.BUNDLE_SYMBOLICNAME, "test.base.exporter.require");
manifest.put(Constants.BUNDLE_VERSION, "1.0");
manifest.put(Constants.REQUIRE_BUNDLE, "test.base.exporter");
- manifest.put(Constants.EXPORT_PACKAGE,
+ manifest.put(Constants.EXPORT_PACKAGE,
"test.base; base.exporter.require=split; mandatory:=base.exporter.require");
BundleDescription baseExporterRequire = state.getFactory().createBundleDescription(state, manifest, (String) manifest.get(Constants.BUNDLE_SYMBOLICNAME), bundleID++);
@@ -217,7 +217,7 @@ public class XFriendsInternalResolverTest extends AbstractStateTest {
manifest.put(Constants.BUNDLE_MANIFESTVERSION, "2");
manifest.put(Constants.BUNDLE_SYMBOLICNAME, "test.base.exporter.require2");
manifest.put(Constants.BUNDLE_VERSION, "1.0");
- manifest.put(Constants.REQUIRE_BUNDLE,
+ manifest.put(Constants.REQUIRE_BUNDLE,
"test.base.exporter.require");
manifest.put(Constants.EXPORT_PACKAGE, "test.base.exporter.require");
BundleDescription baseExporterRequire2 = state.getFactory().createBundleDescription(state, manifest, (String) manifest.get(Constants.BUNDLE_SYMBOLICNAME), bundleID++);
@@ -227,7 +227,7 @@ public class XFriendsInternalResolverTest extends AbstractStateTest {
manifest.put(Constants.BUNDLE_MANIFESTVERSION, "2");
manifest.put(Constants.BUNDLE_SYMBOLICNAME, "test.base.importer");
manifest.put(Constants.BUNDLE_VERSION, "1.0");
- manifest.put(Constants.REQUIRE_BUNDLE,
+ manifest.put(Constants.REQUIRE_BUNDLE,
"test.base.exporter.require");
BundleDescription baseImporter = state.getFactory().createBundleDescription(state, manifest, (String) manifest.get(Constants.BUNDLE_SYMBOLICNAME), bundleID++);
@@ -332,7 +332,7 @@ public class XFriendsInternalResolverTest extends AbstractStateTest {
manifest.put(Constants.BUNDLE_MANIFESTVERSION, "2");
manifest.put(Constants.BUNDLE_SYMBOLICNAME, "A");
manifest.put(Constants.BUNDLE_VERSION, "1.0");
- manifest.put(Constants.REQUIRE_BUNDLE, "B; " + Constants.VISIBILITY_DIRECTIVE + ":=" + Constants.VISIBILITY_REEXPORT +
+ manifest.put(Constants.REQUIRE_BUNDLE, "B; " + Constants.VISIBILITY_DIRECTIVE + ":=" + Constants.VISIBILITY_REEXPORT +
",C");
BundleDescription a = state.getFactory().createBundleDescription(state, manifest, (String) manifest.get(Constants.BUNDLE_SYMBOLICNAME), bundleID++);
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/util/BidiTextProcessorTestCase.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/util/BidiTextProcessorTestCase.java
index 07dfac7fd..0b28ad074 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/util/BidiTextProcessorTestCase.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/util/BidiTextProcessorTestCase.java
@@ -18,7 +18,7 @@ import org.eclipse.osgi.util.TextProcessor;
/**
* Tests for strings that use the TextProcessor and are run in a bidi locale.
- *
+ *
* NOTE: Run these tests as a session test in order to have the correct
* locale set. Run class AllTests.
*/
@@ -28,7 +28,7 @@ public class BidiTextProcessorTestCase extends TextProcessorTestCase {
protected static final char LRM = '\u200e';
// left to right embedding
protected static final char LRE = '\u202a';
- // pop directional format
+ // pop directional format
protected static final char PDF = '\u202c';
private static String PATH_1_RESULT = LRE + PATH_1 + PDF;
@@ -71,7 +71,7 @@ public class BidiTextProcessorTestCase extends TextProcessorTestCase {
private static String OTHER_STRING_1_RESULT = LRE + "*" + "." + "java" + PDF;
private static String OTHER_STRING_2_RESULT = LRE + "*" + "." + "\u05d0\u05d1\u05d2" + PDF;
private static String OTHER_STRING_3_RESULT = LRE + "\u05d0\u05d1\u05d2 " + LRM + "=" + " \u05ea\u05e9\u05e8\u05e7\u05e6" + PDF;
- // result strings if null delimiter is passed
+ // result strings if null delimiter is passed
private static String OTHER_STRING_1_ND_RESULT = LRE + "*" + "." + "java" + PDF;
private static String OTHER_STRING_2_ND_RESULT = LRE + "*" + "." + "\u05d0\u05d1\u05d2" + PDF;
private static String OTHER_STRING_3_ND_RESULT = LRE + "\u05d0\u05d1\u05d2 " + "=" + " \u05ea\u05e9\u05e8\u05e7\u05e6" + PDF;
@@ -103,7 +103,7 @@ public class BidiTextProcessorTestCase extends TextProcessorTestCase {
/**
* Constructor.
- *
+ *
* @param name test name
*/
public BidiTextProcessorTestCase(String name) {
@@ -148,7 +148,7 @@ public class BidiTextProcessorTestCase extends TextProcessorTestCase {
}
/*
- * Test other possible uses for TextProcessor, including file associations and
+ * Test other possible uses for TextProcessor, including file associations and
* variable assignment statements.
*/
public void testOtherStrings() {
@@ -211,7 +211,7 @@ public class BidiTextProcessorTestCase extends TextProcessorTestCase {
}
/*
- * Test the result to ensure markers aren't added more than once if the
+ * Test the result to ensure markers aren't added more than once if the
* string is processed multiple times.
*/
public void testDoubleProcessPaths() {
@@ -226,7 +226,7 @@ public class BidiTextProcessorTestCase extends TextProcessorTestCase {
}
/*
- * Test the result to ensure markers aren't added more than once if the
+ * Test the result to ensure markers aren't added more than once if the
* string is processed multiple times.
*/
public void testDoubleProcessOtherStrings() {
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/util/LatinTextProcessorTestCase.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/util/LatinTextProcessorTestCase.java
index 2e9caca5c..a5a048016 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/util/LatinTextProcessorTestCase.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/util/LatinTextProcessorTestCase.java
@@ -16,7 +16,7 @@ package org.eclipse.osgi.tests.util;
import org.eclipse.osgi.util.TextProcessor;
/**
- * Test for strings that use the TextProcessor but are not run in a bidi locale.
+ * Test for strings that use the TextProcessor but are not run in a bidi locale.
* Latin locales should return the same String that was passed in.
*
*/
@@ -47,7 +47,7 @@ public class LatinTextProcessorTestCase extends TextProcessorTestCase {
/**
* Constructor for class.
- *
+ *
* @param name test name
*/
public LatinTextProcessorTestCase(String name) {
@@ -61,14 +61,14 @@ public class LatinTextProcessorTestCase extends TextProcessorTestCase {
verifyResult("Process string " + (i + 1), result, ALL_PATHS[i]);
}
}
-
+
public void testLatinPathsDeprocess(){
// test all strings using process(String) method
for (int i = 0; i < ALL_PATHS.length; i++) {
String result = TextProcessor.process(ALL_PATHS[i]);
String resultDP = TextProcessor.deprocess(result);
verifyResult("Deprocess string " + (i + 1), resultDP, ALL_PATHS[i]);
- }
+ }
}
public void testLatinPathsWithNullDelimiter() {
@@ -78,7 +78,7 @@ public class LatinTextProcessorTestCase extends TextProcessorTestCase {
verifyResult("Process string " + (i + 1), result, ALL_PATHS[i]);
}
}
-
+
public void testLatinOtherStrings() {
// test the process(String, String) method
for (int i = 0; i < TEST_STAR_PATHS.length; i++) {
@@ -91,7 +91,7 @@ public class LatinTextProcessorTestCase extends TextProcessorTestCase {
verifyResult("Equals expression " + (i + 1), result, TEST_EQUALS_PATHS[i]);
}
}
-
+
public void testLatinOtherStringsDeprocess() {
// test the process(String, String) method
for (int i = 0; i < TEST_STAR_PATHS.length; i++) {
@@ -105,7 +105,7 @@ public class LatinTextProcessorTestCase extends TextProcessorTestCase {
String resultDP = TextProcessor.deprocess(result);
verifyResult("Equals expression " + (i + 1), resultDP, TEST_EQUALS_PATHS[i]);
}
- }
+ }
public void testLatinOtherStringsWithNoDelimiter() {
for (int i = 0; i < TEST_STAR_PATHS.length; i++) {
@@ -123,17 +123,17 @@ public class LatinTextProcessorTestCase extends TextProcessorTestCase {
verifyResult("TextProcessor.process(String) for empty string ", TextProcessor.process(""), EMPTY_STRING);
verifyResult("TextProcessor.process(String, String) for empty strings ", TextProcessor.process("", ""), EMPTY_STRING);
}
-
+
public void testEmptyStringParamsDeprocess() {
verifyResult("TextProcessor.deprocess(String) for empty string ", TextProcessor.deprocess(""), EMPTY_STRING);
}
-
+
public void testNullParams() {
assertNull("TextProcessor.process(String) for null param ", TextProcessor.process(null));
assertNull("TextProcessor.process(String, String) for params ", TextProcessor.process(null, null));
}
-
+
public void testNullParamsDeprocess() {
assertNull("TextProcessor.deprocess(String) for null param ", TextProcessor.deprocess(null));
- }
+ }
}
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/util/TextProcessorSessionTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/util/TextProcessorSessionTest.java
index 93fc182f3..e7616b5b7 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/util/TextProcessorSessionTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/util/TextProcessorSessionTest.java
@@ -21,7 +21,7 @@ public class TextProcessorSessionTest extends ConfigurationSessionTestSuite {
private String lang = null;
/**
- * Create a session test for the given class.
+ * Create a session test for the given class.
* @param pluginId tests plugin id
* @param clazz the test class to run
* @param language the language to run the tests under (the -nl parameter value)
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/util/TextProcessorTestCase.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/util/TextProcessorTestCase.java
index f0186c2d4..685b53767 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/util/TextProcessorTestCase.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/util/TextProcessorTestCase.java
@@ -26,7 +26,7 @@ public abstract class TextProcessorTestCase extends TestCase {
protected static String HEBREW_STRING_3 = "\u05e5\u05e4\u05e3";
protected static String HEBREW_STRING_4 = "\u05e2\u05e1\u05e0";
protected static String HEBREW_STRING_5 = "\u05df\u05fd\u05dd";
- protected static String HEBREW_STRING_6 = "\u05dc\u05db\u05da";
+ protected static String HEBREW_STRING_6 = "\u05dc\u05db\u05da";
protected static String HEBREW_STRING_7 = "\u05d0";
protected static String HEBREW_STRING_8 = "\u05e9";
protected static String HEBREW_STRING_9 = "\u05dc";
@@ -34,9 +34,9 @@ public abstract class TextProcessorTestCase extends TestCase {
protected static String HEBREW_STRING_11 = "\u05d4";
protected static String HEBREW_STRING_12 = "\u05da";
protected static String HEBREW_STRING_13 = "\u05df";
-
+
// strings to test
-
+
// paths
protected static String PATH_1 = "d:\\test\\" + HEBREW_STRING_1 + "\\segment";
protected static String PATH_2 = "\\test\\" + HEBREW_STRING_1 + "\\segment";
@@ -51,7 +51,7 @@ public abstract class TextProcessorTestCase extends TestCase {
protected static String PATH_11 = "\\t\\" + HEBREW_STRING_7 + "\\segment";
protected static String PATH_12 = "d:\\";
protected static String PATH_13 = "\\t";
-
+
protected static String STRING_1 = "d:\\all\\english";
protected static String STRING_2 = "all english with neutrals (spaces) in the middle";
protected static String STRING_3 = "_d:all/english with leading neutral";
@@ -67,7 +67,7 @@ public abstract class TextProcessorTestCase extends TestCase {
protected static String STRING_13 = "d:\\myFolder\\" + HEBREW_STRING_2 + "\\123/myfile." + HEBREW_STRING_6;
protected static String STRING_14 = "d:\\myFolder\\" + HEBREW_STRING_2 + "\\123myfile." + HEBREW_STRING_6;
protected static String STRING_15= "d:\\myFolder\\" + HEBREW_STRING_2 + "12-=\\<>?34" + HEBREW_STRING_6 + ".java";
- protected static String STRING_16 = HEBREW_STRING_2 + "/" + HEBREW_STRING_6 + "/" + HEBREW_STRING_4 + "." + HEBREW_STRING_5;
+ protected static String STRING_16 = HEBREW_STRING_2 + "/" + HEBREW_STRING_6 + "/" + HEBREW_STRING_4 + "." + HEBREW_STRING_5;
protected static String STRING_17 = HEBREW_STRING_7 + "/" + HEBREW_STRING_8 + "/" + HEBREW_STRING_9 + "/" + HEBREW_STRING_10 + "/" +HEBREW_STRING_11 + "/" + HEBREW_STRING_12 + "/" + HEBREW_STRING_13;
protected static String STRING_18 = "_" + HEBREW_STRING_2 + " mixed text starts and ends with neutral.";
protected static String STRING_19 = "english and " + HEBREW_STRING_2 + " text starts with LTR ends with neutral _";
@@ -94,7 +94,7 @@ public abstract class TextProcessorTestCase extends TestCase {
/**
* Constructor for class
- *
+ *
* @param name
*/
public TextProcessorTestCase(String name) {
@@ -102,7 +102,7 @@ public abstract class TextProcessorTestCase extends TestCase {
}
protected void verifyResult(String testName, String expected, String result){
- assertTrue(testName + " result string is not the same as string passed in.", result.equals(expected));
+ assertTrue(testName + " result string is not the same as string passed in.", result.equals(expected));
}
-
+
}
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java
index d3d81e0ca..7b41681b4 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Alex Blewitt (bug 172969)
@@ -53,16 +53,16 @@ import org.osgi.resource.Resource;
import org.osgi.util.tracker.ServiceTracker;
/**
- * Special startup class for the Eclipse Platform. This class cannot be
- * instantiated; all functionality is provided by static methods.
+ * Special startup class for the Eclipse Platform. This class cannot be
+ * instantiated; all functionality is provided by static methods.
* <p>
- * The Eclipse Platform makes heavy use of Java class loaders for loading
+ * The Eclipse Platform makes heavy use of Java class loaders for loading
* plug-ins. Even the Eclipse Runtime itself and the OSGi framework need
- * to be loaded by special class loaders. The upshot is that a
- * client program (such as a Java main program, a servlet) cannot
- * reference any part of Eclipse directly. Instead, a client must use this
- * loader class to start the platform, invoking functionality defined
- * in plug-ins, and shutting down the platform when done.
+ * to be loaded by special class loaders. The upshot is that a
+ * client program (such as a Java main program, a servlet) cannot
+ * reference any part of Eclipse directly. Instead, a client must use this
+ * loader class to start the platform, invoking functionality defined
+ * in plug-ins, and shutting down the platform when done.
* </p>
* <p>Note that the fields on this class are not API. </p>
* @since 3.0
@@ -89,12 +89,12 @@ public class EclipseStarter {
private static final String ARCH = "-arch"; //$NON-NLS-1$
private static final String NL = "-nl"; //$NON-NLS-1$
private static final String NL_EXTENSIONS = "-nlExtensions"; //$NON-NLS-1$
- private static final String CONFIGURATION = "-configuration"; //$NON-NLS-1$
+ private static final String CONFIGURATION = "-configuration"; //$NON-NLS-1$
private static final String USER = "-user"; //$NON-NLS-1$
private static final String NOEXIT = "-noExit"; //$NON-NLS-1$
private static final String LAUNCHER = "-launcher"; //$NON-NLS-1$
- // this is more of an Eclipse argument but this OSGi implementation stores its
+ // this is more of an Eclipse argument but this OSGi implementation stores its
// metadata alongside Eclipse's.
private static final String DATA = "-data"; //$NON-NLS-1$
@@ -232,13 +232,13 @@ public class EclipseStarter {
/**
* Launches the platform and runs a single application. The application is either identified
- * in the given arguments (e.g., -application &lt;app id&gt;) or in the <code>eclipse.application</code>
- * System property. This convenience method starts
- * up the platform, runs the indicated application, and then shuts down the
- * platform. The platform must not be running already.
- *
+ * in the given arguments (e.g., -application &lt;app id&gt;) or in the <code>eclipse.application</code>
+ * System property. This convenience method starts
+ * up the platform, runs the indicated application, and then shuts down the
+ * platform. The platform must not be running already.
+ *
* @param args the command line-style arguments used to configure the platform
- * @param endSplashHandler the block of code to run to tear down the splash
+ * @param endSplashHandler the block of code to run to tear down the splash
* screen or <code>null</code> if no tear down is required
* @return the result of running the application
* @throws Exception if anything goes wrong
@@ -300,7 +300,7 @@ public class EclipseStarter {
/**
* Starts the platform and sets it up to run a single application. The application is either identified
* in the given arguments (e.g., -application &lt;app id&gt;) or in the <code>eclipse.application</code>
- * System property. The platform must not be running already.
+ * System property. The platform must not be running already.
* <p>
* The given runnable (if not <code>null</code>) is used to tear down the splash screen if required.
* </p>
@@ -371,8 +371,8 @@ public class EclipseStarter {
}
/**
- * Runs the application for which the platform was started. The platform
- * must be running.
+ * Runs the application for which the platform was started. The platform
+ * must be running.
* <p>
* The given argument is passed to the application being run. If it is <code>null</code>
* then the command line arguments used in starting the platform, and not consumed
@@ -395,8 +395,8 @@ public class EclipseStarter {
// create the ApplicationLauncher and register it as a service
appLauncher = new EclipseAppLauncher(context, Boolean.parseBoolean(getProperty(PROP_ALLOW_APPRELAUNCH)), launchDefault, log, equinoxConfig);
appLauncherRegistration = context.registerService(ApplicationLauncher.class.getName(), appLauncher, null);
- // must start the launcher AFTER service restration because this method
- // blocks and runs the application on the current thread. This method
+ // must start the launcher AFTER service restration because this method
+ // blocks and runs the application on the current thread. This method
// will return only after the application has stopped.
return appLauncher.start(argument);
}
@@ -415,19 +415,19 @@ public class EclipseStarter {
}
/**
- * Shuts down the Platform. The state of the Platform is not automatically
- * saved before shutting down.
+ * Shuts down the Platform. The state of the Platform is not automatically
+ * saved before shutting down.
* <p>
- * On return, the Platform will no longer be running (but could be re-launched
+ * On return, the Platform will no longer be running (but could be re-launched
* with another call to startup). If relaunching, care must be taken to reinitialize
* any System properties which the platform uses (e.g., osgi.instance.area) as
- * some policies in the platform do not allow resetting of such properties on
+ * some policies in the platform do not allow resetting of such properties on
* subsequent runs.
* </p><p>
- * Any objects handed out by running Platform,
- * including Platform runnables obtained via getRunnable, will be
- * permanently invalid. The effects of attempting to invoke methods
- * on invalid objects is undefined.
+ * Any objects handed out by running Platform,
+ * including Platform runnables obtained via getRunnable, will be
+ * permanently invalid. The effects of attempting to invoke methods
+ * on invalid objects is undefined.
* </p>
* @throws Exception if anything goes wrong
*/
@@ -516,8 +516,8 @@ public class EclipseStarter {
url = createURL(new File(parent).toURL(), name);
} catch (MalformedURLException e) {
// TODO this is legacy support for non-URL names. It should be removed eventually.
- // if name was not a URL then construct one.
- // Assume it should be a reference and that it is relative. This support need not
+ // if name was not a URL then construct one.
+ // Assume it should be a reference and that it is relative. This support need not
// be robust as it is temporary..
File child = new File(name);
fileLocation = child.isAbsolute() ? child : new File(parent, name);
@@ -543,7 +543,7 @@ public class EclipseStarter {
if (!fileLocation.isAbsolute())
fileLocation = new File(parent, fileLocation.toString());
}
- // If the result is a reference then search for the real result and
+ // If the result is a reference then search for the real result and
// reconstruct the answer.
if (reference) {
String result = searchFor(fileLocation.getName(), new File(fileLocation.getParent()).getAbsolutePath());
@@ -553,7 +553,7 @@ public class EclipseStarter {
return null;
}
- // finally we have something worth trying
+ // finally we have something worth trying
try {
URLConnection result = LocationHelper.getConnection(url);
result.connect();
@@ -567,7 +567,7 @@ public class EclipseStarter {
/*
* Ensure all basic bundles are installed, resolved and scheduled to start. Returns an array containing
- * all basic bundles that are marked to start.
+ * all basic bundles that are marked to start.
* Returns null if the framework has been shutdown as a result of refreshPackages
*/
private static Bundle[] loadBasicBundles() throws InterruptedException {
@@ -586,7 +586,7 @@ public class EclipseStarter {
// list of bundles to be refreshed
List<Bundle> toRefresh = new ArrayList<>(curInitBundles.length);
- // uninstall any of the currently installed bundles that do not exist in the
+ // uninstall any of the currently installed bundles that do not exist in the
// initial bundle list from installEntries.
uninstallBundles(curInitBundles, initialBundles, toRefresh);
@@ -705,7 +705,7 @@ public class EclipseStarter {
// check for args without parameters (i.e., a flag arg)
// check if debug should be enabled for the entire platform
- // If this is the last arg or there is a following arg (i.e., arg+1 has a leading -),
+ // If this is the last arg or there is a following arg (i.e., arg+1 has a leading -),
// simply enable debug. Otherwise, assume that that the following arg is
// actually the filename of an options file. This will be processed below.
if (args[i].equalsIgnoreCase(DEBUG) && ((i + 1 == args.length) || ((i + 1 < args.length) && (args[i + 1].startsWith("-"))))) { //$NON-NLS-1$
@@ -715,7 +715,7 @@ public class EclipseStarter {
}
// check if development mode should be enabled for the entire platform
- // If this is the last arg or there is a following arg (i.e., arg+1 has a leading -),
+ // If this is the last arg or there is a following arg (i.e., arg+1 has a leading -),
// simply enable development mode. Otherwise, assume that that the following arg is
// actually some additional development time class path entries. This will be processed below.
if (args[i].equalsIgnoreCase(DEV) && ((i + 1 == args.length) || ((i + 1 < args.length) && (args[i + 1].startsWith("-"))))) { //$NON-NLS-1$
@@ -741,7 +741,7 @@ public class EclipseStarter {
found = true;
}
- // look for the console with no port.
+ // look for the console with no port.
if (args[i].equalsIgnoreCase(CONSOLE) && ((i + 1 == args.length) || ((i + 1 < args.length) && (args[i + 1].startsWith("-"))))) { //$NON-NLS-1$
setProperty(PROP_CONSOLE, ""); //$NON-NLS-1$
found = true;
@@ -763,25 +763,25 @@ public class EclipseStarter {
}
String arg = args[++i];
- // look for the console and port.
+ // look for the console and port.
if (args[i - 1].equalsIgnoreCase(CONSOLE)) {
setProperty(PROP_CONSOLE, arg);
found = true;
}
- // look for the configuration location .
+ // look for the configuration location .
if (args[i - 1].equalsIgnoreCase(CONFIGURATION)) {
setProperty(EquinoxLocations.PROP_CONFIG_AREA, arg);
found = true;
}
- // look for the data location for this instance.
+ // look for the data location for this instance.
if (args[i - 1].equalsIgnoreCase(DATA)) {
setProperty(EquinoxLocations.PROP_INSTANCE_AREA, arg);
found = true;
}
- // look for the user location for this instance.
+ // look for the user location for this instance.
if (args[i - 1].equalsIgnoreCase(USER)) {
setProperty(EquinoxLocations.PROP_USER_AREA, arg);
found = true;
@@ -792,20 +792,20 @@ public class EclipseStarter {
setProperty(EquinoxLocations.PROP_LAUNCHER, arg);
found = true;
}
- // look for the development mode and class path entries.
+ // look for the development mode and class path entries.
if (args[i - 1].equalsIgnoreCase(DEV)) {
setProperty(PROP_DEV, arg);
found = true;
}
- // look for the debug mode and option file location.
+ // look for the debug mode and option file location.
if (args[i - 1].equalsIgnoreCase(DEBUG)) {
setProperty(PROP_DEBUG, arg);
debug = true;
found = true;
}
- // look for the window system.
+ // look for the window system.
if (args[i - 1].equalsIgnoreCase(WS)) {
setProperty(PROP_WS, arg);
found = true;
@@ -835,7 +835,7 @@ public class EclipseStarter {
found = true;
}
- // done checking for args. Remember where an arg was found
+ // done checking for args. Remember where an arg was found
if (found) {
configArgs[configArgIndex++] = i - 1;
configArgs[configArgIndex++] = i;
@@ -865,7 +865,7 @@ public class EclipseStarter {
/**
* Returns the result of converting a list of comma-separated tokens into an array
- *
+ *
* @return the array of string tokens
* @param prop the initial comma-separated string
*/
@@ -1076,7 +1076,7 @@ public class EclipseStarter {
/**
* Returns a URL which is equivalent to the given URL relative to the
* specified base URL. Works only for file: URLs
- * @throws MalformedURLException
+ * @throws MalformedURLException
*/
private static URL makeRelative(URL base, URL location) throws MalformedURLException {
if (base == null)
@@ -1090,7 +1090,7 @@ public class EclipseStarter {
if (!base.getProtocol().equals(nonReferenceLocation.getProtocol()))
return location;
File locationPath = new File(nonReferenceLocation.getPath());
- // if location is not absolute, return original location
+ // if location is not absolute, return original location
if (!locationPath.isAbsolute())
return location;
File relativePath = makeRelative(new File(base.getPath()), locationPath);
@@ -1098,9 +1098,9 @@ public class EclipseStarter {
if (File.separatorChar != '/')
urlPath = urlPath.replace(File.separatorChar, '/');
if (nonReferenceLocation.getPath().endsWith("/")) //$NON-NLS-1$
- // restore original trailing slash
+ // restore original trailing slash
urlPath += '/';
- // couldn't use File to create URL here because it prepends the path with user.dir
+ // couldn't use File to create URL here because it prepends the path with user.dir
URL relativeURL = createURL(base.getProtocol(), base.getHost(), base.getPort(), urlPath);
// now make it back to a reference URL
relativeURL = createURL(REFERENCE_SCHEME + relativeURL.toExternalForm());
@@ -1205,9 +1205,9 @@ public class EclipseStarter {
/**
* Searches for the given target directory immediately under
- * the given start location. If one is found then this location is returned;
+ * the given start location. If one is found then this location is returned;
* otherwise an exception is thrown.
- *
+ *
* @return the location where target directory was found
* @param start the location to begin searching
*/
@@ -1239,7 +1239,7 @@ public class EclipseStarter {
continue;
}
// Note: directory with version suffix is always > than directory without version suffix
- String version = candidateName.length() > target.length() + 1 && (versionSep == '_' || versionSep == '-') ? candidateName.substring(target.length() + 1) : ""; //$NON-NLS-1$
+ String version = candidateName.length() > target.length() + 1 && (versionSep == '_' || versionSep == '-') ? candidateName.substring(target.length() + 1) : ""; //$NON-NLS-1$
Object[] currentVersion = getVersionElements(version);
if (currentVersion != null && compareVersion(maxVersion, currentVersion) < 0) {
File candidate = new File(start, candidateName);
@@ -1263,7 +1263,7 @@ public class EclipseStarter {
* with suitable defaults.
* @return an array of size 4; first three elements are of type Integer (representing
* major, minor and service) and the fourth element is of type String (representing
- * qualifier). A value of null is returned if there are no valid Integers. Note, that
+ * qualifier). A value of null is returned if there are no valid Integers. Note, that
* returning anything else will cause exceptions in the caller.
*/
private static Object[] getVersionElements(String version) {
@@ -1291,7 +1291,7 @@ public class EclipseStarter {
}
/**
- * Compares version strings.
+ * Compares version strings.
* @return result of comparison, as integer;
* <code><0</code> if left < right;
* <code>0</code> if left == right;
@@ -1330,12 +1330,12 @@ public class EclipseStarter {
}
/**
- * Sets the initial properties for the platform.
- * This method must be called before calling the {@link #run(String[], Runnable)} or
- * {@link #startup(String[], Runnable)} methods for the properties to be used in
- * a launched instance of the platform.
+ * Sets the initial properties for the platform.
+ * This method must be called before calling the {@link #run(String[], Runnable)} or
+ * {@link #startup(String[], Runnable)} methods for the properties to be used in
+ * a launched instance of the platform.
* <p>
- * If the specified properties contains a null value then the key for that value
+ * If the specified properties contains a null value then the key for that value
* will be cleared from the properties of the platform.
* </p>
* @param initialProperties the initial properties to set for the platform.
@@ -1353,7 +1353,7 @@ public class EclipseStarter {
}
/**
- * Returns the context of the system bundle. A value of
+ * Returns the context of the system bundle. A value of
* <code>null</code> is returned if the platform is not running.
* @return the context of the system bundle
* @throws java.lang.SecurityException If the caller does not have the
@@ -1373,15 +1373,15 @@ public class EclipseStarter {
/*
* NOTE: This is an internal/experimental method used by launchers that need to react when the framework
* is shutdown internally.
- *
+ *
* Adds a framework shutdown handler. <p>
* A handler implements the {@link Runnable} interface. When the framework is shutdown
- * the {@link Runnable#run()} method is called for each registered handler. Handlers should
- * make no assumptions on the thread it is being called from. If a handler object is
+ * the {@link Runnable#run()} method is called for each registered handler. Handlers should
+ * make no assumptions on the thread it is being called from. If a handler object is
* registered multiple times it will be called once for each registration.
* <p>
- * At the time a handler is called the framework is shutdown. Handlers must not depend on
- * a running framework to execute or attempt to load additional classes from bundles
+ * At the time a handler is called the framework is shutdown. Handlers must not depend on
+ * a running framework to execute or attempt to load additional classes from bundles
* installed in the framework.
* @param handler the framework shutdown handler
* @throws IllegalStateException if the platform is already running
@@ -1399,7 +1399,7 @@ public class EclipseStarter {
/*
* NOTE: This is an internal/experimental method used by launchers that need to react when the framework
* is shutdown internally.
- *
+ *
* Removes a framework shutdown handler. <p>
* @param handler the framework shutdown handler
* @throws IllegalStateException if the platform is already running
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/ConsoleManager.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/ConsoleManager.java
index e7055df27..ef4a32087 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/ConsoleManager.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/ConsoleManager.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/DefaultStartupMonitor.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/DefaultStartupMonitor.java
index 583ddd593..bad1d89e4 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/DefaultStartupMonitor.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/DefaultStartupMonitor.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* Andrew Niefer - IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -28,7 +28,7 @@ public class DefaultStartupMonitor implements StartupMonitor {
/**
* Create a new startup monitor using the given splash handler. The splash handle must
* have an updateSplash method.
- *
+ *
* @param splashHandler
* @throws IllegalStateException
*/
@@ -42,7 +42,7 @@ public class DefaultStartupMonitor implements StartupMonitor {
//TODO maybe we could do something else in the update method in this case, like print something to the console?
throw new IllegalStateException(e.getMessage(), e);
}
-
+
}
/* (non-Javadoc)
@@ -64,7 +64,7 @@ public class DefaultStartupMonitor implements StartupMonitor {
@Override
public void applicationRunning() {
if (EclipseStarter.debug) {
- String timeString = equinoxConfig.getConfiguration("eclipse.startTime"); //$NON-NLS-1$
+ String timeString = equinoxConfig.getConfiguration("eclipse.startTime"); //$NON-NLS-1$
long time = timeString == null ? 0L : Long.parseLong(timeString);
Debug.println("Application started in : " + (System.currentTimeMillis() - time) + "ms"); //$NON-NLS-1$ //$NON-NLS-2$
}
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseAppLauncher.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseAppLauncher.java
index ffc771cc1..fef62dfc6 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseAppLauncher.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseAppLauncher.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -71,7 +71,7 @@ public class EclipseAppLauncher implements ApplicationLauncher {
/*
* Starts this application launcher on the current thread. This method
- * should be called by the main thread to ensure that applications are
+ * should be called by the main thread to ensure that applications are
* launched in the main thread.
*/
public Object start(Object defaultContext) throws Exception {
@@ -128,9 +128,9 @@ public class EclipseAppLauncher implements ApplicationLauncher {
// this must happen after we have acquired an application (by acquiring waitForAppLock above).
runningLock.acquire();
if (EclipseStarter.debug) {
- String timeString = equinoxConfig.getConfiguration("eclipse.startTime"); //$NON-NLS-1$
+ String timeString = equinoxConfig.getConfiguration("eclipse.startTime"); //$NON-NLS-1$
long time = timeString == null ? 0L : Long.parseLong(timeString);
- Debug.println("Starting application: " + (System.currentTimeMillis() - time)); //$NON-NLS-1$
+ Debug.println("Starting application: " + (System.currentTimeMillis() - time)); //$NON-NLS-1$
}
try {
// run the actual application on the current thread (main).
@@ -179,7 +179,7 @@ public class EclipseAppLauncher implements ApplicationLauncher {
/*
* Similar to the start method this method will restart the default method on current thread.
- * This method assumes that the default application was launched at least once and that an ApplicationDescriptor
+ * This method assumes that the default application was launched at least once and that an ApplicationDescriptor
* exists that can be used to relaunch the default application.
*/
public Object reStart(Object argument) throws Exception {
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/Module.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/Module.java
index 3e38958f4..8f9219471 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/Module.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/Module.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -44,7 +44,7 @@ public abstract class Module implements BundleReference, BundleStartLevel, Compa
*/
public static enum StartOptions {
/**
- * The module start operation is transient and the persistent
+ * The module start operation is transient and the persistent
* autostart or activation policy setting of the module is not modified.
*/
TRANSIENT,
@@ -87,7 +87,7 @@ public abstract class Module implements BundleReference, BundleStartLevel, Compa
*/
public static enum StopOptions {
/**
- * The module stop operation is transient and the persistent
+ * The module stop operation is transient and the persistent
* autostart setting of the module is not modified.
*/
TRANSIENT;
@@ -379,7 +379,7 @@ public abstract class Module implements BundleReference, BundleStartLevel, Compa
}
/**
- * Returns the thread that currently owns the state change lock for this module, or
+ * Returns the thread that currently owns the state change lock for this module, or
* <code>null</code> if not owned.
* @return the owner, or <code>null</code> if not owned.
*/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleCapability.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleCapability.java
index fb49562f9..0da9f66e5 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleCapability.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleCapability.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleCollisionHook.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleCollisionHook.java
index ceccd8dd5..7f2193dcc 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleCollisionHook.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleCollisionHook.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -41,17 +41,17 @@ public interface ModuleCollisionHook {
* <li> {@link #INSTALLING installing} - The target is the module associated
* which is performing the install operation. The
* collision candidate collection contains the existing modules installed
- * which have a current revision with the same symbolic name and version as the
+ * which have a current revision with the same symbolic name and version as the
* module being installed.
- * <li> {@link #UPDATING updating} - The target is the module being updated.
+ * <li> {@link #UPDATING updating} - The target is the module being updated.
* The collision candidate collection contains the existing modules installed which have
- * a current revision with the same symbolic name and version as the content the target
+ * a current revision with the same symbolic name and version as the content the target
* module is being updated to.
* </ul>
* This method can filter the collection of collision candidates by removing
* potential collisions. For the specified operation to succeed, the
* collection of collision candidates must be empty when this method returns.
- *
+ *
* @param operationType The operation type. Must be the value of
* {@link #INSTALLING installing} or {@link #UPDATING updating}.
* @param target The target module used to determine what collision
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainer.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainer.java
index c248ff4e2..a45fafd7c 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainer.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainer.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -117,7 +117,7 @@ public final class ModuleContainer implements DebugOptionsListener {
final ModuleContainerAdaptor adaptor;
/**
- * The module resolver which implements the ResolverContext and handles calling the
+ * The module resolver which implements the ResolverContext and handles calling the
* resolver service.
*/
private final ModuleResolver moduleResolver;
@@ -191,7 +191,7 @@ public final class ModuleContainer implements DebugOptionsListener {
}
/**
- * Returns the module installed with the specified id, or null if no
+ * Returns the module installed with the specified id, or null if no
* such module is installed.
* @param id the id of the module
* @return the module with the specified id, or null of no such module is installed.
@@ -201,7 +201,7 @@ public final class ModuleContainer implements DebugOptionsListener {
}
/**
- * Returns the module installed with the specified location, or null if no
+ * Returns the module installed with the specified location, or null if no
* such module is installed.
* @param location the location of the module
* @return the module with the specified location, or null of no such module is installed.
@@ -224,17 +224,17 @@ public final class ModuleContainer implements DebugOptionsListener {
/**
* Installs a new module using the specified location. The specified
- * builder is used to create a new {@link ModuleRevision revision}
+ * builder is used to create a new {@link ModuleRevision revision}
* which will become the {@link Module#getCurrentRevision() current}
* revision of the new module.
* <p>
- * If a module already exists with the specified location then the
+ * If a module already exists with the specified location then the
* existing module is returned and the builder is not used.
* @param origin the module performing the install, may be {@code null}.
- * @param location The location identifier of the module to install.
+ * @param location The location identifier of the module to install.
* @param builder the builder used to create the revision to install.
* @param revisionInfo the revision info for the new revision, may be {@code null}.
- * @return a new module or a existing module if one exists at the
+ * @return a new module or a existing module if one exists at the
* specified location.
* @throws BundleException if some error occurs installing the module
*/
@@ -325,7 +325,7 @@ public final class ModuleContainer implements DebugOptionsListener {
/**
* Updates the specified module with a new revision. The specified
- * builder is used to create a new {@link ModuleRevision revision}
+ * builder is used to create a new {@link ModuleRevision revision}
* which will become the {@link Module#getCurrentRevision() current}
* revision of the new module.
* @param module the module to update
@@ -481,7 +481,7 @@ public final class ModuleContainer implements DebugOptionsListener {
* Attempts to resolve the current revisions of the specified modules.
* @param triggers the modules to resolve or {@code null} to resolve all unresolved
* current revisions.
- * @param triggersMandatory true if the triggers must be resolved. This will result in
+ * @param triggersMandatory true if the triggers must be resolved. This will result in
* a {@link ResolutionException} if set to true and one of the triggers could not be resolved.
* @see FrameworkWiring#resolveBundles(Collection)
* @return A resolution report for the resolve operation
@@ -562,7 +562,7 @@ public final class ModuleContainer implements DebugOptionsListener {
* Attempts to resolve the specified dynamic package name request for the specified revision.
* @param dynamicPkgName the package name to attempt a dynamic resolution for
* @param revision the module revision the dynamic resolution request is for
- * @return the new resolution wire establishing a dynamic package resolution or null if
+ * @return the new resolution wire establishing a dynamic package resolution or null if
* a dynamic wire could not be established.
*/
public ModuleWire resolveDynamic(String dynamicPkgName, ModuleRevision revision) {
@@ -1141,8 +1141,8 @@ public final class ModuleContainer implements DebugOptionsListener {
/**
* Returns the dependency closure of for the specified modules.
* @param initial The initial modules for which to generate the dependency closure
- * @return A collection containing a snapshot of the dependency closure of the specified
- * modules, or an empty collection if there were no specified modules.
+ * @return A collection containing a snapshot of the dependency closure of the specified
+ * modules, or an empty collection if there were no specified modules.
*/
public Collection<Module> getDependencyClosure(Collection<Module> initial) {
moduleDatabase.readLock();
@@ -1164,11 +1164,11 @@ public final class ModuleContainer implements DebugOptionsListener {
/**
* Return the active start level value of this container.
- *
+ *
* If the container is in the process of changing the start level this
* method must return the active start level if this differs from the
* requested start level.
- *
+ *
* @return The active start level value of the Framework.
*/
public int getStartLevel() {
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainerAdaptor.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainerAdaptor.java
index df8838e76..5e067a82c 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainerAdaptor.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainerAdaptor.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -242,7 +242,7 @@ public abstract class ModuleContainerAdaptor {
}
/**
- * This is called when a wiring is made invalid and allows the adaptor to react
+ * This is called when a wiring is made invalid and allows the adaptor to react
* to this. This method is called while holding state change lock for the
* module as well as for the module database. Care must be taken not to introduce
* deadlock.
@@ -256,7 +256,7 @@ public abstract class ModuleContainerAdaptor {
/**
* This is called if a request to refresh modules causes the system module
* to be refreshed. This causes the system module to be stopped in a back
- * ground thread. This method is called before the background thread is
+ * ground thread. This method is called before the background thread is
* started to stop the system module.
*/
public void refreshedSystemModule() {
@@ -303,7 +303,7 @@ public abstract class ModuleContainerAdaptor {
}
/**
- * Returns the executor used to by the
+ * Returns the executor used to by the
* {@link ModuleContainer#getFrameworkStartLevel() FrameworkStartLevel} implementation to
* start bundles that have the same start level. This allows bundles to be
* started in parallel.
@@ -319,11 +319,11 @@ public abstract class ModuleContainerAdaptor {
* call when a new module is {@link ModuleContainer#install(Module, String, ModuleRevisionBuilder, Object) installed}
* into the container or when an existing module is {@link ModuleContainer#update(Module, ModuleRevisionBuilder, Object) updated}
* with a new revision. The container does not call any methods on the builder before calling this method.
- * @param operation The lifecycle operation event that is in progress using the supplied builder.
+ * @param operation The lifecycle operation event that is in progress using the supplied builder.
* This will be either {@link ModuleEvent#INSTALLED installed} or {@link ModuleEvent#UPDATED updated}.
* @param origin The module which originated the lifecycle operation. The origin may be {@code null} for
* {@link ModuleEvent#INSTALLED installed} operations. This is the module
- * passed to the {@link ModuleContainer#install(Module, String, ModuleRevisionBuilder, Object) install} or
+ * passed to the {@link ModuleContainer#install(Module, String, ModuleRevisionBuilder, Object) install} or
* {@link ModuleContainer#update(Module, ModuleRevisionBuilder, Object) update} method.
* @param builder the builder that will be used to create a new {@link ModuleRevision}.
* @param revisionInfo the revision info that will be used for the new revision, may be {@code null}.
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleDatabase.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleDatabase.java
index 1b27d8de2..e1af37150 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleDatabase.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleDatabase.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -59,7 +59,7 @@ import org.osgi.service.resolver.Resolver;
* the wiring states.
* <p>
* <strong>Concurrent Semantics</strong><br />
- *
+ *
* Implementations must be thread safe. The database allows for concurrent
* read operations and all read operations are protected by the
* {@link #readLock() read} lock. All write operations are
@@ -72,7 +72,7 @@ import org.osgi.service.resolver.Resolver;
* to upgrade from a read to a write lock.
* <p>
* A database is associated with a {@link ModuleContainer container}. The container
- * associated with a database provides public API for manipulating the modules
+ * associated with a database provides public API for manipulating the modules
* and their wiring states. For example, installing, updating, uninstalling,
* resolving and unresolving modules. Except for the {@link #load(DataInputStream)},
* all other methods that perform write operations are intended to be used by
@@ -481,13 +481,13 @@ public class ModuleDatabase {
/**
* Returns a cloned snapshot of the wirings of all revisions. This
- * performs a clone of each {@link ModuleWiring}. The
+ * performs a clone of each {@link ModuleWiring}. The
* {@link ModuleWiring#getRevision() revision},
* {@link ModuleWiring#getModuleCapabilities(String) capabilities},
* {@link ModuleWiring#getModuleRequirements(String) requirements},
* {@link ModuleWiring#getProvidedModuleWires(String) provided wires},
* {@link ModuleWiring#getRequiredModuleWires(String) required wires}, and
- * {@link ModuleWiring#getSubstitutedNames()} of
+ * {@link ModuleWiring#getSubstitutedNames()} of
* each wiring are copied into a cloned copy of the wiring.
* <p>
* The returned map of wirings may be safely read from while not holding
@@ -813,7 +813,7 @@ public class ModuleDatabase {
/**
* Adds the {@link ModuleRevision#getModuleCapabilities(String) capabilities}
- * provided by the specified revision to this database. These capabilities must
+ * provided by the specified revision to this database. These capabilities must
* become available for lookup with the {@link ModuleDatabase#findCapabilities(Requirement)}
* method.
* <p>
@@ -832,7 +832,7 @@ public class ModuleDatabase {
/**
* Removes the {@link ModuleRevision#getModuleCapabilities(String) capabilities}
* provided by the specified revision from this database. These capabilities
- * must no longer be available for lookup with the
+ * must no longer be available for lookup with the
* {@link ModuleDatabase#findCapabilities(Requirement)} method.
* <p>
* This method must be called while holding the {@link #writeLock() write} lock.
@@ -844,7 +844,7 @@ public class ModuleDatabase {
}
/**
- * Returns a mutable snapshot of capabilities that are candidates for
+ * Returns a mutable snapshot of capabilities that are candidates for
* satisfying the specified requirement.
* <p>
* A read operation protected by the {@link #readLock() read} lock.
@@ -866,14 +866,14 @@ public class ModuleDatabase {
* Writes this database in a format suitable for using the {@link #load(DataInputStream)}
* method. All modules are stored which have a current {@link ModuleRevision revision}.
* Only the current revision of each module is stored (no removal pending revisions
- * are stored). Optionally the {@link ModuleWiring wiring} of each current revision
+ * are stored). Optionally the {@link ModuleWiring wiring} of each current revision
* may be stored. Wiring can only be stored if there are no {@link #getRemovalPending()
* removal pending} revisions.
* <p>
* This method acquires the {@link #readLock() read} lock while writing this
* database.
* <p>
- * After this database have been written, the output stream is flushed.
+ * After this database have been written, the output stream is flushed.
* The output stream remains open after this method returns.
* @param out the data output steam.
* @param persistWirings true if wirings should be persisted. This option will be ignored
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleLoader.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleLoader.java
index 237747163..9e2c390c2 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleLoader.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleLoader.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -37,7 +37,7 @@ public abstract class ModuleLoader {
protected abstract List<URL> findEntries(String path, String filePattern, int options);
/**
- *
+ *
* @param path
* @param filePattern
* @param options
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRequirement.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRequirement.java
index 4cacf4e60..42f69c1c9 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRequirement.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRequirement.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -24,7 +24,7 @@ import org.osgi.framework.wiring.BundleRequirement;
import org.osgi.resource.Namespace;
/**
- * An implementation of {@link BundleRequirement}. This requirement implements
+ * An implementation of {@link BundleRequirement}. This requirement implements
* the matches method according to the OSGi specification which includes
* implementing the mandatory directive for the osgi.wiring.* namespaces.
* @since 3.10
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java
index 7766a670b..cf8318a79 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -150,11 +150,11 @@ final class ModuleResolver {
/**
* Attempts to resolve all unresolved modules installed in the specified module database.
- * returns a delta containing the new wirings or modified wirings that should be
+ * returns a delta containing the new wirings or modified wirings that should be
* merged into the specified moduleDatabase.
* <p>
* This method only does read operations on the database no wirings are modified
- * directly by this method. The returned wirings need to be merged into
+ * directly by this method. The returned wirings need to be merged into
* the database.
* @param triggers the triggers that caused the resolver operation to occur
* @param triggersMandatory true if the triggers must be resolved by the resolve process
@@ -563,12 +563,12 @@ final class ModuleResolver {
private final Collection<ModuleRevision> unresolved;
/*
* Contains unresolved revisions that should not be resolved as part of
- * this process. The reasons they should not be resolved will vary. For
+ * this process. The reasons they should not be resolved will vary. For
* example, some might have been filtered out by the resolver hook while
* others represent singleton collisions. It is assumed that all
* unresolved revisions are disabled at the start of the resolve
* process (see initialization in constructors). Any not filtered out
- * by ResolverHook.filterResolvable are then removed but may be added
+ * by ResolverHook.filterResolvable are then removed but may be added
* back later for other reasons.
*/
private final Collection<ModuleRevision> disabled;
@@ -589,7 +589,7 @@ final class ModuleResolver {
private AtomicReference<ScheduledFuture<?>> timoutFuture = new AtomicReference<>();
/*
* Used to generate the UNRESOLVED_PROVIDER resolution report entries.
- *
+ *
* The inner map associates a requirement to the set of all matching
* capabilities that were found. The outer map associates the requiring
* resource to the inner map so that its contents may easily be looked
@@ -973,7 +973,7 @@ final class ModuleResolver {
Map<Resource, List<Wire>> dynamicAttachWirings = resolveNonPayLoadFragments();
applyInterimResultToWiringCopy(dynamicAttachWirings);
if (!dynamicAttachWirings.isEmpty()) {
- // be sure to remove the revisions from the optional and triggers
+ // be sure to remove the revisions from the optional and triggers
// so they no longer attempt to be resolved
Set<Resource> fragmentResources = dynamicAttachWirings.keySet();
triggers.removeAll(fragmentResources);
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevision.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevision.java
index 223990823..b7261b480 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevision.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevision.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -119,8 +119,8 @@ public final class ModuleRevision implements BundleRevision {
/**
* Returns the capabilities declared by this revision
- * @param namespace The namespace of the declared capabilities to return or
- * {@code null} to return the declared capabilities from all namespaces.
+ * @param namespace The namespace of the declared capabilities to return or
+ * {@code null} to return the declared capabilities from all namespaces.
* @return An unmodifiable list containing the declared capabilities.
*/
public List<ModuleCapability> getModuleCapabilities(String namespace) {
@@ -137,8 +137,8 @@ public final class ModuleRevision implements BundleRevision {
/**
* Returns the requirements declared by this revision
- * @param namespace The namespace of the declared requirements to return or
- * {@code null} to return the declared requirements from all namespaces.
+ * @param namespace The namespace of the declared requirements to return or
+ * {@code null} to return the declared requirements from all namespaces.
* @return An unmodifiable list containing the declared requirements.
*/
public List<ModuleRequirement> getModuleRequirements(String namespace) {
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevisionBuilder.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevisionBuilder.java
index a3b5e4b75..ca895ae2b 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevisionBuilder.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevisionBuilder.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -32,9 +32,9 @@ import org.osgi.framework.wiring.BundleRevision;
import org.osgi.resource.Namespace;
/**
- * A builder for creating module {@link ModuleRevision} objects. A builder can only be used by
- * the module {@link ModuleContainer container} to build revisions when
- * {@link ModuleContainer#install(Module, String, ModuleRevisionBuilder, Object)
+ * A builder for creating module {@link ModuleRevision} objects. A builder can only be used by
+ * the module {@link ModuleContainer container} to build revisions when
+ * {@link ModuleContainer#install(Module, String, ModuleRevisionBuilder, Object)
* installing} or {@link ModuleContainer#update(Module, ModuleRevisionBuilder, Object) updating} a module.
* <p>
* The builder provides the instructions to the container for creating a {@link ModuleRevision}.
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevisions.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevisions.java
index 00af04e86..2570138a3 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevisions.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleRevisions.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -20,10 +20,10 @@ import org.osgi.framework.wiring.BundleRevision;
import org.osgi.framework.wiring.BundleRevisions;
/**
- * An implementation of {@link BundleRevisions} which represent a
+ * An implementation of {@link BundleRevisions} which represent a
* {@link Module} installed in a {@link ModuleContainer container}.
- * The ModuleRevisions provides a bridge between the revisions, the
- * module and the container they are associated with. The
+ * The ModuleRevisions provides a bridge between the revisions, the
+ * module and the container they are associated with. The
* ModuleRevisions holds the information about the installation of
* a module in a container such as the module id and location.
* @since 3.10
@@ -77,7 +77,7 @@ public final class ModuleRevisions implements BundleRevisions {
/**
* Returns the current {@link ModuleRevision revision} associated with this revisions.
- *
+ *
* @return the current {@link ModuleRevision revision} associated with this revisions
* or {@code null} if the current revision does not exist.
*/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleWire.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleWire.java
index 1de66ab12..8fa836b53 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleWire.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleWire.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleWiring.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleWiring.java
index 5d72c4f27..7f21644f4 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleWiring.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleWiring.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -261,7 +261,7 @@ public final class ModuleWiring implements BundleWiring {
}
/**
- * Returns the module loader for this wiring. If the module
+ * Returns the module loader for this wiring. If the module
* loader does not exist yet then one will be created
* @return the module loader for this wiring.
*/
@@ -384,7 +384,7 @@ public final class ModuleWiring implements BundleWiring {
}
/**
- * Returns an unmodifiable collection of package names for
+ * Returns an unmodifiable collection of package names for
* package capabilities that have been substituted.
* @return the substituted package names
*/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/SystemModule.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/SystemModule.java
index e7e8426e0..31f9e80a9 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/SystemModule.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/SystemModule.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -179,7 +179,7 @@ public abstract class SystemModule extends Module {
}
/**
- * @throws BundleException
+ * @throws BundleException
*/
protected void initWorker() throws BundleException {
// Do nothing
@@ -197,7 +197,7 @@ public abstract class SystemModule extends Module {
@Override
public void stop(StopOptions... options) throws BundleException {
ContainerEvent containerEvent = ContainerEvent.STOPPED_TIMEOUT;
- // Need to lock the state change lock with no state to prevent
+ // Need to lock the state change lock with no state to prevent
// other threads from starting the framework while we are shutting down
try {
if (stateChangeLock.tryLock(10, TimeUnit.SECONDS)) {
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/builders/OSGiManifestBuilderFactory.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/builders/OSGiManifestBuilderFactory.java
index adcce44b6..674850459 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/builders/OSGiManifestBuilderFactory.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/builders/OSGiManifestBuilderFactory.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/namespaces/EclipsePlatformNamespace.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/namespaces/EclipsePlatformNamespace.java
index 3be51579a..9376db001 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/namespaces/EclipsePlatformNamespace.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/namespaces/EclipsePlatformNamespace.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -17,14 +17,14 @@ import org.osgi.resource.Namespace;
/**
* Eclipse Platform and Requirement Namespace.
- *
+ *
* <p>
* This class defines the names for the attributes and directives for this
* namespace. All unspecified capability attributes are of type {@code String}
* and are used as arbitrary matching attributes for the capability. The values
* associated with the specified directive and attribute keys are of type
* {@code String}, unless otherwise indicated.
- *
+ *
* @Immutable
* @noinstantiate This class is not intended to be instantiated by clients.
* @since 3.10
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/namespaces/EquinoxFragmentNamespace.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/namespaces/EquinoxFragmentNamespace.java
index 96aeba1a3..ef050fc7c 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/namespaces/EquinoxFragmentNamespace.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/namespaces/EquinoxFragmentNamespace.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -17,14 +17,14 @@ import org.osgi.resource.Namespace;
/**
* Equinox Namespace for fragment capabilities.
- *
+ *
* <p>
* This class defines the names for the attributes and directives for this
* namespace. All unspecified capability attributes are of type {@code String}
* and are used as arbitrary matching attributes for the capability. The values
* associated with the specified directive and attribute keys are of type
* {@code String}, unless otherwise indicated.
- *
+ *
* @Immutable
* @noinstantiate This class is not intended to be instantiated by clients.
* @since 3.10
@@ -34,7 +34,7 @@ public class EquinoxFragmentNamespace extends Namespace {
/**
/**
* Namespace name for fragment capabilities and requirements.
- *
+ *
* <p>
* Also, the capability attribute used to specify the symbolic name of the host the
* resource is providing a fragment for.
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/namespaces/EquinoxModuleDataNamespace.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/namespaces/EquinoxModuleDataNamespace.java
index 35f6c2aef..bd51bc874 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/namespaces/EquinoxModuleDataNamespace.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/namespaces/EquinoxModuleDataNamespace.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -28,14 +28,14 @@ import org.osgi.resource.Namespace;
* header.</li>
* <li>The bundle class loading policy.
* </ul>
- *
- * This capability is provided for informational purposes and
+ *
+ * This capability is provided for informational purposes and
* should not be considered as effective by the resolver.
* <p>
* This class defines the names for the attributes and directives for this
* namespace. Capabilities in this namespace are not intended to be used to
* match requirements and should not be considered as effective by a resolver.
- *
+ *
* @Immutable
* @noinstantiate This class is not intended to be instantiated by clients.
* @since 3.10
@@ -59,8 +59,8 @@ public class EquinoxModuleDataNamespace extends Namespace {
/** An Eclipse-LazyStart header attribute used to specify exception classes for auto start */
public static final String LAZYSTART_EXCEPTIONS_ATTRIBUTE = "exceptions"; //$NON-NLS-1$
- /**
- * The Equinox specific header for specifying the lazy start policy
+ /**
+ * The Equinox specific header for specifying the lazy start policy
* @deprecated use {@link #LAZYSTART_HEADER}
*/
public static final String AUTOSTART_HEADER = "Eclipse-AutoStart"; //$NON-NLS-1$
@@ -75,7 +75,7 @@ public class EquinoxModuleDataNamespace extends Namespace {
* The directive value identifying a {@link #CAPABILITY_EFFECTIVE_DIRECTIVE
* capability} that is effective for information purposes. Capabilities
* in this namespace must have an effective directive value of information.
- *
+ *
* @see #CAPABILITY_EFFECTIVE_DIRECTIVE
*/
public final static String EFFECTIVE_INFORMATION = "information"; //$NON-NLS-1$
@@ -95,19 +95,19 @@ public class EquinoxModuleDataNamespace extends Namespace {
public final static String CAPABILITY_ACTIVATION_POLICY_LAZY = "lazy"; //$NON-NLS-1$
/**
- * When the {@link #CAPABILITY_ACTIVATION_POLICY_LAZY lazy} policy is used this
+ * When the {@link #CAPABILITY_ACTIVATION_POLICY_LAZY lazy} policy is used this
* attribute contains the package names that must
* trigger the activation when a class is loaded of these packages.
- * If the attribute is not defined then the default is all package names.
+ * If the attribute is not defined then the default is all package names.
* The value of this attribute must be of type {@code List<String>}.
*/
public final static String CAPABILITY_LAZY_INCLUDE_ATTRIBUTE = "lazy.include"; //$NON-NLS-1$
/**
- * When the {@link #CAPABILITY_ACTIVATION_POLICY_LAZY lazy} policy is used this
+ * When the {@link #CAPABILITY_ACTIVATION_POLICY_LAZY lazy} policy is used this
* attribute contains the package names that must not
* trigger the activation when a class is loaded of these packages.
- * If the attribute is not defined then the default is no package names.
+ * If the attribute is not defined then the default is no package names.
* The value of this attribute must be of type {@code List<String>}.
*/
public final static String CAPABILITY_LAZY_EXCLUDE_ATTRIBUTE = "lazy.exclude"; //$NON-NLS-1$
@@ -129,7 +129,7 @@ public class EquinoxModuleDataNamespace extends Namespace {
/**
* The capability attribute contains the list buddy loading policies
- * for the providing module revision as specified in the Eclipse-BuddyPolicy header.
+ * for the providing module revision as specified in the Eclipse-BuddyPolicy header.
* The value of this attribute must be of type
* {@code List<String>}.
*/
@@ -137,7 +137,7 @@ public class EquinoxModuleDataNamespace extends Namespace {
/**
* The capability attribute contains the list of symbolic names the
- * providing module revision is a registered buddy of as specified by
+ * providing module revision is a registered buddy of as specified by
* the Eclipse-BuddyPolicy header. The value of this attribute must be of type
* {@code List<String>}.
*/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/CaseInsensitiveDictionaryMap.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/CaseInsensitiveDictionaryMap.java
index 6edaf1c67..a067b6993 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/CaseInsensitiveDictionaryMap.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/CaseInsensitiveDictionaryMap.java
@@ -293,7 +293,7 @@ public class CaseInsensitiveDictionaryMap<K, V> extends Dictionary<K, V> impleme
}
/**
- * Returns the specified key or, if the key is a String, returns
+ * Returns the specified key or, if the key is a String, returns
* a case-insensitive wrapping of the key.
*
* @param key
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/FilePath.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/FilePath.java
index e1d5cfc59..e3b5793d3 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/FilePath.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/FilePath.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -15,13 +15,13 @@ package org.eclipse.osgi.framework.util;
import java.io.File;
-/**
+/**
* A utility class for manipulating file system paths.
* <p>
* This class is not intended to be subclassed by clients but
* may be instantiated.
* </p>
- *
+ *
* @since 3.1
*/
public class FilePath {
@@ -44,7 +44,7 @@ public class FilePath {
/**
* Constructs a new file path from the given File object.
- *
+ *
* @param location
*/
public FilePath(File location) {
@@ -57,7 +57,7 @@ public class FilePath {
/**
* Constructs a new file path from the given string path.
- *
+ *
* @param original
*/
public FilePath(String original) {
@@ -85,7 +85,7 @@ public class FilePath {
}
/*
- * Splits the given path string into an array of segments.
+ * Splits the given path string into an array of segments.
*/
private String[] computeSegments(String path) {
int maxSegmentCount = computeSegmentCount(path);
@@ -96,7 +96,7 @@ public class FilePath {
// allways absolute
int firstPosition = isAbsolute() ? 1 : 0;
int lastPosition = hasTrailingSlash() ? len - 2 : len - 1;
- // for non-empty paths, the number of segments is
+ // for non-empty paths, the number of segments is
// the number of slashes plus 1, ignoring any leading
// and trailing slashes
int next = firstPosition;
@@ -125,10 +125,10 @@ public class FilePath {
}
/**
- * Returns the device for this file system path, or <code>null</code> if
+ * Returns the device for this file system path, or <code>null</code> if
* none exists. The device string ends with a colon.
- *
- * @return the device string or null
+ *
+ * @return the device string or null
*/
public String getDevice() {
return device;
@@ -136,8 +136,8 @@ public class FilePath {
/**
* Returns the segments in this path. If this path has no segments, returns an empty array.
- *
- * @return an array containing all segments for this path
+ *
+ * @return an array containing all segments for this path
*/
public String[] getSegments() {
return segments.clone();
@@ -145,7 +145,7 @@ public class FilePath {
/**
* Returns whether this path ends with a slash.
- *
+ *
* @return <code>true</code> if the path ends with a slash, false otherwise
*/
public boolean hasTrailingSlash() {
@@ -158,7 +158,7 @@ public class FilePath {
// only deal with devices/UNC paths on Windows
int deviceSeparatorPos = original.indexOf(DEVICE_SEPARATOR);
if (deviceSeparatorPos >= 0) {
- //extract device if any
+ //extract device if any
//remove leading slash from device part to handle output of URL.getFile()
int start = original.charAt(0) == SEPARATOR ? 1 : 0;
device = original.substring(start, deviceSeparatorPos + 1);
@@ -186,7 +186,7 @@ public class FilePath {
/**
* Returns whether this path is absolute (begins with a slash).
- *
+ *
* @return <code>true</code> if this path is absolute, <code>false</code> otherwise
*/
public boolean isAbsolute() {
@@ -197,11 +197,11 @@ public class FilePath {
* Returns a string representing this path as a relative to the given base path.
* <p>
* If this path and the given path do not use the same device letter, this path's
- * string representation is returned as is.
+ * string representation is returned as is.
* </p>
- *
+ *
* @param base the path this path should be made relative to
- * @return a string representation for this path as relative to the given base path
+ * @return a string representation for this path as relative to the given base path
*/
public String makeRelative(FilePath base) {
if (base.device != null && !base.device.equalsIgnoreCase(this.device))
@@ -210,7 +210,7 @@ public class FilePath {
int count = this.matchingFirstSegments(base);
if (baseCount == count && count == base.segments.length)
return base.hasTrailingSlash() ? ("." + SEPARATOR) : "."; //$NON-NLS-1$ //$NON-NLS-2$
- StringBuilder relative = new StringBuilder(); //
+ StringBuilder relative = new StringBuilder(); //
for (int j = 0; j < baseCount - count; j++)
relative.append(PARENT_DIR + SEPARATOR);
for (int i = 0; i < base.segments.length - count; i++) {
@@ -222,7 +222,7 @@ public class FilePath {
return relative.toString();
}
- /*
+ /*
* Returns the number of segments in this matching the first segments of the
* given path.
*/
@@ -240,7 +240,7 @@ public class FilePath {
/**
* Returns a string representation of this path.
- *
+ *
* @return a string representation of this path
*/
@Override
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/Headers.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/Headers.java
index 02ea3af36..bc6e00a50 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/Headers.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/Headers.java
@@ -157,8 +157,8 @@ public class Headers<K, V> extends Dictionary<K, V> implements Map<K, V> {
* @param key Key name.
* @param value Value of the key or null to remove key.
* @param replace A value of true will allow a previous
- * value of the key to be replaced. A value of false
- * will cause an IllegalArgumentException to be thrown
+ * value of the key to be replaced. A value of false
+ * will cause an IllegalArgumentException to be thrown
* if a previous value of the key exists.
* @return the previous value to which the key was mapped,
* or null if the key did not have a previous mapping.
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/KeyedElement.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/KeyedElement.java
index 33bb142dd..10bc792de 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/KeyedElement.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/KeyedElement.java
@@ -20,7 +20,7 @@ package org.eclipse.osgi.framework.util;
* A keyed element can easily be put into a standard Map implementation by using the keyed element
* key for the mapping.
* <p>
- * An element of an <code>KeyedHashSet</code>. A KeyedElement privides the key which is used to hash
+ * An element of an <code>KeyedHashSet</code>. A KeyedElement privides the key which is used to hash
* the elements in an <code>KeyedHashSet</code>.
* @since 3.2
*/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/ObjectPool.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/ObjectPool.java
index 7d0ed38ad..44853f0eb 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/ObjectPool.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/ObjectPool.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/SecureAction.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/SecureAction.java
index 89684a902..1fc169312 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/SecureAction.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/SecureAction.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -41,9 +41,9 @@ public class SecureAction {
});
/*
- * Package privaet constructor a new SecureAction object.
- * The constructed SecureAction object uses the caller's AccessControlContext
- * to perform security checks
+ * Package privaet constructor a new SecureAction object.
+ * The constructed SecureAction object uses the caller's AccessControlContext
+ * to perform security checks
*/
SecureAction() {
// save the control context to be used.
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/ThreadInfoReport.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/ThreadInfoReport.java
index 89e8e5d59..405b96c3a 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/ThreadInfoReport.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/util/ThreadInfoReport.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/cds/CDSBundleEntry.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/cds/CDSBundleEntry.java
index 746af6cb1..1c60e0230 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/cds/CDSBundleEntry.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/cds/CDSBundleEntry.java
@@ -61,7 +61,7 @@ public class CDSBundleEntry extends BundleEntry {
* @see org.eclipse.osgi.baseadaptor.bundlefile.BundleEntry#getFileURL()
* uses the wrapped bundle file to get the actual file url to the content of
* the class on disk.
- *
+ *
* This should is likely never to be called.
*/
@Override
@@ -85,7 +85,7 @@ public class CDSBundleEntry extends BundleEntry {
/*
* (non-Javadoc)
* @see org.eclipse.osgi.baseadaptor.bundlefile.BundleEntry#getBytes()
- * if classbytes is not null, it returns the magic cookie for the shared class. This is used to define
+ * if classbytes is not null, it returns the magic cookie for the shared class. This is used to define
* the class during class loading.
* if classbytes is null, it gets the contents from actual BundleEntry and caches it in classbytes.
*/
@@ -99,7 +99,7 @@ public class CDSBundleEntry extends BundleEntry {
* @see org.eclipse.osgi.baseadaptor.bundlefile.BundleEntry#getLocalURL()
* uses the wrapped bundle file to get the actual local url to the content of
* the class on disk.
- *
+ *
* This should is likely never to be called.
*/
@Override
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/cds/CDSBundleFile.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/cds/CDSBundleFile.java
index 29a8dd796..beb6373b9 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/cds/CDSBundleFile.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/cds/CDSBundleFile.java
@@ -31,7 +31,7 @@ import org.eclipse.osgi.storage.bundlefile.BundleFileWrapper;
/**
* Wraps an actual BundleFile object for purposes of loading classes from the
- * shared classes cache.
+ * shared classes cache.
*/
public class CDSBundleFile extends BundleFileWrapper {
private final static String classFileExt = ".class"; //$NON-NLS-1$
@@ -63,10 +63,10 @@ public class CDSBundleFile extends BundleFileWrapper {
/*
* (non-Javadoc)
* @see org.eclipse.osgi.storage.bundlefile.BundleFile#getEntry(java.lang.String)
- *
- * If path is not for a class then just use the wrapped bundle file to answer the call.
+ *
+ * If path is not for a class then just use the wrapped bundle file to answer the call.
* If the path is for a class, it returns a CDSBundleEntry object.
- * If the path is for a class, it will look for the magic cookie in the
+ * If the path is for a class, it will look for the magic cookie in the
* shared classes cache. If found, the bytes representing the magic cookie are stored in CDSBundleEntry object.
*/
@Override
@@ -88,7 +88,7 @@ public class CDSBundleFile extends BundleFileWrapper {
}
/**
- * Returns the file url to the content of the actual bundle file
+ * Returns the file url to the content of the actual bundle file
* @return the file url to the content of the actual bundle file
*/
URL getURL() {
@@ -96,7 +96,7 @@ public class CDSBundleFile extends BundleFileWrapper {
}
/**
- * Returns the url helper for this bundle file. This is set by the
+ * Returns the url helper for this bundle file. This is set by the
* class loading hook
* @return the url helper for this bundle file
*/
@@ -105,7 +105,7 @@ public class CDSBundleFile extends BundleFileWrapper {
}
/**
- * Sets the url helper for this bundle file. This is called by the
+ * Sets the url helper for this bundle file. This is called by the
* class loading hook.
* @param urlHelper the url helper
*/
@@ -115,8 +115,8 @@ public class CDSBundleFile extends BundleFileWrapper {
}
/**
- * Sets the primed flag for the bundle file. This is called by the
- * class loading hook after the first class has been loaded from disk for
+ * Sets the primed flag for the bundle file. This is called by the
+ * class loading hook after the first class has been loaded from disk for
* this bundle file.
* @param primed the primed flag
*/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/cds/CDSHookImpls.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/cds/CDSHookImpls.java
index 3f1507a1c..5eddeaffc 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/cds/CDSHookImpls.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/cds/CDSHookImpls.java
@@ -82,7 +82,7 @@ public class CDSHookImpls extends ClassLoaderHook implements BundleFileWrapperFa
modified = true;
}
if (modified) {
- // Class bytes have been modified by weaving hooks.
+ // Class bytes have been modified by weaving hooks.
// Such classes need to be stored as Orphans, so skip the call to storeSharedClass()
return;
}
@@ -169,7 +169,7 @@ public class CDSHookImpls extends ClassLoaderHook implements BundleFileWrapperFa
}
}
} catch (HelperAlreadyDefinedException e) {
- // We should never get here.
+ // We should never get here.
// If we do, we simply won't share for this ClassLoader
}
}
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/AtomicLazyInitializer.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/AtomicLazyInitializer.java
index 71e45b3b6..071ab6181 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/AtomicLazyInitializer.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/AtomicLazyInitializer.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -17,8 +17,8 @@ import java.util.concurrent.Callable;
import java.util.concurrent.atomic.AtomicReference;
/**
- * A helper class for doing lazy initialization
- *
+ * A helper class for doing lazy initialization
+ *
* @param <V> the type of object to lazy initialize
*/
public class AtomicLazyInitializer<V> {
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/Capabilities.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/Capabilities.java
index 25f1ac8d4..68318a67a 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/Capabilities.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/Capabilities.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -207,7 +207,7 @@ public class Capabilities {
/**
* Adds the {@link ModuleRevision#getModuleCapabilities(String) capabilities}
- * provided by the specified revision to this database. These capabilities must
+ * provided by the specified revision to this database. These capabilities must
* become available for lookup with the {@link #findCapabilities(Requirement)}
* method.
* @param revision the revision which has capabilities to add
@@ -240,7 +240,7 @@ public class Capabilities {
/**
* Removes the {@link ModuleRevision#getModuleCapabilities(String) capabilities}
* provided by the specified revision from this database. These capabilities
- * must no longer be available for lookup with the
+ * must no longer be available for lookup with the
* {@link #findCapabilities(Requirement)} method.
* @param revision
*/
@@ -254,7 +254,7 @@ public class Capabilities {
}
/**
- * Returns a mutable snapshot of capabilities that are candidates for
+ * Returns a mutable snapshot of capabilities that are candidates for
* satisfying the specified requirement.
* @param requirement the requirement
* @return the candidates for the requirement
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/ComputeNodeOrder.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/ComputeNodeOrder.java
index f54d5e11b..6c0c8cff7 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/ComputeNodeOrder.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/ComputeNodeOrder.java
@@ -17,11 +17,11 @@ package org.eclipse.osgi.internal.container;
import java.util.*;
/**
- * Borrowed from org.eclipse.core.internal.resources.ComputeProjectOrder
+ * Borrowed from org.eclipse.core.internal.resources.ComputeProjectOrder
* to be used when computing the stop order.
* Implementation of a sort algorithm for computing the node order. This
* algorithm handles cycles in the node reference graph in a reasonable way.
- *
+ *
* @since 3.0
*/
public class ComputeNodeOrder {
@@ -93,14 +93,14 @@ public class ComputeNodeOrder {
* Ordered list of adjacent vertexes. In other words, "this" is the
* "from" vertex and the elements of this list are all "to"
* vertexes.
- *
+ *
* Element type: <code>Vertex</code>
*/
public List<Vertex> adjacent = new ArrayList<>(3);
/**
* Creates a new vertex with the given id.
- *
+ *
* @param id the vertex id
*/
public Vertex(Object id) {
@@ -110,14 +110,14 @@ public class ComputeNodeOrder {
/**
* Ordered list of all vertexes in this graph.
- *
+ *
* Element type: <code>Vertex</code>
*/
private List<Vertex> vertexList = new ArrayList<>(100);
/**
* Map from id to vertex.
- *
+ *
* Key type: <code>Object</code>; value type: <code>Vertex</code>
*/
private Map<Object, Vertex> vertexMap = new HashMap<>(100);
@@ -170,7 +170,7 @@ public class ComputeNodeOrder {
* Defines a new vertex with the given id. The depth-first search is
* performed in the relative order in which vertexes were added to the
* graph.
- *
+ *
* @param id the id of the vertex
* @exception IllegalArgumentException if the vertex id is
* already defined or if the graph is frozen
@@ -194,7 +194,7 @@ public class ComputeNodeOrder {
* <code>addVertex</code>. The depth-first search is performed in the
* relative order in which adjacent "to" vertexes were added to a given
* "from" index.
- *
+ *
* @param fromId the id of the "from" vertex
* @param toId the id of the "to" vertex
* @exception IllegalArgumentException if either vertex is undefined or
@@ -215,7 +215,7 @@ public class ComputeNodeOrder {
/**
* Returns the ids of the vertexes in this graph ordered by depth-first
* search finish time. The graph must be frozen.
- *
+ *
* @param increasing <code>true</code> if objects are to be arranged
* into increasing order of depth-first search finish time, and
* <code>false</code> if objects are to be arranged into decreasing
@@ -244,7 +244,7 @@ public class ComputeNodeOrder {
/**
* Returns whether the graph contains cycles. The graph must be frozen.
- *
+ *
* @return <code>true</code> if this graph contains at least one cycle,
* and <code>false</code> if this graph is cycle free
* @exception IllegalArgumentException if the graph is not frozen
@@ -260,9 +260,9 @@ public class ComputeNodeOrder {
* Returns the non-trivial components of this graph. A non-trivial
* component is a set of 2 or more vertexes that were traversed
* together. The graph must be frozen.
- *
+ *
* @return the possibly empty list of non-trivial components, where
- * each component is an array of ids (element type:
+ * each component is an array of ids (element type:
* <code>Object[]</code>)
* @exception IllegalArgumentException if the graph is not frozen
*/
@@ -311,7 +311,7 @@ public class ComputeNodeOrder {
// * </p>
// */
// private void recursiveDFS() {
- // // initialize
+ // // initialize
// // all vertex.color initially Vertex.WHITE;
// // all vertex.predecessor initially null;
// time = 0;
@@ -325,7 +325,7 @@ public class ComputeNodeOrder {
//
// /**
// * Helper method. Performs a depth first search of this graph.
- // *
+ // *
// * @param vertex the vertex to visit
// */
// private void DFSVisit(Vertex vertex) {
@@ -364,7 +364,7 @@ public class ComputeNodeOrder {
// use precomputed objects to avoid garbage
final Integer NEXT_VERTEX_OBJECT = Integer.valueOf(NEXT_VERTEX);
final Integer AFTER_NEXTED_DFS_VISIT_OBJECT = Integer.valueOf(AFTER_NEXTED_DFS_VISIT);
- // initialize
+ // initialize
// all vertex.color initially Vertex.WHITE;
// all vertex.predecessor initially null;
time = 0;
@@ -460,7 +460,7 @@ public class ComputeNodeOrder {
* Algorithms</it>, McGraw-Hill, 1990. The strongly-connected-components
* algorithm is in section 23.5.
* </p>
- *
+ *
* @param objects a list of projects (element type:
* <code>IProject</code>)
* @param references a list of project references [A,B] meaning that A
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/InternalUtils.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/InternalUtils.java
index f2f3e75d2..d563aa1e3 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/InternalUtils.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/InternalUtils.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/LockSet.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/LockSet.java
index 531fe026a..67dd60bd8 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/LockSet.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/LockSet.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -25,7 +25,7 @@ import java.util.concurrent.locks.ReentrantLock;
* over and over then new ReentrantLocks are created each time. This set should be
* used with care. If the same object is going to be locked/unlocked over and over then
* consider using a different locking strategy.
- *
+ *
* Previous implementations of this class attempted to use a WeakHashMap to cache
* the locks, but this proved to be a flawed approach because of the unpredictable
* timing of garbage collection, particularly with autoboxed types (e.g. bundle
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/Debug.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/Debug.java
index 645b99bb0..00bb8264c 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/Debug.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/Debug.java
@@ -21,7 +21,7 @@ import org.eclipse.osgi.service.debug.DebugOptions;
import org.eclipse.osgi.service.debug.DebugOptionsListener;
/**
- * This class has debug constants which can be used by the Framework implementation
+ * This class has debug constants which can be used by the Framework implementation
* and Adaptor implementations
* @since 3.1
*/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/EclipseDebugTrace.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/EclipseDebugTrace.java
index 846ced8fb..f94881513 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/EclipseDebugTrace.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/EclipseDebugTrace.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -110,8 +110,8 @@ class EclipseDebugTrace implements DebugTrace {
/**
* Construct a new EclipseDebugTrace for the specified bundle symbolic name and write messages to the specified
- * trace file.
- *
+ * trace file.
+ *
* @param bundleSymbolicName The symbolic name of the bundle being traced
* @param debugOptions Used to determine if the specified bundle symbolic name + option-path has tracing enabled
* @param traceClass The class that the client is using to perform trace API calls
@@ -126,7 +126,7 @@ class EclipseDebugTrace implements DebugTrace {
/**
* Is debugging enabled for the specified option-path
- *
+ *
* @param optionPath The <i>option-path</i>
* @return Returns true if debugging is enabled for the specified option-path on this bundle; Otherwise false.
*/
@@ -288,7 +288,7 @@ class EclipseDebugTrace implements DebugTrace {
/**
* Set the trace message for the specified record to include class and method information
* if verbose debugging is disabled.
- *
+ *
* @param record The {@link FrameworkDebugTraceEntry} containing the information to persist to the trace file.
* @param originalMessage The original tracing message
*/
@@ -310,7 +310,7 @@ class EclipseDebugTrace implements DebugTrace {
/**
* Utility method to convert an array of StackTraceElement objects to form a String representation of a stack dump
- *
+ *
* @param elements
* The array of StackTraceElement objects
* @return A String of the stack dump produced by the list of elements
@@ -336,7 +336,7 @@ class EclipseDebugTrace implements DebugTrace {
/**
* Write the specified FrameworkTraceEntry to trace file
- *
+ *
* @param entry The FrameworkTraceEntry to write to the log file.
*/
private void writeRecord(final FrameworkDebugTraceEntry entry) {
@@ -357,7 +357,7 @@ class EclipseDebugTrace implements DebugTrace {
// flush the writer
traceWriter.flush();
} catch (Exception ex) {
- // any exceptions during tracing should be caught
+ // any exceptions during tracing should be caught
System.err.println("An exception occurred while writing to the platform trace file: ");//$NON-NLS-1$
ex.printStackTrace(System.err);
} finally {
@@ -394,8 +394,8 @@ class EclipseDebugTrace implements DebugTrace {
}
/**
- * Checks the trace file size. If the file size reaches the limit then the trace file is rotated.
- *
+ * Checks the trace file size. If the file size reaches the limit then the trace file is rotated.
+ *
* @param traceFile The tracing file
* @param timestamp the timestamp for the session; this is the same timestamp as the first entry
* @return false if an error occurred trying to rotate the trace file
@@ -419,7 +419,7 @@ class EclipseDebugTrace implements DebugTrace {
final File backupFile = new File(backupFilename);
if (backupFile.exists()) {
if (!backupFile.delete()) {
- System.err.println("Error when trying to delete old trace file: " + backupFile.getName());//$NON-NLS-1$
+ System.err.println("Error when trying to delete old trace file: " + backupFile.getName());//$NON-NLS-1$
if (backupFile.renameTo(new File(backupFile.getAbsolutePath() + System.currentTimeMillis()))) {
System.err.println("So we rename it to filename: " + backupFile.getName()); //$NON-NLS-1$
} else {
@@ -436,8 +436,8 @@ class EclipseDebugTrace implements DebugTrace {
isBackupOK = false;
}
/*
- * Write a header to new log file stating that this new file is a continuation file.
- * This method should already be called with the file lock set so we should be safe
+ * Write a header to new log file stating that this new file is a continuation file.
+ * This method should already be called with the file lock set so we should be safe
* to update it here.
*/
Writer traceWriter = null;
@@ -478,7 +478,7 @@ class EclipseDebugTrace implements DebugTrace {
/**
* Accessor to retrieve the time stamp in a formatted manner.
- *
+ *
* @return A formatted time stamp based on the {@link EclipseDebugTrace#TRACE_FILE_DATE_FORMATTER} formatter
*/
private final String getFormattedDate(long timestamp) {
@@ -488,8 +488,8 @@ class EclipseDebugTrace implements DebugTrace {
/**
* Accessor to retrieve the text of a {@link Throwable} in a formatted manner so that it can be written to the
- * trace file.
- *
+ * trace file.
+ *
* @param error The {@lnk Throwable} to format
* @return The complete text of a {@link Throwable} as a {@link String} or null if the input error is null.
*/
@@ -514,17 +514,17 @@ class EclipseDebugTrace implements DebugTrace {
/**
* Writes header information to a new trace file
- *
+ *
* @param traceWriter the trace writer
* @param timestamp the timestamp for the session; this is the same timestamp as the first entry
- * @throws IOException If an error occurs while writing this session information
+ * @throws IOException If an error occurs while writing this session information
*/
private void writeSession(final Writer traceWriter, long timestamp) throws IOException {
writeComment(traceWriter, EclipseDebugTrace.TRACE_NEW_SESSION + this.getFormattedDate(timestamp));
writeComment(traceWriter, EclipseDebugTrace.TRACE_FILE_VERSION_COMMENT + EclipseDebugTrace.TRACE_FILE_VERSION);
writeComment(traceWriter, EclipseDebugTrace.TRACE_FILE_VERBOSE_COMMENT + debugOptions.isVerbose());
- writeComment(traceWriter, "The following option strings are specified for this debug session:"); //$NON-NLS-1$
+ writeComment(traceWriter, "The following option strings are specified for this debug session:"); //$NON-NLS-1$
final String[] allOptions = debugOptions.getAllOptions();
for (String allOption : allOptions) {
writeComment(traceWriter, "\t" + allOption); //$NON-NLS-1$
@@ -532,10 +532,10 @@ class EclipseDebugTrace implements DebugTrace {
}
/**
- * Writes the specified trace entry object to the trace file using the
+ * Writes the specified trace entry object to the trace file using the
* {@link EclipseDebugTrace#TRACE_ELEMENT_DELIMITER} as the delimiter between
* each element of the entry.
- *
+ *
* @param traceWriter the trace writer
* @param entry The trace entry object to write to the trace file
* @throws IOException If an error occurs while writing this message
@@ -598,11 +598,11 @@ class EclipseDebugTrace implements DebugTrace {
* Encodes the specified string to replace any occurrence of the {@link EclipseDebugTrace#TRACE_ELEMENT_DELIMITER}
* string with the {@link EclipseDebugTrace#TRACE_ELEMENT_DELIMITER_ENCODED}
* string. This can be used to ensure that the delimiter character does not break parsing when
- * the entry text contains the delimiter character.
- *
- * @param inputString The original string to be written to the trace file.
+ * the entry text contains the delimiter character.
+ *
+ * @param inputString The original string to be written to the trace file.
* @return The original input string with all occurrences of
- * {@link EclipseDebugTrace#TRACE_ELEMENT_DELIMITER} replaced with
+ * {@link EclipseDebugTrace#TRACE_ELEMENT_DELIMITER} replaced with
* {@link EclipseDebugTrace#TRACE_ELEMENT_DELIMITER_ENCODED}. A <code>null</code> value will be
* returned if the input string is <code>null</code>.
*/
@@ -630,9 +630,9 @@ class EclipseDebugTrace implements DebugTrace {
/**
* Creates the trace writer.
* If the tracing file is null then the writer will use System.out to print any messages.
- *
+ *
* @param traceFile The tracing file
- * @return Returns a new Writer object
+ * @return Returns a new Writer object
*/
private Writer openWriter(final File traceFile) {
OutputStream out = null;
@@ -647,7 +647,7 @@ class EclipseDebugTrace implements DebugTrace {
if (out == null) {
out = new FilterOutputStream(System.out) {
/**
- * @throws IOException
+ * @throws IOException
*/
@Override
public void close() throws IOException {
@@ -685,7 +685,7 @@ class EclipseDebugTrace implements DebugTrace {
/**
* Close the trace writer
- *
+ *
* @param traceWriter The trace writer
*/
private void closeWriter(Writer traceWriter) {
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/FrameworkDebugOptions.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/FrameworkDebugOptions.java
index 6f11c7b1e..cbea86156 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/FrameworkDebugOptions.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/FrameworkDebugOptions.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -39,7 +39,7 @@ import org.osgi.util.tracker.ServiceTrackerCustomizer;
* The DebugOptions implementation class that allows accessing the list of debug options specified
* for the application as well as creating {@link DebugTrace} objects for the purpose of having
* dynamic enablement of debug tracing.
- *
+ *
* @since 3.1
*/
public class FrameworkDebugOptions implements DebugOptions, ServiceTrackerCustomizer<DebugOptionsListener, DebugOptionsListener> {
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/FrameworkDebugTraceEntry.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/FrameworkDebugTraceEntry.java
index f46675223..90c1f1390 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/FrameworkDebugTraceEntry.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/FrameworkDebugTraceEntry.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -27,7 +27,7 @@ public class FrameworkDebugTraceEntry {
/**
* The date and time when the trace occurred.
- *
+ *
*/
private final long timestamp;
@@ -68,7 +68,7 @@ public class FrameworkDebugTraceEntry {
/**
* Construct a new FrameworkTraceRecord object
- *
+ *
* @param bundleSymbolicName
* The symbolic name of the bundle being traced
* @param optionPath
@@ -84,7 +84,7 @@ public class FrameworkDebugTraceEntry {
/**
* Construct a new FrameworkTraceRecord object
- *
+ *
* @param bundleSymbolicName
* The symbolic name of the bundle being traced
* @param optionPath
@@ -94,7 +94,7 @@ public class FrameworkDebugTraceEntry {
* @param error
* An exception to be traced
* @param traceClass
- * The class that calls the trace API
+ * The class that calls the trace API
*/
public FrameworkDebugTraceEntry(String bundleSymbolicName, final String optionPath, final String message, final Throwable error, final String traceClass) {
threadName = Thread.currentThread().getName();
@@ -123,7 +123,7 @@ public class FrameworkDebugTraceEntry {
* is likely that class so we should find out who called it. If a
* trace class has not been specified, or has been specified and this
* stack element is not that class, then we assume this stack element
- * is the caller of the trace API.
+ * is the caller of the trace API.
*/
if ((traceClass == null) || !fullClassName.equals(traceClass)) {
determineClassName = stackElements[i].getClassName();
@@ -142,7 +142,7 @@ public class FrameworkDebugTraceEntry {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
@@ -173,7 +173,7 @@ public class FrameworkDebugTraceEntry {
/**
* Accessor to the threads name
- *
+ *
* @return the name of the thread
*/
public final String getThreadName() {
@@ -183,7 +183,7 @@ public class FrameworkDebugTraceEntry {
/**
* Accessor to the timestamp for this trace record
- *
+ *
* @return the date
*/
public final long getTimestamp() {
@@ -193,7 +193,7 @@ public class FrameworkDebugTraceEntry {
/**
* Accessor for the symbolic name of the bundle being traced
- *
+ *
* @return The symbolic name of the bundle being traced
*/
public final String getBundleSymbolicName() {
@@ -203,7 +203,7 @@ public class FrameworkDebugTraceEntry {
/**
* Accessor for the trace message
- *
+ *
* @return the trace message
*/
public final String getMessage() {
@@ -213,7 +213,7 @@ public class FrameworkDebugTraceEntry {
/**
* Accessor for the trace exception. This may be null if there is no exception.
- *
+ *
* @return the trace exception or null if none was defined.
*/
public final Throwable getThrowable() {
@@ -223,7 +223,7 @@ public class FrameworkDebugTraceEntry {
/**
* Accessor for the name of the class being traced.
- *
+ *
* @return The name of the class being traced.
*/
public final String getClassName() {
@@ -233,7 +233,7 @@ public class FrameworkDebugTraceEntry {
/**
* Accessor for the method being traced.
- *
+ *
* @return The name of the method being traced.
*/
public final String getMethodName() {
@@ -244,14 +244,14 @@ public class FrameworkDebugTraceEntry {
/**
* Accessor for the option-path being traced. The <i>&lt;option-path&gt;</i> part of the debug option string
* required for the Eclipse debugging framework.
- *
+ *
* <pre>
* Examples:
* 1) If a trace string com.ibm.myplugin.core/debug=true is specified then 'debug' is the option-path value.
* 2) If a trace string com.ibm.myplugin.core/debug/perf=true is specified then 'debug/perf' is the option-path value.
* </pre>
- *
- *
+ *
+ *
* @return The option-path being traced.
*/
public final String getOptionPath() {
@@ -261,7 +261,7 @@ public class FrameworkDebugTraceEntry {
/**
* Return the line number in the class/method where the trace originator
- *
+ *
* @return The line number from the class and method where the trace request originated
*/
public final int getLineNumber() {
@@ -270,7 +270,7 @@ public class FrameworkDebugTraceEntry {
}
/**
- *
+ *
* @param newMessage
*/
void setMessage(final String newMessage) {
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/BundleContextImpl.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/BundleContextImpl.java
index 5d900bf78..29b20c0bd 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/BundleContextImpl.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/BundleContextImpl.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -264,7 +264,7 @@ public class BundleContextImpl implements BundleContext, EventDispatcher<Object,
void notifyFindHooksPriviledged(final BundleContextImpl context, final Collection<Bundle> allBundles) {
if (debug.DEBUG_HOOKS) {
- Debug.println("notifyBundleFindHooks(" + allBundles + ")"); //$NON-NLS-1$ //$NON-NLS-2$
+ Debug.println("notifyBundleFindHooks(" + allBundles + ")"); //$NON-NLS-1$ //$NON-NLS-2$
}
container.getServiceRegistry().notifyHooksPrivileged(new HookContext() {
@Override
@@ -281,7 +281,7 @@ public class BundleContextImpl implements BundleContext, EventDispatcher<Object,
@Override
public String getHookMethodName() {
- return "find"; //$NON-NLS-1$
+ return "find"; //$NON-NLS-1$
}
@Override
@@ -860,7 +860,7 @@ public class BundleContextImpl implements BundleContext, EventDispatcher<Object,
String clazz = null;
clazz = bundleActivator.getClass().getName();
- throw new BundleException(NLS.bind(Msg.BUNDLE_ACTIVATOR_EXCEPTION, new Object[] {clazz, "start", bundle.getSymbolicName() == null ? "" + bundle.getBundleId() : bundle.getSymbolicName()}), BundleException.ACTIVATOR_ERROR, t); //$NON-NLS-1$ //$NON-NLS-2$
+ throw new BundleException(NLS.bind(Msg.BUNDLE_ACTIVATOR_EXCEPTION, new Object[] {clazz, "start", bundle.getSymbolicName() == null ? "" + bundle.getBundleId() : bundle.getSymbolicName()}), BundleException.ACTIVATOR_ERROR, t); //$NON-NLS-1$ //$NON-NLS-2$
}
}
@@ -916,16 +916,16 @@ public class BundleContextImpl implements BundleContext, EventDispatcher<Object,
String clazz = (activator == null) ? "" : activator.getClass().getName(); //$NON-NLS-1$
- throw new BundleException(NLS.bind(Msg.BUNDLE_ACTIVATOR_EXCEPTION, new Object[] {clazz, "stop", bundle.getSymbolicName() == null ? "" + bundle.getBundleId() : bundle.getSymbolicName()}), BundleException.ACTIVATOR_ERROR, t); //$NON-NLS-1$ //$NON-NLS-2$
+ throw new BundleException(NLS.bind(Msg.BUNDLE_ACTIVATOR_EXCEPTION, new Object[] {clazz, "stop", bundle.getSymbolicName() == null ? "" + bundle.getBundleId() : bundle.getSymbolicName()}), BundleException.ACTIVATOR_ERROR, t); //$NON-NLS-1$ //$NON-NLS-2$
} finally {
activator = null;
}
}
- /**
+ /**
* Return the map of ServiceRegistrationImpl to ServiceUse for services being
* used by this context.
- * @return A map of ServiceRegistrationImpl to ServiceUse for services in use by
+ * @return A map of ServiceRegistrationImpl to ServiceUse for services in use by
* this context.
*/
public Map<ServiceRegistrationImpl<?>, ServiceUse<?>> getServicesInUseMap() {
@@ -1057,7 +1057,7 @@ public class BundleContextImpl implements BundleContext, EventDispatcher<Object,
}
/**
- * This method checks that the context is still valid.
+ * This method checks that the context is still valid.
*
* @return true if the context is still valid; false otherwise
*/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/ContextFinder.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/ContextFinder.java
index 0c3cf1ef5..2ea40c99c 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/ContextFinder.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/ContextFinder.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -60,7 +60,7 @@ public class ContextFinder extends ClassLoader implements PrivilegedAction<List<
this.parentContextClassLoader = contextClassLoader != null ? contextClassLoader : bootLoader;
}
- // Return a list of all classloaders on the stack that are neither the
+ // Return a list of all classloaders on the stack that are neither the
// ContextFinder classloader nor the boot classloader. The last classloader
// in the list is either a bundle classloader or the framework's classloader
// We assume that the bootclassloader never uses the context classloader to find classes in itself.
@@ -85,7 +85,7 @@ public class ContextFinder extends ClassLoader implements PrivilegedAction<List<
return result;
}
- // ensures that a classloader does not have the ContextFinder as part of the
+ // ensures that a classloader does not have the ContextFinder as part of the
// parent hierachy. A classloader which has the ContextFinder as a parent must
// not be used as a delegate, otherwise we endup in endless recursion.
private boolean checkClassLoader(ClassLoader classloader) {
@@ -109,7 +109,7 @@ public class ContextFinder extends ClassLoader implements PrivilegedAction<List<
}
//Return whether the request for loading "name" should proceed.
- //False is returned when a cycle is being detected
+ //False is returned when a cycle is being detected
private boolean startLoading(String name) {
Set<String> classesAndResources = cycleDetector.get();
if (classesAndResources != null && classesAndResources.contains(name))
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/DTOBuilder.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/DTOBuilder.java
index a54e9bad6..96074297f 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/DTOBuilder.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/DTOBuilder.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxBundle.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxBundle.java
index aefaac69d..684d80509 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxBundle.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxBundle.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java
index da2fb2dfa..2cb16eb89 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -160,7 +160,7 @@ public class EquinoxConfiguration implements EnvironmentInfo {
public static final String ECLIPSE_FRAMEWORK_VENDOR = "Eclipse"; //$NON-NLS-1$
public static final String PROP_OSGI_JAVA_PROFILE = "osgi.java.profile"; //$NON-NLS-1$
- public static final String PROP_OSGI_JAVA_PROFILE_NAME = "osgi.java.profile.name"; //$NON-NLS-1$
+ public static final String PROP_OSGI_JAVA_PROFILE_NAME = "osgi.java.profile.name"; //$NON-NLS-1$
// OSGi java profile bootdelegation; used to indicate how the org.osgi.framework.bootdelegation
// property defined in the java profile should be processed, (ingnore, override, none). default is ignore
public static final String PROP_OSGI_JAVA_PROFILE_BOOTDELEGATION = "osgi.java.profile.bootdelegation"; //$NON-NLS-1$
@@ -186,7 +186,7 @@ public class EquinoxConfiguration implements EnvironmentInfo {
public static final String PROP_ROOT_LOCALE = "equinox.root.locale"; //$NON-NLS-1$
- public static final String PROP_PARENT_CLASSLOADER = "osgi.parentClassloader"; //$NON-NLS-1$
+ public static final String PROP_PARENT_CLASSLOADER = "osgi.parentClassloader"; //$NON-NLS-1$
// A parent classloader type that specifies the framework classlaoder
public static final String PARENT_CLASSLOADER_FWK = "fwk"; //$NON-NLS-1$
// System property used to set the context classloader parent classloader type (ccl is the default)
@@ -415,7 +415,7 @@ public class EquinoxConfiguration implements EnvironmentInfo {
Method getenv = System.class.getMethod("getenv", new Class[] {String.class}); //$NON-NLS-1$
prop = (String) getenv.invoke(null, new Object[] {var});
} catch (Throwable t) {
- // do nothing;
+ // do nothing;
// on 1.4 VMs this throws an error
// on J2ME this method does not exist
}
@@ -1036,7 +1036,7 @@ public class EquinoxConfiguration implements EnvironmentInfo {
/*
* Initializes the execution context for this run of the platform. The context
* includes information about the locale, operating system and window system.
- *
+ *
* NOTE: The OS, WS, and ARCH values should never be null. The executable should
* be setting these values and therefore this code path is obsolete for Eclipse
* when run from the executable.
@@ -1053,7 +1053,7 @@ public class EquinoxConfiguration implements EnvironmentInfo {
nlValue = Locale.getDefault().toString();
setConfiguration(PROP_OSGI_NL, nlValue);
- // if the user didn't set the operating system with a command line
+ // if the user didn't set the operating system with a command line
// argument then use the default.
String osValue = getConfiguration(PROP_OSGI_OS);
if (osValue == null) {
@@ -1061,7 +1061,7 @@ public class EquinoxConfiguration implements EnvironmentInfo {
setConfiguration(PROP_OSGI_OS, osValue);
}
- // if the user didn't set the window system with a command line
+ // if the user didn't set the window system with a command line
// argument then use the default.
String wsValue = getConfiguration(PROP_OSGI_WS);
if (wsValue == null) {
@@ -1069,7 +1069,7 @@ public class EquinoxConfiguration implements EnvironmentInfo {
setConfiguration(PROP_OSGI_WS, wsValue);
}
- // if the user didn't set the system architecture with a command line
+ // if the user didn't set the system architecture with a command line
// argument then use the default.
String archValue = getConfiguration(PROP_OSGI_ARCH);
if (archValue == null) {
@@ -1138,22 +1138,22 @@ public class EquinoxConfiguration implements EnvironmentInfo {
* <p>
* Converts a String to a Locale.
* </p>
- *
+ *
* <p>
* This method takes the string format of a locale and creates the locale object from it.
* </p>
- *
+ *
* <p>
* This method validates the input strictly. The language code must be lowercase. The country
* code must be uppercase. The separator must be an underscore. The length must be correct.
* </p>
- *
+ *
* <p>
* This method is inspired by <code>org.apache.commons.lang.LocaleUtils.toLocale(String)</code>
* by fixing the parsing error for uncommon Locales like having a language and a variant code
* but no country code, or a Locale that only consists of a country code.
* </p>
- *
+ *
* @param str
* the locale String to convert
* @param defaultLocale
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxContainer.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxContainer.java
index d728c9fa9..af1b7d0d6 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxContainer.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxContainer.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -208,7 +208,7 @@ public class EquinoxContainer implements ThreadFactory, Runnable {
// do this outside of the lock to avoid deadlock
currentSaver.close();
currentStorage.close();
- // Must be done last since it will result in termination of the
+ // Must be done last since it will result in termination of the
// framework active thread.
currentExecutor.shutdown();
}
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxContainerAdaptor.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxContainerAdaptor.java
index ace518c87..e6e3a6e34 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxContainerAdaptor.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxContainerAdaptor.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxEventPublisher.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxEventPublisher.java
index 19daba488..8df1049fa 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxEventPublisher.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxEventPublisher.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -120,7 +120,7 @@ public class EquinoxEventPublisher {
/**
* Deliver a BundleEvent to SynchronousBundleListeners (synchronous) and
* BundleListeners (asynchronous).
- *
+ *
* @param type
* BundleEvent type.
* @param bundle
@@ -250,7 +250,7 @@ public class EquinoxEventPublisher {
private void notifyEventHooksPrivileged(final BundleEvent event, final Collection<BundleContext> result) {
if (container.getConfiguration().getDebug().DEBUG_HOOKS) {
- Debug.println("notifyBundleEventHooks(" + event.getType() + ":" + event.getBundle() + ", " + result + " )"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ Debug.println("notifyBundleEventHooks(" + event.getType() + ":" + event.getBundle() + ", " + result + " )"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
}
ServiceRegistry serviceRegistry = container.getServiceRegistry();
@@ -283,7 +283,7 @@ public class EquinoxEventPublisher {
/**
* Deliver a FrameworkEvent.
- *
+ *
* @param type
* FrameworkEvent type.
* @param bundle
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/FilterImpl.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/FilterImpl.java
index c9f574709..d0ccb3637 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/FilterImpl.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/FilterImpl.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -58,7 +58,7 @@ import org.osgi.framework.Version;
* <p>
* The string representation of an LDAP search filter is defined by the
* following grammar. It uses a prefix format.
- *
+ *
* <pre>
* &lt;filter&gt; ::= '(' &lt;filtercomp&gt; ')'
* &lt;filtercomp&gt; ::= &lt;and&gt; | &lt;or&gt; | &lt;not&gt; | &lt;item&gt;
@@ -80,7 +80,7 @@ import org.osgi.framework.Version;
* &lt;starval&gt; ::= NULL | &lt;value&gt; '*' &lt;starval&gt;
* &lt;final&gt; ::= NULL | &lt;value&gt;
* </pre>
- *
+ *
* {@code &lt;attr&gt;} is a string representing an attribute, or key, in the
* properties objects of the registered services. Attribute names are not case
* sensitive; that is cn and CN both refer to the same attribute.
@@ -94,7 +94,7 @@ import org.osgi.framework.Version;
* presence filter.
* <p>
* Examples of LDAP filters are:
- *
+ *
* <pre>
* &quot;(cn=Babs Jensen)&quot;
* &quot;(!(cn=Tim Howes))&quot;
@@ -144,14 +144,14 @@ import org.osgi.framework.Version;
* Note: arrays of primitives are also supported. </blockquote> A filter matches
* a key that has multiple values if it matches at least one of those values.
* For example,
- *
+ *
* <pre>
* Dictionary d = new Hashtable();
* d.put(&quot;cn&quot;, new String[] {
* &quot;a&quot;, &quot;b&quot;, &quot;c&quot;
* });
* </pre>
- *
+ *
* d will match {@code (cn=a)} and also {@code (cn=b)}
* <p>
* A filter component that references a key having an unrecognizable data type
@@ -167,7 +167,7 @@ public abstract class FilterImpl implements Filter {
* <p>
* If the filter cannot be parsed, an {@link InvalidSyntaxException} will be
* thrown with a human readable message where the filter became unparsable.
- *
+ *
* @param filterString the filter string.
* @throws InvalidSyntaxException If the filter parameter contains an
* invalid filter string that cannot be parsed.
@@ -190,7 +190,7 @@ public abstract class FilterImpl implements Filter {
* This {@code Filter} is executed using the keys and values of the
* referenced service's properties. The keys are looked up in a case
* insensitive manner.
- *
+ *
* @param reference The reference to the service whose properties are used
* in the match.
* @return {@code true} if the service's properties match this
@@ -205,7 +205,7 @@ public abstract class FilterImpl implements Filter {
* Filter using a {@code Dictionary} with case insensitive key lookup. This
* {@code Filter} is executed using the specified {@code Dictionary}'s keys
* and values. The keys are looked up in a case insensitive manner.
- *
+ *
* @param dictionary The {@code Dictionary} whose key/value pairs are used
* in the match.
* @return {@code true} if the {@code Dictionary}'s values match this
@@ -222,7 +222,7 @@ public abstract class FilterImpl implements Filter {
* Filter using a {@code Dictionary}. This {@code Filter} is executed using
* the specified {@code Dictionary}'s keys and values. The keys are looked
* up in a normal manner respecting case.
- *
+ *
* @param dictionary The {@code Dictionary} whose key/value pairs are used
* in the match.
* @return {@code true} if the {@code Dictionary}'s values match this
@@ -238,7 +238,7 @@ public abstract class FilterImpl implements Filter {
* Filter using a {@code Map}. This {@code Filter} is executed using the
* specified {@code Map}'s keys and values. The keys are looked up in a
* normal manner respecting case.
- *
+ *
* @param map The {@code Map} whose key/value pairs are used in the match.
* Maps with {@code null} key or values are not supported. A
* {@code null} value is considered not present to the filter.
@@ -258,7 +258,7 @@ public abstract class FilterImpl implements Filter {
* <p>
* The filter string is normalized by removing whitespace which does not
* affect the meaning of the filter.
- *
+ *
* @return This {@code Filter}'s filter string.
*/
@Override
@@ -275,7 +275,7 @@ public abstract class FilterImpl implements Filter {
* <p>
* The filter string is normalized by removing whitespace which does not
* affect the meaning of the filter.
- *
+ *
* @return This {@code Filter}'s filter string.
*/
abstract StringBuilder normalize(StringBuilder sb);
@@ -285,7 +285,7 @@ public abstract class FilterImpl implements Filter {
* <p>
* This implementation returns the result of calling
* {@code this.toString().equals(obj.toString()}.
- *
+ *
* @param obj The object to compare against this {@code Filter}.
* @return If the other object is a {@code Filter} object, then returns the
* result of calling {@code this.toString().equals(obj.toString()};
@@ -309,7 +309,7 @@ public abstract class FilterImpl implements Filter {
* <p>
* This implementation returns the result of calling
* {@code this.toString().hashCode()}.
- *
+ *
* @return The hashCode of this {@code Filter}.
*/
@Override
@@ -714,7 +714,7 @@ public abstract class FilterImpl implements Filter {
/**
* Encode the value string such that '(', '*', ')' and '\' are escaped.
- *
+ *
* @param value unencoded value string.
*/
static StringBuilder encodeValue(StringBuilder sb, String value) {
@@ -1258,7 +1258,7 @@ public abstract class FilterImpl implements Filter {
* Map a string for an APPROX (~=) comparison. This implementation
* removes white spaces. This is the minimum implementation allowed by
* the OSGi spec.
- *
+ *
* @param input Input string.
* @return String ready for APPROX comparison.
*/
@@ -1292,7 +1292,7 @@ public abstract class FilterImpl implements Filter {
/**
* Returns the leftmost required objectClass value for the filter to evaluate to true.
- *
+ *
* @return The leftmost required objectClass value or null if none could be determined.
*/
public String getRequiredObjectClass() {
@@ -1682,7 +1682,7 @@ public abstract class FilterImpl implements Filter {
/**
* Create a case insensitive map from the specified dictionary.
- *
+ *
* @param dictionary
* @throws IllegalArgumentException If {@code dictionary} contains case
* variants of the same key name.
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/OSGiFrameworkHooks.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/OSGiFrameworkHooks.java
index 8f38c2bc7..feed04ded 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/OSGiFrameworkHooks.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/OSGiFrameworkHooks.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -115,7 +115,7 @@ class OSGiFrameworkHooks {
void notifyCollisionHooksPriviledged(final int operationType, final Bundle target, final Collection<Bundle> collisionCandidates) {
if (debug.DEBUG_HOOKS) {
- Debug.println("notifyCollisionHooks(" + operationType + ", " + target + ", " + collisionCandidates + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ Debug.println("notifyCollisionHooks(" + operationType + ", " + target + ", " + collisionCandidates + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
}
ServiceRegistry registry = container.getServiceRegistry();
if (registry != null) {
@@ -134,7 +134,7 @@ class OSGiFrameworkHooks {
@Override
public String getHookMethodName() {
- return "filterCollisions"; //$NON-NLS-1$
+ return "filterCollisions"; //$NON-NLS-1$
}
@Override
@@ -150,7 +150,7 @@ class OSGiFrameworkHooks {
* This class encapsulates the delegation to ResolverHooks that are registered with the service
* registry. This way the resolver implementation only has to call out to a single hook
* which does all the necessary service registry lookups.
- *
+ *
* This class is not thread safe and expects external synchronization.
*
*/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/StorageSaver.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/StorageSaver.java
index cd85841f5..13f239fbc 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/StorageSaver.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/StorageSaver.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java
index 4cb0b3ca1..b1917a102 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/XMLParsingServiceFactory.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/XMLParsingServiceFactory.java
index fbeb96e62..84a6e37e3 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/XMLParsingServiceFactory.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/XMLParsingServiceFactory.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -33,10 +33,10 @@ class XMLParsingServiceFactory implements ServiceFactory<Object> {
return createService();
/*
* Set the TCCL while creating jaxp factory instances to the
- * requesting bundles class loader. This is needed to
- * work around bug 285505. There are issues if multiple
+ * requesting bundles class loader. This is needed to
+ * work around bug 285505. There are issues if multiple
* xerces implementations are available on the bundles class path
- *
+ *
* The real issue is that the ContextFinder will only delegate
* to the framework class loader in this case. This class
* loader forces the requesting bundle to be delegated to for
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/legacy/PackageAdminImpl.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/legacy/PackageAdminImpl.java
index 6044e1597..c6fe2c7e3 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/legacy/PackageAdminImpl.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/legacy/PackageAdminImpl.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -57,7 +57,7 @@ import org.osgi.service.packageadmin.RequiredBundle;
public class PackageAdminImpl implements PackageAdmin {
private final ModuleContainer container;
- /*
+ /*
* We need to make sure that the GetBundleAction class loads early to prevent a ClassCircularityError when checking permissions.
* See bug 161561
*/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/legacy/StartLevelImpl.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/legacy/StartLevelImpl.java
index 2d3f7cf9a..45e272d10 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/legacy/StartLevelImpl.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/legacy/StartLevelImpl.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/BundleFileWrapperFactoryHook.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/BundleFileWrapperFactoryHook.java
index 22efbdadb..6d38949f3 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/BundleFileWrapperFactoryHook.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/BundleFileWrapperFactoryHook.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -23,8 +23,8 @@ import org.eclipse.osgi.storage.bundlefile.BundleFileWrapper;
*/
public interface BundleFileWrapperFactoryHook {
/**
- * Wraps a bundle file for the given content and base data. If the
- * specified bundle file should not be wrapped then null is returned
+ * Wraps a bundle file for the given content and base data. If the
+ * specified bundle file should not be wrapped then null is returned
* @param bundleFile the bundle file to be wrapped
* @param generation the generation the bundle file is for
* @param base true if the content is for the base bundle (not an inner jar, directory etc.)
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/ClassLoaderHook.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/ClassLoaderHook.java
index 8e0a52949..3a906b9e0 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/ClassLoaderHook.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/ClassLoaderHook.java
@@ -32,7 +32,7 @@ import org.eclipse.osgi.storage.bundlefile.BundleEntry;
*/
public abstract class ClassLoaderHook {
/**
- * Gets called by a classpath manager before defining a class. This method allows a class loading hook
+ * Gets called by a classpath manager before defining a class. This method allows a class loading hook
* to process the bytes of a class that is about to be defined and return a transformed byte array.
* @param name the name of the class being defined
* @param classbytes the bytes of the class being defined
@@ -47,7 +47,7 @@ public abstract class ClassLoaderHook {
/**
* Gets called by a classpath manager before defining a class. This method allows a class loading hook
- * to reject a transformation to the class bytes by a
+ * to reject a transformation to the class bytes by a
* {@link #processClass(String, byte[], ClasspathEntry, BundleEntry, ClasspathManager) processClass} method.
* @param name the name of the class being defined
* @param transformedBytes the transformed bytes of the class being defined
@@ -61,7 +61,7 @@ public abstract class ClassLoaderHook {
}
/**
- * Gets called by a classpath manager when looking for ClasspathEntry objects. This method allows
+ * Gets called by a classpath manager when looking for ClasspathEntry objects. This method allows
* a class loading hook to add additional ClasspathEntry objects
* @param cpEntries the list of ClasspathEntry objects currently available for the requested classpath
* @param cp the name of the requested classpath
@@ -75,8 +75,8 @@ public abstract class ClassLoaderHook {
/**
* Gets called by a base data during {@link ModuleClassLoader#findLibrary(String)}.
- * A this method is called for each configured class loading hook until one
- * class loading hook returns a non-null value. If no class loading hook returns
+ * A this method is called for each configured class loading hook until one
+ * class loading hook returns a non-null value. If no class loading hook returns
* a non-null value then the default behavior will be used.
* @param generation the bundle generation to find a native library for.
* @param libName the name of the native library.
@@ -93,7 +93,7 @@ public abstract class ClassLoaderHook {
* returns null indicating the built-in implementation should be used.
* Only one hook is able to provide the implementation of the module class loader
* and the first one to return non-null wins.
- *
+ *
* @param parent the parent classloader
* @param configuration the equinox configuration
* @param delegate the delegate for this classloader
@@ -107,7 +107,7 @@ public abstract class ClassLoaderHook {
}
/**
- * Gets called by a classpath manager at the end of
+ * Gets called by a classpath manager at the end of
* {@link BundleLoader#getClassLoader()} is called the first time and a class loader is created.
* @param classLoader the newly created bundle classloader
*/
@@ -116,10 +116,10 @@ public abstract class ClassLoaderHook {
}
/**
- * Called by a {@link BundleLoader#findClass(String)} method before delegating to the resolved constraints and
- * local bundle for a class load. If this method returns null then normal delegation is done. If this method
+ * Called by a {@link BundleLoader#findClass(String)} method before delegating to the resolved constraints and
+ * local bundle for a class load. If this method returns null then normal delegation is done. If this method
* returns a non-null value then the rest of the delegation process is skipped and the returned value is used.
- * If this method throws a <code>ClassNotFoundException</code> then the calling
+ * If this method throws a <code>ClassNotFoundException</code> then the calling
* {@link BundleLoader#findClass(String)} method re-throws the exception.
* @param name the name of the class to find
* @param classLoader the module class loader
@@ -131,7 +131,7 @@ public abstract class ClassLoaderHook {
}
/**
- * Called by a {@link BundleLoader#findClass(String)} method after delegating to the resolved constraints and
+ * Called by a {@link BundleLoader#findClass(String)} method after delegating to the resolved constraints and
* local bundle for a class load. This method will only be called if no class was found
* from the normal delegation.
* @param name the name of the class to find
@@ -144,8 +144,8 @@ public abstract class ClassLoaderHook {
}
/**
- * Called by a {@link BundleLoader#findResource(String)} before delegating to the resolved constraints and
- * local bundle for a resource load. If this method returns null then normal delegation is done.
+ * Called by a {@link BundleLoader#findResource(String)} before delegating to the resolved constraints and
+ * local bundle for a resource load. If this method returns null then normal delegation is done.
* If this method returns a non-null value then the rest of the delegation process is skipped and the returned value is used.
* If this method throws an <code>FileNotFoundException</code> then the delegation is terminated.
* @param name the name of the resource to find
@@ -158,7 +158,7 @@ public abstract class ClassLoaderHook {
}
/**
- * Called by a {@link BundleLoader#findResource(String)} after delegating to the resolved constraints and
+ * Called by a {@link BundleLoader#findResource(String)} after delegating to the resolved constraints and
* local bundle for a resource load. This method will only be called if no resource was found
* from the normal delegation.
* @param name the name of the resource to find
@@ -171,8 +171,8 @@ public abstract class ClassLoaderHook {
}
/**
- * Called by a {@link BundleLoader#findResources(String)} before delegating to the resolved constraints and
- * local bundle for a resource load. If this method returns null then normal delegation is done.
+ * Called by a {@link BundleLoader#findResources(String)} before delegating to the resolved constraints and
+ * local bundle for a resource load. If this method returns null then normal delegation is done.
* If this method returns a non-null value then the rest of the delegation process is skipped and the returned value is used.
* If this method throws an <code>FileNotFoundException</code> then the delegation is terminated
* @param name the name of the resource to find
@@ -185,7 +185,7 @@ public abstract class ClassLoaderHook {
}
/**
- * Called by a {@link BundleLoader#findResources(String)} after delegating to the resolved constraints and
+ * Called by a {@link BundleLoader#findResources(String)} after delegating to the resolved constraints and
* local bundle for a resource load. This method will only be called if no resources were found
* from the normal delegation.
* @param name the name of the resource to find
@@ -198,7 +198,7 @@ public abstract class ClassLoaderHook {
}
/**
- * Called by a {@link ClasspathManager} before normal delegation. If this method returns
+ * Called by a {@link ClasspathManager} before normal delegation. If this method returns
* a non-null value then the rest of the delegation process is skipped and the returned value
* is used.
* @param name the name of the library to find
@@ -222,8 +222,8 @@ public abstract class ClassLoaderHook {
}
/**
- * Gets called by a classpath manager during {@link ClasspathManager#findLocalClass(String)} before
- * searching the local classloader for a class. A classpath manager will call this method for
+ * Gets called by a classpath manager during {@link ClasspathManager#findLocalClass(String)} before
+ * searching the local classloader for a class. A classpath manager will call this method for
* each configured class loading hook.
* @param name the name of the requested class
* @param manager the classpath manager used to find and load the requested class
@@ -235,7 +235,7 @@ public abstract class ClassLoaderHook {
/**
* Gets called by a classpath manager during {@link ClasspathManager#findLocalClass(String)} after
- * searching the local classloader for a class. A classpath manager will call this method for
+ * searching the local classloader for a class. A classpath manager will call this method for
* each configured class loading hook.
* @param name the name of the requested class
* @param clazz the loaded class or null if not found
@@ -249,7 +249,7 @@ public abstract class ClassLoaderHook {
/**
* Gets called by a classpath manager during {@link ClasspathManager#findLocalResource(String)} before
- * searching the local classloader for a resource. A classpath manager will call this method for
+ * searching the local classloader for a resource. A classpath manager will call this method for
* each configured class loading hook.
* @param name the name of the requested resource
* @param manager the classpath manager used to find the requested resource
@@ -261,7 +261,7 @@ public abstract class ClassLoaderHook {
/**
* Gets called by a classpath manager during {@link ClasspathManager#findLocalResource(String)} after
- * searching the local classloader for a resource. A classpath manager will call this method for
+ * searching the local classloader for a resource. A classpath manager will call this method for
* each configured class loading hook.
* @param name the name of the requested resource
* @param resource the URL to the requested resource or null if not found
@@ -273,8 +273,8 @@ public abstract class ClassLoaderHook {
}
/**
- * Gets called by a classpath manager after an attempt is made to define a class. This method allows
- * a class loading hook to record data about a class definition.
+ * Gets called by a classpath manager after an attempt is made to define a class. This method allows
+ * a class loading hook to record data about a class definition.
* @param name the name of the class that got defined
* @param clazz the class object that got defined or null if an error occurred while defining a class
* @param classbytes the class bytes used to define the class
@@ -300,7 +300,7 @@ public abstract class ClassLoaderHook {
}
/**
- * Returns true if this hook can support invoking
+ * Returns true if this hook can support invoking
* {@link ClassLoaderHook#processClass(String, byte[], ClasspathEntry, BundleEntry, ClasspathManager) processClass}
* recursively for the same class name. If false is returned then a class
* loading error will occur if recursive class processing is detected.
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/FrameworkUtilHelper.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/FrameworkUtilHelper.java
index 80bc1a80c..5bfb4e3c2 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/FrameworkUtilHelper.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/FrameworkUtilHelper.java
@@ -27,7 +27,7 @@ public class FrameworkUtilHelper {
/**
* See {@link FrameworkUtil#getBundle(Class)}
* @param classFromBundle a class defined by a bundle class loader.
- * @return A Bundle for the specified bundle class or null if the
+ * @return A Bundle for the specified bundle class or null if the
* specified class was not defined by a bundle class loader.
*/
public Bundle getBundle(Class<?> classFromBundle) {
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/HookRegistry.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/HookRegistry.java
index a2c9f3969..552438ada 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/HookRegistry.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/HookRegistry.java
@@ -40,15 +40,15 @@ import org.eclipse.osgi.util.ManifestElement;
public final class HookRegistry {
/**
* The hook configurators properties file (&quot;hookconfigurators.properties&quot;) <p>
- * A framework extension may supply a hook configurators properties file to specify a
+ * A framework extension may supply a hook configurators properties file to specify a
* list of hook configurators.
* @see #HOOK_CONFIGURATORS
*/
public static final String HOOK_CONFIGURATORS_FILE = "hookconfigurators.properties"; //$NON-NLS-1$
/**
- * The hook configurators property key (&quot;hookconfigurators.properties&quot;) used in
- * a hook configurators properties file to specify a comma separated list of fully
+ * The hook configurators property key (&quot;hookconfigurators.properties&quot;) used in
+ * a hook configurators properties file to specify a comma separated list of fully
* qualified hook configurator classes.
*/
public static final String HOOK_CONFIGURATORS = "hook.configurators"; //$NON-NLS-1$
@@ -60,7 +60,7 @@ public final class HookRegistry {
public static final String PROP_HOOK_CONFIGURATORS_INCLUDE = "osgi.hook.configurators.include"; //$NON-NLS-1$
/**
- * A system property (&quot;osgi.hook.configurators.exclude&quot;) used to exclude
+ * A system property (&quot;osgi.hook.configurators.exclude&quot;) used to exclude
* any hook configurators. This is helpful for disabling hook
* configurators that is specified in hook configurator properties files.
*/
@@ -68,7 +68,7 @@ public final class HookRegistry {
/**
* A system property (&quot;osgi.hook.configurators&quot;) used to specify the list
- * of hook configurators. If this property is set then the list of configurators
+ * of hook configurators. If this property is set then the list of configurators
* specified will be the only configurators used.
*/
public static final String PROP_HOOK_CONFIGURATORS = "osgi.hook.configurators"; //$NON-NLS-1$
@@ -92,9 +92,9 @@ public final class HookRegistry {
/**
* Initializes the hook configurators. The following steps are used to initialize the hook configurators. <p>
- * 1. Get a list of hook configurators from all hook configurators properties files on the classpath,
+ * 1. Get a list of hook configurators from all hook configurators properties files on the classpath,
* add this list to the overall list of hook configurators, remove duplicates. <p>
- * 2. Get a list of hook configurators from the (&quot;osgi.hook.configurators.include&quot;) system property
+ * 2. Get a list of hook configurators from the (&quot;osgi.hook.configurators.include&quot;) system property
* and add this list to the overall list of hook configurators, remove duplicates. <p>
* 3. Get a list of hook configurators from the (&quot;osgi.hook.configurators.exclude&quot;) system property
* and remove this list from the overall list of hook configurators. <p>
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/StorageHookFactory.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/StorageHookFactory.java
index 34cd3dd9b..261e81367 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/StorageHookFactory.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/StorageHookFactory.java
@@ -41,10 +41,10 @@ public abstract class StorageHookFactory<S, L, H extends StorageHookFactory.Stor
protected final String KEY = this.getClass().getName().intern();
/**
- * Returns the storage version of this storage hook. This version
- * is used by the storage to check the consistency of cached persistent
- * data. Any time a storage hook changes the format of its persistent
- * data the storage version should be incremented.
+ * Returns the storage version of this storage hook. This version
+ * is used by the storage to check the consistency of cached persistent
+ * data. Any time a storage hook changes the format of its persistent
+ * data the storage version should be incremented.
* @return the storage version of this storage hook
*/
public int getStorageVersion() {
@@ -60,13 +60,13 @@ public abstract class StorageHookFactory<S, L, H extends StorageHookFactory.Stor
}
/**
- * Returns true if the persisted version is compatible with the
+ * Returns true if the persisted version is compatible with the
* current version of this storage hook. The default implementation
* returns true if the specified version is identical to the current
* version. Implementations must override this method if they
* want to support other (older) versions for migration purposes.
* @param version the persisted version
- * @return true if the persisted version is compatible with
+ * @return true if the persisted version is compatible with
* the current version.
*/
public boolean isCompatibleWith(int version) {
@@ -74,7 +74,7 @@ public abstract class StorageHookFactory<S, L, H extends StorageHookFactory.Stor
}
/**
- * Creates a save context object for a storage hook. The
+ * Creates a save context object for a storage hook. The
* save context is passed to the {@link StorageHook#save(Object, DataOutputStream)}
* for each generation being persisted by the framework.
* @return a save context object or {@code null} if no save context is needed
@@ -108,7 +108,7 @@ public abstract class StorageHookFactory<S, L, H extends StorageHookFactory.Stor
* Creates a storage hook for the specified generation and checks that the
* factory class of the storage hook equals the class of this storage hook
* factory.
- *
+ *
* @param generation - The generation for which a storage hook should be
* created.
* @return A newly created storage hook or {@code null} if no hook is needed
@@ -168,7 +168,7 @@ public abstract class StorageHookFactory<S, L, H extends StorageHookFactory.Stor
}
/**
- * Initializes this storage hook with the content of the specified bundle manifest.
+ * Initializes this storage hook with the content of the specified bundle manifest.
* This method is called when a bundle is installed or updated.
* @param manifest the bundle manifest to load into this storage hook
* @throws BundleException if any error occurs
@@ -184,7 +184,7 @@ public abstract class StorageHookFactory<S, L, H extends StorageHookFactory.Stor
* This will be either {@link ModuleEvent#INSTALLED installed} or {@link ModuleEvent#UPDATED updated}.
* @param origin The module which originated the lifecycle operation. The origin may be {@code null} for
* {@link ModuleEvent#INSTALLED installed} operations. This is the module
- * passed to the {@link ModuleContainer#install(Module, String, ModuleRevisionBuilder, Object) install} or
+ * passed to the {@link ModuleContainer#install(Module, String, ModuleRevisionBuilder, Object) install} or
* {@link ModuleContainer#update(Module, ModuleRevisionBuilder, Object) update} method.
* @param builder the builder that will be used to create a new {@link ModuleRevision}.
* @return The modified builder or a completely new builder to be used by the bundle. A {@code null} value
@@ -198,10 +198,10 @@ public abstract class StorageHookFactory<S, L, H extends StorageHookFactory.Stor
}
/**
- * Loads the data from the specified
- * input stream into the storage hook. This method is called during startup to
+ * Loads the data from the specified
+ * input stream into the storage hook. This method is called during startup to
* load all the persistently installed bundles. <p>
- * It is important that this method and the {@link #save(Object, DataOutputStream)} method
+ * It is important that this method and the {@link #save(Object, DataOutputStream)} method
* stay in sync. This method must be able to successfully read the data saved by the
* {@link #save(Object, DataOutputStream)} method.
* @param is an input stream used to load the storage hook's data from.
@@ -216,7 +216,7 @@ public abstract class StorageHookFactory<S, L, H extends StorageHookFactory.Stor
* Saves the data from this storage hook into the specified output stream. This method
* is called if some persistent data has changed for the bundle. <p>
* It is important that this method and the {@link #load(Object, DataInputStream)}
- * method stay in sync. This method must be able to save data which the
+ * method stay in sync. This method must be able to save data which the
* {@link #load(Object, DataInputStream)} method can ready successfully.
* @see #load(Object, DataInputStream)
* @param os an output stream used to save the storage hook's data from.
@@ -235,7 +235,7 @@ public abstract class StorageHookFactory<S, L, H extends StorageHookFactory.Stor
}
/**
- * Validates the data in this storage hook, if the data is invalid then an illegal state
+ * Validates the data in this storage hook, if the data is invalid then an illegal state
* exception is thrown
* @throws IllegalStateException if the data is invalid
*/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hooks/DevClassLoadingHook.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hooks/DevClassLoadingHook.java
index a1cfc662c..8a4eb82a9 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hooks/DevClassLoadingHook.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hooks/DevClassLoadingHook.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -77,7 +77,7 @@ public class DevClassLoadingHook extends ClassLoaderHook implements KeyedElement
}
}
}
- // mark the first entry of the list.
+ // mark the first entry of the list.
// This way we can quickly tell that dev classpath entries have been added to the list
if (result && cpEntries.size() > 0)
cpEntries.get(0).addUserObject(this);
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hooks/EclipseLazyStarter.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hooks/EclipseLazyStarter.java
index 8339703cd..c9ade4c9b 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hooks/EclipseLazyStarter.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hooks/EclipseLazyStarter.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/BundleLoader.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/BundleLoader.java
index 4db50392b..b58432099 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/BundleLoader.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/BundleLoader.java
@@ -213,7 +213,7 @@ public class BundleLoader extends ModuleLoader {
if (!exportNames.contains(name)) {
// must force filtered and reexport sources to be created early
// to prevent lazy normal package source creation.
- // We only do this for the first export of a package name.
+ // We only do this for the first export of a package name.
sources.createPackageSource(export, true);
}
}
@@ -370,9 +370,9 @@ public class BundleLoader extends ModuleLoader {
}
/**
- * This method gets a resource from the bundle. The resource is searched
- * for in the same manner as it would if it was being loaded from a bundle
- * (i.e. all hosts, fragments, import, required bundles and
+ * This method gets a resource from the bundle. The resource is searched
+ * for in the same manner as it would if it was being loaded from a bundle
+ * (i.e. all hosts, fragments, import, required bundles and
* local resources are searched).
*
* @param name the name of the desired resource.
@@ -386,7 +386,7 @@ public class BundleLoader extends ModuleLoader {
* Finds a class local to this bundle. Only the classloader for this bundle is searched.
* @param name The name of the class to find.
* @return The loaded Class or null if the class is not found.
- * @throws ClassNotFoundException
+ * @throws ClassNotFoundException
*/
public Class<?> findLocalClass(String name) throws ClassNotFoundException {
long start = 0;
@@ -960,7 +960,7 @@ public class BundleLoader extends ModuleLoader {
for (ModuleWire bundleWire : requiredBundleWires) {
if (local != null || BundleNamespace.VISIBILITY_REEXPORT.equals(bundleWire.getRequirement().getDirectives().get(BundleNamespace.REQUIREMENT_VISIBILITY_DIRECTIVE))) {
// always add required bundles first if we locally provide the package
- // This allows a bundle to provide a package from a required bundle without
+ // This allows a bundle to provide a package from a required bundle without
// re-exporting the whole required bundle.
BundleLoader loader = getProviderLoader(bundleWire);
if (loader != null) {
@@ -1147,7 +1147,7 @@ public class BundleLoader extends ModuleLoader {
PackageSource result = findImportedSource(pkgName, null);
if (result != null)
return result;
- // Note that dynamic imports are not checked to avoid aggressive wiring (bug 105779)
+ // Note that dynamic imports are not checked to avoid aggressive wiring (bug 105779)
return findRequiredSource(pkgName, null);
}
@@ -1225,7 +1225,7 @@ public class BundleLoader extends ModuleLoader {
// so we do not have to do the search again for this package.
source = NullPackageSource.getNullPackageSource(pkgName);
} else if (result.size() == 1) {
- // if there is just one source, remember just the single source
+ // if there is just one source, remember just the single source
source = result.get(0);
} else {
// if there was more than one source, build a multisource and cache that.
@@ -1240,7 +1240,7 @@ public class BundleLoader extends ModuleLoader {
/*
* Gets the package source for the pkgName. This will include the local package source
- * if the bundle exports the package. This is used to compare the PackageSource of a
+ * if the bundle exports the package. This is used to compare the PackageSource of a
* package from two different bundles.
*/
public final PackageSource getPackageSource(String pkgName) {
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/BundleLoaderSources.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/BundleLoaderSources.java
index a4a7f7523..3b24f87c6 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/BundleLoaderSources.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/BundleLoaderSources.java
@@ -52,7 +52,7 @@ public class BundleLoaderSources {
// creates a PackageSource from an ExportPackageDescription. This is called when initializing
// a BundleLoader to ensure that the proper PackageSource gets created and used for
// filtered and reexport packages. The storeSource flag is used by initialize to indicate
- // that the source for special case package sources (filtered or re-exported should be stored
+ // that the source for special case package sources (filtered or re-exported should be stored
// in the cache. if this flag is set then a normal SinglePackageSource will not be created
// (i.e. it will be created lazily)
public PackageSource createPackageSource(ModuleCapability packageCapability, boolean storeSource) {
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/ModuleClassLoader.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/ModuleClassLoader.java
index b51194304..31aa057b6 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/ModuleClassLoader.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/ModuleClassLoader.java
@@ -154,9 +154,9 @@ public abstract class ModuleClassLoader extends ClassLoader implements BundleRef
/**
* Loads a class for the bundle. First delegate.findClass(name) is called.
* The delegate will query the system class loader, bundle imports, bundle
- * local classes, bundle hosts and fragments. The delegate will call
- * BundleClassLoader.findLocalClass(name) to find a class local to this
- * bundle.
+ * local classes, bundle hosts and fragments. The delegate will call
+ * BundleClassLoader.findLocalClass(name) to find a class local to this
+ * bundle.
* @param name the name of the class to load.
* @param resolve indicates whether to resolve the loaded class or not.
* @return The Class object.
@@ -199,11 +199,11 @@ public abstract class ModuleClassLoader extends ClassLoader implements BundleRef
}
/**
- * Gets a resource for the bundle. First delegate.findResource(name) is
+ * Gets a resource for the bundle. First delegate.findResource(name) is
* called. The delegate will query the system class loader, bundle imports,
- * bundle local resources, bundle hosts and fragments. The delegate will
- * call BundleClassLoader.findLocalResource(name) to find a resource local
- * to this bundle.
+ * bundle local resources, bundle hosts and fragments. The delegate will
+ * call BundleClassLoader.findLocalResource(name) to find a resource local
+ * to this bundle.
* @param name The resource path to get.
* @return The URL of the resource or null if it does not exist.
*/
@@ -263,7 +263,7 @@ public abstract class ModuleClassLoader extends ClassLoader implements BundleRef
}
/**
- * Finds a library for this bundle. Simply calls
+ * Finds a library for this bundle. Simply calls
* manager.findLibrary(libname) to find the library.
* @param libname The library to find.
* @return The absolution path to the library or null if not found
@@ -350,7 +350,7 @@ public abstract class ModuleClassLoader extends ClassLoader implements BundleRef
* Creates a ProtectionDomain which uses specified BundleFile and the permissions of the baseDomain
* @param bundlefile The source bundlefile the domain is for.
* @param domainGeneration the source generation for the domain
- * @return a ProtectionDomain which uses specified BundleFile and the permissions of the baseDomain
+ * @return a ProtectionDomain which uses specified BundleFile and the permissions of the baseDomain
*/
@SuppressWarnings("deprecation")
protected ProtectionDomain createProtectionDomain(BundleFile bundlefile, Generation domainGeneration) {
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/SystemBundleLoader.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/SystemBundleLoader.java
index e8c7f730f..11099cfd4 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/SystemBundleLoader.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/SystemBundleLoader.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -55,7 +55,7 @@ public class SystemBundleLoader extends BundleLoader {
}
/**
- * The ClassLoader that loads OSGi framework classes is used to find the class.
+ * The ClassLoader that loads OSGi framework classes is used to find the class.
*/
@Override
public Class<?> findLocalClass(String name) {
@@ -100,7 +100,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 ModuleClassLoader for the framework.
- * @throws IOException
+ * @throws IOException
*/
@Override
public Enumeration<URL> findResources(String name) throws IOException {
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/DependentPolicy.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/DependentPolicy.java
index 838d9d52c..3e8dd60e2 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/DependentPolicy.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/DependentPolicy.java
@@ -24,7 +24,7 @@ import org.osgi.framework.namespace.BundleNamespace;
import org.osgi.framework.namespace.PackageNamespace;
/**
- * DependentPolicy is an implementation of a buddy policy.
+ * DependentPolicy is an implementation of a buddy policy.
* It is responsible for looking up a class in the dependents of the bundle
* to which this policy is attached to.
*/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/IBuddyPolicy.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/IBuddyPolicy.java
index f6993fd9b..704b5d129 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/IBuddyPolicy.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/IBuddyPolicy.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/PolicyHandler.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/PolicyHandler.java
index 16285449d..190ca9c31 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/PolicyHandler.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/PolicyHandler.java
@@ -190,7 +190,7 @@ public class PolicyHandler implements SynchronousBundleListener {
results = new ArrayList<>(policyCount);
while (result.hasMoreElements()) {
URL url = result.nextElement();
- if (!results.contains(url)) //only add if not already added
+ if (!results.contains(url)) //only add if not already added
results.add(url);
}
}
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/RegisteredPolicy.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/RegisteredPolicy.java
index 3546bb4c2..8bfc83ba7 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/RegisteredPolicy.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/RegisteredPolicy.java
@@ -22,7 +22,7 @@ import org.eclipse.osgi.container.namespaces.EquinoxModuleDataNamespace;
import org.eclipse.osgi.internal.loader.BundleLoader;
/**
- *Registered policy is an implementation of a buddy policy.
+ *Registered policy is an implementation of a buddy policy.
* It is responsible for looking up a class in the bundles (registrant) that declare interest in the bundle that require the buddy loading.
* Note that the registrants must have a direct dependency on the bundle needing buddy.
*/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/SystemPolicy.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/SystemPolicy.java
index 9c5eb813f..4a5d02698 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/SystemPolicy.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/SystemPolicy.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathEntry.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathEntry.java
index 5b7882b67..d93618312 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathEntry.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathEntry.java
@@ -37,9 +37,9 @@ import org.eclipse.osgi.storage.bundlefile.BundleEntry;
import org.eclipse.osgi.storage.bundlefile.BundleFile;
/**
- * A ClasspathEntry contains a single <code>BundleFile</code> which is used as
- * a source to load classes and resources from, and a single
- * <code>ProtectionDomain</code> which is used as the domain to define classes
+ * A ClasspathEntry contains a single <code>BundleFile</code> which is used as
+ * a source to load classes and resources from, and a single
+ * <code>ProtectionDomain</code> which is used as the domain to define classes
* loaded from this ClasspathEntry.
* @since 3.2
*/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathManager.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathManager.java
index d4b950ffa..fa24f45f3 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathManager.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathManager.java
@@ -51,10 +51,10 @@ import org.osgi.framework.BundleException;
import org.osgi.framework.namespace.HostNamespace;
/**
- * A helper class for {@link ModuleClassLoader} implementations. This class will keep track of
- * {@link ClasspathEntry} objects for the host bundle and any attached fragment bundles. This
+ * A helper class for {@link ModuleClassLoader} implementations. This class will keep track of
+ * {@link ClasspathEntry} objects for the host bundle and any attached fragment bundles. This
* class takes care of searching the {@link ClasspathEntry} objects for a module class loader
- * implementation. Additional behavior may be added to a classpath manager by configuring a
+ * implementation. Additional behavior may be added to a classpath manager by configuring a
* {@link ClassLoaderHook}.
* @see ModuleClassLoader
* @see ClassLoaderHook
@@ -173,7 +173,7 @@ public class ClasspathManager {
/**
* Finds all the ClasspathEntry objects for the requested classpath. This method will first call all
* the configured class loading hooks {@link ClassLoaderHook#addClassPathEntry(ArrayList, String, ClasspathManager, Generation)}
- * methods. This allows class loading hooks to add additional ClasspathEntry objects to the result for the
+ * methods. This allows class loading hooks to add additional ClasspathEntry objects to the result for the
* requested classpath. Then the local host classpath entries and attached fragment classpath entries are
* searched.
* @param result a list of ClasspathEntry objects. This list is used to add new ClasspathEntry objects to.
@@ -254,12 +254,12 @@ public class ClasspathManager {
if (var.equals("ws")) //$NON-NLS-1$
return ClasspathManager.addStandardClassPathEntry(cpEntries, "ws/" + configuration.getWS() + cp.substring(4), hostManager, source); //$NON-NLS-1$
if (var.equals("os")) //$NON-NLS-1$
- return ClasspathManager.addStandardClassPathEntry(cpEntries, "os/" + configuration.getOS() + cp.substring(4), hostManager, source); //$NON-NLS-1$
+ return ClasspathManager.addStandardClassPathEntry(cpEntries, "os/" + configuration.getOS() + cp.substring(4), hostManager, source); //$NON-NLS-1$
if (var.equals("nl")) { //$NON-NLS-1$
cp = cp.substring(4);
List<String> NL_JAR_VARIANTS = source.getBundleInfo().getStorage().getConfiguration().ECLIPSE_NL_JAR_VARIANTS;
for (String nlVariant : NL_JAR_VARIANTS) {
- if (ClasspathManager.addStandardClassPathEntry(cpEntries, "nl/" + nlVariant + cp, hostManager, source)) //$NON-NLS-1$
+ if (ClasspathManager.addStandardClassPathEntry(cpEntries, "nl/" + nlVariant + cp, hostManager, source)) //$NON-NLS-1$
return true;
}
}
@@ -350,8 +350,8 @@ public class ClasspathManager {
/**
* Finds a local resource by searching the ClasspathEntry objects of the classpath manager.
- * This method will first call all the configured class loading hooks
- * {@link ClassLoaderHook#preFindLocalResource(String, ClasspathManager)} methods. Then it
+ * This method will first call all the configured class loading hooks
+ * {@link ClassLoaderHook#preFindLocalResource(String, ClasspathManager)} methods. Then it
* will search for the resource. Finally it will call all the configured class loading hooks
* {@link ClassLoaderHook#postFindLocalResource(String, URL, ClasspathManager)} methods.
* @param resource the requested resource name.
@@ -536,15 +536,15 @@ public class ClasspathManager {
/**
* Finds a local class by searching the ClasspathEntry objects of the classpath manager.
- * This method will first call all the configured class loader hooks
- * {@link ClassLoaderHook#preFindLocalClass(String, ClasspathManager)} methods. Then it
+ * This method will first call all the configured class loader hooks
+ * {@link ClassLoaderHook#preFindLocalClass(String, ClasspathManager)} methods. Then it
* will search for the class. If a class is found then
* <ol>
* <li>All configured class loader hooks
* {@link ClassLoaderHook#processClass(String, byte[], ClasspathEntry, BundleEntry, ClasspathManager)}
* methods will be called.</li>
- * <li>The class is then defined.</li>
- * <li>Finally, all configured class loading
+ * <li>The class is then defined.</li>
+ * <li>Finally, all configured class loading
* stats hooks {@link ClassLoaderHook#recordClassDefine(String, Class, byte[], ClasspathEntry, BundleEntry, ClasspathManager)}
* methods are called.</li>
* </ol>
@@ -651,10 +651,10 @@ public class ClasspathManager {
}
/**
- * Defines the specified class. This method will first call all the configured class loader hooks
- * {@link ClassLoadingHook#processClass(String, byte[], ClasspathEntry, BundleEntry, ClasspathManager)}
- * methods. If any hook modifies the bytes the all configured hook
- * {@link ClassLoaderHook#rejectTransformation(String, byte[], ClasspathEntry, BundleEntry, ClasspathManager)}
+ * Defines the specified class. This method will first call all the configured class loader hooks
+ * {@link ClassLoadingHook#processClass(String, byte[], ClasspathEntry, BundleEntry, ClasspathManager)}
+ * methods. If any hook modifies the bytes the all configured hook
+ * {@link ClassLoaderHook#rejectTransformation(String, byte[], ClasspathEntry, BundleEntry, ClasspathManager)}
* methods are called. Then it will call the {@link ModuleClassLoader#defineClass(String, byte[], ClasspathEntry, BundleEntry)}
* method to define the class. After that, the class loader hooks are called to announce the class
* definition by calling {@link ClassLoaderHook#recordClassDefine(String, Class, byte[], ClasspathEntry, BundleEntry, ClasspathManager)}.
@@ -679,7 +679,7 @@ public class ClasspathManager {
// First call the hooks that do not handle recursion themselves
if (!hookRegistry.getContainer().isProcessClassRecursionSupportedByAll()) {
// One or more hooks do not support recursive class processing.
- // We need to detect recursions for this set of hooks.
+ // We need to detect recursions for this set of hooks.
if (context.currentlyProcessing.contains(name)) {
// Avoid recursion for the same class name for these hooks
recursionDetected = true;
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ManifestPackageAttributes.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ManifestPackageAttributes.java
index 8d2705472..9dec7ab2f 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ManifestPackageAttributes.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ManifestPackageAttributes.java
@@ -38,8 +38,8 @@ class ManifestPackageAttributes {
* Factory method for creating ManifestPackageAttributes. If any of the given title,
* version, or vendor values are <code>null</code> then the defaultAttributes will be
* used. If the defaultAttributes is null or returns all <code>null</code> values then
- * <code>null</code> values will be used. If <code>null</code> values are used for all of the
- * versions, titles, and vendors then {@link #NONE} is returned.
+ * <code>null</code> values will be used. If <code>null</code> values are used for all of the
+ * versions, titles, and vendors then {@link #NONE} is returned.
* @param specificationTitle the package specification title
* @param specificationVersion the package specification version
* @param specificationVendor the package specification vendor
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/TitleVersionVendor.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/TitleVersionVendor.java
index 1ed88db36..1a754a7a8 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/TitleVersionVendor.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/TitleVersionVendor.java
@@ -27,7 +27,7 @@ class TitleVersionVendor {
private final String vendor;
/**
- * Factory for creating TitleVersionVendor objects. If the given title, version and
+ * Factory for creating TitleVersionVendor objects. If the given title, version and
* vendor are <code>null</code> then {@link #NONE} is returned.
* @param title
* @param version
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/FilteredSourcePackage.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/FilteredSourcePackage.java
index 39d203116..051df33eb 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/FilteredSourcePackage.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/FilteredSourcePackage.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/MultiSourcePackage.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/MultiSourcePackage.java
index ee7559a39..b42472a58 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/MultiSourcePackage.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/MultiSourcePackage.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/PackageSource.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/PackageSource.java
index 99471fd3e..556b07e0f 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/PackageSource.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/PackageSource.java
@@ -149,7 +149,7 @@ public abstract class PackageSource {
@SuppressWarnings("deprecation")
Bundle bundle = container.getPackageAdmin().getBundle(serviceClass);
if (bundle != null && bundle != registrant)
- // in this case we have a wacky ServiceFactory that is doing something we cannot
+ // in this case we have a wacky ServiceFactory that is doing something we cannot
// verify if it is correct. Instead of failing we allow the assignment and hope for the best
// bug 326918
return true;
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/SingleSourcePackage.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/SingleSourcePackage.java
index a686cd84e..204e9797a 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/SingleSourcePackage.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/sources/SingleSourcePackage.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/BasicLocation.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/BasicLocation.java
index 45c38d584..7197ef292 100755
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/BasicLocation.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/BasicLocation.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java
index f58e50a0b..0c13ace6f 100755
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Rapicorp, Inc - Support for Mac Layout (bug 431116)
@@ -115,8 +115,8 @@ public class EquinoxLocations {
// only compute the default if the configuration area property is not set
defaultLocation = buildURL(computeDefaultConfigurationLocation(), true);
configurationLocation = buildLocation(PROP_CONFIG_AREA, defaultLocation, "", false, false, null); //$NON-NLS-1$
- // get the parent location based on the system property. This will have been set on the
- // way in either by the caller/user or by main. There will be no parent location if we are not
+ // get the parent location based on the system property. This will have been set on the
+ // way in either by the caller/user or by main. There will be no parent location if we are not
// cascaded.
URL parentLocation = computeSharedConfigurationLocation();
if (parentLocation != null && !parentLocation.equals(configurationLocation.getURL())) {
@@ -183,10 +183,10 @@ public class EquinoxLocations {
@SuppressWarnings("deprecation")
private Location buildLocation(String property, URL defaultLocation, String userDefaultAppendage, boolean readOnlyDefault, boolean computeReadOnly, String dataAreaPrefix) {
String location = equinoxConfig.clearConfiguration(property);
- // the user/product may specify a non-default readOnly setting
+ // the user/product may specify a non-default readOnly setting
String userReadOnlySetting = equinoxConfig.getConfiguration(property + READ_ONLY_AREA_SUFFIX);
boolean readOnly = (userReadOnlySetting == null ? readOnlyDefault : Boolean.valueOf(userReadOnlySetting).booleanValue());
- // if the instance location is not set, predict where the workspace will be and
+ // if the instance location is not set, predict where the workspace will be and
// put the instance area inside the workspace meta area.
if (location == null)
return new BasicLocation(property, defaultLocation, userReadOnlySetting != null || !computeReadOnly ? readOnly : !canWrite(defaultLocation), dataAreaPrefix, equinoxConfig, container, debugLocations);
@@ -247,16 +247,16 @@ public class EquinoxLocations {
sharedConfigurationURL = new URL(installURL, sharedConfigurationURL.getPath());
equinoxConfig.setConfiguration(PROP_SHARED_CONFIG_AREA, sharedConfigurationURL.toExternalForm());
} catch (MalformedURLException e) {
- // do nothing here since it is basically impossible to get a bogus url
+ // do nothing here since it is basically impossible to get a bogus url
}
return null;
}
private String computeDefaultConfigurationLocation() {
// 1) We store the config state relative to the 'eclipse' directory if possible
- // 2) If this directory is read-only
- // we store the state in <user.home>/.eclipse/<application-id>_<version> where <user.home>
- // is unique for each local user, and <application-id> is the one
+ // 2) If this directory is read-only
+ // we store the state in <user.home>/.eclipse/<application-id>_<version> where <user.home>
+ // is unique for each local user, and <application-id> is the one
// defined in .eclipseproduct marker file. If .eclipseproduct does not
// exist, use "eclipse" as the application-id.
@@ -285,8 +285,8 @@ public class EquinoxLocations {
}
private String computeDefaultUserAreaLocation(String pathAppendage) {
- // we store the state in <user.home>/.eclipse/<application-id>_<version> where <user.home>
- // is unique for each local user, and <application-id> is the one
+ // we store the state in <user.home>/.eclipse/<application-id>_<version> where <user.home>
+ // is unique for each local user, and <application-id> is the one
// defined in .eclipseproduct marker file. If .eclipseproduct does not
// exist, use "eclipse" as the application-id.
String installProperty = equinoxConfig.getConfiguration(PROP_INSTALL_AREA);
@@ -310,7 +310,7 @@ public class EquinoxLocations {
appVersion = ""; //$NON-NLS-1$
appName += File.separator + appId + "_" + appVersion + "_" + installDirHash; //$NON-NLS-1$ //$NON-NLS-2$
} catch (IOException e) {
- // Do nothing if we get an exception. We will default to a standard location
+ // Do nothing if we get an exception. We will default to a standard location
// in the user's home dir.
// add the hash to help prevent collisions
appName += File.separator + installDirHash;
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ConfigAdminListener.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ConfigAdminListener.java
index 9252f3517..a2d73193b 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ConfigAdminListener.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ConfigAdminListener.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EquinoxLogFactory.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EquinoxLogFactory.java
index e24e7bb3a..99a0d0aae 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EquinoxLogFactory.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EquinoxLogFactory.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EquinoxLogServices.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EquinoxLogServices.java
index 8040f9009..2efb30678 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EquinoxLogServices.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EquinoxLogServices.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -114,7 +114,7 @@ public class EquinoxLogServices {
private ServiceRegistration<?> perfLogReg;
/**
- * @throws BundleException
+ * @throws BundleException
*/
public void start(BundleContext context) throws BundleException {
logServiceManager.start(context);
@@ -123,7 +123,7 @@ public class EquinoxLogServices {
}
/**
- * @throws BundleException
+ * @throws BundleException
*/
public void stop(BundleContext context) throws BundleException {
frameworkLogReg.unregister();
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EquinoxLogWriter.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EquinoxLogWriter.java
index 4e4946259..134f4fcb2 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EquinoxLogWriter.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EquinoxLogWriter.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -43,7 +43,7 @@ import org.osgi.service.log.admin.LoggerAdmin;
import org.osgi.service.log.admin.LoggerContext;
class EquinoxLogWriter implements SynchronousLogListener, LogFilter {
- private static final String PASSWORD = "-password"; //$NON-NLS-1$
+ private static final String PASSWORD = "-password"; //$NON-NLS-1$
/** The session tag */
private static final String SESSION = "!SESSION"; //$NON-NLS-1$
/** The entry tag */
@@ -179,7 +179,7 @@ class EquinoxLogWriter implements SynchronousLogListener, LogFilter {
* @return the session timestamp
*/
private String getSessionTimestamp() {
- // Main should have set the session start-up timestamp so return that.
+ // Main should have set the session start-up timestamp so return that.
// Return the "now" time if not available.
String ts = environmentInfo.getConfiguration("eclipse.startTime"); //$NON-NLS-1$
if (ts != null) {
@@ -233,7 +233,7 @@ class EquinoxLogWriter implements SynchronousLogListener, LogFilter {
write(", ARCH=" + environmentInfo.getOSArch()); //$NON-NLS-1$
write(", WS=" + environmentInfo.getWS()); //$NON-NLS-1$
writeln(", NL=" + environmentInfo.getNL()); //$NON-NLS-1$
- // Add the command-line arguments used to invoke the platform
+ // Add the command-line arguments used to invoke the platform
// XXX: this includes runtime-private arguments - should we do that?
if (includeCommandLine) {
writeArgs("Framework arguments: ", environmentInfo.getNonFrameworkArgs()); //$NON-NLS-1$
@@ -303,7 +303,7 @@ class EquinoxLogWriter implements SynchronousLogListener, LogFilter {
writeLog(0, logEntry);
writer.flush();
} catch (Exception e) {
- // any exceptions during logging should be caught
+ // any exceptions during logging should be caught
System.err.println("An exception occurred while writing to the platform log:");//$NON-NLS-1$
e.printStackTrace(System.err);
System.err.println("Logging to the console instead.");//$NON-NLS-1$
@@ -326,7 +326,7 @@ class EquinoxLogWriter implements SynchronousLogListener, LogFilter {
}
/**
- * @throws IOException
+ * @throws IOException
*/
public synchronized void setFile(File newFile, boolean append) throws IOException {
if (newFile != null && !newFile.equals(this.outFile)) {
@@ -591,7 +591,7 @@ class EquinoxLogWriter implements SynchronousLogListener, LogFilter {
}
/**
- * Checks the log file size. If the log file size reaches the limit then the log
+ * Checks the log file size. If the log file size reaches the limit then the log
* is rotated
* @return false if an error occured trying to rotate the log
*/
@@ -614,7 +614,7 @@ class EquinoxLogWriter implements SynchronousLogListener, LogFilter {
File backupFile = new File(backupFilename);
if (backupFile.exists()) {
if (!backupFile.delete()) {
- System.err.println("Error when trying to delete old log file: " + backupFile.getName());//$NON-NLS-1$
+ System.err.println("Error when trying to delete old log file: " + backupFile.getName());//$NON-NLS-1$
if (backupFile.renameTo(new File(backupFile.getAbsolutePath() + System.currentTimeMillis()))) {
System.err.println("So we rename it to filename: " + backupFile.getName()); //$NON-NLS-1$
} else {
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EventAdminAdapter.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EventAdminAdapter.java
index cf673436d..fe62d5a07 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EventAdminAdapter.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EventAdminAdapter.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ExtendedLogReaderServiceFactory.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ExtendedLogReaderServiceFactory.java
index cca82e301..4972ccf1f 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ExtendedLogReaderServiceFactory.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ExtendedLogReaderServiceFactory.java
@@ -114,7 +114,7 @@ public class ExtendedLogReaderServiceFactory implements ServiceFactory<ExtendedL
// Catch linkage errors as these are generally recoverable but let other Errors propagate (see bug 222001)
getErrorStream().println("LogListener.logged threw a non-fatal unchecked exception as follows:"); //$NON-NLS-1$
e.printStackTrace(getErrorStream());
- }
+ }
}
public ExtendedLogReaderServiceFactory(int maxHistory, LogLevel defaultLevel) {
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ExtendedLogReaderServiceImpl.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ExtendedLogReaderServiceImpl.java
index 273f9fcf9..8cd1161c4 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ExtendedLogReaderServiceImpl.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ExtendedLogReaderServiceImpl.java
@@ -32,7 +32,7 @@ public class ExtendedLogReaderServiceImpl implements ExtendedLogReaderService {
throw new IllegalArgumentException("LogListener must not be null"); //$NON-NLS-1$
if (filter == null)
- throw new IllegalArgumentException("LogFilter must not be null"); //$NON-NLS-1$
+ throw new IllegalArgumentException("LogFilter must not be null"); //$NON-NLS-1$
listeners.add(listener);
factory.addLogListener(listener, filter);
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/LoggerContextTargetMap.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/LoggerContextTargetMap.java
index 2f6c0f832..3dd871992 100755
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/LoggerContextTargetMap.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/LoggerContextTargetMap.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/BundlePermissions.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/BundlePermissions.java
index 6168edb5a..2d874bd4b 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/BundlePermissions.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/BundlePermissions.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -22,7 +22,7 @@ import org.osgi.framework.PackagePermission;
public final class BundlePermissions extends PermissionCollection {
private static final long serialVersionUID = -5443618108312606612L;
- // Note that this forces the Enumeration inner class to be loaded as soon as possible (see bug 119069)
+ // Note that this forces the Enumeration inner class to be loaded as soon as possible (see bug 119069)
static final Enumeration<Permission> EMPTY_ENUMERATION = new Enumeration<Permission>() {
@Override
public boolean hasMoreElements() {
@@ -60,7 +60,7 @@ public final class BundlePermissions extends PermissionCollection {
* <p/>
* Bundles may require additional permissions in order to execute byte code
* woven by weaving hooks.
- *
+ *
* @param permission The package permission to add to this woven bundle.
* @throws SecurityException If the <code>permission</code>
* does not have an action of {@link PackagePermission#IMPORT}.
@@ -73,7 +73,7 @@ public final class BundlePermissions extends PermissionCollection {
@Override
public Enumeration<Permission> elements() {
- // TODO return an empty enumeration for now;
+ // TODO return an empty enumeration for now;
// It does not seem possible to do this properly with multiple exports and conditional permissions.
// When looking to fix this be sure the Enumeration class is loaded as soon as possible (see bug 119069)
return EMPTY_ENUMERATION;
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/EquinoxSecurityManager.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/EquinoxSecurityManager.java
index 0234cc8f3..fed844202 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/EquinoxSecurityManager.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/EquinoxSecurityManager.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -20,13 +20,13 @@ import org.eclipse.osgi.internal.permadmin.SecurityRow.Decision;
import org.osgi.service.condpermadmin.Condition;
/**
- *
+ *
* This security manager implements the ConditionalPermission processing for
* OSGi. It is to be used with ConditionalPermissionAdmin.
- *
+ *
*/
public class EquinoxSecurityManager extends SecurityManager {
- /*
+ /*
* This is super goofy, but we need to make sure that the CheckContext and
* CheckPermissionAction classes load early. Otherwise, we run into problems later.
*/
@@ -96,7 +96,7 @@ public class EquinoxSecurityManager extends SecurityManager {
/**
* Gets the AccessControlContext currently being evaluated by
* the SecurityManager.
- *
+ *
* @return the AccessControlContext currently being evaluated by the SecurityManager, or
* null if no AccessControlContext is being evaluated. Note: this method will
* return null if the permission check is being done directly on the AccessControlContext
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/PermissionAdminTable.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/PermissionAdminTable.java
index 49e4db187..54e2d4549 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/PermissionAdminTable.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/PermissionAdminTable.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/PermissionInfoCollection.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/PermissionInfoCollection.java
index cb057962e..e6635428a 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/PermissionInfoCollection.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/PermissionInfoCollection.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -69,7 +69,7 @@ public final class PermissionInfoCollection extends PermissionCollection {
@Override
public Enumeration<Permission> elements() {
- // TODO return an empty enumeration for now;
+ // TODO return an empty enumeration for now;
return BundlePermissions.EMPTY_ENUMERATION;
}
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityAdmin.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityAdmin.java
index 255577039..4a1ad5223 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityAdmin.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityAdmin.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityRow.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityRow.java
index 0dbb366ee..af9efdae4 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityRow.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityRow.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Connexta, LLC - performance improvements
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityRowSnapShot.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityRowSnapShot.java
index e9c0b1b86..b2b415c82 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityRowSnapShot.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityRowSnapShot.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityTable.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityTable.java
index 34aa2a171..ff32046ac 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityTable.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityTable.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Connexta, LLC - evaluation cache implementation
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityTableUpdate.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityTableUpdate.java
index 1522f8a1a..e99eafb64 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityTableUpdate.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/permadmin/SecurityTableUpdate.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/service/security/AuthorizationEngine.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/service/security/AuthorizationEngine.java
index 0d148788a..b57c39297 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/service/security/AuthorizationEngine.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/service/security/AuthorizationEngine.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -38,9 +38,9 @@ public abstract class AuthorizationEngine {
}
/**
- * Authorizes a <code>SignedContent</code> object. The engine determines if the
- * signed content authorization should be granted. The context is the entity
- * associated with the signed content. For example, signed content
+ * Authorizes a <code>SignedContent</code> object. The engine determines if the
+ * signed content authorization should be granted. The context is the entity
+ * associated with the signed content. For example, signed content
* for a bundle will have a <code>Bundle</code> object as the context.
* @param content the signed content. The value may be <code>null</code>.
* @param context the context associated with the signed content. The value may be <code>null</code>.
@@ -65,7 +65,7 @@ public abstract class AuthorizationEngine {
}
/**
- * Authorizes a <code>SignedContent</code> object. The engine determines if the
+ * Authorizes a <code>SignedContent</code> object. The engine determines if the
* signed content authorization should be granted.
* @param content
* @param context the context associated with the signed content
@@ -76,7 +76,7 @@ public abstract class AuthorizationEngine {
/**
* Return the current status of the Authorization system.
- *
+ *
* @return A value of {@link AuthorizationStatus#OK} or {@link AuthorizationStatus#ERROR}
* @see AuthorizationStatus#OK
* @see AuthorizationStatus#ERROR
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/service/security/AuthorizationEvent.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/service/security/AuthorizationEvent.java
index 41c314799..3798cb6b8 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/service/security/AuthorizationEvent.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/service/security/AuthorizationEvent.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -17,7 +17,7 @@ import org.eclipse.osgi.signedcontent.SignedContent;
/**
* An event that is fired when an AuthorizationEngine implementation makes
- * a decision.
+ * a decision.
* @since 3.4
*/
public class AuthorizationEvent {
@@ -39,7 +39,7 @@ public class AuthorizationEvent {
/**
* Create a new AuthorizationEvent
- * @param result - the result code
+ * @param result - the result code
* @param content - the signed content
* @param context - operation specific context
* @param severity - severity code
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/service/security/AuthorizationListener.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/service/security/AuthorizationListener.java
index 516087eab..4284fff24 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/service/security/AuthorizationListener.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/service/security/AuthorizationListener.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -16,7 +16,7 @@ package org.eclipse.osgi.internal.provisional.service.security;
import java.util.EventListener;
/**
- * A Listener interface for an authorization handler. Implementors
+ * A Listener interface for an authorization handler. Implementors
* should register as an OSGI service.
* @since 3.4
*/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/service/security/AuthorizationStatus.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/service/security/AuthorizationStatus.java
index 1a6493d90..b06088847 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/service/security/AuthorizationStatus.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/service/security/AuthorizationStatus.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -18,7 +18,7 @@ package org.eclipse.osgi.internal.provisional.service.security;
* <p>
* This class is not intended to be extended by clients.
* </p>
- *
+ *
* @since 3.4
*/
public class AuthorizationStatus {
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/verifier/CertificateChain.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/verifier/CertificateChain.java
index 14d98825a..f4a9d562e 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/verifier/CertificateChain.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/verifier/CertificateChain.java
@@ -28,7 +28,7 @@ import java.util.Date;
public interface CertificateChain {
/**
* Returns the list of X500 distinguished names that make up the certificate chain. Each
- * distinguished name is separated by a ';'. The first distinguished name is the signer
+ * distinguished name is separated by a ';'. The first distinguished name is the signer
* and the last is the root Certificate Authority.
* @return the list of X500 distinguished names that make up the certificate chain
*/
@@ -60,7 +60,7 @@ public interface CertificateChain {
/**
* Return the signing time for this signer.
- *
+ *
* @return null if there is a signing time for this signer null otherwise
*/
public Date getSigningTime();
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/verifier/CertificateTrustAuthority.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/verifier/CertificateTrustAuthority.java
index 324d1ce57..ec126b747 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/verifier/CertificateTrustAuthority.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/verifier/CertificateTrustAuthority.java
@@ -19,12 +19,12 @@ import java.security.cert.CertificateException;
/**
* A CertificateTrustAuthority is used to check if certificate chains are trusted.
- *
+ *
*/
public interface CertificateTrustAuthority {
/**
- * Determines if the certificates are trusted. This method will throw a
+ * Determines if the certificates are trusted. This method will throw a
* <code>CertificateException</code> if the specified certificate chain is not trusted.
* @param certChain a chain of certificates
* @throws CertificateException if the certficates are not trusted
@@ -33,7 +33,7 @@ public interface CertificateTrustAuthority {
/**
* Add the specified certificate chain as a trusted certificate chain.
- *
+ *
* @param certChain a chain of certificates
*/
public void addTrusted(Certificate[] certChain) throws CertificateException;
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/verifier/CertificateVerifier.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/verifier/CertificateVerifier.java
index 96fbf3907..b8170bce2 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/verifier/CertificateVerifier.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/verifier/CertificateVerifier.java
@@ -17,8 +17,8 @@ import java.security.SignatureException;
import java.security.cert.*;
/**
- * A certificate verifier is used to verify the authenticity of a signed
- * repository. A certificate verifier is created using a
+ * A certificate verifier is used to verify the authenticity of a signed
+ * repository. A certificate verifier is created using a
* {@link CertificateVerifierFactory}.
* <p>
* <strong>EXPERIMENTAL</strong>. This class or interface has been added as
@@ -30,8 +30,8 @@ import java.security.cert.*;
public interface CertificateVerifier {
/**
* Verify the content of the repository.
- *
- * @throws CertificateException
+ *
+ * @throws CertificateException
* @throws CertificateExpiredException
* @throws CertificateParsingException
* @throws SignatureException
@@ -39,10 +39,10 @@ public interface CertificateVerifier {
public void checkContent() throws CertificateException, CertificateExpiredException, SignatureException;
/**
- * Verifies the content of the repository. An array is returned with the entry names
+ * Verifies the content of the repository. An array is returned with the entry names
* which are corrupt. If no entries are corrupt then an empty array is returned.
- * @return An array of entry names which are corrupt. An empty array is returned if the
- * repository is not corrupt or if the repository is not signed.
+ * @return An array of entry names which are corrupt. An empty array is returned if the
+ * repository is not corrupt or if the repository is not signed.
*/
public String[] verifyContent();
@@ -54,7 +54,7 @@ public interface CertificateVerifier {
/**
* Returns all certificate chains of the repository. All certificate chains
- * are returned whether they are trusted or not. If the repository is not signed
+ * are returned whether they are trusted or not. If the repository is not signed
* then an empty array is returned.
* @return all certificate chains of the repository
*/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/verifier/CertificateVerifierFactory.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/verifier/CertificateVerifierFactory.java
index 25c91cb4c..c03e47093 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/verifier/CertificateVerifierFactory.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/provisional/verifier/CertificateVerifierFactory.java
@@ -37,7 +37,7 @@ public interface CertificateVerifierFactory {
/**
* Returns a certificate verifier for the specified bundle.
- * @param bundle the bundle to get a verifier for
+ * @param bundle the bundle to get a verifier for
* @return a certificate verifier for the specified bundle.
* @throws IOException if an IO exception occurs while reading the bundle content
*/
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/service/security/KeyStoreTrustEngine.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/service/security/KeyStoreTrustEngine.java
index 4295da3f1..47764b5ac 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/service/security/KeyStoreTrustEngine.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/service/security/KeyStoreTrustEngine.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -46,7 +46,7 @@ public class KeyStoreTrustEngine extends TrustEngine {
private final SignedBundleHook signedBundleHook;
/**
- * Create a new KeyStoreTrustEngine that is backed by a KeyStore
+ * Create a new KeyStoreTrustEngine that is backed by a KeyStore
* @param path - path to the keystore
* @param type - the type of keystore at the path location
* @param password - the password required to unlock the keystore
@@ -77,7 +77,7 @@ public class KeyStoreTrustEngine extends TrustEngine {
/**
* Return the password
- * @return password - the password as a char[]
+ * @return password - the password as a char[]
*/
private char[] getPassword() {
return password;
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/FilteredServiceListener.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/FilteredServiceListener.java
index 1a6638366..7468872f8 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/FilteredServiceListener.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/FilteredServiceListener.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -73,7 +73,7 @@ class FilteredServiceListener implements ServiceListener, ListenerHook.ListenerI
/**
* Receives notification that a service has had a lifecycle change.
- *
+ *
* @param event The <code>ServiceEvent</code> object.
*/
@Override
@@ -85,7 +85,7 @@ class FilteredServiceListener implements ServiceListener, ListenerHook.ListenerI
String[] classes = reference.getClasses();
int size = classes.length;
for (int i = 0; i < size; i++) {
- if (classes[i] == objectClass) // objectClass strings have previously been interned for identity comparison
+ if (classes[i] == objectClass) // objectClass strings have previously been interned for identity comparison
break objectClassCheck;
}
return; // no class in this event matches a required part of the filter; we do not need to deliver this event
@@ -117,7 +117,7 @@ class FilteredServiceListener implements ServiceListener, ListenerHook.ListenerI
/**
* Returns a service event that should be delivered to the listener based on the filter evaluation.
* This may result in a service event of type MODIFIED_ENDMATCH.
- *
+ *
* @param delivered The service event delivered by the framework.
* @return The event to be delivered or null if no event is to be delivered to the listener.
*/
@@ -155,7 +155,7 @@ class FilteredServiceListener implements ServiceListener, ListenerHook.ListenerI
return listener.getClass().getName() + "@" + Integer.toHexString(System.identityHashCode(listener)) + filterString; //$NON-NLS-1$
}
- /**
+ /**
* Return the bundle context for the ListenerHook.
* @return The context of the bundle which added the service listener.
* @see org.osgi.framework.hooks.service.ListenerHook.ListenerInfo#getBundleContext()
@@ -165,7 +165,7 @@ class FilteredServiceListener implements ServiceListener, ListenerHook.ListenerI
return context;
}
- /**
+ /**
* Return the filter string for the ListenerHook.
* @return The filter string with which the listener was added. This may
* be <code>null</code> if the listener was added without a filter.
@@ -185,7 +185,7 @@ class FilteredServiceListener implements ServiceListener, ListenerHook.ListenerI
* indicating the listener has been added but has not been removed.
* After the listener has been removed, this method must always return
* <code>true</code>.
- *
+ *
* @return <code>false</code> if the listener has not been been removed,
* <code>true</code> otherwise.
*/
@@ -194,7 +194,7 @@ class FilteredServiceListener implements ServiceListener, ListenerHook.ListenerI
return removed;
}
- /**
+ /**
* Mark the service listener registration as removed.
*/
void markRemoved() {
@@ -203,7 +203,7 @@ class FilteredServiceListener implements ServiceListener, ListenerHook.ListenerI
/**
* Returns an objectClass filter string for the specified class name.
- * @return A filter string for the specified class name or <code>null</code> if the
+ * @return A filter string for the specified class name or <code>null</code> if the
* specified class name is <code>null</code>.
*/
private static String getObjectClassFilterString(String className) {
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/HookContext.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/HookContext.java
index c4fb74cf8..a16d885ec 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/HookContext.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/HookContext.java
@@ -27,7 +27,7 @@ public interface HookContext {
/**
* Call the specified hook.
- *
+ *
* @param hook The hook ob