X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=helpcommand.cpp;h=47d04f9d528ab14053f468f2eacc7e150db736c0;hb=541bab1dac00688b4c3a8c4a95ab464412663c50;hp=47fb72ad6e561f35b74e210c3a715561dc78a398;hpb=510b1cfc25cd79391d6973ca20c5ec25fb1bb3b2;p=mothur.git

diff --git a/helpcommand.cpp b/helpcommand.cpp
index 47fb72a..47d04f9 100644
--- a/helpcommand.cpp
+++ b/helpcommand.cpp
@@ -11,29 +11,22 @@
 
 //**********************************************************************************************************************
 
-HelpCommand::HelpCommand(string option){
-
-	
-	if (option != "") { mothurOut("There are no valid parameters for the help() command."); mothurOutEndLine();  }
-	
-	validCommands = new CommandFactory();
+HelpCommand::HelpCommand(string option)  {	
+	validCommands = CommandFactory::getInstance();	
 }
-
-//**********************************************************************************************************************
-
-HelpCommand::~HelpCommand(){}
-
 //**********************************************************************************************************************
-
 int HelpCommand::execute(){
-
-	validCommands->printCommands(cout);
-	mothurOut("For more information about a specific command type 'commandName(help)' i.e. 'read.dist(help)'"); mothurOutEndLine();
+	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");
 	
-	mothurOutEndLine(); mothurOut("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);
+	}
 }
-
 //**********************************************************************************************************************/