From f29206b576a5fbc9715e89377ed8f7c04f623ef1 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 15 Mar 2018 18:53:32 +0100
Subject: [PATCH] Adapt to changes in Connect

---
 org.argeo.suite.workbench.rap/plugin.xml                      | 4 ++--
 .../workbench/internal/EntitySingleColumnLabelProvider.java   | 4 ++--
 .../argeo/suite/workbench/parts/DefaultDashboardEditor.java   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/org.argeo.suite.workbench.rap/plugin.xml b/org.argeo.suite.workbench.rap/plugin.xml
index a75a9a6..981c361 100644
--- a/org.argeo.suite.workbench.rap/plugin.xml
+++ b/org.argeo.suite.workbench.rap/plugin.xml
@@ -19,7 +19,7 @@
 			class="org.argeo.eclipse.spring.SpringExtensionFactory"
 			id="org.argeo.suite.workbench.rap.quickSearchView"
 			name="%search"
-      		icon="platform:/plugin/org.argeo.connect.ui.workbench/icons/actions/search.png"
+      		icon="platform:/plugin/org.argeo.cms.ui.theme/icons/actions/search.png"
 			restorable="false">
 		</view>
 		
@@ -31,7 +31,7 @@
 		<editor
 			id="org.argeo.suite.workbench.rap.defaultDashboardEditor"
 			class="org.argeo.eclipse.spring.SpringExtensionFactory"
-      		icon="platform:/plugin/org.argeo.connect.ui.workbench//icons/types/dashboard.png"
+      		icon="platform:/plugin/org.argeo.cms.ui.theme/icons/types/dashboard.png"
 			name="Dashboard">
 		</editor>
 	</extension>
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 29d10cc..5a557cc 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,8 +10,8 @@ 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.ConnectUiUtils;
 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;
@@ -74,7 +74,7 @@ public class EntitySingleColumnLabelProvider extends LabelProvider implements Pe
 				result = entity.getProperty(Property.JCR_TITLE).getString();
 			else
 				result = "";
-			return ConnectUiUtils.replaceAmpersand(result);
+			return ConnectUtils.replaceAmpersand(result);
 		} catch (RepositoryException re) {
 			throw new PeopleException("Unable to get formatted value for node", re);
 		}
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 5156f1c..d24ad97 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,8 +19,8 @@ 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.ConnectUiUtils;
 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;
@@ -125,7 +125,7 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					String mainMixin = TrackerTypes.TRACKER_TASK;
-					String pathCreated = ConnectUiUtils.createAndConfigureEntity(createTaskLk.getShell(), getSession(),
+					String pathCreated = ConnectWorkbenchUtils.createAndConfigureEntity(createTaskLk.getShell(), getSession(),
 							getSystemAppService(), getSystemWorkbenchService(), mainMixin);
 					if (EclipseUiUtils.notEmpty(pathCreated))
 						forceRefresh(null);
-- 
2.30.2