X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=plugins%2Forg.argeo.slc.client.ui.dist%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fclient%2Fui%2Fdist%2Feditors%2FDistributionEditor.java;h=1e3be13df9c7addd9e1e5eb4c985f3cb2eae5079;hb=d5b315ae97d554676a77bd0e4476446da2a78264;hp=44825043782efc25b3ed5f5fffb8d1918ce67a8d;hpb=651d33e13bfa9a7b46464be412023ee747e612e8;p=gpl%2Fargeo-slc.git

diff --git a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/DistributionEditor.java b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/DistributionEditor.java
index 448250437..1e3be13df 100644
--- a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/DistributionEditor.java
+++ b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/DistributionEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2012 Mathieu Baudier
+ * Copyright (C) 2007-2012 Argeo GmbH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ package org.argeo.slc.client.ui.dist.editors;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
-import org.argeo.ArgeoException;
+import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.client.ui.dist.DistPlugin;
 import org.argeo.slc.jcr.SlcNames;
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -28,7 +28,7 @@ import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.forms.editor.FormEditor;
 
 /**
- * Editor to browse, analyze and modify an OSGi distribution
+ * Browse, analyse and modify an OSGi distribution
  */
 public class DistributionEditor extends FormEditor implements SlcNames {
 	// private final static Log log =
@@ -42,7 +42,8 @@ public class DistributionEditor extends FormEditor implements SlcNames {
 			throws PartInitException {
 		DistributionEditorInput dei = (DistributionEditorInput) input;
 		try {
-			session = dei.getRepository().login(dei.getWorkspaceName());
+			session = dei.getRepository().login(dei.getCredentials(),
+					dei.getWorkspaceName());
 		} catch (RepositoryException e) {
 			throw new PartInitException("Cannot log to workspace "
 					+ dei.getWorkspaceName(), e);
@@ -53,11 +54,12 @@ public class DistributionEditor extends FormEditor implements SlcNames {
 
 	@Override
 	protected void addPages() {
-		try {
-			addPage(new DistributionOverviewPage(this, "Overview", session));
-		} catch (PartInitException e) {
-			throw new ArgeoException("Cannot add distribution editor pages", e);
-		}
+		// try {
+		// addPage(new DistWkspSearchPage(this, "Overview", session));
+		// addPage(new DistWkspBrowserPage(this, "Browser", session));
+		// } catch (PartInitException e) {
+		// throw new ArgeoException("Cannot add distribution editor pages", e);
+		// }
 	}
 
 	@Override
@@ -66,8 +68,7 @@ public class DistributionEditor extends FormEditor implements SlcNames {
 
 	@Override
 	public void dispose() {
-		if (session != null)
-			session.logout();
+		JcrUtils.logoutQuietly(session);
 		super.dispose();
 	}
 
@@ -79,5 +80,4 @@ public class DistributionEditor extends FormEditor implements SlcNames {
 	public boolean isSaveAsAllowed() {
 		return false;
 	}
-
-}
+}
\ No newline at end of file