X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fplugins%2Forg.argeo.jcr.ui.explorer%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjcr%2Fui%2Fexplorer%2Fmodel%2FWorkspaceNode.java;h=f73312d52ea3d7d664fd287684c0f7fe5d707ad5;hb=a093e5c849e70bbc754fa4462dbb6c2b59979973;hp=58c9c83bc3efa24fdd3c25009145712ded086f3f;hpb=c0b7b3f9d1781d074ab35d24017042fa9415e1e4;p=lgpl%2Fargeo-commons.git

diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/model/WorkspaceNode.java b/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/model/WorkspaceNode.java
index 58c9c83bc..f73312d52 100644
--- a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/model/WorkspaceNode.java
+++ b/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/model/WorkspaceNode.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2007-2012 Mathieu Baudier
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.argeo.jcr.ui.explorer.model;
 
 import javax.jcr.Node;
@@ -10,24 +25,15 @@ import javax.jcr.observation.EventListener;
 
 import org.argeo.ArgeoException;
 import org.argeo.eclipse.ui.TreeParent;
-import org.argeo.eclipse.ui.jcr.JcrUiPlugin;
-import org.eclipse.swt.graphics.Image;
 
 /**
  * UI Tree component. Wraps the root node of a JCR {@link Workspace}. It also
  * keeps a reference to its parent {@link RepositoryNode}, to be able to
  * retrieve alias of the current used repository
  */
-
 public class WorkspaceNode extends TreeParent implements EventListener, UiNode {
 	private Session session = null;
 
-	public final static Image WORKSPACE_DISCONNECTED = JcrUiPlugin
-			.getImageDescriptor("icons/workspace_disconnected.png")
-			.createImage();
-	public final static Image WORKSPACE_CONNECTED = JcrUiPlugin
-			.getImageDescriptor("icons/workspace_connected.png").createImage();
-
 	public WorkspaceNode(RepositoryNode parent, String name) {
 		this(parent, name, null);
 	}
@@ -59,8 +65,7 @@ public class WorkspaceNode extends TreeParent implements EventListener, UiNode {
 	public void login() {
 		try {
 			logout();
-			session = ((RepositoryNode) getParent()).getRepository().login(
-					getName());
+			session = ((RepositoryNode) getParent()).repositoryLogin(getName());
 			processNewSession(session);
 
 		} catch (RepositoryException e) {
@@ -69,6 +74,13 @@ public class WorkspaceNode extends TreeParent implements EventListener, UiNode {
 		}
 	}
 
+	@Override
+	public synchronized void dispose() {
+		logout();
+		super.dispose();
+	}
+
+	/** Logouts the session, does not nothing if there is no live session. */
 	public void logout() {
 		try {
 			if (session != null && session.isLive()) {