[Orxonox-commit 4878] r9547 - in code/branches/testing: src/libraries/core src/libraries/core/command src/libraries/util/output src/orxonox/overlays test/util/output
landauf at orxonox.net
landauf at orxonox.net
Tue Mar 12 22:05:25 CET 2013
Author: landauf
Date: 2013-03-12 22:05:25 +0100 (Tue, 12 Mar 2013)
New Revision: 9547
Modified:
code/branches/testing/src/libraries/core/Core.cc
code/branches/testing/src/libraries/core/command/Shell.cc
code/branches/testing/src/libraries/util/output/LogWriter.cc
code/branches/testing/src/libraries/util/output/OutputManager.h
code/branches/testing/src/orxonox/overlays/InGameConsole.cc
code/branches/testing/test/util/output/ConsoleWriterTest.cc
code/branches/testing/test/util/output/OutputManagerTest.cc
code/branches/testing/test/util/output/OutputStreamTest.cc
Log:
return pointers instead of references because they could be null
Modified: code/branches/testing/src/libraries/core/Core.cc
===================================================================
--- code/branches/testing/src/libraries/core/Core.cc 2013-03-12 14:41:50 UTC (rev 9546)
+++ code/branches/testing/src/libraries/core/Core.cc 2013-03-12 21:05:25 UTC (rev 9547)
@@ -180,7 +180,7 @@
this->setConfigValues();
// Set the correct log path and rewrite the log file with the correct log levels
- OutputManager::getInstance().getLogWriter().setLogDirectory(PathConfig::getLogPathString());
+ OutputManager::getInstance().getLogWriter()->setLogDirectory(PathConfig::getLogPathString());
#if !defined(ORXONOX_PLATFORM_APPLE) && !defined(ORXONOX_USE_WINMAIN)
// Create persistent IO console
@@ -258,24 +258,24 @@
//! Function to collect the SetConfigValue-macro calls.
void Core::setConfigValues()
{
- SetConfigValueExternal(OutputManager::getInstance().getLogWriter().configurableMaxLevel_,
- OutputManager::getInstance().getLogWriter().getConfigurableSectionName(),
- OutputManager::getInstance().getLogWriter().getConfigurableMaxLevelName(),
- OutputManager::getInstance().getLogWriter().configurableMaxLevel_)
+ SetConfigValueExternal(OutputManager::getInstance().getLogWriter()->configurableMaxLevel_,
+ OutputManager::getInstance().getLogWriter()->getConfigurableSectionName(),
+ OutputManager::getInstance().getLogWriter()->getConfigurableMaxLevelName(),
+ OutputManager::getInstance().getLogWriter()->configurableMaxLevel_)
.description("The maximum level of output shown in the log file")
- .callback(static_cast<BaseWriter*>(&OutputManager::getInstance().getLogWriter()), &BaseWriter::changedConfigurableLevel);
- SetConfigValueExternal(OutputManager::getInstance().getLogWriter().configurableAdditionalContextsMaxLevel_,
- OutputManager::getInstance().getLogWriter().getConfigurableSectionName(),
- OutputManager::getInstance().getLogWriter().getConfigurableAdditionalContextsMaxLevelName(),
- OutputManager::getInstance().getLogWriter().configurableAdditionalContextsMaxLevel_)
+ .callback(static_cast<BaseWriter*>(OutputManager::getInstance().getLogWriter()), &BaseWriter::changedConfigurableLevel);
+ SetConfigValueExternal(OutputManager::getInstance().getLogWriter()->configurableAdditionalContextsMaxLevel_,
+ OutputManager::getInstance().getLogWriter()->getConfigurableSectionName(),
+ OutputManager::getInstance().getLogWriter()->getConfigurableAdditionalContextsMaxLevelName(),
+ OutputManager::getInstance().getLogWriter()->configurableAdditionalContextsMaxLevel_)
.description("The maximum level of output shown in the log file for additional contexts")
- .callback(static_cast<BaseWriter*>(&OutputManager::getInstance().getLogWriter()), &BaseWriter::changedConfigurableAdditionalContextsLevel);
- SetConfigValueExternal(OutputManager::getInstance().getLogWriter().configurableAdditionalContexts_,
- OutputManager::getInstance().getLogWriter().getConfigurableSectionName(),
- OutputManager::getInstance().getLogWriter().getConfigurableAdditionalContextsName(),
- OutputManager::getInstance().getLogWriter().configurableAdditionalContexts_)
+ .callback(static_cast<BaseWriter*>(OutputManager::getInstance().getLogWriter()), &BaseWriter::changedConfigurableAdditionalContextsLevel);
+ SetConfigValueExternal(OutputManager::getInstance().getLogWriter()->configurableAdditionalContexts_,
+ OutputManager::getInstance().getLogWriter()->getConfigurableSectionName(),
+ OutputManager::getInstance().getLogWriter()->getConfigurableAdditionalContextsName(),
+ OutputManager::getInstance().getLogWriter()->configurableAdditionalContexts_)
.description("Additional output contexts shown in the log file")
- .callback(static_cast<BaseWriter*>(&OutputManager::getInstance().getLogWriter()), &BaseWriter::changedConfigurableAdditionalContexts);
+ .callback(static_cast<BaseWriter*>(OutputManager::getInstance().getLogWriter()), &BaseWriter::changedConfigurableAdditionalContexts);
SetConfigValue(bDevMode_, PathConfig::buildDirectoryRun())
.description("Developer mode. If not set, hides some things from the user to not confuse him.")
Modified: code/branches/testing/src/libraries/core/command/Shell.cc
===================================================================
--- code/branches/testing/src/libraries/core/command/Shell.cc 2013-03-12 14:41:50 UTC (rev 9546)
+++ code/branches/testing/src/libraries/core/command/Shell.cc 2013-03-12 21:05:25 UTC (rev 9547)
@@ -87,7 +87,7 @@
this->setConfigValues();
// Get the previous output and add it to the Shell
- OutputManager::getInstance().getMemoryWriter().resendOutput(this);
+ OutputManager::getInstance().getMemoryWriter()->resendOutput(this);
}
/**
Modified: code/branches/testing/src/libraries/util/output/LogWriter.cc
===================================================================
--- code/branches/testing/src/libraries/util/output/LogWriter.cc 2013-03-12 14:41:50 UTC (rev 9546)
+++ code/branches/testing/src/libraries/util/output/LogWriter.cc 2013-03-12 21:05:25 UTC (rev 9547)
@@ -167,8 +167,8 @@
this->openFile();
// request old output from MemoryWriter
- if (&OutputManager::getInstance().getMemoryWriter())
- OutputManager::getInstance().getMemoryWriter().resendOutput(this);
+ if (OutputManager::getInstance().getMemoryWriter())
+ OutputManager::getInstance().getMemoryWriter()->resendOutput(this);
}
/**
Modified: code/branches/testing/src/libraries/util/output/OutputManager.h
===================================================================
--- code/branches/testing/src/libraries/util/output/OutputManager.h 2013-03-12 14:41:50 UTC (rev 9546)
+++ code/branches/testing/src/libraries/util/output/OutputManager.h 2013-03-12 21:05:25 UTC (rev 9547)
@@ -71,9 +71,9 @@
static OutputManager& getInstance();
static OutputManager& getInstanceAndCreateListeners();
- inline MemoryWriter& getMemoryWriter() { return *this->memoryWriterInstance_; }
- inline ConsoleWriter& getConsoleWriter() { return *this->consoleWriterInstance_; }
- inline LogWriter& getLogWriter() { return *this->logWriterInstance_; }
+ inline MemoryWriter* getMemoryWriter() { return this->memoryWriterInstance_; }
+ inline ConsoleWriter* getConsoleWriter() { return this->consoleWriterInstance_; }
+ inline LogWriter* getLogWriter() { return this->logWriterInstance_; }
virtual void pushMessage(OutputLevel level, const OutputContextContainer& context, const std::string& message);
Modified: code/branches/testing/src/orxonox/overlays/InGameConsole.cc
===================================================================
--- code/branches/testing/src/orxonox/overlays/InGameConsole.cc 2013-03-12 14:41:50 UTC (rev 9546)
+++ code/branches/testing/src/orxonox/overlays/InGameConsole.cc 2013-03-12 21:05:25 UTC (rev 9547)
@@ -95,7 +95,7 @@
// Output buffering is not anymore needed. Not the best solution to do
// this here, but there isn't much of another way.
- OutputManager::getInstance().getMemoryWriter().disable();
+ OutputManager::getInstance().getMemoryWriter()->disable();
}
/**
Modified: code/branches/testing/test/util/output/ConsoleWriterTest.cc
===================================================================
--- code/branches/testing/test/util/output/ConsoleWriterTest.cc 2013-03-12 14:41:50 UTC (rev 9546)
+++ code/branches/testing/test/util/output/ConsoleWriterTest.cc 2013-03-12 21:05:25 UTC (rev 9547)
@@ -65,6 +65,6 @@
TEST(ConsoleWriterTest, DefaultConsoleWriterUsesCout)
{
OutputManager::getInstanceAndCreateListeners();
- EXPECT_EQ(std::cout, OutputManager::getInstance().getConsoleWriter().getOutputStream());
+ EXPECT_EQ(std::cout, OutputManager::getInstance().getConsoleWriter()->getOutputStream());
}
}
Modified: code/branches/testing/test/util/output/OutputManagerTest.cc
===================================================================
--- code/branches/testing/test/util/output/OutputManagerTest.cc 2013-03-12 14:41:50 UTC (rev 9546)
+++ code/branches/testing/test/util/output/OutputManagerTest.cc 2013-03-12 21:05:25 UTC (rev 9547)
@@ -53,29 +53,29 @@
// test getInstance does not create listeners
TEST(OutputManagerTest, GetInstanceDoesNotCreateDefaultListeners)
{
- EXPECT_TRUE(NULL == &OutputManager::getInstance().getMemoryWriter());
- EXPECT_TRUE(NULL == &OutputManager::getInstance().getConsoleWriter());
- EXPECT_TRUE(NULL == &OutputManager::getInstance().getLogWriter());
+ EXPECT_TRUE(NULL == OutputManager::getInstance().getMemoryWriter());
+ EXPECT_TRUE(NULL == OutputManager::getInstance().getConsoleWriter());
+ EXPECT_TRUE(NULL == OutputManager::getInstance().getLogWriter());
}
// test getInstanceAndCreateListeners creates listeners
TEST(OutputManagerTest, GetInstanceAndCreateListenersCreatesDefaultListeners)
{
- EXPECT_TRUE(NULL != &OutputManager::getInstanceAndCreateListeners().getMemoryWriter());
- EXPECT_TRUE(NULL != &OutputManager::getInstanceAndCreateListeners().getConsoleWriter());
- EXPECT_TRUE(NULL != &OutputManager::getInstanceAndCreateListeners().getLogWriter());
+ EXPECT_TRUE(NULL != OutputManager::getInstanceAndCreateListeners().getMemoryWriter());
+ EXPECT_TRUE(NULL != OutputManager::getInstanceAndCreateListeners().getConsoleWriter());
+ EXPECT_TRUE(NULL != OutputManager::getInstanceAndCreateListeners().getLogWriter());
}
// test getInstanceAndCreateListeners called again does not re-create listeners
TEST(OutputManagerTest, GetInstanceAndCreateListenersDoesNotCreateDefaultListenersTwice)
{
- MemoryWriter* memoryWriter = &OutputManager::getInstanceAndCreateListeners().getMemoryWriter();
- ConsoleWriter* consoleWriter = &OutputManager::getInstanceAndCreateListeners().getConsoleWriter();
- LogWriter* logWriter = &OutputManager::getInstanceAndCreateListeners().getLogWriter();
+ MemoryWriter* memoryWriter = OutputManager::getInstanceAndCreateListeners().getMemoryWriter();
+ ConsoleWriter* consoleWriter = OutputManager::getInstanceAndCreateListeners().getConsoleWriter();
+ LogWriter* logWriter = OutputManager::getInstanceAndCreateListeners().getLogWriter();
- EXPECT_TRUE(memoryWriter == &OutputManager::getInstanceAndCreateListeners().getMemoryWriter());
- EXPECT_TRUE(consoleWriter == &OutputManager::getInstanceAndCreateListeners().getConsoleWriter());
- EXPECT_TRUE(logWriter == &OutputManager::getInstanceAndCreateListeners().getLogWriter());
+ EXPECT_TRUE(memoryWriter == OutputManager::getInstanceAndCreateListeners().getMemoryWriter());
+ EXPECT_TRUE(consoleWriter == OutputManager::getInstanceAndCreateListeners().getConsoleWriter());
+ EXPECT_TRUE(logWriter == OutputManager::getInstanceAndCreateListeners().getLogWriter());
}
// test constructor
Modified: code/branches/testing/test/util/output/OutputStreamTest.cc
===================================================================
--- code/branches/testing/test/util/output/OutputStreamTest.cc 2013-03-12 14:41:50 UTC (rev 9546)
+++ code/branches/testing/test/util/output/OutputStreamTest.cc 2013-03-12 21:05:25 UTC (rev 9547)
@@ -63,7 +63,7 @@
TEST(OutputStreamTest, ManipulatorOnlyAppliedIfOutputAccepted)
{
// disable MemoryWriter because otherwise we would always accept all output
- OutputManager::getInstance().getMemoryWriter().disable();
+ OutputManager::getInstance().getMemoryWriter()->disable();
{
OutputStream stream;
@@ -139,7 +139,7 @@
TEST_F(OutputStreamTestWithMockedOutputManager, OutputOnlySentToOutputManagerIfAccepted)
{
// disable MemoryWriter because otherwise we would always accept all output
- OutputManager::getInstanceAndCreateListeners().getMemoryWriter().disable();
+ OutputManager::getInstanceAndCreateListeners().getMemoryWriter()->disable();
OutputStream stream;
More information about the Orxonox-commit
mailing list