From b1253a7d7fa5cb447c7edaae541705bb9f0da7d1 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 9 Jul 2012 14:31:44 +0000 Subject: [PATCH] Fix JAR indexer for Require-Bundle git-svn-id: https://svn.argeo.org/slc/trunk@5424 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../main/java/org/argeo/slc/repo/JarFileIndexer.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/JarFileIndexer.java b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/JarFileIndexer.java index 80c750407..d6cee9bf9 100644 --- a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/JarFileIndexer.java +++ b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/JarFileIndexer.java @@ -211,7 +211,7 @@ public class JarFileIndexer implements NodeIndexer, SlcNames { cleanSubNodes(fileNode, SlcNames.SLC_ + Constants.IMPORT_PACKAGE); if (attrs.containsKey(new Name(Constants.IMPORT_PACKAGE))) { String importPackages = attrs.getValue(Constants.IMPORT_PACKAGE); - List packages = parsePackages(importPackages); + List packages = parseCommaSeparated(importPackages); for (String pkg : packages) { String[] tokens = pkg.split(";"); Node node = fileNode.addNode(SlcNames.SLC_ @@ -238,7 +238,7 @@ public class JarFileIndexer implements NodeIndexer, SlcNames { if (attrs.containsKey(new Name(Constants.DYNAMICIMPORT_PACKAGE))) { String importPackages = attrs .getValue(Constants.DYNAMICIMPORT_PACKAGE); - List packages = parsePackages(importPackages); + List packages = parseCommaSeparated(importPackages); for (String pkg : packages) { String[] tokens = pkg.split(";"); Node node = fileNode.addNode(SlcNames.SLC_ @@ -258,7 +258,7 @@ public class JarFileIndexer implements NodeIndexer, SlcNames { cleanSubNodes(fileNode, SlcNames.SLC_ + Constants.EXPORT_PACKAGE); if (attrs.containsKey(new Name(Constants.EXPORT_PACKAGE))) { String exportPackages = attrs.getValue(Constants.EXPORT_PACKAGE); - List packages = parsePackages(exportPackages); + List packages = parseCommaSeparated(exportPackages); for (String pkg : packages) { String[] tokens = pkg.split(";"); Node node = fileNode.addNode(SlcNames.SLC_ @@ -294,7 +294,7 @@ public class JarFileIndexer implements NodeIndexer, SlcNames { cleanSubNodes(fileNode, SlcNames.SLC_ + Constants.REQUIRE_BUNDLE); if (attrs.containsKey(new Name(Constants.REQUIRE_BUNDLE))) { String requireBundle = attrs.getValue(Constants.REQUIRE_BUNDLE); - String[] bundles = requireBundle.split(","); + List bundles = parseCommaSeparated(requireBundle); for (String bundle : bundles) { String[] tokens = bundle.split(";"); Node node = fileNode.addNode(SlcNames.SLC_ @@ -362,7 +362,7 @@ public class JarFileIndexer implements NodeIndexer, SlcNames { } /** Parse package list with nested directive with ',' */ - private List parsePackages(String str) { + private List parseCommaSeparated(String str) { List res = new ArrayList(); StringBuffer curr = new StringBuffer(""); boolean in = false; -- 2.39.2