X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=org.argeo.suite.ui%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fui%2FRecentItems.java;h=b9aa5b721784ecc309dcd943ff2a495d4eb94fe8;hp=09480ba5a226096d1e145665a1f21755cba8b9a6;hb=921e69ca45d5e257429c019b984428a59f891487;hpb=d16d512082582d231d1cccc2b035fb41831f571b 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 09480ba..b9aa5b7 100644 --- a/org.argeo.suite.ui/src/org/argeo/suite/ui/RecentItems.java +++ b/org.argeo.suite.ui/src/org/argeo/suite/ui/RecentItems.java @@ -2,6 +2,7 @@ package org.argeo.suite.ui; import static org.argeo.eclipse.ui.EclipseUiUtils.notEmpty; +import java.util.List; import java.util.Map; import javax.jcr.Node; @@ -14,19 +15,16 @@ import javax.jcr.observation.EventListener; import javax.jcr.query.Query; import javax.jcr.query.QueryResult; -import org.argeo.api.NodeConstants; import org.argeo.cms.ui.CmsTheme; import org.argeo.cms.ui.CmsUiProvider; import org.argeo.cms.ui.CmsView; import org.argeo.cms.ui.util.CmsUiUtils; -import org.argeo.connect.ui.ConnectUiConstants; -import org.argeo.connect.ui.util.BasicNodeListContentProvider; -import org.argeo.connect.ui.widgets.DelayedText; -import org.argeo.connect.util.XPathUtils; 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; +import org.argeo.suite.util.XPathUtils; import org.eclipse.jface.layout.TableColumnLayout; import org.eclipse.jface.viewers.ColumnLabelProvider; import org.eclipse.jface.viewers.ColumnWeightData; @@ -34,8 +32,10 @@ import org.eclipse.jface.viewers.DoubleClickEvent; import org.eclipse.jface.viewers.IDoubleClickListener; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ISelectionChangedListener; +import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.TableViewer; +import org.eclipse.jface.viewers.Viewer; import org.eclipse.swt.SWT; import org.eclipse.swt.events.KeyEvent; import org.eclipse.swt.events.KeyListener; @@ -45,7 +45,6 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.Text; @@ -54,29 +53,37 @@ import org.eclipse.swt.widgets.ToolItem; /** List recent items. */ public class RecentItems implements CmsUiProvider { -// private final static int SEARCH_TEXT_DELAY = 800; + private final static int SEARCH_TEXT_DELAY = 800; + private final static int SEARCH_DEFAULT_LIMIT = 100; + private CmsTheme theme; private String entityType; + static enum Property { + entityTypes; + } + @Override public Control createUi(Composite parent, Node context) throws RepositoryException { theme = CmsTheme.getCmsTheme(parent); parent.setLayout(new GridLayout()); +// parent.setLayout(CmsUiUtils.noSpaceGridLayout()); + parent.setLayout(new GridLayout()); - Composite top = new Composite(parent, SWT.NONE); - CmsUiUtils.style(top, SuiteStyle.recentItems); - top.setLayoutData(CmsUiUtils.fillWidth()); - top.setLayout(CmsUiUtils.noSpaceGridLayout(2)); - Label lbl = new Label(top, SWT.NONE); - lbl.setLayoutData(CmsUiUtils.fillAll()); - lbl.setText(SuiteMsg.recentItems.lead()); - CmsUiUtils.style(lbl, SuiteStyle.recentItems); - - ToolBar topToolBar = new ToolBar(top, SWT.NONE); - ToolItem addItem = new ToolItem(topToolBar, SWT.FLAT); -// CmsUiUtils.style(addItem, SuiteStyle.recentItems); - addItem.setImage(SuiteIcon.add.getSmallIcon(theme)); +// Composite top = new Composite(parent, SWT.BORDER); +// CmsUiUtils.style(top, SuiteStyle.recentItems); +// top.setLayoutData(CmsUiUtils.fillWidth()); +// top.setLayout(CmsUiUtils.noSpaceGridLayout(2)); +// Label lbl = new Label(top, SWT.FLAT); +// lbl.setLayoutData(CmsUiUtils.fillWidth()); +// lbl.setText(SuiteMsg.recentItems.lead()); +// CmsUiUtils.style(lbl, SuiteStyle.recentItems); +// +// ToolBar topToolBar = new ToolBar(top, SWT.NONE); +// ToolItem addItem = new ToolItem(topToolBar, SWT.FLAT); +//// CmsUiUtils.style(addItem, SuiteStyle.recentItems); +// addItem.setImage(SuiteIcon.add.getSmallIcon(theme)); if (context == null) return null; @@ -93,15 +100,16 @@ public class RecentItems implements CmsUiProvider { deleteItem.setEnabled(false); // CmsUiUtils.style(deleteItem, SuiteStyle.recentItems); deleteItem.setImage(SuiteIcon.delete.getSmallIcon(theme)); - + ToolItem addItem = new ToolItem(bottomToolBar, SWT.FLAT); + addItem.setImage(SuiteIcon.add.getSmallIcon(theme)); entityViewer.getViewer().addDoubleClickListener(new IDoubleClickListener() { @Override public void doubleClick(DoubleClickEvent event) { Node node = (Node) entityViewer.getViewer().getStructuredSelection().getFirstElement(); if (node != null) - CmsView.getCmsView(parent).sendEvent(SuiteEvent.openNewPart.topic(), SuiteEvent.NODE_ID, - Jcr.getIdentifier(node)); + CmsView.getCmsView(parent).sendEvent(SuiteEvent.openNewPart.topic(), + SuiteEvent.eventProperties(node)); } }); @@ -109,8 +117,8 @@ public class RecentItems implements CmsUiProvider { public void selectionChanged(SelectionChangedEvent event) { Node node = (Node) entityViewer.getViewer().getStructuredSelection().getFirstElement(); if (node != null) { - CmsView.getCmsView(parent).sendEvent(SuiteEvent.refreshPart.topic(), SuiteEvent.NODE_ID, - Jcr.getIdentifier(node)); + CmsView.getCmsView(parent).sendEvent(SuiteEvent.refreshPart.topic(), + SuiteEvent.eventProperties(node)); deleteItem.setEnabled(true); } else { deleteItem.setEnabled(false); @@ -123,7 +131,8 @@ public class RecentItems implements CmsUiProvider { } public void init(Map properties) { - entityType = properties.get(NodeConstants.DATA_TYPE); + // TODO manage multiple entities + entityType = properties.get(Property.entityTypes.name()); } class SingleEntityViewer { @@ -164,7 +173,7 @@ public class RecentItems implements CmsUiProvider { // Use a delayed text: the query won't be done until the user stop // typing for 800ms int style = SWT.BORDER | SWT.SEARCH | SWT.ICON_CANCEL; - DelayedText delayedText = new DelayedText(parent, style, ConnectUiConstants.SEARCH_TEXT_DELAY); + DelayedText delayedText = new DelayedText(parent, style, SEARCH_TEXT_DELAY); filterTxt = delayedText.getText(); filterTxt.setLayoutData(EclipseUiUtils.fillWidth()); @@ -212,7 +221,8 @@ public class RecentItems implements CmsUiProvider { } protected TableViewer createListPart(Composite parent, ILabelProvider labelProvider) { - parent.setLayout(new GridLayout()); +// parent.setLayout(new GridLayout()); +// parent.setLayout(CmsUiUtils.noSpaceGridLayout()); Composite tableComposite = new Composite(parent, SWT.NONE); GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_VERTICAL @@ -257,8 +267,8 @@ public class RecentItems implements CmsUiProvider { // }); table.setLinesVisible(true); table.setHeaderVisible(false); - CmsUiUtils.markup(table); - CmsUiUtils.setItemHeight(table, 26); + // CmsUiUtils.markup(table); + // CmsUiUtils.setItemHeight(table, 26); viewer.setContentProvider(new BasicNodeListContentProvider()); return viewer; @@ -284,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)) @@ -298,7 +314,7 @@ public class RecentItems implements CmsUiProvider { // session.refresh(false); Query xpathQuery = XPathUtils.createQuery(session, xpathQueryStr); - xpathQuery.setLimit(ConnectUiConstants.SEARCH_DEFAULT_LIMIT); + xpathQuery.setLimit(SEARCH_DEFAULT_LIMIT); QueryResult result = xpathQuery.execute(); NodeIterator nit = result.getNodes(); @@ -326,5 +342,25 @@ public class RecentItems implements CmsUiProvider { } } + + class BasicNodeListContentProvider implements IStructuredContentProvider { + private static final long serialVersionUID = 1L; + // keep a cache of the Nodes in the content provider to be able to + // manage long request + private List nodes; + + public void dispose() { + } + + /** Expects a list of nodes as a new input */ + @SuppressWarnings("unchecked") + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + nodes = (List) newInput; + } + + public Object[] getElements(Object arg0) { + return nodes.toArray(); + } + } } }