Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2017-01-18 09:49:31 -0500
committerThomas Watson2017-01-18 13:58:10 -0500
commitc8caeaa2cf5f6621f755dd7878a911e77147ea88 (patch)
tree5319d3f2dd9812125a8d662bc57a91af01191874 /bundles/org.eclipse.osgi.compatibility.plugins/src
parentf2c1c6a63763ab80aafeb8045ff8f73048870401 (diff)
downloadrt.equinox.framework-c8caeaa2cf5f6621f755dd7878a911e77147ea88.tar.gz
rt.equinox.framework-c8caeaa2cf5f6621f755dd7878a911e77147ea88.tar.xz
rt.equinox.framework-c8caeaa2cf5f6621f755dd7878a911e77147ea88.zip
Bug 510641 - Remove old Headers implementation.
Change-Id: Ibc09bc478f68516c692c95181081a08781024ed5 Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
Diffstat (limited to 'bundles/org.eclipse.osgi.compatibility.plugins/src')
-rw-r--r--bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/PluginConverterHook.java10
1 files changed, 6 insertions, 4 deletions
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<String, String> headers = null;
+ Map<String, String> headers = null;
if (entry != null) {
try {
- headers = Headers.parseManifest(entry.getInputStream());
+ headers = ManifestElement.parseBundleManifest(entry.getInputStream(), new CaseInsensitiveDictionaryMap<String, String>());
} catch (Exception e) {
throw new RuntimeException(e);
}

Back to the top