Preparing for Mendix 9

mendix · Dec 21, 2020 · 451be35 · 451be35
2 parents 70c18ca + 87f0649
commit 451be35
Show file tree

Hide file tree

Showing 250 changed files with 31,387 additions and 925 deletions.
diff --git a/src/AuditTrailModule/Audit trail.mpr b/src/AuditTrailModule/Audit trail.mpr
diff --git a/src/AuditTrailModule/javasource/audittrail/actions/CreateLogRecordChangesBeforeDelete.java b/src/AuditTrailModule/javasource/audittrail/actions/CreateLogRecordChangesBeforeDelete.java
@@ -1,4 +1,4 @@
-// This file was generated by Mendix Modeler.
+// This file was generated by Mendix Studio Pro.
 //
 // WARNING: Only the following code will be retained when actions are regenerated:
 // - the import list

diff --git a/src/AuditTrailModule/javasource/audittrail/actions/CreateLogRecordOfObject.java b/src/AuditTrailModule/javasource/audittrail/actions/CreateLogRecordOfObject.java
@@ -1,4 +1,4 @@
-// This file was generated by Mendix Modeler.
+// This file was generated by Mendix Studio Pro.
 //
 // WARNING: Only the following code will be retained when actions are regenerated:
 // - the import list

diff --git a/src/AuditTrailModule/javasource/audittrail/actions/GetDiff.java b/src/AuditTrailModule/javasource/audittrail/actions/GetDiff.java
@@ -1,4 +1,4 @@
-// This file was generated by Mendix Modeler.
+// This file was generated by Mendix Studio Pro.
 //
 // WARNING: Only the following code will be retained when actions are regenerated:
 // - the import list

diff --git a/src/AuditTrailModule/javasource/audittrail/log/CreateLogObject.java b/src/AuditTrailModule/javasource/audittrail/log/CreateLogObject.java
@@ -83,7 +83,7 @@ public static IMendixObject createAuditLogItems(final IMendixObject auditableObj
 
 		final IContext sudoContext = Core.createSystemContext();
 		final IMendixObject logObject = Core.instantiate(sudoContext, Log.getType());
-		;
+
 		IMendixIdentifier userObjectId = null;
 
 		try {
@@ -113,7 +113,7 @@ public static IMendixObject createAuditLogItems(final IMendixObject auditableObj
 			logObject.setValue(sudoContext, Log.MemberNames.Log_AudittrailSuperClass.toString(),
 					auditableObject.getId());
 		} else {
-			// Retrieve the custom created association to AuditbleObject, look it up when
+			// Retrieve the custom created association to AuditableObject, look it up when
 			// not found
 			association = getAssociationName(auditableObject.getType());
 

diff --git a/src/AuditTrailModule/javasource/objecthandling/ORM.java b/src/AuditTrailModule/javasource/objecthandling/ORM.java
@@ -5,12 +5,8 @@
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
 
 import com.mendix.core.Core;
 import com.mendix.core.CoreException;
@@ -25,7 +21,6 @@
 import com.mendix.systemwideinterfaces.core.IMendixObject.ObjectState;
 import com.mendix.systemwideinterfaces.core.IMendixObjectMember;
 import com.mendix.systemwideinterfaces.core.IMendixObjectMember.MemberState;
-import com.mendix.systemwideinterfaces.core.ISession;
 import com.mendix.systemwideinterfaces.core.meta.IMetaAssociation;
 import com.mendix.systemwideinterfaces.core.meta.IMetaAssociation.AssociationType;
 import com.mendix.systemwideinterfaces.core.meta.IMetaEnumValue;
@@ -37,8 +32,6 @@
 public class ORM
 {
 
-
-
 	public static Long getGUID(IMendixObject item)
 	{
 		return item.getId().toLong();
@@ -180,8 +173,8 @@ private static void duplicateReverseAssociations(IContext ctx, IMendixObject src
 					throw new IllegalArgumentException("It is not possible to clone reverse referencesets: '" + fullAssocName + "'");
 				}
 
-				List<IMendixObject> objs = Core.retrieveXPathQueryEscaped(ctx, "//%s[%s='%s']", 
-				        relationParent.getName(), assocname, String.valueOf(src.getId().toLong()));
+				List<IMendixObject> objs = Core.retrieveXPathQuery(ctx, String.format("//%s[%s='%s']", 
+				        relationParent.getName(), assocname, String.valueOf(src.getId().toLong())));
 
 				for(IMendixObject obj : objs) {
 				    @SuppressWarnings("unused") // object is unused on purpose