Adapt to changes in Connect

diff --git a/org.argeo.suite.apps/META-INF/spring/osgi.xml b/org.argeo.suite.apps/META-INF/spring/osgi.xml
index 72c463b012ba7ebdc4dbb9bc5ebdebef04273128..de5e38ef135ed45e45d23fc147bc4b892302c555 100644 (file)
--- a/org.argeo.suite.apps/META-INF/spring/osgi.xml
+++ b/org.argeo.suite.apps/META-INF/spring/osgi.xml
@@ -31,6 +31,6 @@
 \r
        <!-- Assembly of the various apps workbench services -->\r
        <service ref="suiteWorkbenchService"\r
 \r
        <!-- Assembly of the various apps workbench services -->\r
        <service ref="suiteWorkbenchService"\r

-               interface="org.argeo.connect.workbench.SystemWorkbenchService" />\r
+               interface="org.argeo.connect.ui.SystemWorkbenchService" />\r

 \r
 </beans:beans>\r
 \r
 </beans:beans>\r

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 054a601d2c55e8b37e186be9a9fb1f40edfe6b67..a9ce94d8752abcce6e7948f17a1109d5ab420a67 100644 (file)
--- 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 @@
        </util:list>\r
 \r
        <bean id="suiteWorkbenchService"\r
        </util:list>\r
 \r
        <bean id="suiteWorkbenchService"\r

-               class="org.argeo.connect.workbench.DefaultSystemWorkbenchService">\r
+               class="org.argeo.connect.ui.DefaultSystemWorkbenchService">\r

                <property name="knownAppWbServices" ref="knownWbServices" />\r
                <property name="defaultEditorId"\r
                        value="org.argeo.suite.workbench.rap.defaultDashboardEditor" />\r
                <property name="knownAppWbServices" ref="knownWbServices" />\r
                <property name="defaultEditorId"\r
                        value="org.argeo.suite.workbench.rap.defaultDashboardEditor" />\r

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 4dd9d0ca2a6ca132825a8fbf7435d730d572673e..8f2cd1b867b569b5fd08b4ec6b6d5c5e021f79dc 100644 (file)
--- 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 @@
 \r
        <reference id="systemAppService" interface="org.argeo.connect.SystemAppService" />\r
        <reference id="systemWorkbenchService"\r
 \r
        <reference id="systemAppService" interface="org.argeo.connect.SystemAppService" />\r
        <reference id="systemWorkbenchService"\r

-               interface="org.argeo.connect.workbench.SystemWorkbenchService" />\r
+               interface="org.argeo.connect.ui.SystemWorkbenchService" />\r

 \r
 </beans:beans>\r
 \r
 </beans:beans>\r

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 5a557cc86cd3bf79437c350dee4194f2df0deb07..42cd4e358c77aee939e50253f75ef8b82502fc4e 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,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.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.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;
 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 7e0c4a6613924c86bde3933bee283021d54f4b64..29c5672440eeb0db04b6c6c54df4996945c6855f 100644 (file)
--- 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.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.ConnectUiStyles;

+import org.argeo.connect.ui.SystemWorkbenchService;

 import org.argeo.connect.util.ConnectJcrUtils;
 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;
 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<String, String> params = new HashMap<String, String>();
                        @Override
                        public void widgetSelected(final SelectionEvent event) {
                                Map<String, String> params = new HashMap<String, String>();

-                               params.put(OpenEntityEditor.PARAM_JCR_ID, ConnectJcrUtils.getIdentifier(entity));
+                               params.put(ConnectEditor.PARAM_JCR_ID, ConnectJcrUtils.getIdentifier(entity));

                                CommandUtils.callCommand(peopleUiService.getOpenEntityEditorCmdId(), params);
                        }
                });
                                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 d24ad972cdb6f560e78a73f4d9ec7074bc3e5f20..d55b5bf83a33043228bd68dcbb8d8f2b765395d2 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,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.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.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;
 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(),
                                @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 e0afd192921a5d29a353f214e76c86a8894da059..284290f283a1ae98d0cedee840d8252a8ac8c88b 100644 (file)
--- 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.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.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;
 import org.argeo.connect.workbench.util.JcrViewerDClickListener;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.jcr.JcrUtils;