Author: rob.stryker(a)jboss.com Date: 2012-02-15 06:31:38 -0500 (Wed, 15 Feb 2012) New Revision: 38750 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIActivator.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java Log: JBIDE-10908 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIActivator.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIActivator.java 2012-02-15 11:17:39 UTC (rev 38749) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIActivator.java 2012-02-15 11:31:38 UTC (rev 38750) @@ -1,6 +1,5 @@ package org.jboss.tools.openshift.express.internal.ui; -import java.io.IOException; import java.net.URL; import org.eclipse.core.runtime.FileLocator; @@ -15,9 +14,6 @@ import org.jboss.tools.openshift.express.internal.core.console.UserModel; import org.osgi.framework.BundleContext; -import com.openshift.express.client.IUser; -import com.openshift.express.client.OpenShiftException; - /** * The activator class controls the plug-in life cycle */ Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java 2012-02-15 11:17:39 UTC (rev 38749) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java 2012-02-15 11:31:38 UTC (rev 38750) @@ -58,6 +58,9 @@ @Override public Object[] getElements(final Object parentElement) { + // A refresh on the whole model... clear our cache + loadedUsers.clear(); + loadingUsers.clear(); if (parentElement instanceof IWorkspaceRoot) { return UserModel.getDefault().getUsers(); } @@ -65,7 +68,11 @@ IUser[] users = ((UserModel) parentElement).getUsers(); return users; } - + return new Object[0]; + } + + @Override + public Object[] getChildren(Object parentElement) { if (parentElement instanceof IUser) { if (!loadedUsers.contains(parentElement)) { if (!loadingUsers.contains(parentElement)) { @@ -144,11 +151,6 @@ } @Override - public Object[] getChildren(Object parentElement) { - return getElements(parentElement); - } - - @Override public Object getParent(Object element) { // TODO Auto-generated method stub return null;