From 9297b3ebb42b59a931214e34e34ad77364edcacc Mon Sep 17 00:00:00 2001 From: Karsten Thoms Date: Thu, 31 Mar 2016 23:21:27 +0200 Subject: [PATCH] [356750] addPath can also take a comma-separated list of paths and splits it. This feature is useful for workflows where the list of paths is passed in as a single argument. Change-Id: I0b933c18c318487544e29ed5b9e36cf8acd30698 Signed-off-by: Karsten Thoms --- .../src/org/eclipse/xtext/mwe/Reader.java | 30 ++++++++++++++----- .../src/org/eclipse/xtext/mwe/ReaderTest.java | 8 +++-- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/mwe/Reader.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/mwe/Reader.java index 0fb5d73a2..a17722c88 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/mwe/Reader.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/mwe/Reader.java @@ -70,16 +70,25 @@ public class Reader extends AbstractReader { /** *

- * A path pointing to a folder, jar or zip which contains EMF resources. - *

- * Example use: + * A comma-separated list of paths pointing to a folder, jar or zip which contains EMF resources. + *

+ *

+ * Example use (MWE2): *

* - * <path value="./foo/bar.jar"/> + * path = "./foo/bar.jar,./src/main/model" + * + *

+ * Example use (MWE1): + *

+ * + * <path value="./foo/bar.jar,./src/main/model"/> * */ public void addPath(String path) { - this.pathes.add(path); + for (String p : path.split(",")) { + this.pathes.add(p.trim()); + } } public List getPathes() { @@ -89,8 +98,15 @@ public class Reader extends AbstractReader { /** *

* Automatically adds all class path entries of the current process (more specifically uses 'java.class.path' system property). - *

- * Example use: + *

+ *

+ * Example use (MWE2): + *

+ * + * useJavaClassPath = true + * + *

+ * Example use (MWE1): *

* * <useJavaClassPath value="true"/> diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/ReaderTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/ReaderTest.java index 2e7434582..3ba4bd251 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/ReaderTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/ReaderTest.java @@ -94,9 +94,11 @@ public class ReaderTest extends AbstractReaderTest { @SuppressWarnings("unchecked") @Test public void testShadowingPathes() throws Exception { Reader reader = getReader(); - reader.addPath(pathTo("shadowingtest/folder 1")); - reader.addPath(pathTo("shadowingtest/folder 2")); - reader.addPath(pathTo("shadowingtest/folder 3")); + // also test adding multiple paths as comma-separated list, see bug#356750 + reader.addPath( + pathTo("shadowingtest/folder 1") + +"," +pathTo("shadowingtest/folder 2") + +" , "+pathTo("shadowingtest/folder 3")); reader.addRegister(new IndexTestLanguageStandaloneSetup()); SlotEntry entry = createSlotEntry(); entry.setType("Entity");