rename to TreeBuilder

Author: kapilratnani

NppJSONViewer/JSONDialog.cpp

@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "json.h"
 #include <sstream>
 #include "StopWatch.h"
-#include "SaxHandler.h"
+#include "TreeBuilder.h"
 #include "rapidjson/reader.h"
 
 using win32::Stopwatch;
@@ -91,7 +91,7 @@ void JSONDialog::setJSON(char* json)
 void JSONDialog::populateTreeUsingSax(HWND hWndDlg, HTREEITEM tree_root, char *json) {
 	Stopwatch sw;
 	sw.Start();
-	SaxHandler handler(this, tree_root);
+	TreeBuilder handler(this, tree_root);
 	rapidjson::Reader reader;
 
 	rapidjson::StringStream ss(json);

NppJSONViewer/NPPJSONViewer.vcxproj

@@ -175,7 +175,7 @@
     <ClCompile Include="JSONDialog.cpp" />
     <ClCompile Include="NppPlugin.cpp" />
     <ClCompile Include="PluginDefinition.cpp" />
-    <ClCompile Include="SaxHandler.cpp" />
+    <ClCompile Include="TreeBuilder.cpp" />
     <ClCompile Include="StaticDialog.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -190,7 +190,7 @@
     <ClInclude Include="PluginDefinition.h" />
     <ClInclude Include="PluginInterface.h" />
     <ClInclude Include="resource.h" />
-    <ClInclude Include="SaxHandler.h" />
+    <ClInclude Include="TreeBuilder.h" />
     <ClInclude Include="Scintilla.h" />
     <ClInclude Include="StaticDialog.h" />
     <ClInclude Include="StopWatch.h" />

NppJSONViewer/NPPJSONViewer.vcxproj.filters

@@ -33,7 +33,7 @@
     <ClCompile Include="StaticDialog.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="SaxHandler.cpp">
+    <ClCompile Include="TreeBuilder.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
@@ -83,10 +83,10 @@
     <ClInclude Include="StopWatch.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="SaxHandler.h">
+    <ClInclude Include="utils.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="utils.h">
+    <ClInclude Include="TreeBuilder.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

NppJSONViewer/SaxHandler.cpp NppJSONViewer/TreeBuilder.cppNppJSONViewer/SaxHandler.cpp renamed to NppJSONViewer/TreeBuilder.cpp

@@ -1,4 +1,4 @@
-#include "SaxHandler.h"
+#include "TreeBuilder.h"
 #include <iostream>
 #include "JSONDialog.h"
 #include "utils.h"
@@ -41,27 +41,27 @@ const char* NULL_STR = "null";
 const char* TRUE_STR = "true";
 const char* FALSE_STR = "false";
 
-bool SaxHandler::Null() {
+bool TreeBuilder::Null() {
 	return this->String(NULL_STR, sizeof(NULL_STR), true);
 }
 
-bool SaxHandler::Bool(bool b) {
+bool TreeBuilder::Bool(bool b) {
 	if (b)
 		return this->String(TRUE_STR, sizeof(TRUE_STR), true);
 	return this->String(FALSE_STR, sizeof(FALSE_STR), true);
 }
 
-bool SaxHandler::Int(int i) { cout << "Int(" << i << ")" << endl; return true; }
-bool SaxHandler::Uint(unsigned u) { cout << "Uint(" << u << ")" << endl; return true; }
-bool SaxHandler::Int64(int64_t i) { cout << "Int64(" << i << ")" << endl; return true; }
-bool SaxHandler::Uint64(uint64_t u) { cout << "Uint64(" << u << ")" << endl; return true; }
-bool SaxHandler::Double(double d) { cout << "Double(" << d << ")" << endl; return true; }
+bool TreeBuilder::Int(int i) { cout << "Int(" << i << ")" << endl; return true; }
+bool TreeBuilder::Uint(unsigned u) { cout << "Uint(" << u << ")" << endl; return true; }
+bool TreeBuilder::Int64(int64_t i) { cout << "Int64(" << i << ")" << endl; return true; }
+bool TreeBuilder::Uint64(uint64_t u) { cout << "Uint64(" << u << ")" << endl; return true; }
+bool TreeBuilder::Double(double d) { cout << "Double(" << d << ")" << endl; return true; }
 
-bool SaxHandler::RawNumber(const char *str, SizeType length, bool copy) {
+bool TreeBuilder::RawNumber(const char *str, SizeType length, bool copy) {
 	return this->String(str, length, copy);
 }
 
-bool SaxHandler::String(const char* str, SizeType length, bool copy) {
+bool TreeBuilder::String(const char* str, SizeType length, bool copy) {
 	// copy and process
 	TreeNode *parent = this->stack.top();
 	char *value = NULL;
@@ -91,7 +91,7 @@ bool SaxHandler::String(const char* str, SizeType length, bool copy) {
 	return true;
 }
 
-bool SaxHandler::StartObject() {
+bool TreeBuilder::StartObject() {
 	TreeNode *parent;
 	if (this->stack.empty()) {
 		parent = new TreeNode;
@@ -125,7 +125,7 @@ bool SaxHandler::StartObject() {
 	return true;
 }
 
-bool SaxHandler::EndObject(SizeType memberCount) {
+bool TreeBuilder::EndObject(SizeType memberCount) {
 	if (!this->stack.empty()) {
 		TreeNode *node = this->stack.top();
 		this->stack.pop();
@@ -134,14 +134,14 @@ bool SaxHandler::EndObject(SizeType memberCount) {
 	return true;
 }
 
-bool SaxHandler::Key(const char* str, SizeType length, bool copy) {
+bool TreeBuilder::Key(const char* str, SizeType length, bool copy) {
 	this->lastKey = new char[length + 1];
 	strncpy(this->lastKey, str, length);
 	this->lastKey[length] = '\0';
 	return true;
 }
 
-bool SaxHandler::StartArray() {
+bool TreeBuilder::StartArray() {
 	TreeNode *parent;
 	if (this->stack.empty()) {
 		parent = new TreeNode;
@@ -174,7 +174,7 @@ bool SaxHandler::StartArray() {
 	return true;
 }
 
-bool SaxHandler::EndArray(SizeType elementCount) {
+bool TreeBuilder::EndArray(SizeType elementCount) {
 	if (!this->stack.empty()) {
 		TreeNode *node = this->stack.top();
 		this->stack.pop();
@@ -183,14 +183,14 @@ bool SaxHandler::EndArray(SizeType elementCount) {
 	return true;
 }
 
-SaxHandler::SaxHandler(JSONDialog *dlg, HTREEITEM treeRoot) {
+TreeBuilder::TreeBuilder(JSONDialog *dlg, HTREEITEM treeRoot) {
 	this->dlg = dlg;
 	this->lastKey = NULL;
 	this->treeRoot = treeRoot;
 }
 
 
-SaxHandler::~SaxHandler()
+TreeBuilder::~TreeBuilder()
 {
 }
 

NppJSONViewer/SaxHandler.h NppJSONViewer/TreeBuilder.hNppJSONViewer/SaxHandler.h renamed to NppJSONViewer/TreeBuilder.h

@@ -15,15 +15,15 @@ struct TreeNode {
 };
 
 
-class SaxHandler : public BaseReaderHandler<UTF8<>, SaxHandler>
+class TreeBuilder : public BaseReaderHandler<UTF8<>, TreeBuilder>
 {
 	JSONDialog *dlg;
 	std::stack<TreeNode*> stack;
 	HTREEITEM treeRoot;
 	char *lastKey;
 public:
-	SaxHandler(JSONDialog *dlg, HTREEITEM treeRoot);
-	~SaxHandler();
+	TreeBuilder(JSONDialog *dlg, HTREEITEM treeRoot);
+	~TreeBuilder();
 
 	bool Null();
 	bool Bool(bool b);