Move another method to net.bioclipse.r.ui.util package

parseCommand from RBusinessManager
bioclipse · Mar 1, 2012 · 18c2a84 · 18c2a84
1 parent 8eb1bf4
commit 18c2a84
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 26 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
@@ -447,26 +447,6 @@ else if (command.contains("quartz"))
         return returnVal;
     }
 
-    public String evalSnippet(String seltext) {
-		String retVal = null;
-    	String[] commands = parseCommand(seltext);
-    	for (String cmd : commands) {
-    		retVal = eval(cmd);
-    	}
-		return retVal;
-
-	}
-
-    public String[] parseCommand(String command) {
-    	String[] cmd = command.split(cmdparser);
-    	ArrayList<String> list = new ArrayList<String>();
-    	for (String s : cmd)
-    		if (!s.startsWith("#") && s.length() != 0)
-    			list.add(s);
-    	cmd = list.toArray(new String[list.size()]);
-		return cmd;
-    }
-
     public String ls() {
     	return eval("ls()");
     }

diff --git a/plugins/net.bioclipse.r.ui/src/net/bioclipse/r/ui/util/RunUtil.java b/plugins/net.bioclipse.r.ui/src/net/bioclipse/r/ui/util/RunUtil.java
@@ -7,6 +7,8 @@
 
 package net.bioclipse.r.ui.util;
 
+import java.util.ArrayList;
+
 import net.bioclipse.r.ui.editors.REditor;
 
 import org.eclipse.core.commands.ExecutionEvent;
@@ -27,6 +29,7 @@
 public class RunUtil {
 
     public static final String fileseparator = java.io.File.separator;
+    public static String cmdparser    = "(;?\r?\n|;)";
 
 	public static String getSelectedCode(final ExecutionEvent event) throws CoreException {
 		try {
@@ -94,4 +97,13 @@ public static String fixFilepath(String filepath) {
 		return filepath;
 	}
 
+    public static String[] parseCommand(String command) {
+    	String[] cmd = command.split(cmdparser);
+    	ArrayList<String> list = new ArrayList<String>();
+    	for (String s : cmd)
+    		if (!s.startsWith("#") && s.length() != 0)
+    			list.add(s);
+    	cmd = list.toArray(new String[list.size()]);
+		return cmd;
+    }
 }
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
@@ -10,6 +10,7 @@
 package net.bioclipse.r.ui.views;
 import net.bioclipse.r.business.Activator;
 import net.bioclipse.r.business.IRBusinessManager;
+import net.bioclipse.r.ui.util.RunUtil;
 import net.bioclipse.scripting.ui.views.ScriptingConsoleView;
 
 import org.eclipse.jface.dialogs.MessageDialog;
@@ -57,12 +58,7 @@ protected String executeCommand( String command ) {
  */
     	String returnVal = null;
     	String[] commands = null;
-    	if (r == null) {
-    		getRBusinessManager();
-    		if (r == null)
-    			returnVal = "Waiting for R Manager, please try again.";
-    	}
-    	commands = r.parseCommand(command);
+    	commands = RunUtil.parseCommand(command);
 		for (String cmd : commands){
 			returnVal = r.eval(cmd);
 			echoCommand(cmd);