Changeset 8780 for code/branches/output

Timestamp:

Jul 25, 2011, 8:03:05 PM (13 years ago)

Author:

landauf

Message:

added ConsoleWriter

Location:

code/branches/output/src/libraries/util

Files:

• CMakeLists.txt (modified) (1 diff)
• output/ConsoleWriter.cc (added)
• output/ConsoleWriter.h (added)
• output/OutputManager.cc (modified) (4 diffs)

code/branches/output/src/libraries/util/CMakeLists.txt

@@ -43 +43 @@
   output/OutputManager.cc
   output/OutputListener.cc
+  output/ConsoleWriter.cc
   output/LogWriter.cc
   output/MemoryWriter.cc

code/branches/output/src/libraries/util/output/OutputManager.cc

@@ -29 +29 @@
 #include "OutputManager.h"
 
-#include "util/Debug.h"
-#include "OutputListener.h"
 #include "MemoryWriter.h"
+#include "ConsoleWriter.h"
 #include "LogWriter.h"
 
@@ -38 +37 @@
 namespace test
 {
-    class ConsoleOutput : public OutputListener
-    {
-        public:
-            ConsoleOutput()
-            {
-                this->setLevelMax(level::user_info);
-            }
-
-        protected:
-            virtual void output(OutputLevel level, OutputContext context, const std::vector<std::string>& lines)
-            {
-                const std::string& prefix = OutputManager::getInstance().getDefaultPrefix(level, context);
-                std::string blanks(prefix.length(), ' ');
-
-                for (size_t i = 0; i < lines.size(); ++i)
-                    COUT(0) << (i == 0 ? prefix : blanks) << lines[i] << endl;
-            }
-    };
-
     OutputManager::OutputManager()
     {
@@ -77 +57 @@
         static OutputManager& instance = OutputManager::getInstance();
 
-        static ConsoleOutput consoleOutputInstance;
         static MemoryWriter& memoryWriterInstance = MemoryWriter::getInstance(); (void)memoryWriterInstance;
+        static ConsoleWriter& consoleWriterInstance = ConsoleWriter::getInstance(); (void)consoleWriterInstance;
         static LogWriter& logWriterInstance = LogWriter::getInstance(); (void)logWriterInstance;
 
@@ -153 +133 @@
     OutputContext registerContext(const std::string& name)
     {
-        COUT(0) << "### register context " << name << std::endl;
         return OutputManager::getInstance().registerContext(name);
     }