Fix JAR indexer for Require-Bundle

git-svn-id: https://svn.argeo.org/slc/trunk@5424 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

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 80c750407a70c23343390db139aad1066fcc4941..d6cee9bf956052744a475fdf8da817345d41c858 100644 (file)
--- 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<String> packages = parsePackages(importPackages);
+                       List<String> 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<String> packages = parsePackages(importPackages);
+                       List<String> 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<String> packages = parsePackages(exportPackages);
+                       List<String> 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<String> 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<String> parsePackages(String str) {
+       private List<String> parseCommaSeparated(String str) {
                List<String> res = new ArrayList<String>();
                StringBuffer curr = new StringBuffer("");
                boolean in = false;