Changeset 8794

Timestamp:

Jul 28, 2011, 10:35:41 PM (13 years ago)

Author:

landauf

Message:

added BaseWriter, a common base class of ConsoleWriter, LogWriter, and also the Shell in future

Location:

code/branches/output/src/libraries/util

Files:

• CMakeLists.txt (modified) (1 diff)
• output/BaseWriter.cc (added)
• output/BaseWriter.h (added)
• output/ConsoleWriter.cc (modified) (1 diff)
• output/ConsoleWriter.h (modified) (2 diffs)
• output/LogWriter.cc (modified) (2 diffs)
• output/LogWriter.h (modified) (2 diffs)
• output/MemoryWriter.h (modified) (1 diff)
• output/OutputListener.h (modified) (1 diff)

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

@@ -42 +42 @@
   output/OutputManager.cc
   output/OutputListener.cc
+  output/BaseWriter.cc
   output/ConsoleWriter.cc
   output/LogWriter.cc

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

@@ -51 +51 @@
     }
 
-    void ConsoleWriter::output(OutputLevel level, OutputContext context, const std::vector<std::string>& lines)
+    void ConsoleWriter::printLine(const std::string& line)
     {
-        const std::string& prefix = OutputManager::getInstance().getDefaultPrefix(level, context);
-        std::string blanks(prefix.length(), ' ');
-
-        for (size_t i = 0; i < lines.size(); ++i)
-            std::cout << (i == 0 ? prefix : blanks) << lines[i] << std::endl;
+        std::cout << line << std::endl;
     }
 

code/branches/output/src/libraries/util/output/ConsoleWriter.h

@@ -31 +31 @@
 
 #include "util/UtilPrereqs.h"
-#include "OutputListener.h"
+#include "BaseWriter.h"
 
 namespace orxonox
 {
-    class _UtilExport ConsoleWriter : public OutputListener
+    class _UtilExport ConsoleWriter : public BaseWriter
     {
         public:
@@ -44 +44 @@
 
         protected:
-            virtual void output(OutputLevel level, OutputContext context, const std::vector<std::string>& lines);
+            virtual void printLine(const std::string& line);
 
         private:
             ConsoleWriter();
             ConsoleWriter(const ConsoleWriter&);
-            ~ConsoleWriter();
+            virtual ~ConsoleWriter();
 
             bool bEnabled_;

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

@@ -64 +64 @@
     }
 
-    void LogWriter::output(OutputLevel level, OutputContext context, const std::vector<std::string>& lines)
-    {
-        if (!this->file_.is_open())
-            return;
-
-        const std::string& prefix = OutputManager::getInstance().getDefaultPrefix(level, context);
-        std::string blanks(prefix.length(), ' ');
-
-        for (size_t i = 0; i < lines.size(); ++i)
-            this->printLine((i == 0 ? prefix : blanks) + lines[i]);
-    }
-
     void LogWriter::openFile()
     {
@@ -114 +102 @@
     void LogWriter::printLine(const std::string& line)
     {
+        if (!this->file_.is_open())
+            return;
+
         // Get current time
         time_t rawtime;

code/branches/output/src/libraries/util/output/LogWriter.h

@@ -34 +34 @@
 #include <fstream>
 
-#include "OutputListener.h"
+#include "BaseWriter.h"
 
 namespace orxonox
 {
-    class _UtilExport LogWriter : public OutputListener
+    class _UtilExport LogWriter : public BaseWriter
     {
         public:
@@ -46 +46 @@
 
         protected:
-            virtual void output(OutputLevel level, OutputContext context, const std::vector<std::string>& lines);
+            virtual void printLine(const std::string& line);
 
         private:
             LogWriter();
             LogWriter(const LogWriter&);
-            ~LogWriter();
+            virtual ~LogWriter();
 
             void openFile();
             void closeFile();
-
-            void printLine(const std::string& line);
 
             std::string filename_;

code/branches/output/src/libraries/util/output/MemoryWriter.h

@@ -59 +59 @@
             MemoryWriter();
             MemoryWriter(const MemoryWriter&);
-            ~MemoryWriter();
+            virtual ~MemoryWriter();
 
             std::vector<Message> messages_;

code/branches/output/src/libraries/util/output/OutputListener.h

@@ -42 +42 @@
         public:
             OutputListener();
-            ~OutputListener();
+            virtual ~OutputListener();
 
             void setLevelMax(OutputLevel max);