X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mergefilecommand.h;fp=mergefilecommand.h;h=1ecc3cb6e24f72b99c5e4d9ddb0850e1cc16e082;hb=ca9ac1d80c62f57270b0dcd49410ebe08a8aecd6;hp=56da3152309ec3c422cccb3aa0c6abce9f92be46;hpb=36a867cbd85d9c276d3c8d13f25a150bbbe2466b;p=mothur.git

diff --git a/mergefilecommand.h b/mergefilecommand.h
index 56da315..1ecc3cb 100644
--- a/mergefilecommand.h
+++ b/mergefilecommand.h
@@ -17,17 +17,18 @@ class MergeFileCommand : public Command {
 public:
 	MergeFileCommand(string);
 	MergeFileCommand();
-	~MergeFileCommand();
-	vector<string> getRequiredParameters();
-	vector<string> getValidParameters();
-	vector<string> getRequiredFiles();
-	map<string, vector<string> > getOutputFiles() { return outputTypes; }
-	int execute();
-	void help();	
-
+	~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, outputNames;
-	map<string, vector<string> > outputTypes;
 	string outputFileName;
 	int numInputFiles;
 	bool abort;