removed obj_name where possible (idaholab#12960)

tophmatthews · Mar 28, 2019 · da594cc · da594cc
1 parent b218d87
commit da594cc
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/framework/src/parser/Parser.C b/framework/src/parser/Parser.C
@@ -738,24 +738,24 @@ Parser::buildJsonSyntaxTree(JsonSyntaxTree & root) const
               name = act_name.substr(0, pos - 1) + obj_name;
             else
             {
-              name = act_name.substr(0, pos - 1) + "/<type>/" + obj_name;
+              name = act_name.substr(0, pos - 1) + "/<type>/" + moose_obj->first;
               is_action_params = true;
             }
           }
           else
           {
-            name = act_name + "/<type>/" + obj_name;
+            name = act_name + "/<type>/" + moose_obj->first;
             is_type = true;
           }
 
-          moose_obj_params.set<std::string>("type") = obj_name;
+          moose_obj_params.set<std::string>("type") = moose_obj->first;
 
           auto lineinfo = _factory.getLineInfo(moose_obj->first);
           std::string classname = _factory.associatedClassName(moose_obj->first);
           root.addParameters(act_name,
                              name,
                              is_type,
-                             obj_name,
+                             moose_obj->first,
                              is_action_params,
                              &moose_obj_params,
                              lineinfo,
@@ -840,16 +840,16 @@ Parser::buildFullTree(const std::string & search_string)
               name = act_name.substr(0, pos - 1) + obj_name;
             else
             {
-              name = act_name.substr(0, pos - 1) + "/<type>/" + obj_name;
+              name = act_name.substr(0, pos - 1) + "/<type>/" + moose_obj->first;
               is_action_params = true;
             }
           }
           else
           {
-            name = act_name + "/<type>/" + obj_name;
+            name = act_name + "/<type>/" + moose_obj->first;
           }
 
-          moose_obj_params.set<std::string>("type") = obj_name;
+          moose_obj_params.set<std::string>("type") = moose_obj->first;
 
           _syntax_formatter->insertNode(
               name, moose_obj->first, is_action_params, &moose_obj_params);