| commit | 8559ff46caf4281512f38ece9138ea32e6ca2ed7 | [log] [tgz] |
|---|---|---|
| author | eyuen <eyuen> | Wed Oct 27 21:16:32 2010 +0000 |
| committer | eyuen <eyuen> | Wed Oct 27 21:16:32 2010 +0000 |
| tree | 91bb36d6f8e251a47403a12da765c4474820ee92 | |
| parent | 4eeccda8ef2fa7d0832f516433c365c8152b14f8 [diff] |
[328891] Sever never shows publishing state and in sync state prematurely
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/cnf/ServerContentProvider.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/cnf/ServerContentProvider.java index 5f463e8..fe73c84 100644 --- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/cnf/ServerContentProvider.java +++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/cnf/ServerContentProvider.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008,2009 IBM Corporation and others. + * Copyright (c) 2008,2010 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -24,10 +24,6 @@ // TODO Angel Says: Need to review if this is needed public static Object INITIALIZING = new Object(); - // TODO Angel Says: Need to review how to port this function into CNF - // servers that are currently publishing and starting - protected static Set<String> publishing = new HashSet<String>(4); - public Object[] getElements(Object element) { List<IServer> list = new ArrayList<IServer>(); IServer[] servers = ServerCore.getServers();
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/cnf/ServerDecorator.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/cnf/ServerDecorator.java index 7a6c9cb..86edac5 100644 --- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/cnf/ServerDecorator.java +++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/cnf/ServerDecorator.java
@@ -131,7 +131,7 @@ return ""; String serverId = server.getId(); - if (ServerContentProvider.publishing.contains(serverId)) + if (ServersView2.publishing.contains(serverId)) return ServerDecorator.syncState[4]; // republish