[rhq] Branch 'rhq-on-as7' - modules/enterprise

mazz mazz at fedoraproject.org
Sat Aug 4 06:51:53 UTC 2012


 modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/Installer.java           |   31 ++++++----
 modules/enterprise/gui/installer/src/main/resources/org/rhq/enterprise/gui/installer/client/Messages.properties |    5 -
 2 files changed, 22 insertions(+), 14 deletions(-)

New commits:
commit 53b48046558ee1a4b2ac15501a399d339a17d8e0
Author: John Mazzitelli <mazz at redhat.com>
Date:   Sat Aug 4 02:51:49 2012 -0400

    show messages during install

diff --git a/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/Installer.java b/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/Installer.java
index 8612167..ca68076 100644
--- a/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/Installer.java
+++ b/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/Installer.java
@@ -87,6 +87,8 @@ public class Installer implements EntryPoint {
     private final HashMap<String, String> originalProperties = new HashMap<String, String>();
     private final LinkedHashMap<String, String> registeredServerNames = new LinkedHashMap<String, String>();
 
+    private VLayout mainCanvas;
+
     private ListGrid advancedPropertyItemGrid;
     private Button mainInstallButton;
 
@@ -111,16 +113,16 @@ public class Installer implements EntryPoint {
         mainInstallButton = createMainInstallButton();
         Canvas tabSet = createTabSet();
 
-        VLayout layout = new VLayout();
-        layout.setWidth100();
-        layout.setHeight100();
-        layout.setLayoutMargin(10);
-        layout.setMembersMargin(5);
-        layout.setDefaultLayoutAlign(Alignment.CENTER);
-        layout.addMember(header);
-        layout.addMember(mainInstallButton);
-        layout.addMember(tabSet);
-        layout.draw();
+        mainCanvas = new VLayout();
+        mainCanvas.setWidth100();
+        mainCanvas.setHeight100();
+        mainCanvas.setLayoutMargin(10);
+        mainCanvas.setMembersMargin(5);
+        mainCanvas.setDefaultLayoutAlign(Alignment.CENTER);
+        mainCanvas.addMember(header);
+        mainCanvas.addMember(mainInstallButton);
+        mainCanvas.addMember(tabSet);
+        mainCanvas.draw();
 
         // Remove loading image in case we don't completely cover it
         Element loadingPanel = DOM.getElementById("Loading-Panel");
@@ -218,17 +220,22 @@ public class Installer implements EntryPoint {
                 int httpsPort = Integer.parseInt(serverSettingWebSecureHttpPort.getValueAsString());
                 String existingSchemaOption = dbExistingSchemaOption.getValueAsString();
 
+                SC.say(MSG.message_install_started());
+                mainCanvas.disable();
+
                 HashMap<String, String> propMap = serverProperties.getMap();
                 ServerDetails svrDetails = new ServerDetails(highAvailabilityName, publicEndpoint, httpPort, httpsPort);
                 installerService.install(propMap, svrDetails, existingSchemaOption, new AsyncCallback<Void>() {
                     @Override
                     public void onSuccess(Void result) {
-                        SC.say(MSG.message_installDone());
+                        mainCanvas.enable();
+                        SC.say(MSG.message_install_done());
                     }
 
                     @Override
                     public void onFailure(Throwable caught) {
-                        SC.say(MSG.message_installFailed() + " - " + caught.toString());
+                        mainCanvas.enable();
+                        SC.say(MSG.message_install_failed() + " - " + caught.toString());
                     }
                 });
             }
diff --git a/modules/enterprise/gui/installer/src/main/resources/org/rhq/enterprise/gui/installer/client/Messages.properties b/modules/enterprise/gui/installer/src/main/resources/org/rhq/enterprise/gui/installer/client/Messages.properties
index a12e1a4..9708d56 100644
--- a/modules/enterprise/gui/installer/src/main/resources/org/rhq/enterprise/gui/installer/client/Messages.properties
+++ b/modules/enterprise/gui/installer/src/main/resources/org/rhq/enterprise/gui/installer/client/Messages.properties
@@ -4,8 +4,9 @@ button_startInstallation = Press To Start The Installation Now
 button_testConnection = Test Connection
 help_registeredServers = If you are performing an upgrade or a re-installation then you should select a server from this list of registered servers. If you want to install a new server into the system, select the *New Server* option. (Note that if you are going to overwrite your existing schema, you cannot select an existing registered server since they will be deleted when the overwrite is performed.)
 message_formDidNotValidate = Please fix the errors before continuing.
-message_installDone = The installation has completed.
-message_installFailed = The installation failed.
+message_install_done = The installation has completed.
+message_install_failed = The installation failed.
+message_install_started = The installation has started . . . please wait.
 message_notValidBoolean = That is not a valid boolean (must be "true" or "false").
 message_notValidInteger = That is not a valid number.
 property_name_label = Property




More information about the rhq-commits mailing list