"Save R Session" button runs through RThread now

changed label from "Running R script" to "Running R"
bioclipse · Sep 6, 2012 · 8efb63d · 8efb63d
1 parent ac90324
commit 8efb63d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
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
@@ -62,7 +62,7 @@ public void run() {
             Job job = new Job("R-script") {
                 @Override
                 protected IStatus run( IProgressMonitor pm ) {
-                    pm.beginTask( "Running R script", 
+                    pm.beginTask( "Running R",
                                   IProgressMonitor.UNKNOWN );
                     monitor[0] = pm;
                     nextAction[0].runPreCommandHook();

diff --git a/plugins/net.bioclipse.r.ui/src/net/bioclipse/r/ui/views/RConsoleView.java b/plugins/net.bioclipse.r.ui/src/net/bioclipse/r/ui/views/RConsoleView.java
@@ -89,23 +89,24 @@ protected void evalCommand(final String command, boolean quotes) {
         rThread.enqueue( new ScriptAction(input, 
                              new Hook() {
                                 public void run( final Object result ) {
-                                    echoCommand( command );
+                                	if (!command.contentEquals("save.image(\".RData\")")) {
+                                		echoCommand( command );
+                                	}
                                 }
                              },
                              new Hook() {
                                 public void run( final Object result ) {
-                                    printMessage(NEWLINE + result);
+                                	if (command.contentEquals("save.image(\".RData\")")) {
+                                		printMessage(NEWLINE + "R Session saved");
+                                	} else {
+                                		printMessage(NEWLINE + result);
+                                	}
                                 }
                              }) );
     }
 
     public void saveSession() {
-    	String saveRes = r.eval("save.image(\".RData\")");
-    	if (saveRes.isEmpty()) {
-    		printMessage(NEWLINE + "R Session saved");
-    	} else {
-    		printMessage(NEWLINE + saveRes);
-    	}
+    	evalCommand("save.image(\".RData\")", false);
     }
 
     private void getRBusinessManager() {