From a943ddd4f7628b2fcc0beed5eed8eaa3861574ba Mon Sep 17 00:00:00 2001 From: Edouard Dupin Date: Sun, 19 Feb 2012 22:33:43 +0100 Subject: [PATCH] start remove of singleton --- jni/edn/Buffer/BufferEmpty.cpp | 5 +- jni/edn/Buffer/BufferText.cpp | 22 ++- jni/edn/Buffer/BufferText.h | 2 - jni/edn/Colorize/ColorizeManager.cpp | 144 ++++++++++++++-- jni/edn/Colorize/ColorizeManager.h | 35 ++-- jni/edn/Gui/BufferView.cpp | 7 +- jni/edn/Gui/BufferView.h | 1 - jni/edn/Gui/CodeView.cpp | 1 - jni/edn/Gui/CodeView.h | 1 - jni/edn/Highlight/HighlightManager.cpp | 219 ++++++++++++++++--------- jni/edn/Highlight/HighlightManager.h | 27 +-- jni/edn/Highlight/HighlightPattern.cpp | 9 +- jni/edn/init.cpp | 16 +- 13 files changed, 316 insertions(+), 173 deletions(-) diff --git a/jni/edn/Buffer/BufferEmpty.cpp b/jni/edn/Buffer/BufferEmpty.cpp index 26ab3f5..5f7b00c 100644 --- a/jni/edn/Buffer/BufferEmpty.cpp +++ b/jni/edn/Buffer/BufferEmpty.cpp @@ -73,7 +73,6 @@ int32_t BufferEmpty::Display(ewol::OObject2DTextColored& OOTextNormal, ewol::OObject2DTextColored& OOTextBoldItalic, ewol::OObject2DColored& OOColored, int32_t offsetX, int32_t offsetY, int32_t sizeX, int32_t sizeY) { - ColorizeManager * myColorManager = ColorizeManager::getInstance(); // Get color : Colorize *myColor = NULL; @@ -89,12 +88,12 @@ int32_t BufferEmpty::Display(ewol::OObject2DTextColored& OOTextNormal, drawClipping.w = sizeX; drawClipping.h = sizeY; - myColor = myColorManager->Get("normal"); + myColor = ColorizeManager::Get("normal"); OOTextNormal.SetColor(myColor->GetFG()); etk::UString tmpDisplay = "edn - Editeur De N'ours"; OOTextBold.Text(textPos, drawClipping, tmpDisplay); - myColor = myColorManager->Get("commentDoxygen"); + myColor = ColorizeManager::Get("commentDoxygen"); OOTextNormal.SetColor(myColor->GetFG()); textPos.y = (int32_t)(textPos.y + letterHeight*1.30); tmpDisplay = "No Buffer Availlable to display"; diff --git a/jni/edn/Buffer/BufferText.cpp b/jni/edn/Buffer/BufferText.cpp index 8fc87c5..67321d5 100644 --- a/jni/edn/Buffer/BufferText.cpp +++ b/jni/edn/Buffer/BufferText.cpp @@ -67,8 +67,6 @@ void BufferText::BasicInit(void) // set the number of the lineNumber; nbColoneForLineNumber = 1; - // init the link with the buffer manager - myColorManager = ColorizeManager::getInstance(); // Init Selection mode : SelectionEnd(); //EDN_INFO("Init"); @@ -95,8 +93,8 @@ void BufferText::NameChange(void) { // Find HL system //EDN_DEBUG("check name change"); - if (true == HighlightManager::getInstance()->Exist(m_fileName)) { - Highlight * myHL = HighlightManager::getInstance()->Get(m_fileName); + if (true == HighlightManager::Exist(m_fileName)) { + Highlight * myHL = HighlightManager::Get(m_fileName); // Set the new HL if (NULL != myHL) { m_EdnBuf.SetHLSystem(myHL); @@ -244,9 +242,9 @@ void BufferText::DrawLineNumber(ewol::OObject2DTextColored* OOText, ewol::OObjec { char tmpLineNumber[50]; sprintf(tmpLineNumber, myPrint, lineNumber); - OOColored->SetColor(myColorManager->Get(COLOR_LIST_BG_2)); + OOColored->SetColor(ColorizeManager::Get(COLOR_LIST_BG_2)); OOColored->Rectangle( 0, positionY, sizeX+0.5*SEPARATION_SIZE_LINE_NUMBER, sizeY); - OOText->SetColor(myColorManager->Get(COLOR_CODE_LINE_NUMBER)); + OOText->SetColor(ColorizeManager::Get(COLOR_CODE_LINE_NUMBER)); coord2D_ts textPos; @@ -266,7 +264,7 @@ void BufferText::DrawLineNumber(ewol::OObject2DTextColored* OOText, ewol::OObjec #define CURSOR_THICKNESS (1.2) void BufferText::CursorDisplay(ewol::OObject2DColored* OOColored, int32_t x, int32_t y, int32_t letterHeight, int32_t letterWidth, clipping_ts &clip) { - color_ts & tmpppppp = ColorizeManager::getInstance()->Get(COLOR_CODE_CURSOR); + color_ts & tmpppppp = ColorizeManager::Get(COLOR_CODE_CURSOR); OOColored->SetColor(tmpppppp); if (true == ewol::IsSetInsert()) { OOColored->Rectangle( x, y, letterWidth, letterHeight, clip); @@ -382,10 +380,10 @@ int32_t BufferText::Display(ewol::OObject2DTextColored& OOTextNormal, uint32_t y = 0; int32_t iii, new_i; // Get color : - Colorize * myColor = myColorManager->Get("normal"); - Colorize * myColorSel = myColorManager->Get("SelectedText"); - color_ts & myColorSpace = myColorManager->Get(COLOR_CODE_SPACE); - color_ts & myColorTab = myColorManager->Get(COLOR_CODE_TAB); + Colorize * myColor = ColorizeManager::Get("normal"); + Colorize * myColorSel = ColorizeManager::Get("SelectedText"); + color_ts & myColorSpace = ColorizeManager::Get(COLOR_CODE_SPACE); + color_ts & myColorTab = ColorizeManager::Get(COLOR_CODE_TAB); Colorize * selectColor = NULL; ewol::OObject2DTextColored* OOTextSelected = NULL; @@ -393,7 +391,7 @@ int32_t BufferText::Display(ewol::OObject2DTextColored& OOTextNormal, int32_t x_base=nbColoneForLineNumber*letterWidth; int32_t idX = 0; - OOColored.SetColor(myColorManager->Get(COLOR_CODE_BASIC_BG)); + OOColored.SetColor(ColorizeManager::Get(COLOR_CODE_BASIC_BG)); OOColored.Rectangle( 0, 0, sizeX, sizeY); int64_t startTime = GetCurrentTime(); diff --git a/jni/edn/Buffer/BufferText.h b/jni/edn/Buffer/BufferText.h index 13fdb5a..323c2db 100644 --- a/jni/edn/Buffer/BufferText.h +++ b/jni/edn/Buffer/BufferText.h @@ -87,8 +87,6 @@ class BufferText : public Buffer { // Display bool NeedToCleanEndPage; //!< if true, the end of the page need to be clean (arrive after a remove line) uint32_t nbColoneForLineNumber; //!< number of colome used to display the line Number - ColorizeManager * myColorManager; //!< for the background color : - // Direct buffer IO EdnBuf m_EdnBuf; //!< buffer associated on this displayer diff --git a/jni/edn/Colorize/ColorizeManager.cpp b/jni/edn/Colorize/ColorizeManager.cpp index c554cf9..686dc6e 100644 --- a/jni/edn/Colorize/ColorizeManager.cpp +++ b/jni/edn/Colorize/ColorizeManager.cpp @@ -27,16 +27,44 @@ #include #include #include +#include #define PFX "ColorizeManager " -ColorizeManager::ColorizeManager(void) + +class classColorManager: public ewol::Widget +{ + public: + // Constructeur + classColorManager(void); + ~classColorManager(void); + public: + bool OnEventAreaExternal(int32_t widgetID, const char * generateEventId, const char * eventExternId, etkFloat_t x, etkFloat_t y); + public: + void LoadFile(etk::UString &xmlFilename); + void LoadFile(const char * xmlFilename); + Colorize * Get(const char *colorName); + Colorize * Get(etk::UString &colorName); + color_ts & Get(basicColor_te myColor); + bool Exist(etk::UString &colorName); + bool Exist(const char *colorName); + void DisplayListOfColor(void); + + private: + etk::UString m_fileColor; + etk::VectorType listMyColor; //!< List of ALL Color + Colorize * errorColor; + color_ts basicColors[COLOR_NUMBER_MAX]; +}; + + +classColorManager::classColorManager(void) { ewol::widgetMessageMultiCast::Add(GetWidgetId(), ednMsgGuiChangeColor); } -ColorizeManager::~ColorizeManager(void) +classColorManager::~classColorManager(void) { delete(errorColor); @@ -53,7 +81,7 @@ ColorizeManager::~ColorizeManager(void) } -bool ColorizeManager::OnEventAreaExternal(int32_t widgetID, const char * generateEventId, const char * eventExternId, etkFloat_t x, etkFloat_t y) +bool classColorManager::OnEventAreaExternal(int32_t widgetID, const char * generateEventId, const char * eventExternId, etkFloat_t x, etkFloat_t y) { /* switch (id) @@ -72,14 +100,14 @@ bool ColorizeManager::OnEventAreaExternal(int32_t widgetID, const char * generat } -void ColorizeManager::LoadFile(etk::UString &xmlFilename) +void classColorManager::LoadFile(etk::UString &xmlFilename) { // TODO : Remove this LoadFile(xmlFilename.Utf8Data()); } // TODO : Remove this ... -void ColorizeManager::LoadFile(const char * xmlFilename) +void classColorManager::LoadFile(const char * xmlFilename) { // Remove all old color : int32_t i; @@ -276,7 +304,7 @@ void ColorizeManager::LoadFile(const char * xmlFilename) } // TODO : Remove this ... -Colorize *ColorizeManager::Get(const char *colorName) +Colorize *classColorManager::Get(const char *colorName) { int32_t i; for (i=0; i already exist, just unlink the previous ..."); + localManager = NULL; + } + localManager = new classColorManager(); + + if (NULL == localManager) { + EWOL_CRITICAL("Allocation of HighlightManager not done ..."); + } +} + +void ColorizeManager::UnInit(void) +{ + if (NULL == localManager) { + EWOL_ERROR("ColorizeManager ==> request UnInit, but does not exist ..."); + return; + } + ewol::widgetManager::MarkWidgetToBeRemoved(localManager); + localManager = NULL; +} + +void ColorizeManager::LoadFile(etk::UString &xmlFilename) +{ + if (NULL == localManager) { + return; + } + localManager->LoadFile(xmlFilename); +} + + +void ColorizeManager::LoadFile(const char * xmlFilename) +{ + if (NULL == localManager) { + return; + } + localManager->LoadFile(xmlFilename); +} + +Colorize* ColorizeManager::Get(const char *colorName) +{ + if (NULL == localManager) { + return NULL; + } + return localManager->Get(colorName); +} + +Colorize* ColorizeManager::Get(etk::UString &colorName) +{ + if (NULL == localManager) { + return NULL; + } + return localManager->Get(colorName); +} + +color_ts errorColor; + +color_ts& ColorizeManager::Get(basicColor_te myColor) +{ + if (NULL == localManager) { + return errorColor; + } + return localManager->Get(myColor); +} + +bool ColorizeManager::Exist(etk::UString &colorName) +{ + if (NULL == localManager) { + return false; + } + return localManager->Exist(colorName); +} + +bool ColorizeManager::Exist(const char *colorName) +{ + if (NULL == localManager) { + return false; + } + return localManager->Exist(colorName); +} + +void ColorizeManager::DisplayListOfColor(void) +{ + if (NULL == localManager) { + return; + } + localManager->DisplayListOfColor(); +} + + diff --git a/jni/edn/Colorize/ColorizeManager.h b/jni/edn/Colorize/ColorizeManager.h index 07ad3dd..b6b20fb 100644 --- a/jni/edn/Colorize/ColorizeManager.h +++ b/jni/edn/Colorize/ColorizeManager.h @@ -50,31 +50,18 @@ typedef enum { -class ColorizeManager: public etk::Singleton, public ewol::Widget +namespace ColorizeManager { - friend class etk::Singleton; - // specific for sigleton system... - private: - // Constructeur - ColorizeManager(void); - ~ColorizeManager(void); - public: - bool OnEventAreaExternal(int32_t widgetID, const char * generateEventId, const char * eventExternId, etkFloat_t x, etkFloat_t y); - public: - void LoadFile(etk::UString &xmlFilename); - void LoadFile(const char * xmlFilename); - Colorize * Get(const char *colorName); - Colorize * Get(etk::UString &colorName); - color_ts & Get(basicColor_te myColor); - bool Exist(etk::UString &colorName); - bool Exist(const char *colorName); - void DisplayListOfColor(void); - - private: - etk::UString m_fileColor; - etk::VectorType listMyColor; //!< List of ALL Color - Colorize * errorColor; - color_ts basicColors[COLOR_NUMBER_MAX]; + void Init(void); + void UnInit(void); + void LoadFile(etk::UString &xmlFilename); + void LoadFile(const char * xmlFilename); + Colorize * Get(const char *colorName); + Colorize * Get(etk::UString &colorName); + color_ts & Get(basicColor_te myColor); + bool Exist(etk::UString &colorName); + bool Exist(const char *colorName); + void DisplayListOfColor(void); }; #endif diff --git a/jni/edn/Gui/BufferView.cpp b/jni/edn/Gui/BufferView.cpp index 977cdf1..644198c 100644 --- a/jni/edn/Gui/BufferView.cpp +++ b/jni/edn/Gui/BufferView.cpp @@ -39,7 +39,6 @@ BufferView::BufferView(void) { // Init link with the buffer Manager m_bufferManager = BufferManager::getInstance(); - m_colorManager = ColorizeManager::getInstance(); SetCanHaveFocus(true); ewol::widgetMessageMultiCast::Add(GetWidgetId(), ednMsgBufferListChange); ewol::widgetMessageMultiCast::Add(GetWidgetId(), ednMsgBufferState); @@ -73,7 +72,7 @@ bool BufferView::OnEventAreaExternal(int32_t widgetID, const char * generateEven color_ts BufferView::GetBasicBG(void) { - return m_colorManager->Get(COLOR_LIST_BG_1); + return ColorizeManager::Get(COLOR_LIST_BG_1); } uint32_t BufferView::GetNuberOfColomn(void) @@ -134,8 +133,8 @@ bool BufferView::GetElement(int32_t colomn, int32_t raw, etk::UString &myTextToW } else { myTextToWrite = "ERROR"; } - fg = m_colorManager->Get(selectFG); - bg = m_colorManager->Get(selectBG); + fg = ColorizeManager::Get(selectFG); + bg = ColorizeManager::Get(selectBG); return true; } diff --git a/jni/edn/Gui/BufferView.h b/jni/edn/Gui/BufferView.h index 23a7078..2e47789 100644 --- a/jni/edn/Gui/BufferView.h +++ b/jni/edn/Gui/BufferView.h @@ -52,7 +52,6 @@ class BufferView : public ewol::List private: // récupération des proprieter général... BufferManager * m_bufferManager; - ColorizeManager * m_colorManager; int32_t m_selectedID; }; diff --git a/jni/edn/Gui/CodeView.cpp b/jni/edn/Gui/CodeView.cpp index 412b38e..46d1fcb 100644 --- a/jni/edn/Gui/CodeView.cpp +++ b/jni/edn/Gui/CodeView.cpp @@ -57,7 +57,6 @@ CodeView::CodeView(void) // Init link with the buffer Manager m_bufferManager = BufferManager::getInstance(); - m_colorManager = ColorizeManager::getInstance(); m_textColorFg.red = 0.0; m_textColorFg.green = 0.0; diff --git a/jni/edn/Gui/CodeView.h b/jni/edn/Gui/CodeView.h index 95631fa..b3e0322 100644 --- a/jni/edn/Gui/CodeView.h +++ b/jni/edn/Gui/CodeView.h @@ -46,7 +46,6 @@ class CodeView :public ewol::WidgetScrooled color_ts m_textColorFg; //!< Text color color_ts m_textColorBg; //!< Background color BufferManager * m_bufferManager; - ColorizeManager * m_colorManager; int32_t m_bufferID; bool m_buttunOneSelected; // drawing elements : diff --git a/jni/edn/Highlight/HighlightManager.cpp b/jni/edn/Highlight/HighlightManager.cpp index 064a707..29dc7dd 100644 --- a/jni/edn/Highlight/HighlightManager.cpp +++ b/jni/edn/Highlight/HighlightManager.cpp @@ -27,106 +27,165 @@ #include #include #include +#include #undef __class__ #define __class__ "HighlightManager" -HighlightManager::HighlightManager(void) -{ - ewol::widgetMessageMultiCast::Add(GetWidgetId(), ednMsgBufferColor); -} -HighlightManager::~HighlightManager(void) +class localClassHighlightManager: public ewol::Widget { - int32_t i; - // clean all Element - for (i=0; i< listHighlight.Size(); i++) { - if (NULL != listHighlight[i]) { - delete(listHighlight[i]); - listHighlight[i] = NULL; - } - } - // clear the compleate list - listHighlight.Clear(); -} - - -bool HighlightManager::OnEventAreaExternal(int32_t widgetID, const char * generateEventId, const char * eventExternId, etkFloat_t x, etkFloat_t y) -{ - /* - switch (id) - { - case EDN_MSG__COLOR_HAS_CHANGE: - EDN_INFO("UPDATE the color pointer on the HL"); - for (int32_t i=0; i listHighlight; //!< List of ALL hightlight modules + public: + // Constructeur + localClassHighlightManager(void) { + ewol::widgetMessageMultiCast::Add(GetWidgetId(), ednMsgBufferColor); + }; + ~localClassHighlightManager(void) { + int32_t i; + // clean all Element + for (i=0; i< listHighlight.Size(); i++) { if (NULL != listHighlight[i]) { - listHighlight[i]->ReloadColor(); + delete(listHighlight[i]); + listHighlight[i] = NULL; } } - break; + // clear the compleate list + listHighlight.Clear(); + }; + bool OnEventAreaExternal(int32_t widgetID, const char * generateEventId, const char * eventExternId, etkFloat_t x, etkFloat_t y) + { + /* + switch (id) + { + case EDN_MSG__COLOR_HAS_CHANGE: + EDN_INFO("UPDATE the color pointer on the HL"); + for (int32_t i=0; iReloadColor(); + } + } + break; + } + */ + return false; + } + + Highlight* Get(etk::File &fileName) + { + int32_t i; + for (i=0; iFileNameCompatible(fileName) ) { + return listHighlight[i]; + } + } + return NULL; + } + + bool Exist(etk::File &fileName) + { + if (NULL != Get(fileName) ) { + return true; + } + return false; + } + + + void loadLanguages(void) + { + etk::UString xmlFilename = "lang_c.xml"; + Highlight *myHightline = new Highlight(xmlFilename); + listHighlight.PushBack(myHightline); + + xmlFilename = "lang_boo.xml"; + myHightline = new Highlight(xmlFilename); + listHighlight.PushBack(myHightline); + + xmlFilename = "lang_Makefile.xml"; + myHightline = new Highlight(xmlFilename); + listHighlight.PushBack(myHightline); + + xmlFilename = "lang_asm.xml"; + myHightline = new Highlight(xmlFilename); + listHighlight.PushBack(myHightline); + + xmlFilename = "lang_xml.xml"; + myHightline = new Highlight(xmlFilename); + listHighlight.PushBack(myHightline); + + xmlFilename = "lang_php.xml"; + myHightline = new Highlight(xmlFilename); + listHighlight.PushBack(myHightline); + + xmlFilename = "lang_bash.xml"; + myHightline = new Highlight(xmlFilename); + listHighlight.PushBack(myHightline); + + xmlFilename = "lang_matlab.xml"; + myHightline = new Highlight(xmlFilename); + listHighlight.PushBack(myHightline); + + xmlFilename = "lang_java.xml"; + myHightline = new Highlight(xmlFilename); + listHighlight.PushBack(myHightline); + + //myHightline->Display(); + } + +}; + + +static localClassHighlightManager * localManager = NULL; + + + +void HighlightManager::Init(void) +{ + if (NULL == localManager) { + EWOL_ERROR("HighlightManager ==> already exist, just unlink the previous ..."); + localManager = NULL; + } + localManager = new localClassHighlightManager(); + + if (NULL == localManager) { + EWOL_CRITICAL("Allocation of HighlightManager not done ..."); } - */ - return false; } -Highlight *HighlightManager::Get(etk::File &fileName) +void HighlightManager::UnInit(void) { - int32_t i; - for (i=0; iFileNameCompatible(fileName) ) { - return listHighlight[i]; - } + if (NULL == localManager) { + EWOL_ERROR("HighlightManager ==> request UnInit, but does not exist ..."); + return; } - return NULL; + ewol::widgetManager::MarkWidgetToBeRemoved(localManager); + localManager = NULL; +} + +void HighlightManager::loadLanguages(void) +{ + if (NULL == localManager) { + return; + } + localManager->loadLanguages(); +} + +Highlight* HighlightManager::Get(etk::File &fileName) +{ + if (NULL == localManager) { + return NULL; + } + return localManager->Get(fileName); } bool HighlightManager::Exist(etk::File &fileName) { - if (NULL != Get(fileName) ) { - return true; + if (NULL == localManager) { + return false; } - return false; + return localManager->Exist(fileName); } -void HighlightManager::loadLanguages(void) -{ - etk::UString xmlFilename = "lang_c.xml"; - Highlight *myHightline = new Highlight(xmlFilename); - listHighlight.PushBack(myHightline); - - xmlFilename = "lang_boo.xml"; - myHightline = new Highlight(xmlFilename); - listHighlight.PushBack(myHightline); - - xmlFilename = "lang_Makefile.xml"; - myHightline = new Highlight(xmlFilename); - listHighlight.PushBack(myHightline); - - xmlFilename = "lang_asm.xml"; - myHightline = new Highlight(xmlFilename); - listHighlight.PushBack(myHightline); - - xmlFilename = "lang_xml.xml"; - myHightline = new Highlight(xmlFilename); - listHighlight.PushBack(myHightline); - - xmlFilename = "lang_php.xml"; - myHightline = new Highlight(xmlFilename); - listHighlight.PushBack(myHightline); - - xmlFilename = "lang_bash.xml"; - myHightline = new Highlight(xmlFilename); - listHighlight.PushBack(myHightline); - - xmlFilename = "lang_matlab.xml"; - myHightline = new Highlight(xmlFilename); - listHighlight.PushBack(myHightline); - - xmlFilename = "lang_java.xml"; - myHightline = new Highlight(xmlFilename); - listHighlight.PushBack(myHightline); - - //myHightline->Display(); -} diff --git a/jni/edn/Highlight/HighlightManager.h b/jni/edn/Highlight/HighlightManager.h index a35352e..d5f4a86 100644 --- a/jni/edn/Highlight/HighlightManager.h +++ b/jni/edn/Highlight/HighlightManager.h @@ -26,7 +26,6 @@ #ifndef __HIGHLIGHT_MANAGER_H__ #define __HIGHLIGHT_MANAGER_H__ -class HighlightManager; #include #include @@ -34,26 +33,14 @@ class HighlightManager; #include #include - -class HighlightManager: public etk::Singleton, public ewol::Widget -{ - friend class etk::Singleton; - // specific for sigleton system... - private: - // Constructeur - HighlightManager(void); - ~HighlightManager(void); - - public: - bool OnEventAreaExternal(int32_t widgetID, const char * generateEventId, const char * eventExternId, etkFloat_t x, etkFloat_t y); - public: - void loadLanguages(void); - Highlight * Get(etk::File &fileName); - bool Exist(etk::File &fileName); - - private: - etk::VectorType listHighlight; //!< List of ALL hightlight modules +namespace HighlightManager{ + void Init(void); + void UnInit(void); + void loadLanguages(void); + Highlight* Get(etk::File &fileName); + bool Exist(etk::File &fileName); }; + #endif diff --git a/jni/edn/Highlight/HighlightPattern.cpp b/jni/edn/Highlight/HighlightPattern.cpp index 4d1aecc..32bbe23 100644 --- a/jni/edn/Highlight/HighlightPattern.cpp +++ b/jni/edn/Highlight/HighlightPattern.cpp @@ -37,8 +37,7 @@ HighlightPattern::HighlightPattern(void) { m_haveStopPatern = false; m_multiline = false; - ColorizeManager *myColorManager = ColorizeManager::getInstance(); - m_color = myColorManager->Get("normal"); + m_color = ColorizeManager::Get("normal"); m_regExpStart = new etk::RegExp(); m_regExpStop = new etk::RegExp(); m_escapeChar = 0; @@ -78,8 +77,7 @@ void HighlightPattern::SetEscapeChar(etk::UString &EscapeChar) void HighlightPattern::SetColor(etk::UString &colorName) { m_colorName = colorName; - ColorizeManager *myColorManager = ColorizeManager::getInstance(); - m_color = myColorManager->Get(m_colorName); + m_color = ColorizeManager::Get(m_colorName); } bool HighlightPattern::IsEnable(void) @@ -90,8 +88,7 @@ bool HighlightPattern::IsEnable(void) void HighlightPattern::ReloadColor(void) { - ColorizeManager *myColorManager = ColorizeManager::getInstance(); - m_color = myColorManager->Get(m_colorName); + m_color = ColorizeManager::Get(m_colorName); } /** diff --git a/jni/edn/init.cpp b/jni/edn/init.cpp index 8556559..472fbd4 100644 --- a/jni/edn/init.cpp +++ b/jni/edn/init.cpp @@ -89,15 +89,13 @@ void APP_Init(void) (void)BufferManager::getInstance(); // set color and other trucs... - ColorizeManager *myColorManager = NULL; - myColorManager = ColorizeManager::getInstance(); + ColorizeManager::Init(); etk::UString homedir = "color_white.xml"; - myColorManager->LoadFile( homedir.Utf8Data() ); - myColorManager->DisplayListOfColor(); + ColorizeManager::LoadFile( homedir.Utf8Data() ); + ColorizeManager::DisplayListOfColor(); - HighlightManager *myHighlightManager = NULL; - myHighlightManager = HighlightManager::getInstance(); - myHighlightManager->loadLanguages(); + HighlightManager::Init(); + HighlightManager::loadLanguages(); // get the curent program folder @@ -139,11 +137,13 @@ void APP_UnInit(void) // Remove windows : ewol::DisplayWindows(NULL); + EDN_INFO("Stop Hightlight"); + HighlightManager::UnInit(); //Kill all singleton EDN_INFO("Stop BufferManager"); BufferManager::Kill(); EDN_INFO("Stop ColorizeManager"); - ColorizeManager::Kill(); + ColorizeManager::UnInit(); EDN_INFO("Stop Search"); Search::Kill(); //EDN_INFO("Stop Accel key");