X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=server%2Fplugins%2Forg.argeo.jcr.ui.explorer%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjcr%2Fui%2Fexplorer%2Futils%2FJcrUiUtils.java;h=cee62f2fa4bb81c00cd12df40ee6310b993553fa;hb=fc4c9f53197bc7c0a9a30bc6c55cfd1c162ebd9a;hp=756748bb4b4042a03ccc42770b7615812d60cb47;hpb=1d5afdce3e91054f07ddd3c98309c363b4cf1d46;p=lgpl%2Fargeo-commons.git

diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/utils/JcrUiUtils.java b/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/utils/JcrUiUtils.java
index 756748bb4..cee62f2fa 100644
--- a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/utils/JcrUiUtils.java
+++ b/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/utils/JcrUiUtils.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.
@@ -20,30 +20,45 @@ import javax.jcr.RepositoryException;
 
 import org.argeo.ArgeoException;
 import org.argeo.eclipse.ui.TreeParent;
+import org.argeo.jcr.ui.explorer.model.RepositoriesNode;
+import org.argeo.jcr.ui.explorer.model.RepositoryNode;
 import org.argeo.jcr.ui.explorer.model.SingleJcrNode;
 import org.argeo.jcr.ui.explorer.model.WorkspaceNode;
 
-/** Centralizes some useful methods to build Uis with JCR */
+/** Centralizes some useful methods to build UIs with JCR */
 public class JcrUiUtils {
 
-	/** Insure that the UI componant is not stale, refresh if needed */
+	/** Insure that the UI component is not stale, refresh if needed */
 	public static void forceRefreshIfNeeded(TreeParent element) {
-		Node curNode;
+		Node curNode = null;
 
-		if (element instanceof SingleJcrNode)
-			curNode = ((SingleJcrNode) element).getNode();
-		else if (element instanceof WorkspaceNode)
-			curNode = ((WorkspaceNode) element).getRootNode();
-		else
-			return;
-		// TODO implement specific methods for other cases
+		boolean doRefresh = false;
 
 		try {
-			// we mainly rely on nb of children
-			if (element.getChildren().length == curNode.getNodes().getSize())
-				return;
-			else {
-				// get rid of children of UI object
+			if (element instanceof SingleJcrNode) {
+				curNode = ((SingleJcrNode) element).getNode();
+			} else if (element instanceof WorkspaceNode) {
+				curNode = ((WorkspaceNode) element).getRootNode();
+			}
+
+			if (curNode != null
+					&& element.getChildren().length != curNode.getNodes()
+							.getSize())
+				doRefresh = true;
+			else if (element instanceof RepositoryNode) {
+				RepositoryNode rn = (RepositoryNode) element;
+				if (rn.isConnected()) {
+					String[] wkpNames = rn.getAccessibleWorkspaceNames();
+					if (element.getChildren().length != wkpNames.length)
+						doRefresh = true;
+				}
+			} else if (element instanceof RepositoriesNode) {
+				RepositoriesNode rn = (RepositoriesNode) element;
+				if (element.getChildren().length != rn.getRepositoryRegister()
+						.getRepositories().size())
+					doRefresh = true;
+			}
+			if (doRefresh) {
 				element.clearChildren();
 				element.getChildren();
 			}