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=bdbaf6831559b4117118f2205bee90e1fa3302c2;hb=82ea7f475d12a554e0597fa39007ae3ee6790604;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..bdbaf6831 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. @@ -19,6 +19,7 @@ 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; @@ -42,7 +43,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); @@ -55,6 +57,7 @@ public class DistributionEditor extends FormEditor implements SlcNames { protected void addPages() { try { addPage(new DistributionOverviewPage(this, "Overview", session)); + addPage(new ArtifactsBrowserPage(this, "Browser", session)); } catch (PartInitException e) { throw new ArgeoException("Cannot add distribution editor pages", e); } @@ -66,8 +69,7 @@ public class DistributionEditor extends FormEditor implements SlcNames { @Override public void dispose() { - if (session != null) - session.logout(); + JcrUtils.logoutQuietly(session); super.dispose(); }