Merge pull request #62 from mendix/dat/upgrade-to-10.18.0

[DAT-3993] Upgrade to 10.18.0

Author: dahfjkg

.gitignore

@@ -20,4 +20,8 @@ build
 /.dccache
 /theme-cache/
 /userlib/
+/project-settings.user.json
+/.mendix-cache/
+
+# Ignore files used for local testing
 /upgraded

Audit trail.mpr

@@ -1,6 +1,6 @@
 plugins {
     id 'java'
-    id 'com.mendix.gradle.publish-module-plugin' version '1.13'
+    id 'com.mendix.gradle.publish-module-plugin' version '1.15'
     id 'net.researchgate.release' version '2.8.1'
 }
 
@@ -14,6 +14,7 @@ mxMarketplace {
     moduleLicense = "Apache V2"
     appNumber     = 138
     appName       = "Audittrail"
+    filterWidgets = true
     appDirectory      = "."
     versionPathPrefix = "__Version " // the path prefix within the module to the version folder
 }

build.gradle

@@ -2,7 +2,7 @@ def mxPathDefault = (System.getProperty('os.name').startsWith('Windows'))
         ? "${System.getenv('PROGRAMFILES')}/Mendix"
         : "${System.getenv('HOME')}/.mendix"
 def mxPath = System.getenv('MX_INSTALL_PATH') ?: System.getProperty('MX_INSTALL_PATH') ?: mxPathDefault
-def mxInstallVersion = System.getenv('MODELER_VERSION') ?: System.getenv('MX_INSTALL_VERSION') ?: System.getProperty('MX_INSTALL_VERSION') ?: '9.18.4.62522'
+def mxInstallVersion = System.getenv('MODELER_VERSION') ?: System.getenv('MX_INSTALL_VERSION') ?: System.getProperty('MX_INSTALL_VERSION') ?: '10.18.0.54340'
 
 project.ext.mxInstallPath = "${mxPath}/${mxInstallVersion}"
 project.ext.mxRuntimeBundles = new File("${mxInstallPath}/runtime/bundles")

environment.gradle

@@ -1 +1 @@
-version=9.1.5
+version=10.0.0

gradle.properties

@@ -24,12 +24,15 @@
  */
 public class CreateLogRecordChangesBeforeDelete extends CustomJavaAction<IMendixObject>
 {
-	private IMendixObject AuditableObject;
+	private final IMendixObject AuditableObject;
 
-	public CreateLogRecordChangesBeforeDelete(IContext context, IMendixObject AuditableObject)
+	public CreateLogRecordChangesBeforeDelete(
+		IContext context,
+		IMendixObject _auditableObject
+	)
 	{
 		super(context);
-		this.AuditableObject = AuditableObject;
+		this.AuditableObject = _auditableObject;
 	}
 
 	@java.lang.Override

javasource/audittrail/actions/CreateLogRecordChangesBeforeDelete.java

@@ -28,12 +28,15 @@
  */
 public class CreateLogRecordOfObject extends CustomJavaAction<IMendixObject>
 {
-	private IMendixObject AuditableObject;
+	private final IMendixObject AuditableObject;
 
-	public CreateLogRecordOfObject(IContext context, IMendixObject AuditableObject)
+	public CreateLogRecordOfObject(
+		IContext context,
+		IMendixObject _auditableObject
+	)
 	{
 		super(context);
-		this.AuditableObject = AuditableObject;
+		this.AuditableObject = _auditableObject;
 	}
 
 	@java.lang.Override

javasource/audittrail/actions/CreateLogRecordOfObject.java

@@ -17,14 +17,18 @@
 
 public class GetDiff extends CustomJavaAction<java.lang.String>
 {
-	private java.lang.String OldText;
-	private java.lang.String NewText;
+	private final java.lang.String OldText;
+	private final java.lang.String NewText;
 
-	public GetDiff(IContext context, java.lang.String OldText, java.lang.String NewText)
+	public GetDiff(
+		IContext context,
+		java.lang.String _oldText,
+		java.lang.String _newText
+	)
 	{
 		super(context);
-		this.OldText = OldText;
-		this.NewText = NewText;
+		this.OldText = _oldText;
+		this.NewText = _newText;
 	}
 
 	@java.lang.Override

javasource/audittrail/actions/GetDiff.java

@@ -6,7 +6,6 @@ public class UserActionsRegistrar
 {
   public void registerActions(IActionRegistrator registrator)
   {
-    registrator.bundleComponentLoaded();
     registrator.registerUserAction(audittrail.actions.CreateLogRecordChangesBeforeDelete.class);
     registrator.registerUserAction(audittrail.actions.CreateLogRecordOfObject.class);
     registrator.registerUserAction(audittrail.actions.GetDiff.class);

javasource/system/UserActionsRegistrar.java

@@ -19,14 +19,18 @@
  */
 public class VerifyPassword extends CustomJavaAction<java.lang.Boolean>
 {
-	private java.lang.String userName;
-	private java.lang.String password;
+	private final java.lang.String userName;
+	private final java.lang.String password;
 
-	public VerifyPassword(IContext context, java.lang.String userName, java.lang.String password)
+	public VerifyPassword(
+		IContext context,
+		java.lang.String _userName,
+		java.lang.String _password
+	)
 	{
 		super(context);
-		this.userName = userName;
-		this.password = password;
+		this.userName = _userName;
+		this.password = _password;
 	}
 
 	@java.lang.Override