Adapt for R package rj version 1.1; Bug 3298

rj version 1.1 works with R 2.13 - 2.15
bioclipse · Sep 3, 2012 · e843539 · e843539
1 parent 12e53f5
commit e843539
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/plugins/net.bioclipse.r.business/src/net/bioclipse/r/business/RBusinessManager.java b/plugins/net.bioclipse.r.business/src/net/bioclipse/r/business/RBusinessManager.java
@@ -227,8 +227,8 @@ private void checkRdependencies() throws FileNotFoundException, BioclipseExcepti
     		installRj();
     	} else {
     		runRCmd("R -e \"installed.packages()['rj','Version']\" -s");
-    		if (!status.contains("1.0")) {
-    			status += "Wrong 'rj' package installed, please install version 1.0";
+    		if (!status.contains("1.1")) {
+    			status += "Wrong 'rj' package installed, please install version 1.1";
     			logger.error(status);
     			if (runRCmd("R -e \"remove.packages('rj')\" -s"))
     				installRj();
@@ -266,7 +266,7 @@ public boolean getRightRVersion(){
 	}
 
 	private boolean installRj() throws FileNotFoundException {
-		if (!runRCmd("R -e \"install.packages('rj', repos='http://download.walware.de/rj-1.0')\" -s")) {
+		if (!runRCmd("R -e \"install.packages('rj', repos='http://download.walware.de/rj-1.1')\" -s")) {
 			status += "Error installing rj-package, try manually from: http://www.walware.de/it/downloads/rj.mframe";
 			logger.error("Error: Installation of rj failed.");
 			throw new FileNotFoundException(status);