X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=helpcommand.cpp;h=ef54dae941edcf3d8f2720e931d8a9a293574ee3;hp=0acce707e01e6567f9111bd58f83910aa90eba92;hb=b206f634aae1b4ce13978d203247fb64757d5482;hpb=0470f6d037aacb3563c3f7010708120a4a67d4e6

diff --git a/helpcommand.cpp b/helpcommand.cpp
index 0acce70..ef54dae 100644
--- a/helpcommand.cpp
+++ b/helpcommand.cpp
@@ -11,29 +11,22 @@
 
 //**********************************************************************************************************************
 
-HelpCommand::HelpCommand(string option){
-	globaldata = GlobalData::getInstance();
-	
-	if (option != "") { cout << "There are no valid parameters for the help() command." << endl;  }
-	
-	validCommands = new ValidCommands();
-	}
-
-//**********************************************************************************************************************
-
-HelpCommand::~HelpCommand(){}
-
+HelpCommand::HelpCommand(string option)  {	
+	validCommands = CommandFactory::getInstance();	
+}
 //**********************************************************************************************************************
-
 int HelpCommand::execute(){
-
-	validCommands->printCommands(cout);
-	cout << "For more information about a specific command type 'commandName(help)' i.e. 'read.dist(help)'" << endl;
+	try {
+        validCommands->printCommands(cout);
+		m->mothurOut("For more information about a specific command type 'commandName(help)' i.e. 'read.dist(help)'"); m->mothurOutEndLine();
 	
-	delete validCommands;
+		m->mothurOutEndLine(); m->mothurOut("For further assistance please refer to the Mothur manual on our wiki at http://www.mothur.org/wiki, or contact Pat Schloss at mothur.bugs@gmail.com.\n");
 	
-	cout << endl << "For further assistance please refer to the Mothur manual on our wiki at http://schloss.micro.umass.edu/mothur/, or contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-	return 0;
+		return 0;
+	}
+	catch(exception& e) {
+		m->errorOut(e, "HelpCommand", "execute");
+		exit(1);
+	}
 }
-
 //**********************************************************************************************************************/