Move common methods to GXBaseObject.

Add a virtual ExecutePrivate to move executePrivateCatch from generated code to base class.

Author: claudiamurialdo

dotnet/src/dotnetcore/GxClasses.Web/GxClasses.Web.csproj

@@ -15,7 +15,6 @@
     <Compile Include="..\..\dotnetframework\GxClasses\Helpers\GxDynamicCall.cs" Link="Helpers\GxDynamicCall.cs" />
     <Compile Include="..\..\dotnetframework\GxClasses\Middleware\GXHttp.cs" Link="Middleware\GXHttp.cs" />
     <Compile Include="..\..\dotnetframework\GxClasses\Middleware\GXHttpServices.cs" Link="Middleware\GXHttpServices.cs" />
-    <Compile Include="..\..\dotnetframework\GxClasses\Domain\GXRuntime.cs" Link="Domain\GXRuntime.cs" />
     <Compile Include="..\..\dotnetframework\GxClasses\Services\GxRestWrapper.cs" Link="Middleware\GxRestWrapper.cs" />
     <Compile Include="..\..\dotnetframework\GxClasses\Services\ReflectionHelper.cs" Link="Helpers\ReflectionHelper.cs" />
     <Compile Include="..\..\dotnetframework\GxClasses\View\GXGridStateHandler.cs" Link="View\GXGridStateHandler.cs" />

dotnet/src/dotnetcore/GxClasses/GxClasses.csproj

@@ -41,6 +41,7 @@
     <Compile Include="..\..\dotnetframework\GxClasses\Domain\GXLDAP.cs" Link="Domain\GXLDAP.cs" />
     <Compile Include="..\..\dotnetframework\GxClasses\Domain\GxMessages.cs" Link="Domain\GxMessages.cs" />
     <Compile Include="..\..\dotnetframework\GxClasses\Domain\GxMessaging.cs" Link="Domain\GxMessaging.cs" />
+    <Compile Include="..\..\dotnetframework\GxClasses\Domain\GXRuntime.cs" Link="Domain\GXRuntime.cs" />
     <Compile Include="..\..\dotnetframework\GxClasses\Domain\GXTypeConstants.cs" Link="Domain\GXTypeConstants.cs" />
     <Compile Include="..\..\dotnetframework\GxClasses\Domain\GXUri.cs" Link="Domain\GXUri.cs" />
     <Compile Include="..\..\dotnetframework\GxClasses\Domain\GXUserInfo.cs" Link="Domain\GXUserInfo.cs" />

dotnet/src/dotnetframework/GxClasses/Model/GXBaseObject.cs

@@ -10,6 +10,7 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
+using System.Threading;
 
 namespace GeneXus.Application
 {
@@ -25,11 +26,7 @@ public class GXBaseObject
 		protected IGxContext _Context;
 		bool _isMain;
 		protected bool _isApi;
-		protected virtual void ExecutePrivate()
-		{
-
-		}
-		protected virtual void ExecuteImpl()
+		protected virtual void ExecuteEx()
 		{
 			if (GxMockProvider.Provider != null)
 			{
@@ -39,6 +36,45 @@ protected virtual void ExecuteImpl()
 			}
 			ExecutePrivate();
 		}
+		protected virtual void ExecutePrivate()
+		{
+
+		}
+		protected virtual void ExecutePrivateCatch(object stateInfo)
+		{
+			try
+			{
+				((GXBaseObject)stateInfo).ExecutePrivate();
+			}
+			catch (Exception e)
+			{
+				GXUtil.SaveToEventLog("Design", e);
+				Console.WriteLine(e.ToString());
+			}
+		}
+		protected virtual void CloseCursors()
+		{
+
+		}
+
+		protected void Submit(Action<object> executeMethod, object state)
+		{
+			ThreadUtil.Submit(PropagateCulture(new WaitCallback(executeMethod)), state);
+		}
+		protected WaitCallback PropagateCulture(WaitCallback action)
+		{
+			var currentCulture = Thread.CurrentThread.CurrentCulture;
+			GXLogging.Debug(log, "Submit PropagateCulture " + currentCulture);
+			var currentUiCulture = Thread.CurrentThread.CurrentUICulture;
+			return (x) =>
+			{
+				Thread.CurrentThread.CurrentCulture = currentCulture;
+				Thread.CurrentThread.CurrentUICulture = currentUiCulture;
+				action(x);
+			};
+		}
+
+
 		private List<GxObjectParameter> GetExecuteParameterMap()
 		{
 			ParameterInfo[] pars = GetType().GetMethod("execute").GetParameters();

dotnet/src/dotnetframework/GxClasses/Model/GXWebProcedure.cs

@@ -8,6 +8,8 @@ namespace GeneXus.Procedure
 	using System.Threading;
 	using GeneXus.Mime;
 	using GeneXus.Utils;
+	using log4net;
+	using GeneXus.Application;
 
 	public class GXWebProcedure : GXHttpHandler
 	{
@@ -35,7 +37,12 @@ public override void webExecute() { }
 		public override void initialize() { }
 		protected override void createObjects() { }
 		public override void skipLines(long nToSkip) { }
-
+		protected void SubmitImpl()
+		{
+			context.SetSubmitInitialConfig(context);
+			initialize();
+			Submit(ExecutePrivateCatch, this);
+		}
 		public override void cleanup()
 		{
 			if (!context.WillRedirect() && context.IsLocalStorageSupported())
@@ -220,14 +227,5 @@ protected void GxDrawDynamicBitMap(int printBlock, int controlId, string value,
 			reportMetadata.GxDrawBitMap(printBlock, controlId, line, value, aspectRatio);
 		}
 
-		protected static WaitCallback PropagateCulture(WaitCallback action)
-		{
-			return GXProcedure.PropagateCulture(action);
-		}
-		protected void Submit(Action<object> executeMethod, object state)
-		{
-			ThreadUtil.Submit(PropagateCulture(new WaitCallback(executeMethod)), state);
-		}
-
 	}
 }

dotnet/src/dotnetframework/GxClasses/Model/gxproc.cs

@@ -20,7 +20,6 @@ namespace GeneXus.Procedure
 
 	public abstract class GXProcedure: GXBaseObject
 	{
-		static readonly ILog log = log4net.LogManager.GetLogger(typeof(GeneXus.Procedure.GXProcedure));
 		public abstract void initialize();
 
 		protected int handle;
@@ -59,12 +58,12 @@ public GXProcedure()
 #endif
 		}
 
-		/*protected static int MainImpl(string[] args, GXProcedure instance)
+		protected int MainImpl(string[] args)
 		{
 			try
 			{
 				Config.ParseArgs(ref args);
-				return instance.ExecuteCmdLine(args);
+				return ExecuteCmdLine(args);
 			}
 			catch (Exception e)
 			{
@@ -75,47 +74,31 @@ public GXProcedure()
 		}
 		protected virtual int ExecuteCmdLine(string[] args)
 		{
+			initialize();
+			ExecutePrivate();
 			return GX.GXRuntime.ExitCode;
-		}*/
+		}
 		protected void SubmitImpl()
 		{
 			context.SetSubmitInitialConfig(context);
 			initialize();
 			Submit(ExecutePrivateCatch, this);
 		}
-		protected virtual void ExecutePrivateCatch(object stateInfo)
+
+		public override void cleanup()
 		{
-			try
+			CloseCursors();
+			if (IsMain)
 			{
-				((GXProcedure)stateInfo).ExecutePrivate();
-			}
-			catch (Exception e)
-			{
-				GXUtil.SaveToEventLog("Design", e);
-				Console.WriteLine(e.ToString());
+				context.CloseConnections();
 			}
+			ExitApp();
 		}
 		public bool DisconnectAtCleanup
 		{
 			get{ return disconnectUserAtCleanup;}
 			set{ disconnectUserAtCleanup=value;}
 		}
-		protected void Submit(Action<object> executeMethod, object state)
-		{
-			ThreadUtil.Submit(PropagateCulture(new WaitCallback(executeMethod)), state);
-		}
-		public static WaitCallback PropagateCulture(WaitCallback action)
-		{
-			var currentCulture = Thread.CurrentThread.CurrentCulture;
-			GXLogging.Debug(log, "Submit PropagateCulture " + currentCulture);
-			var currentUiCulture = Thread.CurrentThread.CurrentUICulture;
-			return (x) =>
-			{
-				Thread.CurrentThread.CurrentCulture = currentCulture;
-				Thread.CurrentThread.CurrentUICulture = currentUiCulture;
-				action(x);
-			};
-		}
 		protected void ExitApp()
 		{
 			exitApplication(BatchCursorHolder());

dotnet/src/dotnetframework/GxClasses/Reorg/GXReorg.cs

@@ -54,6 +54,10 @@ public GXReorganization()
             GxContext.isReorganization = true;
            GXLogging.Debug(log, "GXReorganization.Ctr()");
         }
+		protected virtual void ExecutePrivate()
+		{
+
+		}
         public IGxContext context
         {
             get { return _Context; }
@@ -387,9 +391,14 @@ public static bool IsBadImageFormatException(Exception ex)
 			return false;
 #endif
 		}
+		protected virtual void CloseCursors()
+		{
+
+		}
+
 	}
 
-		public delegate void BlockEndCallback(string blockName, int errorCode);
+	public delegate void BlockEndCallback(string blockName, int errorCode);
 
 	public class ReorgExecute
 	{

dotnet/src/extensions/mocking/test/TestMockDBAccess/aprocmain.cs

@@ -65,7 +65,7 @@ public void execute(short aP0_clientid,
 			this.AV9Number = aP1_Number;
 			this.AV10Message = "";
 			initialize();
-			ExecuteImpl();
+			ExecuteEx();
 			aP1_Number = this.AV9Number;
 			aP2_Message = this.AV10Message;
 		}