modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java | 4 ++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/DeployStep.java | 19 +++++++--- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDeploymentConfigStep.java | 2 - 3 files changed, 19 insertions(+), 6 deletions(-)
New commits: commit 0716681d8453add414fe0acd4b705de75feb6ce7 Author: John Mazzitelli mazz@redhat.com Date: Mon Dec 20 12:19:59 2010 -0500
BZ 625198 - forgot to zero out the IDs in the default config
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDeploymentConfigStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDeploymentConfigStep.java index 5c31961..736acba 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDeploymentConfigStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDeploymentConfigStep.java @@ -64,7 +64,7 @@ public class GetDeploymentConfigStep extends AbstractWizardStep { if (defaultTemplate == null) { startingConfig = new Configuration(); } else { - startingConfig = defaultTemplate.getConfiguration(); + startingConfig = defaultTemplate.createConfiguration(); } } else { startingConfig = getNormalizedLiveConfig(configDef);
commit dffca6088e3b5e1b686bef0892e1bbb4082da523 Author: John Mazzitelli mazz@redhat.com Date: Mon Dec 20 12:18:34 2010 -0500
fix the loading icon
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java index bdc647a..576af53 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java @@ -23,6 +23,10 @@ public class ImageManager {
public static final String IMAGES_DIR = "images/";
+ public static String getLoadingIcon() { + return "ajax-loader.gif"; + } + /** * Returns a generic "upload" icon. */ diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/DeployStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/DeployStep.java index 1c9dca9..619cd3e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/DeployStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/DeployStep.java @@ -28,6 +28,7 @@ import com.smartgwt.client.widgets.layout.VLayout;
import org.rhq.core.domain.bundle.BundleDeployment; import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.ImageManager; import org.rhq.enterprise.gui.coregui.client.components.wizard.AbstractWizardStep; import org.rhq.enterprise.gui.coregui.client.gwt.BundleGWTServiceAsync; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; @@ -62,7 +63,7 @@ public class DeployStep extends AbstractWizardStep { canvas.setHeight100(); canvas.setAlign(Alignment.CENTER);
- final Img deployingImage = new Img("/images/status-bar.gif"); + final Img deployingImage = new Img(ImageManager.getLoadingIcon()); deployingImage.setLayoutAlign(Alignment.CENTER); deployingImage.setWidth(50); deployingImage.setHeight(15);
commit 1e23b466af25ad9c62d26b3ac5048b6966b45784 Author: John Mazzitelli mazz@redhat.com Date: Mon Dec 20 11:54:56 2010 -0500
show concise error message along with details
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/DeployStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/DeployStep.java index bdd818c..1c9dca9 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/DeployStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/DeployStep.java @@ -31,6 +31,7 @@ import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.components.wizard.AbstractWizardStep; import org.rhq.enterprise.gui.coregui.client.gwt.BundleGWTServiceAsync; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.util.ErrorHandler; import org.rhq.enterprise.gui.coregui.client.util.message.Message; import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; @@ -94,6 +95,7 @@ public class DeployStep extends AbstractWizardStep { new Message(MSG.view_bundle_deployWizard_deploymentScheduledDetail_concise(), MSG.view_bundle_deployWizard_deploymentScheduledDetail(result.getName(), result.getDestination().getGroup().getName()), Severity.Info)); + wizard.getView().hideMessage(); CoreGUI.refresh(); wizard.setNewDeployment(result); } @@ -101,8 +103,12 @@ public class DeployStep extends AbstractWizardStep { public void onFailure(Throwable caught) { deployingImage.setSrc("/images/status_error.gif"); deployingMessage.setText(MSG.view_bundle_deployWizard_error_3()); - CoreGUI.getErrorHandler().handleError( - MSG.view_bundle_deployWizard_error_4(caught.getMessage()), caught); + String errMsg = MSG.view_bundle_deployWizard_error_4(ErrorHandler + .getAllMessages(caught)); + wizard.getView().showMessage(errMsg); + Message msg = new Message(MSG.view_bundle_deployWizard_error_3(), errMsg, + Severity.Error); + CoreGUI.getMessageCenter().notify(msg); } }); } @@ -110,8 +116,10 @@ public class DeployStep extends AbstractWizardStep { public void onFailure(Throwable caught) { deployingImage.setSrc("/images/status_error.gif"); deployingMessage.setText(MSG.view_bundle_deployWizard_error_5()); - CoreGUI.getErrorHandler().handleError( - MSG.view_bundle_deployWizard_error_6(caught.getMessage()), caught); + String errMsg = MSG.view_bundle_deployWizard_error_6(ErrorHandler.getAllMessages(caught)); + wizard.getView().showMessage(errMsg); + Message msg = new Message(MSG.view_bundle_deployWizard_error_5(), errMsg, Severity.Error); + CoreGUI.getMessageCenter().notify(msg); } }); }