modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/revert/ConfirmationStep.java
| 101 +++++-----
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
| 2
2 files changed, 56 insertions(+), 47 deletions(-)
New commits:
commit eb88d3f495920873b3e469bde1d39024ed6d2f4e
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Mon Dec 20 17:46:48 2010 -0500
fix long message names that are expanding the message center too much - use concise
messages
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/revert/ConfirmationStep.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/revert/ConfirmationStep.java
index 4580301..0f86d64 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/revert/ConfirmationStep.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/revert/ConfirmationStep.java
@@ -73,19 +73,24 @@ public class ConfirmationStep extends AbstractWizardStep {
public void onSuccess(PageList<BundleDeployment>
liveDeployments) {
if (1 != liveDeployments.size()) {
nextPage = false;
+ String messageConcise =
MSG.view_bundle_revertWizard_confirmStep_noLiveDeployment_concise();
String message =
MSG.view_bundle_revertWizard_confirmStep_noLiveDeployment(wizard
.getDestination().toString());
wizard.getView().showMessage(message);
- CoreGUI.getMessageCenter().notify(new Message(message,
Message.Severity.Warning));
+ CoreGUI.getMessageCenter().notify(
+ new Message(messageConcise, message,
Message.Severity.Warning));
}
wizard.setLiveDeployment(liveDeployments.get(0));
wizard.setPreviousDeployment(wizard.getLiveDeployment().getReplacedBundleDeployment());
if (null == wizard.getPreviousDeployment()) {
nextPage = false;
+ String messageConcise = MSG
+
.view_bundle_revertWizard_confirmStep_noPriorDeployment_concise();
String message =
MSG.view_bundle_revertWizard_confirmStep_noPriorDeployment(wizard
.getLiveDeployment().toString(),
wizard.getDestination().toString());
wizard.getView().showMessage(message);
- CoreGUI.getMessageCenter().notify(new Message(message,
Message.Severity.Warning));
+ CoreGUI.getMessageCenter().notify(
+ new Message(messageConcise, message,
Message.Severity.Warning));
}
setLayout();
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
index a34c71c..2c45fbb 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
@@ -922,7 +922,9 @@ view_bundle_revertWizard_getInfoStep_revertDeployDescFull = [REVERT
From]\\n{0}\
view_bundle_revertWizard_getInfoStep_cleanDeploy = Clean Deployment? (this will delete an
old, existing deploy directory prior to starting the revert deployment)
view_bundle_revertWizard_getInfoStep_getNameFailure = Failed to get revert deployment
name
view_bundle_revertWizard_confirmStep_name = Revert Deployment Confirmation
+view_bundle_revertWizard_confirmStep_noLiveDeployment_concise = No live deployment was
found for the destination
view_bundle_revertWizard_confirmStep_noLiveDeployment = No live deployment was found for
the destination [{0}]
+view_bundle_revertWizard_confirmStep_noPriorDeployment_concise = The live deployment
cannot be reverted because there is no prior deployment
view_bundle_revertWizard_confirmStep_noPriorDeployment = The live deployment [{0}] cannot
be reverted because there is no prior deployment for the destination [{1}]
view_bundle_revertWizard_confirmStep_failedToFindLiveDeployment = Failed to find live
deployment; cannot revert
view_bundle_revertWizard_confirmStep_liveDeployment = Live Deployment
commit 7f4a24bd14d2be5763837abab8e04ce35548ec93
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Mon Dec 20 17:46:26 2010 -0500
fix NPE
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/revert/ConfirmationStep.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/revert/ConfirmationStep.java
index 4053fae..4580301 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/revert/ConfirmationStep.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/revert/ConfirmationStep.java
@@ -151,54 +151,56 @@ public class ConfirmationStep extends AbstractWizardStep {
prevHeader.setWidth100();
layout.addMember(prevHeader);
- final DynamicForm prevForm = new DynamicForm();
- prevForm.setNumCols(2);
-
- StaticTextItem prevNameItem = new StaticTextItem("prevName",
MSG.common_title_name());
- prevNameItem.setTitleAlign(Alignment.LEFT);
- prevNameItem.setAlign(Alignment.LEFT);
- prevNameItem.setWrap(false);
- prevNameItem.setWrapTitle(false);
- prevNameItem.setValue(prev.getName());
-
- StaticTextItem prevDescItem = new StaticTextItem("prevDesc",
MSG.common_title_description());
- prevDescItem.setTitleAlign(Alignment.LEFT);
- prevDescItem.setAlign(Alignment.LEFT);
- prevDescItem.setWrap(false);
- prevDescItem.setWrapTitle(false);
- prevDescItem.setTitleVAlign(VerticalAlignment.TOP);
- prevDescItem.setValue((null != prev.getDescription()) ? prev.getDescription() :
MSG.common_val_none());
-
- final StaticTextItem prevVersionItem = new
StaticTextItem("prevVersion", MSG.view_bundle_bundleVersion());
- prevVersionItem.setTitleAlign(Alignment.LEFT);
- prevVersionItem.setAlign(Alignment.LEFT);
- prevVersionItem.setWrap(false);
- prevVersionItem.setWrapTitle(false);
- if (prev.getBundleVersion().getVersion() == null) {
- BundleVersionCriteria c = new BundleVersionCriteria();
- c.addFilterId(prev.getBundleVersion().getId());
- bundleServer.findBundleVersionsByCriteria(c, new
AsyncCallback<PageList<BundleVersion>>() {
-
- @Override
- public void onSuccess(PageList<BundleVersion> result) {
- if (result != null && result.size() == 1) {
- prevVersionItem.setValue(result.get(0).getVersion());
+ if (prev != null) {
+ final DynamicForm prevForm = new DynamicForm();
+ prevForm.setNumCols(2);
+
+ StaticTextItem prevNameItem = new StaticTextItem("prevName",
MSG.common_title_name());
+ prevNameItem.setTitleAlign(Alignment.LEFT);
+ prevNameItem.setAlign(Alignment.LEFT);
+ prevNameItem.setWrap(false);
+ prevNameItem.setWrapTitle(false);
+ prevNameItem.setValue(prev.getName());
+
+ StaticTextItem prevDescItem = new StaticTextItem("prevDesc",
MSG.common_title_description());
+ prevDescItem.setTitleAlign(Alignment.LEFT);
+ prevDescItem.setAlign(Alignment.LEFT);
+ prevDescItem.setWrap(false);
+ prevDescItem.setWrapTitle(false);
+ prevDescItem.setTitleVAlign(VerticalAlignment.TOP);
+ prevDescItem.setValue((null != prev.getDescription()) ? prev.getDescription()
: MSG.common_val_none());
+
+ final StaticTextItem prevVersionItem = new
StaticTextItem("prevVersion", MSG.view_bundle_bundleVersion());
+ prevVersionItem.setTitleAlign(Alignment.LEFT);
+ prevVersionItem.setAlign(Alignment.LEFT);
+ prevVersionItem.setWrap(false);
+ prevVersionItem.setWrapTitle(false);
+ if (prev.getBundleVersion().getVersion() == null) {
+ BundleVersionCriteria c = new BundleVersionCriteria();
+ c.addFilterId(prev.getBundleVersion().getId());
+ bundleServer.findBundleVersionsByCriteria(c, new
AsyncCallback<PageList<BundleVersion>>() {
+
+ @Override
+ public void onSuccess(PageList<BundleVersion> result) {
+ if (result != null && result.size() == 1) {
+ prevVersionItem.setValue(result.get(0).getVersion());
+ prevForm.markForRedraw();
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable caught) {
+ prevVersionItem.setValue("?");
prevForm.markForRedraw();
}
- }
-
- @Override
- public void onFailure(Throwable caught) {
- prevVersionItem.setValue("?");
- prevForm.markForRedraw();
- }
- });
- } else {
- prevVersionItem.setValue(prev.getBundleVersion().getVersion());
- }
+ });
+ } else {
+ prevVersionItem.setValue(prev.getBundleVersion().getVersion());
+ }
- prevForm.setItems(prevNameItem, prevDescItem, prevVersionItem);
- layout.addMember(prevForm);
+ prevForm.setItems(prevNameItem, prevDescItem, prevVersionItem);
+ layout.addMember(prevForm);
+ }
Label confirmation = new Label();
confirmation.setContents("<b>" +
MSG.view_bundle_revertWizard_confirmStep_confirmation() + "</b>");
Show replies by date