Some more cleanup

Author: SinghRajenM

NppJSONViewer/NppJsonViewer/Define.h

@@ -36,6 +36,7 @@ const TCHAR JSON_INFO_TITLE[] = TEXT("JSON Viewer: Information");
 const TCHAR JSON_ERR_PARSE[] = TEXT("Cannot parse JSON. Please select a JSON String.");
 const TCHAR JSON_ERR_VALIDATE[] = TEXT("There was an error while parsing JSON. Refer the current selection for possible problematic area.");
 const TCHAR JSON_ERR_VALIDATE_SUCCESS[] = TEXT("JSON looks good. No error found while validating it.");
+const TCHAR JSON_ERR_SAVE_SETTING[] = TEXT("Failed to save the setting. Please try again.");
 
 const TCHAR STR_VERSION[] = TEXT("Version: ");
 const TCHAR STR_COPY[] = TEXT("Copy");

NppJSONViewer/NppJsonViewer/JsonViewDlg.cpp

@@ -300,23 +300,10 @@ void JsonViewDlg::PopulateTreeUsingSax(HTREEITEM tree_root, const std::string& j
 	m_Editor->SetLangAsJson();
 }
 
-HTREEITEM JsonViewDlg::InsertToTree(HWND hWndDlg, HTREEITEM parent, const std::string& text)
-{
-	auto wText = StringHelper::ToWstring(text);
-
-	TV_INSERTSTRUCT tvinsert{};
-	tvinsert.hParent = parent;
-	tvinsert.hInsertAfter = TVI_LAST;
-	tvinsert.item.mask = TVIF_TEXT;
-	tvinsert.item.pszText = const_cast<LPWSTR>(wText.c_str());
-
-	HTREEITEM item = (HTREEITEM)SendDlgItemMessage(hWndDlg, IDC_TREE, TVM_INSERTITEM, 0, (LPARAM)&tvinsert);
-	return item;
-}
-
 HTREEITEM JsonViewDlg::InsertToTree(HTREEITEM parent, const std::string& text)
 {
-	return InsertToTree(getHSelf(), parent, text);
+	auto wText = StringHelper::ToWstring(text);
+	return m_hTreeView->InsertNode(wText, NULL, parent);
 }
 
 void JsonViewDlg::UpdateNodePath(HTREEITEM htiNode)

NppJSONViewer/NppJsonViewer/JsonViewDlg.h

@@ -20,8 +20,6 @@ class JsonViewDlg : public DockingDlgInterface
 	void FormatJson();
 	void CompressJson();
 
-	// TODO : move to treeviewctrl class
-	HTREEITEM InsertToTree(HWND hWndDlg, HTREEITEM parent, const std::string& text);
 	HTREEITEM InsertToTree(HTREEITEM parent, const std::string& text);
 
 private:

NppJSONViewer/NppJsonViewer/RapidJsonHandler.h

@@ -10,9 +10,9 @@ class JsonViewDlg;
 
 struct TreeNode
 {
-	HTREEITEM subRoot;
-	JsonNode node;
-	int counter;
+	HTREEITEM subRoot{};
+	JsonNode node{};
+	int counter{};
 };
 
 class RapidJsonHandler :public rapidjson::BaseReaderHandler<rapidjson::UTF8<>, RapidJsonHandler>

NppJSONViewer/NppJsonViewer/SettingsDlg.cpp

@@ -65,8 +65,7 @@ INT_PTR SettingsDlg::run_dlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
 			}
 			else
 			{
-				::MessageBox(_hSelf, L"Failed to save the setting. Please try again.",
-					L"Setting Save Error", MB_OK | MB_ICONERROR);
+				::MessageBox(_hSelf, JSON_ERR_SAVE_SETTING, JSON_ERROR_TITLE, MB_OK | MB_ICONERROR);
 			}
 			return TRUE;
 

NppJSONViewer/NppJsonViewer/TreeViewCtrl.cpp

@@ -44,45 +44,6 @@ auto TreeViewCtrl::InsertNode(const std::wstring& text, LPARAM lparam, HTREEITEM
 	return item;
 }
 
-void TreeViewCtrl::InsertItem(const void* jsonNode, HTREEITEM node)
-{
-	if (!jsonNode || !node)
-		return;
-
-	/*std::wstring txtToInsert = StringHelper::ToWstring(jsonNode->key);
-	JsonNodeType valType = jsonNode->type;
-
-	if (valType == JsonNodeType::UNKNOWN || valType == JsonNodeType::NUMBER || valType == JsonNodeType::BOOL)
-	{
-		txtToInsert += TEXT(" : ");
-		txtToInsert += StringHelper::ToWstring(jsonNode->value);
-		InsertNode(txtToInsert, jsonNode->pos.line, node);
-	}
-	else if (valType == JsonNodeType::STRING)
-	{
-		txtToInsert += TEXT(" : ");
-		txtToInsert += TEXT("\"");
-		txtToInsert += StringHelper::ToWstring(jsonNode->value);
-		txtToInsert += TEXT("\"");
-		InsertNode(txtToInsert, jsonNode->pos.line, node);
-	}
-	else if (valType == JsonNodeType::OBJECT || valType == JsonNodeType::ARRAY)
-	{
-		if (valType == JsonNodeType::OBJECT)
-			txtToInsert += TEXT(" : [Object]");
-		if (valType == JsonNodeType::ARRAY)
-			txtToInsert += TEXT(" : [Array]");
-
-		HTREEITEM newNode = InsertNode(txtToInsert, jsonNode->pos.line, node);
-
-		for (auto jsonNextNode : jsonNode->childs)
-		{
-			if (jsonNextNode)
-				InsertItem(jsonNextNode, newNode);
-		}
-	}*/
-}
-
 bool TreeViewCtrl::IsExpanded(HTREEITEM node) const
 {
 	return TreeView_GetItemState(m_hTree, node, TVIS_EXPANDED) & TVIS_EXPANDED;

NppJSONViewer/NppJsonViewer/TreeViewCtrl.h

@@ -18,8 +18,6 @@ class TreeViewCtrl
 
 	auto InitTree()->HTREEITEM;
 	auto InsertNode(const std::wstring& text, LPARAM lparam, HTREEITEM parentNode)->HTREEITEM;
-	//void InsertItem(const JsonNode* jsonNode, HTREEITEM node);
-	void InsertItem(const void* jsonNode, HTREEITEM node);
 
 	bool IsExpanded(HTREEITEM node) const;
 	bool IsThisOrAnyChildExpanded(HTREEITEM node) const;