Changeset 10310 for trunk/FACT++

Timestamp:

04/07/11 15:49:54 (14 years ago)

Author:

tbretz

Message:

Removed some little code which is in the base classes anyway.

Location:

trunk/FACT++/src

Files:

• LocalControl.h (modified) (2 diffs)
• RemoteControl.h (modified) (5 diffs)

trunk/FACT++/src/LocalControl.h

@@ -58 +58 @@
         lout << endl << kBold << "List of commands:" << endl;
         fStateMachine->PrintListOfEvents(lout);
-        //lout << endl;
+        lout << endl;
 
         return true;
@@ -74 +74 @@
 
     void SetReceiver(StateMachineImp &imp) { fStateMachine = &imp; }
-
-    void Run(const char * = 0)
-    {
-        lout << endl;
-        lout << kBlue << kBold << "You are on the " << fName << " terminal of the MCP -" << endl;
-        lout << kBlue << kBold << "the Master Control Program." << endl;
-        lout << endl;
-        lout << kBlue << kBold << "Hello Flynn..." << endl;
-        lout << endl;
-
-        T::Run();
-    }
 };
 

trunk/FACT++/src/RemoteControl.h

@@ -103 +103 @@
 // **************************************************************************
 #include "WindowLog.h"
+#include "ReadlineColor.h"
 
 template <class T>
@@ -151 +152 @@
         T::PrintGeneralHelp();
         lout << " " << kUnderline << "Specific commands:" << endl;
-        lout << kBold << "  s,servers   " << kReset << "List all servers which are connected." << endl;
-        lout << kBold << "  svc,service " << kReset << "List all services in the network." << endl;
+        lout << kBold << "  s,servers     " << kReset << "List all servers which are connected." << endl;
+        lout << kBold << "  svc,services  " << kReset << "List all services in the network." << endl;
         lout << endl;
         return true;
@@ -167 +168 @@
     bool Process(const std::string &str)
     {
+        if (ReadlineColor::Process(lout, str))
+            return true;
+
         if (T::Process(str))
             return true;
@@ -176 +180 @@
         }
 
-        if (str=="service" || str=="svc")
+        if (str=="services" || str=="svc")
         {
             fServiceList.PrintDescription(lout);
@@ -183 +187 @@
 
         return ProcessCommand(str);
-    }
-    void Run(const char * = 0)
-    {
-        lout << endl;
-        lout << kBlue << kBold << "You are on the terminal of the MCP -" << endl;
-        lout << kBlue << kBold << "the Master Control Program." << endl;
-        lout << endl;
-        lout << kBlue << kBold << "Hello Flynn..." << endl;
-        lout << endl;
-
-        T::Run();
     }
 };