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/container/src/org/eclipse/osgi/internal/hookregistry/StorageHookFactory.java | |
| 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/container/src/org/eclipse/osgi/internal/hookregistry/StorageHookFactory.java')
| -rw-r--r-- | bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/StorageHookFactory.java | 12 |
1 files changed, 9 insertions, 3 deletions
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 9c5ad2abc..4d221f1ff 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2016 IBM Corporation and others. + * Copyright (c) 2005, 2017 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -11,10 +11,16 @@ package org.eclipse.osgi.internal.hookregistry; -import java.io.*; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; import java.util.Dictionary; -import org.eclipse.osgi.container.*; +import org.eclipse.osgi.container.Module; +import org.eclipse.osgi.container.ModuleContainer; +import org.eclipse.osgi.container.ModuleContainerAdaptor; import org.eclipse.osgi.container.ModuleContainerAdaptor.ModuleEvent; +import org.eclipse.osgi.container.ModuleRevision; +import org.eclipse.osgi.container.ModuleRevisionBuilder; import org.eclipse.osgi.storage.BundleInfo.Generation; import org.osgi.framework.BundleException; |