From f3bbb463529b06de6ba0093b65d948d875bec6a2 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 20 Mar 2018 17:04:22 +0100 Subject: [PATCH 1/1] Adapt to changes in Connect --- org.argeo.suite.apps/META-INF/spring/osgi.xml | 2 +- .../META-INF/spring/workbench-services.xml | 2 +- org.argeo.suite.workbench.rap/META-INF/spring/osgi.xml | 2 +- .../internal/EntitySingleColumnLabelProvider.java | 2 +- .../suite/workbench/parts/AbstractSuiteDashboard.java | 8 ++++---- .../suite/workbench/parts/DefaultDashboardEditor.java | 6 +++--- .../org/argeo/suite/workbench/parts/QuickSearchView.java | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/org.argeo.suite.apps/META-INF/spring/osgi.xml b/org.argeo.suite.apps/META-INF/spring/osgi.xml index 72c463b..de5e38e 100644 --- a/org.argeo.suite.apps/META-INF/spring/osgi.xml +++ b/org.argeo.suite.apps/META-INF/spring/osgi.xml @@ -31,6 +31,6 @@ + interface="org.argeo.connect.ui.SystemWorkbenchService" /> diff --git a/org.argeo.suite.apps/META-INF/spring/workbench-services.xml b/org.argeo.suite.apps/META-INF/spring/workbench-services.xml index 054a601..a9ce94d 100644 --- a/org.argeo.suite.apps/META-INF/spring/workbench-services.xml +++ b/org.argeo.suite.apps/META-INF/spring/workbench-services.xml @@ -35,7 +35,7 @@ + class="org.argeo.connect.ui.DefaultSystemWorkbenchService"> diff --git a/org.argeo.suite.workbench.rap/META-INF/spring/osgi.xml b/org.argeo.suite.workbench.rap/META-INF/spring/osgi.xml index 4dd9d0c..8f2cd1b 100644 --- a/org.argeo.suite.workbench.rap/META-INF/spring/osgi.xml +++ b/org.argeo.suite.workbench.rap/META-INF/spring/osgi.xml @@ -17,6 +17,6 @@ + interface="org.argeo.connect.ui.SystemWorkbenchService" /> 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 5a557cc..42cd4e3 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 @@ -10,9 +10,9 @@ import org.argeo.activities.ActivitiesTypes; import org.argeo.activities.ui.ActivityListLabelProvider; import org.argeo.connect.resources.ResourcesService; import org.argeo.connect.ui.ConnectUiConstants; +import org.argeo.connect.ui.SystemWorkbenchService; import org.argeo.connect.ui.util.TagLabelProvider; import org.argeo.connect.util.ConnectUtils; -import org.argeo.connect.workbench.SystemWorkbenchService; import org.argeo.people.PeopleException; import org.argeo.people.PeopleNames; import org.argeo.people.PeopleService; 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 7e0c4a6..29c5672 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 @@ -11,11 +11,11 @@ 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; -import org.argeo.connect.workbench.AppWorkbenchService; -import org.argeo.connect.workbench.SystemWorkbenchService; -import org.argeo.connect.workbench.commands.OpenEntityEditor; import org.argeo.connect.workbench.util.EntityEditorInput; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.jcr.JcrUtils; @@ -116,7 +116,7 @@ public abstract class AbstractSuiteDashboard extends EditorPart { @Override public void widgetSelected(final SelectionEvent event) { Map params = new HashMap(); - params.put(OpenEntityEditor.PARAM_JCR_ID, ConnectJcrUtils.getIdentifier(entity)); + params.put(ConnectEditor.PARAM_JCR_ID, ConnectJcrUtils.getIdentifier(entity)); CommandUtils.callCommand(peopleUiService.getOpenEntityEditorCmdId(), params); } }); 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 d24ad97..d55b5bf 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 @@ -19,10 +19,10 @@ 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.Refreshable; import org.argeo.connect.util.ConnectJcrUtils; import org.argeo.connect.workbench.ConnectWorkbenchUtils; -import org.argeo.connect.workbench.Refreshable; -import org.argeo.connect.workbench.commands.OpenEntityEditor; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.jcr.JcrUtils; import org.argeo.node.NodeUtils; @@ -398,7 +398,7 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re @Override public void widgetSelected(final SelectionEvent event) { CommandUtils.callCommand(getSystemWorkbenchService().getOpenEntityEditorCmdId(), - OpenEntityEditor.PARAM_JCR_ID, ConnectJcrUtils.getIdentifier(node)); + ConnectEditor.PARAM_JCR_ID, ConnectJcrUtils.getIdentifier(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 e0afd19..284290f 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 @@ -19,12 +19,12 @@ import org.argeo.cms.util.CmsUtils; import org.argeo.connect.ConnectTypes; import org.argeo.connect.resources.ResourcesService; 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.widgets.DelayedText; import org.argeo.connect.util.ConnectJcrUtils; import org.argeo.connect.util.XPathUtils; -import org.argeo.connect.workbench.Refreshable; -import org.argeo.connect.workbench.SystemWorkbenchService; import org.argeo.connect.workbench.util.JcrViewerDClickListener; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.jcr.JcrUtils; -- 2.30.2