X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=org.argeo.suite.workbench.rap%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fworkbench%2Fparts%2FAbstractSuiteDashboard.java;h=42a7de4c4b88c4ed8e26d7457b6a862fb8d83fad;hp=6ca460eb55be19fbdb930c520cad702195de9317;hb=ec48cb7ff84de8842c146d54057e70a93040e169;hpb=ce27112f9bc01fc37b1121496f3ad1eb7593d7eb

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 6ca460e..42a7de4 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
@@ -1,21 +1,16 @@
 package org.argeo.suite.workbench.parts;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import javax.jcr.Node;
 import javax.jcr.Repository;
 import javax.jcr.Session;
 
-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.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;
@@ -23,7 +18,6 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
@@ -47,7 +41,6 @@ public abstract class AbstractSuiteDashboard extends EditorPart {
 	private Session session;
 
 	// UI Objects
-	private Image logoImg;
 	private FormToolkit toolkit;
 
 	@Override
@@ -56,7 +49,6 @@ public abstract class AbstractSuiteDashboard extends EditorPart {
 		setInput(input);
 
 		session = ConnectJcrUtils.login(repository);
-		// initialiseImg();
 		updateTooltip(input);
 	}
 
@@ -67,26 +59,6 @@ public abstract class AbstractSuiteDashboard extends EditorPart {
 		}
 	}
 
-	// private void initialiseImg() {
-	// InputStream is = null;
-	// try {
-	// String imgPath = peopleService.getInstanceConfPath() + "/"
-	// + AoNames.AO_DEFAULT_LOGO;
-	// if (session.nodeExists(imgPath)) {
-	// Node imageNode = session.getNode(imgPath).getNode(
-	// Node.JCR_CONTENT);
-	// is = imageNode.getProperty(Property.JCR_DATA).getBinary()
-	// .getStream();
-	// logoImg = new Image(this.getSite().getShell().getDisplay(), is);
-	// }
-	// } catch (RepositoryException re) {
-	// throw new AoException(
-	// "Unable to initialise specific logo for demo app", re);
-	// } finally {
-	// IOUtils.closeQuietly(is);
-	// }
-	// }
-
 	/**
 	 * Implementing classes must call super in order to create the correct form
 	 * toolkit
@@ -138,9 +110,11 @@ public abstract class AbstractSuiteDashboard extends EditorPart {
 
 			@Override
 			public void widgetSelected(final SelectionEvent event) {
-				Map<String, String> params = new HashMap<String, String>();
-				params.put(OpenEntityEditor.PARAM_JCR_ID, ConnectJcrUtils.getIdentifier(entity));
-				CommandUtils.callCommand(peopleUiService.getOpenEntityEditorCmdId(), params);
+				// Map<String, String> params = new HashMap<String, String>();
+				// params.put(ConnectEditor.PARAM_JCR_ID,
+				// ConnectJcrUtils.getIdentifier(entity));
+				// CommandUtils.callCommand(peopleUiService.getOpenEntityEditorCmdId(), params);
+				peopleUiService.openEntityEditor(entity);
 			}
 		});
 		return link;
@@ -150,8 +124,6 @@ public abstract class AbstractSuiteDashboard extends EditorPart {
 	@Override
 	public void dispose() {
 		JcrUtils.logoutQuietly(session);
-		if (logoImg != null)
-			logoImg.dispose();
 		super.dispose();
 	}