import javax.jcr.query.Query;
import javax.jcr.query.QueryResult;
-import org.argeo.cms.ui.CmsTheme;
+import org.argeo.api.cms.CmsTheme;
+import org.argeo.cms.swt.CmsSwtUtils;
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;
private final static int SEARCH_TEXT_DELAY = 800;
private final static int SEARCH_DEFAULT_LIMIT = 100;
- public static enum Property {
- entityTypes;
- }
-
private CmsTheme theme;
private String entityType;
+ static enum Property {
+ entityTypes;
+ }
+
@Override
public Control createUi(Composite parent, Node context) throws RepositoryException {
- theme = CmsTheme.getCmsTheme(parent);
+ theme = CmsSwtUtils.getCmsTheme(parent);
parent.setLayout(new GridLayout());
// parent.setLayout(CmsUiUtils.noSpaceGridLayout());
parent.setLayout(new GridLayout());
return null;
SingleEntityViewer entityViewer = new SingleEntityViewer(parent, SWT.NONE, context.getSession());
entityViewer.createUi();
- entityViewer.getViewer().getTable().setLayoutData(CmsUiUtils.fillAll());
+ entityViewer.getViewer().getTable().setLayoutData(CmsSwtUtils.fillAll());
Composite bottom = new Composite(parent, SWT.NONE);
- bottom.setLayoutData(CmsUiUtils.fillWidth());
- bottom.setLayout(CmsUiUtils.noSpaceGridLayout());
+ bottom.setLayoutData(CmsSwtUtils.fillWidth());
+ bottom.setLayout(CmsSwtUtils.noSpaceGridLayout());
ToolBar bottomToolBar = new ToolBar(bottom, SWT.NONE);
bottomToolBar.setLayoutData(new GridData(SWT.END, SWT.FILL, true, false));
ToolItem deleteItem = new ToolItem(bottomToolBar, SWT.FLAT);
public void doubleClick(DoubleClickEvent event) {
Node node = (Node) entityViewer.getViewer().getStructuredSelection().getFirstElement();
if (node != null)
- CmsView.getCmsView(parent).sendEvent(SuiteEvent.openNewPart.topic(),
+ CmsSwtUtils.getCmsView(parent).sendEvent(SuiteEvent.openNewPart.topic(),
SuiteEvent.eventProperties(node));
}
public void selectionChanged(SelectionChangedEvent event) {
Node node = (Node) entityViewer.getViewer().getStructuredSelection().getFirstElement();
if (node != null) {
- CmsView.getCmsView(parent).sendEvent(SuiteEvent.refreshPart.topic(),
+ CmsSwtUtils.getCmsView(parent).sendEvent(SuiteEvent.refreshPart.topic(),
SuiteEvent.eventProperties(node));
deleteItem.setEnabled(true);
} else {
// 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))