update stork and examples to new registration funcs

A few straggler changes missed by idaholab#12161
rwcarlsen · Sep 27, 2018 · 460e6f3 · 460e6f3
1 parent 4966335
commit 460e6f3
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 119 deletions.
diff --git a/stork/include/base/StorkApp.h b/stork/include/base/StorkApp.h
@@ -23,11 +23,7 @@ class StorkApp : public MooseApp
   virtual ~StorkApp();
 
   static void registerApps();
-  static void registerObjects(Factory & factory);
-  static void registerObjectDepends(Factory & factory);
-  static void associateSyntax(Syntax & syntax, ActionFactory & action_factory);
-  static void associateSyntaxDepends(Syntax & syntax, ActionFactory & action_factory);
-  static void registerExecFlags(Factory & factory);
+  static void registerAll(Factory & f, ActionFactory & af, Syntax & s);
 };
 
 #endif /* STORKAPP_H */
diff --git a/stork/src/base/StorkApp.C.app b/stork/src/base/StorkApp.C.app
@@ -14,80 +14,37 @@ validParams<StorkApp>()
 
 StorkApp::StorkApp(InputParameters parameters) : MooseApp(parameters)
 {
-  Moose::registerObjects(_factory);
-  ModulesApp::registerObjects(_factory);
-  StorkApp::registerObjects(_factory);
-
-  Moose::associateSyntax(_syntax, _action_factory);
-  ModulesApp::associateSyntax(_syntax, _action_factory);
-  StorkApp::associateSyntax(_syntax, _action_factory);
-
-  Moose::registerExecFlags(_factory);
-  ModulesApp::registerExecFlags(_factory);
-  StorkApp::registerExecFlags(_factory);
+  StorkApp::registerAll(_factory, _action_factory, _syntax);
 }
 
 StorkApp::~StorkApp() {}
 
 void
-StorkApp::registerApps()
-{
-  registerApp(StorkApp);
-}
-
-void
-StorkApp::registerObjects(Factory & factory)
-{
-    Registry::registerObjectsTo(factory, {"StorkApp"});
-}
-
-void
-StorkApp::associateSyntax(Syntax & /*syntax*/, ActionFactory & action_factory)
+StorkApp::registerAll(Factory & f, ActionFactory & af, Syntax & s)
 {
-  Registry::registerActionsTo(action_factory, {"StorkApp"});
+  ModulesApp::registerAll(f, af, s);
+  Registry::registerObjectsTo(f, {"StorkApp"});
+  Registry::registerActionsTo(af, {"StorkApp"});
 
-  /* Uncomment Syntax parameter and register your new production objects here! */
+  /* register custom execute flags, action syntax, etc. here */
 }
 
 void
-StorkApp::registerObjectDepends(Factory & /*factory*/)
-{
-}
-
-void
-StorkApp::associateSyntaxDepends(Syntax & /*syntax*/, ActionFactory & /*action_factory*/)
-{
-}
-
-void
-StorkApp::registerExecFlags(Factory & /*factory*/)
+StorkApp::registerApps()
 {
-  /* Uncomment Factory parameter and register your new execution flags here! */
+  registerApp(StorkApp);
 }
 
 /***************************************************************************************************
  *********************** Dynamic Library Entry Points - DO NOT MODIFY ******************************
  **************************************************************************************************/
 extern "C" void
-StorkApp__registerApps()
+StorkApp__registerAll(Factory & f, ActionFactory & af, Syntax & s)
 {
-  StorkApp::registerApps();
+  StorkApp::registerAll(f, af, s);
 }
-
 extern "C" void
-StorkApp__registerObjects(Factory & factory)
-{
-  StorkApp::registerObjects(factory);
-}
-
-extern "C" void
-StorkApp__associateSyntax(Syntax & syntax, ActionFactory & action_factory)
-{
-  StorkApp::associateSyntax(syntax, action_factory);
-}
-
-extern "C" void
-StorkApp__registerExecFlags(Factory & factory)
+StorkApp__registerApps()
 {
-  StorkApp::registerExecFlags(factory);
+  StorkApp::registerApps();
 }
diff --git a/stork/test/include/base/StorkTestApp.h b/stork/test/include/base/StorkTestApp.h
@@ -23,9 +23,7 @@ class StorkTestApp : public MooseApp
   virtual ~StorkTestApp();
 
   static void registerApps();
-  static void registerObjects(Factory & factory);
-  static void associateSyntax(Syntax & syntax, ActionFactory & action_factory);
-  static void registerExecFlags(Factory & factory);
+  static void registerAll(Factory & f, ActionFactory & af, Syntax & s, bool use_test_objs = false);
 };
 
 #endif /* STORKTESTAPP_H */
diff --git a/stork/test/src/base/StorkTestApp.C b/stork/test/src/base/StorkTestApp.C
@@ -23,83 +23,41 @@ validParams<StorkTestApp>()
 
 StorkTestApp::StorkTestApp(InputParameters parameters) : MooseApp(parameters)
 {
-  Moose::registerObjects(_factory);
-  ModulesApp::registerObjects(_factory);
-  StorkApp::registerObjectDepends(_factory);
-  StorkApp::registerObjects(_factory);
-
-  Moose::associateSyntax(_syntax, _action_factory);
-  ModulesApp::associateSyntax(_syntax, _action_factory);
-  StorkApp::associateSyntaxDepends(_syntax, _action_factory);
-  StorkApp::associateSyntax(_syntax, _action_factory);
+  StorkTestApp::registerAll(
+      _factory, _action_factory, _syntax, getParam<bool>("allow_test_objects"));
+}
 
-  Moose::registerExecFlags(_factory);
-  ModulesApp::registerExecFlags(_factory);
-  StorkApp::registerExecFlags(_factory);
+StorkTestApp::~StorkTestApp() {}
 
-  bool use_test_objs = getParam<bool>("allow_test_objects");
+void
+StorkTestApp::registerAll(Factory & f, ActionFactory & af, Syntax & s, bool use_test_objs)
+{
+  StorkApp::registerAll(f, af, s);
   if (use_test_objs)
   {
-    StorkTestApp::registerObjects(_factory);
-    StorkTestApp::associateSyntax(_syntax, _action_factory);
-    StorkTestApp::registerExecFlags(_factory);
+    Registry::registerObjectsTo(f, {"StorkTestApp"});
+    Registry::registerActionsTo(af, {"StorkTestApp"});
   }
 }
 
-StorkTestApp::~StorkTestApp() {}
-
 void
 StorkTestApp::registerApps()
 {
   registerApp(StorkApp);
   registerApp(StorkTestApp);
 }
 
-void
-StorkTestApp::registerObjects(Factory & /*factory*/)
-{
-  /* Uncomment Factory parameter and register your new test objects here! */
-}
-
-void
-StorkTestApp::associateSyntax(Syntax & /*syntax*/, ActionFactory & /*action_factory*/)
-{
-  /* Uncomment Syntax and ActionFactory parameters and register your new test objects here! */
-}
-
-void
-StorkTestApp::registerExecFlags(Factory & /*factory*/)
-{
-  /* Uncomment Factory parameter and register your new execute flags here! */
-}
-
 /***************************************************************************************************
  *********************** Dynamic Library Entry Points - DO NOT MODIFY ******************************
  **************************************************************************************************/
 // External entry point for dynamic application loading
 extern "C" void
-StorkTestApp__registerApps()
-{
-  StorkTestApp::registerApps();
-}
-
-// External entry point for dynamic object registration
-extern "C" void
-StorkTestApp__registerObjects(Factory & factory)
-{
-  StorkTestApp::registerObjects(factory);
-}
-
-// External entry point for dynamic syntax association
-extern "C" void
-StorkTestApp__associateSyntax(Syntax & syntax, ActionFactory & action_factory)
+StorkTestApp__registerAll(Factory & f, ActionFactory & af, Syntax & s)
 {
-  StorkTestApp::associateSyntax(syntax, action_factory);
+  StorkTestApp::registerAll(f, af, s);
 }
-
-// External entry point for dynamic execute flag loading
 extern "C" void
-StorkTestApp__registerExecFlags(Factory & factory)
+StorkTestApp__registerApps()
 {
-  StorkTestApp::registerExecFlags(factory);
+  StorkTestApp::registerApps();
 }