Restore the old eval(String command) method

bioclipse · Apr 10, 2013 · f0514e4 · f0514e4
1 parent 1dc572f
commit f0514e4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/plugins/net.bioclipse.r.business/src/net/bioclipse/r/business/IRBusinessManager.java b/plugins/net.bioclipse.r.business/src/net/bioclipse/r/business/IRBusinessManager.java
@@ -31,7 +31,7 @@ public interface IRBusinessManager extends IBioclipseManager {
     public String  eval(String command, RServi myRServi);
 
 	@Recorded
-	public String  evalS(String command, RServi servi);
+	public String  eval(String command);
 
 	public String  getStatus();
 

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
@@ -109,7 +109,7 @@ public RBusinessManager() throws LoginException, NoSuchElementException {
 			working = false;
 			status = e.getMessage();
 		}
-//		rservi = getInitR("Rconsole");
+		rservi = getInitR("Rconsole");
 	}
 
 	public RServi getInitR(String task) {
@@ -143,14 +143,15 @@ public RServi getInitR(String task) {
 		}
 		return rservi;
 	}
-
-	public String evalS(String command, RServi servi) {
+
+	/**
+	 * The old eval method that can be called without RServi
+	 * @param command
+	 * @return result
+	 */
+	public String eval(String command) {
 		String result;
-		if (servi == null) {
 			result = eval(command, rservi);
-		} else {
-			result = eval(command, servi);
-		}
 		return result;
 	}
     /**

diff --git a/plugins/net.bioclipse.r.business/src/net/bioclipse/r/business/RThread.java b/plugins/net.bioclipse.r.business/src/net/bioclipse/r/business/RThread.java
@@ -115,7 +115,7 @@ protected IStatus run( IProgressMonitor pm ) {
                 }
             }
             try {
-                result[0] = r.evalS( nextAction[0].getCommand(), servi );
+                result[0] = r.eval( nextAction[0].getCommand(), servi );
             }
             catch (Throwable t) {
                 LogUtils.debugTrace( logger, t );