diff options
| author | Thomas Watson | 2017-11-15 18:53:41 +0000 |
|---|---|---|
| committer | Thomas Watson | 2017-11-16 15:13:33 +0000 |
| commit | 045a3a31cf5900255afd392a6e310fd99b84ac6e (patch) | |
| tree | bf28ee7fce4702701a47e187023395b95ff6c482 /bundles/org.eclipse.osgi.compatibility.state/src/org | |
| parent | 399ac521ec3043355fe1a0daa2bb0f0483c28605 (diff) | |
| download | rt.equinox.framework-045a3a31cf5900255afd392a6e310fd99b84ac6e.tar.gz rt.equinox.framework-045a3a31cf5900255afd392a6e310fd99b84ac6e.tar.xz rt.equinox.framework-045a3a31cf5900255afd392a6e310fd99b84ac6e.zip | |
Bug 526997 - Usage of org.eclipse.osgi.container.Module is ambiguousI20171122-2000I20171121-2000I20171121-0020I20171120-2225I20171120-2000I20171119-2000I20171118-1500I20171117-2000I20171116-2000
with a Java 9 JRE
Added explicit imports to org.eclipse.osgi.container.Module where
needed. Also had to update the jdt prefs for the projects to stop
collapsing the imports when 3 or more classes are imported from the same
package.
Change-Id: I6cbfbeea07e2cb0e5df7db8db1d145014ab33cb2
Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
Diffstat (limited to 'bundles/org.eclipse.osgi.compatibility.state/src/org')
| -rw-r--r-- | bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/PlatformAdminImpl.java | 22 |
1 files changed, 18 insertions, 4 deletions
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 3f35cd719..4adbb67b6 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 @@ -9,15 +9,29 @@ ******************************************************************************/ package org.eclipse.osgi.compatibility.state; -import java.util.*; -import org.eclipse.osgi.container.*; +import java.util.Dictionary; +import java.util.Hashtable; +import java.util.List; +import java.util.Map; +import org.eclipse.osgi.container.Module; +import org.eclipse.osgi.container.ModuleContainer; +import org.eclipse.osgi.container.ModuleDatabase; +import org.eclipse.osgi.container.ModuleRevision; import org.eclipse.osgi.internal.framework.BundleContextImpl; import org.eclipse.osgi.internal.framework.EquinoxContainer; import org.eclipse.osgi.internal.module.ResolverImpl; import org.eclipse.osgi.internal.resolver.StateHelperImpl; import org.eclipse.osgi.internal.resolver.StateObjectFactoryImpl; -import org.eclipse.osgi.service.resolver.*; -import org.osgi.framework.*; +import org.eclipse.osgi.service.resolver.BundleDescription; +import org.eclipse.osgi.service.resolver.DisabledInfo; +import org.eclipse.osgi.service.resolver.PlatformAdmin; +import org.eclipse.osgi.service.resolver.Resolver; +import org.eclipse.osgi.service.resolver.State; +import org.eclipse.osgi.service.resolver.StateHelper; +import org.eclipse.osgi.service.resolver.StateObjectFactory; +import org.osgi.framework.BundleContext; +import org.osgi.framework.BundleException; +import org.osgi.framework.ServiceRegistration; public class PlatformAdminImpl implements PlatformAdmin { private final StateObjectFactory factory = new StateObjectFactoryImpl(); |