Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2013-08-30 15:31:57 -0400
committerThomas Watson2013-08-30 16:23:18 -0400
commit0ba4188bc161ee52e2f8335dde7a33f9d1789333 (patch)
tree556b5e59758af94df6fab8b6d7fa6f35557480d9 /bundles/org.eclipse.osgi.compatibility.plugins/src
parent4af4881573f98cb0eab92922c6302908fd56b389 (diff)
downloadrt.equinox.framework-0ba4188bc161ee52e2f8335dde7a33f9d1789333.tar.gz
rt.equinox.framework-0ba4188bc161ee52e2f8335dde7a33f9d1789333.tar.xz
rt.equinox.framework-0ba4188bc161ee52e2f8335dde7a33f9d1789333.zip
Bug 416073 - Optimize Storage.listEntryPaths for wildcards and recursion.I20130903-0900I20130831-1500I20130830-2000
Minor tweaks: - Change PluginConverterHook to use getBundleFile() to avoid confusion on which bundle file it was using - Change ZipBundleFile to use LinkedHashSet to preserve order.
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.java6
1 files changed, 3 insertions, 3 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 b7fd91719..88dca675d 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
@@ -43,7 +43,7 @@ public class PluginConverterHook implements HookConfigurator {
hookRegistry.addBundleFileWrapperFactoryHook(new BundleFileWrapperFactoryHook() {
@Override
- public BundleFileWrapper wrapBundleFile(final BundleFile bundleFile, Generation generation, boolean base) {
+ public BundleFileWrapper wrapBundleFile(BundleFile bundleFile, Generation generation, boolean base) {
if (!base) {
return null;
}
@@ -51,7 +51,7 @@ public class PluginConverterHook implements HookConfigurator {
@Override
public BundleEntry getEntry(String path) {
- BundleEntry entry = bundleFile.getEntry(path);
+ BundleEntry entry = getBundleFile().getEntry(path);
if (!PluginConverterImpl.OSGI_BUNDLE_MANIFEST.equals(path)) {
return entry;
}
@@ -70,7 +70,7 @@ public class PluginConverterHook implements HookConfigurator {
}
}
try {
- File manifest = converter.convertManifest(bundleFile.getBaseFile(), null, true, null, true, null, false);
+ File manifest = converter.convertManifest(getBaseFile(), null, true, null, true, null, false);
if (manifest == null) {
return entry;
}

Back to the top