From: Mathieu Baudier Date: Sat, 24 Mar 2018 10:30:03 +0000 (+0100) Subject: Adapt to changes in Argeo Connect X-Git-Tag: argeo-suite-2.1.13~67 X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=ec48cb7ff84de8842c146d54057e70a93040e169 Adapt to changes in Argeo Connect --- diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/internal/EntitySingleColumnLabelProvider.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/internal/EntitySingleColumnLabelProvider.java index 42cd4e3..49c39a5 100644 --- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/internal/EntitySingleColumnLabelProvider.java +++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/internal/EntitySingleColumnLabelProvider.java @@ -17,9 +17,9 @@ import org.argeo.people.PeopleException; import org.argeo.people.PeopleNames; import org.argeo.people.PeopleService; import org.argeo.people.PeopleTypes; -import org.argeo.people.workbench.rap.providers.GroupLabelProvider; -import org.argeo.people.workbench.rap.providers.OrgListLabelProvider; -import org.argeo.people.workbench.rap.providers.PersonListLabelProvider; +import org.argeo.people.ui.providers.GroupLabelProvider; +import org.argeo.people.ui.providers.OrgListLabelProvider; +import org.argeo.people.ui.providers.PersonListLabelProvider; import org.argeo.tracker.TrackerTypes; import org.argeo.tracker.ui.TrackerSingleColLP; import org.eclipse.jface.viewers.LabelProvider; diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/AbstractSuiteDashboard.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/AbstractSuiteDashboard.java index 29c5672..42a7de4 100644 --- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/AbstractSuiteDashboard.java +++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/AbstractSuiteDashboard.java @@ -1,18 +1,13 @@ package org.argeo.suite.workbench.parts; -import java.util.HashMap; -import java.util.Map; - import javax.jcr.Node; import javax.jcr.Repository; import javax.jcr.Session; -import org.argeo.cms.ui.workbench.util.CommandUtils; import org.argeo.cms.util.CmsUtils; import org.argeo.connect.SystemAppService; import org.argeo.connect.resources.ResourcesService; import org.argeo.connect.ui.AppWorkbenchService; -import org.argeo.connect.ui.ConnectEditor; import org.argeo.connect.ui.ConnectUiStyles; import org.argeo.connect.ui.SystemWorkbenchService; import org.argeo.connect.util.ConnectJcrUtils; @@ -115,9 +110,11 @@ public abstract class AbstractSuiteDashboard extends EditorPart { @Override public void widgetSelected(final SelectionEvent event) { - Map params = new HashMap(); - params.put(ConnectEditor.PARAM_JCR_ID, ConnectJcrUtils.getIdentifier(entity)); - CommandUtils.callCommand(peopleUiService.getOpenEntityEditorCmdId(), params); + // Map params = new HashMap(); + // params.put(ConnectEditor.PARAM_JCR_ID, + // ConnectJcrUtils.getIdentifier(entity)); + // CommandUtils.callCommand(peopleUiService.getOpenEntityEditorCmdId(), params); + peopleUiService.openEntityEditor(entity); } }); return link; diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java index d55b5bf..74701ba 100644 --- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java +++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java @@ -14,15 +14,13 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.activities.ActivitiesNames; import org.argeo.activities.ActivitiesService; -import org.argeo.activities.workbench.parts.TaskViewerContextMenu; +import org.argeo.activities.ui.TaskViewerContextMenu; import org.argeo.cms.auth.CurrentUser; -import org.argeo.cms.ui.workbench.util.CommandUtils; import org.argeo.cms.util.CmsUtils; import org.argeo.connect.ConnectNames; -import org.argeo.connect.ui.ConnectEditor; +import org.argeo.connect.ui.ConnectWorkbenchUtils; import org.argeo.connect.ui.Refreshable; import org.argeo.connect.util.ConnectJcrUtils; -import org.argeo.connect.workbench.ConnectWorkbenchUtils; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.jcr.JcrUtils; import org.argeo.node.NodeUtils; @@ -125,8 +123,8 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re @Override public void widgetSelected(SelectionEvent e) { String mainMixin = TrackerTypes.TRACKER_TASK; - String pathCreated = ConnectWorkbenchUtils.createAndConfigureEntity(createTaskLk.getShell(), getSession(), - getSystemAppService(), getSystemWorkbenchService(), mainMixin); + String pathCreated = ConnectWorkbenchUtils.createAndConfigureEntity(createTaskLk.getShell(), + getSession(), getSystemAppService(), getSystemWorkbenchService(), mainMixin); if (EclipseUiUtils.notEmpty(pathCreated)) forceRefresh(null); } @@ -174,7 +172,8 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re Calendar now = GregorianCalendar.getInstance(); return node.hasProperty(propName) && node.getProperty(propName).getDate().before(now); } catch (RepositoryException e) { - throw new SuiteWorkbenchException("Cannot check overdue status with property " + propName + " on " + node, e); + throw new SuiteWorkbenchException("Cannot check overdue status with property " + propName + " on " + node, + e); } } @@ -397,8 +396,9 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re @Override public void widgetSelected(final SelectionEvent event) { - CommandUtils.callCommand(getSystemWorkbenchService().getOpenEntityEditorCmdId(), - ConnectEditor.PARAM_JCR_ID, ConnectJcrUtils.getIdentifier(node)); + // CommandUtils.callCommand(getSystemWorkbenchService().getOpenEntityEditorCmdId(), + // ConnectEditor.PARAM_JCR_ID, ConnectJcrUtils.getIdentifier(node)); + getSystemWorkbenchService().openEntityEditor(node); } }); } diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/QuickSearchView.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/QuickSearchView.java index 284290f..c8ebdb2 100644 --- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/QuickSearchView.java +++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/QuickSearchView.java @@ -22,10 +22,10 @@ import org.argeo.connect.ui.ConnectUiConstants; import org.argeo.connect.ui.Refreshable; import org.argeo.connect.ui.SystemWorkbenchService; import org.argeo.connect.ui.util.BasicNodeListContentProvider; +import org.argeo.connect.ui.util.JcrViewerDClickListener; import org.argeo.connect.ui.widgets.DelayedText; import org.argeo.connect.util.ConnectJcrUtils; import org.argeo.connect.util.XPathUtils; -import org.argeo.connect.workbench.util.JcrViewerDClickListener; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.jcr.JcrUtils; import org.argeo.people.PeopleService; @@ -171,7 +171,7 @@ public class QuickSearchView extends ViewPart implements Refreshable { CmsUtils.setItemHeight(table, 26); v.setContentProvider(new BasicNodeListContentProvider()); - v.addDoubleClickListener(new JcrViewerDClickListener()); + v.addDoubleClickListener(new JcrViewerDClickListener(systemWorkbenchService)); return v; }