X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mergefilecommand.h;h=1ecc3cb6e24f72b99c5e4d9ddb0850e1cc16e082;hb=f0a594f6676ef5a52d1f122b6de70de2fda08c81;hp=bd94d77aa6cd8990545953b718c9f6254f44231c;hpb=cd37904452dc95b183ff313ff05720c562902487;p=mothur.git

diff --git a/mergefilecommand.h b/mergefilecommand.h
index bd94d77..1ecc3cb 100644
--- a/mergefilecommand.h
+++ b/mergefilecommand.h
@@ -16,12 +16,19 @@
 class MergeFileCommand : public Command {
 public:
 	MergeFileCommand(string);
-	~MergeFileCommand();
-	int execute();
-	void help();	
-
+	MergeFileCommand();
+	~MergeFileCommand(){}
+	
+	vector<string> setParameters();
+	string getCommandName()			{ return "merge.files";	}
+	string getCommandCategory()		{ return "General";		}
+	string getHelpString();	
+	
+	int execute(); 
+	void help() { m->mothurOut(getHelpString()); }	
+	
 private:
-	vector<string> fileNames;
+	vector<string> fileNames, outputNames;
 	string outputFileName;
 	int numInputFiles;
 	bool abort;