merged pat's trim seqs edits with sarah's major overhaul of global data; also added...

[mothur.git] / commandfactory.cpp

diff --git a/commandfactory.cpp b/commandfactory.cpp
index 48a363336be3bea3a482471608cf7e0ce2300b3e..eeaf8ee38ee287691dc8023307f95e098026c9ac 100644 (file)
--- a/commandfactory.cpp
+++ b/commandfactory.cpp
@@ -33,7 +33,6 @@
 #include "heatmapcommand.h"
 #include "heatmapsimcommand.h"
 #include "filterseqscommand.h"
-#include "mothur.h"
 #include "venncommand.h"
 #include "nocommands.h"
 #include "binsequencecommand.h"
@@ -50,6 +49,7 @@
 #include "screenseqscommand.h"
 #include "reversecommand.h"
 #include "trimseqscommand.h"
+#include "mergefilecommand.h"
 
 /***********************************************************/
 
@@ -111,6 +111,7 @@ Command* CommandFactory::getCommand(string commandName, string optionString){
                else if(commandName == "screen.seqs")                   {       command = new ScreenSeqsCommand(optionString);                  }
                else if(commandName == "reverse.seqs")                  {       command = new ReverseSeqsCommand(optionString);                 }
                else if(commandName == "trim.seqs")                             {       command = new TrimSeqsCommand(optionString);                    }
+               else if(commandName == "merge.files")                   {       command = new MergeFileCommand(optionString);                   }
                else                                                                                    {       command = new NoCommand(optionString);                                  }
 
                return command;