From c8caeaa2cf5f6621f755dd7878a911e77147ea88 Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Wed, 18 Jan 2017 08:49:31 -0600 Subject: Bug 510641 - Remove old Headers implementation. Change-Id: Ibc09bc478f68516c692c95181081a08781024ed5 Signed-off-by: Thomas Watson --- .../osgi/compatibility/plugins/PluginConverterHook.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'bundles/org.eclipse.osgi.compatibility.plugins/src') diff --git a/bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/PluginConverterHook.java b/bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/PluginConverterHook.java index 88dca675d..3ff76b4b8 100644 --- a/bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/PluginConverterHook.java +++ b/bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/PluginConverterHook.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2013 IBM Corporation and others. + * Copyright (c) 2013, 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 @@ -12,8 +12,9 @@ package org.eclipse.osgi.compatibility.plugins; import java.io.File; import java.io.IOException; +import java.util.Map; -import org.eclipse.osgi.framework.util.Headers; +import org.eclipse.osgi.framework.util.CaseInsensitiveDictionaryMap; import org.eclipse.osgi.internal.hookregistry.ActivatorHookFactory; import org.eclipse.osgi.internal.hookregistry.BundleFileWrapperFactoryHook; import org.eclipse.osgi.internal.hookregistry.HookConfigurator; @@ -25,6 +26,7 @@ import org.eclipse.osgi.storage.bundlefile.BundleEntry; import org.eclipse.osgi.storage.bundlefile.BundleFile; import org.eclipse.osgi.storage.bundlefile.BundleFileWrapper; import org.eclipse.osgi.storage.bundlefile.FileBundleEntry; +import org.eclipse.osgi.util.ManifestElement; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; @@ -55,10 +57,10 @@ public class PluginConverterHook implements HookConfigurator { if (!PluginConverterImpl.OSGI_BUNDLE_MANIFEST.equals(path)) { return entry; } - Headers headers = null; + Map headers = null; if (entry != null) { try { - headers = Headers.parseManifest(entry.getInputStream()); + headers = ManifestElement.parseBundleManifest(entry.getInputStream(), new CaseInsensitiveDictionaryMap()); } catch (Exception e) { throw new RuntimeException(e); } -- cgit v1.2.3