More generic fix for Bug 3103

used method provided by Stephan Wahlbrink <stephan.wahlbrink@walware.de>, instead of modifying the walware code
bioclipse · Sep 3, 2012 · 5da1c05 · 5da1c05
1 parent e843539
commit 5da1c05
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/plugins/net.bioclipse.r/src/net/bioclipse/r/RServiManager.java b/plugins/net.bioclipse.r/src/net/bioclipse/r/RServiManager.java
@@ -26,6 +26,7 @@
 import de.walware.rj.RjException;
 import de.walware.rj.rsetups.RSetup;
 import de.walware.rj.rsetups.RSetupUtil;
+import de.walware.rj.server.srvext.EServerUtil;
 import de.walware.rj.servi.RServi;
 import de.walware.rj.servi.RServiUtil;
 import de.walware.rj.servi.pool.EmbeddedRServiManager;
@@ -112,6 +113,12 @@ public void setEmbedded(final String rHome, final String userLibPath) throws Cor
 		rConfig.setRHome(rHome);
 		rConfig.setEnableVerbose(true);
 		rConfig.setJavaArgs(""); // remove "-server" flag from the java command
+		String[] swtLibs = new String[] {
+				"org.eclipse.swt"};
+		String[] swtFilePaths = EServerUtil.searchRJLibsInPlatform(swtLibs);
+		for (String swtfp : swtFilePaths) {
+			rConfig.addToClasspath(swtfp);
+		}
 		rConfig.setNodeArgs("-plugins=swt"); // solves the plotting issue on Windows
 		// if a user lib path was defined, set that as environment variable
 		// in the embedded