removed no command because it is never called now that we error check for the command...

diff --git a/Mothur.xcodeproj/project.pbxproj b/Mothur.xcodeproj/project.pbxproj
index d72922c68689a444662447f4964f9abcec521993..b9278ad0feee18aa9fe4ee14cda0d093d7e8a9c9 100644 (file)
--- a/Mothur.xcodeproj/project.pbxproj
+++ b/Mothur.xcodeproj/project.pbxproj
@@ -52,7 +52,6 @@
                37D9286E0F21331F001D4494 /* listvector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 37D927ED0F21331F001D4494 /* listvector.cpp */; };
                37D9286F0F21331F001D4494 /* mothur.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 37D927EF0F21331F001D4494 /* mothur.cpp */; };
                37D928700F21331F001D4494 /* nameassignment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 37D927F00F21331F001D4494 /* nameassignment.cpp */; };
-               37D928710F21331F001D4494 /* nocommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 37D927F20F21331F001D4494 /* nocommand.cpp */; };
                37D928720F21331F001D4494 /* npshannon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 37D927F40F21331F001D4494 /* npshannon.cpp */; };
                37D928730F21331F001D4494 /* ordervector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 37D927F70F21331F001D4494 /* ordervector.cpp */; };
                37D928740F21331F001D4494 /* parselistcommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 37D927F90F21331F001D4494 /* parselistcommand.cpp */; };
@@ -210,8 +209,6 @@
                37D927EF0F21331F001D4494 /* mothur.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mothur.cpp; sourceTree = "<group>"; };
                37D927F00F21331F001D4494 /* nameassignment.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = nameassignment.cpp; sourceTree = "<group>"; };
                37D927F10F21331F001D4494 /* nameassignment.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = nameassignment.hpp; sourceTree = "<group>"; };
-               37D927F20F21331F001D4494 /* nocommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = nocommand.cpp; sourceTree = "<group>"; };
-               37D927F30F21331F001D4494 /* nocommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nocommand.h; sourceTree = "<group>"; };
                37D927F40F21331F001D4494 /* npshannon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = npshannon.cpp; sourceTree = "<group>"; };
                37D927F50F21331F001D4494 /* npshannon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = npshannon.h; sourceTree = "<group>"; };
                37D927F60F21331F001D4494 /* observable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = observable.h; sourceTree = "<group>"; };
@@ -488,8 +485,6 @@
                                37D927E30F21331F001D4494 /* helpcommand.cpp */,
                                374CD63D0F65832000D90B4A /* libshuffcommand.h */,
                                374CD63E0F65832000D90B4A /* libshuffcommand.cpp */,
-                               37D927F30F21331F001D4494 /* nocommand.h */,
-                               37D927F20F21331F001D4494 /* nocommand.cpp */,
                                37D927FA0F21331F001D4494 /* parselistcommand.h */,
                                37D927F90F21331F001D4494 /* parselistcommand.cpp */,
                                3792946E0F2E191800B9034A /* parsimonycommand.h */,
@@ -651,7 +646,6 @@
                                37D9286E0F21331F001D4494 /* listvector.cpp in Sources */,
                                37D9286F0F21331F001D4494 /* mothur.cpp in Sources */,
                                37D928700F21331F001D4494 /* nameassignment.cpp in Sources */,
-                               37D928710F21331F001D4494 /* nocommand.cpp in Sources */,
                                37D928720F21331F001D4494 /* npshannon.cpp in Sources */,
                                37D928730F21331F001D4494 /* ordervector.cpp in Sources */,
                                37D928740F21331F001D4494 /* parselistcommand.cpp in Sources */,

diff --git a/commandfactory.cpp b/commandfactory.cpp
index 19022040cc507e29ec6019442638564ad0ce6048..b6f63aa8f873296ef0bc146e2bb0cdcf9edb835c 100644 (file)
--- a/commandfactory.cpp
+++ b/commandfactory.cpp
@@ -22,7 +22,6 @@
 #include "summarycommand.h"
 #include "summarysharedcommand.h"
 #include "rarefactsharedcommand.h"
-#include "nocommand.h"
 #include "quitcommand.h"
 #include "helpcommand.h"
 #include "commandfactory.hpp"
@@ -37,9 +36,7 @@
 /***********************************************************/
 
 /***********************************************************/
-CommandFactory::CommandFactory(){
-       command = new NoCommand();
-}
+CommandFactory::CommandFactory(){}
 
 /***********************************************************/
 
@@ -76,7 +73,6 @@ Command* CommandFactory::getCommand(string commandName){
                else if(commandName == "get.label")             {   command = new GetlabelCommand();                    }
                else if(commandName == "get.line")              {   command = new GetlineCommand();                             }
                else if(commandName == "libshuff")              {   command = new LibShuffCommand();                    }
-               else                                                                                    {       command = new NoCommand();                                      }
 
                return command;
        }

diff --git a/nocommand.cpp b/nocommand.cpp
deleted file mode 100644 (file)
index 9cbf3d3..0000000
--- a/nocommand.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  nocommand.cpp
- *  Dotur
- *
- *  Created by Sarah Westcott on 1/2/09.
- *  Copyright 2009 Schloss Lab UMASS Amherst. All rights reserved.
- *
- */
-
-#include "nocommand.h"
-
-//**********************************************************************************************************************
-
-NoCommand::NoCommand(){}
-
-//**********************************************************************************************************************
-
-NoCommand::~NoCommand(){}
-
-//**********************************************************************************************************************
-
-int NoCommand::execute(){
-       //Could choose to give more help here?fdsah
-       cout << "Invalid command." << "\n";
-       cout << "For more information on command parameters use the help() command." << "\n";
-       return 0;
-}
-
-//**********************************************************************************************************************

diff --git a/nocommand.h b/nocommand.h
deleted file mode 100644 (file)
index b529392..0000000
--- a/nocommand.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef NOCOMMAND_H
-#define NOCOMMAND_H
-/*
- *  nocommand.h
- *  Dotur
- *
- *  Created by Sarah Westcott on 1/2/09.
- *  Copyright 2009 Schloss Lab UMASS Amherst. All rights reserved.
- *
- */
-
-/* This command is run if the user enters an invalid command. */
-
-#include "command.hpp"
-
-class NoCommand : public Command {
-
-public:
-       NoCommand();
-       ~NoCommand();
-       int execute();
-       
-private:
-               
-};
-
-#endif