Fix Monitor Start Argument Handling

Author: srgjc

Monitor/trunk/src/org/tzi/use/plugins/monitor/cmd/StartMonitorCmd.java

@@ -4,6 +4,7 @@
 import org.tzi.use.plugins.monitor.MonitorPlugin;
 import org.tzi.use.plugins.monitor.vm.adapter.InvalidAdapterConfiguration;
 import org.tzi.use.plugins.monitor.vm.adapter.VMAdapter;
+import org.tzi.use.plugins.monitor.vm.adapter.jvm.JVMAdapter;
 import org.tzi.use.util.Log;
 import org.tzi.use.util.StringUtil;
 
@@ -12,26 +13,23 @@ public class StartMonitorCmd extends AbstractMonitorCmd {
 	@Override
 	public void doPerformCommand(IPluginShellCmd pluginCommand) {
 		if (MonitorPlugin.getInstance().getMonitor().isRunning()) {
-    		Log.error("Already monitioring an application. Please stop before starting a new monitor.");
+    		Log.error("Already monitoring an application. Please stop before starting a new monitor.");
     		return;
     	}
 
-    	String[] args = pluginCommand.getCmdArguments().split(" ");
-
+    	String[] args = pluginCommand.getCmdArgumentList();
+		String adapterName;
     	if (args.length == 0) {
+			adapterName = JVMAdapter.JVM_ADAPTER_NAME;
     		Log.println("Using default value for JVM remote debugger: localhost:6000");
-    	} 
-    	
-    	String adpaterName = args[0];
-		VMAdapter adapter = MonitorPlugin.getInstance().getAdapterRegistry().getAdapterByName(adpaterName);
+    	} else {
+			adapterName = args[0];
+		}
 
+		VMAdapter adapter = MonitorPlugin.getInstance().getAdapterRegistry().getAdapterByName(adapterName);
     	if (adapter == null) {
-    		Log.print("Invalid adapter name " + StringUtil.inQuotes(adpaterName) + " specified.");
+    		Log.println("Invalid adapter name " + StringUtil.inQuotes(adapterName) + " specified.");
     		return;
-    	}
-    		
-    	for (int i = 1; i < args.length;++i) {
-    		
     	}
 
 		try {
@@ -41,6 +39,4 @@ public void doPerformCommand(IPluginShellCmd pluginCommand) {
 		}
 	}
 
-	
-
 }

Monitor/trunk/src/org/tzi/use/plugins/monitor/vm/adapter/jvm/JVMAdapter.java

@@ -81,6 +81,8 @@
  */
 public class JVMAdapter extends AbstractVMAdapter {
 
+	public static final String JVM_ADAPTER_NAME = "JVMAdapter";
+
 	private static final int SETTING_HOST = 0;
 
 	private static final int SETTING_PORT = 1;