commit dbf306ceecac8c5eb093810dd9153e183e130798
author Till Brychcy <register.eclipse@brychcy.de> Fri Oct 19 21:48:40 2018 +0200
committer Till Brychcy <register.eclipse@brychcy.de> Fri Oct 19 21:48:40 2018 +0200
tree e0aec9f92ccfd4f0742bed76f7abd5e0b1397efa
parent ff281a98f547a2663507b989fd9c360c13708e76

Bug 540305 - Contents of user libraries are put on the run configuration
classpath instead of the module path

Change-Id: Icd1a08fd002508634d74742ac4d015f454239d4e

org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java

diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java
index 351e1ef..094e73b 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java
@@ -1561,7 +1561,13 @@
 		int property = -1;
 		switch (container.getKind()) {
 			case IClasspathContainer.K_APPLICATION:
-				property = IRuntimeClasspathEntry.USER_CLASSES;
+				if (entry.getClasspathProperty() == IRuntimeClasspathEntry.MODULE_PATH) {
+					property = IRuntimeClasspathEntry.MODULE_PATH;
+				} else if (entry.getClasspathProperty() == IRuntimeClasspathEntry.CLASS_PATH) {
+					property = IRuntimeClasspathEntry.CLASS_PATH;
+				} else {
+					property = IRuntimeClasspathEntry.USER_CLASSES;
+				}
 				break;
 			case IClasspathContainer.K_DEFAULT_SYSTEM:
 				property = IRuntimeClasspathEntry.STANDARD_CLASSES;