Fix AS7-1669

jbossas · Sep 15, 2011 · c17d941 · c17d941
1 parent 5dcd25f
commit c17d941
Show file tree

Hide file tree

Showing 10 changed files with 114 additions and 10 deletions.
diff --git a/gui/src/main/java/org/jboss/as/console/client/core/settings/SettingsPresenter.java b/gui/src/main/java/org/jboss/as/console/client/core/settings/SettingsPresenter.java
@@ -71,13 +71,11 @@ protected void onBind() {
     @Override
     protected void onReveal() {
         super.onReveal();
-        System.out.println("reveal");
     }
 
     @Override
     protected void onReset() {
         super.onReset();
-        System.out.println("reset");
     }
 
     @Override

diff --git a/gui/src/main/java/org/jboss/as/console/client/domain/hosts/ServerConfigPresenter.java b/gui/src/main/java/org/jboss/as/console/client/domain/hosts/ServerConfigPresenter.java
@@ -30,6 +30,7 @@
 import com.gwtplatform.mvp.client.annotations.NameToken;
 import com.gwtplatform.mvp.client.annotations.ProxyCodeSplit;
 import com.gwtplatform.mvp.client.proxy.Place;
+import com.gwtplatform.mvp.client.proxy.PlaceManager;
 import com.gwtplatform.mvp.client.proxy.PlaceRequest;
 import com.gwtplatform.mvp.client.proxy.Proxy;
 import com.gwtplatform.mvp.client.proxy.RevealContentEvent;
@@ -58,8 +59,8 @@
 import org.jboss.as.console.client.shared.properties.NewPropertyWizard;
 import org.jboss.as.console.client.shared.properties.PropertyManagement;
 import org.jboss.as.console.client.shared.properties.PropertyRecord;
-import org.jboss.ballroom.client.widgets.window.DefaultWindow;
 import org.jboss.as.console.client.widgets.forms.PropertyMetaData;
+import org.jboss.ballroom.client.widgets.window.DefaultWindow;
 import org.jboss.dmr.client.ModelNode;
 
 import java.util.List;
@@ -72,7 +73,9 @@
  * @date 3/3/11
  */
 public class ServerConfigPresenter extends Presenter<ServerConfigPresenter.MyView, ServerConfigPresenter.MyProxy>
-        implements HostSelectionEvent.HostSelectionListener, JvmManagement, PropertyManagement {
+        implements HostSelectionEvent.HostSelectionListener,
+        ServerWizardEvent.ServerWizardListener,
+        JvmManagement, PropertyManagement {
 
     private HostInformationStore hostInfoStore;
 
@@ -89,6 +92,7 @@ public class ServerConfigPresenter extends Presenter<ServerConfigPresenter.MyVie
     private DispatchAsync dispatcher;
     private PropertyMetaData propertyMetaData;
     private BeanFactory factory;
+    private PlaceManager placeManager;
 
     @ProxyCodeSplit
     @NameToken(NameTokens.ServerPresenter)
@@ -110,21 +114,24 @@ public ServerConfigPresenter(
             HostInformationStore hostInfoStore,
             ServerGroupStore serverGroupStore,
             DispatchAsync dispatcher,
-            PropertyMetaData propertyMetaData, BeanFactory factory) {
+            PropertyMetaData propertyMetaData, BeanFactory factory,
+            PlaceManager placeManager) {
         super(eventBus, view, proxy);
 
         this.hostInfoStore = hostInfoStore;
         this.serverGroupStore = serverGroupStore;
         this.dispatcher = dispatcher;
         this.propertyMetaData = propertyMetaData;
         this.factory = factory;
+        this.placeManager = placeManager;
     }
 
     @Override
     protected void onBind() {
         super.onBind();
         getView().setPresenter(this);
         getEventBus().addHandler(HostSelectionEvent.TYPE, this);
+        getEventBus().addHandler(ServerWizardEvent.TYPE, this);
     }
 
     @Override
@@ -268,15 +275,24 @@ private void loadDefaultForHost(final String hostName) {
         hostInfoStore.getServerConfigurations(hostName, new SimpleCallback<List<Server>>() {
             @Override
             public void onSuccess(List<Server> result) {
+
                 if(!result.isEmpty()) {
                     workOn(result.get(0));
                     serverName = selectedRecord.getName();
                     loadJVMs(hostName);
                 }
+                else {
+                    noServerAvailable();
+                }
+
             }
         });
     }
 
+    private void noServerAvailable() {
+        placeManager.revealPlace(new PlaceRequest(NameTokens.InstancesPresenter));
+    }
+
     public void createServerConfig(final Server newServer) {
 
         // close popup
@@ -294,7 +310,6 @@ public void onSuccess(Boolean wasSuccessful) {
                     Scheduler.get().scheduleDeferred(new Scheduler.ScheduledCommand() {
                         @Override
                         public void execute() {
-                            System.out.println("> stale model event");
                             getEventBus().fireEvent(new StaleModelEvent(StaleModelEvent.SERVER_CONFIGURATIONS));
                         }
                     });
@@ -551,4 +566,8 @@ public void onSuccess(List<SocketBinding> result) {
         });
     }
 
+    @Override
+    public void launchWizard(String HostName) {
+        launchNewConfigDialoge();
+    }
 }
diff --git a/gui/src/main/java/org/jboss/as/console/client/domain/hosts/ServerConfigView.java b/gui/src/main/java/org/jboss/as/console/client/domain/hosts/ServerConfigView.java
@@ -282,6 +282,7 @@ private void onEdit() {
 
     @Override
     public void setSelectedRecord(Server selectedRecord) {
+
         nameLabel.setText(selectedRecord.getName());
         form.edit(selectedRecord);
 

diff --git a/gui/src/main/java/org/jboss/as/console/client/domain/hosts/ServerInstancesPresenter.java b/gui/src/main/java/org/jboss/as/console/client/domain/hosts/ServerInstancesPresenter.java
@@ -35,6 +35,7 @@
 import org.jboss.as.console.client.core.NameTokens;
 import org.jboss.as.console.client.core.SuspendableView;
 import org.jboss.as.console.client.core.message.Message;
+import org.jboss.as.console.client.domain.events.StaleModelEvent;
 import org.jboss.as.console.client.domain.model.EntityFilter;
 import org.jboss.as.console.client.domain.model.Host;
 import org.jboss.as.console.client.domain.model.HostInformationStore;
@@ -44,6 +45,7 @@
 import org.jboss.as.console.client.domain.model.SimpleCallback;
 import org.jboss.ballroom.client.layout.LHSHighlightEvent;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -53,7 +55,7 @@
  * @date 3/8/11
  */
 public class ServerInstancesPresenter extends Presenter<ServerInstancesPresenter.MyView, ServerInstancesPresenter.MyProxy>
-        implements HostSelectionEvent.HostSelectionListener {
+        implements HostSelectionEvent.HostSelectionListener, StaleModelEvent.StaleModelListener {
 
     private final PlaceManager placeManager;
     private HostInformationStore hostInfoStore;
@@ -91,6 +93,7 @@ protected void onBind() {
         super.onBind();
         getView().setPresenter(this);
         getEventBus().addHandler(HostSelectionEvent.TYPE, this);
+        getEventBus().addHandler(StaleModelEvent.TYPE, this);
     }
 
     @Override
@@ -167,6 +170,12 @@ public void onSuccess(List<ServerInstance> result) {
             @Override
             public void onSuccess(List<Server> result) {
                 getView().updateServerConfigurations(result);
+
+                if(result.isEmpty())
+                {
+                    // hacky: See HostInfoStore#getServerInstances()
+                    getView().updateInstances(Collections.EMPTY_LIST);
+                }
             }
         });
     }
@@ -267,4 +276,10 @@ public void onSuccess(Boolean result) {
             }
         });
     }
+
+    @Override
+    public void onStaleModel(String modelName) {
+        if(StaleModelEvent.SERVER_CONFIGURATIONS.equals(modelName))
+            refreshView();
+    }
 }
diff --git a/gui/src/main/java/org/jboss/as/console/client/domain/hosts/ServerWizardEvent.java b/gui/src/main/java/org/jboss/as/console/client/domain/hosts/ServerWizardEvent.java
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
+ * as indicated by the @author tags. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ */
+
+package org.jboss.as.console.client.domain.hosts;
+
+import com.google.gwt.event.shared.EventHandler;
+import com.google.gwt.event.shared.GwtEvent;
+
+
+/**
+ * @author Heiko Braun
+ * @date 2/7/11
+ */
+public class ServerWizardEvent extends GwtEvent<ServerWizardEvent.ServerWizardListener> {
+
+    public static final Type TYPE = new Type<ServerWizardListener>();
+
+    private String hostName;
+
+    public ServerWizardEvent(String hostName) {
+        super();
+        this.hostName = hostName;
+    }
+
+    @Override
+    public Type<ServerWizardListener> getAssociatedType() {
+        return TYPE;
+    }
+
+    @Override
+    protected void dispatch(ServerWizardListener listener) {
+        listener.launchWizard(hostName);
+    }
+
+    public String getHostName() {
+        return hostName;
+    }
+
+    public interface ServerWizardListener extends EventHandler {
+        void launchWizard(String HostName);
+    }
+}
+
diff --git a/gui/src/main/java/org/jboss/as/console/client/domain/hosts/ServersConfigSection.java b/gui/src/main/java/org/jboss/as/console/client/domain/hosts/ServersConfigSection.java
@@ -19,16 +19,20 @@
 
 package org.jboss.as.console.client.domain.hosts;
 
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.user.client.ui.DisclosurePanel;
 import com.google.gwt.user.client.ui.HTML;
 import com.google.gwt.user.client.ui.Tree;
 import com.google.gwt.user.client.ui.TreeItem;
 import com.google.gwt.user.client.ui.Widget;
+import com.gwtplatform.mvp.client.proxy.PlaceRequest;
 import org.jboss.as.console.client.Console;
 import org.jboss.as.console.client.core.NameTokens;
 import org.jboss.as.console.client.domain.model.Server;
 import org.jboss.ballroom.client.layout.LHSNavTree;
 import org.jboss.ballroom.client.layout.LHSNavTreeItem;
+import org.jboss.ballroom.client.widgets.common.DefaultButton;
 import org.jboss.ballroom.client.widgets.stack.DisclosureStackPanel;
 
 import java.util.List;
@@ -76,6 +80,15 @@ public void updateServers(List<Server> servers) {
         {
             TreeItem empty = new TreeItem(new HTML(Console.CONSTANTS.common_label_noRecords()));
             hostTree.addItem(empty);
+            hostTree.addItem(new DefaultButton("Create New Server", new ClickHandler() {
+                @Override
+                public void onClick(ClickEvent event) {
+                    Console.MODULES.getPlaceManager().revealPlace(
+                            new PlaceRequest(NameTokens.ServerPresenter).with("action", "new")
+                    );
+                }
+            }));
+
         }
 
     }

diff --git a/gui/src/main/java/org/jboss/as/console/client/domain/model/impl/HostInfoStoreImpl.java b/gui/src/main/java/org/jboss/as/console/client/domain/model/impl/HostInfoStoreImpl.java
@@ -207,7 +207,6 @@ public void onSuccess(final List<Server> serverNames) {
 
                 for(final Server handle : serverNames)
                 {
-
                     final ModelNode operation = new ModelNode();
                     operation.get(OP).set(READ_ATTRIBUTE_OPERATION);
                     operation.get(ADDRESS).setEmptyList();

diff --git a/gui/src/main/java/org/jboss/as/console/client/shared/jvm/JvmEditor.java b/gui/src/main/java/org/jboss/as/console/client/shared/jvm/JvmEditor.java
@@ -169,4 +169,5 @@ public void setSelectedRecord(String reference, Jvm jvm) {
             form.edit(factory.jvm().as());
 
     }
+
 }
diff --git a/gui/src/main/java/org/jboss/as/console/client/shared/properties/PropertyEditor.java b/gui/src/main/java/org/jboss/as/console/client/shared/properties/PropertyEditor.java
@@ -19,6 +19,7 @@
 
 package org.jboss.as.console.client.shared.properties;
 
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
@@ -270,5 +271,4 @@ public void setAllowEditProps(boolean allowEditProps) {
         this.allowEditProps = allowEditProps;
         propertyTable.setEnabled(enabled && allowEditProps);
     }
-
 }
diff --git a/...src/main/java/org/jboss/as/console/client/shared/subsys/jca/ResourceAdapterPresenter.java b/...src/main/java/org/jboss/as/console/client/shared/subsys/jca/ResourceAdapterPresenter.java
@@ -310,7 +310,6 @@ public void onSuccess(DMRResponse dmrResponse) {
     @Override
     public void onCreateProperty(final String ref, final PropertyRecord prop) {
         closePropertyDialoge();
-        System.out.println("Create "+prop.getKey());
 
         ModelNode operation = new ModelNode();
         operation.get(OP).set(WRITE_ATTRIBUTE_OPERATION);