Support JCR node types as entity types.

[gpl/argeo-suite.git] / org.argeo.suite.ui / src / org / argeo / suite / ui / RecentItems.java

diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/RecentItems.java b/org.argeo.suite.ui/src/org/argeo/suite/ui/RecentItems.java
index e0415a0304baf8473adf5d74f0e4bd9ef3413cf3..5c6fa0de79a754a11cde4d08ee8c74ddd008f038 100644 (file)
--- a/org.argeo.suite.ui/src/org/argeo/suite/ui/RecentItems.java
+++ b/org.argeo.suite.ui/src/org/argeo/suite/ui/RecentItems.java
@@ -20,7 +20,7 @@ import org.argeo.cms.ui.CmsUiProvider;
 import org.argeo.cms.ui.CmsView;
 import org.argeo.cms.ui.util.CmsUiUtils;
 import org.argeo.eclipse.ui.EclipseUiUtils;
-import org.argeo.entity.EntityTypes;
+import org.argeo.entity.EntityType;
 import org.argeo.jcr.Jcr;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.suite.ui.widgets.DelayedText;
@@ -294,11 +294,17 @@ public class RecentItems implements CmsUiProvider {
 
                                // XPATH Query
                                String xpathQueryStr;
-                               if (entityType != null)
-                                       xpathQueryStr = entityType.contains(":") ? "//element(*, " + entityType + ")"
-                                                       : "//element(*, " + EntityTypes.ENTITY_ENTITY + ")[@entity:type='" + entityType + "']";
-                               else
-                                       xpathQueryStr = "//element(*, " + EntityTypes.ENTITY_ENTITY + ")";
+                               if (entityType != null) {
+                                       int indexColumn = entityType.indexOf(':');
+                                       if (indexColumn > 0) {// JCR node type
+                                               xpathQueryStr = "//element(*, " + entityType + ") order by @jcr:created descending";
+                                       } else {
+                                               xpathQueryStr = entityType.contains(":") ? "//element(*, " + entityType + ")"
+                                                               : "//element(*, " + EntityType.entity.get() + ")[@entity:type='" + entityType + "']";
+                                       }
+                               } else {
+                                       xpathQueryStr = "//element(*, " + EntityType.entity.get() + ")";
+                               }
 //                     String xpathQueryStr = "//element(*, " + ConnectTypes.CONNECT_ENTITY + ")";
                                String xpathFilter = XPathUtils.getFreeTextConstraint(filter);
                                if (notEmpty(xpathFilter))