modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/Footer.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AgentPluginDetailView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/DownloadsView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/ServerPluginControlView.java | 17 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/ServerPluginDetailView.java | 10 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/SystemSettingsView.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/agent/install/RemoteAgentInstallView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java | 27 +-- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleResourceGroupSelector.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/AlertDefinitionTemplateTypeView.java | 11 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/DriftDefinitionTemplateTypeView.java | 10 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/MetricTemplateTypeView.java | 7 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeView.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/TemplateSchedulesView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupDetailView.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDetailView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventDetailView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDetailView.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java | 13 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractNotificationSenderForm.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/CliNotificationSenderForm.java | 20 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsAlertDefinitionForm.java | 13 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsEditor.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GroupAlertDefinitionsView.java | 10 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NotificationsAlertDefinitionForm.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsView.java | 7 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceOperationNotificationSenderForm.java | 15 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java | 11 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/TemplateAlertDefinitionsView.java | 7 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDataStep.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/DeployStep.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDestinationStep.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java | 40 ++-- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleResourceDeploymentHistoryListView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java | 42 ++-- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java | 48 ++--- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/revert/ConfirmationStep.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/revert/RevertStep.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java | 53 +++--- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/file/FileListView.java | 10 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/AboutModalWindow.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/TitleBar.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/BookmarkableCarousel.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/Carousel.java | 28 +-- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java | 38 ++-- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/GroupConfigurationEditor.java | 27 +-- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/AbstractRecordEditor.java | 18 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java | 17 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/sorter/ReorderableList.java | 16 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTab.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTab.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTabLayout.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTab.java | 11 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/AbstractTableSection.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java | 24 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tagging/TagEditorView.java | 11 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/trigger/JobTriggerEditor.java | 16 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/AbstractSectionedLeftNavigationView.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java | 15 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java | 15 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortalLayout.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupBundleDeploymentsPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java | 16 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOobsPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/drift/AbstractRecentDriftsPortlet.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourcesPortlet.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/AbstractOperationHistoryPortlet.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationSchedulePortlet.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceEventsPortlet.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryPortlet.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionEditView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplateEditView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplatesView.java | 7 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDetailsView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizardConfigStep.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftPinTemplateWizardConfigStep.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftPinTemplateWizardInfoStep.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/help/HelpView.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricGraphView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractSchedulesView.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/monitoring/IFrameWithMeasurementRangeEditorView.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDetailsView.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDetailsView.java | 10 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionExpressionBuilder.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java | 9 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/GeneralProperties.java | 7 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java | 35 +--- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java | 47 ++--- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/GroupResourceConfigurationEditView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationMembers.java | 7 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationSettings.java | 7 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationTable.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationView.java | 12 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/GroupPluginConfigurationEditView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationMembers.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationSettings.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationTable.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationView.java | 9 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/MembersView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/ResourceGroupMembershipView.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/ResourceGroupResourceSelector.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/ResourceGroupSchedulesView.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMeasurementTableView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMembersHealthView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMonitoringTablesView.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupOperationHistoryDetailsView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDetailsView.java | 10 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java | 13 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ChildHistoryDetails.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java | 36 +--- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java | 44 ++--- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDetailView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationEditView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryDetailView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceAgentView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceGroupSelector.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceGroupsView.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/GraphListView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/LiveGraphView.java | 10 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricGraphView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/ResourceAvailabilityView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/schedules/ResourceSchedulesView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java | 14 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/TimelineView.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/ResourceAutodiscoveryView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryConfigurationStep.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourcePicker.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/SingleResourcePicker.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/PluginTypeTreeView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeTreeView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/DriftComplianceReportResourceSearchView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/inventory/DriftComplianceReport.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/inventory/ResourceInstallReport.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java | 19 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestMessageCenterView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestNumberFormatView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestTopView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestConfigurationView.java | 12 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestGroupConfigurationView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/Enhanced.java | 35 ++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/EnhancedHLayout.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/EnhancedHStack.java | 51 +++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/EnhancedIButton.java | 19 -- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/EnhancedLayout.java | 27 +++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/EnhancedToolStrip.java | 27 +++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/EnhancedVLayout.java | 31 +++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/EnhancedVStack.java | 31 +++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/Locatable.java | 36 ---- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableHStack.java | 86 ---------- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableLayout.java | 43 ----- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableTab.java | 10 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableToolStrip.java | 43 ----- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableTransferImgButton.java | 59 ------ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableVLayout.java | 59 ------ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableVStack.java | 57 ------ 177 files changed, 915 insertions(+), 1166 deletions(-)
New commits: commit f9530e22303ee5f39f5b00c0a621e863f665d70a Author: Jay Shaughnessy jshaughn@redhat.com Date: Fri Feb 22 12:15:00 2013 -0500
If I only had a brain... migrate more Locatables to Enhanced
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/Footer.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/Footer.java index 8e6ade0..fef0d88 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/Footer.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/Footer.java @@ -30,7 +30,7 @@ import org.rhq.enterprise.gui.coregui.client.util.message.MessageBar; import org.rhq.enterprise.gui.coregui.client.util.message.MessageCenterView; import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedHLayout; import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedIButton; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Greg Hinkle @@ -75,8 +75,8 @@ public class Footer extends EnhancedHLayout { addMember(createHSpacer(0)); }
- private LocatableVLayout getMessageCenterButton() { - LocatableVLayout layout = new LocatableVLayout(); + private EnhancedVLayout getMessageCenterButton() { + EnhancedVLayout layout = new EnhancedVLayout(); layout.setMembersMargin(5); layout.setHeight100(); layout.setAlign(Alignment.CENTER); 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 8749176..5d3fb6e 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 @@ -70,7 +70,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTyp import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.message.Message; import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedIButton; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Greg Hinkle @@ -238,7 +238,7 @@ public class LoginView extends Canvas { int fieldWidth = 120;
//Build registration window. - LocatableVLayout column = new LocatableVLayout(); + EnhancedVLayout column = new EnhancedVLayout(); column.setMargin(25); HeaderItem header = new HeaderItem(); //Locate product info for registration screen. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java index 80e521e..4e0ee4a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java @@ -47,7 +47,7 @@ import org.rhq.enterprise.gui.coregui.client.components.view.NavigationItem; import org.rhq.enterprise.gui.coregui.client.components.view.NavigationSection; import org.rhq.enterprise.gui.coregui.client.components.view.ViewFactory; import org.rhq.enterprise.gui.coregui.client.components.view.ViewName; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * The Administration top-level view. @@ -106,7 +106,7 @@ public class AdministrationView extends AbstractSectionedLeftNavigationView { }
protected VLayout defaultView() { - LocatableVLayout vLayout = new LocatableVLayout(); + EnhancedVLayout vLayout = new EnhancedVLayout(); vLayout.setWidth100();
// TODO: Admin icon. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AgentPluginDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AgentPluginDetailView.java index ea7cb67..4dfad2f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AgentPluginDetailView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AgentPluginDetailView.java @@ -36,14 +36,14 @@ import org.rhq.enterprise.gui.coregui.client.ImageManager; import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.gwt.PluginGWTServiceAsync; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * Shows details of an agent plugin. * * @author John Mazzitelli */ -public class AgentPluginDetailView extends LocatableVLayout { +public class AgentPluginDetailView extends EnhancedVLayout {
private final PluginGWTServiceAsync pluginManager = GWTServiceLookup.getPluginService(); private final int pluginId; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/DownloadsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/DownloadsView.java index 74f34b5..5aef971 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/DownloadsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/DownloadsView.java @@ -38,7 +38,7 @@ import org.rhq.enterprise.gui.coregui.client.IconEnum; import org.rhq.enterprise.gui.coregui.client.components.view.ViewName; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.gwt.SystemGWTServiceAsync; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * A simple page to view the downloads the server provides (like @@ -46,7 +46,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; * * @author John Mazzitelli */ -public class DownloadsView extends LocatableVLayout { +public class DownloadsView extends EnhancedVLayout {
public static final ViewName VIEW_ID = new ViewName("Downloads", MSG.view_adminConfig_downloads(), IconEnum.DOWNLOAD); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/ServerPluginControlView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/ServerPluginControlView.java index c923a94..a098d54 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/ServerPluginControlView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/ServerPluginControlView.java @@ -53,27 +53,26 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.gwt.PluginGWTServiceAsync; 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; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVStack; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVStack;
/** * A component used to invoke controls on a server plugin. * * @author John Mazzitelli */ -public class ServerPluginControlView extends LocatableVStack { +public class ServerPluginControlView extends EnhancedVStack {
private final ServerPlugin plugin; private final ArrayList<ServerPluginControlDefinition> controlDefinitions; - private LocatableVLayout paramsLayout; - private LocatableVLayout resultsLayout; + private EnhancedVLayout paramsLayout; + private EnhancedVLayout resultsLayout; private String selectedControlName; private ConfigurationDefinition selectedParamsDef; private ConfigurationEditor selectedParamsEditor; private ConfigurationDefinition selectedResultsDef;
- public ServerPluginControlView(String locatorId, ServerPlugin plugin, - ArrayList<ServerPluginControlDefinition> controlDefs) { + public ServerPluginControlView(ServerPlugin plugin, ArrayList<ServerPluginControlDefinition> controlDefs) { super(); this.plugin = plugin; this.controlDefinitions = controlDefs; @@ -88,11 +87,11 @@ public class ServerPluginControlView extends LocatableVStack { DynamicForm form = new DynamicForm(); addMember(form);
- paramsLayout = new LocatableVLayout(); + paramsLayout = new EnhancedVLayout(); paramsLayout.setVisible(false); addMember(paramsLayout);
- resultsLayout = new LocatableVLayout(); + resultsLayout = new EnhancedVLayout(); resultsLayout.setVisible(false); addMember(resultsLayout);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/ServerPluginDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/ServerPluginDetailView.java index ae760ea..fedfa5a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/ServerPluginDetailView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/ServerPluginDetailView.java @@ -55,14 +55,14 @@ import org.rhq.enterprise.gui.coregui.client.gwt.PluginGWTServiceAsync; 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.EnhancedIButton; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * Shows details of a server plugin. * * @author John Mazzitelli */ -public class ServerPluginDetailView extends LocatableVLayout { +public class ServerPluginDetailView extends EnhancedVLayout {
private final PluginGWTServiceAsync pluginManager = GWTServiceLookup.getPluginService(); private final int pluginId; @@ -164,7 +164,7 @@ public class ServerPluginDetailView extends LocatableVLayout { if (result != null && !result.isEmpty()) { SectionStackSection section = new SectionStackSection(MSG.view_admin_plugins_serverControls()); section.setExpanded(false); - section.addItem(new ServerPluginControlView(extendLocatorId("controlView"), plugin, result)); + section.addItem(new ServerPluginControlView(plugin, result));
controlsSection = section; } @@ -183,7 +183,7 @@ public class ServerPluginDetailView extends LocatableVLayout { pluginManager.getServerPluginConfigurationDefinition(pluginKey, new AsyncCallback<ConfigurationDefinition>() { public void onSuccess(ConfigurationDefinition def) { if (def != null) { - LocatableVLayout layout = new LocatableVLayout(extendLocatorId("pcEditorLayout")); + EnhancedVLayout layout = new EnhancedVLayout();
ToolStrip buttons = new ToolStrip(); buttons.setWidth100(); @@ -269,7 +269,7 @@ public class ServerPluginDetailView extends LocatableVLayout { pluginManager.getServerPluginScheduledJobsDefinition(pluginKey, new AsyncCallback<ConfigurationDefinition>() { public void onSuccess(ConfigurationDefinition def) { if (def != null) { - LocatableVLayout layout = new LocatableVLayout(extendLocatorId("sjEditorLayout")); + EnhancedVLayout layout = new EnhancedVLayout();
ToolStrip buttons = new ToolStrip(); buttons.setWidth100(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/SystemSettingsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/SystemSettingsView.java index d0b9923..684693a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/SystemSettingsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/SystemSettingsView.java @@ -55,21 +55,21 @@ 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.EnhancedIButton; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * A simple form to view and edit the server system settings. * * @author John Mazzitelli */ -public class SystemSettingsView extends LocatableVLayout implements PropertyValueChangeListener { +public class SystemSettingsView extends EnhancedVLayout implements PropertyValueChangeListener {
public static final ViewName VIEW_ID = new ViewName("SystemSettings", MSG.view_adminConfig_systemSettings(), IconEnum.CONFIGURE); public static final String VIEW_PATH = AdministrationView.VIEW_ID + "/" + AdministrationView.SECTION_CONFIGURATION_VIEW_ID + "/" + VIEW_ID;
- private LocatableVLayout canvas; + private EnhancedVLayout canvas; private ConfigurationEditor editor; private IButton saveButton; private IButton dumpToLogButton; @@ -79,7 +79,7 @@ public class SystemSettingsView extends LocatableVLayout implements PropertyValu setHeight100(); setWidth100();
- canvas = new LocatableVLayout("innerLayout"); + canvas = new EnhancedVLayout(); canvas.setHeight100(); canvas.setWidth100(); canvas.setMargin(15); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/agent/install/RemoteAgentInstallView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/agent/install/RemoteAgentInstallView.java index bcc1d3a..a0fde34 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/agent/install/RemoteAgentInstallView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/agent/install/RemoteAgentInstallView.java @@ -53,12 +53,12 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.gwt.RemoteInstallGWTServiceAsync; import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient; import org.rhq.enterprise.gui.coregui.client.util.message.Message; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Greg Hinkle */ -public class RemoteAgentInstallView extends LocatableVLayout { +public class RemoteAgentInstallView extends EnhancedVLayout { public static final ViewName VIEW_ID = new ViewName("RemoteAgentInstall", MSG.view_adminTopology_remoteAgentInstall(), IconEnum.AGENT);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java index 58c7a52..7f1541e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java @@ -49,14 +49,14 @@ import org.rhq.core.domain.common.ProductInfo; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.Messages; import org.rhq.enterprise.gui.coregui.client.util.message.Message; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVStack; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVStack;
/** * An editor for editing the set of RHQ {@link Permission permission}s associated with an RHQ {@link Role role}. * * @author Ian Springer */ -public class PermissionsEditor extends LocatableVStack { +public class PermissionsEditor extends EnhancedVStack {
private static Messages MSG = CoreGUI.getMessages();
@@ -68,7 +68,7 @@ public class PermissionsEditor extends LocatableVStack { private Object originalValue;
public PermissionsEditor(RoleEditView roleEditView, boolean isReadOnly) { - super(roleEditView.extendLocatorId("Permissions")); + super();
this.roleEditView = roleEditView; this.isReadOnly = isReadOnly; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java index 0c2187c..77feb73 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java @@ -53,7 +53,7 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.inventory.resource.selection.ResourceGroupSelector; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTab; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTabSet; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * A form for viewing and/or editing an RHQ {@link Role role}. @@ -134,8 +134,8 @@ public class RoleEditView extends AbstractRecordEditor<RolesDataSource> implemen }
@Override - protected LocatableVLayout buildContentPane() { - LocatableVLayout contentPane = new LocatableVLayout(extendLocatorId("Content")); + protected EnhancedVLayout buildContentPane() { + EnhancedVLayout contentPane = new EnhancedVLayout(); contentPane.setWidth100(); contentPane.setHeight100(); contentPane.setOverflow(Overflow.AUTO); @@ -143,14 +143,14 @@ public class RoleEditView extends AbstractRecordEditor<RolesDataSource> implemen EnhancedDynamicForm form = buildForm(); setForm(form);
- LocatableVLayout topPane = new LocatableVLayout(extendLocatorId("Top")); + EnhancedVLayout topPane = new EnhancedVLayout(); topPane.setWidth100(); topPane.setHeight(80); topPane.addMember(form);
contentPane.addMember(topPane);
- LocatableTabSet tabSet = new LocatableTabSet(contentPane.extendLocatorId("TabSet")); + LocatableTabSet tabSet = new LocatableTabSet(); tabSet.setWidth100(); tabSet.setHeight100();
@@ -177,32 +177,29 @@ public class RoleEditView extends AbstractRecordEditor<RolesDataSource> implemen }
private LocatableTab buildPermissionsTab(LocatableTabSet tabSet) { - LocatableTab tab = new LocatableTab(tabSet.extendLocatorId("Permissions"), MSG.common_title_permissions(), - "global/Locked_16.png"); + LocatableTab tab = new LocatableTab(MSG.common_title_permissions(), "global/Locked_16.png"); // NOTE: We will set the tab content to the permissions editor later once the Role has been fetched.
return tab; }
private LocatableTab buildResourceGroupsTab(LocatableTabSet tabSet) { - LocatableTab tab = new LocatableTab(tabSet.extendLocatorId("ResourceGroups"), - MSG.common_title_resourceGroups(), ImageManager.getGroupIcon(GroupCategory.MIXED)); + LocatableTab tab = new LocatableTab(MSG.common_title_resourceGroups(), + ImageManager.getGroupIcon(GroupCategory.MIXED)); // NOTE: We will set the tab content to the resource group selector later once the Role has been fetched.
return tab; }
private LocatableTab buildSubjectsTab(LocatableTabSet tabSet) { - LocatableTab tab = new LocatableTab(tabSet.extendLocatorId("Users"), MSG.common_title_users(), - "global/User_16.png"); + LocatableTab tab = new LocatableTab(MSG.common_title_users(), "global/User_16.png"); // NOTE: We will set the tab content to the subject selector later once the Role has been fetched.
return tab; }
private LocatableTab buildLdapGroupsTab(LocatableTabSet tabSet) { - LocatableTab tab = new LocatableTab(tabSet.extendLocatorId("LdapGroups"), MSG.common_title_ldapGroups(), - "global/Role_16.png"); + LocatableTab tab = new LocatableTab(MSG.common_title_ldapGroups(), "global/Role_16.png"); // NOTE: We will set the tab content to the LDAP group selector later once the Role has been fetched.
return tab; @@ -241,8 +238,8 @@ public class RoleEditView extends AbstractRecordEditor<RolesDataSource> implemen if (!this.isSystemRole) { Record[] groupRecords = record.getAttributeAsRecordArray(RolesDataSource.Field.RESOURCE_GROUPS); ListGridRecord[] groupListGridRecords = toListGridRecordArray(groupRecords); - this.resourceGroupSelector = new RoleResourceGroupSelector(this.extendLocatorId("Groups"), - groupListGridRecords, !this.hasManageSecurityPermission); + this.resourceGroupSelector = new RoleResourceGroupSelector(groupListGridRecords, + !this.hasManageSecurityPermission); this.resourceGroupSelector.addAssignedItemsChangedHandler(new AssignedItemsChangedHandler() { public void onSelectionChanged(AssignedItemsChangedEvent event) { onItemChanged(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleResourceGroupSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleResourceGroupSelector.java index 3b719da..a6b5154 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleResourceGroupSelector.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleResourceGroupSelector.java @@ -31,9 +31,9 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.selection.Resour */ public class RoleResourceGroupSelector extends ResourceGroupSelector {
- public RoleResourceGroupSelector(String locatorId, ListGridRecord[] groupRecords, boolean isReadOnly) { + public RoleResourceGroupSelector(ListGridRecord[] groupRecords, boolean isReadOnly) { super(isReadOnly); - + setAssigned(groupRecords); }
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/AlertDefinitionTemplateTypeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/AlertDefinitionTemplateTypeView.java index 78bca06..ecc9413 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/AlertDefinitionTemplateTypeView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/AlertDefinitionTemplateTypeView.java @@ -45,14 +45,15 @@ import org.rhq.enterprise.gui.coregui.client.alert.definitions.TemplateAlertDefi import org.rhq.enterprise.gui.coregui.client.components.TitleBar; import org.rhq.enterprise.gui.coregui.client.components.view.ViewName; import org.rhq.enterprise.gui.coregui.client.util.Log; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Jay Shaughnessy */ public class AlertDefinitionTemplateTypeView extends ResourceTypeTreeView {
- public static final ViewName VIEW_ID = new ViewName("AlertDefTemplates", MSG.view_adminConfig_alertDefTemplates(), IconEnum.ALERT_FLAG_BLUE); + public static final ViewName VIEW_ID = new ViewName("AlertDefTemplates", MSG.view_adminConfig_alertDefTemplates(), + IconEnum.ALERT_FLAG_BLUE); public static final String VIEW_PATH = ResourceTypeTreeView.VIEW_PATH + VIEW_ID;
public static final String ATTR_ENABLED_TEMPLATES = "enabledTemplates"; @@ -110,9 +111,7 @@ public class AlertDefinitionTemplateTypeView extends ResourceTypeTreeView {
public void onPermissionsLoaded(Set<Permission> permissions) { final Layout alertCanvas = getCanvas(); - String locatorId = extendLocatorId("alertTemplateDef"); - final TemplateAlertDefinitionsView defsView = new TemplateAlertDefinitionsView(locatorId, type, - permissions); + final TemplateAlertDefinitionsView defsView = new TemplateAlertDefinitionsView(type, permissions); renderTemplateAlertView(alertCanvas, defsView, viewPath); } }); @@ -150,7 +149,7 @@ public class AlertDefinitionTemplateTypeView extends ResourceTypeTreeView {
private Layout getCanvas() { if (null == this.canvas) { - LocatableVLayout layout = new LocatableVLayout(extendLocatorId("alertTemplateLayout")); + EnhancedVLayout layout = new EnhancedVLayout(); layout.setHeight100(); layout.setWidth100(); layout.setMargin(5); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/DriftDefinitionTemplateTypeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/DriftDefinitionTemplateTypeView.java index 07c9ee3..ebeb516 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/DriftDefinitionTemplateTypeView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/DriftDefinitionTemplateTypeView.java @@ -48,7 +48,7 @@ import org.rhq.enterprise.gui.coregui.client.components.view.ViewName; import org.rhq.enterprise.gui.coregui.client.drift.DriftDefinitionTemplatesView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; import org.rhq.enterprise.gui.coregui.client.util.Log; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Jay Shaughnessy @@ -57,7 +57,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; public class DriftDefinitionTemplateTypeView extends ResourceTypeTreeView {
public static final ViewName VIEW_ID = new ViewName("DriftDefTemplates", MSG.view_adminConfig_driftDefTemplates(), - IconEnum.DRIFT_COMPLIANCE); + IconEnum.DRIFT_COMPLIANCE); public static final String VIEW_PATH = ResourceTypeTreeView.VIEW_PATH + VIEW_ID;
public static final String ATTR_PLUGIN_TEMPLATES = "pluginTemplates"; @@ -113,8 +113,8 @@ public class DriftDefinitionTemplateTypeView extends ResourceTypeTreeView { public void onPermissionsLoaded(Set<Permission> permissions) {
Layout templatesCanvas = getCanvas(); - DriftDefinitionTemplatesView view = new DriftDefinitionTemplatesView(extendLocatorId("DriftTemplates"), - type, permissions.contains(Permission.MANAGE_SETTINGS)); + DriftDefinitionTemplatesView view = new DriftDefinitionTemplatesView(type, permissions + .contains(Permission.MANAGE_SETTINGS));
renderTemplateView(templatesCanvas, view, viewPath); } @@ -159,7 +159,7 @@ public class DriftDefinitionTemplateTypeView extends ResourceTypeTreeView {
private Layout getCanvas() { if (this.canvas == null) { - LocatableVLayout layout = new LocatableVLayout(extendLocatorId("metricTemplateLayout")); + EnhancedVLayout layout = new EnhancedVLayout(); layout.setHeight100(); layout.setWidth100(); layout.setMargin(5); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/MetricTemplateTypeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/MetricTemplateTypeView.java index d40d198..8f8e4ea 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/MetricTemplateTypeView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/MetricTemplateTypeView.java @@ -43,7 +43,7 @@ import org.rhq.enterprise.gui.coregui.client.PermissionsLoader; import org.rhq.enterprise.gui.coregui.client.ViewPath; import org.rhq.enterprise.gui.coregui.client.components.TitleBar; import org.rhq.enterprise.gui.coregui.client.components.view.ViewName; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Jay Shaughnessy @@ -109,8 +109,7 @@ public class MetricTemplateTypeView extends ResourceTypeTreeView {
public void onPermissionsLoaded(Set<Permission> permissions) { Layout metricCanvas = getCanvas(); - TemplateSchedulesView templateSchedulesView = new TemplateSchedulesView( - extendLocatorId("MetricTemplate"), type, permissions); + TemplateSchedulesView templateSchedulesView = new TemplateSchedulesView(type, permissions); prepareSubCanvas(metricCanvas, templateSchedulesView, true); switchToCanvas(MetricTemplateTypeView.this, metricCanvas); } @@ -119,7 +118,7 @@ public class MetricTemplateTypeView extends ResourceTypeTreeView {
private Layout getCanvas() { if (this.canvas == null) { - LocatableVLayout layout = new LocatableVLayout(extendLocatorId("metricTemplateLayout")); + EnhancedVLayout layout = new EnhancedVLayout(); layout.setHeight100(); layout.setWidth100(); layout.setMargin(5); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeView.java index 21ae386..41b9f50 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeView.java @@ -50,7 +50,7 @@ import org.rhq.enterprise.gui.coregui.client.admin.AdministrationView; import org.rhq.enterprise.gui.coregui.client.components.TitleBar; import org.rhq.enterprise.gui.coregui.client.components.buttons.BackButton; import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout; import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/** @@ -60,7 +60,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility; * @author Greg Hinkle * @author John Mazzitelli */ -public abstract class ResourceTypeTreeView extends LocatableVLayout implements BookmarkableView { +public abstract class ResourceTypeTreeView extends EnhancedVLayout implements BookmarkableView {
public static final String VIEW_PATH = AdministrationView.VIEW_ID + "/" + AdministrationView.SECTION_CONFIGURATION_VIEW_ID + "/"; @@ -118,7 +118,7 @@ public abstract class ResourceTypeTreeView extends LocatableVLayout implements B
private Canvas getGridCanvas() { if (this.gridCanvas == null) { - LocatableVLayout layout = new LocatableVLayout(extendLocatorId("gridLayout")); + EnhancedVLayout layout = new EnhancedVLayout();
TitleBar titleBar = getTitleBar(); titleBar.setExtraSpace(10); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/TemplateSchedulesView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/TemplateSchedulesView.java index b08a5a1..9c5a823 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/TemplateSchedulesView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/TemplateSchedulesView.java @@ -41,8 +41,8 @@ public class TemplateSchedulesView extends AbstractSchedulesView { private boolean updateExistingSchedules = true; private String typeId;
- public TemplateSchedulesView(String locatorId, ResourceType type, Set<Permission> globalPermissions) { - super(locatorId, getTitle(type), EntityContext.forTemplate(type.getId()), globalPermissions + public TemplateSchedulesView(ResourceType type, Set<Permission> globalPermissions) { + super(getTitle(type), EntityContext.forTemplate(type.getId()), globalPermissions .contains(Permission.MANAGE_INVENTORY));
this.typeId = String.valueOf(type.getId()); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupDetailView.java index b9f308b..f79e640 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupDetailView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupDetailView.java @@ -40,15 +40,15 @@ import org.rhq.enterprise.gui.coregui.client.ViewPath; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.message.Message; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableToolStrip; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedToolStrip; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * Shows details of a affinity group. * * @author Jirka Kremser */ -public class AffinityGroupDetailView extends LocatableVLayout implements BookmarkableView { +public class AffinityGroupDetailView extends EnhancedVLayout implements BookmarkableView {
private final int affinityGroupId;
@@ -166,7 +166,7 @@ public class AffinityGroupDetailView extends LocatableVLayout implements Bookmar final TextItem nameItem = new TextItem(FIELD_NAME.propertyName(), FIELD_NAME.title()); nameItem.setValue(affinityGroup.getName());
- LocatableToolStrip footer = new LocatableToolStrip(); + EnhancedToolStrip footer = new EnhancedToolStrip(); footer.setPadding(5); footer.setWidth100(); footer.setMembersMargin(15); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDetailView.java index 2fc23ff..927afb3 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDetailView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDetailView.java @@ -46,7 +46,7 @@ import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.util.StringUtility; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout; import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/** @@ -54,7 +54,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility; * * @author Jirka Kremser */ -public class AgentDetailView extends LocatableVLayout { +public class AgentDetailView extends EnhancedVLayout {
private final int agentId;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventDetailView.java index 99f7ef8..d224d01 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventDetailView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventDetailView.java @@ -50,14 +50,14 @@ import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellForma import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.gwt.TopologyGWTServiceAsync; import org.rhq.enterprise.gui.coregui.client.util.Log; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * Shows details of a partition event. * * @author Jirka Kremser */ -public class PartitionEventDetailView extends LocatableVLayout implements BookmarkableView { +public class PartitionEventDetailView extends EnhancedVLayout implements BookmarkableView {
private final int partitionEventId;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDetailView.java index 383aaf7..a27943a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDetailView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDetailView.java @@ -56,8 +56,8 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.StringUtility; import org.rhq.enterprise.gui.coregui.client.util.message.Message; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableToolStrip; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedToolStrip; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout; import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/** @@ -65,7 +65,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility; * * @author Jirka Kremser */ -public class ServerDetailView extends LocatableVLayout implements BookmarkableView { +public class ServerDetailView extends EnhancedVLayout implements BookmarkableView {
private final int serverId;
@@ -248,7 +248,7 @@ public class ServerDetailView extends LocatableVLayout implements BookmarkableVi form.setItems(nameItem, addressItem, portItem, securePortItem, operationModeItem, affinityGroupItem, installationDateItem, lastUpdatetem);
- LocatableToolStrip footer = new LocatableToolStrip(); + EnhancedToolStrip footer = new EnhancedToolStrip(); footer.setPadding(5); footer.setWidth100(); footer.setMembersMargin(15); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java index ba6d079..5db8379 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java @@ -55,13 +55,13 @@ import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellForma import org.rhq.enterprise.gui.coregui.client.components.view.ViewName; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.util.Log; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Joseph Marques * @author Ian Springer */ -public class AlertDetailsView extends LocatableVLayout implements BookmarkableView { +public class AlertDetailsView extends EnhancedVLayout implements BookmarkableView {
private int alertId;
@@ -105,16 +105,13 @@ public class AlertDetailsView extends LocatableVLayout implements BookmarkableVi private TabSet getDetailsTabSet(Record record) { TabSet tabset = new NamedTabSet();
- Tab generalTab = new NamedTab(extendLocatorId("general"), new ViewName("general", - MSG.view_alert_common_tab_general())); + Tab generalTab = new NamedTab(new ViewName("general", MSG.view_alert_common_tab_general())); generalTab.setPane(getDetailsTableForAlert(record));
- Tab conditionsTab = new NamedTab(extendLocatorId("conditions"), new ViewName("conditions", - MSG.view_alert_common_tab_conditions())); + Tab conditionsTab = new NamedTab(new ViewName("conditions", MSG.view_alert_common_tab_conditions())); conditionsTab.setPane(getConditionsForAlert(record));
- Tab notificationsTab = new NamedTab(extendLocatorId("notifications"), new ViewName("notifications", - MSG.view_alert_common_tab_notifications())); + Tab notificationsTab = new NamedTab(new ViewName("notifications", MSG.view_alert_common_tab_notifications())); notificationsTab.setPane(getNotificationsForAlert(record));
tabset.addTab(generalTab); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsView.java index 4eac915..a099c59 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsView.java @@ -47,7 +47,7 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; */ public abstract class AbstractAlertDefinitionsView extends TableSection<AbstractAlertDefinitionsDataSource> {
- public AbstractAlertDefinitionsView(String locatorId, String tableTitle, Criteria initialCriteria) { + public AbstractAlertDefinitionsView(String tableTitle, Criteria initialCriteria) { super(tableTitle, initialCriteria);
setEscapeHtmlInDetailsLinkColumn(true); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractNotificationSenderForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractNotificationSenderForm.java index 51d98bc..dc3dae6 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractNotificationSenderForm.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractNotificationSenderForm.java @@ -26,7 +26,7 @@ import com.google.gwt.user.client.rpc.AsyncCallback;
import org.rhq.core.domain.alert.notification.AlertNotification; import org.rhq.core.domain.configuration.Configuration; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * Superclass to all alert senders' forms. Instances of this class @@ -35,7 +35,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; * * @author John Mazzitelli */ -public abstract class AbstractNotificationSenderForm extends LocatableVLayout { +public abstract class AbstractNotificationSenderForm extends EnhancedVLayout {
private Configuration configuration; private Configuration extraConfiguration; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/CliNotificationSenderForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/CliNotificationSenderForm.java index 197ce11..9e89768 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/CliNotificationSenderForm.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/CliNotificationSenderForm.java @@ -227,7 +227,7 @@ public class CliNotificationSenderForm extends AbstractNotificationSenderForm { SectionItem userSection = new SectionItem("userSection"); userSection.setDefaultValue(MSG.view_alert_definition_notification_cliScript_editor_whichUser());
- repoSelector = new SortedSelectItem(extendLocatorId("repoSelector"), + repoSelector = new SortedSelectItem("repoSelector", MSG.view_alert_definition_notification_cliScript_editor_selectRepo()); repoSelector.setDefaultToFirstOption(true); repoSelector.setWrapTitle(false); @@ -240,22 +240,20 @@ public class CliNotificationSenderForm extends AbstractNotificationSenderForm { createExistingPackageForm()); packageSelectItems.put(MSG.view_alert_definition_notification_cliScript_editor_uploadNewScript(), createUploadNewScriptForm()); - packageSelector = new RadioGroupWithComponentsItem(extendLocatorId("packageSelector"), "", - packageSelectItems, form); + packageSelector = new RadioGroupWithComponentsItem("packageSelector", "", packageSelectItems, form); packageSelector.setWidth("100%");
LinkedHashMap<String, DynamicForm> userSelectItems = new LinkedHashMap<String, DynamicForm>(); userSelectItems.put(MSG.view_alert_definition_notification_cliScript_editor_thisUser(), null); userSelectItems.put(MSG.view_alert_definition_notification_cliScript_editor_anotherUser(), createAnotherUserForm()); - userSelector = new RadioGroupWithComponentsItem(extendLocatorId("userSelector"), "", - userSelectItems, form); + userSelector = new RadioGroupWithComponentsItem("userSelector", "", userSelectItems, form); userSelector.setWidth("100%"); userSelector.setShowTitle(false);
- repoSection.setItemIds(extendLocatorId("repoSelector")); - packageSection.setItemIds(extendLocatorId("packageSelector")); - userSection.setItemIds(extendLocatorId("userSelector")); + repoSection.setItemIds("repoSelector"); + packageSection.setItemIds("packageSelector"); + userSection.setItemIds("userSelector");
form.setFields(userSection, userSelector, repoSection, repoSelector, packageSection, packageSelector); @@ -573,7 +571,7 @@ public class CliNotificationSenderForm extends AbstractNotificationSenderForm { private DynamicForm createExistingPackageForm() { DynamicForm form = new DynamicForm(); form.setTitleOrientation(TitleOrientation.TOP); - existingPackageSelector = new SortedSelectItem(extendLocatorId("existingPackageSelector"), ""); + existingPackageSelector = new SortedSelectItem("existingPackageSelector", ""); existingPackageSelector.setDefaultToFirstOption(true); existingPackageSelector.setWrapTitle(false); existingPackageSelector.setRedrawOnChange(true); @@ -586,8 +584,8 @@ public class CliNotificationSenderForm extends AbstractNotificationSenderForm { }
private DynamicForm createUploadNewScriptForm() { - uploadForm = new PackageVersionFileUploadFormWithVersion(extendLocatorId("uploadForm"), cliScriptPackageType - .getPackageType().getId()); + uploadForm = new PackageVersionFileUploadFormWithVersion("uploadForm", cliScriptPackageType.getPackageType() + .getId()); uploadForm.setTitleOrientation(TitleOrientation.TOP); uploadForm.setPackageTypeId(cliScriptPackageType.getPackageType().getId());
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsAlertDefinitionForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsAlertDefinitionForm.java index e309623..34fd622 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsAlertDefinitionForm.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsAlertDefinitionForm.java @@ -42,12 +42,12 @@ import org.rhq.core.domain.resource.ResourceType; import org.rhq.enterprise.gui.coregui.client.CoreGUI; 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; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author John Mazzitelli */ -public class ConditionsAlertDefinitionForm extends LocatableVLayout implements EditAlertDefinitionForm { +public class ConditionsAlertDefinitionForm extends EnhancedVLayout implements EditAlertDefinitionForm {
private final ResourceType resourceType; private AlertDefinition alertDefinition; @@ -60,11 +60,11 @@ public class ConditionsAlertDefinitionForm extends LocatableVLayout implements E private boolean formBuilt = false; private boolean updated;
- public ConditionsAlertDefinitionForm(String locatorId, ResourceType resourceType) { - this(locatorId, resourceType, null); + public ConditionsAlertDefinitionForm(ResourceType resourceType) { + this(resourceType, null); }
- public ConditionsAlertDefinitionForm(String locatorId, ResourceType resourceType, AlertDefinition alertDefinition) { + public ConditionsAlertDefinitionForm(ResourceType resourceType, AlertDefinition alertDefinition) { super(); this.resourceType = resourceType; this.alertDefinition = alertDefinition; @@ -176,8 +176,7 @@ public class ConditionsAlertDefinitionForm extends LocatableVLayout implements E
conditionExpressionForm.setFields(conditionExpression, conditionExpressionStatic);
- conditionsEditor = new ConditionsEditor(this.extendLocatorId("conditionsEditor"), conditionExpression, - resourceType, null); + conditionsEditor = new ConditionsEditor(conditionExpression, resourceType, null);
conditionExpression.addChangeHandler(new ChangeHandler() { @Override diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsEditor.java index 5ce72ee..79aa1fb 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsEditor.java @@ -51,12 +51,12 @@ import org.rhq.enterprise.gui.coregui.client.components.table.TableActionEnablem import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository.MetadataType; import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author John Mazzitelli */ -public class ConditionsEditor extends LocatableVLayout { +public class ConditionsEditor extends EnhancedVLayout {
private final ResourceType resourceType; private HashSet<AlertCondition> conditions; @@ -64,7 +64,7 @@ public class ConditionsEditor extends LocatableVLayout { private final SelectItem conditionExpression; private boolean updated;
- public ConditionsEditor(String locatorId, SelectItem conditionExpression, ResourceType resourceType, + public ConditionsEditor(SelectItem conditionExpression, ResourceType resourceType, HashSet<AlertCondition> conditions) { super(); this.conditionExpression = conditionExpression; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GroupAlertDefinitionsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GroupAlertDefinitionsView.java index 4b8e072..5fc0ea8 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GroupAlertDefinitionsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GroupAlertDefinitionsView.java @@ -52,8 +52,8 @@ public class GroupAlertDefinitionsView extends AbstractAlertDefinitionsView { private ResourceGroup group; private ResourcePermission permissions;
- public GroupAlertDefinitionsView(String locatorId, ResourceGroupComposite groupComposite) { - super(locatorId, MSG.view_alert_definitions_table_title_group(), getCriteria(groupComposite)); + public GroupAlertDefinitionsView(ResourceGroupComposite groupComposite) { + super(MSG.view_alert_definitions_table_title_group(), getCriteria(groupComposite)); this.group = groupComposite.getResourceGroup(); this.permissions = groupComposite.getResourcePermission();
@@ -198,7 +198,8 @@ public class GroupAlertDefinitionsView extends AbstractAlertDefinitionsView { }
@Override - protected void commitAlertDefinition(final AlertDefinition alertDefinition, boolean purgeInternals, final AsyncCallback<AlertDefinition> resultReceiver) { + protected void commitAlertDefinition(final AlertDefinition alertDefinition, boolean purgeInternals, + final AsyncCallback<AlertDefinition> resultReceiver) { if (alertDefinition.getId() == 0) { GWTServiceLookup.getGroupAlertDefinitionService().createGroupAlertDefinitions(alertDefinition, Integer.valueOf(this.group.getId()), new AsyncCallback<Integer>() { @@ -219,8 +220,7 @@ public class GroupAlertDefinitionsView extends AbstractAlertDefinitionsView { }); } else { GWTServiceLookup.getGroupAlertDefinitionService().updateGroupAlertDefinitions(alertDefinition, - purgeInternals, - new AsyncCallback<AlertDefinition>() { + purgeInternals, new AsyncCallback<AlertDefinition>() { @Override public void onSuccess(AlertDefinition result) { CoreGUI.getMessageCenter().notify( diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NotificationsAlertDefinitionForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NotificationsAlertDefinitionForm.java index 9fd52b8..b1299ff 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NotificationsAlertDefinitionForm.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NotificationsAlertDefinitionForm.java @@ -51,12 +51,12 @@ import org.rhq.enterprise.gui.coregui.client.components.table.Table; import org.rhq.enterprise.gui.coregui.client.components.table.TableActionEnablement; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author John Mazzitelli */ -public class NotificationsAlertDefinitionForm extends LocatableVLayout implements EditAlertDefinitionForm { +public class NotificationsAlertDefinitionForm extends EnhancedVLayout implements EditAlertDefinitionForm { private static final String FIELD_OBJECT = "obj"; private static final String FIELD_SENDER = "sender"; private static final String FIELD_CONFIGURATION = "configuration"; @@ -68,7 +68,7 @@ public class NotificationsAlertDefinitionForm extends LocatableVLayout implement
private Table table;
- public NotificationsAlertDefinitionForm(String locatorId, AlertDefinition alertDefinition) { + public NotificationsAlertDefinitionForm(AlertDefinition alertDefinition) { super(); this.alertDefinition = alertDefinition; extractShallowCopyOfNotifications(this.alertDefinition); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsView.java index 5dfacc8..2cbe8c6 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsView.java @@ -52,8 +52,8 @@ public class ResourceAlertDefinitionsView extends AbstractAlertDefinitionsView { private Resource resource; private ResourcePermission permissions;
- public ResourceAlertDefinitionsView(String locatorId, ResourceComposite resourceComposite) { - super(locatorId, "Alert Definitions", getCriteria(resourceComposite)); + public ResourceAlertDefinitionsView(ResourceComposite resourceComposite) { + super("Alert Definitions", getCriteria(resourceComposite)); this.resource = resourceComposite.getResource(); this.permissions = resourceComposite.getResourcePermission();
@@ -194,7 +194,8 @@ public class ResourceAlertDefinitionsView extends AbstractAlertDefinitionsView { }
@Override - protected void commitAlertDefinition(final AlertDefinition alertDefinition, boolean purgeInternals, final AsyncCallback<AlertDefinition> resultReceiver) { + protected void commitAlertDefinition(final AlertDefinition alertDefinition, boolean purgeInternals, + final AsyncCallback<AlertDefinition> resultReceiver) { if (alertDefinition.getId() == 0) { GWTServiceLookup.getAlertDefinitionService().createAlertDefinition(alertDefinition, Integer.valueOf(resource.getId()), new AsyncCallback<Integer>() { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceOperationNotificationSenderForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceOperationNotificationSenderForm.java index 194e06b..5062300 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceOperationNotificationSenderForm.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceOperationNotificationSenderForm.java @@ -146,14 +146,13 @@ public class ResourceOperationNotificationSenderForm extends AbstractNotificatio @Override public void onClick(ClickEvent event) { SingleResourcePicker singleResourcePicker; - singleResourcePicker = new SingleResourcePicker(extendLocatorId("singleResourcePicker"), - new OkHandler() { - public boolean ok(Set<Integer> resourceIdSelection) { - final int resourceId = resourceIdSelection.iterator().next().intValue(); - setSpecificResource(resourceId, null, null); - return true; - } - }, null); + singleResourcePicker = new SingleResourcePicker(new OkHandler() { + public boolean ok(Set<Integer> resourceIdSelection) { + final int resourceId = resourceIdSelection.iterator().next().intValue(); + setSpecificResource(resourceId, null, null); + return true; + } + }, null); singleResourcePicker.show(); } }); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java index 3a5ee88..5bff96a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java @@ -35,12 +35,12 @@ import com.smartgwt.client.widgets.tab.events.TabDeselectedHandler; import org.rhq.core.domain.alert.AlertDefinition; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTab; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTabSet; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author John Mazzitelli */ -public class SingleAlertDefinitionView extends LocatableVLayout { +public class SingleAlertDefinitionView extends EnhancedVLayout {
private AlertDefinition alertDefinition;
@@ -66,7 +66,7 @@ public class SingleAlertDefinitionView extends LocatableVLayout { this.alertDefinition = alertDefinition; this.isAuthorizedToModifyAlertDefinitions = alertDefView.isAuthorizedToModifyAlertDefinitions();
- final LocatableTabSet tabSet = new LocatableTabSet(this.getLocatorId()); + final LocatableTabSet tabSet = new LocatableTabSet(); tabSet.setHeight100();
final Tab generalPropertiesTab = new LocatableTab(tabSet.extendLocatorId("General"), @@ -85,13 +85,12 @@ public class SingleAlertDefinitionView extends LocatableVLayout {
Tab conditionsTab = new LocatableTab(tabSet.extendLocatorId("Conditions"), MSG.view_alert_common_tab_conditions()); - conditions = new ConditionsAlertDefinitionForm(this.getLocatorId(), alertDefView.getResourceType(), - alertDefinition); + conditions = new ConditionsAlertDefinitionForm(alertDefView.getResourceType(), alertDefinition); conditionsTab.setPane(conditions);
Tab notificationsTab = new LocatableTab(tabSet.extendLocatorId("Notifications"), MSG.view_alert_common_tab_notifications()); - notifications = new NotificationsAlertDefinitionForm(this.getLocatorId(), alertDefinition); + notifications = new NotificationsAlertDefinitionForm(alertDefinition); notificationsTab.setPane(notifications);
Tab recoveryTab = new LocatableTab(tabSet.extendLocatorId("Recovery"), MSG.view_alert_common_tab_recovery()); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/TemplateAlertDefinitionsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/TemplateAlertDefinitionsView.java index 1218c3a..5400158 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/TemplateAlertDefinitionsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/TemplateAlertDefinitionsView.java @@ -51,8 +51,8 @@ public class TemplateAlertDefinitionsView extends AbstractAlertDefinitionsView { private ResourceType resourceType; private Set<Permission> globalPermissions;
- public TemplateAlertDefinitionsView(String locatorId, ResourceType resourceType, Set<Permission> globalPermissions) { - super(locatorId, getTitle(resourceType), getCriteria(resourceType)); + public TemplateAlertDefinitionsView(ResourceType resourceType, Set<Permission> globalPermissions) { + super(getTitle(resourceType), getCriteria(resourceType)); this.resourceType = resourceType; this.globalPermissions = globalPermissions;
@@ -206,7 +206,8 @@ public class TemplateAlertDefinitionsView extends AbstractAlertDefinitionsView { }
@Override - protected void commitAlertDefinition(final AlertDefinition alertDefinition, boolean resetMatching, final AsyncCallback<AlertDefinition> resultReceiver) { + protected void commitAlertDefinition(final AlertDefinition alertDefinition, boolean resetMatching, + final AsyncCallback<AlertDefinition> resultReceiver) { if (alertDefinition.getId() == 0) { GWTServiceLookup.getAlertTemplateService().createAlertTemplate(alertDefinition, Integer.valueOf(this.resourceType.getId()), new AsyncCallback<Integer>() { 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 db72369..0176c3f 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,7 +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.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
public class BundleUploadDataStep extends AbstractWizardStep {
@@ -56,7 +56,7 @@ public class BundleUploadDataStep extends AbstractWizardStep { }
public Canvas getCanvas() { - final LocatableVLayout mainLayout = new LocatableVLayout(); + final EnhancedVLayout mainLayout = new EnhancedVLayout(); mainLayout.setMargin(20); mainLayout.setWidth100(); mainLayout.setHeight(10); 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 18c5ce5..999f852 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,7 +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.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Jay Shaughnessy @@ -58,7 +58,7 @@ public class DeployStep extends AbstractWizardStep {
public Canvas getCanvas() { if (canvas == null) { - canvas = new LocatableVLayout(); + canvas = new EnhancedVLayout(); 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/GetDestinationStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDestinationStep.java index c08eadb..671d35e 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 @@ -61,7 +61,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTyp import org.rhq.enterprise.gui.coregui.client.util.FormUtility; 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; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Jay Shaughnessy @@ -88,7 +88,7 @@ public class GetDestinationStep extends AbstractWizardStep {
public Canvas getCanvas() { if (this.form == null) { - this.form = new LocatableVLayout(); + this.form = new EnhancedVLayout(); this.valForm.setWidth100(); this.valForm.setNumCols(2); this.valForm.setColWidths("50%", "*"); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java index 219eef5..1f5a360 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java @@ -53,7 +53,7 @@ public class BundleDeploymentListView extends Table<BundleDeploymentDataSource>
private final boolean canManageBundles;
- public BundleDeploymentListView(String locatorId, Criteria criteria, boolean canManageBundles) { + public BundleDeploymentListView(Criteria criteria, boolean canManageBundles) { super(MSG.view_bundle_bundleDeployments(), criteria); this.canManageBundles = canManageBundles; setDataSource(new BundleDeploymentDataSource()); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java index c32dabe..5bb3a91 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java @@ -81,12 +81,12 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.util.StringUtility; import org.rhq.enterprise.gui.coregui.client.util.message.Message; import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedIButton; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Greg Hinkle */ -public class BundleDeploymentView extends LocatableVLayout implements BookmarkableView { +public class BundleDeploymentView extends EnhancedVLayout implements BookmarkableView { private BundleDeployment deployment; private BundleVersion version; private Bundle bundle; @@ -96,7 +96,7 @@ public class BundleDeploymentView extends LocatableVLayout implements Bookmarkab
private final HashMap<String, String> statusIcons;
- public BundleDeploymentView(String locatorId, boolean canManageBundles) { + public BundleDeploymentView(boolean canManageBundles) { super(); this.canManageBundles = canManageBundles; setWidth100(); @@ -211,7 +211,7 @@ public class BundleDeploymentView extends LocatableVLayout implements Bookmarkab }
private Canvas getActionLayout() { - LocatableVLayout actionLayout = new LocatableVLayout(10); + EnhancedVLayout actionLayout = new EnhancedVLayout(10);
// we can only revert the live deployments, only show revert button when appropriate // in addition, we provide a purge button if you are viewing the live deployment, so @@ -309,23 +309,21 @@ public class BundleDeploymentView extends LocatableVLayout implements Bookmarkab
private TagEditorView createTagEditor() { boolean readOnly = !this.canManageBundles; - TagEditorView tagEditor = new TagEditorView(extendLocatorId("tagEditor"), version.getTags(), readOnly, - new TagsChangedCallback() { - public void tagsChanged(HashSet<Tag> tags) { - GWTServiceLookup.getTagService().updateBundleDeploymentTags(deployment.getId(), tags, - new AsyncCallback<Void>() { - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler() - .handleError(MSG.view_bundle_deploy_tagUpdateFailure(), caught); - } + TagEditorView tagEditor = new TagEditorView(version.getTags(), readOnly, new TagsChangedCallback() { + public void tagsChanged(HashSet<Tag> tags) { + GWTServiceLookup.getTagService().updateBundleDeploymentTags(deployment.getId(), tags, + new AsyncCallback<Void>() { + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_bundle_deploy_tagUpdateFailure(), caught); + }
- public void onSuccess(Void result) { - CoreGUI.getMessageCenter().notify( - new Message(MSG.view_bundle_deploy_tagUpdateSuccessful(), Message.Severity.Info)); - } - }); - } - }); + public void onSuccess(Void result) { + CoreGUI.getMessageCenter().notify( + new Message(MSG.view_bundle_deploy_tagUpdateSuccessful(), Message.Severity.Info)); + } + }); + } + }); tagEditor.setAutoHeight(); tagEditor.setExtraSpace(10); return tagEditor; @@ -333,7 +331,7 @@ public class BundleDeploymentView extends LocatableVLayout implements Bookmarkab
@SuppressWarnings("unchecked") private Table addMemberDeploymentsTable() { - Table table = new Table(extendLocatorId("Deployments"), MSG.view_bundle_deploy_deploymentPlatforms()); + Table table = new Table(MSG.view_bundle_deploy_deploymentPlatforms()); table.setShowFooterRefresh(false);
TitleBar titleBar = new TitleBar(MSG.view_bundle_deploy_selectARow()); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleResourceDeploymentHistoryListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleResourceDeploymentHistoryListView.java index 94a3cb3..55d7db2 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleResourceDeploymentHistoryListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleResourceDeploymentHistoryListView.java @@ -54,12 +54,12 @@ import org.rhq.core.domain.bundle.BundleResourceDeployment; import org.rhq.core.domain.bundle.BundleResourceDeploymentHistory; import org.rhq.enterprise.gui.coregui.client.ErrorMessageWindow; import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Greg Hinkle */ -public class BundleResourceDeploymentHistoryListView extends LocatableVLayout { +public class BundleResourceDeploymentHistoryListView extends EnhancedVLayout {
private BundleResourceDeployment resourceDeployment; private HashMap<String, String> statusIcons; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java index ec543ee..dda1101 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java @@ -63,12 +63,12 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.util.StringUtility; import org.rhq.enterprise.gui.coregui.client.util.message.Message; import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedIButton; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Greg Hinkle */ -public class BundleDestinationView extends LocatableVLayout implements BookmarkableView { +public class BundleDestinationView extends EnhancedVLayout implements BookmarkableView { private BundleDestination destination; private Bundle bundle;
@@ -76,7 +76,7 @@ public class BundleDestinationView extends LocatableVLayout implements Bookmarka
private boolean canManageBundles;
- public BundleDestinationView(String locatorId, boolean canManageBundles) { + public BundleDestinationView(boolean canManageBundles) { super(); this.canManageBundles = canManageBundles; setWidth100(); @@ -160,29 +160,28 @@ public class BundleDestinationView extends LocatableVLayout implements Bookmarka
private TagEditorView createTagEditor() { boolean readOnly = !this.canManageBundles; - TagEditorView tagEditor = new TagEditorView(extendLocatorId("Tags"), destination.getTags(), readOnly, - new TagsChangedCallback() { - public void tagsChanged(HashSet<Tag> tags) { - GWTServiceLookup.getTagService().updateBundleDestinationTags(destination.getId(), tags, - new AsyncCallback<Void>() { - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_bundle_dest_tagUpdateFailure(), caught); - } - - public void onSuccess(Void result) { - CoreGUI.getMessageCenter().notify( - new Message(MSG.view_bundle_dest_tagUpdateSuccessful(), Message.Severity.Info)); - } - }); - } - }); + TagEditorView tagEditor = new TagEditorView(destination.getTags(), readOnly, new TagsChangedCallback() { + public void tagsChanged(HashSet<Tag> tags) { + GWTServiceLookup.getTagService().updateBundleDestinationTags(destination.getId(), tags, + new AsyncCallback<Void>() { + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_bundle_dest_tagUpdateFailure(), caught); + } + + public void onSuccess(Void result) { + CoreGUI.getMessageCenter().notify( + new Message(MSG.view_bundle_dest_tagUpdateSuccessful(), Message.Severity.Info)); + } + }); + } + }); tagEditor.setAutoHeight(); tagEditor.setExtraSpace(10); return tagEditor; }
private Canvas getActionLayout() { - LocatableVLayout actionLayout = new LocatableVLayout(10); + EnhancedVLayout actionLayout = new EnhancedVLayout(10); IButton deployButton = new EnhancedIButton(MSG.view_bundle_deploy()); deployButton.setIcon(IconEnum.BUNDLE_DEPLOY.getIcon16x16Path()); deployButton.addClickHandler(new ClickHandler() { @@ -304,8 +303,7 @@ public class BundleDestinationView extends LocatableVLayout implements Bookmarka private Table createDeploymentsTable() { Criteria criteria = new Criteria(); criteria.addCriteria("bundleDestinationId", destination.getId()); - BundleDeploymentListView deployments = new BundleDeploymentListView(extendLocatorId("Deployments"), criteria, - canManageBundles); + BundleDeploymentListView deployments = new BundleDeploymentListView(criteria, canManageBundles); deployments.setHeight100(); deployments.setShowResizeBar(true); return deployments; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java index f26ff64..f0d0d92 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java @@ -66,9 +66,9 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message; import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedIButton; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTab; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTabSet; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
-public class BundleView extends LocatableVLayout implements BookmarkableView { +public class BundleView extends EnhancedVLayout implements BookmarkableView { private DynamicForm form;
private int bundleBeingViewed = 0; @@ -99,7 +99,7 @@ public class BundleView extends LocatableVLayout implements BookmarkableView {
BackButton backButton = new BackButton(MSG.view_bundle_list_backToAll(), BundleTopView.VIEW_ID.getTitle()); headerLabel = new HeaderLabel(IconEnum.BUNDLE.getIcon24x24Path(), StringUtility.escapeHtml(bundle.getName())); - tabs = new LocatableTabSet(getLocatorId()); + tabs = new LocatableTabSet(); versionsTab = createVersionsTab(); destinationsTab = createDestinationsTab(); tabs.addTab(versionsTab); @@ -127,29 +127,27 @@ public class BundleView extends LocatableVLayout implements BookmarkableView {
private TagEditorView createTagEditor() { boolean readOnly = !this.canManageBundles; - TagEditorView tagEditor = new TagEditorView(extendLocatorId("TagEditor"), bundle.getTags(), readOnly, - new TagsChangedCallback() { - public void tagsChanged(HashSet<Tag> tags) { - GWTServiceLookup.getTagService().updateBundleTags(bundleBeingViewed, tags, - new AsyncCallback<Void>() { - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_bundle_list_tagUpdateFailure(), caught); - } + TagEditorView tagEditor = new TagEditorView(bundle.getTags(), readOnly, new TagsChangedCallback() { + public void tagsChanged(HashSet<Tag> tags) { + GWTServiceLookup.getTagService().updateBundleTags(bundleBeingViewed, tags, new AsyncCallback<Void>() { + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_bundle_list_tagUpdateFailure(), caught); + }
- public void onSuccess(Void result) { - CoreGUI.getMessageCenter().notify( - new Message(MSG.view_bundle_list_tagUpdateSuccessful(), Message.Severity.Info)); - } - }); - } - }); + public void onSuccess(Void result) { + CoreGUI.getMessageCenter().notify( + new Message(MSG.view_bundle_list_tagUpdateSuccessful(), Message.Severity.Info)); + } + }); + } + }); tagEditor.setAutoHeight(); tagEditor.setExtraSpace(10); return tagEditor; }
private Tab createDestinationsTab() { - LocatableTab destinationsTab = new LocatableTab(extendLocatorId("Destinations"), MSG.view_bundle_destinations()); + LocatableTab destinationsTab = new LocatableTab(MSG.view_bundle_destinations()); Criteria criteria = new Criteria(); criteria.addCriteria("bundleId", bundle.getId()); destinationsTab.setPane(new BundleDestinationListView(criteria)); @@ -157,7 +155,7 @@ public class BundleView extends LocatableVLayout implements BookmarkableView { }
private Tab createVersionsTab() { - LocatableTab versionsTab = new LocatableTab(extendLocatorId("Versions"), MSG.view_bundle_versions()); + LocatableTab versionsTab = new LocatableTab(MSG.view_bundle_versions()); Criteria criteria = new Criteria(); criteria.addCriteria("bundleId", bundleBeingViewed); bundleVersionsTable = new BundleVersionListView(criteria); @@ -200,7 +198,7 @@ public class BundleView extends LocatableVLayout implements BookmarkableView { }
private Canvas getActionCanvas() { - VLayout layout = new LocatableVLayout(10); + VLayout layout = new EnhancedVLayout(10);
IButton deployButton = new EnhancedIButton(MSG.view_bundle_deploy()); deployButton.setIcon(IconEnum.BUNDLE_DEPLOY.getIcon16x16Path()); @@ -315,7 +313,7 @@ public class BundleView extends LocatableVLayout implements BookmarkableView { if (viewPath.getCurrent().getPath().equals("versions")) { if (!viewPath.isEnd()) { // a specific version - BundleVersionView view = new BundleVersionView(extendLocatorId("Version"), canManageBundles); + BundleVersionView view = new BundleVersionView(canManageBundles); addMember(view); view.renderView(viewPath.next()); } @@ -329,16 +327,14 @@ public class BundleView extends LocatableVLayout implements BookmarkableView { } else { // a specific deployment //removeMembers(getMembers()); - BundleDeploymentView view = new BundleDeploymentView(extendLocatorId("Deployment"), - canManageBundles); + BundleDeploymentView view = new BundleDeploymentView(canManageBundles); addMember(view); view.renderView(viewPath.next()); } } else if (viewPath.getCurrent().getPath().equals("destinations")) { if (!viewPath.isEnd()) { // a specific destination - BundleDestinationView view = new BundleDestinationView(extendLocatorId("Destination"), - canManageBundles); + BundleDestinationView view = new BundleDestinationView(canManageBundles); addMember(view); view.renderView(viewPath.next()); } 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 0b950fc..0e23d71 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,7 +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.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Jay Shaughnessy @@ -60,7 +60,7 @@ public class ConfirmationStep extends AbstractWizardStep {
public Canvas getCanvas() { if (layout == null) { - layout = new LocatableVLayout(); + layout = new EnhancedVLayout(); layout.setMembersMargin(15);
// Get the Live Deployment 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 65f1ceb..cd93646 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,7 +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.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Jay Shaughnessy @@ -56,7 +56,7 @@ public class RevertStep extends AbstractWizardStep {
public Canvas getCanvas() { if (canvas == null) { - canvas = new LocatableVLayout(); + canvas = new EnhancedVLayout(); 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/version/BundleVersionView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java index 38b5e4d..59ba0f3 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java @@ -62,18 +62,18 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message; import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedIButton; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTab; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTabSet; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Greg Hinkle */ -public class BundleVersionView extends LocatableVLayout implements BookmarkableView { +public class BundleVersionView extends EnhancedVLayout implements BookmarkableView {
private BundleGWTServiceAsync bundleManager = GWTServiceLookup.getBundleService(); private BundleVersion version; private boolean canManageBundles = false;
- public BundleVersionView(String locatorId, boolean canManageBundles) { + public BundleVersionView(boolean canManageBundles) { super(); this.canManageBundles = canManageBundles; setWidth100(); @@ -100,7 +100,7 @@ public class BundleVersionView extends LocatableVLayout implements BookmarkableV
addMember(createSummaryForm());
- TabSet tabs = new LocatableTabSet(extendLocatorId("Tabs")); + TabSet tabs = new LocatableTabSet(); tabs.addTab(createRecipeTab()); tabs.addTab(createLiveDeploymentsTab()); tabs.addTab(createFilesTab()); @@ -158,7 +158,7 @@ public class BundleVersionView extends LocatableVLayout implements BookmarkableV }
private Canvas getActionLayout() { - LocatableVLayout actionLayout = new LocatableVLayout(10); + EnhancedVLayout actionLayout = new EnhancedVLayout(10); IButton deleteButton = new EnhancedIButton(MSG.common_button_delete()); deleteButton.setIcon("subsystems/bundle/BundleVersionAction_Delete_16.png"); deleteButton.addClickHandler(new ClickHandler() { @@ -197,31 +197,30 @@ public class BundleVersionView extends LocatableVLayout implements BookmarkableV
private TagEditorView createTagEditor() { boolean readOnly = !this.canManageBundles; - TagEditorView tagEditor = new TagEditorView(extendLocatorId("Tags"), version.getTags(), readOnly, - new TagsChangedCallback() { - public void tagsChanged(HashSet<Tag> tags) { - GWTServiceLookup.getTagService().updateBundleVersionTags(version.getId(), tags, - new AsyncCallback<Void>() { - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError( - MSG.view_bundle_version_bundleVersionTagUpdateFailure(), caught); - } - - public void onSuccess(Void result) { - CoreGUI.getMessageCenter().notify( - new Message(MSG.view_bundle_version_bundleVersionTagUpdateSuccessful(), - Message.Severity.Info)); - } - }); - } - }); + TagEditorView tagEditor = new TagEditorView(version.getTags(), readOnly, new TagsChangedCallback() { + public void tagsChanged(HashSet<Tag> tags) { + GWTServiceLookup.getTagService().updateBundleVersionTags(version.getId(), tags, + new AsyncCallback<Void>() { + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError( + MSG.view_bundle_version_bundleVersionTagUpdateFailure(), caught); + } + + public void onSuccess(Void result) { + CoreGUI.getMessageCenter().notify( + new Message(MSG.view_bundle_version_bundleVersionTagUpdateSuccessful(), + Message.Severity.Info)); + } + }); + } + }); tagEditor.setAutoHeight(); tagEditor.setExtraSpace(10); return tagEditor; }
private Tab createRecipeTab() { - LocatableTab tab = new LocatableTab(extendLocatorId("Recipe"), MSG.view_bundle_recipe()); + LocatableTab tab = new LocatableTab(MSG.view_bundle_recipe()); DynamicForm form = new DynamicForm();
TextAreaItem recipeCanvas = new TextAreaItem("recipe", MSG.view_bundle_recipe()); @@ -246,15 +245,15 @@ public class BundleVersionView extends LocatableVLayout implements BookmarkableV }
private Tab createLiveDeploymentsTab() { - LocatableTab tab = new LocatableTab(extendLocatorId("Deployments"), MSG.view_bundle_deployments()); + LocatableTab tab = new LocatableTab(MSG.view_bundle_deployments()); Criteria criteria = new Criteria(); criteria.setAttribute("bundleVersionId", version.getId()); - tab.setPane(new BundleDeploymentListView(tab.getLocatorId(), criteria, this.canManageBundles)); + tab.setPane(new BundleDeploymentListView(criteria, this.canManageBundles)); return tab; }
private Tab createFilesTab() { - LocatableTab tab = new LocatableTab(extendLocatorId("Files"), MSG.view_bundle_files()); + LocatableTab tab = new LocatableTab(MSG.view_bundle_files()); FileListView filesView = new FileListView(tab.getLocatorId(), version.getId()); tab.setPane(filesView); return tab; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/file/FileListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/file/FileListView.java index f5bf1ff..ea46c19 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/file/FileListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/file/FileListView.java @@ -39,12 +39,12 @@ import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.components.table.Table; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Greg Hinkle */ -public class FileListView extends LocatableVLayout { +public class FileListView extends EnhancedVLayout {
private static final String ID = "id"; private static final String NAME = "name"; @@ -62,7 +62,7 @@ public class FileListView extends LocatableVLayout {
private void viewFiles(PageList<BundleFile> files) {
- Table table = new Table(extendLocatorId("BundleFiles"), MSG.view_bundle_bundleFiles()); + Table table = new Table(MSG.view_bundle_bundleFiles()); table.setShowFooterRefresh(false);
ListGridField id = new ListGridField(ID, MSG.common_title_id()); @@ -129,8 +129,8 @@ public class FileListView extends LocatableVLayout {
Long size = packageVersion.getFileSize(); if (size != null) { - record.setAttribute(FILESIZE, MeasurementConverterClient.format(size.doubleValue(), - MeasurementUnits.BYTES, true)); + record.setAttribute(FILESIZE, + MeasurementConverterClient.format(size.doubleValue(), MeasurementUnits.BYTES, true)); } else { record.setAttribute(FILESIZE, MSG.common_val_na()); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/AboutModalWindow.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/AboutModalWindow.java index f0b44c0..e561cac 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/AboutModalWindow.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/AboutModalWindow.java @@ -33,7 +33,7 @@ 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.EnhancedHLayout; import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedIButton; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * The "About RHQ" modal window. @@ -71,7 +71,7 @@ public class AboutModalWindow extends Window {
setTitle(MSG.view_aboutBox_title(productInfo.getFullName()));
- LocatableVLayout contentPane = new LocatableVLayout(); + EnhancedVLayout contentPane = new EnhancedVLayout(); contentPane.setPadding(10);
// TODO (ips, 09/06/11): Convert this raw HTML to SmartGWT widgets. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/TitleBar.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/TitleBar.java index 6eed341..feadc7b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/TitleBar.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/TitleBar.java @@ -23,15 +23,15 @@ import com.smartgwt.client.types.VerticalAlignment; import com.smartgwt.client.widgets.Label;
import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedHLayout; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableToolStrip; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedToolStrip; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * A title bar to be displayed at the top of a content view - contains a label and/or an icon. * * @author Ian Springer */ -public class TitleBar extends LocatableToolStrip { +public class TitleBar extends EnhancedToolStrip { private Label label;
public TitleBar() { @@ -48,7 +48,7 @@ public class TitleBar extends LocatableToolStrip { setWidth100(); setHeight(30);
- LocatableVLayout vLayout = new LocatableVLayout(extendLocatorId("VLayout")); + EnhancedVLayout vLayout = new EnhancedVLayout(); vLayout.setAlign(VerticalAlignment.CENTER); vLayout.setLayoutMargin(6);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/BookmarkableCarousel.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/BookmarkableCarousel.java index 636ae95..448aa5c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/BookmarkableCarousel.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/BookmarkableCarousel.java @@ -32,7 +32,7 @@ import org.rhq.enterprise.gui.coregui.client.ViewPath; import org.rhq.enterprise.gui.coregui.client.components.buttons.BackButton; import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableSection; import org.rhq.enterprise.gui.coregui.client.util.Log; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout; import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/** @@ -66,7 +66,7 @@ public abstract class BookmarkableCarousel extends Carousel implements Bookmarka
this.initialDisplay = true;
- detailsHolder = new LocatableVLayout(); + detailsHolder = new EnhancedVLayout(); detailsHolder.setAlign(VerticalAlignment.TOP); detailsHolder.setMargin(4); detailsHolder.hide(); @@ -169,7 +169,7 @@ public abstract class BookmarkableCarousel extends Carousel implements Bookmarka // editable, a Cancel button should already be provided by the details view. BackButton backButton = new BackButton(MSG.view_tableSection_backButton(), basePath); detailsHolder.addMember(backButton); - VLayout verticalSpacer = new LocatableVLayout(); + VLayout verticalSpacer = new EnhancedVLayout(); verticalSpacer.setHeight(8); detailsHolder.addMember(verticalSpacer); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/Carousel.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/Carousel.java index 0dbea46..a060473 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/Carousel.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/Carousel.java @@ -66,8 +66,8 @@ import org.rhq.enterprise.gui.coregui.client.components.buttons.BackButton; import org.rhq.enterprise.gui.coregui.client.components.form.EnhancedSearchBarItem; import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedHLayout; import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedIButton; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableToolStrip; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedToolStrip; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout; import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/** @@ -83,7 +83,7 @@ public abstract class Carousel extends EnhancedHLayout implements RefreshableVie private static final String FILTER_CAROUSEL_START = "CarouselStart"; private static final String FILTER_CAROUSEL_SIZE = "CarouselSize";
- private LocatableVLayout contents; + private EnhancedVLayout contents;
private HLayout titleLayout; private Canvas titleComponent; @@ -114,8 +114,8 @@ public abstract class Carousel extends EnhancedHLayout implements RefreshableVie private boolean carouselActionDisableOverride = false; protected List<Canvas> extraWidgetsAboveFooter = new ArrayList<Canvas>(); protected List<Canvas> extraWidgetsInMainFooter = new ArrayList<Canvas>(); - private LocatableToolStrip footer; - private LocatableToolStrip footerExtraWidgets; + private EnhancedToolStrip footer; + private EnhancedToolStrip footerExtraWidgets; private EnhancedIButton refreshButton; private EnhancedIButton nextButton; private EnhancedIButton previousButton; @@ -175,7 +175,7 @@ public abstract class Carousel extends EnhancedHLayout implements RefreshableVie protected void onInit() { super.onInit();
- contents = new LocatableVLayout(); + contents = new EnhancedVLayout(); contents.setWidth100(); contents.setHeight100();
@@ -243,14 +243,14 @@ public abstract class Carousel extends EnhancedHLayout implements RefreshableVie
// A second toolstrip that optionally appears before the main footer - it will contain extra widgets. // This is hidden from view unless extra widgets are actually added to the carousel above the main footer. - this.footerExtraWidgets = new LocatableToolStrip(); + this.footerExtraWidgets = new EnhancedToolStrip(); footerExtraWidgets.setPadding(5); footerExtraWidgets.setWidth100(); footerExtraWidgets.setMembersMargin(15); footerExtraWidgets.hide(); contents.addMember(footerExtraWidgets);
- this.footer = new LocatableToolStrip(); + this.footer = new EnhancedToolStrip(); footer.setPadding(5); footer.setWidth100(); footer.setMembersMargin(15); @@ -715,8 +715,7 @@ public abstract class Carousel extends EnhancedHLayout implements RefreshableVie } else { unqualifiedLocatorId = locatorId; } - CarouselActionInfo info = new CarouselActionInfo(this.footer.extendLocatorId(unqualifiedLocatorId), title, - confirmation, valueMap, action); + CarouselActionInfo info = new CarouselActionInfo(title, confirmation, valueMap, action); carouselActions.add(info); }
@@ -946,26 +945,21 @@ public abstract class Carousel extends EnhancedHLayout implements RefreshableVie }
public static class CarouselActionInfo { - private String locatorId; private String title; private String confirmMessage; private LinkedHashMap<String, ? extends Object> valueMap; private CarouselAction action; private Canvas actionCanvas;
- protected CarouselActionInfo(String locatorId, String title, String confirmMessage, + protected CarouselActionInfo(String title, String confirmMessage, LinkedHashMap<String, ? extends Object> valueMap, CarouselAction action) { - this.locatorId = locatorId; + this.title = title; this.confirmMessage = confirmMessage; this.valueMap = valueMap; this.action = action; }
- public String getLocatorId() { - return locatorId; - } - public String getTitle() { return title; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java index 6e8f060..f57df59 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java @@ -129,8 +129,8 @@ import org.rhq.enterprise.gui.coregui.client.util.StringUtility; import org.rhq.enterprise.gui.coregui.client.util.message.Message; import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedHLayout; import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedIButton; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableToolStrip; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedToolStrip; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * A SmartGWT widget for editing an RHQ {@link Configuration} that conforms to a {@link ConfigurationDefinition}. @@ -143,7 +143,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; // but there were problems with having different editors active for different rows in the table at the same time. // Smart says they're working on enhancing this area, but the DynamicForm might be a better option anyway. (ghinkle) // -public class ConfigurationEditor extends LocatableVLayout { +public class ConfigurationEditor extends EnhancedVLayout {
static final LinkedHashMap<String, String> BOOLEAN_PROPERTY_ITEM_VALUE_MAP = new LinkedHashMap<String, String>(); static { @@ -153,7 +153,7 @@ public class ConfigurationEditor extends LocatableVLayout {
private ConfigurationGWTServiceAsync configurationService = GWTServiceLookup.getConfigurationService();
- private LocatableToolStrip toolStrip; + private EnhancedToolStrip toolStrip;
private ConfigurationDefinition configurationDefinition; private Configuration configuration; @@ -395,7 +395,7 @@ public class ConfigurationEditor extends LocatableVLayout { if (configurationDefinition.getConfigurationFormat() == ConfigurationFormat.STRUCTURED || configurationDefinition.getConfigurationFormat() == ConfigurationFormat.STRUCTURED_AND_RAW) { Log.debug("Building structured configuration editor..."); - LocatableVLayout structuredConfigLayout = buildStructuredPane(); + EnhancedVLayout structuredConfigLayout = buildStructuredPane(); addMember(structuredConfigLayout); } else { Label label = new Label("Structured configuration is not supported."); @@ -411,8 +411,8 @@ public class ConfigurationEditor extends LocatableVLayout { reload(); }
- protected LocatableVLayout buildStructuredPane() { - LocatableVLayout layout = new LocatableVLayout(extendLocatorId("Structured")); + protected EnhancedVLayout buildStructuredPane() { + EnhancedVLayout layout = new EnhancedVLayout(); List<PropertyGroupDefinition> groupDefinitions = configurationDefinition.getGroupDefinitions();
if (groupDefinitions.isEmpty()) { @@ -434,12 +434,12 @@ public class ConfigurationEditor extends LocatableVLayout { sectionStack.setOverflow(Overflow.AUTO);
if (!configurationDefinition.getNonGroupedProperties().isEmpty()) { - sectionStack.addSection(buildGroupSection(layout.extendLocatorId("NoGroup"), null)); + sectionStack.addSection(buildGroupSection(null)); }
for (PropertyGroupDefinition definition : groupDefinitions) { // com.allen_sauer.gwt.log.client.Log.info("building: " + definition.getDisplayName()); - sectionStack.addSection(buildGroupSection(layout.extendLocatorId(definition.getName()), definition)); + sectionStack.addSection(buildGroupSection(definition)); }
this.toolStrip = buildToolStrip(layout, sectionStack); @@ -468,8 +468,8 @@ public class ConfigurationEditor extends LocatableVLayout { } }
- private LocatableToolStrip buildToolStrip(LocatableVLayout layout, final SectionStack sectionStack) { - LocatableToolStrip toolStrip = new LocatableToolStrip(); + private EnhancedToolStrip buildToolStrip(EnhancedVLayout layout, final SectionStack sectionStack) { + EnhancedToolStrip toolStrip = new EnhancedToolStrip(); toolStrip.setBackgroundImage(null); toolStrip.setWidth100(); toolStrip.setMembersMargin(3); @@ -511,7 +511,7 @@ public class ConfigurationEditor extends LocatableVLayout { return toolStrip; }
- public SectionStackSection buildGroupSection(String locatorId, PropertyGroupDefinition group) { + public SectionStackSection buildGroupSection(PropertyGroupDefinition group) { SectionStackSection section; if (group == null) { section = new SectionStackSection(MSG.common_title_generalProp()); @@ -765,7 +765,7 @@ public class ConfigurationEditor extends LocatableVLayout { addMemberPropertyDefinitionsToDynamicPropertyMap(propertyDefinitionMapClone, propertyMap); propertyDefinitionMap = propertyDefinitionMapClone; } - LocatableVLayout layout = new LocatableVLayout(); + EnhancedVLayout layout = new EnhancedVLayout();
HTMLFlow description = new HTMLFlow(propertyDefinitionMap.getDescription()); layout.addMember(description); @@ -777,7 +777,7 @@ public class ConfigurationEditor extends LocatableVLayout {
if (isDynamic && !isReadOnly(propertyDefinitionMap, propertyMap)) { // Map is not read-only - add footer with New and Delete buttons to allow user to add or remove members. - LocatableToolStrip buttonBar = new LocatableToolStrip(); + EnhancedToolStrip buttonBar = new EnhancedToolStrip(); buttonBar.setPadding(5); buttonBar.setMembersMargin(15);
@@ -826,7 +826,7 @@ public class ConfigurationEditor extends LocatableVLayout { selectItem.setValueMap(propertyDefinitionMap.getMap().keySet() .toArray(new String[propertyDefinitionMap.getMap().size()]));
- final EnhancedIButton okButton = new EnhancedIButton(buttonBar.extendLocatorId("OK")); + final EnhancedIButton okButton = new EnhancedIButton(); okButton.setTitle(MSG.common_button_ok()); okButton.setDisabled(true); okButton.addClickHandler(new com.smartgwt.client.widgets.events.ClickHandler() { @@ -1019,7 +1019,7 @@ public class ConfigurationEditor extends LocatableVLayout { ListGridRecord[] rows = buildSummaryRecords(propertyList, propertyDefinitions); summaryTable.setData(rows);
- VLayout summaryTableHolder = new LocatableVLayout(); + VLayout summaryTableHolder = new EnhancedVLayout();
ToolStrip toolStrip = new ToolStrip(); toolStrip.setWidth100(); @@ -1096,7 +1096,7 @@ public class ConfigurationEditor extends LocatableVLayout { final PropertyList propertyList) { Log.debug("Building list-of-simples field for " + propertyList + "...");
- LocatableVLayout vLayout = new LocatableVLayout(); + EnhancedVLayout vLayout = new EnhancedVLayout();
final DynamicForm listGrid = new DynamicForm(); vLayout.addMember(listGrid); @@ -1119,7 +1119,7 @@ public class ConfigurationEditor extends LocatableVLayout { footer.setMembersMargin(15); vLayout.addMember(footer);
- final IButton deleteButton = new EnhancedIButton(extendLocatorId("Delete")); + final IButton deleteButton = new EnhancedIButton(); deleteButton.setIcon(Window.getImgURL(ImageManager.getRemoveIcon())); deleteButton.setTooltip(MSG.view_configEdit_tooltip_1()); deleteButton.setDisabled(true); @@ -1688,7 +1688,7 @@ public class ConfigurationEditor extends LocatableVLayout { final String title = (mapReadOnly) ? MSG.view_configEdit_viewRow() : MSG.view_configEdit_editRow(); final Window popup = createPopup(title, 800, 600);
- final LocatableVLayout layout = new LocatableVLayout(); + final EnhancedVLayout layout = new EnhancedVLayout(); layout.setHeight100(); layout.setMargin(8);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/GroupConfigurationEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/GroupConfigurationEditor.java index faf6e84..a9e408d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/GroupConfigurationEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/GroupConfigurationEditor.java @@ -73,8 +73,8 @@ import org.rhq.enterprise.gui.coregui.client.components.form.SortedSelectItem; import org.rhq.enterprise.gui.coregui.client.util.StringUtility; 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.LocatableToolStrip; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedToolStrip; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * A SmartGWT widget for editing a group of RHQ {@link Configuration}s that conform to the same @@ -193,8 +193,7 @@ public class GroupConfigurationEditor extends ConfigurationEditor { icon.addFormItemClickHandler(new FormItemClickHandler() { public void onFormItemClick(FormItemIconClickEvent event) { // TODO: Pass the actual index, rather than null, if the prop is inside a list. - displayMemberValuesEditor(extendLocatorId("MemberValuesEditor"), propertyDefinitionSimple, - propertySimple, null, dynamicItem); + displayMemberValuesEditor(propertyDefinitionSimple, propertySimple, null, dynamicItem); } });
@@ -224,7 +223,7 @@ public class GroupConfigurationEditor extends ConfigurationEditor { return unsetItem; }
- private void displayMemberValuesEditor(String locatorId, final PropertyDefinitionSimple propertyDefinitionSimple, + private void displayMemberValuesEditor(final PropertyDefinitionSimple propertyDefinitionSimple, final PropertySimple aggregatePropertySimple, Integer index, final FormItem aggregateValueItem) {
final PopupWindow popup = new PopupWindow(null); @@ -232,28 +231,28 @@ public class GroupConfigurationEditor extends ConfigurationEditor { popup.setWidth(800); popup.setHeight(600);
- LocatableVLayout layout = buildMemberEditor(locatorId, propertyDefinitionSimple, aggregatePropertySimple, - index, aggregateValueItem, popup); + EnhancedVLayout layout = buildMemberEditor(propertyDefinitionSimple, aggregatePropertySimple, index, + aggregateValueItem, popup);
popup.addItem(layout); popup.show(); }
- private LocatableVLayout buildMemberEditor(String locatorId, - final PropertyDefinitionSimple propertyDefinitionSimple, final PropertySimple aggregatePropertySimple, - final Integer index, final FormItem aggregateValueItem, final PopupWindow popup) { + private EnhancedVLayout buildMemberEditor(final PropertyDefinitionSimple propertyDefinitionSimple, + final PropertySimple aggregatePropertySimple, final Integer index, final FormItem aggregateValueItem, + final PopupWindow popup) {
final boolean propertyIsReadOnly = isReadOnly(propertyDefinitionSimple, aggregatePropertySimple);
- LocatableVLayout layout = new LocatableVLayout(extendLocatorId(locatorId)); + EnhancedVLayout layout = new EnhancedVLayout(); layout.setHeight100(); layout.setWidth100(); layout.setMargin(11);
// create the header strip - will contain "set all values to" form - LocatableToolStrip headerStrip = null; + EnhancedToolStrip headerStrip = null; if (!propertyIsReadOnly) { - headerStrip = new LocatableToolStrip(); + headerStrip = new EnhancedToolStrip(); headerStrip.setWidth100(); headerStrip.setPadding(5); headerStrip.setMembersMargin(10); @@ -356,7 +355,7 @@ public class GroupConfigurationEditor extends ConfigurationEditor { layout.addMember(memberValuesGrid);
// create the footer strip - will contain ok and cancel buttons - LocatableToolStrip footerStrip = new LocatableToolStrip(); + EnhancedToolStrip footerStrip = new EnhancedToolStrip(); footerStrip.setWidth100(); footerStrip.setPadding(5); footerStrip.setMembersMargin(10); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/AbstractRecordEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/AbstractRecordEditor.java index 51aa001..b86f799 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/AbstractRecordEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/AbstractRecordEditor.java @@ -51,8 +51,8 @@ import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; import org.rhq.enterprise.gui.coregui.client.util.message.Message; import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedHLayout; import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedIButton; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableToolStrip; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedToolStrip; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * An editor for a SmartGWT {@link Record} backed by an {@link RPCDataSource}. @@ -60,7 +60,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; * @author Ian Springer */ @SuppressWarnings("unchecked") -public abstract class AbstractRecordEditor<DS extends RPCDataSource> extends LocatableVLayout implements +public abstract class AbstractRecordEditor<DS extends RPCDataSource> extends EnhancedVLayout implements BookmarkableView, DetailsView {
private static final Label LOADING_LABEL = new Label(MSG.common_msg_loading()); @@ -78,7 +78,7 @@ public abstract class AbstractRecordEditor<DS extends RPCDataSource> extends Loc private String dataTypeName; private String listViewPath; private ButtonBar buttonBar; - private LocatableVLayout contentPane; + private EnhancedVLayout contentPane; private boolean postFetchHandlerExecutedAlready;
public AbstractRecordEditor(DS dataSource, int recordId, String dataTypeName, String headerIcon) { @@ -143,8 +143,8 @@ public abstract class AbstractRecordEditor<DS extends RPCDataSource> extends Loc } }
- protected LocatableVLayout buildContentPane() { - LocatableVLayout contentPane = new LocatableVLayout(extendLocatorId("Content")); + protected EnhancedVLayout buildContentPane() { + EnhancedVLayout contentPane = new EnhancedVLayout(); contentPane.setWidth100(); contentPane.setHeight100(); contentPane.setOverflow(Overflow.AUTO); @@ -185,7 +185,7 @@ public abstract class AbstractRecordEditor<DS extends RPCDataSource> extends Loc return this.isReadOnly; }
- public LocatableVLayout getContentPane() { + public EnhancedVLayout getContentPane() { return this.contentPane; }
@@ -438,7 +438,7 @@ public abstract class AbstractRecordEditor<DS extends RPCDataSource> extends Loc return Character.toUpperCase(itemTitle.charAt(ID_NEW)) + itemTitle.substring(1); }
- protected class ButtonBar extends LocatableToolStrip { + protected class ButtonBar extends EnhancedToolStrip {
private IButton saveButton; private IButton resetButton; @@ -450,7 +450,7 @@ public abstract class AbstractRecordEditor<DS extends RPCDataSource> extends Loc setWidth100(); setHeight(35);
- LocatableVLayout vLayout = new LocatableVLayout(extendLocatorId("VLayout")); + EnhancedVLayout vLayout = new EnhancedVLayout(); vLayout.setAlign(VerticalAlignment.CENTER); vLayout.setLayoutMargin(4);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java index 6f3e9f8..de9d362 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java @@ -65,16 +65,15 @@ import com.smartgwt.client.widgets.layout.VStack;
import org.rhq.enterprise.gui.coregui.client.ImageManager; import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTransferImgButton; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVStack; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVStack; import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/** * @author Greg Hinkle * @author Ian Springer */ -public abstract class AbstractSelector<T, C extends org.rhq.core.domain.criteria.Criteria> extends LocatableVLayout { +public abstract class AbstractSelector<T, C extends org.rhq.core.domain.criteria.Criteria> extends EnhancedVLayout {
private static final String SELECTOR_KEY = "id";
@@ -395,12 +394,12 @@ public abstract class AbstractSelector<T, C extends org.rhq.core.domain.criteria }
private VStack buildButtonStack() { - VStack moveButtonStack = new LocatableVStack(extendLocatorId("MoveButtons"), 6); + VStack moveButtonStack = new EnhancedVStack(6); moveButtonStack.setWidth(42); moveButtonStack.setHeight(250); moveButtonStack.setAlign(VerticalAlignment.CENTER);
- this.addButton = new LocatableTransferImgButton(this.getLocatorId(), TransferImgButton.RIGHT); + this.addButton = new TransferImgButton(TransferImgButton.RIGHT); this.addButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { addSelectedRows(); @@ -408,7 +407,7 @@ public abstract class AbstractSelector<T, C extends org.rhq.core.domain.criteria }); moveButtonStack.addMember(this.addButton);
- this.removeButton = new LocatableTransferImgButton(this.getLocatorId(), TransferImgButton.LEFT); + this.removeButton = new TransferImgButton(TransferImgButton.LEFT); this.removeButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { removeSelectedRows(); @@ -417,7 +416,7 @@ public abstract class AbstractSelector<T, C extends org.rhq.core.domain.criteria }); moveButtonStack.addMember(this.removeButton);
- this.addAllButton = new LocatableTransferImgButton(this.getLocatorId(), TransferImgButton.RIGHT_ALL); + this.addAllButton = new TransferImgButton(TransferImgButton.RIGHT_ALL); this.addAllButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { availableGrid.selectAllRecords(); @@ -426,7 +425,7 @@ public abstract class AbstractSelector<T, C extends org.rhq.core.domain.criteria }); moveButtonStack.addMember(this.addAllButton);
- this.removeAllButton = new LocatableTransferImgButton(this.getLocatorId(), TransferImgButton.LEFT_ALL); + this.removeAllButton = new TransferImgButton(TransferImgButton.LEFT_ALL); this.removeAllButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { assignedGrid.selectAllRecords(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/sorter/ReorderableList.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/sorter/ReorderableList.java index f405d27..f0b61a7 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/sorter/ReorderableList.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/sorter/ReorderableList.java @@ -36,12 +36,12 @@ import com.smartgwt.client.widgets.layout.HLayout; import com.smartgwt.client.widgets.layout.SectionStack; import com.smartgwt.client.widgets.layout.SectionStackSection;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Ian Springer */ -public class ReorderableList extends LocatableVLayout { +public class ReorderableList extends EnhancedVLayout {
protected ListGridRecord[] initialSelection; protected HLayout hlayout; @@ -58,17 +58,17 @@ public class ReorderableList extends LocatableVLayout {
private HoverCustomizer nameHoverCustomizer;
- public ReorderableList(String locatorId, ListGridRecord[] records, String itemTitle, String itemIcon) { - this(locatorId, false, records, itemTitle, itemIcon, null); + public ReorderableList(ListGridRecord[] records, String itemTitle, String itemIcon) { + this(false, records, itemTitle, itemIcon, null); }
- public ReorderableList(String locatorId, ListGridRecord[] records, String itemTitle, String itemIcon, + public ReorderableList(ListGridRecord[] records, String itemTitle, String itemIcon, HoverCustomizer nameHoverCustomizer) { - this(locatorId, false, records, itemTitle, itemIcon, nameHoverCustomizer); + this(false, records, itemTitle, itemIcon, nameHoverCustomizer); }
- public ReorderableList(String locatorId, boolean isReadOnly, ListGridRecord[] records, String itemTitle, - String itemIcon, HoverCustomizer nameHoverCustomizer) { + public ReorderableList(boolean isReadOnly, ListGridRecord[] records, String itemTitle, String itemIcon, + HoverCustomizer nameHoverCustomizer) { super();
this.isReadOnly = isReadOnly; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTab.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTab.java index c8ce710..d54048e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTab.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTab.java @@ -15,13 +15,13 @@ public class NamedTab extends LocatableTab {
private ViewName viewName;
- public NamedTab(String locatorId, ViewName viewName) { - super(locatorId, viewName.getTitle()); + public NamedTab(ViewName viewName) { + super(viewName.getTitle()); this.viewName = viewName; }
- public NamedTab(String locatorId, ViewName viewName, String icon) { - super(locatorId, viewName.getTitle(), icon); + public NamedTab(ViewName viewName, String icon) { + super(viewName.getTitle(), icon); this.viewName = viewName; }
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTab.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTab.java index a9c5ef7..e28b80d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTab.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTab.java @@ -24,14 +24,14 @@ import com.smartgwt.client.widgets.Canvas;
import org.rhq.enterprise.gui.coregui.client.components.view.ViewFactory; import org.rhq.enterprise.gui.coregui.client.components.view.ViewName; -import org.rhq.enterprise.gui.coregui.client.util.selenium.Locatable; +import org.rhq.enterprise.gui.coregui.client.util.selenium.Enhanced;
/** * A Locatable SubTab associating a Button with a Canvas. * * @author Jay Shaughnessy */ -public class SubTab implements Locatable { +public class SubTab implements Enhanced { private String locatorId; private ViewName viewName; private Canvas canvas; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTabLayout.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTabLayout.java index c7cd05e..95f786b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTabLayout.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTabLayout.java @@ -35,13 +35,13 @@ import com.smartgwt.client.widgets.events.ClickHandler; import com.smartgwt.client.widgets.toolbar.ToolStrip;
import org.rhq.enterprise.gui.coregui.client.CoreGUI; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableToolStrip; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedToolStrip; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Greg Hinkle */ -public class SubTabLayout extends LocatableVLayout { +public class SubTabLayout extends EnhancedVLayout {
/** maps subTab locator IDs to SubTabs. Unlike names, locatorIDs are qualified by the Tab and therefore unique. */ private Map<String, SubTab> subTabs = new LinkedHashMap<String, SubTab>(); @@ -70,7 +70,7 @@ public class SubTabLayout extends LocatableVLayout { setMargin(0); setPadding(0);
- buttonBar = new LocatableToolStrip(); + buttonBar = new EnhancedToolStrip(); buttonBar.setBackgroundColor("grey"); buttonBar.setWidth100(); buttonBar.setBorder(null); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTab.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTab.java index 922ec35..813d638 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTab.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTab.java @@ -29,26 +29,25 @@ import org.rhq.enterprise.gui.coregui.client.components.view.ViewName; */ public class TwoLevelTab extends NamedTab { private SubTabLayout layout; - + private TwoLevelTab actualNext; private TwoLevelTab visibleNext;
/** * Use the more type safe version instead.<br/> * <code>TwoLevelTab(String locatorId, ViewName viewName, String icon)</code> - * @param locatorId * @param viewName * @param icon String representation of Icon not as typesafe as IconEnum. */ @Deprecated - public TwoLevelTab(String locatorId, ViewName viewName, String icon) { - super(locatorId, viewName, icon); + public TwoLevelTab(ViewName viewName, String icon) { + super(viewName, icon);
layout = new SubTabLayout(); }
- public TwoLevelTab(String locatorId, ViewName viewName, IconEnum iconEnum) { - super(locatorId, viewName, iconEnum.getIcon16x16DisabledPath()); + public TwoLevelTab(ViewName viewName, IconEnum iconEnum) { + super(viewName, iconEnum.getIcon16x16DisabledPath());
layout = new SubTabLayout(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/AbstractTableSection.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/AbstractTableSection.java index 9735e2b..4a49067 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/AbstractTableSection.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/AbstractTableSection.java @@ -45,7 +45,7 @@ import org.rhq.enterprise.gui.coregui.client.components.buttons.BackButton; import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; import org.rhq.enterprise.gui.coregui.client.util.StringUtility; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout; import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/** @@ -109,7 +109,7 @@ public abstract class AbstractTableSection<DS extends RPCDataSource, ID> extends
this.initialDisplay = true;
- detailsHolder = new LocatableVLayout(); + detailsHolder = new EnhancedVLayout(); detailsHolder.setAlign(VerticalAlignment.TOP); //detailsHolder.setWidth100(); //detailsHolder.setHeight100(); @@ -388,7 +388,7 @@ public abstract class AbstractTableSection<DS extends RPCDataSource, ID> extends // editable, a Cancel button should already be provided by the details view. BackButton backButton = new BackButton(MSG.view_tableSection_backButton(), basePath); detailsHolder.addMember(backButton); - VLayout verticalSpacer = new LocatableVLayout(); + VLayout verticalSpacer = new EnhancedVLayout(); verticalSpacer.setHeight(8); detailsHolder.addMember(verticalSpacer); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java index 0df8621..d7f83f1 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java @@ -85,8 +85,8 @@ import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; import org.rhq.enterprise.gui.coregui.client.util.message.Message; import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedHLayout; import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedIButton; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableToolStrip; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedToolStrip; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout; import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/** @@ -109,11 +109,11 @@ public class Table<DS extends RPCDataSource> extends EnhancedHLayout implements protected static final String FIELD_ID = "id"; protected static final String FIELD_NAME = "name";
- private LocatableVLayout contents; + private EnhancedVLayout contents;
private HTMLFlow titleCanvas;
- private LocatableVLayout titleLayout; + private EnhancedVLayout titleLayout;
private TitleBar titleBar; private String titleIcon; @@ -146,8 +146,8 @@ public class Table<DS extends RPCDataSource> extends EnhancedHLayout implements private boolean tableActionDisableOverride = false; protected List<Canvas> extraWidgetsAboveFooter = new ArrayList<Canvas>(); protected List<Canvas> extraWidgetsInMainFooter = new ArrayList<Canvas>(); - private LocatableToolStrip footer; - private LocatableToolStrip footerExtraWidgets; + private EnhancedToolStrip footer; + private EnhancedToolStrip footerExtraWidgets; private EnhancedIButton refreshButton; private boolean initialized;
@@ -245,9 +245,9 @@ public class Table<DS extends RPCDataSource> extends EnhancedHLayout implements * @return the Layout for all of the Table contents * @see #configureTableContents(Layout) */ - protected LocatableVLayout createTableContents() { + protected EnhancedVLayout createTableContents() { if (null == contents) { - contents = new LocatableVLayout(); + contents = new EnhancedVLayout(); }
return contents; @@ -270,7 +270,7 @@ public class Table<DS extends RPCDataSource> extends EnhancedHLayout implements contents.setOverflow(Overflow.AUTO); }
- public LocatableVLayout getTableContents() { + public EnhancedVLayout getTableContents() { return contents; }
@@ -422,7 +422,7 @@ public class Table<DS extends RPCDataSource> extends EnhancedHLayout implements
if (showHeader) { // titleLayout not really needed now as TitleBar has a LocatableVLayout - titleLayout = new LocatableVLayout(contents.extendLocatorId("Title")); + titleLayout = new EnhancedVLayout(); titleLayout.setAutoHeight(); titleLayout.setAlign(VerticalAlignment.BOTTOM); contents.addMember(titleLayout, 0); @@ -438,14 +438,14 @@ public class Table<DS extends RPCDataSource> extends EnhancedHLayout implements
// A second toolstrip that optionally appears before the main footer - it will contain extra widgets. // This is hidden from view unless extra widgets are actually added to the table above the main footer. - this.footerExtraWidgets = new LocatableToolStrip(); + this.footerExtraWidgets = new EnhancedToolStrip(); footerExtraWidgets.setPadding(5); footerExtraWidgets.setWidth100(); footerExtraWidgets.setMembersMargin(15); footerExtraWidgets.hide(); contents.addMember(footerExtraWidgets);
- this.footer = new LocatableToolStrip(); + this.footer = new EnhancedToolStrip(); footer.setPadding(5); footer.setWidth100(); footer.setMembersMargin(15); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tagging/TagEditorView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tagging/TagEditorView.java index e626457..4f6b037 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tagging/TagEditorView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tagging/TagEditorView.java @@ -55,7 +55,7 @@ import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.LinkManager; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedHLayout; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedLayout;
/** * A reusable component that shows a set of tags and, if not read only, allows the user @@ -64,7 +64,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableLayout; * @author Greg Hinkle * @author John Mazzitelli */ -public class TagEditorView extends LocatableLayout { +public class TagEditorView extends EnhancedLayout {
private LinkedHashSet<Tag> tags = new LinkedHashSet<Tag>(); private boolean readOnly; @@ -74,12 +74,11 @@ public class TagEditorView extends LocatableLayout { private Img addImg; private TagInputDialog tagInputDialog;
- public TagEditorView(String locatorId, Set<Tag> tags, boolean readOnly, TagsChangedCallback callback) { - this(locatorId, tags, readOnly, callback, false); + public TagEditorView(Set<Tag> tags, boolean readOnly, TagsChangedCallback callback) { + this(tags, readOnly, callback, false); }
- public TagEditorView(String locatorId, Set<Tag> tags, boolean readOnly, TagsChangedCallback callback, - boolean vertical) { + public TagEditorView(Set<Tag> tags, boolean readOnly, TagsChangedCallback callback, boolean vertical) {
super();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/trigger/JobTriggerEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/trigger/JobTriggerEditor.java index e613674..83702f9 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/trigger/JobTriggerEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/trigger/JobTriggerEditor.java @@ -49,7 +49,7 @@ import org.rhq.enterprise.gui.coregui.client.components.form.EnhancedDynamicForm import org.rhq.enterprise.gui.coregui.client.components.form.TimeUnit; import org.rhq.enterprise.gui.coregui.client.components.form.UnitType; import org.rhq.enterprise.gui.coregui.client.util.message.Message; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * A SmartGWT widget that provides the ability to create a new {@link JobTrigger job trigger}, or view or edit an @@ -57,7 +57,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; * * @author Ian Springer */ -public class JobTriggerEditor extends LocatableVLayout { +public class JobTriggerEditor extends EnhancedVLayout {
// Field Names private static final String FIELD_MODE = "mode"; @@ -73,8 +73,8 @@ public class JobTriggerEditor extends LocatableVLayout { private JobTrigger jobTrigger; private boolean isReadOnly;
- private LocatableVLayout calendarModeLayout; - private LocatableVLayout cronModeLayout; + private EnhancedVLayout calendarModeLayout; + private EnhancedVLayout cronModeLayout;
private EnhancedDynamicForm modeForm; private EnhancedDynamicForm calendarTypeForm; @@ -95,7 +95,7 @@ public class JobTriggerEditor extends LocatableVLayout { * * @param locatorId */ - public JobTriggerEditor(String locatorId, boolean isReadOnly) { + public JobTriggerEditor(boolean isReadOnly) { super();
this.isReadOnly = isReadOnly; @@ -107,7 +107,7 @@ public class JobTriggerEditor extends LocatableVLayout { * @param locatorId * @param jobTrigger */ - public JobTriggerEditor(String locatorId, JobTrigger jobTrigger) { + public JobTriggerEditor(JobTrigger jobTrigger) { super();
this.jobTrigger = jobTrigger; @@ -192,7 +192,7 @@ public class JobTriggerEditor extends LocatableVLayout { this.modeForm.setFields(modeItem); addMember(this.modeForm);
- this.calendarModeLayout = new LocatableVLayout(extendLocatorId("CalendarModeLayout")); + this.calendarModeLayout = new EnhancedVLayout();
this.calendarTypeForm = new EnhancedDynamicForm(this.isReadOnly);
@@ -213,7 +213,7 @@ public class JobTriggerEditor extends LocatableVLayout { this.calendarModeLayout.addMember(this.calendarTypeForm); addMember(this.calendarModeLayout);
- this.cronModeLayout = new LocatableVLayout(extendLocatorId("CronModeLayout")); + this.cronModeLayout = new EnhancedVLayout(); this.cronModeLayout.setVisible(false);
this.cronForm = new DynamicForm(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/AbstractSectionedLeftNavigationView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/AbstractSectionedLeftNavigationView.java index a623f54..c5860f7 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/AbstractSectionedLeftNavigationView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/AbstractSectionedLeftNavigationView.java @@ -49,7 +49,7 @@ import org.rhq.enterprise.gui.coregui.client.components.TitleBar; import org.rhq.enterprise.gui.coregui.client.components.tree.EnhancedTreeNode; import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedHLayout; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * The base class for the various top-level views which have a sectioned navigation menu on the left side and a content @@ -195,7 +195,7 @@ public abstract class AbstractSectionedLeftNavigationView extends EnhancedHLayou
public void setContent(Canvas newContent) { if (newContent instanceof HasViewName) { - LocatableVLayout decoratedContent = decorateWithTitleBar(((HasViewName) newContent).getViewName(), + EnhancedVLayout decoratedContent = decorateWithTitleBar(((HasViewName) newContent).getViewName(), newContent); contentCanvas.addChild(decoratedContent); } else { @@ -294,8 +294,8 @@ public abstract class AbstractSectionedLeftNavigationView extends EnhancedHLayou return globalPermissions; }
- private LocatableVLayout decorateWithTitleBar(ViewName viewName, Canvas pageBody){ - LocatableVLayout vLayout = new LocatableVLayout(); + private EnhancedVLayout decorateWithTitleBar(ViewName viewName, Canvas pageBody){ + EnhancedVLayout vLayout = new EnhancedVLayout(); vLayout.setWidth100(); vLayout.setHeight100(); // default to 24x24 otherwise use 16x16 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 a89873d..9b2126b 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 @@ -40,12 +40,12 @@ 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.EnhancedIButton; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Greg Hinkle */ -public class WizardView extends LocatableVLayout { +public class WizardView extends EnhancedVLayout {
static private final Messages MSG = CoreGUI.getMessages();
@@ -79,7 +79,7 @@ public class WizardView extends LocatableVLayout { HashSet<Canvas> createdCanvases = new HashSet<Canvas>();
public WizardView(Wizard wizard) { - super("WizardView", 10); + super(10);
this.wizard = wizard; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java index f0693d6..e96a08a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java @@ -76,7 +76,7 @@ import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.resource.Resourc import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.resource.ResourcePkgHistoryPortlet; 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.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout; import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/** @@ -84,7 +84,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility; * @author Greg Hinkle * @author Simeon Pinder */ -public class DashboardView extends LocatableVLayout { +public class DashboardView extends EnhancedVLayout {
private DashboardContainer dashboardContainer; private Dashboard storedDashboard; @@ -128,9 +128,9 @@ public class DashboardView extends LocatableVLayout { * @param dashboardContainer * @param storedDashboard */ - public DashboardView(String locatorId, DashboardContainer dashboardContainer, Dashboard storedDashboard) { + public DashboardView(DashboardContainer dashboardContainer, Dashboard storedDashboard) {
- this(locatorId, dashboardContainer, storedDashboard, EntityContext.forSubsystemView(), null); + this(dashboardContainer, storedDashboard, EntityContext.forSubsystemView(), null); }
/** @@ -140,8 +140,8 @@ public class DashboardView extends LocatableVLayout { * @param context * @param composite ResourceComposite, ResourceGroupComposite or null depending on context */ - public DashboardView(String locatorId, DashboardContainer dashboardContainer, Dashboard storedDashboard, - EntityContext context, Object composite) { + public DashboardView(DashboardContainer dashboardContainer, Dashboard storedDashboard, EntityContext context, + Object composite) {
super();
@@ -208,8 +208,7 @@ public class DashboardView extends LocatableVLayout { public void buildPortlets() { this.setBackgroundColor(storedDashboard.getConfiguration().getSimpleValue(Dashboard.CFG_BACKGROUND, "white"));
- portalLayout = new PortalLayout(extendLocatorId("PortalLayout"), this, storedDashboard.getColumns(), - storedDashboard.getColumnWidths()); + portalLayout = new PortalLayout(this, storedDashboard.getColumns(), storedDashboard.getColumnWidths());
portalLayout.setOverflow(Overflow.AUTO); portalLayout.setWidth100(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java index 3ac6274..d71aa2d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java @@ -72,13 +72,13 @@ import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.util.MessagePort import org.rhq.enterprise.gui.coregui.client.gwt.DashboardGWTServiceAsync; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedIButton; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Jay Shaughnessy * @author Greg Hinkle */ -public class DashboardsView extends LocatableVLayout implements DashboardContainer, BookmarkableView, InitializableView { +public class DashboardsView extends EnhancedVLayout implements DashboardContainer, BookmarkableView, InitializableView {
public static final ViewName VIEW_ID = new ViewName("Dashboards", MSG.view_dashboards_title());
@@ -234,9 +234,8 @@ public class DashboardsView extends LocatableVLayout implements DashboardContain String dashboardName = String.valueOf(dashboard.getId()); String dashboardTitle = dashboard.getName(); String dashboardLocatorId = getDashboardLocatorId(dashboardTitle); - String locatorId = extendLocatorId(dashboardLocatorId); - DashboardView dashboardView = new DashboardView(locatorId, this, dashboard); - Tab tab = new NamedTab(locatorId, new ViewName(dashboardName, dashboardTitle), null); + DashboardView dashboardView = new DashboardView(this, dashboard); + Tab tab = new NamedTab(new ViewName(dashboardName, dashboardTitle), null); tab.setPane(dashboardView); tab.setCanClose(true);
@@ -391,10 +390,8 @@ public class DashboardsView extends LocatableVLayout implements DashboardContain String dashboardTitle = result.getName(); dashboardsByName.put(dashboardTitle, result); // update map so name can not be reused String dashboardLocatorId = getDashboardLocatorId(dashboardTitle); - DashboardView dashboardView = new DashboardView(extendLocatorId(dashboardLocatorId), - DashboardsView.this, result); - NamedTab tab = new NamedTab(extendLocatorId(dashboardLocatorId), new ViewName(dashboardName, - dashboardTitle), null); + DashboardView dashboardView = new DashboardView(DashboardsView.this, result); + NamedTab tab = new NamedTab(new ViewName(dashboardName, dashboardTitle), null); tab.setPane(dashboardView); tab.setCanClose(true);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortalLayout.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortalLayout.java index 3da3145..6b7abb6 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortalLayout.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortalLayout.java @@ -56,7 +56,7 @@ public class PortalLayout extends EnhancedHLayout { * @param columnWidths Currently only the first column width is set, others are ignored and share the remaining space * evenly. If null column 0 defaults to 30%. */ - public PortalLayout(String locatorId, DashboardView dashboardView, int numColumns, String[] columnWidths) { + public PortalLayout(DashboardView dashboardView, int numColumns, String[] columnWidths) { super();
if (numColumns < 1) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupBundleDeploymentsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupBundleDeploymentsPortlet.java index 10b3ac5..d29154a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupBundleDeploymentsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupBundleDeploymentsPortlet.java @@ -55,13 +55,13 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.summary.AbstractActivityView; import org.rhq.enterprise.gui.coregui.client.util.GwtRelativeDurationConverter; import org.rhq.enterprise.gui.coregui.client.util.Log; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/**This portlet allows the end user to customize the Bundle Deployment display * * @author Simeon Pinder */ -public class GroupBundleDeploymentsPortlet extends LocatableVLayout implements CustomSettingsPortlet, +public class GroupBundleDeploymentsPortlet extends EnhancedVLayout implements CustomSettingsPortlet, AutoRefreshPortlet {
private int groupId = -1; @@ -156,7 +156,7 @@ public class GroupBundleDeploymentsPortlet extends LocatableVLayout implements C final Configuration portletConfig = storedPortlet.getConfiguration();
DynamicForm customSettings = new DynamicForm(); - LocatableVLayout page = new LocatableVLayout(); + EnhancedVLayout page = new EnhancedVLayout(); //build editor form container final DynamicForm form = new DynamicForm(); form.setMargin(5); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java index e575fc6..cdf1a9e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java @@ -64,12 +64,12 @@ import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.configurati import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.configuration.HistoryGroupResourceConfigurationTable; import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Simeon Pinder */ -public class GroupConfigurationUpdatesPortlet extends LocatableVLayout implements CustomSettingsPortlet, +public class GroupConfigurationUpdatesPortlet extends EnhancedVLayout implements CustomSettingsPortlet, AutoRefreshPortlet {
// A non-displayed, persisted identifier for the portlet @@ -163,7 +163,7 @@ public class GroupConfigurationUpdatesPortlet extends LocatableVLayout implement final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet(); final Configuration portletConfig = storedPortlet.getConfiguration(); DynamicForm customSettings = new DynamicForm(); - LocatableVLayout page = new LocatableVLayout(); + EnhancedVLayout page = new EnhancedVLayout(); //build editor form container final DynamicForm form = new DynamicForm(); form.setMargin(5); @@ -316,16 +316,14 @@ public class GroupConfigurationUpdatesPortlet extends LocatableVLayout implement filterResourceGroupIds.add(context.getGroupId()); criteria.addFilterResourceGroupIds(filterResourceGroupIds);
- groupHistoryTable = new GroupConfigurationHistoryCriteriaTable(extendLocatorId("Table"), - groupComposite); + groupHistoryTable = new GroupConfigurationHistoryCriteriaTable(groupComposite); } else { ResourceGroup emptyGroup = new ResourceGroup(""); emptyGroup.setId(-1); Long zero = new Long(0); groupComposite = new ResourceGroupComposite(zero, zero, zero, zero, zero, zero, zero, zero, emptyGroup); - groupHistoryTable = new GroupConfigurationHistoryCriteriaTable(extendLocatorId("Table"), - groupComposite); + groupHistoryTable = new GroupConfigurationHistoryCriteriaTable(groupComposite); }
//update table for portlet display. @@ -347,8 +345,8 @@ public class GroupConfigurationUpdatesPortlet extends LocatableVLayout implement
class GroupConfigurationHistoryCriteriaTable extends HistoryGroupResourceConfigurationTable {
- public GroupConfigurationHistoryCriteriaTable(String locatorId, ResourceGroupComposite groupComposite) { - super(locatorId, groupComposite); + public GroupConfigurationHistoryCriteriaTable(ResourceGroupComposite groupComposite) { + super(groupComposite); }
@Override diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java index 52ed212..daf29b4 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java @@ -52,13 +52,13 @@ import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.summary.Abs import org.rhq.enterprise.gui.coregui.client.util.GwtTuple; import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/**This portlet allows the end user to customize the Events display * * @author Simeon Pinder */ -public class GroupEventsPortlet extends LocatableVLayout implements CustomSettingsPortlet, AutoRefreshPortlet { +public class GroupEventsPortlet extends EnhancedVLayout implements CustomSettingsPortlet, AutoRefreshPortlet {
// A non-displayed, persisted identifier for the portlet public static final String KEY = "GroupEvents"; @@ -155,7 +155,7 @@ public class GroupEventsPortlet extends LocatableVLayout implements CustomSettin @Override public DynamicForm getCustomSettingsForm() { final DynamicForm customSettings = new DynamicForm(); - LocatableVLayout page = new LocatableVLayout(); + EnhancedVLayout page = new EnhancedVLayout();
final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet(); final Configuration portletConfig = storedPortlet.getConfiguration(); @@ -246,7 +246,7 @@ public class GroupEventsPortlet extends LocatableVLayout implements CustomSettin } } //build display - LocatableVLayout column = new LocatableVLayout(); + EnhancedVLayout column = new EnhancedVLayout(); column.setHeight(10);
if (!results.isEmpty()) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java index f6ed358..8aee857 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java @@ -70,13 +70,13 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTyp import org.rhq.enterprise.gui.coregui.client.util.BrowserUtility; import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/**This portlet allows the end user to customize the metric display * * @author Simeon Pinder */ -public class GroupMetricsPortlet extends LocatableVLayout implements CustomSettingsPortlet, AutoRefreshPortlet { +public class GroupMetricsPortlet extends EnhancedVLayout implements CustomSettingsPortlet, AutoRefreshPortlet {
private int groupId = -1; private boolean isAutoCluster; @@ -184,7 +184,7 @@ public class GroupMetricsPortlet extends LocatableVLayout implements CustomSetti //root form. DynamicForm customSettings = new DynamicForm(); //embed range editor in it own container - LocatableVLayout page = new LocatableVLayout(); + EnhancedVLayout page = new EnhancedVLayout(); final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet(); final Configuration portletConfig = storedPortlet.getConfiguration(); final CustomConfigMeasurementRangeEditor measurementRangeEditor = PortletConfigurationEditorComponent diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOobsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOobsPortlet.java index a41594a..96d5520 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOobsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOobsPortlet.java @@ -55,13 +55,13 @@ import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.summary.Abs import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.summary.AbstractActivityView.ChartViewWindow; import org.rhq.enterprise.gui.coregui.client.util.GwtRelativeDurationConverter; import org.rhq.enterprise.gui.coregui.client.util.Log; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/**This portlet allows the end user to customize the OOB display * * @author Simeon Pinder */ -public class GroupOobsPortlet extends LocatableVLayout implements CustomSettingsPortlet, AutoRefreshPortlet { +public class GroupOobsPortlet extends EnhancedVLayout implements CustomSettingsPortlet, AutoRefreshPortlet {
// A non-displayed, persisted identifier for the portlet public static final String KEY = "GroupOobs"; @@ -155,7 +155,7 @@ public class GroupOobsPortlet extends LocatableVLayout implements CustomSettings final Configuration portletConfig = storedPortlet.getConfiguration();
DynamicForm customSettings = new DynamicForm(); - LocatableVLayout page = new LocatableVLayout(); + EnhancedVLayout page = new EnhancedVLayout(); //build editor form container final DynamicForm form = new DynamicForm(); form.setMargin(5); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java index 3e1f428..1e5946b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java @@ -62,12 +62,12 @@ import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.operation.h import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.operation.history.GroupOperationHistoryListView; import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Simeon Pinder */ -public class GroupOperationsPortlet extends LocatableVLayout implements CustomSettingsPortlet, AutoRefreshPortlet { +public class GroupOperationsPortlet extends EnhancedVLayout implements CustomSettingsPortlet, AutoRefreshPortlet {
// A non-displayed, persisted identifier for the portlet public static final String KEY = "GroupOperations"; @@ -235,7 +235,7 @@ public class GroupOperationsPortlet extends LocatableVLayout implements CustomSe final Configuration portletConfig = storedPortlet.getConfiguration();
DynamicForm customSettings = new DynamicForm(); - LocatableVLayout page = new LocatableVLayout(); + EnhancedVLayout page = new EnhancedVLayout(); //build editor form container final DynamicForm form = new DynamicForm(); form.setMargin(5); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java index 520cd0d..7ed8a80 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java @@ -53,13 +53,13 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.summary.AbstractActivityView; import org.rhq.enterprise.gui.coregui.client.util.GwtRelativeDurationConverter; import org.rhq.enterprise.gui.coregui.client.util.Log; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/**This portlet allows the end user to customize the Package History display * * @author Simeon Pinder */ -public class GroupPkgHistoryPortlet extends LocatableVLayout implements CustomSettingsPortlet, AutoRefreshPortlet { +public class GroupPkgHistoryPortlet extends EnhancedVLayout implements CustomSettingsPortlet, AutoRefreshPortlet {
// A non-displayed, persisted identifier for the portlet public static final String KEY = "GroupPackageHistory"; @@ -153,7 +153,7 @@ public class GroupPkgHistoryPortlet extends LocatableVLayout implements CustomSe final Configuration portletConfig = storedPortlet.getConfiguration();
DynamicForm customSettings = new DynamicForm(); - LocatableVLayout page = new LocatableVLayout(); + EnhancedVLayout page = new EnhancedVLayout(); //build editor form container final DynamicForm form = new DynamicForm(); form.setMargin(5); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java index 1fbf7aa..44f7e79 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java @@ -45,7 +45,7 @@ import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent.Constant; import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout; import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/** @@ -163,7 +163,7 @@ public abstract class AbstractRecentAlertsPortlet extends AlertHistoryView imple public DynamicForm getCustomSettingsForm() {
DynamicForm customSettingsForm = new DynamicForm(); - LocatableVLayout page = new LocatableVLayout(); + EnhancedVLayout page = new EnhancedVLayout(); DynamicForm filterForm = new DynamicForm(); filterForm.setMargin(5);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/drift/AbstractRecentDriftsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/drift/AbstractRecentDriftsPortlet.java index b695984..63ba856 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/drift/AbstractRecentDriftsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/drift/AbstractRecentDriftsPortlet.java @@ -42,7 +42,7 @@ import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigura import org.rhq.enterprise.gui.coregui.client.drift.DriftDataSource; import org.rhq.enterprise.gui.coregui.client.drift.DriftHistoryView; import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * A base class for deriving recent drift portlets for different entity contexts. In this way the @@ -129,7 +129,7 @@ public abstract class AbstractRecentDriftsPortlet extends DriftHistoryView imple public DynamicForm getCustomSettingsForm() {
DynamicForm customSettingsForm = new DynamicForm(); - LocatableVLayout page = new LocatableVLayout(); + EnhancedVLayout page = new EnhancedVLayout(); DynamicForm filterForm = new DynamicForm(); filterForm.setMargin(5);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourcesPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourcesPortlet.java index 2e4f279..5941428 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourcesPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourcesPortlet.java @@ -46,9 +46,9 @@ import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet; import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory; import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
-public class RecentlyAddedResourcesPortlet extends LocatableVLayout implements CustomSettingsPortlet, +public class RecentlyAddedResourcesPortlet extends EnhancedVLayout implements CustomSettingsPortlet, AutoRefreshPortlet {
// A non-displayed, persisted identifier for the portlet diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/AbstractOperationHistoryPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/AbstractOperationHistoryPortlet.java index 3eeb1cb..2b310f4 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/AbstractOperationHistoryPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/AbstractOperationHistoryPortlet.java @@ -41,7 +41,7 @@ import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigura import org.rhq.enterprise.gui.coregui.client.operation.OperationHistoryDataSource; import org.rhq.enterprise.gui.coregui.client.operation.OperationHistoryView; import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * A base class for deriving recent resource operations portlets for different entity contexts. In this way the @@ -135,7 +135,7 @@ public abstract class AbstractOperationHistoryPortlet extends OperationHistoryVi public DynamicForm getCustomSettingsForm() {
DynamicForm customSettingsForm = new DynamicForm(); - LocatableVLayout page = new LocatableVLayout(); + EnhancedVLayout page = new EnhancedVLayout(); DynamicForm filterForm = new DynamicForm(); filterForm.setMargin(5);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationSchedulePortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationSchedulePortlet.java index 77cfb60..1890b5a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationSchedulePortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationSchedulePortlet.java @@ -55,7 +55,7 @@ import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow; import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil; import org.rhq.enterprise.gui.coregui.client.operation.ScheduledOperationsDataSource; import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedHLayout; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout; import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/** @@ -63,7 +63,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility; * * @author Simeon Pinder */ -public class OperationSchedulePortlet extends LocatableVLayout implements CustomSettingsPortlet, AutoRefreshPortlet { +public class OperationSchedulePortlet extends EnhancedVLayout implements CustomSettingsPortlet, AutoRefreshPortlet {
// A non-displayed, persisted identifier for the portlet public static final String KEY = "OperationSchedule"; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceEventsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceEventsPortlet.java index 1d0265e..b44fe46 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceEventsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceEventsPortlet.java @@ -43,7 +43,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.summary.Abs import org.rhq.enterprise.gui.coregui.client.util.GwtTuple; import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/**This portlet allows the end user to customize the Events display * @@ -137,7 +137,7 @@ public class ResourceEventsPortlet extends GroupEventsPortlet { } } //build display - LocatableVLayout column = new LocatableVLayout(); + EnhancedVLayout column = new EnhancedVLayout(); column.setHeight(10);
if (!results.isEmpty()) { 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 379580e..65be45f 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 @@ -49,9 +49,9 @@ import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory; import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.gwt.ResourceBossGWTServiceAsync; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
-public class InventorySummaryPortlet extends LocatableVLayout implements AutoRefreshPortlet { +public class InventorySummaryPortlet extends EnhancedVLayout implements AutoRefreshPortlet {
// A non-displayed, persisted identifier for the portlet public static final String KEY = "InventorySummary"; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionEditView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionEditView.java index 4ee32db..2a3b7ff 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionEditView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionEditView.java @@ -44,14 +44,14 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.ResourceD import org.rhq.enterprise.gui.coregui.client.util.message.Message; import org.rhq.enterprise.gui.coregui.client.util.message.MessageCenter; import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedIButton; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * A view for editing a Resource's configuration. * * @author Jay Shaughnessy */ -public class DriftDefinitionEditView extends LocatableVLayout implements PropertyValueChangeListener, RefreshableView { +public class DriftDefinitionEditView extends EnhancedVLayout implements PropertyValueChangeListener, RefreshableView {
private EntityContext context; private int driftDefId; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplateEditView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplateEditView.java index d057a9c..1ec90bb 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplateEditView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplateEditView.java @@ -43,14 +43,14 @@ 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.MessageCenter; import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedIButton; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * A view for editing a Resource's configuration. * * @author Jay Shaughnessy */ -public class DriftDefinitionTemplateEditView extends LocatableVLayout implements PropertyValueChangeListener, +public class DriftDefinitionTemplateEditView extends EnhancedVLayout implements PropertyValueChangeListener, RefreshableView {
private int driftTemplateId; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplatesView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplatesView.java index 38bb2d4..460371d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplatesView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplatesView.java @@ -97,12 +97,11 @@ public class DriftDefinitionTemplatesView extends TableSection<DriftDefinitionTe }
// for subsystem views - public DriftDefinitionTemplatesView(String locatorId, ResourceType type, boolean hasWriteAccess) { - this(locatorId, getTitle(type), type, hasWriteAccess); + public DriftDefinitionTemplatesView(ResourceType type, boolean hasWriteAccess) { + this(getTitle(type), type, hasWriteAccess); }
- protected DriftDefinitionTemplatesView(String locatorId, String tableTitle, ResourceType type, - boolean hasWriteAccess) { + protected DriftDefinitionTemplatesView(String tableTitle, ResourceType type, boolean hasWriteAccess) { super(tableTitle, null, new SortSpecifier[] { DEFAULT_SORT_SPECIFIER });
this.type = type; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDetailsView.java index 5eae9e5..891a197 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDetailsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDetailsView.java @@ -49,12 +49,12 @@ import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellForma import org.rhq.enterprise.gui.coregui.client.drift.util.DiffUtility; import org.rhq.enterprise.gui.coregui.client.gwt.DriftGWTServiceAsync; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Jay Shaughnessy */ -public class DriftDetailsView extends LocatableVLayout { +public class DriftDetailsView extends EnhancedVLayout {
private String driftId;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizardConfigStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizardConfigStep.java index 998e625..f4f0f96 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizardConfigStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizardConfigStep.java @@ -29,14 +29,14 @@ import org.rhq.core.domain.drift.DriftConfigurationDefinition; import org.rhq.core.domain.drift.DriftDefinitionTemplate; 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.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Jay Shaughnessy */ public class DriftAddDefinitionWizardConfigStep extends AbstractWizardStep {
- private LocatableVLayout vLayout; + private EnhancedVLayout vLayout; private ConfigurationEditor editor; AbstractDriftAddDefinitionWizard wizard; private Configuration startingConfig; @@ -50,7 +50,7 @@ public class DriftAddDefinitionWizardConfigStep extends AbstractWizardStep { // be able to see the wizard's next/cancel buttons. This vlayout also provides for easier expansion if we add more items. if (vLayout == null || !wizard.getNewStartingConfiguration().equals(startingConfig)) {
- vLayout = new LocatableVLayout(); + vLayout = new EnhancedVLayout();
vLayout.setOverflow(Overflow.AUTO);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftPinTemplateWizardConfigStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftPinTemplateWizardConfigStep.java index a624d34..13d7f3b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftPinTemplateWizardConfigStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftPinTemplateWizardConfigStep.java @@ -30,14 +30,14 @@ import org.rhq.core.domain.drift.DriftConfigurationDefinition; import org.rhq.core.domain.drift.DriftDefinitionTemplate; 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.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Jay Shaughnessy */ public class DriftPinTemplateWizardConfigStep extends AbstractWizardStep {
- private LocatableVLayout vLayout; + private EnhancedVLayout vLayout; private ConfigurationEditor editor; AbstractDriftPinTemplateWizard wizard; private boolean isConfirmed; @@ -56,7 +56,7 @@ public class DriftPinTemplateWizardConfigStep extends AbstractWizardStep { // be able to see the wizard's next/cancel buttons. This vlayout also provides for easier expansion if we add more items. if (vLayout == null) {
- vLayout = new LocatableVLayout(); + vLayout = new EnhancedVLayout();
vLayout.setOverflow(Overflow.AUTO);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftPinTemplateWizardInfoStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftPinTemplateWizardInfoStep.java index a21132a..79874e6 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftPinTemplateWizardInfoStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftPinTemplateWizardInfoStep.java @@ -44,7 +44,7 @@ import org.rhq.core.domain.drift.DriftDefinitionTemplate; import org.rhq.enterprise.gui.coregui.client.components.form.SortedSelectItem; import org.rhq.enterprise.gui.coregui.client.components.wizard.AbstractWizardStep; import org.rhq.enterprise.gui.coregui.client.util.FormUtility; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Jay Shaughnessy @@ -54,7 +54,7 @@ public class DriftPinTemplateWizardInfoStep extends AbstractWizardStep { static private final String CREATE_TEMPLATE = "create"; static private final String SELECT_TEMPLATE = "select";
- private LocatableVLayout canvas; + private EnhancedVLayout canvas; private DynamicForm radioForm; private AbstractDriftPinTemplateWizard wizard;
@@ -67,7 +67,7 @@ public class DriftPinTemplateWizardInfoStep extends AbstractWizardStep {
public Canvas getCanvas() { if (null == canvas) { - canvas = new LocatableVLayout(); + canvas = new EnhancedVLayout(); canvas.setWidth100();
radioForm = new DynamicForm(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/help/HelpView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/help/HelpView.java index 7f58d37..53b64d3 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/help/HelpView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/help/HelpView.java @@ -41,7 +41,7 @@ import org.rhq.enterprise.gui.coregui.client.components.view.NavigationItem; import org.rhq.enterprise.gui.coregui.client.components.view.NavigationSection; import org.rhq.enterprise.gui.coregui.client.components.view.ViewFactory; import org.rhq.enterprise.gui.coregui.client.components.view.ViewName; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * The Help top-level view. @@ -76,8 +76,8 @@ public class HelpView extends AbstractSectionedLeftNavigationView { }
@Override - protected LocatableVLayout defaultView() { - LocatableVLayout vLayout = new LocatableVLayout(); + protected EnhancedVLayout defaultView() { + EnhancedVLayout vLayout = new EnhancedVLayout(); vLayout.setWidth100();
// TODO: Help icon. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java index 69b7c94..95f2257 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java @@ -49,7 +49,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSour import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDatasource; import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceSearchView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.discovery.ResourceAutodiscoveryView; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * The Inventory top-level view. @@ -109,7 +109,7 @@ public class InventoryView extends AbstractSectionedLeftNavigationView { }
protected Canvas defaultView() { - LocatableVLayout vLayout = new LocatableVLayout(); + EnhancedVLayout vLayout = new EnhancedVLayout(); vLayout.setWidth100();
// TODO: Admin icon. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricGraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricGraphView.java index f91962d..677b9fb 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricGraphView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricGraphView.java @@ -56,13 +56,13 @@ import org.rhq.core.domain.measurement.MeasurementDefinition; import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite; import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient; import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedHLayout; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Greg Hinkle * @author Jay Shaughnessy */ -public abstract class AbstractMetricGraphView extends LocatableVLayout { +public abstract class AbstractMetricGraphView extends EnhancedVLayout {
private static final String INSTRUCTIONS = MSG.view_resource_monitor_graph_instructions();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractSchedulesView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractSchedulesView.java index c85bbc8..5bca807 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractSchedulesView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractSchedulesView.java @@ -52,8 +52,7 @@ public abstract class AbstractSchedulesView extends Table<SchedulesDataSource> {
protected SchedulesDataSource dataSource;
- public AbstractSchedulesView(String locatorId, String tableTitle, EntityContext entityContext, - boolean hasWriteAccess) { + public AbstractSchedulesView(String tableTitle, EntityContext entityContext, boolean hasWriteAccess) {
super(tableTitle, SORT_SPECIFIERS); this.entityContext = entityContext; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java index e6f408a..1fa8e72 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java @@ -43,13 +43,13 @@ import org.rhq.enterprise.gui.coregui.client.components.tab.TwoLevelTabSelectedH import org.rhq.enterprise.gui.coregui.client.components.tab.TwoLevelTabSet; import org.rhq.enterprise.gui.coregui.client.components.view.ViewFactory; import org.rhq.enterprise.gui.coregui.client.util.Log; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Greg Hinkle * @author Ian Springer */ -public abstract class AbstractTwoLevelTabSetView<T, U extends Layout> extends LocatableVLayout implements +public abstract class AbstractTwoLevelTabSetView<T, U extends Layout> extends EnhancedVLayout implements BookmarkableView, TwoLevelTabSelectedHandler {
private String baseViewPath; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/monitoring/IFrameWithMeasurementRangeEditorView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/monitoring/IFrameWithMeasurementRangeEditorView.java index efe107d..27ffc4e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/monitoring/IFrameWithMeasurementRangeEditorView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/monitoring/IFrameWithMeasurementRangeEditorView.java @@ -24,15 +24,15 @@ import com.smartgwt.client.widgets.HTMLPane;
import org.rhq.enterprise.gui.coregui.client.RefreshableView; import org.rhq.enterprise.gui.coregui.client.components.measurement.UserPreferencesMeasurementRangeEditor; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableToolStrip; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedToolStrip; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * * * @author Lukas Krejci */ -public class IFrameWithMeasurementRangeEditorView extends LocatableVLayout implements RefreshableView { +public class IFrameWithMeasurementRangeEditorView extends EnhancedVLayout implements RefreshableView {
UserPreferencesMeasurementRangeEditor editor; HTMLPane iframe; @@ -47,7 +47,7 @@ public class IFrameWithMeasurementRangeEditorView extends LocatableVLayout imple
addMember(iframe);
- LocatableToolStrip footer = new LocatableToolStrip(); + EnhancedToolStrip footer = new EnhancedToolStrip(); footer.setWidth100(); addMember(footer);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDetailsView.java index 0308564..71adf52 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDetailsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDetailsView.java @@ -47,13 +47,13 @@ import org.rhq.enterprise.gui.coregui.client.ImageManager; import org.rhq.enterprise.gui.coregui.client.ViewPath; import org.rhq.enterprise.gui.coregui.client.components.configuration.ConfigurationEditor; import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVStack; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVStack;
/** * @author Greg Hinkle */ -public abstract class AbstractOperationHistoryDetailsView<T extends OperationHistory> extends LocatableVStack implements +public abstract class AbstractOperationHistoryDetailsView<T extends OperationHistory> extends EnhancedVStack implements BookmarkableView {
private T operationHistory; @@ -104,7 +104,7 @@ public abstract class AbstractOperationHistoryDetailsView<T extends OperationHis
// Parameters (if applicable) if (operationHistory.getParameters() != null) { - LocatableVLayout parametersSection = new LocatableVLayout(extendLocatorId("ParametersSection")); + EnhancedVLayout parametersSection = new EnhancedVLayout();
Label title = new Label("<h4>" + MSG.view_operationHistoryDetails_parameters() + "</h4>"); title.setHeight(27); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java index ab0bbf1..2513a9f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java @@ -71,7 +71,7 @@ import org.rhq.enterprise.gui.coregui.client.util.FormUtility; import org.rhq.enterprise.gui.coregui.client.util.TypeConversionUtility; import org.rhq.enterprise.gui.coregui.client.util.message.Message; import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedHLayout; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * A view for viewing or editing an RHQ {@link org.rhq.core.domain.operation.bean.OperationSchedule operation schedule}. @@ -233,8 +233,8 @@ public abstract class AbstractOperationScheduleDetailsView extends }
@Override - protected LocatableVLayout buildContentPane() { - LocatableVLayout contentPane = super.buildContentPane(); + protected EnhancedVLayout buildContentPane() { + EnhancedVLayout contentPane = super.buildContentPane();
this.operationParametersConfigurationHolder = new EnhancedHLayout(); this.operationParametersConfigurationHolder.setVisible(false); @@ -243,7 +243,7 @@ public abstract class AbstractOperationScheduleDetailsView extends HTMLFlow hr = new HTMLFlow("<hr/>"); contentPane.addMember(hr);
- this.triggerEditor = new JobTriggerEditor(extendLocatorId("TriggerEditor"), isReadOnly()); + this.triggerEditor = new JobTriggerEditor(isReadOnly()); contentPane.addMember(this.triggerEditor);
hr = new HTMLFlow("<hr/>"); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java index 09a7963..f8cf38c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java @@ -69,13 +69,13 @@ import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility; import org.rhq.enterprise.gui.coregui.client.util.measurement.GwtMonitorUtils; import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedHLayout; import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedIButton; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout; import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/** * @author Simeon Pinder */ -public abstract class AbstractActivityView extends LocatableVLayout implements RefreshableView { +public abstract class AbstractActivityView extends EnhancedVLayout implements RefreshableView {
//contains the activity display region private EnhancedHLayout columnSection = new EnhancedHLayout(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDetailsView.java index eef423c..a28531b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDetailsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDetailsView.java @@ -38,24 +38,24 @@ import org.rhq.enterprise.gui.coregui.client.ImageManager; import org.rhq.enterprise.gui.coregui.client.ViewPath; import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Joseph Marques */ -public class EventCompositeDetailsView extends LocatableVLayout implements BookmarkableView { +public class EventCompositeDetailsView extends EnhancedVLayout implements BookmarkableView {
private int eventId;
- private static EventCompositeDetailsView INSTANCE = new EventCompositeDetailsView("eventCompositeDetailsView"); + private static EventCompositeDetailsView INSTANCE = new EventCompositeDetailsView();
public static EventCompositeDetailsView getInstance() { return INSTANCE; }
- private EventCompositeDetailsView(String id) { + private EventCompositeDetailsView() { // access through the static singleton only - super(id); + super(); }
private void show(int eventId) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionExpressionBuilder.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionExpressionBuilder.java index 8d6e861..01c2bb7 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionExpressionBuilder.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionExpressionBuilder.java @@ -56,7 +56,7 @@ import org.rhq.enterprise.gui.coregui.client.Messages; import org.rhq.enterprise.gui.coregui.client.components.form.SortedSelectItem; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.gwt.GroupDefinitionExpressionBuilderGWTServiceAsync; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * A dialog window that lets you build custom dynagroup expressions. @@ -336,7 +336,7 @@ public class GroupDefinitionExpressionBuilder extends Window { this.pluginItem, this.resourceTypeItem, this.propertyNameItem, this.unsetItem, this.compareTypeItem, this.valueItem, addButton, closeButton);
- LocatableVLayout layout = new LocatableVLayout(); + EnhancedVLayout layout = new EnhancedVLayout(); layout.setLayoutMargin(5); layout.setAutoHeight(); layout.setAutoWidth(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java index 93ee568..916f11b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java @@ -85,12 +85,12 @@ import org.rhq.enterprise.gui.coregui.client.util.StringUtility; 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.EnhancedIButton; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Joseph Marques */ -public class SingleGroupDefinitionView extends LocatableVLayout implements BookmarkableView { +public class SingleGroupDefinitionView extends EnhancedVLayout implements BookmarkableView {
private static final String TEMPLATE_JBOSSAS4_CLUSTERS = MSG.view_dynagroup_template_jbossas4_clusters(); private static final String TEMPLATE_JBOSSAS5_CLUSTERS = MSG.view_dynagroup_template_jbossas5_clusters(); // true for AS 5 and 6 @@ -147,8 +147,7 @@ public class SingleGroupDefinitionView extends LocatableVLayout implements Bookm : DSOperationType.UPDATE; form.setSaveOperationType(saveOperationType);
- final DynaGroupChildrenView dynaGroupChildrenView = new DynaGroupChildrenView(extendLocatorId("DynaGroups"), - groupDefinitionId); + final DynaGroupChildrenView dynaGroupChildrenView = new DynaGroupChildrenView(groupDefinitionId);
// button setup IButton saveButton = new EnhancedIButton(MSG.common_button_save()); @@ -257,7 +256,7 @@ public class SingleGroupDefinitionView extends LocatableVLayout implements Bookm }
class DynaGroupChildrenView extends Table<ResourceGroupsDataSource> { - public DynaGroupChildrenView(String locatorId, int groupDefinitionId) { + public DynaGroupChildrenView(int groupDefinitionId) { super(MSG.view_dynagroup_children(), new Criteria("groupDefinitionId", String.valueOf(groupDefinition .getId()))); setDataSource(ResourceGroupsDataSource.getInstance()); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/GeneralProperties.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/GeneralProperties.java index bc13894..a82659f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/GeneralProperties.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/GeneralProperties.java @@ -44,7 +44,7 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGroupGWTServiceAsync; import org.rhq.enterprise.gui.coregui.client.util.StringUtility; import org.rhq.enterprise.gui.coregui.client.util.message.Message; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * A canvas that shows basic information/properties on a specific group. @@ -52,14 +52,13 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; * @author Ian Springer * @author John Mazzitelli */ -public class GeneralProperties extends LocatableVLayout { +public class GeneralProperties extends EnhancedVLayout { private ResourceGroupGWTServiceAsync resourceGroupService = GWTServiceLookup.getResourceGroupService(); private ResourceGroupComposite groupComposite; private final ResourceGroupTitleBar titleBar; private boolean isEditable;
- public GeneralProperties(String locatorId, ResourceGroupComposite groupComposite, ResourceGroupTitleBar titleBar, - boolean isEditable) { + public GeneralProperties(ResourceGroupComposite groupComposite, ResourceGroupTitleBar titleBar, boolean isEditable) { super(); this.groupComposite = groupComposite; this.titleBar = titleBar; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java index d3fc036..6ccbc9d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java @@ -157,14 +157,14 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource
@Override protected ResourceGroupTitleBar createTitleBar() { - return new ResourceGroupTitleBar(getLocatorId(), isAutoGroup(), isAutoCluster()); + return new ResourceGroupTitleBar(isAutoGroup(), isAutoCluster()); }
protected List<TwoLevelTab> createTabs() { List<TwoLevelTab> tabs = new ArrayList<TwoLevelTab>();
- summaryTab = new TwoLevelTab(getTabSet().extendLocatorId("Summary"), new ViewName("Summary", - MSG.common_title_summary()), ImageManager.getResourceIcon(ResourceCategory.SERVICE, AvailabilityType.UP)); + summaryTab = new TwoLevelTab(new ViewName("Summary", MSG.common_title_summary()), ImageManager.getResourceIcon( + ResourceCategory.SERVICE, AvailabilityType.UP));
summaryActivity = new SubTab(summaryTab.extendLocatorId("Activity"), new ViewName("Activity", MSG.view_tabs_common_activity()), null); @@ -173,8 +173,8 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource summaryTab.registerSubTabs(summaryActivity, summaryTimeline); tabs.add(summaryTab);
- inventoryTab = new TwoLevelTab(getTabSet().extendLocatorId("Inventory"), new ViewName("Inventory", - MSG.view_tabs_common_inventory()), IconEnum.INVENTORY_SUMMARY); + inventoryTab = new TwoLevelTab(new ViewName("Inventory", MSG.view_tabs_common_inventory()), + IconEnum.INVENTORY_SUMMARY); inventoryMembers = new SubTab(inventoryTab.extendLocatorId("Members"), new ViewName("Members", MSG.view_tabs_common_members()), null); inventoryConn = new SubTab(inventoryTab.extendLocatorId("ConnectionSettings"), new ViewName( @@ -184,8 +184,7 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource inventoryTab.registerSubTabs(this.inventoryMembers, this.inventoryConn, this.inventoryConnHistory); tabs.add(inventoryTab);
- alertsTab = new TwoLevelTab(getTabSet().extendLocatorId("Alerts"), new ViewName("Alerts", - MSG.common_title_alerts()), IconEnum.ALERT_DEFINITIONS); + alertsTab = new TwoLevelTab(new ViewName("Alerts", MSG.common_title_alerts()), IconEnum.ALERT_DEFINITIONS); this.alertHistory = new SubTab(alertsTab.extendLocatorId("History"), new ViewName("History", MSG.view_tabs_common_history()), null); this.alertDef = new SubTab(alertsTab.extendLocatorId("Definitions"), new ViewName("Definitions", @@ -193,8 +192,8 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource alertsTab.registerSubTabs(alertHistory, alertDef); tabs.add(alertsTab);
- monitoringTab = new TwoLevelTab(getTabSet().extendLocatorId("Monitoring"), new ViewName("Monitoring", - MSG.view_tabs_common_monitoring()), IconEnum.SUSPECT_METRICS); + monitoringTab = new TwoLevelTab(new ViewName("Monitoring", MSG.view_tabs_common_monitoring()), + IconEnum.SUSPECT_METRICS); monitorGraphs = new SubTab(monitoringTab.extendLocatorId("Graphs"), new ViewName("Graphs", MSG.view_tabs_common_graphs()), null); monitorTables = new SubTab(monitoringTab.extendLocatorId("Tables"), new ViewName("Tables", @@ -209,15 +208,14 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource monitoringTab.registerSubTabs(monitorGraphs, monitorTables, monitorTraits, monitorSched, monitorCallTime); tabs.add(monitoringTab);
- eventsTab = new TwoLevelTab(getTabSet().extendLocatorId("Events"), new ViewName("Events", - MSG.view_tabs_common_events()), IconEnum.EVENTS); + eventsTab = new TwoLevelTab(new ViewName("Events", MSG.view_tabs_common_events()), IconEnum.EVENTS); this.eventHistory = new SubTab(eventsTab.extendLocatorId("History"), new ViewName("History", MSG.view_tabs_common_history()), null); eventsTab.registerSubTabs(eventHistory); tabs.add(eventsTab);
- operationsTab = new TwoLevelTab(getTabSet().extendLocatorId("Operations"), new ViewName("Operations", - MSG.common_title_operations()), IconEnum.RECENT_OPERATIONS); + operationsTab = new TwoLevelTab(new ViewName("Operations", MSG.common_title_operations()), + IconEnum.RECENT_OPERATIONS); this.operationsSchedules = new SubTab(operationsTab.extendLocatorId("Schedules"), new ViewName("Schedules", MSG.view_tabs_common_schedules()), null); this.operationsHistory = new SubTab(operationsTab.extendLocatorId("History"), new ViewName("History", @@ -225,8 +223,8 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource operationsTab.registerSubTabs(this.operationsSchedules, this.operationsHistory); tabs.add(operationsTab);
- configurationTab = new TwoLevelTab(getTabSet().extendLocatorId("Configuration"), new ViewName("Configuration", - MSG.common_title_configuration()), IconEnum.CONFIGURATION_HISTORY); + configurationTab = new TwoLevelTab(new ViewName("Configuration", MSG.common_title_configuration()), + IconEnum.CONFIGURATION_HISTORY); this.configCurrent = new SubTab(configurationTab.extendLocatorId("Current"), new ViewName("Current", MSG.view_tabs_common_current()), null); this.configHistory = new SubTab(configurationTab.extendLocatorId("History"), new ViewName("History", @@ -336,7 +334,7 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource viewFactory = (!visible) ? null : new ViewFactory() { @Override public Canvas createView() { - return new ResourceGroupSchedulesView(monitorSched.extendLocatorId("View"), groupComposite); + return new ResourceGroupSchedulesView(groupComposite); } }; updateSubTab(this.monitoringTab, this.monitorSched, visible, true, viewFactory); @@ -361,8 +359,7 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource updateSubTab(this.inventoryTab, this.inventoryMembers, true, true, new ViewFactory() { @Override public Canvas createView() { - return new MembersView(inventoryMembers.extendLocatorId("View"), groupComposite.getResourceGroup() - .getId(), canModifyMembers); + return new MembersView(groupComposite.getResourceGroup().getId(), canModifyMembers); } }); updateSubTab(this.inventoryTab, this.inventoryConn, facets.contains(ResourceTypeFacet.PLUGIN_CONFIGURATION), @@ -416,7 +413,7 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource ViewFactory viewFactory = (!visible) ? null : new ViewFactory() { @Override public Canvas createView() { - return new GroupAlertDefinitionsView(alertDef.extendLocatorId("View"), groupComposite); + return new GroupAlertDefinitionsView(groupComposite); } }; updateSubTab(this.alertsTab, this.alertDef, visible, true, viewFactory); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java index 404607d..12fb3fd 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java @@ -46,13 +46,13 @@ import org.rhq.enterprise.gui.coregui.client.components.tagging.TagsChangedCallb 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.EnhancedHLayout; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Greg Hinkle * @author Ian Springer */ -public class ResourceGroupTitleBar extends LocatableVLayout { +public class ResourceGroupTitleBar extends EnhancedVLayout { private static final String FAV_ICON = "Favorite_24_Selected.png"; private static final String NOT_FAV_ICON = "Favorite_24.png";
@@ -72,7 +72,7 @@ public class ResourceGroupTitleBar extends LocatableVLayout { private boolean supportsFavorite; private GeneralProperties generalProperties;
- public ResourceGroupTitleBar(String locatorId, boolean isAutoGroup, boolean isAutoCluster) { + public ResourceGroupTitleBar(boolean isAutoGroup, boolean isAutoCluster) { super();
this.isAutoGroup = isAutoGroup; @@ -142,8 +142,8 @@ public class ResourceGroupTitleBar extends LocatableVLayout { resultComposite.getResourceGroup().setName(group.getName()); }
- generalProperties = new GeneralProperties(extendLocatorId("genProps"), resultComposite, - ResourceGroupTitleBar.this, (!(isAutoGroup || isAutoCluster))); + generalProperties = new GeneralProperties(resultComposite, ResourceGroupTitleBar.this, + (!(isAutoGroup || isAutoCluster))); generalProperties.setVisible(false); ResourceGroupTitleBar.this.addMember(generalProperties); expandCollapseArrow.addClickHandler(new ClickHandler() { @@ -176,26 +176,25 @@ public class ResourceGroupTitleBar extends LocatableVLayout {
badge = new Img(ImageManager.getGroupLargeIcon(GroupCategory.MIXED), 24, 24);
- TagEditorView tagEditorView = new TagEditorView(extendLocatorId("Editor"), group.getTags(), false, - new TagsChangedCallback() { - public void tagsChanged(final HashSet<Tag> tags) { - GWTServiceLookup.getTagService().updateResourceGroupTags(group.getId(), tags, - new AsyncCallback<Void>() { - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError( - MSG.view_titleBar_common_updateTagsFailure(group.getName()), caught); - } + TagEditorView tagEditorView = new TagEditorView(group.getTags(), false, new TagsChangedCallback() { + public void tagsChanged(final HashSet<Tag> tags) { + GWTServiceLookup.getTagService().updateResourceGroupTags(group.getId(), tags, + new AsyncCallback<Void>() { + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError( + MSG.view_titleBar_common_updateTagsFailure(group.getName()), caught); + }
- public void onSuccess(Void result) { - CoreGUI.getMessageCenter().notify( - new Message(MSG.view_titleBar_common_updateTagsSuccessful(group.getName()), - Message.Severity.Info)); - // update what is essentially our local cache - group.setTags(tags); - } - }); - } - }); + public void onSuccess(Void result) { + CoreGUI.getMessageCenter().notify( + new Message(MSG.view_titleBar_common_updateTagsSuccessful(group.getName()), + Message.Severity.Info)); + // update what is essentially our local cache + group.setTags(tags); + } + }); + } + });
loadTags(tagEditorView);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java index 763ba9d..057d3bb 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java @@ -66,7 +66,7 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.StringUtility; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout; import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/** @@ -89,7 +89,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility; * @author Ian Springer * @author John Mazzitelli */ -public class ResourceGroupTreeView extends LocatableVLayout implements BookmarkableView { +public class ResourceGroupTreeView extends EnhancedVLayout implements BookmarkableView {
private static final String FAKE_ROOT_ID = "__fakeRoot__"; // id of the parent node of our real root node
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/GroupResourceConfigurationEditView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/GroupResourceConfigurationEditView.java index dc76e9b..43fe7e7 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/GroupResourceConfigurationEditView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/GroupResourceConfigurationEditView.java @@ -56,14 +56,14 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTyp import org.rhq.enterprise.gui.coregui.client.util.message.Message; import org.rhq.enterprise.gui.coregui.client.util.message.MessageCenter; import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedIButton; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * A view for editing a group's configuration. * * @author Ian Springer */ -public class GroupResourceConfigurationEditView extends LocatableVLayout implements PropertyValueChangeListener, +public class GroupResourceConfigurationEditView extends EnhancedVLayout implements PropertyValueChangeListener, RefreshableView { private final ConfigurationGWTServiceAsync configurationService = GWTServiceLookup.getConfigurationService();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationMembers.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationMembers.java index 664c8dd..5ccda50 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationMembers.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationMembers.java @@ -60,7 +60,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil; import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository.TypesLoadedCallback; import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout; import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/** @@ -68,14 +68,13 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility; * * @author John Mazzitelli */ -public class HistoryGroupResourceConfigurationMembers extends LocatableVLayout { +public class HistoryGroupResourceConfigurationMembers extends EnhancedVLayout { private final ResourceGroup group; @SuppressWarnings("unused") private final ResourcePermission groupPerms; private final int groupUpdateId;
- public HistoryGroupResourceConfigurationMembers(String locatorId, ResourceGroupComposite groupComposite, - int updateId) { + public HistoryGroupResourceConfigurationMembers(ResourceGroupComposite groupComposite, int updateId) { super(); this.group = groupComposite.getResourceGroup(); this.groupPerms = groupComposite.getResourcePermission(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationSettings.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationSettings.java index 80aa5d0..b6199a5 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationSettings.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationSettings.java @@ -43,7 +43,7 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; 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; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * Read only view that shows group resource configuration properties. These are properties @@ -51,7 +51,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; * * @author John Mazzitelli */ -public class HistoryGroupResourceConfigurationSettings extends LocatableVLayout { +public class HistoryGroupResourceConfigurationSettings extends EnhancedVLayout { private final ResourceGroup group; private final ResourcePermission groupPerms; private final int groupUpdateId; @@ -59,8 +59,7 @@ public class HistoryGroupResourceConfigurationSettings extends LocatableVLayout private List<GroupMemberConfiguration> memberConfigurations; private GroupConfigurationEditor editor;
- public HistoryGroupResourceConfigurationSettings(String locatorId, ResourceGroupComposite groupComposite, - int updateId) { + public HistoryGroupResourceConfigurationSettings(ResourceGroupComposite groupComposite, int updateId) { super(); this.group = groupComposite.getResourceGroup(); this.groupPerms = groupComposite.getResourcePermission(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationTable.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationTable.java index 2997047..091ef6d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationTable.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationTable.java @@ -58,8 +58,8 @@ public class HistoryGroupResourceConfigurationTable extends Table<GroupResourceC private final ResourceGroup group; private final ResourcePermission groupPerms;
- public HistoryGroupResourceConfigurationTable(String locatorId, ResourceGroupComposite groupComposite) { - super(locatorId, MSG.view_group_resConfig_table_title()); + public HistoryGroupResourceConfigurationTable(ResourceGroupComposite groupComposite) { + super(MSG.view_group_resConfig_table_title()); this.group = groupComposite.getResourceGroup(); this.groupPerms = groupComposite.getResourcePermission();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationView.java index 7c2ba98..84fa545 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationView.java @@ -23,14 +23,14 @@ import com.smartgwt.client.widgets.Canvas; import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite; import org.rhq.enterprise.gui.coregui.client.BookmarkableView; import org.rhq.enterprise.gui.coregui.client.ViewPath; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * A view for group resource configuration history. * * @author John Mazzitelli */ -public class HistoryGroupResourceConfigurationView extends LocatableVLayout implements BookmarkableView { +public class HistoryGroupResourceConfigurationView extends EnhancedVLayout implements BookmarkableView { private final ResourceGroupComposite groupComposite; private HistoryGroupResourceConfigurationTable groupHistoryTable; private Canvas detailsCanvas = null; @@ -39,7 +39,7 @@ public class HistoryGroupResourceConfigurationView extends LocatableVLayout impl super(); this.groupComposite = groupComposite;
- groupHistoryTable = new HistoryGroupResourceConfigurationTable(extendLocatorId("Table"), groupComposite); + groupHistoryTable = new HistoryGroupResourceConfigurationTable(groupComposite); addMember(groupHistoryTable); }
@@ -73,11 +73,9 @@ public class HistoryGroupResourceConfigurationView extends LocatableVLayout impl }
if (configView) { - detailsCanvas = new HistoryGroupResourceConfigurationSettings(extendLocatorId("SettingsView"), - this.groupComposite, groupHistoryId); + detailsCanvas = new HistoryGroupResourceConfigurationSettings(this.groupComposite, groupHistoryId); } else { - detailsCanvas = new HistoryGroupResourceConfigurationMembers(extendLocatorId("MembersView"), - this.groupComposite, groupHistoryId); + detailsCanvas = new HistoryGroupResourceConfigurationMembers(this.groupComposite, groupHistoryId); } addMember(detailsCanvas); setVisibleMember(detailsCanvas); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/GroupPluginConfigurationEditView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/GroupPluginConfigurationEditView.java index bd1d5e8..b62ce64 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/GroupPluginConfigurationEditView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/GroupPluginConfigurationEditView.java @@ -53,7 +53,7 @@ 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.message.MessageCenter; import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedIButton; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * A view for editing a group's current plugin configuration. @@ -61,7 +61,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; * @author Ian Springer * @author John Mazzitelli */ -public class GroupPluginConfigurationEditView extends LocatableVLayout implements PropertyValueChangeListener, +public class GroupPluginConfigurationEditView extends EnhancedVLayout implements PropertyValueChangeListener, RefreshableView { private final ConfigurationGWTServiceAsync configurationService = GWTServiceLookup.getConfigurationService(); private final ResourceGWTServiceAsync resourceService = GWTServiceLookup.getResourceService(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationMembers.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationMembers.java index 5e6ca96..2a7033d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationMembers.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationMembers.java @@ -60,7 +60,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil; import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository.TypesLoadedCallback; import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout; import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/** @@ -68,7 +68,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility; * * @author John Mazzitelli */ -public class HistoryGroupPluginConfigurationMembers extends LocatableVLayout { +public class HistoryGroupPluginConfigurationMembers extends EnhancedVLayout { private final ResourceGroup group; @SuppressWarnings("unused") private final ResourcePermission groupPerms; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationSettings.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationSettings.java index eb5937a..a3227d5 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationSettings.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationSettings.java @@ -43,7 +43,7 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; 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; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * Read only view that shows group plugin configuration properties. These are properties @@ -51,7 +51,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; * * @author John Mazzitelli */ -public class HistoryGroupPluginConfigurationSettings extends LocatableVLayout { +public class HistoryGroupPluginConfigurationSettings extends EnhancedVLayout { private final ResourceGroup group; private final ResourcePermission groupPerms; private final int groupUpdateId; @@ -59,7 +59,7 @@ public class HistoryGroupPluginConfigurationSettings extends LocatableVLayout { private List<GroupMemberConfiguration> memberConfigurations; private GroupConfigurationEditor editor;
- public HistoryGroupPluginConfigurationSettings(String locatorId, ResourceGroupComposite groupComposite, int updateId) { + public HistoryGroupPluginConfigurationSettings(ResourceGroupComposite groupComposite, int updateId) { super(); this.group = groupComposite.getResourceGroup(); this.groupPerms = groupComposite.getResourcePermission(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationTable.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationTable.java index 5453b6c..cdbf282 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationTable.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationTable.java @@ -66,8 +66,8 @@ public class HistoryGroupPluginConfigurationTable extends Table<HistoryGroupPlug private final ResourceGroup group; private final ResourcePermission groupPerms;
- public HistoryGroupPluginConfigurationTable(String locatorId, ResourceGroupComposite groupComposite) { - super(locatorId, MSG.view_group_pluginConfig_table_title()); + public HistoryGroupPluginConfigurationTable(ResourceGroupComposite groupComposite) { + super(MSG.view_group_pluginConfig_table_title()); this.group = groupComposite.getResourceGroup(); this.groupPerms = groupComposite.getResourcePermission();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationView.java index 1420859..a250498 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationView.java @@ -23,14 +23,14 @@ import com.smartgwt.client.widgets.Canvas; import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite; import org.rhq.enterprise.gui.coregui.client.BookmarkableView; import org.rhq.enterprise.gui.coregui.client.ViewPath; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * A view for group plugin configuration history. * * @author John Mazzitelli */ -public class HistoryGroupPluginConfigurationView extends LocatableVLayout implements BookmarkableView { +public class HistoryGroupPluginConfigurationView extends EnhancedVLayout implements BookmarkableView { private final ResourceGroupComposite groupComposite; private HistoryGroupPluginConfigurationTable groupHistoryTable; private Canvas detailsCanvas = null; @@ -39,7 +39,7 @@ public class HistoryGroupPluginConfigurationView extends LocatableVLayout implem super(); this.groupComposite = groupComposite;
- groupHistoryTable = new HistoryGroupPluginConfigurationTable(extendLocatorId("Table"), groupComposite); + groupHistoryTable = new HistoryGroupPluginConfigurationTable(groupComposite); addMember(groupHistoryTable); }
@@ -73,8 +73,7 @@ public class HistoryGroupPluginConfigurationView extends LocatableVLayout implem }
if (configView) { - detailsCanvas = new HistoryGroupPluginConfigurationSettings(extendLocatorId("SettingsView"), - this.groupComposite, groupHistoryId); + detailsCanvas = new HistoryGroupPluginConfigurationSettings(this.groupComposite, groupHistoryId); } else { detailsCanvas = new HistoryGroupPluginConfigurationMembers(this.groupComposite, groupHistoryId); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/MembersView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/MembersView.java index a4292c6..f246d79 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/MembersView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/MembersView.java @@ -45,7 +45,7 @@ public class MembersView extends ResourceSearchView { private int groupId; private boolean canModifyMembers;
- public MembersView(String locatorId, int groupId, boolean canModifyMembers) { + public MembersView(int groupId, boolean canModifyMembers) { super(new Criteria(ResourceDatasource.FILTER_GROUP_ID, String.valueOf(groupId)), MSG .view_inventory_resources_members()); setInitialCriteriaFixed(true); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/ResourceGroupMembershipView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/ResourceGroupMembershipView.java index 8aef886..0da6cfb 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/ResourceGroupMembershipView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/ResourceGroupMembershipView.java @@ -35,12 +35,12 @@ import org.rhq.enterprise.gui.coregui.client.CoreGUI; 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.EnhancedIButton; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Jay Shaughnessy */ -public class ResourceGroupMembershipView extends LocatableVLayout { +public class ResourceGroupMembershipView extends EnhancedVLayout {
private int resourceGroupId; private ResourceGroup resourceGroup; @@ -128,7 +128,6 @@ public class ResourceGroupMembershipView extends LocatableVLayout { ResourceGroup group = result.get(0); ResourceGroupMembershipView.this.resourceGroup = group; ResourceGroupMembershipView.this.selector = new ResourceGroupResourceSelector( - ResourceGroupMembershipView.this.getLocatorId(), group.getExplicitResources(), (GroupCategory.COMPATIBLE == ResourceGroupMembershipView.this.resourceGroup.getGroupCategory()) ? group .getResourceType() : null, false); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/ResourceGroupResourceSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/ResourceGroupResourceSelector.java index 2b7f7db..0882ce2 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/ResourceGroupResourceSelector.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/ResourceGroupResourceSelector.java @@ -45,8 +45,8 @@ public class ResourceGroupResourceSelector extends ResourceSelector {
Collection<Resource> resources;
- public ResourceGroupResourceSelector(String locatorId, Collection<Resource> resources, - ResourceType resourceTypeFilter, boolean forceResourceTypeFilter) { + public ResourceGroupResourceSelector(Collection<Resource> resources, ResourceType resourceTypeFilter, + boolean forceResourceTypeFilter) {
super(resourceTypeFilter, forceResourceTypeFilter);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/ResourceGroupSchedulesView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/ResourceGroupSchedulesView.java index 001cd91..61fab35 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/ResourceGroupSchedulesView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/ResourceGroupSchedulesView.java @@ -41,9 +41,9 @@ public class ResourceGroupSchedulesView extends AbstractSchedulesView { private ResourceGroupComposite resourceGroupComposite; private int groupId;
- public ResourceGroupSchedulesView(String locatorId, ResourceGroupComposite resourceGroupComposite) { - super(locatorId, TITLE, EntityContext.forGroup(resourceGroupComposite.getResourceGroup().getId()), - resourceGroupComposite.getResourcePermission().isMeasure()); + public ResourceGroupSchedulesView(ResourceGroupComposite resourceGroupComposite) { + super(TITLE, EntityContext.forGroup(resourceGroupComposite.getResourceGroup().getId()), resourceGroupComposite + .getResourcePermission().isMeasure());
this.resourceGroupComposite = resourceGroupComposite; this.groupId = resourceGroupComposite.getResourceGroup().getId(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMeasurementTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMeasurementTableView.java index b33af08..4589b0f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMeasurementTableView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMeasurementTableView.java @@ -42,7 +42,7 @@ public class GroupMeasurementTableView extends Table<GroupMeasurementTableDataSo
private final int groupId;
- public GroupMeasurementTableView(String locatorId, ResourceGroupComposite groupComposite, int groupId) { + public GroupMeasurementTableView(ResourceGroupComposite groupComposite, int groupId) { super(); this.groupId = groupId; setDataSource(new GroupMeasurementTableDataSource(groupComposite, groupId)); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMembersHealthView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMembersHealthView.java index f2d8814..4559411 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMembersHealthView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMembersHealthView.java @@ -40,8 +40,8 @@ public class GroupMembersHealthView extends MembersView { private int groupId; private boolean canModifyMembers;
- public GroupMembersHealthView(String locatorId, int groupId, boolean canModifyMembers) { - super(locatorId, groupId, false); + public GroupMembersHealthView(int groupId, boolean canModifyMembers) { + super(groupId, false); this.canModifyMembers = canModifyMembers; this.groupId = groupId; setShowFilterForm(false); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMonitoringTablesView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMonitoringTablesView.java index b65bf0b..97308cf 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMonitoringTablesView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMonitoringTablesView.java @@ -21,14 +21,14 @@ package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring
import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite; import org.rhq.enterprise.gui.coregui.client.RefreshableView; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * * * @author Lukas Krejci */ -public class GroupMonitoringTablesView extends LocatableVLayout implements RefreshableView { +public class GroupMonitoringTablesView extends EnhancedVLayout implements RefreshableView {
private GroupMeasurementTableView metrics; private GroupMembersHealthView memberHealth; @@ -39,8 +39,8 @@ public class GroupMonitoringTablesView extends LocatableVLayout implements Refre public GroupMonitoringTablesView(String locatorId, ResourceGroupComposite groupComposite) { super();
- metrics = new GroupMeasurementTableView(extendLocatorId("ViewMetrics"), groupComposite, groupComposite.getResourceGroup().getId()); - memberHealth = new GroupMembersHealthView(extendLocatorId("ViewHealth"), groupComposite.getResourceGroup().getId(), false); + metrics = new GroupMeasurementTableView(groupComposite, groupComposite.getResourceGroup().getId()); + memberHealth = new GroupMembersHealthView(groupComposite.getResourceGroup().getId(), false); addMember(metrics); addMember(memberHealth); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupOperationHistoryDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupOperationHistoryDetailsView.java index 8622d98..fd3b445 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupOperationHistoryDetailsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupOperationHistoryDetailsView.java @@ -31,7 +31,7 @@ import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.history.AbstractOperationHistoryDetailsView; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Ian Springer @@ -70,7 +70,7 @@ public class GroupOperationHistoryDetailsView extends AbstractOperationHistoryDe
@Override protected Canvas buildResultsSection(GroupOperationHistory operationHistory) { - LocatableVLayout resultsSection = new LocatableVLayout(extendLocatorId("ResultsSection")); + EnhancedVLayout resultsSection = new EnhancedVLayout();
Label title = new Label("<h4>" + MSG.view_operationHistoryDetails_results() + "</h4>"); title.setHeight(27); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDetailsView.java index 936e554..33e4eaf 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDetailsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDetailsView.java @@ -30,7 +30,7 @@ import org.rhq.enterprise.gui.coregui.client.components.sorter.ReorderableList; import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.schedule.AbstractOperationScheduleDetailsView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil; import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDatasource; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * The details view of the Group Operations>Schedules subtab. @@ -92,8 +92,8 @@ public class GroupOperationScheduleDetailsView extends AbstractOperationSchedule }
@Override - protected LocatableVLayout buildContentPane() { - LocatableVLayout contentPane = super.buildContentPane(); + protected EnhancedVLayout buildContentPane() { + EnhancedVLayout contentPane = super.buildContentPane();
HTMLFlow hr = new HTMLFlow("<hr/>"); contentPane.addMember(hr); @@ -133,8 +133,8 @@ public class GroupOperationScheduleDetailsView extends AbstractOperationSchedule return AncestryUtil.getAncestryHoverHTML(listGridRecord, 0); } }; - this.memberExecutionOrderer = new ReorderableList(extendLocatorId("MemberExecutionOrderer"), - this.memberResourceRecords, null, memberIcon, nameHoverCustomizer); + this.memberExecutionOrderer = new ReorderableList(this.memberResourceRecords, null, memberIcon, + nameHoverCustomizer); this.memberExecutionOrderer.setVisible(false); this.memberExecutionOrderer.setNameFieldTitle(MSG.view_group_operationScheduleDetails_memberResource()); hLayout.addMember(this.memberExecutionOrderer); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java index 344fffb..8b47fbf 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java @@ -54,8 +54,8 @@ import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupOper import org.rhq.enterprise.gui.coregui.client.gwt.DashboardGWTServiceAsync; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedIButton; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableToolStrip; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedToolStrip; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * The content pane for the group Summary>Activity subtab. @@ -63,7 +63,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; * @author Simeon Pinder * @author Jay Shaughnessy */ -public class ActivityView extends LocatableVLayout implements DashboardContainer, InitializableView { +public class ActivityView extends EnhancedVLayout implements DashboardContainer, InitializableView {
private static final String DASHBOARD_NAME_PREFIX = "GroupDashboard_";
@@ -75,7 +75,7 @@ public class ActivityView extends LocatableVLayout implements DashboardContainer
private DashboardView dashboardView;
- private LocatableToolStrip footer; + private EnhancedToolStrip footer; private IButton editButton; private IButton resetButton;
@@ -142,11 +142,10 @@ public class ActivityView extends LocatableVLayout implements DashboardContainer //pass in the group information EntityContext context = EntityContext.forGroup(groupComposite.getResourceGroup().getId(), isAutoCluster, isAutoGroup); - dashboardView = new DashboardView(extendLocatorId(dashboard.getName()), this, dashboard, context, - groupComposite); + dashboardView = new DashboardView(this, dashboard, context, groupComposite); addMember(dashboardView);
- footer = new LocatableToolStrip(); + footer = new EnhancedToolStrip(); footer.setPadding(5); footer.setWidth100(); footer.setMembersMargin(15); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ChildHistoryDetails.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ChildHistoryDetails.java index 49b1dbb..467d6e2 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ChildHistoryDetails.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ChildHistoryDetails.java @@ -28,14 +28,14 @@ import com.smartgwt.client.widgets.form.fields.TextAreaItem; import org.rhq.core.domain.resource.CreateResourceHistory; import org.rhq.core.domain.resource.DeleteResourceHistory; import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * Details view for a single child history entity. * * @author John Mazzitelli */ -public class ChildHistoryDetails extends LocatableVLayout { +public class ChildHistoryDetails extends EnhancedVLayout { private CreateResourceHistory createHistory; private DeleteResourceHistory deleteHistory;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java index 917bc57..301583e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java @@ -166,8 +166,8 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo protected List<TwoLevelTab> createTabs() { List<TwoLevelTab> tabs = new ArrayList<TwoLevelTab>();
- summaryTab = new TwoLevelTab(getTabSet().extendLocatorId("Summary"), new ViewName("Summary", - MSG.common_title_summary()), ImageManager.getResourceIcon(ResourceCategory.SERVICE, AvailabilityType.UP)); + summaryTab = new TwoLevelTab(new ViewName("Summary", MSG.common_title_summary()), ImageManager.getResourceIcon( + ResourceCategory.SERVICE, AvailabilityType.UP)); summaryActivity = new SubTab(summaryTab.extendLocatorId("Activity"), new ViewName("Activity", MSG.view_tabs_common_activity()), null); summaryTimeline = new SubTab(summaryTab.extendLocatorId("Timeline"), new ViewName("Timeline", @@ -175,8 +175,8 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo summaryTab.registerSubTabs(summaryActivity, summaryTimeline); tabs.add(summaryTab);
- inventoryTab = new TwoLevelTab(getTabSet().extendLocatorId("Inventory"), new ViewName("Inventory", - MSG.view_tabs_common_inventory()), IconEnum.INVENTORY_SUMMARY); + inventoryTab = new TwoLevelTab(new ViewName("Inventory", MSG.view_tabs_common_inventory()), + IconEnum.INVENTORY_SUMMARY); inventoryChildren = new SubTab(inventoryTab.extendLocatorId("Children"), new ViewName("Children", MSG.view_tabs_common_child_resources()), null); inventoryChildHistory = new SubTab(inventoryTab.extendLocatorId("ChildHist"), new ViewName("ChildHistory", @@ -193,8 +193,7 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo this.inventoryConnHistory, this.inventoryGroups, this.inventoryAgent); tabs.add(inventoryTab);
- alertsTab = new TwoLevelTab(getTabSet().extendLocatorId("Alerts"), new ViewName("Alerts", - MSG.common_title_alerts()), IconEnum.ALERT_DEFINITIONS); + alertsTab = new TwoLevelTab(new ViewName("Alerts", MSG.common_title_alerts()), IconEnum.ALERT_DEFINITIONS); this.alertHistory = new SubTab(alertsTab.extendLocatorId("History"), new ViewName("History", MSG.view_tabs_common_history()), null); this.alertDef = new SubTab(alertsTab.extendLocatorId("Definitions"), new ViewName("Definitions", @@ -202,8 +201,8 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo alertsTab.registerSubTabs(alertHistory, alertDef); tabs.add(alertsTab);
- monitoringTab = new TwoLevelTab(getTabSet().extendLocatorId("Monitoring"), new ViewName("Monitoring", - MSG.view_tabs_common_monitoring()), IconEnum.SUSPECT_METRICS); + monitoringTab = new TwoLevelTab(new ViewName("Monitoring", MSG.view_tabs_common_monitoring()), + IconEnum.SUSPECT_METRICS); monitorGraphs = new SubTab(monitoringTab.extendLocatorId("Graphs"), new ViewName("Graphs", MSG.view_tabs_common_graphs()), null); monitorTables = new SubTab(monitoringTab.extendLocatorId("Tables"), new ViewName("Tables", @@ -220,15 +219,14 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo monitorCallTime); tabs.add(monitoringTab);
- eventsTab = new TwoLevelTab(getTabSet().extendLocatorId("Events"), new ViewName("Events", - MSG.view_tabs_common_events()), IconEnum.EVENTS); + eventsTab = new TwoLevelTab(new ViewName("Events", MSG.view_tabs_common_events()), IconEnum.EVENTS); this.eventHistory = new SubTab(eventsTab.extendLocatorId("History"), new ViewName("History", MSG.view_tabs_common_history()), null); eventsTab.registerSubTabs(eventHistory); tabs.add(eventsTab);
- operationsTab = new TwoLevelTab(getTabSet().extendLocatorId(Tab.OPERATIONS), new ViewName(Tab.OPERATIONS, - MSG.common_title_operations()), IconEnum.RECENT_OPERATIONS); + operationsTab = new TwoLevelTab(new ViewName(Tab.OPERATIONS, MSG.common_title_operations()), + IconEnum.RECENT_OPERATIONS); this.operationsSchedules = new SubTab(operationsTab.extendLocatorId(OperationsSubTab.SCHEDULES), new ViewName( OperationsSubTab.SCHEDULES, MSG.view_tabs_common_schedules()), null); this.operationsHistory = new SubTab(operationsTab.extendLocatorId(OperationsSubTab.HISTORY), new ViewName( @@ -236,8 +234,8 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo operationsTab.registerSubTabs(this.operationsSchedules, this.operationsHistory); tabs.add(operationsTab);
- configurationTab = new TwoLevelTab(getTabSet().extendLocatorId(Tab.CONFIGURATION), new ViewName( - Tab.CONFIGURATION, MSG.common_title_configuration()), IconEnum.CONFIGURATION_HISTORY); + configurationTab = new TwoLevelTab(new ViewName(Tab.CONFIGURATION, MSG.common_title_configuration()), + IconEnum.CONFIGURATION_HISTORY); this.configCurrent = new SubTab(configurationTab.extendLocatorId(ConfigurationSubTab.CURRENT), new ViewName( ConfigurationSubTab.CURRENT, MSG.view_tabs_common_current()), null); this.configHistory = new SubTab(configurationTab.extendLocatorId(ConfigurationSubTab.HISTORY), new ViewName( @@ -245,8 +243,7 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo configurationTab.registerSubTabs(this.configCurrent, this.configHistory); tabs.add(configurationTab);
- driftTab = new TwoLevelTab(getTabSet().extendLocatorId(Tab.DRIFT), new ViewName(Tab.DRIFT, - MSG.view_tabs_common_drift()), IconEnum.DRIFT_COMPLIANCE); + driftTab = new TwoLevelTab(new ViewName(Tab.DRIFT, MSG.view_tabs_common_drift()), IconEnum.DRIFT_COMPLIANCE); // TODO: Experimenting with not shoing a drift history tab and having all resource level drift viewing // go through the comprehensive drift carousel view. Leave it in, but commented, in case we want it back. //this.driftHistory = new SubTab(driftTab.extendLocatorId(DriftSubTab.HISTORY), new ViewName(DriftSubTab.HISTORY, @@ -257,8 +254,7 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo driftTab.registerSubTabs(driftDefinitions); tabs.add(driftTab);
- contentTab = new TwoLevelTab(getTabSet().extendLocatorId("Content"), new ViewName("Content", - MSG.view_tabs_common_content()), IconEnum.CONTENT); + contentTab = new TwoLevelTab(new ViewName("Content", MSG.view_tabs_common_content()), IconEnum.CONTENT); this.contentDeployed = new SubTab(contentTab.extendLocatorId("Deployed"), new ViewName("Deployed", MSG.view_tabs_common_deployed()), null); this.contentNew = new SubTab(contentTab.extendLocatorId("New"), new ViewName("New", MSG.common_button_new()), @@ -401,7 +397,7 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo updateSubTab(this.alertsTab, this.alertDef, true, true, new ViewFactory() { @Override public Canvas createView() { - return new ResourceAlertDefinitionsView(alertsTab.extendLocatorId("AlertDefView"), resourceComposite); + return new ResourceAlertDefinitionsView(resourceComposite); } }); } @@ -446,7 +442,7 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo new ViewFactory() { @Override public Canvas createView() { - return new ResourceSchedulesView(monitoringTab.extendLocatorId("SchedulesView"), resourceComposite); + return new ResourceSchedulesView(resourceComposite); } });
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java index fb111b5..23058c9 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java @@ -55,13 +55,13 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.util.StringUtility; import org.rhq.enterprise.gui.coregui.client.util.message.Message; import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedHLayout; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Greg Hinkle * @author Ian Springer */ -public class ResourceTitleBar extends LocatableVLayout { +public class ResourceTitleBar extends EnhancedVLayout {
//represents row of Resource title details[icon,title,show-details,tags,availability,favorites] private EnhancedHLayout top; @@ -133,26 +133,24 @@ public class ResourceTitleBar extends LocatableVLayout {
badge = new Img(ImageManager.getResourceLargeIcon(ResourceCategory.SERVICE), 24, 24);
- TagEditorView tagEditorView = new TagEditorView(extendLocatorId("TagEdit"), resource.getTags(), - !resourceComposite.getResourcePermission().isInventory(), new TagsChangedCallback() { - public void tagsChanged(final HashSet<Tag> tags) { - GWTServiceLookup.getTagService().updateResourceTags(resource.getId(), tags, - new AsyncCallback<Void>() { - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler() - .handleError(MSG.view_resource_title_tagUpdateFailed(), caught); - } - - public void onSuccess(Void result) { - CoreGUI.getMessageCenter().notify( - new Message(MSG.view_titleBar_common_updateTagsSuccessful(resource.getName()), - Message.Severity.Info)); - // update what is essentially our local cache - resource.setTags(tags); - } - }); - } - }); + TagEditorView tagEditorView = new TagEditorView(resource.getTags(), !resourceComposite.getResourcePermission() + .isInventory(), new TagsChangedCallback() { + public void tagsChanged(final HashSet<Tag> tags) { + GWTServiceLookup.getTagService().updateResourceTags(resource.getId(), tags, new AsyncCallback<Void>() { + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_resource_title_tagUpdateFailed(), caught); + } + + public void onSuccess(Void result) { + CoreGUI.getMessageCenter().notify( + new Message(MSG.view_titleBar_common_updateTagsSuccessful(resource.getName()), + Message.Severity.Info)); + // update what is essentially our local cache + resource.setTags(tags); + } + }); + } + });
loadTags(tagEditorView);
@@ -207,7 +205,7 @@ public class ResourceTitleBar extends LocatableVLayout { disposalReminder.setValign(VerticalAlignment.CENTER); disposalReminder.setContents(MSG.view_resource_title_component_errors_cleanup());
- LocatableVLayout form = new LocatableVLayout(extendLocatorId("_Modal_Form")); + EnhancedVLayout form = new EnhancedVLayout(); form.setAlign(VerticalAlignment.CENTER); form.setLayoutMargin(10); form.setWidth100(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java index 102dfc9..01afb85 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java @@ -102,13 +102,13 @@ import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.message.Message; import org.rhq.enterprise.gui.coregui.client.util.preferences.MeasurementUserPreferences; import org.rhq.enterprise.gui.coregui.client.util.preferences.UserPreferences; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Jay Shaughnessy * @author Greg Hinkle */ -public class ResourceTreeView extends LocatableVLayout { +public class ResourceTreeView extends EnhancedVLayout {
private TreeGrid treeGrid; private String selectedNodeId; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDetailView.java index c6ac7d9..007255b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDetailView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDetailView.java @@ -33,12 +33,12 @@ import org.rhq.enterprise.gui.coregui.client.ViewPath; import org.rhq.enterprise.gui.coregui.client.components.configuration.ConfigurationEditor; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Greg Hinkle */ -public class ConfigurationHistoryDetailView extends LocatableVLayout implements BookmarkableView { +public class ConfigurationHistoryDetailView extends EnhancedVLayout implements BookmarkableView {
public ConfigurationHistoryDetailView() { super(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java index 22104ab..7ea1368 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java @@ -50,7 +50,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTyp import org.rhq.enterprise.gui.coregui.client.util.message.Message; import org.rhq.enterprise.gui.coregui.client.util.message.MessageCenter; import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedIButton; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * A view for editing a Resource's configuration. @@ -58,7 +58,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; * @author Greg Hinkle * @author Ian Springer */ -public class ResourceConfigurationEditView extends LocatableVLayout implements PropertyValueChangeListener, +public class ResourceConfigurationEditView extends EnhancedVLayout implements PropertyValueChangeListener, RefreshableView {
private Resource resource; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationEditView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationEditView.java index 37eb27b..feb2914 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationEditView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationEditView.java @@ -42,7 +42,7 @@ 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.MessageCenter; import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedIButton; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * A view for editing a Resource's plugin configuration (aka connection settings). @@ -50,7 +50,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; * @author Greg Hinkle * @author Ian Springer */ -public class PluginConfigurationEditView extends LocatableVLayout implements PropertyValueChangeListener, +public class PluginConfigurationEditView extends EnhancedVLayout implements PropertyValueChangeListener, RefreshableView {
private Resource resource; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryDetailView.java index 4c6cc43..1dde8d8 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryDetailView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryDetailView.java @@ -33,12 +33,12 @@ import org.rhq.enterprise.gui.coregui.client.ViewPath; import org.rhq.enterprise.gui.coregui.client.components.configuration.ConfigurationEditor; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author John Mazzitelli */ -public class PluginConfigurationHistoryDetailView extends LocatableVLayout implements BookmarkableView { +public class PluginConfigurationHistoryDetailView extends EnhancedVLayout implements BookmarkableView {
public PluginConfigurationHistoryDetailView() { super(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceAgentView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceAgentView.java index 5cfadc2..259bcff 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceAgentView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceAgentView.java @@ -38,7 +38,7 @@ import org.rhq.enterprise.gui.coregui.client.RefreshableView; import org.rhq.enterprise.gui.coregui.client.admin.topology.AgentTableView; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.util.StringUtility; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout; import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/** @@ -46,7 +46,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility; * * @author Simeon Pinder */ -public class ResourceAgentView extends LocatableVLayout implements RefreshableView { +public class ResourceAgentView extends EnhancedVLayout implements RefreshableView {
private int resourceId; private DynamicForm form; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceGroupSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceGroupSelector.java index d99d583..df66589 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceGroupSelector.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceGroupSelector.java @@ -36,7 +36,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.selection.Resour */ public class ResourceResourceGroupSelector extends ResourceGroupSelector {
- public ResourceResourceGroupSelector(String locatorId, Collection<ResourceGroup> resourceGroups) { + public ResourceResourceGroupSelector(Collection<ResourceGroup> resourceGroups) {
super();
@@ -47,5 +47,5 @@ public class ResourceResourceGroupSelector extends ResourceGroupSelector {
this.setOverflow(Overflow.AUTO); } - + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceGroupsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceGroupsView.java index 6f1a7a8..e5662d0 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceGroupsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceGroupsView.java @@ -34,12 +34,12 @@ import org.rhq.enterprise.gui.coregui.client.CoreGUI; 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.EnhancedIButton; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Jay Shaughnessy */ -public class ResourceResourceGroupsView extends LocatableVLayout { +public class ResourceResourceGroupsView extends EnhancedVLayout {
private int resourceId; private Resource resource; @@ -100,8 +100,8 @@ public class ResourceResourceGroupsView extends LocatableVLayout {
public void onSuccess(PageList<Resource> result) { resource = result.get(0); - ResourceResourceGroupsView.this.selector = new ResourceResourceGroupSelector( - ResourceResourceGroupsView.this.getLocatorId(), resource.getExplicitGroups()); + ResourceResourceGroupsView.this.selector = new ResourceResourceGroupSelector(resource + .getExplicitGroups());
addMember(ResourceResourceGroupsView.this.selector); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/GraphListView.java index 81c3e1a..e18e5b5 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/GraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/GraphListView.java @@ -41,13 +41,13 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceSelectListener; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.avail.AvailabilityBarView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout; import org.rhq.enterprise.server.measurement.util.MeasurementUtils;
/** * @author Greg Hinkle */ -public class GraphListView extends LocatableVLayout implements ResourceSelectListener { +public class GraphListView extends EnhancedVLayout implements ResourceSelectListener {
private Resource resource; private Label loadingLabel = new Label(MSG.common_msg_loading()); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/LiveGraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/LiveGraphView.java index 841afc3..5ce9c2e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/LiveGraphView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/LiveGraphView.java @@ -64,12 +64,12 @@ import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.gwt.MeasurementDataGWTServiceAsync; import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Greg Hinkle */ -public class LiveGraphView extends LocatableVLayout { +public class LiveGraphView extends EnhancedVLayout {
private static final String INSTRUCTIONS = MSG.view_resource_monitor_graph_instructions();
@@ -90,7 +90,7 @@ public class LiveGraphView extends LocatableVLayout { super(); }
- public LiveGraphView(String locatorId, int resourceId, MeasurementDefinition def) { + public LiveGraphView(int resourceId, MeasurementDefinition def) { super(); this.resourceId = resourceId; this.definition = def; @@ -268,8 +268,8 @@ public class LiveGraphView extends LocatableVLayout {
}
- public static void displayAsDialog(String locatorId, int resourceId, MeasurementDefinition def) { - final LiveGraphView graph = new LiveGraphView(locatorId, resourceId, def); + public static void displayAsDialog(int resourceId, MeasurementDefinition def) { + final LiveGraphView graph = new LiveGraphView(resourceId, def); final Window graphPopup = new Window(); graphPopup.setTitle(MSG.view_resource_monitor_detailed_graph_label()); graphPopup.setWidth(800); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricGraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricGraphView.java index e16f2a0..781caf6 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricGraphView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricGraphView.java @@ -144,7 +144,7 @@ public class ResourceMetricGraphView extends AbstractMetricGraphView { }
protected void displayLiveGraphViewDialog() { - LiveGraphView.displayAsDialog(getLocatorId(), getEntityId(), getDefinition()); + LiveGraphView.displayAsDialog(getEntityId(), getDefinition()); }
@Override diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/ResourceAvailabilityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/ResourceAvailabilityView.java index 45a169f..912159c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/ResourceAvailabilityView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/ResourceAvailabilityView.java @@ -55,7 +55,7 @@ import org.rhq.enterprise.gui.coregui.client.gwt.AvailabilityGWTServiceAsync; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient; import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * This shows the availability history for a resource. @@ -63,7 +63,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; * @author Jay Shaughnessy * @author John Mazzitelli */ -public class ResourceAvailabilityView extends LocatableVLayout { +public class ResourceAvailabilityView extends EnhancedVLayout {
private ResourceComposite resourceComposite; private StaticTextItem currentField; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/schedules/ResourceSchedulesView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/schedules/ResourceSchedulesView.java index 8690d23..5b26e48 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/schedules/ResourceSchedulesView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/schedules/ResourceSchedulesView.java @@ -41,8 +41,8 @@ public class ResourceSchedulesView extends AbstractSchedulesView { private ResourceComposite resourceComposite; private int resourceId;
- public ResourceSchedulesView(String locatorId, ResourceComposite resourceComposite) { - super(locatorId, TITLE, EntityContext.forResource(resourceComposite.getResource().getId()), resourceComposite + public ResourceSchedulesView(ResourceComposite resourceComposite) { + super(TITLE, EntityContext.forResource(resourceComposite.getResource().getId()), resourceComposite .getResourcePermission().isMeasure());
this.resourceComposite = resourceComposite; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java index ea0ac97..48694c0 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java @@ -41,7 +41,7 @@ import org.rhq.enterprise.gui.coregui.client.LinkManager; import org.rhq.enterprise.gui.coregui.client.components.configuration.ConfigurationEditor; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.history.AbstractOperationHistoryDetailsView; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout; import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/** @@ -130,7 +130,7 @@ public class ResourceOperationHistoryDetailsView extends AbstractOperationHistor protected Canvas buildResultsSection(ResourceOperationHistory operationHistory) { OperationRequestStatus status = operationHistory.getStatus(); if (status == OperationRequestStatus.SUCCESS) { - LocatableVLayout resultsSection = new LocatableVLayout(extendLocatorId("ResultsSection")); + EnhancedVLayout resultsSection = new EnhancedVLayout();
Label title = new Label("<h4>" + MSG.view_operationHistoryDetails_results() + "</h4>"); title.setHeight(27); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java index 2dda7b6..b489db5 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java @@ -36,15 +36,15 @@ import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.resource.Resourc import org.rhq.enterprise.gui.coregui.client.gwt.DashboardGWTServiceAsync; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedIButton; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableToolStrip; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedToolStrip; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * The content pane for the resource Summary>Activity subtab. * * @author Jay Shaughnessy */ -public class ActivityView extends LocatableVLayout implements DashboardContainer, InitializableView { +public class ActivityView extends EnhancedVLayout implements DashboardContainer, InitializableView {
private static final String DASHBOARD_NAME_PREFIX = "ResourceDashboard_";
@@ -54,7 +54,7 @@ public class ActivityView extends LocatableVLayout implements DashboardContainer
private DashboardView dashboardView;
- private LocatableToolStrip footer; + private EnhancedToolStrip footer; private IButton editButton; private IButton resetButton;
@@ -111,11 +111,11 @@ public class ActivityView extends LocatableVLayout implements DashboardContainer Canvas[] members = getMembers(); removeMembers(members); //pass in the resource information - dashboardView = new DashboardView(extendLocatorId(dashboard.getName()), this, dashboard, - EntityContext.forResource(resourceComposite.getResource().getId()), resourceComposite); + dashboardView = new DashboardView(this, dashboard, EntityContext.forResource(resourceComposite.getResource() + .getId()), resourceComposite); addMember(dashboardView);
- footer = new LocatableToolStrip(); + footer = new EnhancedToolStrip(); footer.setPadding(5); footer.setWidth100(); footer.setMembersMargin(15); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/TimelineView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/TimelineView.java index 87057c9..26a658e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/TimelineView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/TimelineView.java @@ -23,12 +23,12 @@ import org.rhq.core.domain.resource.composite.ResourceComposite; import org.rhq.enterprise.gui.coregui.client.components.FullHTMLPane; import org.rhq.enterprise.gui.coregui.client.components.measurement.UserPreferencesMeasurementRangeEditor; import org.rhq.enterprise.gui.coregui.client.components.view.ViewName; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author John Mazzitelli */ -public class TimelineView extends LocatableVLayout { +public class TimelineView extends EnhancedVLayout { public static final ViewName VIEW_ID = new ViewName("ResourceTimeline", MSG.view_tabs_common_timeline());
private final ResourceComposite resourceComposite; @@ -48,7 +48,7 @@ public class TimelineView extends LocatableVLayout {
// we create a simple subclass because we need to know when a new range has been set in order to refresh the timeline class RangeEditor extends UserPreferencesMeasurementRangeEditor { - RangeEditor(String editorLocatorId) { + RangeEditor() { super(); }
@@ -59,7 +59,7 @@ public class TimelineView extends LocatableVLayout { } }
- RangeEditor range = new RangeEditor(extendLocatorId("TimeRangeEditor")); + RangeEditor range = new RangeEditor(); addMember(range); // put it at the top above the timeline's filters addMember(timelinePane); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/ResourceAutodiscoveryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/ResourceAutodiscoveryView.java index 309b8f5..5fc2d77 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/ResourceAutodiscoveryView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/ResourceAutodiscoveryView.java @@ -59,12 +59,12 @@ import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGWTServiceAsync; import org.rhq.enterprise.gui.coregui.client.util.TableUtility; import org.rhq.enterprise.gui.coregui.client.util.message.Message; import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedIButton; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Greg Hinkle */ -public class ResourceAutodiscoveryView extends LocatableVLayout implements RefreshableView, HasViewName { +public class ResourceAutodiscoveryView extends EnhancedVLayout implements RefreshableView, HasViewName {
public static final ViewName VIEW_ID = new ViewName("AutodiscoveryQueue", MSG.view_inventory_adq(), IconEnum.DISCOVERY_QUEUE); 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 dd30dca..2f44cc4 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 @@ -37,7 +37,7 @@ import org.rhq.enterprise.gui.coregui.client.components.wizard.AbstractWizardSte import org.rhq.enterprise.gui.coregui.client.gwt.ConfigurationGWTServiceAsync; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.schedule.AbstractOperationScheduleDataSource; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * This step displays a config editor for the user to enter the new Resource's initial Resource or plugin configuration. @@ -47,7 +47,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; */ public class ResourceFactoryConfigurationStep extends AbstractWizardStep implements PropertyValueChangeListener {
- private LocatableVLayout vLayout; + private EnhancedVLayout vLayout; private ConfigurationEditor editor; private Configuration startingConfig; private DurationItem timeoutItem; @@ -61,7 +61,7 @@ public class ResourceFactoryConfigurationStep extends AbstractWizardStep impleme boolean newCanvas = this.vLayout == null;
if (newCanvas) { - this.vLayout = new LocatableVLayout(); + this.vLayout = new EnhancedVLayout();
// only create the timeout member 1 time, even if we end up recreating the config editor TreeSet<TimeUnit> supportedUnits = new TreeSet<TimeUnit>(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourcePicker.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourcePicker.java index d5ed7e9..d635c67 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourcePicker.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourcePicker.java @@ -34,7 +34,7 @@ import com.smartgwt.client.widgets.form.fields.events.ClickHandler;
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.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * A window dialog box that lets you pick one or more resources. @@ -80,7 +80,7 @@ public class ResourcePicker extends Window { } });
- LocatableVLayout layout = new LocatableVLayout(); + EnhancedVLayout layout = new EnhancedVLayout(); layout.setLayoutAlign(Alignment.CENTER); layout.setLayoutMargin(10);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/SingleResourcePicker.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/SingleResourcePicker.java index 62b07e0..7968806 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/SingleResourcePicker.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/SingleResourcePicker.java @@ -27,7 +27,7 @@ import java.util.Set; */ public class SingleResourcePicker extends ResourcePicker {
- public SingleResourcePicker(String locatorId, OkHandler okHandler, CancelHandler cancelHandler) { + public SingleResourcePicker(OkHandler okHandler, CancelHandler cancelHandler) { super(okHandler, cancelHandler); }
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/PluginTypeTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/PluginTypeTreeView.java index b29a93a..bdf3a6d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/PluginTypeTreeView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/PluginTypeTreeView.java @@ -32,12 +32,12 @@ import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.ImageManager; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.gwt.ResourceTypeGWTServiceAsync; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Greg Hinkle */ -public class PluginTypeTreeView extends LocatableVLayout { +public class PluginTypeTreeView extends EnhancedVLayout {
private ResourceTypeGWTServiceAsync resourceTypeService = GWTServiceLookup.getResourceTypeGWTService();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeTreeView.java index 8e9b5f5..3c2593e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeTreeView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeTreeView.java @@ -32,12 +32,12 @@ import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.ImageManager; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.gwt.ResourceTypeGWTServiceAsync; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Greg Hinkle */ -public class ResourceTypeTreeView extends LocatableVLayout { +public class ResourceTypeTreeView extends EnhancedVLayout {
private ResourceTypeGWTServiceAsync resourceTypeService = GWTServiceLookup.getResourceTypeGWTService();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java index 02aabbd..9425099 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java @@ -45,15 +45,15 @@ import org.rhq.enterprise.gui.coregui.client.dashboard.DashboardsView; import org.rhq.enterprise.gui.coregui.client.help.HelpView; import org.rhq.enterprise.gui.coregui.client.inventory.InventoryView; import org.rhq.enterprise.gui.coregui.client.report.ReportTopView; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHStack; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedHStack; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Greg Hinkle * @author Joseph Marques * @author Ian Springer */ -public class MenuBarView extends LocatableVLayout { +public class MenuBarView extends EnhancedVLayout {
public static final ViewName[] SECTIONS = { DashboardsView.VIEW_ID, InventoryView.VIEW_ID, ReportTopView.VIEW_ID, BundleTopView.VIEW_ID, AdministrationView.VIEW_ID, HelpView.VIEW_ID }; @@ -142,7 +142,7 @@ public class MenuBarView extends LocatableVLayout { return layout; }
- class LinkBar extends LocatableHStack implements ValueChangeHandler<String> { + class LinkBar extends EnhancedHStack implements ValueChangeHandler<String> { private final Map<String, VLayout> sectionNameToLinkVLayoutMap = new HashMap<String, VLayout>();
LinkBar() { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/DriftComplianceReportResourceSearchView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/DriftComplianceReportResourceSearchView.java index 26aa7a3..5a6aa68 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/DriftComplianceReportResourceSearchView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/DriftComplianceReportResourceSearchView.java @@ -66,7 +66,7 @@ public class DriftComplianceReportResourceSearchView extends ResourceSearchView
private final int resourceTypeId;
- public DriftComplianceReportResourceSearchView(String locatorId, Criteria criteria, boolean exportable) { + public DriftComplianceReportResourceSearchView(Criteria criteria, boolean exportable) { super(criteria, exportable);
setInitialCriteriaFixed(true); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java index 55fa1a6..b4f1161 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java @@ -51,7 +51,7 @@ import org.rhq.enterprise.gui.coregui.client.report.inventory.ResourceInstallRep import org.rhq.enterprise.gui.coregui.client.report.measurement.MeasurementOOBView; import org.rhq.enterprise.gui.coregui.client.report.operation.SubsystemOperationHistoryListView; import org.rhq.enterprise.gui.coregui.client.report.tag.TaggedView; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * The Reports top-level view. @@ -86,7 +86,7 @@ public class ReportTopView extends AbstractSectionedLeftNavigationView {
@Override protected VLayout defaultView() { - LocatableVLayout vLayout = new LocatableVLayout(); + EnhancedVLayout vLayout = new EnhancedVLayout(); vLayout.setWidth100();
TitleBar titleBar = new TitleBar(MSG.view_reportsTop_title(), IconEnum.REPORT.getIcon24x24Path()); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/inventory/DriftComplianceReport.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/inventory/DriftComplianceReport.java index c659a18..148c939 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/inventory/DriftComplianceReport.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/inventory/DriftComplianceReport.java @@ -32,7 +32,7 @@ import org.rhq.enterprise.gui.coregui.client.components.view.ViewName; import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField; import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceSearchView; import org.rhq.enterprise.gui.coregui.client.report.DriftComplianceReportResourceSearchView; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * A tweaked version of the InventorySummary report that narrows the relevant types to those that support Drift @@ -40,7 +40,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; * * @author Jay Shaughnessy */ -public class DriftComplianceReport extends LocatableVLayout implements BookmarkableView, HasViewName { +public class DriftComplianceReport extends EnhancedVLayout implements BookmarkableView, HasViewName {
public static final ViewName VIEW_ID = new ViewName("DriftCompliance", MSG.view_reports_driftCompliance(), IconEnum.DRIFT_COMPLIANCE); @@ -92,7 +92,7 @@ public class DriftComplianceReport extends LocatableVLayout implements Bookmarka
private void showResourceList(Criteria criteria) { hideResourceList(); - resourceList = new DriftComplianceReportResourceSearchView(extendLocatorId("resourceList"), criteria, true); + resourceList = new DriftComplianceReportResourceSearchView(criteria, true); addMember(resourceList); markForRedraw(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/inventory/ResourceInstallReport.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/inventory/ResourceInstallReport.java index abe2051..9674561 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/inventory/ResourceInstallReport.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/inventory/ResourceInstallReport.java @@ -31,7 +31,7 @@ import org.rhq.enterprise.gui.coregui.client.components.view.HasViewName; import org.rhq.enterprise.gui.coregui.client.components.view.ViewName; import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField; import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceSearchView; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * A tabular report that shows the types of resources are installed and how many @@ -39,7 +39,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; * * @author John Mazzitelli */ -public class ResourceInstallReport extends LocatableVLayout implements BookmarkableView, HasViewName { +public class ResourceInstallReport extends EnhancedVLayout implements BookmarkableView, HasViewName {
public static final ViewName VIEW_ID = new ViewName("InventorySummary", MSG.common_title_inventorySummary(), IconEnum.INVENTORY_SUMMARY); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java index 1bc199e..d9d26b9 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java @@ -43,7 +43,7 @@ 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.EnhancedIButton; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * Shows the tags in a large HTML block, where the most used tags are shown in bigger fonts. @@ -51,7 +51,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; * @author Greg Hinkle * @author John Mazzitelli */ -public class TagCloudView extends LocatableVLayout { +public class TagCloudView extends EnhancedVLayout {
private static final String REMOVE_ICON = "[skin]/images/actions/remove.png"; private static final int MIN_FONTSIZE = 8; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java index 543be5b..fd17a80 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java @@ -49,7 +49,7 @@ import org.rhq.enterprise.gui.coregui.client.components.view.ViewName; import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceSearchView; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTab; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTabSet; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * The main tag cloud view which will show the actual tag cloud with a tabbed view @@ -58,7 +58,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; * @author Greg Hinkle * @author John Mazzitelli */ -public class TaggedView extends LocatableVLayout implements BookmarkableView, HasViewName { +public class TaggedView extends EnhancedVLayout implements BookmarkableView, HasViewName {
public static final ViewName VIEW_ID = new ViewName("Tags", MSG.view_tags_tags(), IconEnum.TAGS);
@@ -106,7 +106,7 @@ public class TaggedView extends LocatableVLayout implements BookmarkableView, Ha criteria.addCriteria("tagSemantic", tag.getSemantic()); criteria.addCriteria("tagName", tag.getName());
- container = new LocatableTabSet(extendLocatorId("tags")); + container = new LocatableTabSet(); container.setWidth100(); container.setHeight100(); container.setTabBarControls(tagCloudView.getDeleteButton()); @@ -121,37 +121,36 @@ public class TaggedView extends LocatableVLayout implements BookmarkableView, Ha
BundlesListView bundlesView = new BundlesListView(criteria, null); viewsWithTags.add(bundlesView); - tab = new LocatableTab(extendLocatorId("bundleList"), MSG.view_bundle_bundles()); + tab = new LocatableTab(MSG.view_bundle_bundles()); tab.setIcon(ImageManager.getBundleIcon()); tab.setPane(bundlesView); container.addTab(tab);
BundleVersionListView bundleVersionListView = new BundleVersionListView(criteria); viewsWithTags.add(bundleVersionListView); - tab = new LocatableTab(extendLocatorId("bundleVersionList"), MSG.view_bundle_bundleVersions()); + tab = new LocatableTab(MSG.view_bundle_bundleVersions()); tab.setIcon("subsystems/bundle/BundleVersion_16.png"); tab.setPane(bundleVersionListView); container.addTab(tab);
- BundleDeploymentListView bundleDeploymentListView = new BundleDeploymentListView( - extendLocatorId("bundleDeploymentListView"), criteria, + BundleDeploymentListView bundleDeploymentListView = new BundleDeploymentListView(criteria, this.globalPermissions.contains(Permission.MANAGE_BUNDLE)); viewsWithTags.add(bundleDeploymentListView); - tab = new LocatableTab(extendLocatorId("bundleDeploymentsList"), MSG.view_bundle_bundleDeployments()); + tab = new LocatableTab(MSG.view_bundle_bundleDeployments()); tab.setIcon("subsystems/bundle/BundleDeployment_16.png"); tab.setPane(bundleDeploymentListView); container.addTab(tab);
BundleDestinationListView bundleDestinationListView = new BundleDestinationListView(criteria); viewsWithTags.add(bundleDestinationListView); - tab = new LocatableTab(extendLocatorId("bundleDestinationsList"), MSG.view_bundle_bundleDestinations()); + tab = new LocatableTab(MSG.view_bundle_bundleDestinations()); tab.setIcon("subsystems/bundle/BundleDestination_16.png"); tab.setPane(bundleDestinationListView); container.addTab(tab);
ResourceSearchView resourceView = new ResourceSearchView(criteria, MSG.view_taggedResources_title()); viewsWithTags.add(resourceView); - tab = new LocatableTab(extendLocatorId("resourceList"), MSG.view_taggedResources_title()); + tab = new LocatableTab(MSG.view_taggedResources_title()); tab.setIcon(ImageManager.getResourceIcon(ResourceCategory.SERVICE)); tab.setPane(resourceView); container.addTab(tab); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestMessageCenterView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestMessageCenterView.java index 26c5511..6ac7487 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestMessageCenterView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestMessageCenterView.java @@ -35,9 +35,9 @@ import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.util.message.Message; import org.rhq.enterprise.gui.coregui.client.util.message.Message.Option; import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
-public class TestMessageCenterView extends LocatableVLayout { +public class TestMessageCenterView extends EnhancedVLayout {
public TestMessageCenterView() { super(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestNumberFormatView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestNumberFormatView.java index 5797bf1..ee9f395 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestNumberFormatView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestNumberFormatView.java @@ -33,9 +33,9 @@ import com.smartgwt.client.widgets.form.fields.events.ClickHandler; import org.rhq.core.domain.measurement.MeasurementUnits; import org.rhq.core.domain.measurement.composite.MeasurementNumericValueAndUnits; import org.rhq.enterprise.gui.coregui.client.util.measurement.MeasurementParser; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
-public class TestNumberFormatView extends LocatableVLayout { +public class TestNumberFormatView extends EnhancedVLayout {
public TestNumberFormatView() { super(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestTopView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestTopView.java index 9cb8320..276724d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestTopView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestTopView.java @@ -38,7 +38,7 @@ import org.rhq.enterprise.gui.coregui.client.test.configuration.TestGroupConfigu import org.rhq.enterprise.gui.coregui.client.test.configuration.TestReadOnlyConfigurationView; import org.rhq.enterprise.gui.coregui.client.test.configuration.TestReadOnlyGroupConfigurationView; import org.rhq.enterprise.gui.coregui.client.test.inventory.TestSearchBarView; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * The Test top-level view. This view is "hidden", i.e. there are no links to it, so the user must go to the URL @@ -85,7 +85,7 @@ public class TestTopView extends AbstractSectionedLeftNavigationView { }
protected Canvas defaultView() { - LocatableVLayout vLayout = new LocatableVLayout(); + EnhancedVLayout vLayout = new EnhancedVLayout(); vLayout.setWidth100();
// TODO: Help icon. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestConfigurationView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestConfigurationView.java index ac67975..7cd5286 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestConfigurationView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestConfigurationView.java @@ -40,17 +40,17 @@ import org.rhq.enterprise.gui.coregui.client.components.configuration.PropertyVa import org.rhq.enterprise.gui.coregui.client.util.message.Message; import org.rhq.enterprise.gui.coregui.client.util.message.MessageCenter; import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedIButton; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableToolStrip; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedToolStrip; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Ian Springer */ -public class TestConfigurationView extends LocatableVLayout implements PropertyValueChangeListener { +public class TestConfigurationView extends EnhancedVLayout implements PropertyValueChangeListener {
private ConfigurationEditor editor; private EnhancedIButton saveButton; - private LocatableToolStrip buttonBar; + private EnhancedToolStrip buttonBar; private ConfigurationDefinition configurationDefinition; private Configuration configuration;
@@ -76,8 +76,8 @@ public class TestConfigurationView extends LocatableVLayout implements PropertyV reloadConfiguration(); }
- private LocatableToolStrip createButtonBar() { - LocatableToolStrip toolStrip = new LocatableToolStrip(); + private EnhancedToolStrip createButtonBar() { + EnhancedToolStrip toolStrip = new EnhancedToolStrip(); toolStrip.setWidth100();
toolStrip.addMember(new LayoutSpacer()); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestGroupConfigurationView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestGroupConfigurationView.java index c313821..19387f6 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestGroupConfigurationView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestGroupConfigurationView.java @@ -41,12 +41,12 @@ import org.rhq.enterprise.gui.coregui.client.components.configuration.PropertyVa import org.rhq.enterprise.gui.coregui.client.util.message.Message; import org.rhq.enterprise.gui.coregui.client.util.message.MessageCenter; import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedIButton; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/** * @author Ian Springer */ -public class TestGroupConfigurationView extends LocatableVLayout implements PropertyValueChangeListener { +public class TestGroupConfigurationView extends EnhancedVLayout implements PropertyValueChangeListener {
private static final int GROUP_SIZE = 2;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/Enhanced.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/Enhanced.java new file mode 100644 index 0000000..3c3b0bc --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/Enhanced.java @@ -0,0 +1,35 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +package org.rhq.enterprise.gui.coregui.client.util.selenium; + +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.Messages; + +/** + * Interface to all Enhanced components. + */ +public interface Enhanced { + + Messages MSG = CoreGUI.getMessages(); +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/EnhancedHLayout.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/EnhancedHLayout.java index e7c0f73..ffa6f56 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/EnhancedHLayout.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/EnhancedHLayout.java @@ -3,11 +3,13 @@ package org.rhq.enterprise.gui.coregui.client.util.selenium; import com.smartgwt.client.widgets.layout.HLayout;
/** - * Wrapper for a SmartGWT {@link HLayout} that sets the ID for use with Selenium scLocators. + * Wrapper for a SmartGWT {@link HLayout} that adds some destroy logic. + * + * TODO: Ensure this added destroy logic is necessary now that Selenium support has been removed. * * @author Jay Shaughnessy */ -public class EnhancedHLayout extends HLayout implements Locatable { +public class EnhancedHLayout extends HLayout implements Enhanced {
public EnhancedHLayout() { super(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/EnhancedHStack.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/EnhancedHStack.java new file mode 100644 index 0000000..2973998 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/EnhancedHStack.java @@ -0,0 +1,51 @@ +/* + * RHQ Management Platform + * Copyright (C) 2011 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.rhq.enterprise.gui.coregui.client.util.selenium; + +import com.smartgwt.client.widgets.layout.HStack; + +/** + * Wrapper for a SmartGWT {@link HStack} that adds some destroy logic. + * + * TODO: Ensure this added destroy logic is necessary now that Selenium support has been removed. + * + * @author Ian Springer + */ + +public class EnhancedHStack extends HStack implements Enhanced { + + public EnhancedHStack() { + super(); + } + + public void destroyMembers() { + SeleniumUtility.destroyMembers(this); + } + + @Override + public void destroy() { + destroyMembers(); + super.destroy(); + } + +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/EnhancedLayout.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/EnhancedLayout.java new file mode 100644 index 0000000..f051440 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/EnhancedLayout.java @@ -0,0 +1,27 @@ +package org.rhq.enterprise.gui.coregui.client.util.selenium; + +import com.smartgwt.client.widgets.layout.Layout; + +/** + * Wrapper for a SmartGWT {@link Layout} that adds some destroy logic. + * + * TODO: Ensure this added destroy logic is necessary now that Selenium support has been removed. + * + * @author Jay Shaughnessy + */ +public class EnhancedLayout extends Layout implements Enhanced { + + public EnhancedLayout() { + super(); + } + + public void destroyMembers() { + SeleniumUtility.destroyMembers(this); + } + + @Override + public void destroy() { + destroyMembers(); + super.destroy(); + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/EnhancedToolStrip.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/EnhancedToolStrip.java new file mode 100644 index 0000000..7c5898c --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/EnhancedToolStrip.java @@ -0,0 +1,27 @@ +package org.rhq.enterprise.gui.coregui.client.util.selenium; + +import com.smartgwt.client.widgets.toolbar.ToolStrip; + +/** + * Wrapper for a SmartGWT {@link ToolStrip} that adds some destroy logic. + * + * TODO: Ensure this added destroy logic is necessary now that Selenium support has been removed. + * + * @author Jay Shaughnessy + */ +public class EnhancedToolStrip extends ToolStrip implements Enhanced { + + public EnhancedToolStrip() { + super(); + } + + public void destroyMembers() { + SeleniumUtility.destroyMembers(this); + } + + @Override + public void destroy() { + destroyMembers(); + super.destroy(); + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/EnhancedVLayout.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/EnhancedVLayout.java new file mode 100644 index 0000000..dff1c88 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/EnhancedVLayout.java @@ -0,0 +1,31 @@ +package org.rhq.enterprise.gui.coregui.client.util.selenium; + +import com.smartgwt.client.widgets.layout.VLayout; + +/** + * Wrapper for a SmartGWT {@link VLayout} that adds some destroy logic. + * + * TODO: Ensure this added destroy logic is necessary now that Selenium support has been removed. + * + * @author Jay Shaughnessy + */ +public class EnhancedVLayout extends VLayout implements Enhanced { + + public EnhancedVLayout() { + super(); + } + + public EnhancedVLayout(int membersMargin) { + super(membersMargin); + } + + public void destroyMembers() { + SeleniumUtility.destroyMembers(this); + } + + @Override + public void destroy() { + destroyMembers(); + super.destroy(); + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/EnhancedVStack.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/EnhancedVStack.java new file mode 100644 index 0000000..ed9b35a --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/EnhancedVStack.java @@ -0,0 +1,31 @@ +package org.rhq.enterprise.gui.coregui.client.util.selenium; + +import com.smartgwt.client.widgets.layout.VStack; + +/** + * Wrapper for a SmartGWT {@link VStack} that adds some destroy logic. + * + * TODO: Ensure this added destroy logic is necessary now that Selenium support has been removed. + * + * @author Jay Shaughnessy + */ +public class EnhancedVStack extends VStack implements Enhanced { + + public EnhancedVStack() { + super(); + } + + public EnhancedVStack(int membersMargin) { + super(membersMargin); + } + + public void destroyMembers() { + SeleniumUtility.destroyMembers(this); + } + + @Override + public void destroy() { + destroyMembers(); + super.destroy(); + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/Locatable.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/Locatable.java deleted file mode 100644 index 3947cc2..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/Locatable.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2011 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -package org.rhq.enterprise.gui.coregui.client.util.selenium; - -import org.rhq.enterprise.gui.coregui.client.CoreGUI; -import org.rhq.enterprise.gui.coregui.client.Messages; - -/** - * Interface to all locatable components. - * Implement this to ensure Selenium testability for the implementing component. - */ -public interface Locatable { - - Messages MSG = CoreGUI.getMessages(); -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableHStack.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableHStack.java deleted file mode 100644 index 8706352..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableHStack.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2011 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.rhq.enterprise.gui.coregui.client.util.selenium; - -import com.smartgwt.client.widgets.layout.HStack; - -/** - * Wrapper for a SmartGWT {@link HStack} that sets the ID for use with Selenium scLocators. - * - * @author Ian Springer - */ -public class LocatableHStack extends HStack implements Locatable { - - private String locatorId; - - public LocatableHStack() { - super(); - } - - /** - * <pre> - * ID Format: "simpleClassname_locatorId" - * </pre> - * @param locatorId not null or empty. - */ - public LocatableHStack(String locatorId) { - super(); - init(locatorId); - } - - /** - * <pre> - * ID Format: "simpleClassname_locatorId" - * </pre> - * @param locatorId not null or empty. - * @param membersMargin - */ - public LocatableHStack(String locatorId, int membersMargin) { - super(membersMargin); - init(locatorId); - } - - private void init(String locatorId) { - this.locatorId = locatorId; - SeleniumUtility.setID(this, locatorId); - } - - public String getLocatorId() { - return locatorId; - } - - public String extendLocatorId(String extension) { - return this.locatorId + "_" + extension; - } - - public void destroyMembers() { - SeleniumUtility.destroyMembers(this); - } - - @Override - public void destroy() { - destroyMembers(); - super.destroy(); - } - -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableLayout.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableLayout.java deleted file mode 100644 index 2139960..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableLayout.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.rhq.enterprise.gui.coregui.client.util.selenium; - -import com.smartgwt.client.widgets.layout.Layout; - -/** - * Wrapper for com.smartgwt.client.widgets.layout.HLayout that sets the ID for use with selenium scLocators. - * - * @author Jay Shaughnessy - */ -public class LocatableLayout extends Layout implements Locatable { - - private String locatorId; - - /** - * <pre> - * ID Format: "simpleClassname_locatorId" - * </pre> - * @param locatorId not null or empty. - */ - public LocatableLayout() { - super(); - this.locatorId = locatorId; - SeleniumUtility.setID(this, locatorId); - } - - public String getLocatorId() { - return locatorId; - } - - public String extendLocatorId(String extension) { - return this.locatorId + "_" + extension; - } - - public void destroyMembers() { - SeleniumUtility.destroyMembers(this); - } - - @Override - public void destroy() { - destroyMembers(); - super.destroy(); - } -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableTab.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableTab.java index 197a1be..7777b6a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableTab.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableTab.java @@ -25,7 +25,7 @@ import com.smartgwt.client.widgets.tab.Tab; * * @author Jay Shaughnessy */ -public class LocatableTab extends Tab implements Locatable { +public class LocatableTab extends Tab implements Enhanced {
private String locatorId;
@@ -35,9 +35,9 @@ public class LocatableTab extends Tab implements Locatable { * </pre> * @param locatorId not null or empty. */ - public LocatableTab(String locatorId, String title) { + public LocatableTab(String title) { super(title); - init(locatorId); + init("TODO!!!!"); }
/** @@ -46,9 +46,9 @@ public class LocatableTab extends Tab implements Locatable { * </pre> * @param locatorId not null or empty. */ - public LocatableTab(String locatorId, String title, String icon) { + public LocatableTab(String title, String icon) { super(title, icon); - init(locatorId); + init("TODO!!!"); }
private void init(String locatorId) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableToolStrip.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableToolStrip.java deleted file mode 100644 index 0af562a..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableToolStrip.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.rhq.enterprise.gui.coregui.client.util.selenium; - -import com.smartgwt.client.widgets.toolbar.ToolStrip; - -/** - * Wrapper for com.smartgwt.client.widgets.toolbar.ToolStrip that sets the ID for use with selenium scLocators. - * - * @author Jay Shaughnessy - */ -public class LocatableToolStrip extends ToolStrip implements Locatable { - - private String locatorId; - - /** - * <pre> - * ID Format: "simpleClassname_locatorId" - * </pre> - * @param locatorId not null or empty. - */ - public LocatableToolStrip() { - super(); - this.locatorId = locatorId; - SeleniumUtility.setID(this, locatorId); - } - - public String getLocatorId() { - return locatorId; - } - - public String extendLocatorId(String extension) { - return this.locatorId + "_" + extension; - } - - public void destroyMembers() { - SeleniumUtility.destroyMembers(this); - } - - @Override - public void destroy() { - destroyMembers(); - super.destroy(); - } -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableTransferImgButton.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableTransferImgButton.java deleted file mode 100644 index efbd818..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableTransferImgButton.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.rhq.enterprise.gui.coregui.client.util.selenium; - -import com.smartgwt.client.widgets.TransferImgButton; - -/** - * Wrapper for com.smartgwt.client.widgets.TransferImgButton that sets the ID for use with selenium scLocators. - * - * @author Jay Shaughnessy - */ -public class LocatableTransferImgButton extends TransferImgButton implements Locatable { - - private String locatorId; - - /** - * <pre> - * ID Format: "simpleClassname_locatorId_imgName" - * </pre> - * @param locatorId not null. - * @param img not null or empty. - */ - public LocatableTransferImgButton(String locatorId, TransferImg img) { - super(img); - this.locatorId = locatorId; - this.locatorId = extendLocatorId(getSuffix(img)); - SeleniumUtility.setID(this, this.locatorId); - } - - static private String getSuffix(TransferImg img) { - if (TransferImgButton.LEFT == img) - return "LEFT"; - if (TransferImgButton.LEFT_ALL == img) - return "LEFT_ALL"; - if (TransferImgButton.RIGHT == img) - return "RIGHT"; - if (TransferImgButton.RIGHT_ALL == img) - return "RIGHT_ALL"; - if (TransferImgButton.UP == img) - return "UP"; - if (TransferImgButton.UP_FIRST == img) - return "UP_FIRST"; - if (TransferImgButton.DOWN == img) - return "DOWN"; - if (TransferImgButton.DOWN_LAST == img) - return "DOWN_LAST"; - if (TransferImgButton.DELETE == img) - return "DELETE"; - - return img.toString(); - } - - public String getLocatorId() { - return locatorId; - } - - public String extendLocatorId(String extension) { - return this.locatorId + "_" + extension; - } - -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableVLayout.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableVLayout.java deleted file mode 100644 index 2dcf267..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableVLayout.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.rhq.enterprise.gui.coregui.client.util.selenium; - -import com.smartgwt.client.widgets.layout.VLayout; - -/** - * Wrapper for a SmartGWT {@link VLayout} that sets the ID for use with Selenium scLocators. - * - * @author Jay Shaughnessy - */ -public class LocatableVLayout extends VLayout implements Locatable { - - public LocatableVLayout() { - super(); - } - - public LocatableVLayout(int membersMargin) { - super(membersMargin); - } - - /** - * <pre> - * ID Format: "simpleClassname_locatorId" - * </pre> - * @param locatorId not null or empty. - */ - public LocatableVLayout(String locatorId) { - super(); - } - - /** - * <pre> - * ID Format: "simpleClassname_locatorId" - * </pre> - * @param locatorId not null or empty. - * @param membersMargin - */ - public LocatableVLayout(String locatorId, int membersMargin) { - super(membersMargin); - } - - - public String getLocatorId() { - return ""; - } - - public String extendLocatorId(String extension) { - return extension; - } - - public void destroyMembers() { - SeleniumUtility.destroyMembers(this); - } - - @Override - public void destroy() { - destroyMembers(); - super.destroy(); - } -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableVStack.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableVStack.java deleted file mode 100644 index e13b0c9..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableVStack.java +++ /dev/null @@ -1,57 +0,0 @@ -package org.rhq.enterprise.gui.coregui.client.util.selenium; - -import com.smartgwt.client.widgets.layout.VStack; - -/** - * Wrapper for a SmartGWT {@link VStack} that sets the ID for use with Selenium scLocators. - * - * @author Jay Shaughnessy - */ -public class LocatableVStack extends VStack implements Locatable { - - private String locatorId; - - /** - * <pre> - * ID Format: "simpleClassname_locatorId" - * </pre> - * @param locatorId not null or empty. - */ - public LocatableVStack(String locatorId) { - super(); - } - - public LocatableVStack() { - super(); - } - - /** - * <pre> - * ID Format: "simpleClassname_locatorId" - * </pre> - * @param locatorId not null or empty. - * @param membersMargin - */ - public LocatableVStack(String locatorId, int membersMargin) { - super(membersMargin); - } - - - public String getLocatorId() { - return locatorId; - } - - public String extendLocatorId(String extension) { - return this.locatorId + "_" + extension; - } - - public void destroyMembers() { - SeleniumUtility.destroyMembers(this); - } - - @Override - public void destroy() { - destroyMembers(); - super.destroy(); - } -}
commit 8cb84c647ba9d985035d9323f9d64b8e1badce9f Author: Jay Shaughnessy jshaughn@redhat.com Date: Fri Feb 22 10:50:23 2013 -0500
merge in NPE fix made in master's LocatableIButton class
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/EnhancedIButton.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/EnhancedIButton.java index 4de985f..150fd70 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/EnhancedIButton.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/EnhancedIButton.java @@ -7,31 +7,18 @@ import com.smartgwt.client.widgets.IButton; */ public class EnhancedIButton extends IButton {
- /** - * <pre> - * ID Format: "simpleClassname_locatorId" - * </pre> - * @param locatorId not null or empty. - */ public EnhancedIButton() { - super(); - init(); + this(null); }
- /** - * <pre> - * ID Format: "simpleClassname_locatorId" - * </pre> - * @param locatorId not null or empty. - * @param title - */ public EnhancedIButton(String title) { super(title); init(); }
private void init() { - if (getTitle().length() > 15) { + String title = getTitle(); + if (title != null && title.length() > 15) { setAutoFit(true); } }
rhq-commits@lists.fedorahosted.org