Merge branch 'jl/LH-26/singleton-transformations'

* jl/LH-26/singleton-transformations: FileManager: Make a real singleton. WcharMbcsConvertor: fix the singleton. NppParameters: make it a true singleton. Conflicts: PowerEditor/src/Parameters.cpp [#26] Signed-off-by: Thell Fowler <git@tbfowler.name>
npp-community · Jan 18, 2010 · b26cbf7 · b26cbf7
2 parents ba8ebd7 + 55d585a
commit b26cbf7
Show file tree

Hide file tree

Showing 8 changed files with 85 additions and 49 deletions.
diff --git a/PowerEditor/src/MISC/Common/Common.cpp b/PowerEditor/src/MISC/Common/Common.cpp
@@ -19,7 +19,7 @@
 
 #include "npp_winver.h"
 
-WcharMbcsConvertor * WcharMbcsConvertor::_pSelf = new WcharMbcsConvertor;
+WcharMbcsConvertor * WcharMbcsConvertor::_pSelf = NULL;
 
 // Set a call back with the handle after init to set the path.
 // http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc/platform/shell/reference/callbackfunctions/browsecallbackproc.asp
@@ -236,6 +236,20 @@ generic_string purgeMenuItemString(const TCHAR * menuItemStr, bool keepAmpersand
 
 #define initSize 1024
 
+WcharMbcsConvertor * WcharMbcsConvertor::getInstance()
+{
+	if (!_pSelf)
+	{
+		_pSelf = new WcharMbcsConvertor;
+	}
+	return _pSelf;
+}
+void WcharMbcsConvertor::destroyInstance()
+{
+	delete _pSelf;
+	_pSelf = NULL;
+}
+
 WcharMbcsConvertor::WcharMbcsConvertor() :
 	_multiByteStr(NULL),
 	_multiByteAllocLen(0),

diff --git a/PowerEditor/src/MISC/Common/Common.h b/PowerEditor/src/MISC/Common/Common.h
@@ -106,8 +106,8 @@ BOOL PathCanonicalize(generic_string& path, generic_string& output);
 class WcharMbcsConvertor
 {
 public:
-	static WcharMbcsConvertor * getInstance() {return _pSelf;};
-	static void destroyInstance() {delete _pSelf;};
+	static WcharMbcsConvertor * getInstance();
+	static void destroyInstance();
 
 	const wchar_t * char2wchar(const char *mbStr, UINT codepage);
 	const wchar_t * char2wchar(const char *mbcs2Convert, UINT codepage, int *mstart, int *mend);

diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp
@@ -263,7 +263,7 @@ Notepad_plus::Notepad_plus():
 // its children's windows handle will be destroyed automatically!
 Notepad_plus::~Notepad_plus()
 {
-	(NppParameters::getInstance())->destroyInstance();
+	NppParameters::destroyInstance();
 	FileManager::destroyInstance();
 	WcharMbcsConvertor::destroyInstance();
 	if (_pTrayIco)

diff --git a/PowerEditor/src/Parameters.cpp b/PowerEditor/src/Parameters.cpp
@@ -496,7 +496,7 @@ generic_string ThemeSwitcher::getThemeFromXmlFileName(const TCHAR *xmlFullPath)
 	return themeName;
 }
 
-NppParameters * NppParameters::_pSelf = new NppParameters;
+NppParameters * NppParameters::_pSelf = NULL;
 int FileDialog::_dialogFileBoxId = getWinVersion() < WV_W2K?edt1:cmb13;
 
 NppParameters::NppParameters() :
@@ -538,6 +538,40 @@ NppParameters::NppParameters() :
 
 NppParameters::~NppParameters()
 {
+	if (_pXmlDoc != NULL)
+	{
+		if (_pXmlDoc->isDirty())
+			_pXmlDoc->SaveFile();
+		delete _pXmlDoc;
+	}
+
+	if (_pXmlUserDoc != NULL)
+	{
+		_pXmlUserDoc->SaveFile();
+		delete _pXmlUserDoc;
+	}
+	if (_pXmlUserStylerDoc)
+		delete _pXmlUserStylerDoc;
+
+	if (_pXmlUserLangDoc)
+	{
+		delete _pXmlUserLangDoc;
+	}
+	if (_pXmlNativeLangDocA)
+		delete _pXmlNativeLangDocA;
+
+	if (_pXmlToolIconsDoc)
+		delete _pXmlToolIconsDoc;
+
+	if (_pXmlShortcutDoc)
+		delete _pXmlShortcutDoc;
+
+	if (_pXmlContextMenuDoc)
+		delete _pXmlContextMenuDoc;
+
+	if (_pXmlSessionDoc)
+		delete _pXmlSessionDoc;
+
 	for( std::vector<Lang *>::const_iterator it = _langList.begin(), end = _langList.end();
 		it != end;
 		++it)
@@ -971,44 +1005,8 @@ bool NppParameters::load()
 
 void NppParameters::destroyInstance()
 {
-	if (_pXmlDoc != NULL)
-	{
-        if (_pXmlDoc->isDirty())
-            _pXmlDoc->SaveFile();
-		delete _pXmlDoc;
-	}
-
-	if (_pXmlUserDoc != NULL)
-	{
-		_pXmlUserDoc->SaveFile();
-		delete _pXmlUserDoc;
-	}
-	if (_pXmlUserStylerDoc)
-		delete _pXmlUserStylerDoc;
-
-	if (_pXmlUserLangDoc)
-    {
-		delete _pXmlUserLangDoc;
-    }
-	if (_pXmlNativeLangDocA)
-		delete _pXmlNativeLangDocA;
-
-	if (_pXmlToolIconsDoc)
-		delete _pXmlToolIconsDoc;
-
-	if (_pXmlShortcutDoc)
-		delete _pXmlShortcutDoc;
-
-	if (_pXmlContextMenuDoc)
-		delete _pXmlContextMenuDoc;
-
-	if (_pXmlSessionDoc)
-		delete _pXmlSessionDoc;
-
-	if (_pXmlBlacklistDoc)
-		delete _pXmlBlacklistDoc;
-
 	delete _pSelf;
+	_pSelf = NULL;
 }
 
 void NppParameters::setFontList(HWND hWnd)
@@ -2468,6 +2466,15 @@ TiXmlNode * NppParameters::getChildElementByAttribut(TiXmlNode *pere, const TCHA
 	return NULL;
 }
 
+NppParameters* NppParameters::getInstance()
+{
+	if(!_pSelf)
+	{
+		_pSelf = new NppParameters;
+	}
+	return _pSelf;
+}
+
 // 2 restes : L_H, L_USER
 LangType NppParameters::getLangIDFromStr(const TCHAR *langName)
 {

diff --git a/PowerEditor/src/Parameters.h b/PowerEditor/src/Parameters.h
@@ -661,12 +661,12 @@ private :
 class NppParameters
 {
 public:
-    static NppParameters * getInstance() {return _pSelf;};
+    static NppParameters * getInstance();
 	static LangType getLangIDFromStr(const TCHAR *langName);
+	static void destroyInstance();
 	bool load();
 	bool reloadLang();
 	bool reloadStylers(TCHAR *stylePath = NULL);
-    void destroyInstance();
 
 	bool _isTaskListRBUTTONUP_Active;
 	int L_END;

diff --git a/PowerEditor/src/ScintillaComponent/Buffer.cpp b/PowerEditor/src/ScintillaComponent/Buffer.cpp
@@ -27,7 +27,7 @@
 
 const TCHAR UNTITLED_STR[] = TEXT("new ");
 
-FileManager * FileManager::_pSelf = new FileManager();
+FileManager * FileManager::_pSelf = NULL;
 
 const int blockSize = 128 * 1024 + 4;
 
@@ -348,6 +348,22 @@ void Buffer::setLineUndoState(size_t currentLine, size_t undoLevel, bool isSaved
 
 //filemanager
 
+FileManager* FileManager::getInstance()
+{
+	if (!_pSelf)
+	{
+		_pSelf = new FileManager();
+	}
+	return _pSelf;
+}
+
+void FileManager::destroyInstance()
+{
+	delete _pSelf;
+	_pSelf = NULL;
+}
+
+
 FileManager::~FileManager()
 {
 	for (std::vector<Buffer *>::iterator it = _buffers.begin(), end = _buffers.end(); it != end; ++ it)

diff --git a/PowerEditor/src/ScintillaComponent/Buffer.h b/PowerEditor/src/ScintillaComponent/Buffer.h
@@ -107,9 +107,8 @@ class FileManager {
 
 	bool createEmptyFile(const TCHAR * path);
 
-	// JOCE: Get Instance / destroy instance not symmetric. Maybe _pSelf shouldn't be a pointer...
-	static FileManager * getInstance() {return _pSelf;}
-	static void destroyInstance() { delete _pSelf; }
+	static FileManager * getInstance();
+	static void destroyInstance();
 
 	void increaseDocNr() {_nextNewNumber++;};
 

diff --git a/PowerEditor/src/winmain.cpp b/PowerEditor/src/winmain.cpp
@@ -279,7 +279,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE, LPSTR /*cmdLineAnsi*/, int /*
         if (hNotepad_plus)
         {
 			// First of all, destroy static object NppParameters
-			pNppParameters->destroyInstance();
+			NppParameters::destroyInstance();
 			FileManager::destroyInstance();
 
 			int sw;