X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=helpcommand.cpp;h=ef54dae941edcf3d8f2720e931d8a9a293574ee3;hp=ba4f53d942b899d4dc02d65c8acc68a63fdd45f7;hb=b206f634aae1b4ce13978d203247fb64757d5482;hpb=952a85d59a12e664f5efa6d01681be189e4fff9c

diff --git a/helpcommand.cpp b/helpcommand.cpp
index ba4f53d..ef54dae 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://www.mothur.org/wiki, or contact Pat Schloss at pschloss@umich.edu.\n");
-	return 0;
+		return 0;
+	}
+	catch(exception& e) {
+		m->errorOut(e, "HelpCommand", "execute");
+		exit(1);
+	}
 }
-
 //**********************************************************************************************************************/