Fix AS7-6151

jbossas · Dec 19, 2012 · 380551e · 380551e
1 parent 6a43feb
commit 380551e
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 9 deletions.
diff --git a/gui/src/main/java/org/jboss/as/console/client/domain/hosts/HostServerTable.java b/gui/src/main/java/org/jboss/as/console/client/domain/hosts/HostServerTable.java
@@ -23,13 +23,15 @@
 import com.google.gwt.view.client.SelectionChangeEvent;
 import com.google.gwt.view.client.SingleSelectionModel;
 import org.jboss.as.console.client.Console;
+import org.jboss.as.console.client.domain.events.StaleModelEvent;
 import org.jboss.as.console.client.domain.model.Host;
 import org.jboss.as.console.client.domain.model.ServerInstance;
 import org.jboss.as.console.client.shared.state.GlobalHostSelection;
 import org.jboss.as.console.client.shared.state.HostList;
 import org.jboss.as.console.client.shared.state.ServerInstanceList;
 import org.jboss.as.console.client.widgets.lists.DefaultCellList;
 import org.jboss.as.console.client.widgets.popups.DefaultPopup;
+import org.jboss.ballroom.client.widgets.InlineLink;
 import org.jboss.ballroom.client.widgets.common.DefaultButton;
 import org.jboss.ballroom.client.widgets.tables.DefaultPager;
 
@@ -108,8 +110,20 @@ public Widget asWidget() {
         layout.getElement().setAttribute("style", "padding:5px;");
         //layout.addStyleName("tablepicker-popup");
 
+        HorizontalPanel tools = new HorizontalPanel();
+        tools.setStyleName("fill-layout-width");
         if(description!=null)
-            layout.add(new HTML(description));
+            tools.add(new HTML(description));
+        InlineLink refresh = new InlineLink("Refresh");
+        refresh.addClickHandler(new ClickHandler() {
+            @Override
+            public void onClick(ClickEvent clickEvent) {
+                Console.MODULES.getEventBus().fireEvent(new StaleModelEvent(StaleModelEvent.SERVER_INSTANCES));
+            }
+        });
+        tools.add(refresh);
+        refresh.getElement().getParentElement().setAttribute("style", "vertical-align:right");
+        layout.add(tools);
 
         ratio = new HTML("RATIO HERE");
         layout.add(ratio);

diff --git a/...main/java/org/jboss/as/console/client/domain/model/impl/ServerGroupLifecycleCallback.java b/...main/java/org/jboss/as/console/client/domain/model/impl/ServerGroupLifecycleCallback.java
@@ -19,6 +19,8 @@
 package org.jboss.as.console.client.domain.model.impl;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
+import org.jboss.as.console.client.Console;
+import org.jboss.as.console.client.domain.events.StaleModelEvent;
 import org.jboss.as.console.client.domain.model.HostInformationStore;
 import org.jboss.as.console.client.domain.model.Server;
 import org.jboss.as.console.client.domain.model.ServerInstance;
@@ -47,8 +49,8 @@ public class ServerGroupLifecycleCallback extends SimpleCallback<Boolean>
     private final SimpleCallback<List<Server>> callback;
 
     public ServerGroupLifecycleCallback(final HostInformationStore hostInfoStore,
-            final Map<HostInfo, List<ServerInstance>> serversPerHost,
-            final LifecycleOperation lifecycleOp, final SimpleCallback<List<Server>> callback)
+                                        final Map<HostInfo, List<ServerInstance>> serversPerHost,
+                                        final LifecycleOperation lifecycleOp, final SimpleCallback<List<Server>> callback)
     {
         this.hostInfoStore = hostInfoStore;
         this.serversPerHost = serversPerHost;
@@ -94,6 +96,9 @@ public void onSuccess(final Server server)
                                             if (!keepPolling && finishedServers.size() == servers)
                                             {
                                                 ServerGroupLifecycleCallback.this.callback.onSuccess(finishedServers);
+                                                Console.MODULES.getEventBus().fireEvent(
+                                                        new StaleModelEvent(StaleModelEvent.SERVER_GROUPS)
+                                                );
                                             }
                                             callback.onSuccess(keepPolling);
                                         }

diff --git a/...n/java/org/jboss/as/console/client/domain/model/impl/ServerInstanceLifecycleCallback.java b/...n/java/org/jboss/as/console/client/domain/model/impl/ServerInstanceLifecycleCallback.java
@@ -19,6 +19,8 @@
 package org.jboss.as.console.client.domain.model.impl;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
+import org.jboss.as.console.client.Console;
+import org.jboss.as.console.client.domain.events.StaleModelEvent;
 import org.jboss.as.console.client.domain.model.HostInformationStore;
 import org.jboss.as.console.client.domain.model.Server;
 import org.jboss.as.console.client.domain.model.SimpleCallback;
@@ -77,6 +79,9 @@ public void onSuccess(final Server server)
                             if (!keepPolling)
                             {
                                 ServerInstanceLifecycleCallback.this.callback.onSuccess(server);
+                                Console.MODULES.getEventBus().fireEvent(
+                                        new StaleModelEvent(StaleModelEvent.SERVER_INSTANCES)
+                                );
                             }
                             callback.onSuccess(keepPolling);
                         }

diff --git a/gui/src/main/java/org/jboss/as/console/client/domain/topology/TopologyPresenter.java b/gui/src/main/java/org/jboss/as/console/client/domain/topology/TopologyPresenter.java
@@ -34,10 +34,10 @@
 import com.gwtplatform.mvp.client.proxy.PlaceRequest;
 import com.gwtplatform.mvp.client.proxy.Proxy;
 import com.gwtplatform.mvp.client.proxy.RevealContentEvent;
-import org.jboss.as.console.client.Console;
 import org.jboss.as.console.client.core.DomainGateKeeper;
 import org.jboss.as.console.client.core.NameTokens;
 import org.jboss.as.console.client.core.SuspendableView;
+import org.jboss.as.console.client.domain.events.StaleModelEvent;
 import org.jboss.as.console.client.domain.model.HostInformationStore;
 import org.jboss.as.console.client.domain.model.Server;
 import org.jboss.as.console.client.domain.model.ServerGroupStore;
@@ -52,7 +52,6 @@
 import org.jboss.as.console.client.shared.runtime.ext.Extension;
 import org.jboss.as.console.client.shared.runtime.ext.ExtensionManager;
 import org.jboss.as.console.client.shared.runtime.ext.LoadExtensionCmd;
-import org.jboss.as.console.client.shared.state.StaleGlobalModel;
 import org.jboss.ballroom.client.widgets.window.DefaultWindow;
 
 import java.util.ArrayList;
@@ -282,8 +281,6 @@ public void onSuccess(final Server server)
             case RESTART:
                 break;
         }
-
-        getEventBus().fireEvent(new StaleGlobalModel(StaleGlobalModel.SERVER_INSTANCES));
     }
 
     public void onGroupLifecycle(final String group, final LifecycleOperation op)
@@ -315,8 +312,6 @@ public void onSuccess(final List<Server> result)
                     break;
             }
         }
-
-        getEventBus().fireEvent(new StaleGlobalModel(StaleGlobalModel.SERVER_GROUPS));
     }