start remove of singleton

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";

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)) {
+	if (true == HighlightManager::Exist(m_fileName)) {
-		Highlight * myHL = HighlightManager::getInstance()->Get(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 *  myColor           = ColorizeManager::Get("normal");
-	Colorize *  myColorSel        = myColorManager->Get("SelectedText");
+	Colorize *  myColorSel        = ColorizeManager::Get("SelectedText");
-	color_ts &  myColorSpace      = myColorManager->Get(COLOR_CODE_SPACE);
+	color_ts &  myColorSpace      = ColorizeManager::Get(COLOR_CODE_SPACE);
-	color_ts &  myColorTab        = myColorManager->Get(COLOR_CODE_TAB);
+	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();

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

jni/edn/Colorize/ColorizeManager.cpp

@@ -27,16 +27,44 @@
 #include <ColorizeManager.h>
 #include <tinyXML/tinyxml.h>
 #include <ewol/WidgetMessageMultiCast.h>
+#include <ewol/WidgetManager.h>
 
 #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<Colorize*>  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<listMyColor.Size(); i++) {
@@ -290,13 +318,13 @@ Colorize *ColorizeManager::Get(const char *colorName)
 	return errorColor;
 }
 
-Colorize *ColorizeManager::Get(etk::UString &colorName)
+Colorize *classColorManager::Get(etk::UString &colorName)
 {
 	// TODO : Remove this
 	return Get(colorName.Utf8Data());
 }
 
-color_ts & ColorizeManager::Get(basicColor_te myColor)
+color_ts & classColorManager::Get(basicColor_te myColor)
 {
 	if (myColor < COLOR_NUMBER_MAX) {
 		return basicColors[myColor];
@@ -307,7 +335,7 @@ color_ts & ColorizeManager::Get(basicColor_te myColor)
 
 
 // TODO : Remove this ...
-bool ColorizeManager::Exist(const char *colorName)
+bool classColorManager::Exist(const char *colorName)
 {
 	int32_t i;
 	for (i=0; i<listMyColor.Size(); i++) {
@@ -319,13 +347,13 @@ bool ColorizeManager::Exist(const char *colorName)
 	return false;
 }
 
-bool ColorizeManager::Exist(etk::UString &colorName)
+bool classColorManager::Exist(etk::UString &colorName)
 {
 	// TODO : Remove this
 	return Exist(colorName.Utf8Data());
 }
 
-void ColorizeManager::DisplayListOfColor(void)
+void classColorManager::DisplayListOfColor(void)
 {
 	int32_t i;
 	EDN_INFO(PFX"List of ALL COLOR : ");
@@ -338,3 +366,97 @@ void ColorizeManager::DisplayListOfColor(void)
 
 
 
+static classColorManager * localManager = NULL;
+
+
+void ColorizeManager::Init(void)
+{
+	if (NULL == localManager) {
+		EWOL_ERROR("ColorizeManager ==> 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();
+}
+
+

jni/edn/Colorize/ColorizeManager.h

@@ -50,31 +50,18 @@ typedef enum {
 
 
 
-class ColorizeManager: public etk::Singleton<ColorizeManager>, public ewol::Widget
+namespace ColorizeManager
 {
-	friend class etk::Singleton<ColorizeManager>;
+	void        Init(void);
-	// specific for sigleton system...
+	void        UnInit(void);
-	private:
+	void        LoadFile(etk::UString &xmlFilename);
-		// Constructeur
+	void        LoadFile(const char * xmlFilename);
-		ColorizeManager(void);
+	Colorize *  Get(const char *colorName);
-		~ColorizeManager(void);
+	Colorize *  Get(etk::UString &colorName);
-	public:
+	color_ts &  Get(basicColor_te myColor);
-		bool OnEventAreaExternal(int32_t widgetID, const char * generateEventId, const char * eventExternId, etkFloat_t x, etkFloat_t y);
+	bool        Exist(etk::UString &colorName);
-	public:
+	bool        Exist(const char *colorName);
-		void        LoadFile(etk::UString &xmlFilename);
+	void        DisplayListOfColor(void);
-		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<Colorize*>  listMyColor;		//!< List of ALL Color
-		Colorize *                  errorColor;
-		color_ts                    basicColors[COLOR_NUMBER_MAX];
 };
 
 #endif

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);
+	fg = ColorizeManager::Get(selectFG);
-	bg = m_colorManager->Get(selectBG);
+	bg = ColorizeManager::Get(selectBG);
 	return true;
 }
 

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;
 };
 

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;

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 :

jni/edn/Highlight/HighlightManager.cpp

@@ -27,106 +27,165 @@
 #include <tools_globals.h>
 #include <HighlightManager.h>
 #include <ewol/WidgetMessageMultiCast.h>
+#include <ewol/WidgetManager.h>
 
 #undef __class__
 #define __class__	"HighlightManager"
 
-HighlightManager::HighlightManager(void)
-{
-	ewol::widgetMessageMultiCast::Add(GetWidgetId(), ednMsgBufferColor);
-}
 
-HighlightManager::~HighlightManager(void)
+class localClassHighlightManager: public ewol::Widget
 {
-	int32_t i;
+	private:
-	// clean all Element
+		etk::VectorType<Highlight*> listHighlight;		//!< List of ALL hightlight modules
-	for (i=0; i< listHighlight.Size(); i++) {
+	public:
-		if (NULL != listHighlight[i]) {
+		// Constructeur
-			delete(listHighlight[i]);
+		localClassHighlightManager(void) {
-			listHighlight[i] = NULL;
+			ewol::widgetMessageMultiCast::Add(GetWidgetId(), ednMsgBufferColor);
-		}
+		};
-	}
+		~localClassHighlightManager(void) {
-	// clear the compleate list
+			int32_t i;
-	listHighlight.Clear();
+			// clean all Element
-}
+			for (i=0; i< listHighlight.Size(); i++) {
-
-
-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.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; i<listHighlight.Size(); i++) {
+						if (NULL != listHighlight[i]) {
+							listHighlight[i]->ReloadColor();
+						}
+					}
+					break;
+			}
+			*/
+			return false;
+		}
+		
+		Highlight* Get(etk::File &fileName)
+		{
+			int32_t i;
+			for (i=0; i<listHighlight.Size(); i++) {
+				if (true == listHighlight[i]->FileNameCompatible(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;
+	if (NULL == localManager) {
-	for (i=0; i<listHighlight.Size(); i++) {
+		EWOL_ERROR("HighlightManager ==> request UnInit, but does not exist ...");
-		if (true == listHighlight[i]->FileNameCompatible(fileName) ) {
+		return;
-			return listHighlight[i];
-		}
 	}
-	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) ) {
+	if (NULL == localManager) {
-		return true;
+		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();
-}
 

jni/edn/Highlight/HighlightManager.h

@@ -26,7 +26,6 @@
 #ifndef __HIGHLIGHT_MANAGER_H__
 #define __HIGHLIGHT_MANAGER_H__
 
-class HighlightManager;
 
 #include <etk/Singleton.h>
 #include <etk/UString.h>
@@ -34,26 +33,14 @@ class HighlightManager;
 #include <Highlight.h>
 #include <ewol/Widget.h>
 
-
+namespace HighlightManager{
-class HighlightManager: public etk::Singleton<HighlightManager>, public ewol::Widget
+	void       Init(void);
-{
+	void       UnInit(void);
-	friend class etk::Singleton<HighlightManager>;
+	void       loadLanguages(void);
-	// specific for sigleton system...
+	Highlight* Get(etk::File &fileName);
-	private:
+	bool       Exist(etk::File &fileName);
-		// 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<Highlight*> listHighlight;		//!< List of ALL hightlight modules
 };
 
+
 #endif
 

jni/edn/Highlight/HighlightPattern.cpp

@@ -37,8 +37,7 @@ HighlightPattern::HighlightPattern(void)
 {
 	m_haveStopPatern = false;
 	m_multiline = false;
-	ColorizeManager *myColorManager = ColorizeManager::getInstance();
+	m_color = ColorizeManager::Get("normal");
-	m_color = myColorManager->Get("normal");
 	m_regExpStart = new etk::RegExp<EdnVectorBuf>();
 	m_regExpStop = new etk::RegExp<EdnVectorBuf>();
 	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 = ColorizeManager::Get(m_colorName);
-	m_color = myColorManager->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 = ColorizeManager::Get(m_colorName);
-	m_color = myColorManager->Get(m_colorName);
 }
 
 /**

jni/edn/init.cpp

@@ -89,15 +89,13 @@ void APP_Init(void)
 	(void)BufferManager::getInstance();
 	
 	// set color and other trucs...
-	ColorizeManager *myColorManager = NULL;
+	ColorizeManager::Init();
-	myColorManager = ColorizeManager::getInstance();
 	etk::UString homedir = "color_white.xml";
-	myColorManager->LoadFile( homedir.Utf8Data() );
+	ColorizeManager::LoadFile( homedir.Utf8Data() );
-	myColorManager->DisplayListOfColor();
+	ColorizeManager::DisplayListOfColor();
 	
-	HighlightManager *myHighlightManager = NULL;
+	HighlightManager::Init();
-	myHighlightManager = HighlightManager::getInstance();
+	HighlightManager::loadLanguages();
-	myHighlightManager->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");