[334836] Extending the Server Label Decorator, there are some times that this decorator is not being updated while the Server decorator it is.
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/cnf/ServerDecoratorsHandler.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/cnf/ServerDecoratorsHandler.java
new file mode 100644
index 0000000..d5b2d2b
--- /dev/null
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/cnf/ServerDecoratorsHandler.java
@@ -0,0 +1,93 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.server.ui.internal.cnf;
+
+import java.util.ArrayList;
+
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IDecoratorManager;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.navigator.CommonViewer;
+
+/**
+ *
+ * The purpose of this class is proportionate a way to register those UI Decorators that
+ * needs to be updated after a Server has been modified. Basically this handler is a list
+ * of IDs of UI Decorators.
+ *
+ * @author israelgd@mx1.ibm.com
+ */
+public class ServerDecoratorsHandler {
+
+ final static String NAVIGATOR_DECORATOR_ID = "org.eclipse.wst.server.ui.navigatorDecorator";
+
+ protected static ArrayList <String> UIDecoratorsIDs = new ArrayList<String>();
+
+ static {
+ UIDecoratorsIDs.add(NAVIGATOR_DECORATOR_ID);
+ }
+ protected static IDecoratorManager decoratorManager = null;
+
+ protected static IDecoratorManager getDecoratorManager(){
+ if (decoratorManager == null){
+ decoratorManager = PlatformUI.getWorkbench().getDecoratorManager();
+ }
+ return decoratorManager;
+ }
+ /**
+ * Used to refresh the Server Decorators previously added and set selection after that.
+ * Triggers the decoration event of each Decorator.
+ * */
+ public static void refresh(final CommonViewer tableViewer) {
+ Display.getDefault().asyncExec(new Runnable() {
+ public void run() {
+ IDecoratorManager dm = PlatformUI.getWorkbench().getDecoratorManager();
+ ArrayList<String> UIDecoratorsIDsClone = (ArrayList<String>)UIDecoratorsIDs.clone();
+ for (String decoratorId: UIDecoratorsIDsClone) {
+ dm.update(decoratorId);
+ }
+ if (tableViewer != null){
+ tableViewer.setSelection(tableViewer.getSelection());
+ }
+ }
+ });
+ }
+
+ /**
+ * Used to refresh the Server Decorators previously added.
+ * @param server
+ * */
+ public static void refresh() {
+ refresh(null);
+ }
+
+ /**
+ * Remove a UI Decorator from the Decorator Handler.
+ * @param decoratorID
+ */
+ public static void removeUIDecoratorsID(String decoratorID) {
+ synchronized (UIDecoratorsIDs) {
+ UIDecoratorsIDs.remove(decoratorID);
+ }
+ }
+
+ /**
+ * Adds a new UI Decorator from the Decorator Handler.
+ * @param decoratorID
+ */
+ public static void addUIDecoratorsIDs(String decoratorID) {
+ synchronized (UIDecoratorsIDs) {
+ if(!UIDecoratorsIDs.contains(decoratorID)){
+ UIDecoratorsIDs.add(decoratorID);
+ }
+ }
+ }
+}
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/cnf/ServersView2.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/cnf/ServersView2.java
index 977311b..500cdd1 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/cnf/ServersView2.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/cnf/ServersView2.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008,2010 IBM Corporation and others.
+ * Copyright (c) 2008,2011 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
@@ -23,8 +23,6 @@
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IDecoratorManager;
-import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.contexts.IContextService;
import org.eclipse.ui.navigator.CommonNavigator;
import org.eclipse.ui.navigator.CommonViewer;
@@ -147,13 +145,7 @@
*/
protected void refreshServer(final IServer server){
Trace.trace(Trace.FINEST, "Refreshing UI for server="+server);
- Display.getDefault().asyncExec(new Runnable() {
- public void run() {
- IDecoratorManager dm = PlatformUI.getWorkbench().getDecoratorManager();
- dm.update("org.eclipse.wst.server.ui.navigatorDecorator");
- tableViewer.setSelection(tableViewer.getSelection());
- }
- });
+ ServerDecoratorsHandler.refresh(tableViewer);
}
protected void refreshServerContent(final IServer server){
@@ -168,13 +160,7 @@
protected void refreshServerState(final IServer server){
Trace.trace(Trace.FINEST, "Refreshing UI for server="+server);
- Display.getDefault().asyncExec(new Runnable() {
- public void run() {
- IDecoratorManager dm = PlatformUI.getWorkbench().getDecoratorManager();
- dm.update("org.eclipse.wst.server.ui.navigatorDecorator");
- tableViewer.setSelection(tableViewer.getSelection());
- }
- });
+ ServerDecoratorsHandler.refresh(tableViewer);
}
protected void addListener(){
