Fix Eclipse 3 build

[gpl/argeo-suite.git] / org.argeo.suite.workbench.rap / src / org / argeo / suite / workbench / parts / DefaultDashboardEditor.java

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 535dc7c60cc97898a792edc6c554b5fec3f7462b..3ad7dfa630395b338cd420c06aa541fe2614bc77 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
@@ -14,20 +14,18 @@ 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.ConnectUiUtils;
+import org.argeo.connect.ui.ConnectWorkbenchUtils;
+import org.argeo.connect.ui.Refreshable;
 import org.argeo.connect.util.ConnectJcrUtils;
-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.suite.workbench.SuiteWorkbenchException;
 import org.argeo.suite.workbench.AsUiPlugin;
+import org.argeo.suite.workbench.SuiteWorkbenchException;
 import org.argeo.tracker.TrackerNames;
 import org.argeo.tracker.TrackerService;
 import org.argeo.tracker.TrackerTypes;
@@ -52,6 +50,9 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Link;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.PartInitException;
 
 /** Argeo Suite Default Dashboard */
 public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Refreshable {
@@ -67,6 +68,11 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
        private Composite taskListCmp;
        private TaskVirtualListComposite tvlc;
 
+       @Override
+       public void init(IEditorSite site, IEditorInput input) throws PartInitException {
+               super.init(site, input);
+       }
+
        @Override
        public void createPartControl(Composite parent) {
                super.createPartControl(parent);
@@ -117,23 +123,21 @@ 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(),
-                                                       getSystemAppService(), getSystemWorkbenchService(), mainMixin);
+                                       String pathCreated = ConnectWorkbenchUtils.createAndConfigureEntity(createTaskLk.getShell(),
+                                                       getSession(), getSystemAppService(), getSystemWorkbenchService(), mainMixin);
                                        if (EclipseUiUtils.notEmpty(pathCreated))
                                                forceRefresh(null);
                                }
                        });
 
                } else {
-                       TaskListLabelProvider labelProvider = new TaskListLabelProvider(trackerService);
+                       TaskListLabelProvider labelProvider = new TaskListLabelProvider(getSystemAppService());
                        tvlc = new TaskVirtualListComposite(parent, SWT.NO_FOCUS, labelProvider, 54);
                        tvlc.setLayoutData(EclipseUiUtils.fillAll());
                        final TableViewer viewer = tvlc.getTableViewer();
                        viewer.setInput(JcrUtils.nodeIteratorToList(nit).toArray());
                        final TaskViewerContextMenu contextMenu = new TaskViewerContextMenu(viewer, getSession(),
                                        activitiesService) {
-                               private static final long serialVersionUID = 1640863021424194303L;
-
                                @Override
                                public boolean performAction(String actionId) {
                                        boolean hasChanged = super.performAction(actionId);
@@ -168,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);
                }
        }
 
@@ -391,8 +396,9 @@ 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));
+                                       // CommandUtils.callCommand(getSystemWorkbenchService().getOpenEntityEditorCmdId(),
+                                       // ConnectEditor.PARAM_JCR_ID, ConnectJcrUtils.getIdentifier(node));
+                                       getSystemWorkbenchService().openEntityEditor(node);
                                }
                        });
                }