Adapt to changes in Connect

diff --git a/org.argeo.suite.workbench.rap/plugin.xml b/org.argeo.suite.workbench.rap/plugin.xml
index a75a9a66e46fb6d6a1be745187b13aa5da762126..981c361cf8d19f5cd3a75569c86cde17b4ccb562 100644 (file)
--- 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 29d10cc2e0ee3cf14e9d4e294d338b973a0b3bb0..5a557cc86cd3bf79437c350dee4194f2df0deb07 100644 (file)
--- 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 5156f1c5fdc2062086cfedfc604a2f1ec940e388..d24ad972cdb6f560e78a73f4d9ec7074bc3e5f20 100644 (file)
--- 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);