modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleSummaryStep.java | 11 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDataStep.java | 11 ++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/DeployStep.java | 9 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDeploymentConfigStep.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDeploymentInfoStep.java | 9 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDeploymentOptionsStep.java | 9 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDestinationStep.java | 9 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/SelectBundleStep.java | 9 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/SelectBundleVersionStep.java | 9 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/revert/ConfirmationStep.java | 9 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/revert/GetRevertInfoStep.java | 10 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/revert/RevertStep.java | 9 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/AbstractWizardStep.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardStep.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java | 15 +-- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationsPortlet.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryPortlet.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/OperationParametersStep.java | 14 ++- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/OperationSchedulingStep.java | 42 ++++++---- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateStep.java | 12 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupMembersStep.java | 9 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryConfigurationStep.java | 9 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryInfoStep.java | 12 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryPackageStep.java | 15 ++- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceSelector.java | 2 28 files changed, 181 insertions(+), 74 deletions(-)
New commits: commit cc05acd3b90f8f437977cf3eff1743978b00f7b2 Author: Simeon Pinder spinder@redhat.com Date: Fri Jan 7 09:39:17 2011 -0500
added code to make wizards include scLocator hierarchy information as well.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java index cdcbc1a..cc50eb8 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java @@ -113,7 +113,7 @@ public class LoginView extends LocatableCanvas { loginShowing = true; UserSessionManager.logout();
- form = new LocatableDynamicForm("LoginView"); + form = new LocatableDynamicForm(extendLocatorId("LoginView")); form.setMargin(25); form.setAutoFocus(true); form.setShowErrorText(true); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleSummaryStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleSummaryStep.java index 8a886bd..f781c95 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleSummaryStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleSummaryStep.java @@ -21,11 +21,11 @@ package org.rhq.enterprise.gui.coregui.client.bundle.create; import com.smartgwt.client.types.Alignment; import com.smartgwt.client.types.VerticalAlignment; import com.smartgwt.client.widgets.Canvas; -import com.smartgwt.client.widgets.form.DynamicForm; import com.smartgwt.client.widgets.form.fields.StaticTextItem;
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.util.selenium.Locatable; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
/** @@ -39,9 +39,14 @@ public class BundleSummaryStep extends AbstractWizardStep { this.wizard = bundleCreationWizard; }
- public Canvas getCanvas() { + public Canvas getCanvas(Locatable parent) {
- DynamicForm form = new LocatableDynamicForm("BundleCreateSummary"); + LocatableDynamicForm form; + if (parent != null) { + form = new LocatableDynamicForm(parent.extendLocatorId("BundleCreateSummary")); + } else { + form = new LocatableDynamicForm("BundleCreateSummary"); + } form.setNumCols(2); form.setMargin(20);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDataStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDataStep.java index 0423952..9fa7dd2 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDataStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDataStep.java @@ -42,6 +42,7 @@ 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.message.Message; import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity; +import org.rhq.enterprise.gui.coregui.client.util.selenium.Locatable; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
public class BundleUploadDataStep extends AbstractWizardStep { @@ -55,8 +56,14 @@ public class BundleUploadDataStep extends AbstractWizardStep { this.wizard = bundleCreationWizard; }
- public Canvas getCanvas() { - final VLayout mainLayout = new LocatableVLayout("BundleCreateUploadData"); + public Canvas getCanvas(Locatable parent) { + final LocatableVLayout mainLayout; + if (parent != null) { + mainLayout = new LocatableVLayout(parent.extendLocatorId("BundleCreateUploadData")); + } else { + mainLayout = new LocatableVLayout("BundleCreateUploadData"); + } + mainLayout.setMargin(Integer.valueOf(20)); mainLayout.setWidth100(); mainLayout.setHeight(10); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java index 32df859..4678bbe 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java @@ -48,6 +48,7 @@ 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.message.Message; import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity; +import org.rhq.enterprise.gui.coregui.client.util.selenium.Locatable; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
public class BundleUploadDistroFileStep extends AbstractWizardStep { @@ -68,7 +69,7 @@ public class BundleUploadDistroFileStep extends AbstractWizardStep { this.wizard = bundleCreationWizard; }
- public Canvas getCanvas() { + public Canvas getCanvas(Locatable parent) { if (mainCanvasForm == null) { LinkedHashMap<String, DynamicForm> radioItems = new LinkedHashMap<String, DynamicForm>(); radioItems.put(URL_OPTION, createUrlForm()); 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 619cd3e..1933ac0 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 @@ -35,6 +35,7 @@ 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.Locatable; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/** @@ -56,9 +57,13 @@ public class DeployStep extends AbstractWizardStep { return MSG.view_bundle_deployWizard_deployStep(); }
- public Canvas getCanvas() { + public Canvas getCanvas(Locatable parent) { if (canvas == null) { - canvas = new LocatableVLayout("BundleDeployDeploy"); + if (parent != null) { + canvas = new LocatableVLayout(parent.extendLocatorId("BundleDeployDeploy")); + } else { + canvas = new LocatableVLayout("BundleDeployDeploy"); + } canvas.setWidth100(); canvas.setHeight100(); canvas.setAlign(Alignment.CENTER); 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 736acba..a7840f4 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 @@ -27,6 +27,7 @@ import org.rhq.core.domain.configuration.definition.ConfigurationTemplate; import org.rhq.enterprise.gui.coregui.client.components.HeaderLabel; import org.rhq.enterprise.gui.coregui.client.components.configuration.ConfigurationEditor; import org.rhq.enterprise.gui.coregui.client.components.wizard.AbstractWizardStep; +import org.rhq.enterprise.gui.coregui.client.util.selenium.Locatable;
public class GetDeploymentConfigStep extends AbstractWizardStep {
@@ -41,7 +42,7 @@ public class GetDeploymentConfigStep extends AbstractWizardStep { return MSG.view_bundle_deployWizard_getConfigStep(); }
- public Canvas getCanvas() { + public Canvas getCanvas(Locatable parent) { if (null == editor) { ConfigurationDefinition configDef = wizard.getBundleVersion().getConfigurationDefinition();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDeploymentInfoStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDeploymentInfoStep.java index 9416294..2c5694d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDeploymentInfoStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDeploymentInfoStep.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.selenium.Locatable; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
/** @@ -51,9 +52,13 @@ public class GetDeploymentInfoStep extends AbstractWizardStep { return MSG.view_bundle_deployWizard_getInfoStep(); }
- public Canvas getCanvas() { + public Canvas getCanvas(Locatable parent) { if (form == null) { - form = new LocatableDynamicForm("BundleDeployGetDepInfo"); + if (parent != null) { + form = new LocatableDynamicForm(parent.extendLocatorId("BundleDeployGetDepInfo")); + } else { + form = new LocatableDynamicForm("BundleDeployGetDepInfo"); + } form.setWidth100(); form.setNumCols(2); form.setColWidths("50%", "*"); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDeploymentOptionsStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDeploymentOptionsStep.java index 625738d..a29547b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDeploymentOptionsStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDeploymentOptionsStep.java @@ -27,6 +27,7 @@ import com.smartgwt.client.widgets.form.fields.events.ChangedEvent; import com.smartgwt.client.widgets.form.fields.events.ChangedHandler;
import org.rhq.enterprise.gui.coregui.client.components.wizard.AbstractWizardStep; +import org.rhq.enterprise.gui.coregui.client.util.selenium.Locatable; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
public class GetDeploymentOptionsStep extends AbstractWizardStep { @@ -46,9 +47,13 @@ public class GetDeploymentOptionsStep extends AbstractWizardStep { return "Deploy Options"; }
- public Canvas getCanvas() { + public Canvas getCanvas(Locatable parent) { if (form == null) { - form = new LocatableDynamicForm("BundleDeployGetDepOptions"); + if (parent != null) { + form = new LocatableDynamicForm(parent.extendLocatorId("BundleDeployGetDepOptions")); + } else { + form = new LocatableDynamicForm("BundleDeployGetDepOptions"); + } form.setWidth100(); form.setNumCols(2); form.setColWidths("50%", "*"); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDestinationStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDestinationStep.java index 615f0ab..b6c081b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDestinationStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDestinationStep.java @@ -38,6 +38,7 @@ 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.message.Message; import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity; +import org.rhq.enterprise.gui.coregui.client.util.selenium.Locatable; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
public class GetDestinationStep extends AbstractWizardStep { @@ -58,9 +59,13 @@ public class GetDestinationStep extends AbstractWizardStep { return MSG.view_bundle_deployWizard_getDestStep(); }
- public Canvas getCanvas() { + public Canvas getCanvas(Locatable parent) { if (this.form == null) { - this.form = new LocatableVLayout("BundleDeployGetDest"); + if (parent != null) { + this.form = new LocatableVLayout(parent.extendLocatorId("BundleDeployGetDest")); + } else { + this.form = new LocatableVLayout("BundleDeployGetDest"); + }
this.valForm.setWidth100(); this.valForm.setNumCols(2); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/SelectBundleStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/SelectBundleStep.java index 9dd3420..d04569b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/SelectBundleStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/SelectBundleStep.java @@ -27,6 +27,7 @@ import org.rhq.core.domain.bundle.Bundle; import org.rhq.enterprise.gui.coregui.client.bundle.BundleSelector; import org.rhq.enterprise.gui.coregui.client.components.selector.AbstractSelector; import org.rhq.enterprise.gui.coregui.client.components.wizard.AbstractWizardStep; +import org.rhq.enterprise.gui.coregui.client.util.selenium.Locatable;
public class SelectBundleStep extends AbstractWizardStep {
@@ -42,8 +43,12 @@ public class SelectBundleStep extends AbstractWizardStep { return MSG.view_bundle_deployWizard_selectBundleStep(); }
- public Canvas getCanvas() { - this.selector = new BundleSelector("BundleDeploySelectBundle"); + public Canvas getCanvas(Locatable parent) { + if (parent != null) { + this.selector = new BundleSelector(parent.extendLocatorId("BundleDeploySelectBundle")); + } else { + this.selector = new BundleSelector("BundleDeploySelectBundle"); + } return this.selector; }
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/SelectBundleVersionStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/SelectBundleVersionStep.java index 750bb6a..e1367e8 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/SelectBundleVersionStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/SelectBundleVersionStep.java @@ -37,6 +37,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.selenium.Locatable; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
public class SelectBundleVersionStep extends AbstractWizardStep { @@ -65,9 +66,13 @@ public class SelectBundleVersionStep extends AbstractWizardStep { return MSG.view_bundle_deployWizard_selectVersionStep(); }
- public Canvas getCanvas() { + public Canvas getCanvas(Locatable parent) { if (form == null) { - form = new LocatableDynamicForm("BundleDeploySelectBundleVersion"); + if (parent != null) { + form = new LocatableDynamicForm(parent.extendLocatorId("BundleDeploySelectBundleVersion")); + } else { + form = new LocatableDynamicForm("BundleDeploySelectBundleVersion"); + } form.setWidth100(); form.setNumCols(2); form.setColWidths("50%", "*"); 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 0f86d64..c8abfb5 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 @@ -37,6 +37,7 @@ import org.rhq.enterprise.gui.coregui.client.components.wizard.AbstractWizardSte 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.message.Message; +import org.rhq.enterprise.gui.coregui.client.util.selenium.Locatable; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/** @@ -58,9 +59,13 @@ public class ConfirmationStep extends AbstractWizardStep { return MSG.view_bundle_revertWizard_confirmStep_name(); }
- public Canvas getCanvas() { + public Canvas getCanvas(Locatable parent) { if (layout == null) { - layout = new LocatableVLayout("BundleRevertConfirmation"); + if (parent != null) { + layout = new LocatableVLayout(parent.extendLocatorId("BundleRevertConfirmation")); + } else { + layout = new LocatableVLayout("BundleRevertConfirmation"); + } layout.setMembersMargin(10);
BundleDeploymentCriteria c = new BundleDeploymentCriteria(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/revert/GetRevertInfoStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/revert/GetRevertInfoStep.java index f78bec5..552ab4d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/revert/GetRevertInfoStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/revert/GetRevertInfoStep.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.selenium.Locatable; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
/** @@ -51,9 +52,14 @@ public class GetRevertInfoStep extends AbstractWizardStep { return MSG.view_bundle_revertWizard_getInfoStep_name(); }
- public Canvas getCanvas() { + public Canvas getCanvas(Locatable parent) { if (form == null) { - form = new LocatableDynamicForm("BundleRevertGetRevertInfo"); + if (parent != null) { + form = new LocatableDynamicForm(parent.extendLocatorId("BundleRevertGetRevertInfo")); + } else { + form = new LocatableDynamicForm("BundleRevertGetRevertInfo"); + } + form.setWidth100(); form.setNumCols(2); form.setColWidths("50%", "*"); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/revert/RevertStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/revert/RevertStep.java index bfef06c..eb4de42 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/revert/RevertStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/revert/RevertStep.java @@ -33,6 +33,7 @@ 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.message.Message; import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity; +import org.rhq.enterprise.gui.coregui.client.util.selenium.Locatable; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/** @@ -54,9 +55,13 @@ public class RevertStep extends AbstractWizardStep { return MSG.view_bundle_revertWizard_revertStep_name(); }
- public Canvas getCanvas() { + public Canvas getCanvas(Locatable parent) { if (canvas == null) { - canvas = new LocatableVLayout("BundleRevertRevert"); + if (parent != null) { + canvas = new LocatableVLayout(parent.extendLocatorId("BundleRevertRevert")); + } else { + canvas = new LocatableVLayout("BundleRevertRevert"); + } canvas.setWidth100(); canvas.setHeight100(); canvas.setAlign(Alignment.CENTER); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/AbstractWizardStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/AbstractWizardStep.java index 1fd87f8..299d0f2 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/AbstractWizardStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/AbstractWizardStep.java @@ -20,9 +20,11 @@ package org.rhq.enterprise.gui.coregui.client.components.wizard;
import com.smartgwt.client.widgets.Canvas;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.Locatable; + public abstract class AbstractWizardStep implements WizardStep {
- abstract public Canvas getCanvas(); + abstract public Canvas getCanvas(Locatable parent);
abstract public String getName();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardStep.java index 958f0ed..f5005c0 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardStep.java @@ -22,6 +22,7 @@ import com.smartgwt.client.widgets.Canvas;
import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.Messages; +import org.rhq.enterprise.gui.coregui.client.util.selenium.Locatable;
/** * @author Greg Hinkle @@ -30,7 +31,7 @@ public interface WizardStep {
Messages MSG = CoreGUI.getMessages();
- Canvas getCanvas(); + Canvas getCanvas(Locatable parent);
boolean nextPage();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java index 38c4b1c..8d1ba38 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java @@ -246,8 +246,7 @@ public class WizardView extends LocatableVLayout { if (currentCanvas != null) { contentLayout.removeMember(currentCanvas); } - // currentCanvas = wizardSteps.get(currentStep).getCanvas(); - currentCanvas = wizardSteps.get(currentStep).getCanvas(); + currentCanvas = wizardSteps.get(currentStep).getCanvas(this); createdCanvases.add(currentCanvas);
contentLayout.addMember(currentCanvas); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/OperationParametersStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/OperationParametersStep.java index 91fae90..8ce2ada 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/OperationParametersStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/OperationParametersStep.java @@ -26,6 +26,7 @@ import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; import org.rhq.core.domain.operation.OperationDefinition; import org.rhq.enterprise.gui.coregui.client.components.configuration.ConfigurationEditor; import org.rhq.enterprise.gui.coregui.client.components.wizard.AbstractWizardStep; +import org.rhq.enterprise.gui.coregui.client.util.selenium.Locatable;
/** * @author Greg Hinkle @@ -41,15 +42,20 @@ public class OperationParametersStep extends AbstractWizardStep { this.definition = operationDefinition; }
- public Canvas getCanvas() { + public Canvas getCanvas(Locatable parent) { if (definition.getParametersConfigurationDefinition() != null) { if (configurationEditor == null) { ConfigurationDefinition configurationDefinition = definition.getParametersConfigurationDefinition(); Configuration defaultConfiguration = configurationDefinition.getDefaultTemplate() != null ? configurationDefinition .getDefaultTemplate().createConfiguration() : new Configuration(); - configurationEditor = new ConfigurationEditor("OperationParams", configurationDefinition, - defaultConfiguration); + if (parent != null) { + configurationEditor = new ConfigurationEditor(parent.extendLocatorId("OperationParams"), + configurationDefinition, defaultConfiguration); + } else { + configurationEditor = new ConfigurationEditor("OperationParams", configurationDefinition, + defaultConfiguration); + } } return configurationEditor; } else { @@ -68,5 +74,5 @@ public class OperationParametersStep extends AbstractWizardStep { public Configuration getParameterConfiguration() { return configurationEditor != null ? configurationEditor.getConfiguration() : null; } - + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/OperationSchedulingStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/OperationSchedulingStep.java index ec0e40f..1db4791 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/OperationSchedulingStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/OperationSchedulingStep.java @@ -46,6 +46,7 @@ import com.smartgwt.client.widgets.form.fields.TimeItem; import com.smartgwt.client.widgets.form.validator.CustomValidator;
import org.rhq.enterprise.gui.coregui.client.components.wizard.AbstractWizardStep; +import org.rhq.enterprise.gui.coregui.client.util.selenium.Locatable; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
/** @@ -58,11 +59,15 @@ public class OperationSchedulingStep extends AbstractWizardStep implements ItemC
private ExecutionSchedule executionSchedule = new ExecutionSchedule();
- public Canvas getCanvas() { + public Canvas getCanvas(Locatable parent) {
if (form == null) { valuesManager = new ValuesManager(); - form = new LocatableDynamicForm("OperationScheduling"); + if (parent != null) { + form = new LocatableDynamicForm(parent.extendLocatorId("OperationScheduling")); + } else { + form = new LocatableDynamicForm("OperationScheduling"); + } form.setValuesManager(valuesManager); form.setWrapItemTitles(false); form.setErrorOrientation(FormErrorOrientation.RIGHT); @@ -72,8 +77,8 @@ public class OperationSchedulingStep extends AbstractWizardStep implements ItemC // form.setColWidths("15%", "35%", "15%", "*"); form.setValidateOnChange(true);
- final RadioGroupItem start = new RadioGroupItem("start", - MSG.view_operationCreateWizard_schedulingStep_name()); + final RadioGroupItem start = new RadioGroupItem("start", MSG + .view_operationCreateWizard_schedulingStep_name()); start.setColSpan(3); start.setValueMap(enumValueMap(ExecutionSchedule.Start.class)); // "Immediately", "Future" start.setRedrawOnChange(true); @@ -87,8 +92,8 @@ public class OperationSchedulingStep extends AbstractWizardStep implements ItemC } });
- RadioGroupItem recurr = new RadioGroupItem("recurr", - MSG.view_operationCreateWizard_schedulingStep_label_recurrence()); + RadioGroupItem recurr = new RadioGroupItem("recurr", MSG + .view_operationCreateWizard_schedulingStep_label_recurrence()); recurr.setValueMap(enumValueMap(ExecutionSchedule.Recurr.class)); // "Once", "EveryNMinutes", "Hourly", "Daily", "Weekly", "Monthly"); recurr.setRedrawOnChange(true); recurr.setValue(ExecutionSchedule.Recurr.Once.name()); @@ -108,8 +113,8 @@ public class OperationSchedulingStep extends AbstractWizardStep implements ItemC } });
- CanvasItem everyNMinuteForm = new CanvasItem("everyNMinutesForm", - MSG.view_operationCreateWizard_schedulingStep_label_everyNMinutes()); + CanvasItem everyNMinuteForm = new CanvasItem("everyNMinutesForm", MSG + .view_operationCreateWizard_schedulingStep_label_everyNMinutes()); everyNMinuteForm.setShowTitle(false); everyNMinuteForm.setCanvas(getEveryNMinutesForm()); everyNMinuteForm.setShowIfCondition(new FormItemIfFunction() { @@ -119,7 +124,8 @@ public class OperationSchedulingStep extends AbstractWizardStep implements ItemC } });
- CanvasItem hourlyForm = new CanvasItem("hourlyForm", MSG.view_operationCreateWizard_schedulingStep_label_hourly()); + CanvasItem hourlyForm = new CanvasItem("hourlyForm", MSG + .view_operationCreateWizard_schedulingStep_label_hourly()); hourlyForm.setShowTitle(false); hourlyForm.setCanvas(getHourlyForm()); hourlyForm.setShowIfCondition(new FormItemIfFunction() { @@ -139,7 +145,8 @@ public class OperationSchedulingStep extends AbstractWizardStep implements ItemC } });
- CanvasItem weeklyForm = new CanvasItem("weekly", MSG.view_operationCreateWizard_schedulingStep_label_weekly()); + CanvasItem weeklyForm = new CanvasItem("weekly", MSG + .view_operationCreateWizard_schedulingStep_label_weekly()); weeklyForm.setShowTitle(false); weeklyForm.setCanvas(getWeeklyForm()); weeklyForm.setShowIfCondition(new FormItemIfFunction() { @@ -149,7 +156,8 @@ public class OperationSchedulingStep extends AbstractWizardStep implements ItemC } });
- CanvasItem monthlyForm = new CanvasItem("monthly", MSG.view_operationCreateWizard_schedulingStep_label_monthly()); + CanvasItem monthlyForm = new CanvasItem("monthly", MSG + .view_operationCreateWizard_schedulingStep_label_monthly()); monthlyForm.setShowTitle(false); monthlyForm.setCanvas(getMonthlyForm()); monthlyForm.setShowIfCondition(new FormItemIfFunction() { @@ -168,7 +176,8 @@ public class OperationSchedulingStep extends AbstractWizardStep implements ItemC } });
- DateItem startDate = new DateItem("startDate", MSG.view_operationCreateWizard_schedulingStep_label_startDate()); + DateItem startDate = new DateItem("startDate", MSG + .view_operationCreateWizard_schedulingStep_label_startDate()); startDate.setStartRow(true); startDate.setStartDate(new Date()); startDate.setShowIfCondition(new FormItemIfFunction() { @@ -178,7 +187,8 @@ public class OperationSchedulingStep extends AbstractWizardStep implements ItemC } });
- final RadioGroupItem end = new RadioGroupItem("endType", MSG.view_operationCreateWizard_schedulingStep_label_endDate()); + final RadioGroupItem end = new RadioGroupItem("endType", MSG + .view_operationCreateWizard_schedulingStep_label_endDate()); end.setShowIfCondition(new FormItemIfFunction() { public boolean execute(FormItem formItem, Object o, DynamicForm dynamicForm) { return !ExecutionSchedule.Start.Immediately.name().equals(form.getValueAsString("start")) @@ -235,10 +245,12 @@ public class OperationSchedulingStep extends AbstractWizardStep implements ItemC form.setWrapItemTitles(false); form.setNumCols(2);
- DateItem startDate = new DateItem("onceStartDate", MSG.view_operationCreateWizard_schedulingStep_label_startDate()); + DateItem startDate = new DateItem("onceStartDate", MSG + .view_operationCreateWizard_schedulingStep_label_startDate()); startDate.setValue(new Date());
- TimeItem startTime = new TimeItem("onceStartDate", MSG.view_operationCreateWizard_schedulingStep_label_startDate()); + TimeItem startTime = new TimeItem("onceStartDate", MSG + .view_operationCreateWizard_schedulingStep_label_startDate()); startTime.setValue(new Date()); startTime.setDisplayFormat(TimeFormatter.TOSHORTPADDEDTIME); startTime.setUseMask(true); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateStep.java index d227dbe..03d3198 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateStep.java @@ -31,6 +31,7 @@ import com.smartgwt.client.widgets.form.fields.TextItem;
import org.rhq.core.domain.resource.group.ResourceGroup; import org.rhq.enterprise.gui.coregui.client.components.wizard.AbstractWizardStep; +import org.rhq.enterprise.gui.coregui.client.util.selenium.Locatable; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
/** @@ -40,11 +41,15 @@ public class GroupCreateStep extends AbstractWizardStep {
private LocatableDynamicForm form;
- public Canvas getCanvas() { + public Canvas getCanvas(Locatable parent) {
if (form == null) {
- form = new LocatableDynamicForm("GroupCreate"); + if (parent != null) { + form = new LocatableDynamicForm(parent.extendLocatorId("GroupCreate")); + } else { + form = new LocatableDynamicForm("GroupCreate"); + } form.setValuesManager(new ValuesManager()); form.setWidth100(); form.setNumCols(2); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupMembersStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupMembersStep.java index 3151742..0f8fe84 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupMembersStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupMembersStep.java @@ -28,6 +28,7 @@ import com.smartgwt.client.widgets.Canvas;
import org.rhq.enterprise.gui.coregui.client.components.wizard.AbstractWizardStep; import org.rhq.enterprise.gui.coregui.client.inventory.resource.selection.ResourceSelector; +import org.rhq.enterprise.gui.coregui.client.util.selenium.Locatable;
/** * @author Greg Hinkle @@ -41,9 +42,13 @@ public class GroupMembersStep extends AbstractWizardStep { this.wizard = wizard; }
- public Canvas getCanvas() { + public Canvas getCanvas(Locatable parent) { if (selector == null) { - selector = new ResourceSelector("GroupMembers"); + if (parent != null) { + selector = new ResourceSelector(parent.extendLocatorId("GroupMembers")); + } else { + selector = new ResourceSelector("GroupMembers"); + } } return selector; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryConfigurationStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryConfigurationStep.java index 63d8220..efa297c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryConfigurationStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryConfigurationStep.java @@ -24,6 +24,7 @@ import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; import org.rhq.enterprise.gui.coregui.client.components.configuration.ConfigurationEditor; import org.rhq.enterprise.gui.coregui.client.components.wizard.AbstractWizardStep; +import org.rhq.enterprise.gui.coregui.client.util.selenium.Locatable;
/** * @author Jay Shaughnessy @@ -38,13 +39,17 @@ public class ResourceFactoryConfigurationStep extends AbstractWizardStep { this.wizard = wizard; }
- public Canvas getCanvas() { + public Canvas getCanvas(Locatable parent) { if (editor == null) {
ConfigurationDefinition def = wizard.getNewResourceConfigurationDefinition(); Configuration startingConfig = wizard.getNewResourceStartingConfiguration();
- editor = new ConfigurationEditor("ResourceFactoryConfig", def, startingConfig); + if (parent != null) { + editor = new ConfigurationEditor(parent.extendLocatorId("ResourceFactoryConfig"), def, startingConfig); + } else { + editor = new ConfigurationEditor("ResourceFactoryConfig", def, startingConfig); + } } return editor; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryInfoStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryInfoStep.java index d4ef05b..ad2e1d2 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryInfoStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryInfoStep.java @@ -39,6 +39,7 @@ import org.rhq.core.domain.content.Architecture; 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.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.util.selenium.Locatable; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
/** @@ -74,10 +75,14 @@ public class ResourceFactoryInfoStep extends AbstractWizardStep { this.templates = templates; }
- public Canvas getCanvas() { + public Canvas getCanvas(Locatable parent) { if (form == null) {
- form = new LocatableDynamicForm("ResFactInfo"); + if (parent != null) { + form = new LocatableDynamicForm(parent.extendLocatorId("ResFactInfo")); + } else { + form = new LocatableDynamicForm("ResFactInfo"); + } form.setNumCols(1); List<FormItem> formItems = new ArrayList<FormItem>(2);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryPackageStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryPackageStep.java index ddde67d..3ae99b1 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryPackageStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryPackageStep.java @@ -29,6 +29,7 @@ import org.rhq.enterprise.gui.coregui.client.components.upload.PackageVersionFil import org.rhq.enterprise.gui.coregui.client.components.wizard.AbstractWizardStep; 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.Locatable;
/** * @author Jay Shaughnessy @@ -44,12 +45,18 @@ public class ResourceFactoryPackageStep extends AbstractWizardStep { this.wizard = wizard; }
- public Canvas getCanvas() { + public Canvas getCanvas(Locatable parent) { if (null == form) {
- form = new PackageVersionFileUploadForm("ResFactPackageStep", wizard.getNewResourcePackageType().getId(), - wizard.getChildType().getName(), wizard.getNewResourceVersion(), wizard.getNewResourceArchitectureId(), - true, null); + if (parent != null) { + form = new PackageVersionFileUploadForm(parent.extendLocatorId("ResFactPackageStep"), wizard + .getNewResourcePackageType().getId(), wizard.getChildType().getName(), wizard + .getNewResourceVersion(), wizard.getNewResourceArchitectureId(), true, null); + } else { + form = new PackageVersionFileUploadForm("ResFactPackageStep", wizard.getNewResourcePackageType() + .getId(), wizard.getChildType().getName(), wizard.getNewResourceVersion(), wizard + .getNewResourceArchitectureId(), true, null); + } form.setPadding(20); form.addFormHandler(new DynamicFormHandler() { public void onSubmitComplete(DynamicFormSubmitCompleteEvent event) {
commit 62953e448515945c0dcb660ed46e67bdd0f6a617 Author: Simeon Pinder spinder@redhat.com Date: Fri Jan 7 08:29:56 2011 -0500
fix numerous locatorId hierarchy issues.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java index cbd57ab..38c4b1c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java @@ -33,17 +33,17 @@ import com.smartgwt.client.widgets.events.CloseClickHandler; import com.smartgwt.client.widgets.events.CloseClientEvent; import com.smartgwt.client.widgets.layout.HLayout; import com.smartgwt.client.widgets.layout.LayoutSpacer; -import com.smartgwt.client.widgets.layout.VLayout; import com.smartgwt.client.widgets.toolbar.ToolStrip;
import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.Messages; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableIButton; +import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/** * @author Greg Hinkle */ -public class WizardView extends VLayout { +public class WizardView extends LocatableVLayout { static private final Messages MSG = CoreGUI.getMessages();
static private final String CANCEL = MSG.common_button_cancel(); @@ -76,7 +76,8 @@ public class WizardView extends VLayout { HashSet<Canvas> createdCanvases = new HashSet<Canvas>();
public WizardView(Wizard wizard) { - super(10); + super("WizardView", 10); + this.wizard = wizard; }
@@ -161,7 +162,7 @@ public class WizardView extends VLayout { }
private void setupButtons() { - cancelButton = new LocatableIButton("Cancel", CANCEL); + cancelButton = new LocatableIButton(extendLocatorId("Cancel"), CANCEL); cancelButton.setDisabled(false); cancelButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { @@ -169,7 +170,7 @@ public class WizardView extends VLayout { closeDialog(); } }); - previousButton = new LocatableIButton("Previous", PREVIOUS); + previousButton = new LocatableIButton(extendLocatorId("Previous"), PREVIOUS); previousButton.setDisabled(true); previousButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { @@ -180,7 +181,7 @@ public class WizardView extends VLayout { } } }); - nextButton = new LocatableIButton("Next", NEXT); + nextButton = new LocatableIButton(extendLocatorId("Next"), NEXT); nextButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) {
@@ -245,6 +246,7 @@ public class WizardView extends VLayout { if (currentCanvas != null) { contentLayout.removeMember(currentCanvas); } + // currentCanvas = wizardSteps.get(currentStep).getCanvas(); currentCanvas = wizardSteps.get(currentStep).getCanvas(); createdCanvases.add(currentCanvas);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java index fa119f9..c71af20 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java @@ -276,7 +276,7 @@ public class RecentAlertsPortlet extends AlertHistoryView implements CustomSetti VLayout column = new VLayout();
//label - LocatableLabel alertRangeLabel = new LocatableLabel("DynamicForm_Label_Alert_Range", "<b>" + LocatableLabel alertRangeLabel = new LocatableLabel(extendLocatorId("DynamicForm_Label_Alert_Range"), "<b>" + MSG.common_title_alert_range() + "</b>");
//horizontal layout diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationsPortlet.java index d98fef3..2ae9084 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationsPortlet.java @@ -201,7 +201,7 @@ public class OperationsPortlet extends LocatableVLayout implements CustomSetting public DynamicForm getCustomSettingsForm() {
//root dynamic form instance - final LocatableDynamicForm form = new LocatableDynamicForm("custom-settings"); + final LocatableDynamicForm form = new LocatableDynamicForm(extendLocatorId("custom-settings"));
//vertical layout VStack column = new VStack(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryPortlet.java index b61ed51..e1d00bc 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryPortlet.java @@ -78,7 +78,7 @@ public class InventorySummaryPortlet extends LocatableVLayout implements AutoRef }
public void onSuccess(InventorySummary summary) { - form = new LocatableDynamicForm("Portlet_Inventory_Summary"); + form = new LocatableDynamicForm(extendLocatorId("Portlet_Inventory_Summary")); List<FormItem> formItems = new ArrayList<FormItem>();
// HeaderItem headerItem = new HeaderItem("header"); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateStep.java index d12da80..d227dbe 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateStep.java @@ -23,7 +23,6 @@ package org.rhq.enterprise.gui.coregui.client.inventory.groups.wizard;
import com.smartgwt.client.widgets.Canvas; -import com.smartgwt.client.widgets.form.DynamicForm; import com.smartgwt.client.widgets.form.ValuesManager; import com.smartgwt.client.widgets.form.fields.AutoFitTextAreaItem; import com.smartgwt.client.widgets.form.fields.CheckboxItem; @@ -39,7 +38,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm; */ public class GroupCreateStep extends AbstractWizardStep {
- private DynamicForm form; + private LocatableDynamicForm form;
public Canvas getCanvas() {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryInfoStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryInfoStep.java index 70b262c..d4ef05b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryInfoStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryInfoStep.java @@ -27,7 +27,6 @@ import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.types.Alignment; import com.smartgwt.client.types.TitleOrientation; import com.smartgwt.client.widgets.Canvas; -import com.smartgwt.client.widgets.form.DynamicForm; import com.smartgwt.client.widgets.form.fields.FormItem; import com.smartgwt.client.widgets.form.fields.SelectItem; import com.smartgwt.client.widgets.form.fields.TextItem; @@ -48,7 +47,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm; */ public class ResourceFactoryInfoStep extends AbstractWizardStep {
- private DynamicForm form; + private LocatableDynamicForm form; private AbstractResourceFactoryWizard wizard; private Map<String, ConfigurationTemplate> templates; private String namePrompt; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceSelector.java index 5f77b9a..1f2701b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceSelector.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceSelector.java @@ -64,7 +64,7 @@ public class ResourceSelector extends AbstractSelector<Resource> {
protected DynamicForm getAvailableFilterForm() { if (null == availableFilterForm) { - availableFilterForm = new LocatableDynamicForm("ResSelectAvailFilterForm"); + availableFilterForm = new LocatableDynamicForm(extendLocatorId("ResSelectAvailFilterForm")); availableFilterForm.setNumCols(6); availableFilterForm.setWidth("75%"); final TextItem search = new TextItem("search", MSG.common_title_search());
rhq-commits@lists.fedorahosted.org