modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginManager.java | 20 modules/enterprise/gui/coregui/pom.xml | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/core/domain/measurement/MeasurementConverterClient.java | 7 modules/enterprise/gui/coregui/src/main/java/org/rhq/core/rebind/RecordBuilderGenerator.java | 43 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java | 51 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/Footer.java | 10 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java | 76 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/SearchGUI.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserPermissionsManager.java | 17 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserSessionManager.java | 28 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java | 52 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/RolesView.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java | 7 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleTopView.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeDataSource.java | 29 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionListView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java | 28 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/form/AbstractRecordEditor.java | 10 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/tagging/TaggingDataSource.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tree/EnhancedTreeNode.java | 9 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/BundleDistributionFileUploadForm.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/BundleFileUploadForm.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/DynamicCallbackFormHandlerCollection.java | 31 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/FileUploadForm.java | 25 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/PackageVersionFileUploadForm.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/TextFileRetrieverForm.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/AbstractSectionedLeftNavigationView.java | 7 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/NavigationItem.java | 18 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/NavigationSection.java | 16 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/ViewName.java | 38 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/Wizard.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardStep.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java | 13 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/content/repository/tree/ContentRepositoryTreeDataSource.java | 9 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java | 19 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java | 63 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletHelpWindow.java | 20 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletSettingsWindow.java | 12 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java | 12 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/GraphPortlet.java | 20 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformMetricDataSource.java | 10 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformPortletView.java | 13 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java | 65 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourceDS.java | 14 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedView.java | 21 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationsPortlet.java | 73 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java | 33 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryView.java | 35 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/TagCloudPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/util/MashupPortlet.java | 13 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/util/MessagePortlet.java | 13 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/store/DashboardManager.java | 13 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/footer/FavoritesButton.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/i18n/TestMessages.java | 57 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/i18n/TestMessages_de.properties | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/i18n/TestMessages_fr.properties | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java | 82 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupContextMenu.java | 28 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java | 48 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java | 18 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTopView.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/SchedulesDataSource.java | 54 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/SchedulesView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsDataSource.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/OverviewView.java | 48 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateStep.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateWizard.java | 14 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupMembersStep.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java | 94 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDataSourceField.java | 14 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java | 53 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/NewResourceTreeDataSource.java | 97 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/NewResourceTreeView.java | 41 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java | 88 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java | 33 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTopView.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java | 25 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java | 69 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/alert/AlertEditOldStyleView.java | 206 -- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/alert/AlertEditView.java | 455 ----- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDataSource.java | 62 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDetailView.java | 19 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java | 62 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java | 17 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationEditView.java | 18 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceGroupSelector.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceGroupsView.java | 12 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/AvailabilityBarView.java | 83 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/GraphListView.java | 9 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/LiveGraphView.java | 7 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceScheduledMetricDatasource.java | 18 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/SmallGraphView.java | 17 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/calltime/CallTimeDataSource.java | 22 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/calltime/CallTimeView.java | 21 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/schedules/SchedulesDataSource.java | 47 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/schedules/SchedulesView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/traits/TraitsDataSource.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryDataSource.java | 63 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryView.java | 29 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationWizard.java | 12 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/ExecutionSchedule.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationCreateWizard.java | 19 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationParametersStep.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationSchedulingStep.java | 103 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/detail/OperationDetailsView.java | 22 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/DashboardView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/OverviewForm.java | 24 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/OverviewView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ResourceErrorsDataSource.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/AutodiscoveryQueueDataSource.java | 41 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/ResourceAutodiscoveryView.java | 34 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryConfigurationStep.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryCreateWizard.java | 35 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryImportWizard.java | 12 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryInfoStep.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryPackageStep.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceGroupSelector.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourcePicker.java | 9 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceSelector.java | 10 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/SelectedResourceDataSource.java | 13 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/SingleResourcePicker.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/PluginTypeTreeView.java | 44 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypePluginTreeDataSource.java | 19 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeTreeDataSource.java | 84 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeTreeView.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/DropDownMenuBarView.java | 233 -- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/FavoritesMenu.java | 109 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/GWTMenuBarView.java | 186 -- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java | 20 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/SearchBarPane.java | 12 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/RecentOperationsDataSource.java | 63 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/ScheduledOperationsDataSource.java | 51 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java | 72 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBDataSource.java | 14 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBView.java | 10 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java | 13 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java | 12 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/ProblemResourcesDataSource.java | 44 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/disambiguation/ReportDecorator.java | 11 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchBar.java | 23 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchLogger.java | 9 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchGrid.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchManager.java | 12 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox_v3.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestTopView.java | 58 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestConfigurationView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/i18n/TestPluralizationView.java | 62 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/CanvasUtility.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/ErrorHandler.java | 7 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/FormUtility.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/HighlightingDatasourceTextField.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/MeasurementUtility.java | 19 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java | 19 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/StringUtility.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/TableUtility.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/TreeUtility.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/WidgetUtility.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/WidgetsField.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenter.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java | 17 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferenceChangeListener.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferences.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/MonitoringRequestCallback.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/RPCManager.java | 11 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/Locatable.java | 9 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableCanvas.java | 34 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml | 6 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 792 +++++++++- modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html | 2 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/RemoteDownloader.java | 20 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/ScriptDeployer.java | 54 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/CreateChildResourceFacetDelegate.java | 2 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/script/ScriptComponent.java | 105 + 182 files changed, 2991 insertions(+), 2864 deletions(-)
New commits: commit b303442946977125847aab6654786ea3213ffd3d Merge: 51a03e5... 0ed2ec1... Author: John Sanda jsanda@redhat.com Date: Thu Nov 18 12:14:18 2010 -0500
Merge branch 'master' into delete-agent-plugin
commit 0ed2ec1d1486e591cec001bdcf6d9c05996c061e Author: Ian Springer ian.springer@redhat.com Date: Thu Nov 18 11:00:32 2010 -0500
latest Messages.properties from etherpad
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 9264867..865ca35 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 @@ -19,6 +19,7 @@ */ package org.rhq.enterprise.gui.coregui.client.components.form;
+import java.util.EnumSet; import java.util.List;
import com.google.gwt.user.client.History; @@ -232,6 +233,12 @@ public abstract class AbstractRecordEditor<DS extends RPCDataSource> extends Loc if (!this.isReadOnly) { this.saveButton.setDisabled(!isValid); this.resetButton.setDisabled(false); + if (!isValid) { + Message message = new Message("One or more fields have invalid values. This " + this.dataTypeName + + " cannot be saved until these values are corrected.", Message.Severity.Warning, EnumSet.of( + Message.Option.Sticky, Message.Option.Transient)); + CoreGUI.getMessageCenter().notify(message); + } } }
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index f51c7fe..7b9a0fa 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -1,1019 +1,1069 @@ - # - # RHQ GUI i18n Messages - English - ################################### - - #************************************** SHARED **************************************** - - #=================== Common ===================== - - # - # Build Info - # - common_buildInfo_gwtVersion = ${gwt.version}~ - - # Button Labels - #-------------- - common_button_advanced = Advanced...~ - common_button_apply = Apply~ - common_button_cancel = Cancel~ - common_button_close = Close~ - common_button_compare = Compare~ - common_button_create_child = Create Child~ - common_button_delete = Delete~ - common_button_disable = Disable~ - common_button_enable = Enable~ - common_button_finish = Finish~ - common_button_import = Import~ - common_button_new = New~ - common_button_next = Next~ - common_button_ok = OK~ - common_button_previous = Previous~ - common_button_purgeAll=Purge All~ - common_button_refresh = "Refresh"~ - common_button_reset = Reset~ - common_button_save = Save~ - common_button_search = Search~ - common_button_showDetails = Show Details...~ - common_button_uninventory = Uninventory~ - - # Common Labels - #------------------------ - common_label_all = ALL~ - common_label_all_resources = all resources~ - common_label_day=day~ - common_label_days=days~ - common_label_hour=hour~ - common_label_hours=hours~ - common_label_item=item~ - common_label_items=items~ - common_label_milliseconds=milliseconds~ - common_label_minutes=minutes~ - common_label_month=month~ - common_label_search=Search~ - common_label_scheduled_operations=scheduled operations~ - common_label_seconds=seconds~ - common_label_selected_resources = selected resources~ - common_label_unlimited = unlimited~ - common_label_week=week~ - - # Common Titles - #-------------- - common_title_add_column=Add Column~ - common_title_add_portlet=Add Portlet~ - common_title_alert_range=Alert Range~ - common_title_availability = Availability~ - common_title_average_metrics=Average Metrics per Minute~ - common_title_available_resources=Available Resources~ - common_title_background=Background~ - common_title_category = Category~ - common_title_columns=Columns~ - common_title_compatibleGroups = Compatible Groups~ - common_title_compatibleGroups_total=Compatible Group Total~ - common_title_custom=Custom~ - common_title_dashboard_name=Dashboard Name~ - common_title_dateCreated=Date Created~ - common_title_default=Default~ - common_title_description=Description~ - common_title_display=Display~ - common_title_display_name=Display Name~ - common_title_duration=Duration~ - common_title_edit_mode=Edit Mode~ - common_title_enabled=Enabled?~ - common_title_end = End~ - common_title_favorites=Favorites~ - common_title_generalProp = General Properties~ - common_title_group_def_total=Group Definition Total~ - common_title_icon = icon~ - common_title_id = ID~ - common_title_id_parent = Parent ID~ - common_title_host = Host~ - common_title_inventory = Inventory~ - common_title_inventorySummary = Inventory Summary~ - common_title_lastUpdated=Last Updated~ - common_title_lastUpdatedBy=Last Updated By~ - common_title_mashup=Mashup~ - common_title_metric = Metric~ - common_title_mixedGroups = Mixed Groups~ - common_title_mixedGroups_total=Mixed Group Total~ - common_title_name = Name~ - common_title_new_dashboard=New Dashboard~ - common_title_numeric_type=Numeric Type~ - common_title_operations=Operations~ - common_title_operations_range=Operation Range~ - common_title_over=Over~ - common_title_platform_total=Platform Total~ - common_title_plugin = Plugin~ - common_title_port = Port~ - common_title_recently_added = Recently Added Resources~ - common_title_recent_alerts = Recent Alerts~ - common_title_recent_operations=Recent Operations~ - common_title_remove_column=Remove Column~ - common_title_resource = Resource~ - common_title_resource_group = Resource Group~ - common_title_resource_inventory=Resource Inventory~ - common_title_resource_id=Resource ID~ - common_title_resource_name=Resource Name~ - common_title_scheduled_operations=Scheduled Operations~ - common_title_selected_resources=Selected Resources~ - common_title_server_total=Server Total~ - common_title_service_total=Service Total~ - common_title_settings=Settings~ - common_title_show=Show~ - common_title_start = Start~ - common_title_status=Status~ - common_title_tag_cloud=Tag Cloud~ - common_title_the=The - common_title_summary_counts=Summary Counts~ - common_title_timestamp =Date/Time~ - common_title_total=Total~ - common_title_type = Type~ - common_title_units = Units~ - common_title_user=User~ - common_title_value = Value~ - common_title_version = Version~ - common_title_view_mode=View Mode~ - common_title_web_address=Web Address~ - - # Common Messages - #-------------- - common_msg_areYouSure = Are You Sure?~ - common_msg_deleteConfirm = Are you sure you want to delete the # selected {0}?~ - common_msg_loading = Loading...~ - common_msg_noItemsToShow=No items to show~ - - # Common Values - #-------------- - common_val_no = No~ - common_val_no_lower = no~ - common_val_yes = Yes~ - common_val_yes_lower = yes~ - common_val_never=Never~ - common_val_na=N/A~ - - # Common Calendar - #-------------- - common_calendar_january_short=jan - common_calendar_february_short=feb - common_calendar_march_short=mar - common_calendar_april_short=apr - common_calendar_may_short=may - common_calendar_june_short=jun - common_calendar_july_short=jul - common_calendar_august_short=aug - common_calendar_september_short=sept - common_calendar_october_short=oct - common_calendar_november_short=nov - common_calendar_december_short=dec - - #=================== Widgets ===================== - - # Record Editor - #-------------- - widget_recordEditor_title_view = View {0} [{1}]~ - widget_recordEditor_title_edit = Edit {0} [{1}]~ - widget_recordEditor_title_new = Create New {0}~ - #// dup in common - widget_recordEditor_label_loading = Loading...~ - widget_recordEditor_error_invalidViewPath = Invalid view path: [{0}]~ - widget_recordEditor_error_noRecords = No records were returned - expected exactly one.~ - widget_recordEditor_error_multipleRecords = Multiple records were returned - expected exactly one.~ - widget_recordEditor_info_recordCreatedConcise = {0} created.~ - widget_recordEditor_info_recordCreatedDetailed = {0} [{1}] created.~ - widget_recordEditor_info_recordUpdatedConcise = {0} updated.~ - widget_recordEditor_info_recordUpdatedDetailed = {0} [{1}] updated.~ - widget_recordEditor_info_recordsDeletedConcise = {0} {1} deleted.~ - widget_recordEditor_info_recordsDeletedDetailed = {0} {1} deleted: {2}.~ - widget_recordEditor_error_unsupportedOperationType = Unsupported operation type: [{0}]~ - - # Resource Selector/Picker - #-------------------------------- - widget_resourceSelector_selectResource=Select a Resource~ - widget_resourceSelector_pleaseSelectResource=Please select a resource~ - widget_resourceSelector_selectMultipleResources=Select Resources~ - widget_resourceSelector_pleaseSelectMultipleResource=Please select one or more resources~ - widget_resourceSelector_groupCategory=Group Category~ - - # Resource Factory Wizard - #-------------------------------- - widget_resourceFactoryWizard_uploadInProgress=The upload is in progress... This can take several minutes to complete for large distribution files.~ - widget_resourceFactoryWizard_uploadFileStepName=Upload Resource Content File~ - widget_resourceFactoryWizard_uploadFailure=Failed to upload file~ - widget_resourceFactoryWizard_editConfigStepName=Edit Configuration~ - widget_resourceFactoryWizard_infoStepName=Resource Information~ - widget_resourceFactoryWizard_namePrompt=New Resource Name~ - widget_resourceFactoryWizard_templatePrompt=Connection Settings Template~ - widget_resourceFactoryWizard_contentTemplatePrompt=Deployment Time Configuration Templates~ - widget_resourceFactoryWizard_configTemplatePrompt=Resource Configuration Templates~ - widget_resourceFactoryWizard_archPrompt=Package Architecture~ - widget_resourceFactoryWizard_versionPrompt=Package Version~ - widget_resourceFactoryWizard_importWizardWindowTitle=Resource Import Wizard~ - widget_resourceFactoryWizard_importWizardTitle=Import Resource of Type [{0}]~ - widget_resourceFactoryWizard_importFailure=Failed to manually import resource~ - widget_resourceFactoryWizard_importSubmitted=A request to import a new resource of type [{0}] has been submitted~ - widget_resourceFactoryWizard_createWizardWindowTitle=Resource Create Wizard~ - widget_resourceFactoryWizard_createWizardTitle=Create New Resource of Type [{0}]~ - widget_resourceFactoryWizard_execute1=Failed to create a new resource - there is no package version~ - widget_resourceFactoryWizard_execute2=Failed to create a new resource~ - widget_resourceFactoryWizard_createSubmitType=A request to create a resource of type [{0}] has been submitted successfully.~ - widget_resourceFactoryWizard_createSubmit=A request to create a resource with the name of [{0}] has been submitted successfully.~ - widget_resourceFactoryWizard_failedToGetType=Failed to get backing package type for new resource~ - widget_resourceFactoryWizard_failedToDeleteVersion=Failed to delete package version while canceling a resource create~ - - #===================== Utils ====================== - - # Disambiguation Report Decorator - #------------------------------------------------- - util_disambiguationReportDecorator_pluginSuffix = ({0} plugin)~ - - # Monitoring Request Callback - #------------------------------------------ - util_monitoringRequestCallback_error_checkServerStatusFailure = Unable to determine login status - check Server status.~ - - # RPC Manager - #---------------------- - util_rpcManager_activeRequests = {0} Active Requests~ - - # User Permissions Manager - #-------------------------- - util_userPerm_loadFailGlobal = Failed to load your global permissions - none granted.~ - util_userPerm_loadFailGroup = Failed to load your permissions for Resource Group with id [{0}] - none granted.~ - util_userPerm_loadFailResource = Failed to load your permissions for Resource with id [{0}] - none granted.~ - - # User Session Manager - #-------------------------- - util_userSession_loadFailSubject = UserSessionManager: Failed to load user Subject~ - util_userSession_logoutFail = Failed to logout.~ - - # Error Handler - #-------------------- - util_errorHandler_nullException = exception was null~ - - # Widgets Field - #--------------------- - util_widgetsField_unlimited = Unlimited~ - - #================== DataSources ==================== - - # RPC (abstract) - #----------------------- - dataSource_rpc_error_transformRequestFailure = Failure in datasource while processing {0} request.~ - dataSource_rpc_error_unsupportedArrayFilterType = No support for passing array filters of type {0}.~ - dataSource_rpc_error_unsupportedEnumType = Please add an appropriate code block for enum {0} to RPCDataSource.getEnumArray(Class)~ - dataSource_rpc_yes = yes~ - dataSource_rpc_no = no~ - - # ContentRepositoryTree - #------ - dataSource_ContentRepoTree_error_load = Error loading repositories~ - dataSource_ContentRepoTree_field_parentId = Parent ID~ - - - # Users - #------ - ###### dup in common - dataSource_users_field_id = ID~ - dataSource_users_field_name = User Name~ - dataSource_users_field_ldap = LDAP Login?~ - dataSource_users_field_password = Password` - dataSource_users_field_passwordVerify = Verify Password~ - dataSource_users_field_firstName = First Name~ - dataSource_users_field_lastName = Last Name~ - dataSource_users_field_emailAddress = Email Address~ - dataSource_users_field_phoneNumber = Phone Number~ - dataSource_users_field_department = Department~ - dataSource_users_field_factive = Login Enabled?~ - - # Platforms - #------ - dataSource_platforms_field_cpu=CPU~ - dataSource_platforms_field_memory=Memory~ - dataSource_platforms_field_swap=Swap~ - - # Traits - #------ - dataSource_traits_field_primaryKey=Primary Key~ - dataSource_traits_field_definitionID=Definition ID~ - dataSource_traits_field_lastChanged=Last Changed~ - dataSource_traits_field_trait=Trait~ - dataSource_traits_group_field_groupId=Group ID~ - dataSource_traits_group_field_memberResource=Member Resource~ - - # Measurement OOBs - #--------------------------------- - dataSource_measurementOob_field_scheduleName = Metric~ - dataSource_measurementOob_field_resourceName = Resource~ - dataSource_measurementOob_field_parentName = Parent~ - dataSource_measurementOob_field_formattedBaseband = Band~ - dataSource_measurementOob_field_formattedOutlier = Outlier~ - dataSource_measurementOob_field_factor = Out of Range Factor (%)~ - dataSource_measurementOob_error_fetchFailure = Failed to load measurement OOB information~ - - # Measurements - #---------------------- - dataSource_definitions_loadFailed=Failed to load metric definitions~ - dataSource_schedules_loadFailed=Failed to load metric schedules~ - dataSource_schedules_field_resourceGroupId=Group ID~ - dataSource_definitions_loadFailed=Failed to load metric definitions~ - dataSource_schedules_loadFailed=Failed to load metric schedules~ - dataSource_schedules_field_resourceGroupId=Group ID~ - - dataSource_schedules_enableFailure_resource=Failed to enable the collection of [{0}] metrics for resource with ID [{1}]. The metrics were: [{2}]~ - dataSource_schedules_enableFailure_group=Failed to enable the collection of [{0}] metrics for group with ID [{1}]. The metrics were: [{2}]~ - - dataSource_schedules_enableSuccessful_concise=You have enabled the collection of [{0}] measurements~ - dataSource_schedules_enableSuccessful_full_resource=You have enabled the collection of [{0}] measurements for the resource with ID [{1}]. The enabled measurements are: [{2}]~ - dataSource_schedules_enableSuccessful_full_group=You have enabled the collection of [{0}] measurements for the resource group with ID [{1}]. The enabled measurements are: [{2}]~ - - dataSource_schedules_disableFailure_resource=Failed to disable the collection of [{0}] metrics for resource with ID [{1}]. The metrics were: [{2}]~ - dataSource_schedules_disableFailure_group=Failed to disable the collection of [{0}] metrics for resource group with ID [{1}]. The metrics were: [{2}]~ - - dataSource_schedules_disableSuccessful_concise=You have disabled the collection of [{0}] measurements~ - dataSource_schedules_disableSuccessful_full_resource=You have disabled the collection of [{0}] measurements for the resource with ID [{1}]. The disabled measurements are: [{2}]~ - dataSource_schedules_disableSuccessful_full_group=You have disabled the collection of [{0}] measurements for the resource group with ID [{1}]. The disabled measurements are: [{2}]~ - - dataSource_schedules_updateFailure_resource=Failed to set the collection interval of [{0}] metrics for resource with ID [{1}]. The metrics were: [{2}]. The collection interval was to be [{3}] seconds.~ - dataSource_schedules_updateFailure_group=Failed to set the collection interval of [{0}] metrics for resource group with ID [{1}]. The metrics were: [{2}]. The collection interval was to be [{3}] seconds.~ - - dataSource_schedules_updateSuccessful_concise=A new collection interval of [{0}] seconds has been set on [{1}] measurements~ - dataSource_schedules_updateSuccessful_full_resource=A new collection interval of [{0}] seconds has been set on [{1}] measurements for resource with ID [{2}]. The updated measurements are: [{3}]~ - dataSource_schedules_updateSuccessful_full_group=A new collection interval of [{0}] seconds has been set on [{1}] measurements for resource group with ID [{2}]. The updated measurements are: [{3}]~ - - - # Problem Resources - #------------------------------ - dataSource_problemResources_field_resource = Resource~ - dataSource_problemResources_field_location = Location~ - dataSource_problemResources_field_alerts = Alerts~ - dataSource_problemResources_field_available = Current Availability~ - dataSource_problemResources_error_fetchFailure = Failed to load Resources with alerts/unavailability.~ - - # Recent Operations - #---------------------------- - dataSource_recentOperations_field_resource = Resource~ - dataSource_recentOperations_field_location = Location~ - dataSource_recentOperations_field_operation = Operation~ - dataSource_recentOperations_field_time = Date/Time~ - dataSource_recentOperations_field_status = Status~ - dataSource_recentOperations_error_fetchFailure = Failed to load recently completed operations. - - # Scheduled Operations - #--------------------------------- - dataSource_scheduledOperations_field_resource = Resource~ - dataSource_scheduledOperations_field_location = Location~ - dataSource_scheduledOperations_field_operation = Operation~ - dataSource_scheduledOperations_field_time = Date/Time~ - dataSource_scheduledOperations_error_fetchFailure = Failed to load scheduled operations. - - # Operation History - #--------------------------- - dataSource_operationHistory_error_fetchFailure = Failure loading operation histories.~ - - # Configuration History - #------------------------------- - dataSource_configurationHistory_field_id = ID~ - dataSource_configurationHistory_field_resource = Resource~ - dataSource_configurationHistory_field_createdTime = Created~ - dataSource_configurationHistory_field_status = Status~ - dataSource_configurationHistory_field_subject = Subject~ - dataSource_configurationHistory_error_fetchFailure = Unable to load configuration history.~ - - - #********************************** VIEW-SPECIFIC ************************************* - - #================= Administration ================== - - view_admin_administration = Administration~ - view_admin_configuration = Configuration~ - view_admin_security = Security~ - view_admin_topology = Topology~ - - view_adminSecurity_users = Users~ - view_adminSecurity_roles = Roles~ - - view_adminTopology_affinityGroups = Affinity Groups~ - view_adminTopology_agents = Agents~ - view_adminTopology_partitionEvents = Partition Events~ - view_adminTopology_remoteAgentInstall = Remote Agent Install~ - view_adminTopology_servers = Servers~ - - view_adminConfig_downloads = Downloads~ - view_adminConfig_license = License~ - view_adminConfig_plugins = Plugins~ - view_adminConfig_systemSettings = System Settings~ - view_adminConfig_templates = Templates~ - - # Administration/Security/Users/# - #-------------------------------- - view_adminUsersDetails_dataTypeName = user~ - - # Administration/Topology/RemoteAgentInstall/# - view_remoteAgentInstall_agentStatus = Agent Status~ - view_remoteAgentInstall_agentStatusDefault = -Click Update Status Button-~ - view_remoteAgentInstall_connInfo = Connection Information~ - view_remoteAgentInstall_buttonFindAgent = Find Agent~ - view_remoteAgentInstall_error_1 = Error occurred while trying to find agent install path~ - view_remoteAgentInstall_error_2 = Could not find an agent installed when looking in common locations - view_remoteAgentInstall_error_3 = Could not find an agent installed at or under [{0}] - view_remoteAgentInstall_error_4 = Failed to install agent~ - view_remoteAgentInstall_error_5 = Failed to start agent~ - view_remoteAgentInstall_error_6 = Failed to stop agent~ - - view_remoteAgentInstall_installAgent = Install Agent~ - view_remoteAgentInstall_installInfo = Agent Installation Information~ - view_remoteAgentInstall_installPath = Agent Install Path~ - view_remoteAgentInstall_promptInstallPath = Where the agent is or will be installed. If you aren''t sure where an agent is installed, enter a parent directory and click the ''Find Agent'' button to scan that directory and below. If you enter an empty path, common locations are searched on the host for an agent install.~ - view_remoteAgentInstall_promptHost = The host where the agent is or will be installed~ - view_remoteAgentInstall_promptPassword =The credentials that are used to authenticate the user on the host via SSH~ - view_remoteAgentInstall_promptPort = The port the SSH server is listening to. If not specified, the default is 22~ - view_remoteAgentInstall_promptUser = The name of the user whose credentials are passed to the host via SSH~ - view_remoteAgentInstall_startAgent = Start Agent~ - view_remoteAgentInstall_startAgentResults = Agent start results: [{0}]~ - view_remoteAgentInstall_stopAgent = Stop Agent~ - view_remoteAgentInstall_stopAgentResults = Agent stop results: [{0}]~ - view_remoteAgentInstall_success = Agent installation complete~ - view_remoteAgentInstall_updateStatus = Update Status~ - - - #jjj - - #-------------------------------- - view_adminUsersDetails_dataTypeName = user~ - - # Auto Discovery Queue - #---------------------------- - view_autoDiscoveryQ_title=Autodiscovery Queue~ - view_autoDiscoveryQ_import=Import~ - view_autoDiscoveryQ_ignore=Ignore~ - view_autoDiscoveryQ_ignored=Ignored~ - view_autoDiscoveryQ_unignore=Unignore~ - view_autoDiscoveryQ_new=New~ - view_autoDiscoveryQ_newAndIgnored=New and Ignored~ - view_autoDiscoveryQ_importFailure=Failed to import resources~ - view_autoDiscoveryQ_importSuccessful=You have successfully imported the selected resources.~ - view_autoDiscoveryQ_ignoreFailure=Failed to ignore resources~ - view_autoDiscoveryQ_ignoreSuccessful=You have successfully ignored the selected resources.~ - view_autoDiscoveryQ_unignoreFailure=Failed to unignore resources~ - view_autoDiscoveryQ_unignoreSuccessful=You have successfully unignored the selected resources.~ - view_autoDiscoveryQ_noperm=(Required manage inventory permissions missing. See Administrator to change)~ - view_autoDiscoveryQ_noItems=No items to show~ - view_autoDiscoveryQ_field_parentId=Parent ID~ - view_autoDiscoveryQ_field_name=Resource Name~ - view_autoDiscoveryQ_field_key=Resource Key~ - view_autoDiscoveryQ_field_discoveryTime=Discovery Time~ - view_autoDiscoveryQ_field_inventoryStatus=Inventory Status~ - view_autoDiscoveryQ_loadFailure=Failed to load the inventory discovery queue~ - - #==================== Bundles ====================== - view_bundle_bundles = Bundles~ - view_bundle_fileListView_bundleFiles=Bundle Files~ - view_bundle_fileListView_fileSize=File Size~ - view_bundle_fileListView_loadFailure=Failed to load bundle file data~ - view_bundle_version_bundleVersions=Bundle Versions~ - view_bundle_version_backToBundle=Back to Bundle~ - - #=================== Components ===================== - - view_configCompare_comparingConfigs = Comparing Configurations~ - view_configCompare_configCompare = Configuration Comparison~ - - view_configEdit_addItem = Add Item to List~ - view_configEdit_confirm_1 = Are you sure you want to delete the selected properties from the set?~ - view_configEdit_confirm_2 = Are you sure you want to delete this row?~ - view_configEdit_confirm_3 = Are you sure you want to delete the [{0}] selected [{1}]?~ - view_configEdit_editRow = Edit Configuration Row~ - view_configEdit_enterPropName = Enter the name of the property to be added.~ - view_configEdit_error_1 = Configuration is not supported by this Resource.~ - view_configEdit_error_2 = Connection settings are not supported by this Resource.~ - view_configEdit_error_3 = Cannot add property named [{0}]. The property name is already used in the set.~ - view_configEdit_files = Files~ - view_configEdit_hideAll= Hide All~ - view_configEdit_jumpToSection = Jump to Section~ - view_configEdit_msg_1 = Added property [{0}] to the set.~ - view_configEdit_msg_2 = Removed properties from the set.~ - view_configEdit_msg_3 = [{0} {1}] deleted from list.~ - view_configEdit_msg_4 = Item added to list.~ - view_configEdit_properties = Properties~ - view_configEdit_tooltip_1 = Delete the selected items from the list.~ - view_configEdit_tooltip_2 = Add an item to the list.~ - - view_groupConfigEdit_member = Member~ - view_groupConfigEdit_noListProps = List properties are not currently supported for group configurations.~ - view_groupConfigEdit_tooltip_1 = Member values differ - click icon to edit them.~ - view_groupConfigEdit_setAll = Set all values to:~ - view_groupConfigEdit_unset = Unset~ - view_groupConfigEdit_valsDiff = member values differ~ - view_groupConfigEdit_valsDiffForProp = Member Values for Property [{0}]~ - - view_leftNav_unknownPage = Unknown page name [{0}] for section [{1}] - URL is invalid.~ - - view_measure_nan = --no data available--~ - view_measureRange_day = 1 Day~ - view_measureRange_days = {0} Days~ - view_measureRange_hour = 1 Hour~ - view_measureRange_hours = {0} Hours~ - view_measureRange_last = Last~ - view_measureRange_minutes = {0} Minutes~ - view_measureRange_range = Range~ - view_measureRange_simple = Simple...~ - - view_selector_assigned = Assigned {0}~ - view_selector_available = Available {0}~ - - view_subTab_error_disabled = Cannot select disabled subTab [{0}].~ - - view_table_totalRows = Total Rows: {0} Selected: {1}~ - view_tableSection_backButton = Back to List~ - view_tableSection_error_noId = Table [{0}] record is missing 'id' attribute - please report this bug.~ - view_tableSection_error_badId = Can not show detail for [{0}]. Illegal 'id': [{1}]. Please report this bug~ - - view_tags_tags = Tags - view_tags_error_1 = Failed to load Tags~ - view_tags_title = Tags:~ - view_tags_tooltip_1 = Click to remove this Tag~ - view_tags_tooltip_2 = Click to edit Tags~ - view_tags_tooltip_3 = Enter a Tag in the format: (namespace:)(semantic=)tagname (e.g. it:env=QA, or owner=John) - - # File Upload (various) - view_upload_alreadyUploaded = File has already been uploaded~ - view_upload_bundleDistFile = Distribution File~ - view_upload_error_bundleDistFile = Error uploading Bundle Distribution File~ - view_upload_error_file = Error uploading file~ - view_upload_error_fileName = Error uploading file [{0}]~ - view_upload_error_fileName_2 = Error uploading file [{0}], check for invalid file path.~ - view_upload_error_packageVersionFile = Error uploading Package Version File~ - view_upload_error_results = Error uploading file, unexpected results: [{0}]~ - view_upload_inProgress = Can not submit, upload is currently in progress~ - view_upload_prompt_1 = [{0}] File to Upload~ - view_upload_prompt_2 = File to Upload~ - view_upload_tooltip_1 = Select a file to upload, then click Upload or Next~ - view_upload_tooltip_2 = File upload had previously failed~ - view_upload_success = File successfully uploaded~ - view_upload_upload = Upload~ - view_upload_uploadFile = UploadFile~ - - # Group Create Wizard - view_groupCreateWizard_membersStepName=Select Members~ - view_groupCreateWizard_createStepName=Group Settings~ - view_groupCreateWizard_createStep_recursive=Recursive~ - view_groupCreateWizard_title=Create Group~ - view_groupCreateWizard_windowTitle=Create Group~ - view_groupCreateWizard_createFailure=Failed to create the resource group~ - view_groupCreateWizard_createSuccessful_concise=You have created a new resource group. [<a href="{0}">View Group</a>]~ - view_groupCreateWizard_createSuccessful_full=You have created a new [{0}] resource group with the name [{1}] that contains [{2}] member resources~ - - # Resource Type / Plugin View/Datasources - view_type_resourceTypes=Resource Types~ - view_type_parentId=Parent ID~ - view_type_typeTreeLoadFailure=Failed to load resource type tree data~ - - #=================== Dashboard ===================== - view_dashboard_favorites_error1=Failed to load favorite Resources.~ - view_dashboardManager_error=Failed to save dashboard to server~ - view_dashboardManager_saved=Saved dashboard {0} to server~ - view_dashboardManager_success=Saved dashboard~ - view_dashboardManager_deleted=Successfully deleted dashboard {0}~ - view_dashboards_title=Dashboard~ - view_dashboards_confirm1=Are you sure you want to delete~ - view_dashboardsManager_error1=Failed to add new dashboard~ - // dup in common - view_dashboardsManager_inventory_title=Inventory Summary~ - view_dashboardsManager_mashup_title=RHQ News~ - view_dashboardsManager_message_title=Welcome To RHQ~ - view_dashboardsManager_message_title_details=<h1>Welcome to RHQ</h1>\n<p>The RHQ project is an abstraction and plug-in based systems management suite that provides extensible and integrated systems management for multiple products and platforms across a set of core features. The project is designed with layered modules that provide a flexible architecture for deployment. It delivers a core user interface that delivers audited and historical management across an entire enterprise. A Server/Agent architecture provides remote management and plugins implement all specific support for managed products.</p>\n <p>This default dashboard can be edited by clicking the (edit mode) button above.</p>~ - view_dashboardsManager_tagcloud_title=Tag Cloud~ - view_portlet_autodiscovery_config_platform_selection = Number of platforms to display~ - view_portlet_autodiscovery_help_msg = This portlet offers the ability to import newly discovered resources into the inventory for monitoring and management or to ignore them from further action.~ - view_portlet_autodiscovery_title = Discovery Queue~ - view_portlet_favoriteResources_msg=This portlet displays your favorite resources~ - view_portlet_favoriteResources_title=Favorite Resources~ - view_portlet_generic_help=No help available for this portlet~ - view_portlet_generic_unconfigured=No settings available for this portlet~ - view_portlet_graph_configure_resource_graph=The resource to graph~ - view_portlet_graph_configure_metricDefinition_graph=The metric definition id to graph~ - view_portlet_graph_configure_title=Graph Config~ - view_portlet_graph_configure_title_desc=Configuration of the graph portlet~ - view_portlet_graph_help_msg = This Portlet supports the graphing of a resource metric.~ - view_portlet_graph_help_title = Graph Portlet~ - view_portlet_graph_help_unconfigured=This graph is unconfigured, click the settings button to configure.~ - view_portlet_graph_title = Resource Graph~ - view_portlet_inventory_error1=Failed to retrieve inventory summary~ - view_portlet_mashup_config_title=MashupPorlet Configuration~ - view_portlet_mashup_config_title_desc=The configuration settings for the mashup portlet.~ - view_portlet_mashup_help=This portlet can include a web page via an HTTP request into an iframe on the dashboard.~ - view_portlet_mashup_unconfigured=Page address not yet configured, click the settings button to setup this portlet.~ - view_portlet_message_config_title=MessagePortlet Configuration~ - view_portlet_message_config_title_desc=The configuration settings for the message portlet.~ - view_portlet_message_help=This portlet can display an HTML message on the dashboard.~ - view_portlet_message_title=Message~ - view_portlet_message_unconfigured=Message not yet configured, click the settings button to setup this portlet.~ - view_portlet_operations_config_completed_maximum=Maximum number of Completed operations to display.~ - view_portlet_operations_config_completed_enable=Whether to enable completed operations results grouping for dashboard.~ - view_portlet_operations_config_scheduled_enable=Whether to enable scheduled operations results grouping for dashboard.~ - view_portlet_operations_config_scheduled_maximum=Maximum number of Scheduled operations to display.~ - view_portlet_operations_config_completed=completed operations~ - view_portlet_operations_config_show_last=show Last~ - view_portlet_operations_config_show_next=show Next~ - view_portlet_operations_config_title=OperationsPortlet Configuration~ - view_portlet_operations_config_title_desc=The configuration settings for the Operations portlet.~ - view_portlet_operations_disabled=(Results currently disabled. Change settings to enable results.~ - view_portlet_operations_help_msg=This portlet displays both operations that have occurred and are scheduled to occur.~ - view_portlet_platform_help_msg = This portlet displays information about platforms in inventory.~ - view_portlet_platform_platform_error_1 = Failed to load platform metrics~ - view_portlet_platform_title = Platforms Summary~ - view_portlet_platform_type_error_1 = Could not load type data~ - view_portlet_problem_resources_config_display_maximum=Maximum number of Problem resources to display.~ - view_portlet_problem_resources_config_display_range=Show problem resources going back this many hours.~ - view_portlet_problem_resources_config_display_range2 = From {0} to {1}~ - view_portlet_problem_resources_config_problem_label=problem resources on dashboard.~ - view_portlet_problem_resources_config_title=ProblemResourcesPortlet Configuration~ - view_portlet_problem_resources_config_title_desc=The configuration settings for the Problem resources portlet.~ - view_portlet_problem_resources_help=This portlet displays resources that have reported alerts or Down availability.~ - view_portlet_problem_resources_title=Has Alerts or Currently Unavailable~ - view_portlet_recentAlerts_config_members=Select Members~ - view_portlet_recentAlerts_config_priority_label = priority Alerts,~ - view_portlet_recentAlerts_config_when=within the past~ - view_portlet_recentAlerts_help_msg = Displays recent alerts fired on resources visible to the current user login.~ - // dup in common - view_portlet_recentAlerts_title = Recent Alerts~ - view_portlet_recentlyAdded_approved_platforms=recently approved platforms on dashboard.~ - view_portlet_recentlyAdded_error1=Failed to load recently added resources~ - view_portlet_recentlyAdded_help_msg=This portlet displays resources that have recently been imported into the inventory.~ - view_portlet_recentlyAdded_title =Recently Added Portlet~ - view_portlet_tagCloud_help=portlet displays the relative tag counts in the system visible to the current user.~ - view_portlet_tagCloud_title=TagCloud~ - - #=================== Inventory ===================== - view_inventory_adq = Discovery Queue~ - view_inventory_sectionHelp = From this section, newly discovered Resources, inventoried Resources, and Groups can be viewed and managed.~ - view_inventory_cannotGetGlobalPerms = Could not determine global permissions - assuming none.~ - view_inventory_problemGroups=Problem Groups~ - view_inventory_collectionInterval=Collection Interval~ - view_inventory_mixed=mixed~ - view_inventory_downServers=Down Servers~ - view_inventory_groups = Groups~ - view_inventory_allGroups = All Groups~ - view_inventory_allResources = All Resources~ - view_inventory_platforms = Platforms~ - view_inventory_servers = Servers~ - view_inventory_services = Services~ - view_inventory_dynagroupDefs = Dynagroup Definitions~ - view_metric_traits=Traits~ - view_metric_viewTraitHistory=Value History for Trait [{0}]~ - view_inventory_eventHistory_groupEventHistory=Group Event History~ - view_inventory_eventHistory_resourceEventHistory=Resource Event History~ - view_inventory_eventHistory_sourceFilter=Source Filter~ - view_inventory_eventHistory_detailsFilter=Details Filter~ - view_inventory_eventHistory_severityFilter=Severity Filter~ - view_inventory_eventHistory_timestamp=Timestamp~ - view_inventory_eventHistory_severity=Severity~ - view_inventory_eventHistory_details=Details~ - view_inventory_eventHistory_sourceLocation=Source Location~ - view_inventory_eventHistory_deleteSuccessful=You have successfully deleted [{0}] events for [{1}]~ - view_inventory_eventHistory_deleteFailed=Failed to deleted selected events for [{0}]~ - view_inventory_eventHistory_purgeSuccessful=You have successfully purged [{0}] events for [{1}]~ - view_inventory_eventHistory_purgeFailed=Failed to purge events for [{0}]~ - view_inventory_eventDetails_loadFailed=An error occurred loading the event details~ - view_inventory_groups_resourceGroups=Resource Groups~ - view_inventory_groups_children=Children~ - view_inventory_groups_descendants=Descendants~ - view_inventory_groups_deleteSuccessful=You have successfully deleted the selected resource groups~ - view_inventory_groups_deleteFailed=Failed to delete the selected resource groups~ - view_inventory_groups_loadFailed=Failed to load group composite data~ - view_inventory_resource_loadFailed=Resource with id [{0}] does not exist or is not accessible~ - view_inventory_resources_deleteConfirm=Are you sure you want to delete the selected resources?~ - view_inventory_resources_deleteSuccessful=You have successfully deleted the selected resources~ - view_inventory_resources_deleteFailed=Failed to delete the selected resources~ - view_inventory_resources_loadFailed=Failed to load resource composite data~ - view_inventory_resources_title=Member Resources~ - view_inventory_resources_title_children=Child Resources~ - view_inventory_resources_title_members=Member Resources~ - view_resource_monitor_availability_loadFailed=Failed to load availability history~ - view_resource_monitor_graphs_noneAvailable=No graphs available~ - view_resource_monitor_graphs_loadFailed=Failed to load graph data~ - view_resource_monitor_graphs_lookupFailed=Failed to find resource for graph~ - view_resource_monitor_graph_instructions=Point your mouse to a data point on the chart~ - view_resource_monitor_graph_live_tooltip=Click for a live graph of current values~ - view_resource_monitor_detailed_graph_label=Detailed Graph~ - view_resource_monitor_calltime_title=Call Time Data~ - view_resource_monitor_calltime_destination=Call Destination~ - view_resource_monitor_calltime_count=Count~ - view_resource_monitor_calltime_minimum=Minimum~ - view_resource_monitor_calltime_average=Average~ - view_resource_monitor_calltime_maximum=Maximum~ - view_resource_monitor_calltime_total=Total~ - view_resource_monitor_calltime_loadFailed=Could not load call time data~ - view_resource_monitor_calltime_lookupFailed=Could not load resource for call time~ - view_resource_monitor_calltime_editFailed=Call time data can not be edited~ - view_resource_monitor_schedules_title=Resource Metric Collection Schedules~ - view_tree_common_loadFailed_generic=Failed to load data for tree~ - view_tree_common_loadFailed_root=Failed to load root for tree~ - view_tree_common_loadFailed_descendants=Failed to load descendants for tree~ - view_tree_common_loadFailed_children=Failed to load children for node~ - view_tree_common_loadFailed_selection=Failed to select this node~ - view_tree_common_loadFailed_node=Failed to load data for this node~ - view_tree_common_loadFailed_create=Failed to create view for this node~ - view_tree_common_loadFailed_update=Failed to update view for this node~ - view_tree_common_contextMenu_type_name_label=Type: {0} - view_tree_common_contextMenu_pluginConfiguration=Plugin Configuration~ - view_tree_common_contextMenu_resourceConfiguration=Resource Configuration~ - view_tree_common_contextMenu_editPluginConfiguration=Edit [{0}] Plugin Configuration~ - view_tree_common_contextMenu_editResourceConfiguration=Edit [{0}] Resource Configuration~ - view_tree_common_contextMenu_operations=Operations~ - view_tree_common_contextMenu_operations_loadFailed=Failure to start wizard for running operations~ - view_tree_common_contextMenu_measurements=Measurements~ - view_tree_common_contextMenu_addChartToDashboard=Add chart to dashboard [{0}]~ - view_tree_common_contextMenu_chart=Chart~ - view_tree_common_contextMenu_saveChartToDashboardSuccessful=You have saved dashboard [{0}]~ - view_tree_common_contextMenu_saveChartToDashboardFailure=Failed to save the dashboard~ - view_tree_common_contextMenu_loadFailed_dashboard=Failed to load user dashboards - view_tree_common_contextMenu_loadFailed_manualAddChildren=Failed to load platform manual add children~ - view_tabs_common_summary=Summary~ - view_tabs_common_overview=Overview~ - view_tabs_common_dashboard=Dashboard~ - view_tabs_common_timeline=Timeline~ - view_tabs_common_monitoring=Monitoring~ - view_tabs_common_graphs=Graphs~ - view_tabs_common_tables=Tables~ - view_tabs_common_traits=Traits~ - view_tabs_common_availability=Availability~ - view_tabs_common_schedules=Schedules~ - view_tabs_common_calltime=Calltime~ - view_tabs_common_inventory=Inventory~ - view_tabs_common_groups=Groups~ - view_tabs_common_group_membership=Group Membership~ - view_tabs_common_members=Members~ - view_tabs_common_child_resources=Child Resources~ - view_tabs_common_child_history=Child History~ - view_tabs_common_connectionSettings=Connection Settings~ - view_tabs_common_connectionSettingsHistory=Connection Settings History~ - view_tabs_common_operations=Operations~ - view_tabs_common_history=History~ - view_tabs_common_scheduled=Scheduled~ - view_tabs_common_alerts=Alerts~ - view_tabs_common_definitions=Definitions~ - view_tabs_common_current=Current~ - view_tabs_common_events=Events~ - view_tabs_common_configuration=Configuration~ - view_tabs_common_content=Content~ - view_tabs_common_deployed=Deployed~ - view_tabs_common_new=New~ - view_tabs_common_subscriptions=Subscriptions~ - view_titleBar_common_updateTagsSuccessful=The tags for [{0}] have been updated~ - view_titleBar_common_updateTagsFailure=Failed to update the tags for [{0}]~ - view_titleBar_common_loadTagsFailure=Failed to load the tags for [{0}]~ - view_titleBar_common_clickToRemoveFav=Click to remove this as a favorite~ - view_titleBar_common_clickToAddFav=Click to add this as a favorite~ - view_titleBar_common_removedFav=You have removed [{0}] as one of your favorites~ - view_titleBar_common_addedFav=You have added [{0}] as a favorite~ - view_titleBar_common_removedFavFailure=Failed to remove [{0}] as one of your favorites~ - view_titleBar_common_addedFavFailure=Failed to add [{0}] as a favorite~ - view_dynagroup_expressionSet=Expression Set~ - view_dynagroup_recalculationInterval=Recalculation Interval~ - view_dynagroup_lastCalculationTime=Last Calculation Time~ - view_dynagroup_nextCalculationTime=Next Calculation Time~ - view_dynagroup_definitionCreated=You have successfully created a group definition named [{0}]~ - view_dynagroup_definitionLoadFailure=Failed to load group definitions~ - view_dynagroup_definitionAlreadyExists=A group definition already exists with this name~ - view_dynagroup_saveSuccessful=You have successfully saved the group definition named [{0}]~ - view_dynagroup_saveFailure=Failed to save the group definition named [{0}]~ - view_dynagroup_singleSaveFailure=An error occurred - there should have been one created, but instead there were [{0}] created~ - view_dynagroup_saveAndRecalculate=Save & Recalculate~ - view_dynagroup_recalculate=Recalculate~ - view_dynagroup_recalcSuccessful=You have successfully recalculated this group definition~ - view_dynagroup_recalcFailure=Failed to recalculated this group definition~ - view_dynagroup_recalcSuccessfulSelection=You have successfully recalculated [{0}] group definitions~ - view_dynagroup_recalcFailureSelection=Failed to recalculated the selected group definitions~ - view_dynagroup_deleteSuccessfulSelection=You have successfully deleted [{0}] group definitions~ - view_dynagroup_deleteFailureSelection=Failed to delete the selected group definitions~ - view_dynagroup_children=DynaGroup Children~ - view_dynagroup_newGroupDefinition=New Group Definition~ - view_dynagroup_editing=Editing [{0}]~ - view_dynagroup_expression=Expression~ - view_dynagroup_recursive=Recursive~ - view_dynagroup_loadDefinitionFailure=Failed to load group definition [{0}]~ - view_dynagroup_loadDefinitionMissing=There is no group definition with the ID of [{0}]~ - view_dynagroup_permUnknown=Could not determine if you have the proper permissions - access is denied~ - view_dynagroup_permDenied=You do not have permission to view group definitions~ - view_dynagroup_definitions=DynaGroup Definitions~ - view_group_membership_saveFailure=Failed to update membership of group [{0}]~ - view_group_membership_saveSuccessful=You have updated the membership of group [{0}]~ - view_group_resConfig_edit_saveTooltip=Update the configurations of all group members~ - view_group_resConfig_edit_noperm=You do not have permission to edit this group configuration~ - view_group_resConfig_edit_saveInitiated_concise=The group configuration updates have been initiated~ - view_group_resConfig_edit_saveInitiated_full=The group configuration updates have been initiated for the [{0}] compatible group named [{1}]~ - view_group_resConfig_edit_saveFailure=Failed to initiate group configuration update for [{0}] compatible group named [{1}]~ - view_group_resConfig_edit_valid=All configuration properties have valid values, so the configuration can now be saved~ - view_group_resConfig_edit_invalid=The following configuration properties have invalid values and must be corrected before the configuration can be saved: [{0}]~ - view_group_pluginConfig_view_noperm=You do not have permissions to see the connection settings~ - view_group_pluginConfig_view_groupProperties=Group Properties~ - view_group_pluginConfig_table_title=Group Connection Settings History~ - view_group_pluginConfig_table_statusDetails=Status Details~ - view_group_pluginConfig_table_viewSettings=View Settings~ - view_group_pluginConfig_table_viewMemberHistory=View Member History~ - view_group_pluginConfig_table_deleteSuccessful=You have deleted [{0}] history items~ - view_group_pluginConfig_table_deleteFailure=Failed to delete group plugin config history~ - view_group_pluginConfig_table_msg1=View Member History for status of each individual resource~ - view_group_pluginConfig_table_statusSuccess=This group configuration update was successful~ - view_group_pluginConfig_table_statusInprogress=This group configuration update is still in progress~ - view_group_pluginConfig_table_statusNochange=No changes were made to this group configuration~ - view_group_pluginConfig_table_statusFailure=This group configuration update failed~ - view_group_pluginConfig_table_clickStatusIcon=Click the status icon for full details~ - view_group_pluginConfig_members_title=Group Connection Settings Member Histories~ - view_group_pluginConfig_members_statusDetails=Status Details~ - view_group_pluginConfig_members_statusSuccess=This configuration update was successful~ - view_group_pluginConfig_members_statusInprogress=This configuration update is still in progress~ - view_group_pluginConfig_members_statusNochange=No changes were made to this configuration~ - view_group_pluginConfig_members_statusFailure=This configuration update failed for an unknown reason~ - view_group_pluginConfig_members_fetchFailure=Failed to get plugin config update history for members of group [{0}]~ - view_group_pluginConfig_edit_currentGroupProperties=Current Group Properties~ - view_group_pluginConfig_edit_saveTooltip=Update the connection settings of all group members~ - view_group_pluginConfig_edit_noperm=You do not have permission to edit this group connection settings~ - view_group_pluginConfig_edit_saveInitiated_concise=The group connection setting updates have been initiated~ - view_group_pluginConfig_edit_saveInitiated_full=The group connection setting updates have been initiated for the [{0}] compatible group named [{1}]~ - view_group_pluginConfig_edit_saveFailure=Failed to initiate group connection setting update for [{0}] compatible group named [{1}]~ - view_group_pluginConfig_edit_valid=All connection setting properties have valid values, so the connection settings can now be saved~ - view_group_pluginConfig_edit_invalid=The following connection setting properties have invalid values and must be corrected before the connection settings can be saved: [{0}]~ - view_group_meas_schedules_title=Group Metric Collection Schedules~ - view_group_summary_nameUpdateFailure=Failed to change the name of the resource group with ID [{0}] - could not change from [{1}] to [{2}]~ - view_group_summary_nameUpdateSuccessful=You have changed the name of the resource group with ID [{0}] from [{1}] to [{2}]~ - view_group_summary_memberType=Member Type~ - view_group_summary_memberCount=Member Count~ - view_group_summary_dynamic=Dynamic~ - view_group_summary_recursive=Recursive~ - view_group_summary_groupDefinition=Group Definition~ - view_group_summary_mixed=Mixed~ - view_group_summary_descUpdateFailure=Failed to change the description of the resource group with ID [{0}]~ - view_group_summary_descUpdateSuccessful=You have changed the description of this resource group~ - view_group_summary_dynamicNote=Dynamic group names and descriptions are managed, and therefore are not editable~ - - # Connection Settings Details - #------------------------------------------ - view_connectionSettingsDetails_noPermission = You do not have permission to edit this Resource''s connection settings.~ - view_connectionSettingsDetails_error_updateFailure = Failed to update connection settings.~ - view_connectionSettingsDetails_messageConcise_updateSuccess = Connection settings updated.~ - view_connectionSettingsDetails_messageDetailed_updateSuccess = Connection settings updated for Resource [{0}].~ - view_connectionSettingsDetails_allPropertiesValid = All connection settings have valid values, so the settings can now be saved.~ - view_connectionSettingsDetails_somePropertiesInvalid = The following connection settings have invalid values: {0}. The values must be corrected before the settings can be saved.~ - - # Resource Resource Groups - #----------------------------------------- - view_resourceResourceGroupList_error_fetchFailure = Failed to fetch Resource''s groups.~ - view_resourceResourceGroupList_error_updateFailure = Failed to update assigned Resource groups.~ - view_resourceResourceGroupList_message_updateSuccess = Group membership updated for [{0}]. - - # Configuration Details - #------------------------------- - view_configurationDetails_noPermission = You do not have permission to edit this Resource''s configuration.~ - view_configurationDetails_error_updateFailure = Failed to update configuration.~ - view_configurationDetails_messageConcise = Configuration updated.~ - view_configurationDetails_messageDetailed = Configuration updated for Resource [{0}].~ - view_configurationDetails_allPropertiesValid = All configuration properties have valid values, so the configuration can now be saved.~ - view_configurationDetails_somePropertiesInvalid = The following configuration properties have invalid values: {0}. The values must be corrected before the configuration can be saved.~ - - # Configuration History List - view_configurationHistoryList_title = Configuration History~ - view_configurationHistoryList_itemNamePlural = configuration history items - - # Configuration History Details - #------------------------------------------ - view_configurationHistoryDetails_dialogTitle = Configuration Details~ - view_configurationHistoryDetails_error_loadFailure = Unable to load configuration history.~ - - # Operation History List - #--------------------------------- - view_operationHistoryList_title = Operation History~ - view_operationHistoryList_button_runOperation = Run Operation~ - - # Operation History Details - #-------------------------------------- - view_operationHistoryDetails_error_fetchFailure = Failure loading operation history.~ - - # Operation Create Wizard - #------------------------------------- - view_operationCreateWizard_title = Operation Wizard~ - view_operationCreateWizard_header = Execute {0} on {1}~ - view_operationCreateWizard_button_execute = Execute~ - view_operationCreateWizard_button_executeImmediately = Execute Immediately~ - view_operationCreateWizard_error_scheduleOperationFailure = Failed to schedule operation execution.~ - view_operationCreateWizard_message_scheduleOperationSuccess = Schedule operation [{0}] on Resource [{1}] with cron string [{2}].~ - view_operationCreateWizard_parametersStep_name = Operation Parameters~ - view_operationCreateWizard_parametersStep_noParameters = This operation does not take any parameters.~ - view_operationCreateWizard_schedulingStep_name = Schedule~ - view_operationCreateWizard_schedulingStep_label_start = Start~ - view_operationCreateWizard_schedulingStep_label_schedule = Schedule~ - view_operationCreateWizard_schedulingStep_label_recurrence = Recurrence~ - view_operationCreateWizard_schedulingStep_label_runAt = Run At~ - view_operationCreateWizard_schedulingStep_label_nMinutes = n Minutes~ - view_operationCreateWizard_schedulingStep_label_hourly = Hourly~ - view_operationCreateWizard_schedulingStep_label_daily = Daily~ - view_operationCreateWizard_schedulingStep_label_weekly = Weekly~ - view_operationCreateWizard_schedulingStep_label_monthly = Monthly~ - view_operationCreateWizard_schedulingStep_label_timePeriod = Time Period~ - view_operationCreateWizard_schedulingStep_label_startDate = Start Date~ - view_operationCreateWizard_schedulingStep_label_recurrenceEnd = Recurrence End~ - view_operationCreateWizard_schedulingStep_label_endDate = End Date~ - view_operationCreateWizard_schedulingStep_label_willExecuteImmediately = Will execute immediately~ - view_operationCreateWizard_schedulingStep_label_onceAt = Once At~ - view_operationCreateWizard_schedulingStep_label_date = Date~ - view_operationCreateWizard_schedulingStep_label_time = Time~ - view_operationCreateWizard_schedulingStep_label_everyNMinutes = Every n Minutes~ - view_operationCreateWizard_schedulingStep_label_minuteInterval = Minute Interval~ - view_operationCreateWizard_schedulingStep_label_hourlyAt = Hourly At~ - view_operationCreateWizard_schedulingStep_label_minuteOfHour = Minute of Hour~ - view_operationCreateWizard_schedulingStep_label_dailyAt = Daily At~ - view_operationCreateWizard_schedulingStep_label_timeOfDay = Time of Day~ - view_operationCreateWizard_schedulingStep_label_weeklyOn = Weekly On~ - view_operationCreateWizard_schedulingStep_label_dayOfWeek = Day of Week~ - view_operationCreateWizard_schedulingStep_label_monthlyOn = Monthly On~ - view_operationCreateWizard_schedulingStep_label_dayOfMonth = Day of Month~ - - # Summary Overview Form - #------------------------------------- - view_summaryOverviewForm_field_type = Type~ - view_summaryOverviewForm_field_name = Name~ - view_summaryOverviewForm_field_description = Description~ - view_summaryOverviewForm_field_location = Location~ - view_summaryOverviewForm_field_version = Version~ - view_summaryOverviewForm_field_parent = Parent~ - - - #==================== Reports ====================== - - view_reportsTop_title = Reports~ - view_reportsTop_description = This section provides access to global reports.~ - view_reports_platforms = Cpu And Memory Utilization~ - view_reports_subsystems = Subsystems~ - - view_measurementOob_title = Suspect Metrics~ - - view_tagCloud_title = Tag Cloud~ - view_tagCloud_error_fetchFailure = Failed to load tags.~ - view_tagCloud_error_tagUsedCount = Tag used {0} times.~ - - view_taggedResources_title = Tagged Resources~ - - - #===================== Test ======================= - view_testTop_title = Test~ - view_testTop_description = This section contains pages for testing various GUI components.~ - - #=================== Top Level ===================== - - # About Box - #---------- - view_aboutBox_allRightsReserved = All Rights Reserved.~ - view_aboutBox_buildNumber = Build Number:~ - view_aboutBox_failedToLoad = Failed to load product information.~ - view_aboutBox_homepage = Homepage~ - view_aboutBox_jbossByRedHat = JBoss by Red Hat~ - view_aboutBox_title = About {0}~ - view_aboutBox_version = Version:~ - - # CoreGUI - #-------------- - view_core_error_1 = New Alerts lookup failed~ - view_core_loggedInAs = Logged in as {0}~ - view_core_loggedOut = Logged out~ - view_core_recentAlerts = [{0}] recent alerts~ - view_core_uncaught = Globally uncaught exception~ - - # Login - #-------------- - view_login_invalidEmail = Invalid e-mail address~ - view_login_login = Login~ - view_login_logout = Logout~ - view_login_noBackend = The backend datasource is unavailable.~ - view_login_noLdap = Note: Optional retrieval of ldap details unsuccessful. Manual entry is required.~ - view_login_noUser = The username or password provided does not match our records.~ - view_login_prompt = Please Login~ - view_login_registerLater = (Logout - Complete registration later.)~ - view_login_registerLdapSuccess = Succesfully registered the new LDAP User.~ - view_login_registerUser = Register User~ - view_login_welcome = Welcome to JBoss ON! <br/><br/> Enter/update the following fields to complete your registration process.<br/> Once you click "OK" you will be logged in.<br/><br/>~ - - - # Menu Bar - #-------------- - view_menuBar_help = Help~ - view_menuBar_logout = Logout~ - - # Search Bar, GUI - #----------------- - view_searchBar_search = Search~ - view_searchBar_resources = Resources~ - view_searchBar_resourceGroups = Resource Groups~ - # TODO: i18n pluralization - view_searchBar_welcomeMessage = search for {0}s~ - view_searchBar_defaultPattern = name your pattern~ - view_searchBar_error_selectSavedSearch = ''Error selecting saved search''~ - - view_searchGUI_loginStatus = Unable to determine login status, check server status~ - - # Message Center - #-------------------------- - view_messageCenter_button_messages = Messages~ - view_messageCenter_noRecentMessages = No Recent Messages~ - view_messageCenter_messageTitle= Message Center~ - view_messageCenter_messageSeverity= Severity~ - view_messageCenter_messageTime= Time~ - view_messageCenter_messageDetail= Detail~ +# +# RHQ GUI i18n Messages - English +################################### + +#************************************** SHARED **************************************** + +#=================== Common ===================== + +# +# Build Info +# +common_buildInfo_gwtVersion = ${gwt.version}~ + +# Button Labels +#-------------- +common_button_advanced = Advanced...~ +common_button_apply = Apply~ +common_button_cancel = Cancel~ +common_button_close = Close~ +common_button_compare = Compare~ +common_button_create_child = Create Child~ +common_button_delete = Delete~ +common_button_disable = Disable~ +common_button_enable = Enable~ +common_button_finish = Finish~ +common_button_import = Import~ +common_button_new = New~ +common_button_next = Next~ +common_button_ok = OK~ +common_button_previous = Previous~ +common_button_purgeAll=Purge All~ +common_button_refresh = "Refresh"~ +common_button_reset = Reset~ +common_button_save = Save~ +common_button_search = Search~ +common_button_showDetails = Show Details...~ +common_button_uninventory = Uninventory~ + +# Common Labels +#------------------------ +common_label_all = ALL~ +common_label_all_resources = all resources~ +common_label_day=day~ +common_label_days=days~ +common_label_hour=hour~ +common_label_hours=hours~ +common_label_item=item~ +common_label_items=items~ +common_label_milliseconds=milliseconds~ +common_label_minutes=minutes~ +common_label_month=month~ +common_label_search=Search~ +common_label_scheduled_operations=scheduled operations~ +common_label_seconds=seconds~ +common_label_selected_resources = selected resources~ +common_label_unlimited = unlimited~ +common_label_week=week~ + +# Common Titles +#-------------- +common_title_add_column=Add Column~ +common_title_add_portlet=Add Portlet~ +common_title_alert_range=Alert Range~ +common_title_availability = Availability~ +common_title_average_metrics=Average Metrics per Minute~ +common_title_available_resources=Available Resources~ +common_title_background=Background~ +common_title_category = Category~ +common_title_columns=Columns~ +common_title_configuration = Configuration~ +common_title_compatibleGroups = Compatible Groups~ +common_title_compatibleGroups_total=Compatible Group Total~ +common_title_custom=Custom~ +common_title_dashboard_name=Dashboard Name~ +common_title_dateCreated=Date Created~ +common_title_default=Default~ +common_title_description=Description~ +common_title_display=Display~ +common_title_display_name=Display Name~ +common_title_duration=Duration~ +common_title_edit_mode=Edit Mode~ +common_title_enabled=Enabled?~ +common_title_end = End~ +common_title_favorites=Favorites~ +common_title_generalProp = General Properties~ +common_title_group_def_total=Group Definition Total~ +common_title_icon = icon~ +common_title_id = ID~ +common_title_id_parent = Parent ID~ +common_title_host = Host~ +common_title_inventory = Inventory~ +common_title_inventorySummary = Inventory Summary~ +common_title_lastUpdated=Last Updated~ +common_title_lastUpdatedBy=Last Updated By~ +common_title_mashup=Mashup~ +common_title_metric = Metric~ +common_title_mixedGroups = Mixed Groups~ +common_title_mixedGroups_total=Mixed Group Total~ +common_title_name = Name~ +common_title_new_dashboard=New Dashboard~ +common_title_numeric_type=Numeric Type~ +common_title_operations=Operations~ +common_title_operations_range=Operation Range~ +common_title_over=Over~ +common_title_password = Password~ +common_title_path = Path~ +common_title_platform_total=Platform Total~ +common_title_plugin = Plugin~ +common_title_port = Port~ +common_title_recently_added = Recently Added Resources~ +common_title_recent_alerts = Recent Alerts~ +common_title_recent_operations=Recent Operations~ +common_title_remove_column=Remove Column~ +common_title_resource = Resource~ +common_title_resource_group = Resource Group~ +common_title_resource_inventory=Resource Inventory~ +common_title_resource_id=Resource ID~ +common_title_resource_name=Resource Name~ +common_title_scheduled_operations=Scheduled Operations~ +common_title_selected_resources=Selected Resources~ +common_title_server_total=Server Total~ +common_title_service_total=Service Total~ +common_title_settings=Settings~ +common_title_show=Show~ +common_title_start = Start~ +common_title_status=Status~ +common_title_summary=Summary~ +common_title_tag_cloud=Tag Cloud~ +common_title_the=The +common_title_summary_counts=Summary Counts~ +common_title_timestamp =Date/Time~ +common_title_total=Total~ +common_title_type = Type~ +common_title_units = Units~ +common_title_user=User~ +common_title_value = Value~ +common_title_version = Version~ +common_title_view_mode=View Mode~ +common_title_web_address=Web Address~ + +# Common Messages +#-------------- +common_msg_areYouSure = Are You Sure?~ +common_msg_deleteConfirm = Are you sure you want to delete the # selected {0}?~ +common_msg_loading = Loading...~ +common_msg_noItemsToShow=No items to show~ + +# Common Values +#-------------- +common_val_no = No~ +common_val_no_lower = no~ +common_val_yes = Yes~ +common_val_yes_lower = yes~ +common_val_never = Never~ +common_val_na = N/A~ +common_val_none = None~ + +# Common Calendar +#-------------- +common_calendar_january_short=jan~ +common_calendar_february_short=feb~ +common_calendar_march_short=mar~ +common_calendar_april_short=apr~ +common_calendar_may_short=may~ +common_calendar_june_short=jun~ +common_calendar_july_short=jul~ +common_calendar_august_short=aug~ +common_calendar_september_short=sept~ +common_calendar_october_short=oct~ +common_calendar_november_short=nov~ +common_calendar_december_short=dec~ + +#=================== Widgets ===================== + +# Record Editor +#-------------- +widget_recordEditor_title_view = View {0} [{1}]~ +widget_recordEditor_title_edit = Edit {0} [{1}]~ +widget_recordEditor_title_new = Create New {0}~ +# // dup in common +widget_recordEditor_label_loading = Loading...~ +widget_recordEditor_error_invalidViewPath = Invalid view path: [{0}]~ +widget_recordEditor_error_noRecords = No records were returned - expected exactly one.~ +widget_recordEditor_error_multipleRecords = Multiple records were returned - expected exactly one.~ +widget_recordEditor_info_recordCreatedConcise = {0} created.~ +widget_recordEditor_info_recordCreatedDetailed = {0} [{1}] created.~ +widget_recordEditor_info_recordUpdatedConcise = {0} updated.~ +widget_recordEditor_info_recordUpdatedDetailed = {0} [{1}] updated.~ +widget_recordEditor_info_recordsDeletedConcise = {0} {1} deleted.~ +widget_recordEditor_info_recordsDeletedDetailed = {0} {1} deleted: {2}.~ +widget_recordEditor_error_unsupportedOperationType = Unsupported operation type: [{0}]~ + +# Resource Selector/Picker +#-------------------------------- +widget_resourceSelector_selectResource=Select a Resource~ +widget_resourceSelector_pleaseSelectResource=Please select a resource~ +widget_resourceSelector_selectMultipleResources=Select Resources~ +widget_resourceSelector_pleaseSelectMultipleResource=Please select one or more resources~ +widget_resourceSelector_groupCategory=Group Category~ + +# Resource Factory Wizard +#-------------------------------- +widget_resourceFactoryWizard_uploadInProgress=The upload is in progress... This can take several minutes to complete for large distribution files.~ +widget_resourceFactoryWizard_uploadFileStepName=Upload Resource Content File~ +widget_resourceFactoryWizard_uploadFailure=Failed to upload file~ +widget_resourceFactoryWizard_editConfigStepName=Edit Configuration~ +widget_resourceFactoryWizard_infoStepName=Resource Information~ +widget_resourceFactoryWizard_namePrompt=New Resource Name~ +widget_resourceFactoryWizard_templatePrompt=Connection Settings Template~ +widget_resourceFactoryWizard_contentTemplatePrompt=Deployment Time Configuration Templates~ +widget_resourceFactoryWizard_configTemplatePrompt=Resource Configuration Templates~ +widget_resourceFactoryWizard_archPrompt=Package Architecture~ +widget_resourceFactoryWizard_versionPrompt=Package Version~ +widget_resourceFactoryWizard_importWizardWindowTitle=Resource Import Wizard~ +widget_resourceFactoryWizard_importWizardTitle=Import Resource of Type [{0}]~ +widget_resourceFactoryWizard_importFailure=Failed to manually import resource~ +widget_resourceFactoryWizard_importSubmitted=A request to import a new resource of type [{0}] has been submitted~ +widget_resourceFactoryWizard_createWizardWindowTitle=Resource Create Wizard~ +widget_resourceFactoryWizard_createWizardTitle=Create New Resource of Type [{0}]~ +widget_resourceFactoryWizard_execute1=Failed to create a new resource - there is no package version~ +widget_resourceFactoryWizard_execute2=Failed to create a new resource~ +widget_resourceFactoryWizard_createSubmitType=A request to create a resource of type [{0}] has been submitted successfully.~ +widget_resourceFactoryWizard_createSubmit=A request to create a resource with the name of [{0}] has been submitted successfully.~ +widget_resourceFactoryWizard_failedToGetType=Failed to get backing package type for new resource~ +widget_resourceFactoryWizard_failedToDeleteVersion=Failed to delete package version while canceling a resource create~ + +#===================== Utils ====================== + +# Disambiguation Report Decorator +#------------------------------------------------- +util_disambiguationReportDecorator_pluginSuffix = ({0} plugin)~ + +# Monitoring Request Callback +#------------------------------------------ +util_monitoringRequestCallback_error_checkServerStatusFailure = Unable to determine login status - check Server status.~ + +# RPC Manager +#---------------------- +util_rpcManager_activeRequests = {0} Active Requests~ + +# User Permissions Manager +#-------------------------- +util_userPerm_loadFailGlobal = Failed to load your global permissions - none granted.~ +util_userPerm_loadFailGroup = Failed to load your permissions for Resource Group with id [{0}] - none granted.~ +util_userPerm_loadFailResource = Failed to load your permissions for Resource with id [{0}] - none granted.~ + +# User Session Manager +#-------------------------- +util_userSession_loadFailSubject = UserSessionManager: Failed to load user Subject~ +util_userSession_logoutFail = Failed to logout.~ + +# Error Handler +#-------------------- +util_errorHandler_nullException = exception was null~ + +# Widgets Field +#--------------------- +util_widgetsField_unlimited = Unlimited~ + +#================== DataSources ==================== + +# RPC (abstract) +#----------------------- +dataSource_rpc_error_transformRequestFailure = Failure in datasource while processing {0} request.~ +dataSource_rpc_error_unsupportedArrayFilterType = No support for passing array filters of type {0}.~ +dataSource_rpc_error_unsupportedEnumType = Please add an appropriate code block for enum {0} to RPCDataSource.getEnumArray(Class)~ +dataSource_rpc_yes = yes~ +dataSource_rpc_no = no~ + +# ContentRepositoryTree +#------ +dataSource_ContentRepoTree_error_load = Error loading repositories~ +dataSource_ContentRepoTree_field_parentId = Parent ID~ + + +# Users +#------ +###### dup in common +dataSource_users_field_id = ID~ +dataSource_users_field_name = User Name~ +dataSource_users_field_ldap = LDAP Login?~ +dataSource_users_field_password = Password` +dataSource_users_field_passwordVerify = Verify Password~ +dataSource_users_field_firstName = First Name~ +dataSource_users_field_lastName = Last Name~ +dataSource_users_field_emailAddress = Email Address~ +dataSource_users_field_phoneNumber = Phone Number~ +dataSource_users_field_department = Department~ +dataSource_users_field_factive = Login Enabled?~ + +# Platforms +#------ +dataSource_platforms_field_cpu=CPU~ +dataSource_platforms_field_memory=Memory~ +dataSource_platforms_field_swap=Swap~ + +# Traits +#------ +dataSource_traits_field_primaryKey=Primary Key~ +dataSource_traits_field_definitionID=Definition ID~ +dataSource_traits_field_lastChanged=Last Changed~ +dataSource_traits_field_trait=Trait~ +dataSource_traits_group_field_groupId=Group ID~ +dataSource_traits_group_field_memberResource=Member Resource~ + +# Measurement OOBs +#--------------------------------- +dataSource_measurementOob_field_scheduleName = Metric~ +dataSource_measurementOob_field_resourceName = Resource~ +dataSource_measurementOob_field_parentName = Parent~ +dataSource_measurementOob_field_formattedBaseband = Band~ +dataSource_measurementOob_field_formattedOutlier = Outlier~ +dataSource_measurementOob_field_factor = Out of Range Factor (%)~ +dataSource_measurementOob_error_fetchFailure = Failed to load measurement OOB information~ + +# Measurements +#---------------------- +dataSource_definitions_loadFailed = Failed to load metric definitions~ +dataSource_schedules_loadFailed = Failed to load metric schedules~ +dataSource_schedules_field_resourceGroupId = Group ID~ + +dataSource_schedules_enableFailure_resource=Failed to enable the collection of [{0}] metrics for resource with ID [{1}]. The metrics were: [{2}]~ +dataSource_schedules_enableFailure_group=Failed to enable the collection of [{0}] metrics for group with ID [{1}]. The metrics were: [{2}]~ + +dataSource_schedules_enableSuccessful_concise=You have enabled the collection of [{0}] measurements~ +dataSource_schedules_enableSuccessful_full_resource=You have enabled the collection of [{0}] measurements for the resource with ID [{1}]. The enabled measurements are: [{2}]~ +dataSource_schedules_enableSuccessful_full_group=You have enabled the collection of [{0}] measurements for the resource group with ID [{1}]. The enabled measurements are: [{2}]~ + +dataSource_schedules_disableFailure_resource=Failed to disable the collection of [{0}] metrics for resource with ID [{1}]. The metrics were: [{2}]~ +dataSource_schedules_disableFailure_group=Failed to disable the collection of [{0}] metrics for resource group with ID [{1}]. The metrics were: [{2}]~ + +dataSource_schedules_disableSuccessful_concise=You have disabled the collection of [{0}] measurements~ +dataSource_schedules_disableSuccessful_full_resource=You have disabled the collection of [{0}] measurements for the resource with ID [{1}]. The disabled measurements are: [{2}]~ +dataSource_schedules_disableSuccessful_full_group=You have disabled the collection of [{0}] measurements for the resource group with ID [{1}]. The disabled measurements are: [{2}]~ + +dataSource_schedules_updateFailure_resource=Failed to set the collection interval of [{0}] metrics for resource with ID [{1}]. The metrics were: [{2}]. The collection interval was to be [{3}] seconds.~ +dataSource_schedules_updateFailure_group=Failed to set the collection interval of [{0}] metrics for resource group with ID [{1}]. The metrics were: [{2}]. The collection interval was to be [{3}] seconds.~ + +dataSource_schedules_updateSuccessful_concise=A new collection interval of [{0}] seconds has been set on [{1}] measurements~ +dataSource_schedules_updateSuccessful_full_resource=A new collection interval of [{0}] seconds has been set on [{1}] measurements for resource with ID [{2}]. The updated measurements are: [{3}]~ +dataSource_schedules_updateSuccessful_full_group=A new collection interval of [{0}] seconds has been set on [{1}] measurements for resource group with ID [{2}]. The updated measurements are: [{3}]~ + + +# Problem Resources +#------------------------------ +dataSource_problemResources_field_resource = Resource~ +dataSource_problemResources_field_location = Location~ +dataSource_problemResources_field_alerts = Alerts~ +dataSource_problemResources_field_available = Current Availability~ +dataSource_problemResources_error_fetchFailure = Failed to load Resources with alerts/unavailability.~ + +# Recent Operations +#---------------------------- +dataSource_recentOperations_field_resource = Resource~ +dataSource_recentOperations_field_location = Location~ +dataSource_recentOperations_field_operation = Operation~ +dataSource_recentOperations_field_time = Date/Time~ +dataSource_recentOperations_field_status = Status~ +dataSource_recentOperations_error_fetchFailure = Failed to load recently completed operations. + +# Scheduled Operations +#--------------------------------- +dataSource_scheduledOperations_field_resource = Resource~ +dataSource_scheduledOperations_field_location = Location~ +dataSource_scheduledOperations_field_operation = Operation~ +dataSource_scheduledOperations_field_time = Date/Time~ +dataSource_scheduledOperations_error_fetchFailure = Failed to load scheduled operations. + +# Operation History +#--------------------------- +dataSource_operationHistory_error_fetchFailure = Failure loading operation histories.~ + +# Configuration History +#------------------------------- +dataSource_configurationHistory_field_id = ID~ +dataSource_configurationHistory_field_resource = Resource~ +dataSource_configurationHistory_field_createdTime = Created~ +dataSource_configurationHistory_field_status = Status~ +dataSource_configurationHistory_field_subject = Subject~ +dataSource_configurationHistory_error_fetchFailure = Unable to load configuration history.~ + + +#********************************** VIEW-SPECIFIC ************************************* + +#================= Administration ================== + +view_admin_administration = Administration~ +view_admin_configuration = Configuration~ +view_admin_security = Security~ +view_admin_topology = Topology~ + +view_adminSecurity_users = Users~ +view_adminSecurity_roles = Roles~ + +view_adminTopology_affinityGroups = Affinity Groups~ +view_adminTopology_agents = Agents~ +view_adminTopology_partitionEvents = Partition Events~ +view_adminTopology_remoteAgentInstall = Remote Agent Install~ +view_adminTopology_servers = Servers~ + +view_adminConfig_downloads = Downloads~ +view_adminConfig_license = License~ +view_adminConfig_plugins = Plugins~ +view_adminConfig_systemSettings = System Settings~ +view_adminConfig_templates = Templates~ + +# Administration/Security/Users/# +#-------------------------------- +view_adminUsersDetails_dataTypeName = user~ + +# Administration/Security/Roles/# +#-------------------------------- +#jjj +view_adminRoles_globalPerms = Global Permissions~ +view_adminRoles_resourcePerms = Resource Permissions~ + +# Administration/Topology/RemoteAgentInstall/# +#-------------------------------- +view_remoteAgentInstall_agentStatus = Agent Status~ +view_remoteAgentInstall_agentStatusDefault = -Click Update Status Button-~ +view_remoteAgentInstall_connInfo = Connection Information~ +view_remoteAgentInstall_buttonFindAgent = Find Agent~ +view_remoteAgentInstall_error_1 = Error occurred while trying to find agent install path~ +view_remoteAgentInstall_error_2 = Could not find an agent installed when looking in common locations +view_remoteAgentInstall_error_3 = Could not find an agent installed at or under [{0}] +view_remoteAgentInstall_error_4 = Failed to install agent~ +view_remoteAgentInstall_error_5 = Failed to start agent~ +view_remoteAgentInstall_error_6 = Failed to stop agent~ + +view_remoteAgentInstall_installAgent = Install Agent~ +view_remoteAgentInstall_installInfo = Agent Installation Information~ +view_remoteAgentInstall_installPath = Agent Install Path~ +view_remoteAgentInstall_owner = Owner~ +view_remoteAgentInstall_promptInstallPath = Where the agent is or will be installed. If you aren''t sure where an agent is installed, enter a parent directory and click the ''Find Agent'' button to scan that directory and below. If you enter an empty path, common locations are searched on the host for an agent install.~ +view_remoteAgentInstall_promptHost = The host where the agent is or will be installed~ +view_remoteAgentInstall_promptPassword =The credentials that are used to authenticate the user on the host via SSH~ +view_remoteAgentInstall_promptPort = The port the SSH server is listening to. If not specified, the default is 22~ +view_remoteAgentInstall_promptUser = The name of the user whose credentials are passed to the host via SSH~ +view_remoteAgentInstall_result = Result~ +view_remoteAgentInstall_resultCode = ResultCode~ +view_remoteAgentInstall_startAgent = Start Agent~ +view_remoteAgentInstall_startAgentResults = Agent start results: [{0}]~ +view_remoteAgentInstall_step = Step~ +view_remoteAgentInstall_stopAgent = Stop Agent~ +view_remoteAgentInstall_stopAgentResults = Agent stop results: [{0}]~ +view_remoteAgentInstall_success = Agent installation complete~ +view_remoteAgentInstall_updateStatus = Update Status~ + + +# Auto Discovery Queue +#---------------------------- +view_autoDiscoveryQ_title=Autodiscovery Queue~ +view_autoDiscoveryQ_import=Import~ +view_autoDiscoveryQ_ignore=Ignore~ +view_autoDiscoveryQ_ignored=Ignored~ +view_autoDiscoveryQ_unignore=Unignore~ +view_autoDiscoveryQ_new=New~ +view_autoDiscoveryQ_newAndIgnored=New and Ignored~ +view_autoDiscoveryQ_importFailure=Failed to import resources~ +view_autoDiscoveryQ_importSuccessful=You have successfully imported the selected resources.~ +view_autoDiscoveryQ_ignoreFailure=Failed to ignore resources~ +view_autoDiscoveryQ_ignoreSuccessful=You have successfully ignored the selected resources.~ +view_autoDiscoveryQ_unignoreFailure=Failed to unignore resources~ +view_autoDiscoveryQ_unignoreSuccessful=You have successfully unignored the selected resources.~ +view_autoDiscoveryQ_noperm=(Required manage inventory permissions missing. See Administrator to change)~ +view_autoDiscoveryQ_noItems=No items to show~ +view_autoDiscoveryQ_field_parentId=Parent ID~ +view_autoDiscoveryQ_field_name=Resource Name~ +view_autoDiscoveryQ_field_key=Resource Key~ +view_autoDiscoveryQ_field_discoveryTime=Discovery Time~ +view_autoDiscoveryQ_field_inventoryStatus=Inventory Status~ +view_autoDiscoveryQ_loadFailure=Failed to load the inventory discovery queue~ + +#==================== Bundles ====================== + +# some common bundle terms +view_bundle_bundles = Bundles~ +view_bundle_deployments=Deployments~ +view_bundle_bundleVersions=Bundle Versions~ +view_bundle_bundleVersion=Bundle Version~ +view_bundle_versions=Versions~ +view_bundle_bundleFiles=Bundle Files~ +view_bundle_destinations=Destinations~ +view_bundle_files=Files~ +view_bundle_recipe=Recipe~ +view_bundle_bundleType=Bundle Type~ +view_bundle_deploy=Deploy~ +view_bundle_latestVersion=Latest Version~ + +# individual bundle views/wizards +view_bundle_fileListView_fileSize=File Size~ +view_bundle_fileListView_loadFailure=Failed to load bundle file data~ +view_bundle_version_backToBundle=Back to Bundle~ +view_bundle_version_bundleVersionTagUpdateFailure=Failed to update bundle version tags~ +view_bundle_version_bundleVersionTagUpdateSuccessful=You have successfully updated the bundle version tags~ +view_bundle_version_loadFailure=Failed to load bundle version~ +view_bundle_tree_loadFailure=Failed to load bundle data~ +view_bundle_revertWizard_title=Bundle Revert~ +view_bundle_revertWizard_windowTitle=Bundle Revert Wizard~ +view_bundle_revertWizard_getInfoStep_name=Provide Revert Information~ +view_bundle_revertWizard_getInfoStep_revertDeployName=Revert Deploy Name~ +view_bundle_revertWizard_getInfoStep_revertDeployDesc=Revert Deploy Description~ +view_bundle_revertWizard_getInfoStep_revertDeployDescFull=[REVERT From]\n{0}\n\n[REVERT To]\n{1}~ +view_bundle_revertWizard_getInfoStep_cleanDeploy=Clean Deployment? (this will delete an old, existing deploy directory prior to starting the revert deployment)~ +view_bundle_revertWizard_getInfoStep_getNameFailure=Failed to get revert deployment name~ +view_bundle_revertWizard_confirmStep_name=Revert Deployment Confirmation~ +view_bundle_revertWizard_confirmStep_noLiveDeployment=No live deployment was found for the destination [{0}]~ +view_bundle_revertWizard_confirmStep_noPriorDeployment=The live deployment [{0}] cannot be reverted because there is no prior deployment for the destination [{1}]~ +view_bundle_revertWizard_confirmStep_failedToFindLiveDeployment=Failed to find live deployment; cannot revert~ +view_bundle_revertWizard_confirmStep_liveDeployment=Live Deployment~ +view_bundle_revertWizard_confirmStep_prevDeployment=Previous Deployment~ +view_bundle_revertWizard_confirmStep_confirmation=Reverting Live Deployment to Previous Deployment. Click "Next" to continue...~ +view_bundle_revertWizard_revertStep_name=Deploy Bundle to Destination Platforms~ +view_bundle_revertWizard_revertStep_reverting=Reverting...~ +view_bundle_revertWizard_revertStep_scheduled=You have successfully scheduled the revert deployment!~ +view_bundle_revertWizard_revertStep_scheduledDetails=You have successfully scheduled to revert the bundle deployment [{0}] from resource group [{1}]~ +view_bundle_revertWizard_revertStep_scheduledFailure=Failed to schedule revert deployment!~ +view_bundle_list_deleteFailure=Failed to delete bundle [{0}]~ +view_bundle_list_deleteSuccessful=You deleted the bundle named [{0}]~ +view_bundle_list_loadFailure=Failed to load the bundle to be deployed [{0}]~ +view_bundle_list_singleLoadFailure=Failed to get a single bundle to be deployed [{0}]~ +view_bundle_list_versionsCount=Versions Count~ + +#=================== Components ===================== + +view_configCompare_comparingConfigs = Comparing Configurations~ +view_configCompare_configCompare = Configuration Comparison~ + +view_configEdit_addItem = Add Item to List~ +view_configEdit_confirm_1 = Are you sure you want to delete the selected properties from the set?~ +view_configEdit_confirm_2 = Are you sure you want to delete this row?~ +view_configEdit_confirm_3 = Are you sure you want to delete the [{0}] selected [{1}]?~ +view_configEdit_editRow = Edit Configuration Row~ +view_configEdit_enterPropName = Enter the name of the property to be added.~ +view_configEdit_error_1 = Configuration is not supported by this Resource.~ +view_configEdit_error_2 = Connection settings are not supported by this Resource.~ +view_configEdit_error_3 = Cannot add property named [{0}]. The property name is already used in the set.~ +view_configEdit_files = Files~ +view_configEdit_hideAll= Hide All~ +view_configEdit_jumpToSection = Jump to Section~ +view_configEdit_msg_1 = Added property [{0}] to the set.~ +view_configEdit_msg_2 = Removed properties from the set.~ +view_configEdit_msg_3 = [{0} {1}] deleted from list.~ +view_configEdit_msg_4 = Item added to list.~ +view_configEdit_properties = Properties~ +view_configEdit_tooltip_1 = Delete the selected items from the list.~ +view_configEdit_tooltip_2 = Add an item to the list.~ + +view_groupConfigEdit_member = Member~ +view_groupConfigEdit_noListProps = List properties are not currently supported for group configurations.~ +view_groupConfigEdit_tooltip_1 = Member values differ - click icon to edit them.~ +view_groupConfigEdit_setAll = Set all values to:~ +view_groupConfigEdit_unset = Unset~ +view_groupConfigEdit_valsDiff = member values differ~ +view_groupConfigEdit_valsDiffForProp = Member Values for Property [{0}]~ + +view_leftNav_unknownPage = Unknown page name [{0}] for section [{1}] - URL is invalid.~ + +view_measure_nan = --no data available--~ +view_measureRange_day = 1 Day~ +view_measureRange_days = {0} Days~ +view_measureRange_hour = 1 Hour~ +view_measureRange_hours = {0} Hours~ +view_measureRange_last = Last~ +view_measureRange_minutes = {0} Minutes~ +view_measureRange_range = Range~ +view_measureRange_simple = Simple...~ + +view_selector_assigned = Assigned {0}~ +view_selector_available = Available {0}~ + +view_subTab_error_disabled = Cannot select disabled subTab [{0}].~ + +view_table_totalRows = Total Rows: {0} Selected: {1}~ +view_tableSection_backButton = Back to List~ +view_tableSection_error_noId = Table [{0}] record is missing 'id' attribute - please report this bug.~ +view_tableSection_error_badId = Can not show detail for [{0}]. Illegal 'id': [{1}]. Please report this bug~ + +view_tags_tags = Tags +view_tags_error_1 = Failed to load Tags~ +view_tags_title = Tags:~ +view_tags_tooltip_1 = Click to remove this Tag~ +view_tags_tooltip_2 = Click to edit Tags~ +view_tags_tooltip_3 = Enter a Tag in the format: (namespace:)(semantic=)tagname (e.g. it:env=QA, or owner=John) + +# File Upload (various) +view_upload_alreadyUploaded = File has already been uploaded~ +view_upload_bundleDistFile = Distribution File~ +view_upload_error_bundleDistFile = Error uploading Bundle Distribution File~ +view_upload_error_file = Error uploading file~ +view_upload_error_fileName = Error uploading file [{0}]~ +view_upload_error_fileName_2 = Error uploading file [{0}], check for invalid file path.~ +view_upload_error_packageVersionFile = Error uploading Package Version File~ +view_upload_error_results = Error uploading file, unexpected results: [{0}]~ +view_upload_inProgress = Can not submit, upload is currently in progress~ +view_upload_prompt_1 = [{0}] File to Upload~ +view_upload_prompt_2 = File to Upload~ +view_upload_tooltip_1 = Select a file to upload, then click Upload or Next~ +view_upload_tooltip_2 = File upload had previously failed~ +view_upload_success = File successfully uploaded~ +view_upload_upload = Upload~ +view_upload_uploadFile = UploadFile~ + +# Group Create Wizard +view_groupCreateWizard_membersStepName=Select Members~ +view_groupCreateWizard_createStepName=Group Settings~ +view_groupCreateWizard_createStep_recursive=Recursive~ +view_groupCreateWizard_title=Create Group~ +view_groupCreateWizard_windowTitle=Create Group~ +view_groupCreateWizard_createFailure=Failed to create the resource group~ +view_groupCreateWizard_createSuccessful_concise=You have created a new resource group. [<a href="{0}">View Group</a>]~ +view_groupCreateWizard_createSuccessful_full=You have created a new [{0}] resource group with the name [{1}] that contains [{2}] member resources~ + +# Resource Type / Plugin View/Datasources +view_type_resourceTypes=Resource Types~ +view_type_parentId=Parent ID~ +view_type_typeTreeLoadFailure=Failed to load resource type tree data~ + +#=================== Dashboard ===================== +view_dashboard_favorites_error1=Failed to load favorite Resources.~ +view_dashboardManager_error=Failed to save dashboard to server~ +view_dashboardManager_saved=Saved dashboard {0} to server~ +view_dashboardManager_success=Saved dashboard~ +view_dashboardManager_deleted=Successfully deleted dashboard {0}~ +view_dashboards_title=Dashboard~ +view_dashboards_confirm1=Are you sure you want to delete~ +view_dashboardsManager_error1=Failed to add new dashboard~ +# // dup in common +view_dashboardsManager_inventory_title=Inventory Summary~ +view_dashboardsManager_mashup_title=RHQ News~ +view_dashboardsManager_message_title=Welcome To RHQ~ +view_dashboardsManager_message_title_details=<h1>Welcome to RHQ</h1>\n<p>The RHQ project is an abstraction and plug-in based systems management suite that provides extensible and integrated systems management for multiple products and platforms across a set of core features. The project is designed with layered modules that provide a flexible architecture for deployment. It delivers a core user interface that delivers audited and historical management across an entire enterprise. A Server/Agent architecture provides remote management and plugins implement all specific support for managed products.</p>\n <p>This default dashboard can be edited by clicking the (edit mode) button above.</p>~ +view_dashboardsManager_tagcloud_title=Tag Cloud~ +view_portlet_autodiscovery_config_platform_selection = Number of platforms to display~ +view_portlet_autodiscovery_help_msg = This portlet offers the ability to import newly discovered resources into the inventory for monitoring and management or to ignore them from further action.~ +view_portlet_autodiscovery_title = Discovery Queue~ +view_portlet_favoriteResources_msg=This portlet displays your favorite resources~ +view_portlet_favoriteResources_title=Favorite Resources~ +view_portlet_generic_help=No help available for this portlet~ +view_portlet_generic_unconfigured=No settings available for this portlet~ +view_portlet_graph_configure_resource_graph=The resource to graph~ +view_portlet_graph_configure_metricDefinition_graph=The metric definition id to graph~ +view_portlet_graph_configure_title=Graph Config~ +view_portlet_graph_configure_title_desc=Configuration of the graph portlet~ +view_portlet_graph_help_msg = This Portlet supports the graphing of a resource metric.~ +view_portlet_graph_help_title = Graph Portlet~ +view_portlet_graph_help_unconfigured=This graph is unconfigured, click the settings button to configure.~ +view_portlet_graph_title = Resource Graph~ +view_portlet_inventory_error1=Failed to retrieve inventory summary~ +view_portlet_mashup_config_title=MashupPorlet Configuration~ +view_portlet_mashup_config_title_desc=The configuration settings for the mashup portlet.~ +view_portlet_mashup_help=This portlet can include a web page via an HTTP request into an iframe on the dashboard.~ +view_portlet_mashup_unconfigured=Page address not yet configured, click the settings button to setup this portlet.~ +view_portlet_message_config_title=MessagePortlet Configuration~ +view_portlet_message_config_title_desc=The configuration settings for the message portlet.~ +view_portlet_message_help=This portlet can display an HTML message on the dashboard.~ +view_portlet_message_title=Message~ +view_portlet_message_unconfigured=Message not yet configured, click the settings button to setup this portlet.~ +view_portlet_operations_config_completed_maximum=Maximum number of Completed operations to display.~ +view_portlet_operations_config_completed_enable=Whether to enable completed operations results grouping for dashboard.~ +view_portlet_operations_config_scheduled_enable=Whether to enable scheduled operations results grouping for dashboard.~ +view_portlet_operations_config_scheduled_maximum=Maximum number of Scheduled operations to display.~ +view_portlet_operations_config_completed=completed operations~ +view_portlet_operations_config_show_last=show Last~ +view_portlet_operations_config_show_next=show Next~ +view_portlet_operations_config_title=OperationsPortlet Configuration~ +view_portlet_operations_config_title_desc=The configuration settings for the Operations portlet.~ +view_portlet_operations_disabled=(Results currently disabled. Change settings to enable results.~ +view_portlet_operations_help_msg=This portlet displays both operations that have occurred and are scheduled to occur.~ +view_portlet_platform_help_msg = This portlet displays information about platforms in inventory.~ +view_portlet_platform_platform_error_1 = Failed to load platform metrics~ +view_portlet_platform_title = Platforms Summary~ +view_portlet_platform_type_error_1 = Could not load type data~ +view_portlet_problem_resources_config_display_maximum=Maximum number of Problem resources to display.~ +view_portlet_problem_resources_config_display_range=Show problem resources going back this many hours.~ +view_portlet_problem_resources_config_display_range2 = From {0} to {1}~ +view_portlet_problem_resources_config_problem_label=problem resources on dashboard.~ +view_portlet_problem_resources_config_title=ProblemResourcesPortlet Configuration~ +view_portlet_problem_resources_config_title_desc=The configuration settings for the Problem resources portlet.~ +view_portlet_problem_resources_help=This portlet displays resources that have reported alerts or Down availability.~ +view_portlet_problem_resources_title=Has Alerts or Currently Unavailable~ +view_portlet_recentAlerts_config_members=Select Members~ +view_portlet_recentAlerts_config_priority_label = priority Alerts,~ +view_portlet_recentAlerts_config_when=within the past~ +view_portlet_recentAlerts_help_msg = Displays recent alerts fired on resources visible to the current user login.~ +# // dup in common +view_portlet_recentAlerts_title = Recent Alerts~ +view_portlet_recentlyAdded_approved_platforms=recently approved platforms on dashboard.~ +view_portlet_recentlyAdded_error1=Failed to load recently added resources~ +view_portlet_recentlyAdded_help_msg=This portlet displays resources that have recently been imported into the inventory.~ +view_portlet_recentlyAdded_title =Recently Added Portlet~ +view_portlet_tagCloud_help=portlet displays the relative tag counts in the system visible to the current user.~ +view_portlet_tagCloud_title=TagCloud~ + +#=================== Inventory ===================== +view_inventory_adq = Discovery Queue~ +view_inventory_sectionHelp = From this section, newly discovered Resources, inventoried Resources, and Groups can be viewed and managed.~ +view_inventory_cannotGetGlobalPerms = Could not determine global permissions - assuming none.~ +view_inventory_problemGroups=Problem Groups~ +view_inventory_collectionInterval=Collection Interval~ +view_inventory_mixed=mixed~ +view_inventory_downServers=Down Servers~ +view_inventory_groups = Groups~ +view_inventory_allGroups = All Groups~ +view_inventory_allResources = All Resources~ +view_inventory_platforms = Platforms~ +view_inventory_servers = Servers~ +view_inventory_services = Services~ +view_inventory_dynagroupDefs = Dynagroup Definitions~ +view_metric_traits=Traits~ +view_metric_viewTraitHistory=Value History for Trait [{0}]~ +view_inventory_eventHistory_groupEventHistory=Group Event History~ +view_inventory_eventHistory_resourceEventHistory=Resource Event History~ +view_inventory_eventHistory_sourceFilter=Source Filter~ +view_inventory_eventHistory_detailsFilter=Details Filter~ +view_inventory_eventHistory_severityFilter=Severity Filter~ +view_inventory_eventHistory_timestamp=Timestamp~ +view_inventory_eventHistory_severity=Severity~ +view_inventory_eventHistory_details=Details~ +view_inventory_eventHistory_sourceLocation=Source Location~ +view_inventory_eventHistory_deleteSuccessful=You have successfully deleted [{0}] events for [{1}]~ +view_inventory_eventHistory_deleteFailed=Failed to deleted selected events for [{0}]~ +view_inventory_eventHistory_purgeSuccessful=You have successfully purged [{0}] events for [{1}]~ +view_inventory_eventHistory_purgeFailed=Failed to purge events for [{0}]~ +view_inventory_eventDetails_loadFailed=An error occurred loading the event details~ +view_inventory_groups_resourceGroups=Resource Groups~ +view_inventory_groups_children=Children~ +view_inventory_groups_descendants=Descendants~ +view_inventory_groups_deleteSuccessful=You have successfully deleted the selected resource groups~ +view_inventory_groups_deleteFailed=Failed to delete the selected resource groups~ +view_inventory_groups_loadFailed=Failed to load group composite data~ +view_inventory_resource_loadFailed=Resource with id [{0}] does not exist or is not accessible~ +view_inventory_resources_deleteConfirm=Are you sure you want to delete the selected resources?~ +view_inventory_resources_deleteSuccessful=You have successfully deleted the selected resources~ +view_inventory_resources_deleteFailed=Failed to delete the selected resources~ +view_inventory_resources_loadFailed=Failed to load resource composite data~ +view_inventory_resources_title=Member Resources~ +view_inventory_resources_title_children=Child Resources~ +view_inventory_resources_title_members=Member Resources~ +view_resource_monitor_availability_loadFailed=Failed to load availability history~ +view_resource_monitor_graphs_noneAvailable=No graphs available~ +view_resource_monitor_graphs_loadFailed=Failed to load graph data~ +view_resource_monitor_graphs_lookupFailed=Failed to find resource for graph~ +view_resource_monitor_graph_instructions=Point your mouse to a data point on the chart~ +view_resource_monitor_graph_live_tooltip=Click for a live graph of current values~ +view_resource_monitor_detailed_graph_label=Detailed Graph~ +view_resource_monitor_calltime_title=Call Time Data~ +view_resource_monitor_calltime_destination=Call Destination~ +view_resource_monitor_calltime_count=Count~ +view_resource_monitor_calltime_minimum=Minimum~ +view_resource_monitor_calltime_average=Average~ +view_resource_monitor_calltime_maximum=Maximum~ +view_resource_monitor_calltime_total=Total~ +view_resource_monitor_calltime_loadFailed=Could not load call time data~ +view_resource_monitor_calltime_lookupFailed=Could not load resource for call time~ +view_resource_monitor_calltime_editFailed=Call time data can not be edited~ +view_resource_monitor_schedules_title=Resource Metric Collection Schedules~ +view_tree_common_loadFailed_generic=Failed to load data for tree~ +view_tree_common_loadFailed_root=Failed to load root for tree~ +view_tree_common_loadFailed_descendants=Failed to load descendants for tree~ +view_tree_common_loadFailed_children=Failed to load children for node~ +view_tree_common_loadFailed_selection=Failed to select this node~ +view_tree_common_loadFailed_node=Failed to load data for this node~ +view_tree_common_loadFailed_create=Failed to create view for this node~ +view_tree_common_loadFailed_update=Failed to update view for this node~ +view_tree_common_contextMenu_type_name_label=Type: {0} +view_tree_common_contextMenu_pluginConfiguration=Plugin Configuration~ +view_tree_common_contextMenu_resourceConfiguration=Resource Configuration~ +view_tree_common_contextMenu_editPluginConfiguration=Edit [{0}] Plugin Configuration~ +view_tree_common_contextMenu_editResourceConfiguration=Edit [{0}] Resource Configuration~ +view_tree_common_contextMenu_operations=Operations~ +view_tree_common_contextMenu_operations_loadFailed=Failure to start wizard for running operations~ +view_tree_common_contextMenu_measurements=Measurements~ +view_tree_common_contextMenu_addChartToDashboard=Add chart to dashboard [{0}]~ +view_tree_common_contextMenu_chart=Chart~ +view_tree_common_contextMenu_saveChartToDashboardSuccessful=You have saved dashboard [{0}]~ +view_tree_common_contextMenu_saveChartToDashboardFailure=Failed to save the dashboard~ +view_tree_common_contextMenu_loadFailed_dashboard=Failed to load user dashboards +view_tree_common_contextMenu_loadFailed_manualAddChildren=Failed to load platform manual add children~ +view_tabs_common_summary=Summary~ +view_tabs_common_overview=Overview~ +view_tabs_common_dashboard=Dashboard~ +view_tabs_common_timeline=Timeline~ +view_tabs_common_monitoring=Monitoring~ +view_tabs_common_graphs=Graphs~ +view_tabs_common_tables=Tables~ +view_tabs_common_traits=Traits~ +view_tabs_common_availability=Availability~ +view_tabs_common_schedules=Schedules~ +view_tabs_common_calltime=Calltime~ +view_tabs_common_inventory=Inventory~ +view_tabs_common_groups=Groups~ +view_tabs_common_group_membership=Group Membership~ +view_tabs_common_members=Members~ +view_tabs_common_child_resources=Child Resources~ +view_tabs_common_child_history=Child History~ +view_tabs_common_connectionSettings=Connection Settings~ +view_tabs_common_connectionSettingsHistory=Connection Settings History~ +view_tabs_common_operations=Operations~ +view_tabs_common_history=History~ +view_tabs_common_scheduled=Scheduled~ +view_tabs_common_alerts=Alerts~ +view_tabs_common_definitions=Definitions~ +view_tabs_common_current=Current~ +view_tabs_common_events=Events~ +view_tabs_common_configuration=Configuration~ +view_tabs_common_content=Content~ +view_tabs_common_deployed=Deployed~ +view_tabs_common_new=New~ +view_tabs_common_subscriptions=Subscriptions~ +view_titleBar_common_updateTagsSuccessful=The tags for [{0}] have been updated~ +view_titleBar_common_updateTagsFailure=Failed to update the tags for [{0}]~ +view_titleBar_common_loadTagsFailure=Failed to load the tags for [{0}]~ +view_titleBar_common_clickToRemoveFav=Click to remove this as a favorite~ +view_titleBar_common_clickToAddFav=Click to add this as a favorite~ +view_titleBar_common_removedFav=You have removed [{0}] as one of your favorites~ +view_titleBar_common_addedFav=You have added [{0}] as a favorite~ +view_titleBar_common_removedFavFailure=Failed to remove [{0}] as one of your favorites~ +view_titleBar_common_addedFavFailure=Failed to add [{0}] as a favorite~ +view_dynagroup_expressionSet=Expression Set~ +view_dynagroup_recalculationInterval=Recalculation Interval~ +view_dynagroup_lastCalculationTime=Last Calculation Time~ +view_dynagroup_nextCalculationTime=Next Calculation Time~ +view_dynagroup_definitionCreated=You have successfully created a group definition named [{0}]~ +view_dynagroup_definitionLoadFailure=Failed to load group definitions~ +view_dynagroup_definitionAlreadyExists=A group definition already exists with this name~ +view_dynagroup_saveSuccessful=You have successfully saved the group definition named [{0}]~ +view_dynagroup_saveFailure=Failed to save the group definition named [{0}]~ +view_dynagroup_singleSaveFailure=An error occurred - there should have been one created, but instead there were [{0}] created~ +view_dynagroup_saveAndRecalculate=Save & Recalculate~ +view_dynagroup_recalculate=Recalculate~ +view_dynagroup_recalcSuccessful=You have successfully recalculated this group definition~ +view_dynagroup_recalcFailure=Failed to recalculated this group definition~ +view_dynagroup_recalcSuccessfulSelection=You have successfully recalculated [{0}] group definitions~ +view_dynagroup_recalcFailureSelection=Failed to recalculated the selected group definitions~ +view_dynagroup_deleteSuccessfulSelection=You have successfully deleted [{0}] group definitions~ +view_dynagroup_deleteFailureSelection=Failed to delete the selected group definitions~ +view_dynagroup_children=DynaGroup Children~ +view_dynagroup_newGroupDefinition=New Group Definition~ +view_dynagroup_editing=Editing [{0}]~ +view_dynagroup_expression=Expression~ +view_dynagroup_recursive=Recursive~ +view_dynagroup_loadDefinitionFailure=Failed to load group definition [{0}]~ +view_dynagroup_loadDefinitionMissing=There is no group definition with the ID of [{0}]~ +view_dynagroup_permUnknown=Could not determine if you have the proper permissions - access is denied~ +view_dynagroup_permDenied=You do not have permission to view group definitions~ +view_dynagroup_definitions=DynaGroup Definitions~ +view_group_membership_saveFailure=Failed to update membership of group [{0}]~ +view_group_membership_saveSuccessful=You have updated the membership of group [{0}]~ +view_group_resConfig_edit_saveTooltip=Update the configurations of all group members~ +view_group_resConfig_edit_noperm=You do not have permission to edit this group configuration~ +view_group_resConfig_edit_saveInitiated_concise=The group configuration updates have been initiated~ +view_group_resConfig_edit_saveInitiated_full=The group configuration updates have been initiated for the [{0}] compatible group named [{1}]~ +view_group_resConfig_edit_saveFailure=Failed to initiate group configuration update for [{0}] compatible group named [{1}]~ +view_group_resConfig_edit_valid=All configuration properties have valid values, so the configuration can now be saved~ +view_group_resConfig_edit_invalid=The following configuration properties have invalid values and must be corrected before the configuration can be saved: [{0}]~ +view_group_pluginConfig_view_noperm=You do not have permissions to see the connection settings~ +view_group_pluginConfig_view_groupProperties=Group Properties~ +view_group_pluginConfig_table_title=Group Connection Settings History~ +view_group_pluginConfig_table_statusDetails=Status Details~ +view_group_pluginConfig_table_viewSettings=View Settings~ +view_group_pluginConfig_table_viewMemberHistory=View Member History~ +view_group_pluginConfig_table_deleteSuccessful=You have deleted [{0}] history items~ +view_group_pluginConfig_table_deleteFailure=Failed to delete group plugin config history~ +view_group_pluginConfig_table_msg1=View Member History for status of each individual resource~ +view_group_pluginConfig_table_statusSuccess=This group configuration update was successful~ +view_group_pluginConfig_table_statusInprogress=This group configuration update is still in progress~ +view_group_pluginConfig_table_statusNochange=No changes were made to this group configuration~ +view_group_pluginConfig_table_statusFailure=This group configuration update failed~ +view_group_pluginConfig_table_clickStatusIcon=Click the status icon for full details~ +view_group_pluginConfig_members_title=Group Connection Settings Member Histories~ +view_group_pluginConfig_members_statusDetails=Status Details~ +view_group_pluginConfig_members_statusSuccess=This configuration update was successful~ +view_group_pluginConfig_members_statusInprogress=This configuration update is still in progress~ +view_group_pluginConfig_members_statusNochange=No changes were made to this configuration~ +view_group_pluginConfig_members_statusFailure=This configuration update failed for an unknown reason~ +view_group_pluginConfig_members_fetchFailure=Failed to get plugin config update history for members of group [{0}]~ +view_group_pluginConfig_edit_currentGroupProperties=Current Group Properties~ +view_group_pluginConfig_edit_saveTooltip=Update the connection settings of all group members~ +view_group_pluginConfig_edit_noperm=You do not have permission to edit this group connection settings~ +view_group_pluginConfig_edit_saveInitiated_concise=The group connection setting updates have been initiated~ +view_group_pluginConfig_edit_saveInitiated_full=The group connection setting updates have been initiated for the [{0}] compatible group named [{1}]~ +view_group_pluginConfig_edit_saveFailure=Failed to initiate group connection setting update for [{0}] compatible group named [{1}]~ +view_group_pluginConfig_edit_valid=All connection setting properties have valid values, so the connection settings can now be saved~ +view_group_pluginConfig_edit_invalid=The following connection setting properties have invalid values and must be corrected before the connection settings can be saved: [{0}]~ +view_group_meas_schedules_title=Group Metric Collection Schedules~ +view_group_summary_nameUpdateFailure=Failed to change the name of the resource group with ID [{0}] - could not change from [{1}] to [{2}]~ +view_group_summary_nameUpdateSuccessful=You have changed the name of the resource group with ID [{0}] from [{1}] to [{2}]~ +view_group_summary_memberType=Member Type~ +view_group_summary_memberCount=Member Count~ +view_group_summary_dynamic=Dynamic~ +view_group_summary_recursive=Recursive~ +view_group_summary_groupDefinition=Group Definition~ +view_group_summary_mixed=Mixed~ +view_group_summary_descUpdateFailure=Failed to change the description of the resource group with ID [{0}]~ +view_group_summary_descUpdateSuccessful=You have changed the description of this resource group~ +view_group_summary_dynamicNote=Dynamic group names and descriptions are managed, and therefore are not editable~ + +# Connection Settings Details +#------------------------------------------ +view_connectionSettingsDetails_noPermission = You do not have permission to edit this Resource''s connection settings.~ +view_connectionSettingsDetails_error_updateFailure = Failed to update connection settings.~ +view_connectionSettingsDetails_messageConcise_updateSuccess = Connection settings updated.~ +view_connectionSettingsDetails_messageDetailed_updateSuccess = Connection settings updated for Resource [{0}].~ +view_connectionSettingsDetails_allPropertiesValid = All connection settings have valid values, so the settings can now be saved.~ +view_connectionSettingsDetails_somePropertiesInvalid = The following connection settings have invalid values: {0}. The values must be corrected before the settings can be saved.~ + +# Resource Resource Groups +#----------------------------------------- +view_resourceResourceGroupList_error_fetchFailure = Failed to fetch Resource''s groups.~ +view_resourceResourceGroupList_error_updateFailure = Failed to update assigned Resource groups.~ +view_resourceResourceGroupList_message_updateSuccess = Group membership updated for [{0}]. + +# Configuration Details +#------------------------------- +view_configurationDetails_noPermission = You do not have permission to edit this Resource''s configuration.~ +view_configurationDetails_error_updateFailure = Failed to update configuration.~ +view_configurationDetails_messageConcise = Configuration updated.~ +view_configurationDetails_messageDetailed = Configuration updated for Resource [{0}].~ +view_configurationDetails_allPropertiesValid = All configuration properties have valid values, so the configuration can now be saved.~ +view_configurationDetails_somePropertiesInvalid = The following configuration properties have invalid values: {0}. The values must be corrected before the configuration can be saved.~ + +# Configuration History List +view_configurationHistoryList_title = Configuration History~ +view_configurationHistoryList_itemNamePlural = configuration history items + +# Configuration History Details +#------------------------------------------ +view_configurationHistoryDetails_dialogTitle = Configuration Details~ +view_configurationHistoryDetails_error_loadFailure = Unable to load configuration history.~ + +# Operation History List +#--------------------------------- +view_operationHistoryList_title = Operation History~ +view_operationHistoryList_button_runOperation = Run Operation~ + +# Operation History Details +#-------------------------------------- +view_operationHistoryDetails_error_fetchFailure = Failure loading operation history.~ + +# Operation Create Wizard +#------------------------------------- +view_operationCreateWizard_title = Operation Wizard~ +view_operationCreateWizard_header = Execute {0} on {1}~ +view_operationCreateWizard_button_execute = Execute~ +view_operationCreateWizard_button_executeImmediately = Execute Immediately~ +view_operationCreateWizard_error_scheduleOperationFailure = Failed to schedule operation execution.~ +view_operationCreateWizard_message_scheduleOperationSuccess = Schedule operation [{0}] on Resource [{1}] with cron string [{2}].~ +view_operationCreateWizard_parametersStep_name = Operation Parameters~ +view_operationCreateWizard_parametersStep_noParameters = This operation does not take any parameters.~ +view_operationCreateWizard_schedulingStep_name = Schedule~ +view_operationCreateWizard_schedulingStep_label_start = Start~ +view_operationCreateWizard_schedulingStep_label_schedule = Schedule~ +view_operationCreateWizard_schedulingStep_label_recurrence = Recurrence~ +view_operationCreateWizard_schedulingStep_label_runAt = Run At~ +view_operationCreateWizard_schedulingStep_label_nMinutes = n Minutes~ +view_operationCreateWizard_schedulingStep_label_hourly = Hourly~ +view_operationCreateWizard_schedulingStep_label_daily = Daily~ +view_operationCreateWizard_schedulingStep_label_weekly = Weekly~ +view_operationCreateWizard_schedulingStep_label_monthly = Monthly~ +view_operationCreateWizard_schedulingStep_label_timePeriod = Time Period~ +view_operationCreateWizard_schedulingStep_label_startDate = Start Date~ +view_operationCreateWizard_schedulingStep_label_recurrenceEnd = Recurrence End~ +view_operationCreateWizard_schedulingStep_label_endDate = End Date~ +view_operationCreateWizard_schedulingStep_label_willExecuteImmediately = Will execute immediately~ +view_operationCreateWizard_schedulingStep_label_onceAt = Once At~ +view_operationCreateWizard_schedulingStep_label_date = Date~ +view_operationCreateWizard_schedulingStep_label_time = Time~ +view_operationCreateWizard_schedulingStep_label_everyNMinutes = Every n Minutes~ +view_operationCreateWizard_schedulingStep_label_minuteInterval = Minute Interval~ +view_operationCreateWizard_schedulingStep_label_hourlyAt = Hourly At~ +view_operationCreateWizard_schedulingStep_label_minuteOfHour = Minute of Hour~ +view_operationCreateWizard_schedulingStep_label_dailyAt = Daily At~ +view_operationCreateWizard_schedulingStep_label_timeOfDay = Time of Day~ +view_operationCreateWizard_schedulingStep_label_weeklyOn = Weekly On~ +view_operationCreateWizard_schedulingStep_label_dayOfWeek = Day of Week~ +view_operationCreateWizard_schedulingStep_label_monthlyOn = Monthly On~ +view_operationCreateWizard_schedulingStep_label_dayOfMonth = Day of Month~ + +# Summary Overview Form +#------------------------------------- +view_summaryOverviewForm_field_type = Type~ +view_summaryOverviewForm_field_name = Name~ +view_summaryOverviewForm_field_description = Description~ +view_summaryOverviewForm_field_location = Location~ +view_summaryOverviewForm_field_version = Version~ +view_summaryOverviewForm_field_parent = Parent~ + + +#==================== Reports ====================== + +view_reportsTop_title = Reports~ +view_reportsTop_description = This section provides access to global reports.~ +view_reports_platforms = Cpu And Memory Utilization~ +view_reports_subsystems = Subsystems~ + +view_measurementOob_title = Suspect Metrics~ + +view_tagCloud_title = Tag Cloud~ +view_tagCloud_error_fetchFailure = Failed to load tags.~ +view_tagCloud_error_tagUsedCount = Tag used {0} times.~ + +view_taggedResources_title = Tagged Resources~ + + +#===================== Test ======================= +view_testTop_title = Test~ +view_testTop_description = This section contains pages for testing various GUI components.~ + +#=================== Top Level ===================== + +# About Box +#---------- +view_aboutBox_allRightsReserved = All Rights Reserved.~ +view_aboutBox_buildNumber = Build Number:~ +view_aboutBox_failedToLoad = Failed to load product information.~ +view_aboutBox_homepage = Homepage~ +view_aboutBox_jbossByRedHat = JBoss by Red Hat~ +view_aboutBox_title = About {0}~ +view_aboutBox_version = Version:~ + +# CoreGUI +#-------------- +view_core_error_1 = New Alerts lookup failed~ +view_core_loggedInAs = Logged in as {0}~ +view_core_loggedOut = Logged out~ +view_core_recentAlerts = [{0}] recent alerts~ +view_core_uncaught = Globally uncaught exception~ + +# Login +#-------------- +view_login_invalidEmail = Invalid e-mail address~ +view_login_login = Login~ +view_login_logout = Logout~ +view_login_noBackend = The backend datasource is unavailable.~ +view_login_noLdap = Note: Optional retrieval of ldap details unsuccessful. Manual entry is required.~ +view_login_noUser = The username or password provided does not match our records.~ +view_login_prompt = Please Login~ +view_login_registerLater = (Logout - Complete registration later.)~ +view_login_registerLdapSuccess = Succesfully registered the new LDAP User.~ +view_login_registerUser = Register User~ +view_login_welcome = Welcome to JBoss ON! <br/><br/> Enter/update the following fields to complete your registration process.<br/> Once you click "OK" you will be logged in.<br/><br/>~ + + +# Menu Bar +#-------------- +view_menuBar_help = Help~ +view_menuBar_logout = Logout~ + +# Search Bar, GUI +#----------------- +view_searchBar_search = Search~ +view_searchBar_resources = Resources~ +view_searchBar_resourceGroups = Resource Groups~ +# TODO: i18n pluralization +view_searchBar_welcomeMessage = search for {0}s~ +view_searchBar_defaultPattern = name your pattern~ +view_searchBar_error_selectSavedSearch = ''Error selecting saved search''~ + +view_searchGUI_loginStatus = Unable to determine login status, check server status~ + +# Message Center +#-------------------------- +view_messageCenter_button_messages = Messages~ +view_messageCenter_noRecentMessages = No Recent Messages~ +view_messageCenter_messageTitle = Message Center~ +view_messageCenter_messageSeverity = Severity~ +view_messageCenter_messageTime = Time~ +view_messageCenter_messageDetail = Detail~
commit 55268b8daaecb4fccdb548d17fb10683f8392cff Author: Ian Springer ian.springer@redhat.com Date: Thu Nov 18 10:41:45 2010 -0500
fix a couple issues that were causing CoreGUI module to fail to load
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java index 6b56f11..5f4ed59 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java @@ -92,7 +92,8 @@ public class CoreGUI implements EntryPoint, ValueChangeHandler<String> {
private static CoreGUI coreGUI;
- private static Messages messages; + public static Messages messages = GWT.create(Messages.class); + private static Message pendingMessage;
public void onModuleLoad() { @@ -128,8 +129,6 @@ public class CoreGUI implements EntryPoint, ValueChangeHandler<String> {
messageCenter = new MessageCenter();
- messages = GWT.create(Messages.class); - UserSessionManager.login();
// removing loading image, which can be seen if LoginView doesn't completely cover it 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 ad5550d..e8c6084 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 @@ -27,6 +27,7 @@ import java.util.List; import java.util.Map;
import com.allen_sauer.gwt.log.client.Log; +import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.History; import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.types.Overflow; @@ -48,6 +49,7 @@ import org.rhq.core.domain.dashboard.Dashboard; import org.rhq.core.domain.dashboard.DashboardPortlet; import org.rhq.enterprise.gui.coregui.client.BookmarkableView; import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.Messages; import org.rhq.enterprise.gui.coregui.client.ViewPath; import org.rhq.enterprise.gui.coregui.client.components.view.ViewName; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.inventory.queue.AutodiscoveryPortlet; @@ -70,6 +72,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; * @author Greg Hinkle */ public class DashboardsView extends LocatableVLayout implements BookmarkableView { + public static final ViewName VIEW_ID = new ViewName("Dashboard", MSG.view_dashboards_title());
private TabSet tabSet; @@ -78,7 +81,6 @@ public class DashboardsView extends LocatableVLayout implements BookmarkableView
private boolean editMode = false;
- private List<Dashboard> dashboards; private Map<String, Dashboard> dashboardsByName;
private DashboardView selectedDashboardView; @@ -116,8 +118,7 @@ public class DashboardsView extends LocatableVLayout implements BookmarkableView
private void updateDashboards(List<Dashboard> dashboards) { removeMembers(getMembers()); - this.dashboards = dashboards; - this.dashboardsByName = new HashMap(dashboards.size()); + this.dashboardsByName = new HashMap<String, Dashboard>(dashboards.size()); for (Dashboard dashboard : dashboards) { this.dashboardsByName.put(dashboard.getName(), dashboard); } @@ -326,4 +327,5 @@ public class DashboardsView extends LocatableVLayout implements BookmarkableView public Dashboard getDashboard() { return selectedDashboard; } + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/DashboardView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/DashboardView.java index 078c8e9..cb25a1d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/DashboardView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/DashboardView.java @@ -28,6 +28,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceSelectLi * @author Greg Hinkle */ public class DashboardView extends FullHTMLPane implements ResourceSelectListener { + private ResourceComposite resourceComposite;
public DashboardView(String locatorId, ResourceComposite resourceComposite) { @@ -49,4 +50,5 @@ public class DashboardView extends FullHTMLPane implements ResourceSelectListene this.resourceComposite = resourceComposite; setContentsURL("/rhq/resource/summary/overview-plain.xhtml?id=" + resourceComposite.getResource().getId()); } + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/OverviewForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/OverviewForm.java index 2479c87..bae72db 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/OverviewForm.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/OverviewForm.java @@ -42,7 +42,6 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTyp import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import com.google.gwt.user.client.rpc.AsyncCallback; -import com.smartgwt.client.util.SC; import com.smartgwt.client.widgets.form.fields.FormItem; import com.smartgwt.client.widgets.form.fields.HeaderItem; import com.smartgwt.client.widgets.form.fields.SpacerItem; @@ -86,13 +85,8 @@ public class OverviewForm extends EnhancedDynamicForm { EnumSet.of(ResourceTypeRepository.MetadataType.measurements), new ResourceTypeRepository.TypeLoadedCallback() { public void onTypesLoaded(ResourceType type) { - try { - buildForm(type); - loadTraitValues(); - } catch (Exception e) { - SC.say("Form load failure"); - e.printStackTrace(); - } + buildForm(type); + loadTraitValues(); } }); } @@ -122,7 +116,6 @@ public class OverviewForm extends EnhancedDynamicForm { } } ); - }
private void buildForm(ResourceType type) { @@ -146,7 +139,7 @@ public class OverviewForm extends EnhancedDynamicForm { headerItem.setValue("Summary"); formItems.add(headerItem);
- StaticTextItem typeItem = new StaticTextItem("type", "Type"); + StaticTextItem typeItem = new StaticTextItem("type", MSG.view_summaryOverviewForm_field_type()); typeItem.setTooltip("Plugin: " + type.getPlugin() + "\n<br>" + "Type: " + type.getName()); typeItem.setValue(type.getName() + " (" + type.getPlugin() + ")"); formItems.add(typeItem); @@ -156,7 +149,7 @@ public class OverviewForm extends EnhancedDynamicForm {
final FormItem nameItem = (modifiable) ? new TogglableTextItem() : new StaticTextItem(); nameItem.setName("name"); - nameItem.setTitle("Name"); + nameItem.setTitle(MSG.view_summaryOverviewForm_field_name()); nameItem.setValue(resource.getName()); if (nameItem instanceof TogglableTextItem) { TogglableTextItem togglableNameItem = (TogglableTextItem) nameItem; @@ -191,7 +184,7 @@ public class OverviewForm extends EnhancedDynamicForm {
final FormItem descriptionItem = (modifiable) ? new TogglableTextItem() : new StaticTextItem(); descriptionItem.setName("description"); - descriptionItem.setTitle("Description"); + descriptionItem.setTitle(MSG.view_summaryOverviewForm_field_description()); descriptionItem.setValue(resource.getDescription()); if (descriptionItem instanceof TogglableTextItem) { TogglableTextItem togglableDescriptionItem = (TogglableTextItem) descriptionItem; @@ -226,7 +219,7 @@ public class OverviewForm extends EnhancedDynamicForm {
final FormItem locationItem = (modifiable) ? new TogglableTextItem() : new StaticTextItem(); locationItem.setName("location"); - locationItem.setTitle("Location"); + locationItem.setTitle(MSG.view_summaryOverviewForm_field_location()); locationItem.setValue(resource.getLocation()); if (locationItem instanceof TogglableTextItem) { TogglableTextItem togglableNameItem = (TogglableTextItem) locationItem; @@ -260,10 +253,10 @@ public class OverviewForm extends EnhancedDynamicForm { formItems.add(locationItem);
- StaticTextItem versionItem = new StaticTextItem("version", "Version"); + StaticTextItem versionItem = new StaticTextItem("version", MSG.view_summaryOverviewForm_field_version()); formItems.add(versionItem);
- StaticTextItem parentItem = new StaticTextItem("parent", "Parent"); + StaticTextItem parentItem = new StaticTextItem("parent", MSG.view_summaryOverviewForm_field_parent()); formItems.add(parentItem);
for (MeasurementDefinition trait : traits) { @@ -296,4 +289,5 @@ public class OverviewForm extends EnhancedDynamicForm { ("<a href="#Resource/" + parentResource.getId() + "">" + parentResource.getName() + "</a>") : "<i>none</i>"); } + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/OverviewView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/OverviewView.java index b439d44..6b9115e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/OverviewView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/OverviewView.java @@ -40,12 +40,11 @@ import com.smartgwt.client.widgets.grid.events.CellClickHandler; */ public class OverviewView extends LocatableVLayout {
- private OverviewForm form; private Table errorsGrid;
public OverviewView(String locatorId, ResourceComposite resourceComposite) { super(locatorId); - form = new OverviewForm(extendLocatorId("form"), resourceComposite); + OverviewForm form = new OverviewForm(extendLocatorId("form"), resourceComposite); errorsGrid = new Table(extendLocatorId("errors"), "Detected errors", null, null, new String[] { ResourceErrorsDataSource.DETAIL_ID });
Resource resource = resourceComposite.getResource(); @@ -106,4 +105,5 @@ public class OverviewView extends LocatableVLayout { } }); } + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ResourceErrorsDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ResourceErrorsDataSource.java index c19f27f..104e714 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ResourceErrorsDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ResourceErrorsDataSource.java @@ -101,7 +101,7 @@ public class ResourceErrorsDataSource extends RPCDataSource<ResourceError> { ListGridRecord record = new ListGridRecord();
record.setAttribute(DETAIL_ID, from.getDetail()); - record.setAttribute(ERROR_TYPE_ID, from.getErrorType().toString()); + record.setAttribute(ERROR_TYPE_ID, from.getErrorType().name()); record.setAttribute(SUMMARY_ID, from.getSummary()); record.setAttribute(TIME_OCCURED_ID, new Date(from.getTimeOccurred()));
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 index 51b4fa5..61d1b25 100644 --- 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 @@ -1,11 +1,15 @@ package org.rhq.enterprise.gui.coregui.client.util.selenium;
-import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import com.google.gwt.core.client.GWT; + import org.rhq.enterprise.gui.coregui.client.Messages;
+/** + * TODO + */ public interface Locatable {
- Messages MSG = CoreGUI.getMessages(); + Messages MSG = GWT.create(Messages.class);
/** * Returns the locatorId. This can be useful for constructing more granular locatorIds. For example, if @@ -28,4 +32,5 @@ public interface Locatable { * @return the new, extended locatorId */ String extendLocatorId(String extension); + } diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml index dce2135..edc98de 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml @@ -90,7 +90,7 @@ the Constants, ConstantsWithLookup, and Messages class). Note, these other locales must have a file suffixed with _<locale>.properties in the same package/directory as the corresponding GWT i18n interface class resides.--> - <extend-property name="locale" values="de,fr"/> + <!--<extend-property name="locale" values="de,fr"/>-->
<entry-point class='org.rhq.enterprise.gui.coregui.client.CoreGUI'/> <entry-point class='org.rhq.enterprise.gui.coregui.client.SearchGUI'/> diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index 18d2094..f51c7fe 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -1,970 +1,1019 @@ -# -# RHQ GUI i18n Messages - English -################################### - -#************************************** SHARED **************************************** - -#=================== Common ===================== - -# -# Build Info -# -common_buildInfo_gwtVersion = ${gwt.version}~ - -# Button Labels -#-------------- -common_button_advanced = Advanced...~ -common_button_apply = Apply~ -common_button_cancel = Cancel~ -common_button_close = Close~ -common_button_compare = Compare~ -common_button_create_child = Create Child~ -common_button_delete = Delete~ -common_button_disable = Disable~ -common_button_enable = Enable~ -common_button_finish = Finish~ -common_button_import = Import~ -common_button_new = New~ -common_button_next = Next~ -common_button_ok = OK~ -common_button_previous = Previous~ -common_button_purgeAll=Purge All~ -common_button_refresh = "Refresh"~ -common_button_reset = Reset~ -common_button_save = Save~ -common_button_search = Search~ -common_button_showDetails = Show Details...~ -common_button_uninventory = Uninventory~ - -# Common Labels -#------------------------ -common_label_all = ALL~ -common_label_all_resources = all resources~ -common_label_day=day~ -common_label_days=days~ -common_label_hour=hour~ -common_label_hours=hours~ -common_label_item=item~ -common_label_items=items~ -common_label_milliseconds=milliseconds~ -common_label_minutes=minutes~ -common_label_month=month~ -common_label_search=Search~ -common_label_scheduled_operations=scheduled operations~ -common_label_seconds=seconds~ -common_label_selected_resources = selected resources~ -common_label_unlimited = unlimited~ -common_label_week=week~ - -# Common Titles -#-------------- -common_title_add_column=Add Column~ -common_title_add_portlet=Add Portlet~ -common_title_alert_range=Alert Range~ -common_title_availability = Availability~ -common_title_average_metrics=Average Metrics per Minute~ -common_title_available_resources=Available Resources~ -common_title_background=Background~ -common_title_category = Category~ -common_title_columns=Columns~ -common_title_compatibleGroups = Compatible Groups~ -common_title_compatibleGroups_total=Compatible Group Total~ -common_title_custom=Custom~ -common_title_dashboard_name=Dashboard Name~ -common_title_dateCreated=Date Created~ -common_title_default=Default~ -common_title_description=Description~ -common_title_display=Display~ -common_title_display_name=Display Name~ -common_title_duration=Duration~ -common_title_edit_mode=Edit Mode~ -common_title_enabled=Enabled?~ -common_title_end = End~ -common_title_favorites=Favorites~ -common_title_generalProp = General Properties~ -common_title_group_def_total=Group Definition Total~ -common_title_icon = icon~ -common_title_id = ID~ -common_title_id_parent = Parent ID~ -common_title_inventory = Inventory~ -common_title_inventorySummary = Inventory Summary~ -common_title_lastUpdated=Last Updated~ -common_title_lastUpdatedBy=Last Updated By~ -common_title_mashup=Mashup~ -common_title_metric = Metric~ -common_title_mixedGroups = Mixed Groups~ -common_title_mixedGroups_total=Mixed Group Total~ -common_title_name = Name~ -common_title_new_dashboard=New Dashboard~ -common_title_numeric_type=Numeric Type~ -common_title_operations=Operations~ -common_title_operations_range=Operation Range~ -common_title_over=Over~ -common_title_platform_total=Platform Total~ -common_title_plugin = Plugin~ -common_title_recently_added = Recently Added Resources~ -common_title_recent_alerts = Recent Alerts~ -common_title_recent_operations=Recent Operations~ -common_title_remove_column=Remove Column~ -common_title_resource = Resource~ -common_title_resource_group = Resource Group~ -common_title_resource_inventory=Resource Inventory~ -common_title_resource_id=Resource ID~ -common_title_resource_name=Resource Name~ -common_title_scheduled_operations=Scheduled Operations~ -common_title_selected_resources=Selected Resources~ -common_title_server_total=Server Total~ -common_title_service_total=Service Total~ -common_title_settings=Settings~ -common_title_show=Show~ -common_title_start = Start~ -common_title_status=Status~ -common_title_tag_cloud=Tag Cloud~ -common_title_the=The -common_title_summary_counts=Summary Counts~ -common_title_timestamp =Date/Time~ -common_title_total=Total~ -common_title_type = Type~ -common_title_units = Units~ -common_title_user=User~ -common_title_value = Value~ -common_title_version = Version~ -common_title_view_mode=View Mode~ -common_title_web_address=Web Address~ - -# Common Messages -#-------------- -common_msg_areYouSure = Are You Sure?~ -common_msg_deleteConfirm = Are you sure you want to delete the # selected {0}?~ -common_msg_loading = Loading...~ -common_msg_noItemsToShow=No items to show~ - -# Common Values -#-------------- -common_val_no = No~ -common_val_no_lower = no~ -common_val_yes = Yes~ -common_val_yes_lower = yes~ -common_val_never=Never~ -common_val_na=N/A~ - -# Common Calendar -#-------------- -common_calendar_january_short=jan -common_calendar_february_short=feb -common_calendar_march_short=mar -common_calendar_april_short=apr -common_calendar_may_short=may -common_calendar_june_short=jun -common_calendar_july_short=jul -common_calendar_august_short=aug -common_calendar_september_short=sept -common_calendar_october_short=oct -common_calendar_november_short=nov -common_calendar_december_short=dec - -#=================== Widgets ===================== - -# Record Editor -#-------------- -widget_recordEditor_title_view = View {0} [{1}]~ -widget_recordEditor_title_edit = Edit {0} [{1}]~ -widget_recordEditor_title_new = Create New {0}~ -#// dup in common -widget_recordEditor_label_loading = Loading...~ -widget_recordEditor_error_invalidViewPath = Invalid view path: [{0}]~ -widget_recordEditor_error_noRecords = No records were returned - expected exactly one.~ -widget_recordEditor_error_multipleRecords = Multiple records were returned - expected exactly one.~ -widget_recordEditor_info_recordCreatedConcise = {0} created.~ -widget_recordEditor_info_recordCreatedDetailed = {0} [{1}] created.~ -widget_recordEditor_info_recordUpdatedConcise = {0} updated.~ -widget_recordEditor_info_recordUpdatedDetailed = {0} [{1}] updated.~ -widget_recordEditor_info_recordsDeletedConcise = {0} {1} deleted.~ -widget_recordEditor_info_recordsDeletedDetailed = {0} {1} deleted: {2}.~ -widget_recordEditor_error_unsupportedOperationType = Unsupported operation type: [{0}]~ - -# Resource Selector/Picker -#-------------------------------- -widget_resourceSelector_selectResource=Select a Resource~ -widget_resourceSelector_pleaseSelectResource=Please select a resource~ -widget_resourceSelector_selectMultipleResources=Select Resources~ -widget_resourceSelector_pleaseSelectMultipleResource=Please select one or more resources~ -widget_resourceSelector_groupCategory=Group Category~ - -# Resource Factory Wizard -#-------------------------------- -widget_resourceFactoryWizard_uploadInProgress=The upload is in progress... This can take several minutes to complete for large distribution files.~ -widget_resourceFactoryWizard_uploadFileStepName=Upload Resource Content File~ -widget_resourceFactoryWizard_uploadFailure=Failed to upload file~ -widget_resourceFactoryWizard_editConfigStepName=Edit Configuration~ -widget_resourceFactoryWizard_infoStepName=Resource Information~ -widget_resourceFactoryWizard_namePrompt=New Resource Name~ -widget_resourceFactoryWizard_templatePrompt=Connection Settings Template~ -widget_resourceFactoryWizard_contentTemplatePrompt=Deployment Time Configuration Templates~ -widget_resourceFactoryWizard_configTemplatePrompt=Resource Configuration Templates~ -widget_resourceFactoryWizard_archPrompt=Package Architecture~ -widget_resourceFactoryWizard_versionPrompt=Package Version~ -widget_resourceFactoryWizard_importWizardWindowTitle=Resource Import Wizard~ -widget_resourceFactoryWizard_importWizardTitle=Import Resource of Type [{0}]~ -widget_resourceFactoryWizard_importFailure=Failed to manually import resource~ -widget_resourceFactoryWizard_importSubmitted=A request to import a new resource of type [{0}] has been submitted~ -widget_resourceFactoryWizard_createWizardWindowTitle=Resource Create Wizard~ -widget_resourceFactoryWizard_createWizardTitle=Create New Resource of Type [{0}]~ -widget_resourceFactoryWizard_execute1=Failed to create a new resource - there is no package version~ -widget_resourceFactoryWizard_execute2=Failed to create a new resource~ -widget_resourceFactoryWizard_createSubmitType=A request to create a resource of type [{0}] has been submitted successfully.~ -widget_resourceFactoryWizard_createSubmit=A request to create a resource with the name of [{0}] has been submitted successfully.~ -widget_resourceFactoryWizard_failedToGetType=Failed to get backing package type for new resource~ -widget_resourceFactoryWizard_failedToDeleteVersion=Failed to delete package version while canceling a resource create~ - -#===================== Utils ====================== - -# Disambiguation Report Decorator -#------------------------------------------------- -util_disambiguationReportDecorator_pluginSuffix = ({0} plugin)~ - -# Monitoring Request Callback -#------------------------------------------ -util_monitoringRequestCallback_error_checkServerStatusFailure = Unable to determine login status - check Server status.~ - -# RPC Manager -#---------------------- -util_rpcManager_activeRequests = {0} Active Requests~ - -# User Permissions Manager -#-------------------------- -util_userPerm_loadFailGlobal = Failed to load your global permissions - none granted.~ -util_userPerm_loadFailGroup = Failed to load your permissions for Resource Group with id [{0}] - none granted.~ -util_userPerm_loadFailResource = Failed to load your permissions for Resource with id [{0}] - none granted.~ - -# User Session Manager -#-------------------------- -util_userSession_loadFailSubject = UserSessionManager: Failed to load user Subject~ -util_userSession_logoutFail = Failed to logout.~ - -# Error Handler -#-------------------- -util_errorHandler_nullException = exception was null~ - -# Widgets Field -#--------------------- -util_widgetsField_unlimited = Unlimited~ - -#================== DataSources ==================== - -# RPC (abstract) -#----------------------- -dataSource_rpc_error_transformRequestFailure = Failure in datasource while processing {0} request.~ -dataSource_rpc_error_unsupportedArrayFilterType = No support for passing array filters of type {0}.~ -dataSource_rpc_error_unsupportedEnumType = Please add an appropriate code block for enum {0} to RPCDataSource.getEnumArray(Class)~ -dataSource_rpc_yes = yes~ -dataSource_rpc_no = no~ - -# ContentRepositoryTree -#------ -dataSource_ContentRepoTree_error_load = Error loading repositories~ -dataSource_ContentRepoTree_field_parentId = Parent ID~ - - -# Users -#------ -###### dup in common -dataSource_users_field_id = ID~ -dataSource_users_field_name = User Name~ -dataSource_users_field_ldap = LDAP Login?~ -dataSource_users_field_password = Password` -dataSource_users_field_passwordVerify = Verify Password~ -dataSource_users_field_firstName = First Name~ -dataSource_users_field_lastName = Last Name~ -dataSource_users_field_emailAddress = Email Address~ -dataSource_users_field_phoneNumber = Phone Number~ -dataSource_users_field_department = Department~ -dataSource_users_field_factive = Login Enabled?~ - -# Platforms -#------ -dataSource_platforms_field_cpu=CPU~ -dataSource_platforms_field_memory=Memory~ -dataSource_platforms_field_swap=Swap~ - -# Traits -#------ -dataSource_traits_field_primaryKey=Primary Key~ -dataSource_traits_field_definitionID=Definition ID~ -dataSource_traits_field_lastChanged=Last Changed~ -dataSource_traits_field_trait=Trait~ -dataSource_traits_group_field_groupId=Group ID~ -dataSource_traits_group_field_memberResource=Member Resource~ - -# Measurement OOBs -#--------------------------------- -dataSource_measurementOob_field_scheduleName = Metric~ -dataSource_measurementOob_field_resourceName = Resource~ -dataSource_measurementOob_field_parentName = Parent~ -dataSource_measurementOob_field_formattedBaseband = Band~ -dataSource_measurementOob_field_formattedOutlier = Outlier~ -dataSource_measurementOob_field_factor = Out of Range Factor (%)~ -dataSource_measurementOob_error_fetchFailure = Failed to load measurement OOB information~ - -# Measurements -#---------------------- -dataSource_definitions_loadFailed=Failed to load metric definitions~ -dataSource_schedules_loadFailed=Failed to load metric schedules~ -dataSource_schedules_field_resourceGroupId=Group ID~ -dataSource_definitions_loadFailed=Failed to load metric definitions~ -dataSource_schedules_loadFailed=Failed to load metric schedules~ -dataSource_schedules_field_resourceGroupId=Group ID~ - -dataSource_schedules_enableFailure_resource=Failed to enable the collection of [{0}] metrics for resource with ID [{1}]. The metrics were: [{2}]~ -dataSource_schedules_enableFailure_group=Failed to enable the collection of [{0}] metrics for group with ID [{1}]. The metrics were: [{2}]~ - -dataSource_schedules_enableSuccessful_concise=You have enabled the collection of [{0}] measurements~ -dataSource_schedules_enableSuccessful_full_resource=You have enabled the collection of [{0}] measurements for the resource with ID [{1}]. The enabled measurements are: [{2}]~ -dataSource_schedules_enableSuccessful_full_group=You have enabled the collection of [{0}] measurements for the resource group with ID [{1}]. The enabled measurements are: [{2}]~ - -dataSource_schedules_disableFailure_resource=Failed to disable the collection of [{0}] metrics for resource with ID [{1}]. The metrics were: [{2}]~ -dataSource_schedules_disableFailure_group=Failed to disable the collection of [{0}] metrics for resource group with ID [{1}]. The metrics were: [{2}]~ - -dataSource_schedules_disableSuccessful_concise=You have disabled the collection of [{0}] measurements~ -dataSource_schedules_disableSuccessful_full_resource=You have disabled the collection of [{0}] measurements for the resource with ID [{1}]. The disabled measurements are: [{2}]~ -dataSource_schedules_disableSuccessful_full_group=You have disabled the collection of [{0}] measurements for the resource group with ID [{1}]. The disabled measurements are: [{2}]~ - -dataSource_schedules_updateFailure_resource=Failed to set the collection interval of [{0}] metrics for resource with ID [{1}]. The metrics were: [{2}]. The collection interval was to be [{3}] seconds.~ -dataSource_schedules_updateFailure_group=Failed to set the collection interval of [{0}] metrics for resource group with ID [{1}]. The metrics were: [{2}]. The collection interval was to be [{3}] seconds.~ - -dataSource_schedules_updateSuccessful_concise=A new collection interval of [{0}] seconds has been set on [{1}] measurements~ -dataSource_schedules_updateSuccessful_full_resource=A new collection interval of [{0}] seconds has been set on [{1}] measurements for resource with ID [{2}]. The updated measurements are: [{3}]~ -dataSource_schedules_updateSuccessful_full_group=A new collection interval of [{0}] seconds has been set on [{1}] measurements for resource group with ID [{2}]. The updated measurements are: [{3}]~ - - -# Problem Resources -#------------------------------ -dataSource_problemResources_field_resource = Resource~ -dataSource_problemResources_field_location = Location~ -dataSource_problemResources_field_alerts = Alerts~ -dataSource_problemResources_field_available = Current Availability~ -dataSource_problemResources_error_fetchFailure = Failed to load Resources with alerts/unavailability.~ - -# Recent Operations -#---------------------------- -dataSource_recentOperations_field_resource = Resource~ -dataSource_recentOperations_field_location = Location~ -dataSource_recentOperations_field_operation = Operation~ -dataSource_recentOperations_field_time = Date/Time~ -dataSource_recentOperations_field_status = Status~ -dataSource_recentOperations_error_fetchFailure = Failed to load recently completed operations. - -# Scheduled Operations -#--------------------------------- -dataSource_scheduledOperations_field_resource = Resource~ -dataSource_scheduledOperations_field_location = Location~ -dataSource_scheduledOperations_field_operation = Operation~ -dataSource_scheduledOperations_field_time = Date/Time~ -dataSource_scheduledOperations_error_fetchFailure = Failed to load scheduled operations. - -# Operation History -#--------------------------- -dataSource_operationHistory_error_fetchFailure = Failure loading operation histories.~ - -# Configuration History -#------------------------------- -dataSource_configurationHistory_field_id = ID~ -dataSource_configurationHistory_field_resource = Resource~ -dataSource_configurationHistory_field_createdTime = Created~ -dataSource_configurationHistory_field_status = Status~ -dataSource_configurationHistory_field_subject = Subject~ -dataSource_configurationHistory_error_fetchFailure = Unable to load configuration history.~ - - -#********************************** VIEW-SPECIFIC ************************************* - -#================= Administration ================== - -view_admin_administration = Administration~ -view_admin_configuration = Configuration~ -view_admin_security = Security~ -view_admin_topology = Topology~ - -view_adminSecurity_users = Users~ -view_adminSecurity_roles = Roles~ - -view_adminTopology_affinityGroups = Affinity Groups~ -view_adminTopology_agents = Agents~ -view_adminTopology_partitionEvents = Partition Events~ -view_adminTopology_remoteAgentInstall = Remote Agent Install~ -view_adminTopology_servers = Servers~ - -view_adminConfig_downloads = Downloads~ -view_adminConfig_license = License~ -view_adminConfig_plugins = Plugins~ -view_adminConfig_systemSettings = System Settings~ -view_adminConfig_templates = Templates~ - -# Administration/Security/Users/# -#-------------------------------- -view_adminUsersDetails_dataTypeName = user~ - -# Auto Discovery Queue -#---------------------------- -view_autoDiscoveryQ_title=Autodiscovery Queue~ -view_autoDiscoveryQ_import=Import~ -view_autoDiscoveryQ_ignore=Ignore~ -view_autoDiscoveryQ_ignored=Ignored~ -view_autoDiscoveryQ_unignore=Unignore~ -view_autoDiscoveryQ_new=New~ -view_autoDiscoveryQ_newAndIgnored=New and Ignored~ -view_autoDiscoveryQ_importFailure=Failed to import resources~ -view_autoDiscoveryQ_importSuccessful=You have successfully imported the selected resources.~ -view_autoDiscoveryQ_ignoreFailure=Failed to ignore resources~ -view_autoDiscoveryQ_ignoreSuccessful=You have successfully ignored the selected resources.~ -view_autoDiscoveryQ_unignoreFailure=Failed to unignore resources~ -view_autoDiscoveryQ_unignoreSuccessful=You have successfully unignored the selected resources.~ -view_autoDiscoveryQ_noperm=(Required manage inventory permissions missing. See Administrator to change)~ -view_autoDiscoveryQ_noItems=No items to show~ -view_autoDiscoveryQ_field_parentId=Parent ID~ -view_autoDiscoveryQ_field_name=Resource Name~ -view_autoDiscoveryQ_field_key=Resource Key~ -view_autoDiscoveryQ_field_discoveryTime=Discovery Time~ -view_autoDiscoveryQ_field_inventoryStatus=Inventory Status~ -view_autoDiscoveryQ_loadFailure=Failed to load the inventory discovery queue~ - -#==================== Bundles ====================== -view_bundle_bundles = Bundles~ - -#=================== Components ===================== - -view_configCompare_comparingConfigs = Comparing Configurations~ -view_configCompare_configCompare = Configuration Comparison~ - -view_configEdit_addItem = Add Item to List~ -view_configEdit_confirm_1 = Are you sure you want to delete the selected properties from the set?~ -view_configEdit_confirm_2 = Are you sure you want to delete this row?~ -view_configEdit_confirm_3 = Are you sure you want to delete the [{0}] selected [{1}]?~ -view_configEdit_editRow = Edit Configuration Row~ -view_configEdit_enterPropName = Enter the name of the property to be added.~ -view_configEdit_error_1 = Configuration is not supported by this Resource.~ -view_configEdit_error_2 = Connection settings are not supported by this Resource.~ -view_configEdit_error_3 = Cannot add property named [{0}]. The property name is already used in the set.~ -view_configEdit_files = Files~ -view_configEdit_hideAll= Hide All~ -view_configEdit_jumpToSection = Jump to Section~ -view_configEdit_msg_1 = Added property [{0}] to the set.~ -view_configEdit_msg_2 = Removed properties from the set.~ -view_configEdit_msg_3 = [{0} {1}] deleted from list.~ -view_configEdit_msg_4 = Item added to list.~ -view_configEdit_properties = Properties~ -view_configEdit_tooltip_1 = Delete the selected items from the list.~ -view_configEdit_tooltip_2 = Add an item to the list.~ - -view_groupConfigEdit_member = Member~ -view_groupConfigEdit_noListProps = List properties are not currently supported for group configurations.~ -view_groupConfigEdit_tooltip_1 = Member values differ - click icon to edit them.~ -view_groupConfigEdit_setAll = Set all values to:~ -view_groupConfigEdit_unset = Unset~ -view_groupConfigEdit_valsDiff = member values differ~ -view_groupConfigEdit_valsDiffForProp = Member Values for Property [{0}]~ - -view_leftNav_unknownPage = Unknown page name [{0}] for section [{1}] - URL is invalid.~ - -view_measure_nan = --no data available--~ -view_measureRange_day = 1 Day~ -view_measureRange_days = {0} Days~ -view_measureRange_hour = 1 Hour~ -view_measureRange_hours = {0} Hours~ -view_measureRange_last = Last~ -view_measureRange_minutes = {0} Minutes~ -view_measureRange_range = Range~ -view_measureRange_simple = Simple...~ - -view_selector_assigned = Assigned {0}~ -view_selector_available = Available {0}~ - -view_subTab_error_disabled = Cannot select disabled subTab [{0}].~ - -view_table_totalRows = Total Rows: {0} Selected: {1}~ -view_tableSection_backButton = Back to List~ -view_tableSection_error_noId = Table [{0}] record is missing 'id' attribute - please report this bug.~ -view_tableSection_error_badId = Can not show detail for [{0}]. Illegal 'id': [{1}]. Please report this bug~ - -view_tags_tags = Tags -view_tags_error_1 = Failed to load Tags~ -view_tags_title = Tags:~ -view_tags_tooltip_1 = Click to remove this Tag~ -view_tags_tooltip_2 = Click to edit Tags~ -view_tags_tooltip_3 = Enter a Tag in the format: (namespace:)(semantic=)tagname (e.g. it:env=QA, or owner=John) - -# File Upload (various) -view_upload_alreadyUploaded = File has already been uploaded~ -view_upload_bundleDistFile = Distribution File~ -view_upload_error_bundleDistFile = Error uploading Bundle Distribution File~ -view_upload_error_file = Error uploading file~ -view_upload_error_fileName = Error uploading file [{0}]~ -view_upload_error_fileName_2 = Error uploading file [{0}], check for invalid file path.~ -view_upload_error_packageVersionFile = Error uploading Package Version File~ -view_upload_error_results = Error uploading file, unexpected results: [{0}]~ -view_upload_inProgress = Can not submit, upload is currently in progress~ -view_upload_prompt_1 = [{0}] File to Upload~ -view_upload_prompt_2 = File to Upload~ -view_upload_tooltip_1 = Select a file to upload, then click Upload or Next~ -view_upload_tooltip_2 = File upload had previously failed~ -view_upload_success = File successfully uploaded~ -view_upload_upload = Upload~ -view_upload_uploadFile = UploadFile~ - -# Group Create Wizard -view_groupCreateWizard_membersStepName=Select Members~ -view_groupCreateWizard_createStepName=Group Settings~ -view_groupCreateWizard_createStep_recursive=Recursive~ -view_groupCreateWizard_title=Create Group~ -view_groupCreateWizard_windowTitle=Create Group~ -view_groupCreateWizard_createFailure=Failed to create the resource group~ -view_groupCreateWizard_createSuccessful_concise=You have created a new resource group. [<a href="{0}">View Group</a>]~ -view_groupCreateWizard_createSuccessful_full=You have created a new [{0}] resource group with the name [{1}] that contains [{2}] member resources~ - -# Resource Type / Plugin View/Datasources -view_type_resourceTypes=Resource Types~ -view_type_parentId=Parent ID~ -view_type_typeTreeLoadFailure=Failed to load resource type tree data~ - -#=================== Dashboard ===================== -view_dashboard_favorites_error1=Failed to load favorite Resources.~ -view_dashboardManager_error=Failed to save dashboard to server~ -view_dashboardManager_saved=Saved dashboard {0} to server~ -view_dashboardManager_success=Saved dashboard~ -view_dashboardManager_deleted=Successfully deleted dashboard {0}~ -view_dashboards_title=Dashboard~ -view_dashboards_confirm1=Are you sure you want to delete~ -view_dashboardsManager_error1=Failed to add new dashboard~ -// dup in common -view_dashboardsManager_inventory_title=Inventory Summary~ -view_dashboardsManager_mashup_title=RHQ News~ -view_dashboardsManager_message_title=Welcome To RHQ~ -view_dashboardsManager_message_title_details=<h1>Welcome to RHQ</h1>\n<p>The RHQ project is an abstraction and plug-in based systems management suite that provides extensible and integrated systems management for multiple products and platforms across a set of core features. The project is designed with layered modules that provide a flexible architecture for deployment. It delivers a core user interface that delivers audited and historical management across an entire enterprise. A Server/Agent architecture provides remote management and plugins implement all specific support for managed products.</p>\n <p>This default dashboard can be edited by clicking the (edit mode) button above.</p>~ -view_dashboardsManager_tagcloud_title=Tag Cloud~ -view_portlet_autodiscovery_config_platform_selection = Number of platforms to display~ -view_portlet_autodiscovery_help_msg = This portlet offers the ability to import newly discovered resources into the inventory for monitoring and management or to ignore them from further action.~ -view_portlet_autodiscovery_title = Discovery Queue~ -view_portlet_favoriteResources_msg=This portlet displays your favorite resources~ -view_portlet_favoriteResources_title=Favorite Resources~ -view_portlet_generic_help=No help available for this portlet~ -view_portlet_generic_unconfigured=No settings available for this portlet~ -view_portlet_graph_configure_resource_graph=The resource to graph~ -view_portlet_graph_configure_metricDefinition_graph=The metric definition id to graph~ -view_portlet_graph_configure_title=Graph Config~ -view_portlet_graph_configure_title_desc=Configuration of the graph portlet~ -view_portlet_graph_help_msg = This Portlet supports the graphing of a resource metric.~ -view_portlet_graph_help_title = Graph Portlet~ -view_portlet_graph_help_unconfigured=This graph is unconfigured, click the settings button to configure.~ -view_portlet_graph_title = Resource Graph~ -view_portlet_inventory_error1=Failed to retrieve inventory summary~ -view_portlet_mashup_config_title=MashupPorlet Configuration~ -view_portlet_mashup_config_title_desc=The configuration settings for the mashup portlet.~ -view_portlet_mashup_help=This portlet can include a web page via an HTTP request into an iframe on the dashboard.~ -view_portlet_mashup_unconfigured=Page address not yet configured, click the settings button to setup this portlet.~ -view_portlet_message_config_title=MessagePortlet Configuration~ -view_portlet_message_config_title_desc=The configuration settings for the message portlet.~ -view_portlet_message_help=This portlet can display an HTML message on the dashboard.~ -view_portlet_message_title=Message~ -view_portlet_message_unconfigured=Message not yet configured, click the settings button to setup this portlet.~ -view_portlet_operations_config_completed_maximum=Maximum number of Completed operations to display.~ -view_portlet_operations_config_completed_enable=Whether to enable completed operations results grouping for dashboard.~ -view_portlet_operations_config_scheduled_enable=Whether to enable scheduled operations results grouping for dashboard.~ -view_portlet_operations_config_scheduled_maximum=Maximum number of Scheduled operations to display.~ -view_portlet_operations_config_completed=completed operations~ -view_portlet_operations_config_show_last=show Last~ -view_portlet_operations_config_show_next=show Next~ -view_portlet_operations_config_title=OperationsPortlet Configuration~ -view_portlet_operations_config_title_desc=The configuration settings for the Operations portlet.~ -view_portlet_operations_disabled=(Results currently disabled. Change settings to enable results.~ -view_portlet_operations_help_msg=This portlet displays both operations that have occurred and are scheduled to occur.~ -view_portlet_platform_help_msg = This portlet displays information about platforms in inventory.~ -view_portlet_platform_platform_error_1 = Failed to load platform metrics~ -view_portlet_platform_title = Platforms Summary~ -view_portlet_platform_type_error_1 = Could not load type data~ -view_portlet_problem_resources_config_display_maximum=Maximum number of Problem resources to display.~ -view_portlet_problem_resources_config_display_range=Show problem resources going back this many hours.~ -view_portlet_problem_resources_config_display_range2 = From {0} to {1}~ -view_portlet_problem_resources_config_problem_label=problem resources on dashboard.~ -view_portlet_problem_resources_config_title=ProblemResourcesPortlet Configuration~ -view_portlet_problem_resources_config_title_desc=The configuration settings for the Problem resources portlet.~ -view_portlet_problem_resources_help=This portlet displays resources that have reported alerts or Down availability.~ -view_portlet_problem_resources_title=Has Alerts or Currently Unavailable~ -view_portlet_recentAlerts_config_members=Select Members~ -view_portlet_recentAlerts_config_priority_label = priority Alerts,~ -view_portlet_recentAlerts_config_when=within the past~ -view_portlet_recentAlerts_help_msg = Displays recent alerts fired on resources visible to the current user login.~ -// dup in common -view_portlet_recentAlerts_title = Recent Alerts~ -view_portlet_recentlyAdded_approved_platforms=recently approved platforms on dashboard.~ -view_portlet_recentlyAdded_error1=Failed to load recently added resources~ -view_portlet_recentlyAdded_help_msg=This portlet displays resources that have recently been imported into the inventory.~ -view_portlet_recentlyAdded_title =Recently Added Portlet~ -view_portlet_tagCloud_help=portlet displays the relative tag counts in the system visible to the current user.~ -view_portlet_tagCloud_title=TagCloud~ - -#=================== Inventory ===================== -view_inventory_adq = Discovery Queue~ -view_inventory_sectionHelp = From this section, newly discovered Resources, inventoried Resources, and Groups can be viewed and managed.~ -view_inventory_cannotGetGlobalPerms = Could not determine global permissions - assuming none.~ -view_inventory_problemGroups=Problem Groups~ -view_inventory_collectionInterval=Collection Interval~ -view_inventory_mixed=mixed~ -view_inventory_downServers=Down Servers~ -view_inventory_groups = Groups~ -view_inventory_allGroups = All Groups~ -view_inventory_allResources = All Resources~ -view_inventory_platforms = Platforms~ -view_inventory_servers = Servers~ -view_inventory_services = Services~ -view_inventory_dynagroupDefs = Dynagroup Definitions~ -view_metric_traits=Traits~ -view_metric_viewTraitHistory=Value History for Trait [{0}]~ -view_inventory_eventHistory_groupEventHistory=Group Event History~ -view_inventory_eventHistory_resourceEventHistory=Resource Event History~ -view_inventory_eventHistory_sourceFilter=Source Filter~ -view_inventory_eventHistory_detailsFilter=Details Filter~ -view_inventory_eventHistory_severityFilter=Severity Filter~ -view_inventory_eventHistory_timestamp=Timestamp~ -view_inventory_eventHistory_severity=Severity~ -view_inventory_eventHistory_details=Details~ -view_inventory_eventHistory_sourceLocation=Source Location~ -view_inventory_eventHistory_deleteSuccessful=You have successfully deleted [{0}] events for [{1}]~ -view_inventory_eventHistory_deleteFailed=Failed to deleted selected events for [{0}]~ -view_inventory_eventHistory_purgeSuccessful=You have successfully purged [{0}] events for [{1}]~ -view_inventory_eventHistory_purgeFailed=Failed to purge events for [{0}]~ -view_inventory_eventDetails_loadFailed=An error occurred loading the event details~ -view_inventory_groups_resourceGroups=Resource Groups~ -view_inventory_groups_children=Children~ -view_inventory_groups_descendants=Descendants~ -view_inventory_groups_deleteSuccessful=You have successfully deleted the selected resource groups~ -view_inventory_groups_deleteFailed=Failed to delete the selected resource groups~ -view_inventory_groups_loadFailed=Failed to load group composite data~ -view_inventory_resource_loadFailed=Resource with id [{0}] does not exist or is not accessible~ -view_inventory_resources_deleteConfirm=Are you sure you want to delete the selected resources?~ -view_inventory_resources_deleteSuccessful=You have successfully deleted the selected resources~ -view_inventory_resources_deleteFailed=Failed to delete the selected resources~ -view_inventory_resources_loadFailed=Failed to load resource composite data~ -view_inventory_resources_title=Member Resources~ -view_inventory_resources_title_children=Child Resources~ -view_inventory_resources_title_members=Member Resources~ -view_resource_monitor_availability_loadFailed=Failed to load availability history~ -view_resource_monitor_graphs_noneAvailable=No graphs available~ -view_resource_monitor_graphs_loadFailed=Failed to load graph data~ -view_resource_monitor_graphs_lookupFailed=Failed to find resource for graph~ -view_resource_monitor_graph_instructions=Point your mouse to a data point on the chart~ -view_resource_monitor_graph_live_tooltip=Click for a live graph of current values~ -view_resource_monitor_detailed_graph_label=Detailed Graph~ -view_resource_monitor_calltime_title=Call Time Data~ -view_resource_monitor_calltime_destination=Call Destination~ -view_resource_monitor_calltime_count=Count~ -view_resource_monitor_calltime_minimum=Minimum~ -view_resource_monitor_calltime_average=Average~ -view_resource_monitor_calltime_maximum=Maximum~ -view_resource_monitor_calltime_total=Total~ -view_resource_monitor_calltime_loadFailed=Could not load call time data~ -view_resource_monitor_calltime_lookupFailed=Could not load resource for call time~ -view_resource_monitor_calltime_editFailed=Call time data can not be edited~ -view_resource_monitor_schedules_title=Resource Metric Collection Schedules~ -view_tree_common_loadFailed_generic=Failed to load data for tree~ -view_tree_common_loadFailed_root=Failed to load root for tree~ -view_tree_common_loadFailed_descendants=Failed to load descendants for tree~ -view_tree_common_loadFailed_children=Failed to load children for node~ -view_tree_common_loadFailed_selection=Failed to select this node~ -view_tree_common_loadFailed_node=Failed to load data for this node~ -view_tree_common_loadFailed_create=Failed to create view for this node~ -view_tree_common_loadFailed_update=Failed to update view for this node~ -view_tree_common_contextMenu_type_name_label=Type: {0} -view_tree_common_contextMenu_pluginConfiguration=Plugin Configuration~ -view_tree_common_contextMenu_resourceConfiguration=Resource Configuration~ -view_tree_common_contextMenu_editPluginConfiguration=Edit [{0}] Plugin Configuration~ -view_tree_common_contextMenu_editResourceConfiguration=Edit [{0}] Resource Configuration~ -view_tree_common_contextMenu_operations=Operations~ -view_tree_common_contextMenu_operations_loadFailed=Failure to start wizard for running operations~ -view_tree_common_contextMenu_measurements=Measurements~ -view_tree_common_contextMenu_addChartToDashboard=Add chart to dashboard [{0}]~ -view_tree_common_contextMenu_chart=Chart~ -view_tree_common_contextMenu_saveChartToDashboardSuccessful=You have saved dashboard [{0}]~ -view_tree_common_contextMenu_saveChartToDashboardFailure=Failed to save the dashboard~ -view_tree_common_contextMenu_loadFailed_dashboard=Failed to load user dashboards -view_tree_common_contextMenu_loadFailed_manualAddChildren=Failed to load platform manual add children~ -view_tabs_common_summary=Summary~ -view_tabs_common_overview=Overview~ -view_tabs_common_dashboard=Dashboard~ -view_tabs_common_timeline=Timeline~ -view_tabs_common_monitoring=Monitoring~ -view_tabs_common_graphs=Graphs~ -view_tabs_common_tables=Tables~ -view_tabs_common_traits=Traits~ -view_tabs_common_availability=Availability~ -view_tabs_common_schedules=Schedules~ -view_tabs_common_calltime=Calltime~ -view_tabs_common_inventory=Inventory~ -view_tabs_common_groups=Groups~ -view_tabs_common_group_membership=Group Membership~ -view_tabs_common_members=Members~ -view_tabs_common_child_resources=Child Resources~ -view_tabs_common_child_history=Child History~ -view_tabs_common_connectionSettings=Connection Settings~ -view_tabs_common_connectionSettingsHistory=Connection Settings History~ -view_tabs_common_operations=Operations~ -view_tabs_common_history=History~ -view_tabs_common_scheduled=Scheduled~ -view_tabs_common_alerts=Alerts~ -view_tabs_common_definitions=Definitions~ -view_tabs_common_current=Current~ -view_tabs_common_events=Events~ -view_tabs_common_configuration=Configuration~ -view_tabs_common_content=Content~ -view_tabs_common_deployed=Deployed~ -view_tabs_common_new=New~ -view_tabs_common_subscriptions=Subscriptions~ -view_titleBar_common_updateTagsSuccessful=The tags for [{0}] have been updated~ -view_titleBar_common_updateTagsFailure=Failed to update the tags for [{0}]~ -view_titleBar_common_loadTagsFailure=Failed to load the tags for [{0}]~ -view_titleBar_common_clickToRemoveFav=Click to remove this as a favorite~ -view_titleBar_common_clickToAddFav=Click to add this as a favorite~ -view_titleBar_common_removedFav=You have removed [{0}] as one of your favorites~ -view_titleBar_common_addedFav=You have added [{0}] as a favorite~ -view_titleBar_common_removedFavFailure=Failed to remove [{0}] as one of your favorites~ -view_titleBar_common_addedFavFailure=Failed to add [{0}] as a favorite~ -view_dynagroup_expressionSet=Expression Set~ -view_dynagroup_recalculationInterval=Recalculation Interval~ -view_dynagroup_lastCalculationTime=Last Calculation Time~ -view_dynagroup_nextCalculationTime=Next Calculation Time~ -view_dynagroup_definitionCreated=You have successfully created a group definition named [{0}]~ -view_dynagroup_definitionLoadFailure=Failed to load group definitions~ -view_dynagroup_definitionAlreadyExists=A group definition already exists with this name~ -view_dynagroup_saveSuccessful=You have successfully saved the group definition named [{0}]~ -view_dynagroup_saveFailure=Failed to save the group definition named [{0}]~ -view_dynagroup_singleSaveFailure=An error occurred - there should have been one created, but instead there were [{0}] created~ -view_dynagroup_saveAndRecalculate=Save & Recalculate~ -view_dynagroup_recalculate=Recalculate~ -view_dynagroup_recalcSuccessful=You have successfully recalculated this group definition~ -view_dynagroup_recalcFailure=Failed to recalculated this group definition~ -view_dynagroup_recalcSuccessfulSelection=You have successfully recalculated [{0}] group definitions~ -view_dynagroup_recalcFailureSelection=Failed to recalculated the selected group definitions~ -view_dynagroup_deleteSuccessfulSelection=You have successfully deleted [{0}] group definitions~ -view_dynagroup_deleteFailureSelection=Failed to delete the selected group definitions~ -view_dynagroup_children=DynaGroup Children~ -view_dynagroup_newGroupDefinition=New Group Definition~ -view_dynagroup_editing=Editing [{0}]~ -view_dynagroup_expression=Expression~ -view_dynagroup_recursive=Recursive~ -view_dynagroup_loadDefinitionFailure=Failed to load group definition [{0}]~ -view_dynagroup_loadDefinitionMissing=There is no group definition with the ID of [{0}]~ -view_dynagroup_permUnknown=Could not determine if you have the proper permissions - access is denied~ -view_dynagroup_permDenied=You do not have permission to view group definitions~ -view_dynagroup_definitions=DynaGroup Definitions~ -view_group_membership_saveFailure=Failed to update membership of group [{0}]~ -view_group_membership_saveSuccessful=You have updated the membership of group [{0}]~ -view_group_resConfig_edit_saveTooltip=Update the configurations of all group members~ -view_group_resConfig_edit_noperm=You do not have permission to edit this group configuration~ -view_group_resConfig_edit_saveInitiated_concise=The group configuration updates have been initiated~ -view_group_resConfig_edit_saveInitiated_full=The group configuration updates have been initiated for the [{0}] compatible group named [{1}]~ -view_group_resConfig_edit_saveFailure=Failed to initiate group configuration update for [{0}] compatible group named [{1}]~ -view_group_resConfig_edit_valid=All configuration properties have valid values, so the configuration can now be saved~ -view_group_resConfig_edit_invalid=The following configuration properties have invalid values and must be corrected before the configuration can be saved: [{0}]~ -view_group_pluginConfig_view_noperm=You do not have permissions to see the connection settings~ -view_group_pluginConfig_view_groupProperties=Group Properties~ -view_group_pluginConfig_table_title=Group Connection Settings History~ -view_group_pluginConfig_table_statusDetails=Status Details~ -view_group_pluginConfig_table_viewSettings=View Settings~ -view_group_pluginConfig_table_viewMemberHistory=View Member History~ -view_group_pluginConfig_table_deleteSuccessful=You have deleted [{0}] history items~ -view_group_pluginConfig_table_deleteFailure=Failed to delete group plugin config history~ -view_group_pluginConfig_table_msg1=View Member History for status of each individual resource~ -view_group_pluginConfig_table_statusSuccess=This group configuration update was successful~ -view_group_pluginConfig_table_statusInprogress=This group configuration update is still in progress~ -view_group_pluginConfig_table_statusNochange=No changes were made to this group configuration~ -view_group_pluginConfig_table_statusFailure=This group configuration update failed~ -view_group_pluginConfig_table_clickStatusIcon=Click the status icon for full details~ -view_group_pluginConfig_members_title=Group Connection Settings Member Histories~ -view_group_pluginConfig_members_statusDetails=Status Details~ -view_group_pluginConfig_members_statusSuccess=This configuration update was successful~ -view_group_pluginConfig_members_statusInprogress=This configuration update is still in progress~ -view_group_pluginConfig_members_statusNochange=No changes were made to this configuration~ -view_group_pluginConfig_members_statusFailure=This configuration update failed for an unknown reason~ -view_group_pluginConfig_members_fetchFailure=Failed to get plugin config update history for members of group [{0}]~ -view_group_pluginConfig_edit_currentGroupProperties=Current Group Properties~ -view_group_pluginConfig_edit_saveTooltip=Update the connection settings of all group members~ -view_group_pluginConfig_edit_noperm=You do not have permission to edit this group connection settings~ -view_group_pluginConfig_edit_saveInitiated_concise=The group connection setting updates have been initiated~ -view_group_pluginConfig_edit_saveInitiated_full=The group connection setting updates have been initiated for the [{0}] compatible group named [{1}]~ -view_group_pluginConfig_edit_saveFailure=Failed to initiate group connection setting update for [{0}] compatible group named [{1}]~ -view_group_pluginConfig_edit_valid=All connection setting properties have valid values, so the connection settings can now be saved~ -view_group_pluginConfig_edit_invalid=The following connection setting properties have invalid values and must be corrected before the connection settings can be saved: [{0}]~ -view_group_meas_schedules_title=Group Metric Collection Schedules~ -view_group_summary_nameUpdateFailure=Failed to change the name of the resource group with ID [{0}] - could not change from [{1}] to [{2}]~ -view_group_summary_nameUpdateSuccessful=You have changed the name of the resource group with ID [{0}] from [{1}] to [{2}]~ -view_group_summary_memberType=Member Type~ -view_group_summary_memberCount=Member Count~ -view_group_summary_dynamic=Dynamic~ -view_group_summary_recursive=Recursive~ -view_group_summary_groupDefinition=Group Definition~ -view_group_summary_mixed=Mixed~ -view_group_summary_descUpdateFailure=Failed to change the description of the resource group with ID [{0}]~ -view_group_summary_descUpdateSuccessful=You have changed the description of this resource group~ -view_group_summary_dynamicNote=Dynamic group names and descriptions are managed, and therefore are not editable~ - -# Connection Settings Details -#------------------------------------------ -view_connectionSettingsDetails_noPermission = You do not have permission to edit this Resource''s connection settings.~ -view_connectionSettingsDetails_error_updateFailure = Failed to update connection settings.~ -view_connectionSettingsDetails_messageConcise_updateSuccess = Connection settings updated.~ -view_connectionSettingsDetails_messageDetailed_updateSuccess = Connection settings updated for Resource [{0}].~ -view_connectionSettingsDetails_allPropertiesValid = All connection settings have valid values, so the settings can now be saved.~ -view_connectionSettingsDetails_somePropertiesInvalid = The following connection settings have invalid values: {0}. The values must be corrected before the settings can be saved.~ - -# Resource Resource Groups -#----------------------------------------- -view_resourceResourceGroupList_error_fetchFailure = Failed to fetch Resource''s groups.~ -view_resourceResourceGroupList_error_updateFailure = Failed to update assigned Resource groups.~ -view_resourceResourceGroupList_message_updateSuccess = Group membership updated for [{0}]. - -# Configuration Details -#------------------------------- -view_configurationDetails_noPermission = You do not have permission to edit this Resource''s configuration.~ -view_configurationDetails_error_updateFailure = Failed to update configuration.~ -view_configurationDetails_messageConcise = Configuration updated.~ -view_configurationDetails_messageDetailed = Configuration updated for Resource [{0}].~ -view_configurationDetails_allPropertiesValid = All configuration properties have valid values, so the configuration can now be saved.~ -view_configurationDetails_somePropertiesInvalid = The following configuration properties have invalid values: {0}. The values must be corrected before the configuration can be saved.~ - -# Configuration History List -view_configurationHistoryList_title = Configuration History~ -view_configurationHistoryList_itemNamePlural = configuration history items - -# Configuration History Details -#------------------------------------------ -view_configurationHistoryDetails_dialogTitle = Configuration Details~ -view_configurationHistoryDetails_error_loadFailure = Unable to load configuration history.~ - -# Operation History List -#--------------------------------- -view_operationHistoryList_title = Operation History~ -view_operationHistoryList_button_runOperation = Run Operation~ - -# Operation History Details -#-------------------------------------- -view_operationHistoryDetails_error_fetchFailure = Failure loading operation history.~ - -# Operation Create Wizard -#------------------------------------- -view_operationCreateWizard_title = Operation Wizard~ -view_operationCreateWizard_header = Execute {0} on {1}~ -view_operationCreateWizard_button_execute = Execute~ -view_operationCreateWizard_button_executeImmediately = Execute Immediately~ -view_operationCreateWizard_error_scheduleOperationFailure = Failed to schedule operation execution.~ -view_operationCreateWizard_message_scheduleOperationSuccess = Schedule operation [{0}] on Resource [{1}] with cron string [{2}].~ -view_operationCreateWizard_parametersStep_name = Operation Parameters~ -view_operationCreateWizard_parametersStep_noParameters = This operation does not take any parameters.~ -view_operationCreateWizard_schedulingStep_name = Schedule -view_operationCreateWizard_schedulingStep_label_start = Start -view_operationCreateWizard_schedulingStep_label_schedule = Schedule -view_operationCreateWizard_schedulingStep_label_recurrence = Recurrence -view_operationCreateWizard_schedulingStep_label_runAt = Run At -view_operationCreateWizard_schedulingStep_label_nMinutes = n Minutes -view_operationCreateWizard_schedulingStep_label_hourly = Hourly -view_operationCreateWizard_schedulingStep_label_daily = Daily -view_operationCreateWizard_schedulingStep_label_weekly = Weekly -view_operationCreateWizard_schedulingStep_label_monthly = Monthly -view_operationCreateWizard_schedulingStep_label_timePeriod = Time Period -view_operationCreateWizard_schedulingStep_label_startDate = Start Date -view_operationCreateWizard_schedulingStep_label_recurrenceEnd = Recurrence End -view_operationCreateWizard_schedulingStep_label_endDate = End Date -view_operationCreateWizard_schedulingStep_label_willExecuteImmediately = Will execute immediately -view_operationCreateWizard_schedulingStep_label_onceAt = Once At -view_operationCreateWizard_schedulingStep_label_date = Date -view_operationCreateWizard_schedulingStep_label_time = Time -view_operationCreateWizard_schedulingStep_label_everyNMinutes = Every n Minutes -view_operationCreateWizard_schedulingStep_label_minuteInterval = Minute Interval -view_operationCreateWizard_schedulingStep_label_hourlyAt = Hourly At -view_operationCreateWizard_schedulingStep_label_minuteOfHour = Minute of Hour -view_operationCreateWizard_schedulingStep_label_dailyAt = Daily At -view_operationCreateWizard_schedulingStep_label_timeOfDay = Time of Day -view_operationCreateWizard_schedulingStep_label_weeklyOn = Weekly On -view_operationCreateWizard_schedulingStep_label_dayOfWeek = Day of Week -view_operationCreateWizard_schedulingStep_label_monthlyOn = Monthly On -view_operationCreateWizard_schedulingStep_label_dayOfMonth = Day of Month - -#==================== Reports ====================== - -view_reportsTop_title = Reports~ -view_reportsTop_description = This section provides access to global reports.~ -view_reports_platforms = Cpu And Memory Utilization~ -view_reports_subsystems = Subsystems~ - -view_measurementOob_title = Suspect Metrics~ - -view_tagCloud_title = Tag Cloud~ -view_tagCloud_error_fetchFailure = Failed to load tags.~ -view_tagCloud_error_tagUsedCount = Tag used {0} times.~ - -view_taggedResources_title = Tagged Resources~ - - -#===================== Test ======================= -view_testTop_title = Test~ -view_testTop_description = This section contains pages for testing various GUI components.~ - -#=================== Top Level ===================== - -# About Box -#---------- -view_aboutBox_allRightsReserved = All Rights Reserved.~ -view_aboutBox_buildNumber = Build Number:~ -view_aboutBox_failedToLoad = Failed to load product information.~ -view_aboutBox_homepage = Homepage~ -view_aboutBox_jbossByRedHat = JBoss by Red Hat~ -view_aboutBox_title = About {0}~ -view_aboutBox_version = Version:~ - -# CoreGUI -#-------------- -view_core_error_1 = New Alerts lookup failed~ -view_core_loggedInAs = Logged in as {0}~ -view_core_loggedOut = Logged out~ -view_core_recentAlerts = [{0}] recent alerts~ -view_core_uncaught = Globally uncaught exception~ - -# Login -#-------------- -view_login_invalidEmail = Invalid e-mail address~ -view_login_login = Login~ -view_login_logout = Logout~ -view_login_noBackend = The backend datasource is unavailable.~ -view_login_noLdap = Note: Optional retrieval of ldap details unsuccessful. Manual entry is required.~ -view_login_noUser = The username or password provided does not match our records.~ -view_login_prompt = Please Login~ -view_login_registerLater = (Logout - Complete registration later.)~ -view_login_registerLdapSuccess = Succesfully registered the new LDAP User.~ -view_login_registerUser = Register User~ -view_login_welcome = Welcome to JBoss ON! <br/><br/> Enter/update the following fields to complete your registration process.<br/> Once you click "OK" you will be logged in.<br/><br/>~ - - -# Menu Bar -#-------------- -view_menuBar_help = Help~ -view_menuBar_logout = Logout~ - -# Search Bar, GUI -#----------------- -view_searchBar_search = Search~ -view_searchBar_resources = Resources~ -view_searchBar_resourceGroups = Resource Groups~ -# TODO: i18n pluralization -view_searchBar_welcomeMessage = search for {0}s~ -view_searchBar_defaultPattern = name your pattern~ -view_searchBar_error_selectSavedSearch = ''Error selecting saved search''~ - -view_searchGUI_loginStatus = Unable to determine login status, check server status~ - -# Message Center -#-------------------------- -view_messageCenter_button_messages = Messages~ -view_messageCenter_noRecentMessages = No Recent Messages~ -view_messageCenter_messageTitle= Message Center~ -view_messageCenter_messageSeverity= Severity~ -view_messageCenter_messageTime= Time~ -view_messageCenter_messageDetail= Detail~ - + # + # RHQ GUI i18n Messages - English + ################################### + + #************************************** SHARED **************************************** + + #=================== Common ===================== + + # + # Build Info + # + common_buildInfo_gwtVersion = ${gwt.version}~ + + # Button Labels + #-------------- + common_button_advanced = Advanced...~ + common_button_apply = Apply~ + common_button_cancel = Cancel~ + common_button_close = Close~ + common_button_compare = Compare~ + common_button_create_child = Create Child~ + common_button_delete = Delete~ + common_button_disable = Disable~ + common_button_enable = Enable~ + common_button_finish = Finish~ + common_button_import = Import~ + common_button_new = New~ + common_button_next = Next~ + common_button_ok = OK~ + common_button_previous = Previous~ + common_button_purgeAll=Purge All~ + common_button_refresh = "Refresh"~ + common_button_reset = Reset~ + common_button_save = Save~ + common_button_search = Search~ + common_button_showDetails = Show Details...~ + common_button_uninventory = Uninventory~ + + # Common Labels + #------------------------ + common_label_all = ALL~ + common_label_all_resources = all resources~ + common_label_day=day~ + common_label_days=days~ + common_label_hour=hour~ + common_label_hours=hours~ + common_label_item=item~ + common_label_items=items~ + common_label_milliseconds=milliseconds~ + common_label_minutes=minutes~ + common_label_month=month~ + common_label_search=Search~ + common_label_scheduled_operations=scheduled operations~ + common_label_seconds=seconds~ + common_label_selected_resources = selected resources~ + common_label_unlimited = unlimited~ + common_label_week=week~ + + # Common Titles + #-------------- + common_title_add_column=Add Column~ + common_title_add_portlet=Add Portlet~ + common_title_alert_range=Alert Range~ + common_title_availability = Availability~ + common_title_average_metrics=Average Metrics per Minute~ + common_title_available_resources=Available Resources~ + common_title_background=Background~ + common_title_category = Category~ + common_title_columns=Columns~ + common_title_compatibleGroups = Compatible Groups~ + common_title_compatibleGroups_total=Compatible Group Total~ + common_title_custom=Custom~ + common_title_dashboard_name=Dashboard Name~ + common_title_dateCreated=Date Created~ + common_title_default=Default~ + common_title_description=Description~ + common_title_display=Display~ + common_title_display_name=Display Name~ + common_title_duration=Duration~ + common_title_edit_mode=Edit Mode~ + common_title_enabled=Enabled?~ + common_title_end = End~ + common_title_favorites=Favorites~ + common_title_generalProp = General Properties~ + common_title_group_def_total=Group Definition Total~ + common_title_icon = icon~ + common_title_id = ID~ + common_title_id_parent = Parent ID~ + common_title_host = Host~ + common_title_inventory = Inventory~ + common_title_inventorySummary = Inventory Summary~ + common_title_lastUpdated=Last Updated~ + common_title_lastUpdatedBy=Last Updated By~ + common_title_mashup=Mashup~ + common_title_metric = Metric~ + common_title_mixedGroups = Mixed Groups~ + common_title_mixedGroups_total=Mixed Group Total~ + common_title_name = Name~ + common_title_new_dashboard=New Dashboard~ + common_title_numeric_type=Numeric Type~ + common_title_operations=Operations~ + common_title_operations_range=Operation Range~ + common_title_over=Over~ + common_title_platform_total=Platform Total~ + common_title_plugin = Plugin~ + common_title_port = Port~ + common_title_recently_added = Recently Added Resources~ + common_title_recent_alerts = Recent Alerts~ + common_title_recent_operations=Recent Operations~ + common_title_remove_column=Remove Column~ + common_title_resource = Resource~ + common_title_resource_group = Resource Group~ + common_title_resource_inventory=Resource Inventory~ + common_title_resource_id=Resource ID~ + common_title_resource_name=Resource Name~ + common_title_scheduled_operations=Scheduled Operations~ + common_title_selected_resources=Selected Resources~ + common_title_server_total=Server Total~ + common_title_service_total=Service Total~ + common_title_settings=Settings~ + common_title_show=Show~ + common_title_start = Start~ + common_title_status=Status~ + common_title_tag_cloud=Tag Cloud~ + common_title_the=The + common_title_summary_counts=Summary Counts~ + common_title_timestamp =Date/Time~ + common_title_total=Total~ + common_title_type = Type~ + common_title_units = Units~ + common_title_user=User~ + common_title_value = Value~ + common_title_version = Version~ + common_title_view_mode=View Mode~ + common_title_web_address=Web Address~ + + # Common Messages + #-------------- + common_msg_areYouSure = Are You Sure?~ + common_msg_deleteConfirm = Are you sure you want to delete the # selected {0}?~ + common_msg_loading = Loading...~ + common_msg_noItemsToShow=No items to show~ + + # Common Values + #-------------- + common_val_no = No~ + common_val_no_lower = no~ + common_val_yes = Yes~ + common_val_yes_lower = yes~ + common_val_never=Never~ + common_val_na=N/A~ + + # Common Calendar + #-------------- + common_calendar_january_short=jan + common_calendar_february_short=feb + common_calendar_march_short=mar + common_calendar_april_short=apr + common_calendar_may_short=may + common_calendar_june_short=jun + common_calendar_july_short=jul + common_calendar_august_short=aug + common_calendar_september_short=sept + common_calendar_october_short=oct + common_calendar_november_short=nov + common_calendar_december_short=dec + + #=================== Widgets ===================== + + # Record Editor + #-------------- + widget_recordEditor_title_view = View {0} [{1}]~ + widget_recordEditor_title_edit = Edit {0} [{1}]~ + widget_recordEditor_title_new = Create New {0}~ + #// dup in common + widget_recordEditor_label_loading = Loading...~ + widget_recordEditor_error_invalidViewPath = Invalid view path: [{0}]~ + widget_recordEditor_error_noRecords = No records were returned - expected exactly one.~ + widget_recordEditor_error_multipleRecords = Multiple records were returned - expected exactly one.~ + widget_recordEditor_info_recordCreatedConcise = {0} created.~ + widget_recordEditor_info_recordCreatedDetailed = {0} [{1}] created.~ + widget_recordEditor_info_recordUpdatedConcise = {0} updated.~ + widget_recordEditor_info_recordUpdatedDetailed = {0} [{1}] updated.~ + widget_recordEditor_info_recordsDeletedConcise = {0} {1} deleted.~ + widget_recordEditor_info_recordsDeletedDetailed = {0} {1} deleted: {2}.~ + widget_recordEditor_error_unsupportedOperationType = Unsupported operation type: [{0}]~ + + # Resource Selector/Picker + #-------------------------------- + widget_resourceSelector_selectResource=Select a Resource~ + widget_resourceSelector_pleaseSelectResource=Please select a resource~ + widget_resourceSelector_selectMultipleResources=Select Resources~ + widget_resourceSelector_pleaseSelectMultipleResource=Please select one or more resources~ + widget_resourceSelector_groupCategory=Group Category~ + + # Resource Factory Wizard + #-------------------------------- + widget_resourceFactoryWizard_uploadInProgress=The upload is in progress... This can take several minutes to complete for large distribution files.~ + widget_resourceFactoryWizard_uploadFileStepName=Upload Resource Content File~ + widget_resourceFactoryWizard_uploadFailure=Failed to upload file~ + widget_resourceFactoryWizard_editConfigStepName=Edit Configuration~ + widget_resourceFactoryWizard_infoStepName=Resource Information~ + widget_resourceFactoryWizard_namePrompt=New Resource Name~ + widget_resourceFactoryWizard_templatePrompt=Connection Settings Template~ + widget_resourceFactoryWizard_contentTemplatePrompt=Deployment Time Configuration Templates~ + widget_resourceFactoryWizard_configTemplatePrompt=Resource Configuration Templates~ + widget_resourceFactoryWizard_archPrompt=Package Architecture~ + widget_resourceFactoryWizard_versionPrompt=Package Version~ + widget_resourceFactoryWizard_importWizardWindowTitle=Resource Import Wizard~ + widget_resourceFactoryWizard_importWizardTitle=Import Resource of Type [{0}]~ + widget_resourceFactoryWizard_importFailure=Failed to manually import resource~ + widget_resourceFactoryWizard_importSubmitted=A request to import a new resource of type [{0}] has been submitted~ + widget_resourceFactoryWizard_createWizardWindowTitle=Resource Create Wizard~ + widget_resourceFactoryWizard_createWizardTitle=Create New Resource of Type [{0}]~ + widget_resourceFactoryWizard_execute1=Failed to create a new resource - there is no package version~ + widget_resourceFactoryWizard_execute2=Failed to create a new resource~ + widget_resourceFactoryWizard_createSubmitType=A request to create a resource of type [{0}] has been submitted successfully.~ + widget_resourceFactoryWizard_createSubmit=A request to create a resource with the name of [{0}] has been submitted successfully.~ + widget_resourceFactoryWizard_failedToGetType=Failed to get backing package type for new resource~ + widget_resourceFactoryWizard_failedToDeleteVersion=Failed to delete package version while canceling a resource create~ + + #===================== Utils ====================== + + # Disambiguation Report Decorator + #------------------------------------------------- + util_disambiguationReportDecorator_pluginSuffix = ({0} plugin)~ + + # Monitoring Request Callback + #------------------------------------------ + util_monitoringRequestCallback_error_checkServerStatusFailure = Unable to determine login status - check Server status.~ + + # RPC Manager + #---------------------- + util_rpcManager_activeRequests = {0} Active Requests~ + + # User Permissions Manager + #-------------------------- + util_userPerm_loadFailGlobal = Failed to load your global permissions - none granted.~ + util_userPerm_loadFailGroup = Failed to load your permissions for Resource Group with id [{0}] - none granted.~ + util_userPerm_loadFailResource = Failed to load your permissions for Resource with id [{0}] - none granted.~ + + # User Session Manager + #-------------------------- + util_userSession_loadFailSubject = UserSessionManager: Failed to load user Subject~ + util_userSession_logoutFail = Failed to logout.~ + + # Error Handler + #-------------------- + util_errorHandler_nullException = exception was null~ + + # Widgets Field + #--------------------- + util_widgetsField_unlimited = Unlimited~ + + #================== DataSources ==================== + + # RPC (abstract) + #----------------------- + dataSource_rpc_error_transformRequestFailure = Failure in datasource while processing {0} request.~ + dataSource_rpc_error_unsupportedArrayFilterType = No support for passing array filters of type {0}.~ + dataSource_rpc_error_unsupportedEnumType = Please add an appropriate code block for enum {0} to RPCDataSource.getEnumArray(Class)~ + dataSource_rpc_yes = yes~ + dataSource_rpc_no = no~ + + # ContentRepositoryTree + #------ + dataSource_ContentRepoTree_error_load = Error loading repositories~ + dataSource_ContentRepoTree_field_parentId = Parent ID~ + + + # Users + #------ + ###### dup in common + dataSource_users_field_id = ID~ + dataSource_users_field_name = User Name~ + dataSource_users_field_ldap = LDAP Login?~ + dataSource_users_field_password = Password` + dataSource_users_field_passwordVerify = Verify Password~ + dataSource_users_field_firstName = First Name~ + dataSource_users_field_lastName = Last Name~ + dataSource_users_field_emailAddress = Email Address~ + dataSource_users_field_phoneNumber = Phone Number~ + dataSource_users_field_department = Department~ + dataSource_users_field_factive = Login Enabled?~ + + # Platforms + #------ + dataSource_platforms_field_cpu=CPU~ + dataSource_platforms_field_memory=Memory~ + dataSource_platforms_field_swap=Swap~ + + # Traits + #------ + dataSource_traits_field_primaryKey=Primary Key~ + dataSource_traits_field_definitionID=Definition ID~ + dataSource_traits_field_lastChanged=Last Changed~ + dataSource_traits_field_trait=Trait~ + dataSource_traits_group_field_groupId=Group ID~ + dataSource_traits_group_field_memberResource=Member Resource~ + + # Measurement OOBs + #--------------------------------- + dataSource_measurementOob_field_scheduleName = Metric~ + dataSource_measurementOob_field_resourceName = Resource~ + dataSource_measurementOob_field_parentName = Parent~ + dataSource_measurementOob_field_formattedBaseband = Band~ + dataSource_measurementOob_field_formattedOutlier = Outlier~ + dataSource_measurementOob_field_factor = Out of Range Factor (%)~ + dataSource_measurementOob_error_fetchFailure = Failed to load measurement OOB information~ + + # Measurements + #---------------------- + dataSource_definitions_loadFailed=Failed to load metric definitions~ + dataSource_schedules_loadFailed=Failed to load metric schedules~ + dataSource_schedules_field_resourceGroupId=Group ID~ + dataSource_definitions_loadFailed=Failed to load metric definitions~ + dataSource_schedules_loadFailed=Failed to load metric schedules~ + dataSource_schedules_field_resourceGroupId=Group ID~ + + dataSource_schedules_enableFailure_resource=Failed to enable the collection of [{0}] metrics for resource with ID [{1}]. The metrics were: [{2}]~ + dataSource_schedules_enableFailure_group=Failed to enable the collection of [{0}] metrics for group with ID [{1}]. The metrics were: [{2}]~ + + dataSource_schedules_enableSuccessful_concise=You have enabled the collection of [{0}] measurements~ + dataSource_schedules_enableSuccessful_full_resource=You have enabled the collection of [{0}] measurements for the resource with ID [{1}]. The enabled measurements are: [{2}]~ + dataSource_schedules_enableSuccessful_full_group=You have enabled the collection of [{0}] measurements for the resource group with ID [{1}]. The enabled measurements are: [{2}]~ + + dataSource_schedules_disableFailure_resource=Failed to disable the collection of [{0}] metrics for resource with ID [{1}]. The metrics were: [{2}]~ + dataSource_schedules_disableFailure_group=Failed to disable the collection of [{0}] metrics for resource group with ID [{1}]. The metrics were: [{2}]~ + + dataSource_schedules_disableSuccessful_concise=You have disabled the collection of [{0}] measurements~ + dataSource_schedules_disableSuccessful_full_resource=You have disabled the collection of [{0}] measurements for the resource with ID [{1}]. The disabled measurements are: [{2}]~ + dataSource_schedules_disableSuccessful_full_group=You have disabled the collection of [{0}] measurements for the resource group with ID [{1}]. The disabled measurements are: [{2}]~ + + dataSource_schedules_updateFailure_resource=Failed to set the collection interval of [{0}] metrics for resource with ID [{1}]. The metrics were: [{2}]. The collection interval was to be [{3}] seconds.~ + dataSource_schedules_updateFailure_group=Failed to set the collection interval of [{0}] metrics for resource group with ID [{1}]. The metrics were: [{2}]. The collection interval was to be [{3}] seconds.~ + + dataSource_schedules_updateSuccessful_concise=A new collection interval of [{0}] seconds has been set on [{1}] measurements~ + dataSource_schedules_updateSuccessful_full_resource=A new collection interval of [{0}] seconds has been set on [{1}] measurements for resource with ID [{2}]. The updated measurements are: [{3}]~ + dataSource_schedules_updateSuccessful_full_group=A new collection interval of [{0}] seconds has been set on [{1}] measurements for resource group with ID [{2}]. The updated measurements are: [{3}]~ + + + # Problem Resources + #------------------------------ + dataSource_problemResources_field_resource = Resource~ + dataSource_problemResources_field_location = Location~ + dataSource_problemResources_field_alerts = Alerts~ + dataSource_problemResources_field_available = Current Availability~ + dataSource_problemResources_error_fetchFailure = Failed to load Resources with alerts/unavailability.~ + + # Recent Operations + #---------------------------- + dataSource_recentOperations_field_resource = Resource~ + dataSource_recentOperations_field_location = Location~ + dataSource_recentOperations_field_operation = Operation~ + dataSource_recentOperations_field_time = Date/Time~ + dataSource_recentOperations_field_status = Status~ + dataSource_recentOperations_error_fetchFailure = Failed to load recently completed operations. + + # Scheduled Operations + #--------------------------------- + dataSource_scheduledOperations_field_resource = Resource~ + dataSource_scheduledOperations_field_location = Location~ + dataSource_scheduledOperations_field_operation = Operation~ + dataSource_scheduledOperations_field_time = Date/Time~ + dataSource_scheduledOperations_error_fetchFailure = Failed to load scheduled operations. + + # Operation History + #--------------------------- + dataSource_operationHistory_error_fetchFailure = Failure loading operation histories.~ + + # Configuration History + #------------------------------- + dataSource_configurationHistory_field_id = ID~ + dataSource_configurationHistory_field_resource = Resource~ + dataSource_configurationHistory_field_createdTime = Created~ + dataSource_configurationHistory_field_status = Status~ + dataSource_configurationHistory_field_subject = Subject~ + dataSource_configurationHistory_error_fetchFailure = Unable to load configuration history.~ + + + #********************************** VIEW-SPECIFIC ************************************* + + #================= Administration ================== + + view_admin_administration = Administration~ + view_admin_configuration = Configuration~ + view_admin_security = Security~ + view_admin_topology = Topology~ + + view_adminSecurity_users = Users~ + view_adminSecurity_roles = Roles~ + + view_adminTopology_affinityGroups = Affinity Groups~ + view_adminTopology_agents = Agents~ + view_adminTopology_partitionEvents = Partition Events~ + view_adminTopology_remoteAgentInstall = Remote Agent Install~ + view_adminTopology_servers = Servers~ + + view_adminConfig_downloads = Downloads~ + view_adminConfig_license = License~ + view_adminConfig_plugins = Plugins~ + view_adminConfig_systemSettings = System Settings~ + view_adminConfig_templates = Templates~ + + # Administration/Security/Users/# + #-------------------------------- + view_adminUsersDetails_dataTypeName = user~ + + # Administration/Topology/RemoteAgentInstall/# + view_remoteAgentInstall_agentStatus = Agent Status~ + view_remoteAgentInstall_agentStatusDefault = -Click Update Status Button-~ + view_remoteAgentInstall_connInfo = Connection Information~ + view_remoteAgentInstall_buttonFindAgent = Find Agent~ + view_remoteAgentInstall_error_1 = Error occurred while trying to find agent install path~ + view_remoteAgentInstall_error_2 = Could not find an agent installed when looking in common locations + view_remoteAgentInstall_error_3 = Could not find an agent installed at or under [{0}] + view_remoteAgentInstall_error_4 = Failed to install agent~ + view_remoteAgentInstall_error_5 = Failed to start agent~ + view_remoteAgentInstall_error_6 = Failed to stop agent~ + + view_remoteAgentInstall_installAgent = Install Agent~ + view_remoteAgentInstall_installInfo = Agent Installation Information~ + view_remoteAgentInstall_installPath = Agent Install Path~ + view_remoteAgentInstall_promptInstallPath = Where the agent is or will be installed. If you aren''t sure where an agent is installed, enter a parent directory and click the ''Find Agent'' button to scan that directory and below. If you enter an empty path, common locations are searched on the host for an agent install.~ + view_remoteAgentInstall_promptHost = The host where the agent is or will be installed~ + view_remoteAgentInstall_promptPassword =The credentials that are used to authenticate the user on the host via SSH~ + view_remoteAgentInstall_promptPort = The port the SSH server is listening to. If not specified, the default is 22~ + view_remoteAgentInstall_promptUser = The name of the user whose credentials are passed to the host via SSH~ + view_remoteAgentInstall_startAgent = Start Agent~ + view_remoteAgentInstall_startAgentResults = Agent start results: [{0}]~ + view_remoteAgentInstall_stopAgent = Stop Agent~ + view_remoteAgentInstall_stopAgentResults = Agent stop results: [{0}]~ + view_remoteAgentInstall_success = Agent installation complete~ + view_remoteAgentInstall_updateStatus = Update Status~ + + + #jjj + + #-------------------------------- + view_adminUsersDetails_dataTypeName = user~ + + # Auto Discovery Queue + #---------------------------- + view_autoDiscoveryQ_title=Autodiscovery Queue~ + view_autoDiscoveryQ_import=Import~ + view_autoDiscoveryQ_ignore=Ignore~ + view_autoDiscoveryQ_ignored=Ignored~ + view_autoDiscoveryQ_unignore=Unignore~ + view_autoDiscoveryQ_new=New~ + view_autoDiscoveryQ_newAndIgnored=New and Ignored~ + view_autoDiscoveryQ_importFailure=Failed to import resources~ + view_autoDiscoveryQ_importSuccessful=You have successfully imported the selected resources.~ + view_autoDiscoveryQ_ignoreFailure=Failed to ignore resources~ + view_autoDiscoveryQ_ignoreSuccessful=You have successfully ignored the selected resources.~ + view_autoDiscoveryQ_unignoreFailure=Failed to unignore resources~ + view_autoDiscoveryQ_unignoreSuccessful=You have successfully unignored the selected resources.~ + view_autoDiscoveryQ_noperm=(Required manage inventory permissions missing. See Administrator to change)~ + view_autoDiscoveryQ_noItems=No items to show~ + view_autoDiscoveryQ_field_parentId=Parent ID~ + view_autoDiscoveryQ_field_name=Resource Name~ + view_autoDiscoveryQ_field_key=Resource Key~ + view_autoDiscoveryQ_field_discoveryTime=Discovery Time~ + view_autoDiscoveryQ_field_inventoryStatus=Inventory Status~ + view_autoDiscoveryQ_loadFailure=Failed to load the inventory discovery queue~ + + #==================== Bundles ====================== + view_bundle_bundles = Bundles~ + view_bundle_fileListView_bundleFiles=Bundle Files~ + view_bundle_fileListView_fileSize=File Size~ + view_bundle_fileListView_loadFailure=Failed to load bundle file data~ + view_bundle_version_bundleVersions=Bundle Versions~ + view_bundle_version_backToBundle=Back to Bundle~ + + #=================== Components ===================== + + view_configCompare_comparingConfigs = Comparing Configurations~ + view_configCompare_configCompare = Configuration Comparison~ + + view_configEdit_addItem = Add Item to List~ + view_configEdit_confirm_1 = Are you sure you want to delete the selected properties from the set?~ + view_configEdit_confirm_2 = Are you sure you want to delete this row?~ + view_configEdit_confirm_3 = Are you sure you want to delete the [{0}] selected [{1}]?~ + view_configEdit_editRow = Edit Configuration Row~ + view_configEdit_enterPropName = Enter the name of the property to be added.~ + view_configEdit_error_1 = Configuration is not supported by this Resource.~ + view_configEdit_error_2 = Connection settings are not supported by this Resource.~ + view_configEdit_error_3 = Cannot add property named [{0}]. The property name is already used in the set.~ + view_configEdit_files = Files~ + view_configEdit_hideAll= Hide All~ + view_configEdit_jumpToSection = Jump to Section~ + view_configEdit_msg_1 = Added property [{0}] to the set.~ + view_configEdit_msg_2 = Removed properties from the set.~ + view_configEdit_msg_3 = [{0} {1}] deleted from list.~ + view_configEdit_msg_4 = Item added to list.~ + view_configEdit_properties = Properties~ + view_configEdit_tooltip_1 = Delete the selected items from the list.~ + view_configEdit_tooltip_2 = Add an item to the list.~ + + view_groupConfigEdit_member = Member~ + view_groupConfigEdit_noListProps = List properties are not currently supported for group configurations.~ + view_groupConfigEdit_tooltip_1 = Member values differ - click icon to edit them.~ + view_groupConfigEdit_setAll = Set all values to:~ + view_groupConfigEdit_unset = Unset~ + view_groupConfigEdit_valsDiff = member values differ~ + view_groupConfigEdit_valsDiffForProp = Member Values for Property [{0}]~ + + view_leftNav_unknownPage = Unknown page name [{0}] for section [{1}] - URL is invalid.~ + + view_measure_nan = --no data available--~ + view_measureRange_day = 1 Day~ + view_measureRange_days = {0} Days~ + view_measureRange_hour = 1 Hour~ + view_measureRange_hours = {0} Hours~ + view_measureRange_last = Last~ + view_measureRange_minutes = {0} Minutes~ + view_measureRange_range = Range~ + view_measureRange_simple = Simple...~ + + view_selector_assigned = Assigned {0}~ + view_selector_available = Available {0}~ + + view_subTab_error_disabled = Cannot select disabled subTab [{0}].~ + + view_table_totalRows = Total Rows: {0} Selected: {1}~ + view_tableSection_backButton = Back to List~ + view_tableSection_error_noId = Table [{0}] record is missing 'id' attribute - please report this bug.~ + view_tableSection_error_badId = Can not show detail for [{0}]. Illegal 'id': [{1}]. Please report this bug~ + + view_tags_tags = Tags + view_tags_error_1 = Failed to load Tags~ + view_tags_title = Tags:~ + view_tags_tooltip_1 = Click to remove this Tag~ + view_tags_tooltip_2 = Click to edit Tags~ + view_tags_tooltip_3 = Enter a Tag in the format: (namespace:)(semantic=)tagname (e.g. it:env=QA, or owner=John) + + # File Upload (various) + view_upload_alreadyUploaded = File has already been uploaded~ + view_upload_bundleDistFile = Distribution File~ + view_upload_error_bundleDistFile = Error uploading Bundle Distribution File~ + view_upload_error_file = Error uploading file~ + view_upload_error_fileName = Error uploading file [{0}]~ + view_upload_error_fileName_2 = Error uploading file [{0}], check for invalid file path.~ + view_upload_error_packageVersionFile = Error uploading Package Version File~ + view_upload_error_results = Error uploading file, unexpected results: [{0}]~ + view_upload_inProgress = Can not submit, upload is currently in progress~ + view_upload_prompt_1 = [{0}] File to Upload~ + view_upload_prompt_2 = File to Upload~ + view_upload_tooltip_1 = Select a file to upload, then click Upload or Next~ + view_upload_tooltip_2 = File upload had previously failed~ + view_upload_success = File successfully uploaded~ + view_upload_upload = Upload~ + view_upload_uploadFile = UploadFile~ + + # Group Create Wizard + view_groupCreateWizard_membersStepName=Select Members~ + view_groupCreateWizard_createStepName=Group Settings~ + view_groupCreateWizard_createStep_recursive=Recursive~ + view_groupCreateWizard_title=Create Group~ + view_groupCreateWizard_windowTitle=Create Group~ + view_groupCreateWizard_createFailure=Failed to create the resource group~ + view_groupCreateWizard_createSuccessful_concise=You have created a new resource group. [<a href="{0}">View Group</a>]~ + view_groupCreateWizard_createSuccessful_full=You have created a new [{0}] resource group with the name [{1}] that contains [{2}] member resources~ + + # Resource Type / Plugin View/Datasources + view_type_resourceTypes=Resource Types~ + view_type_parentId=Parent ID~ + view_type_typeTreeLoadFailure=Failed to load resource type tree data~ + + #=================== Dashboard ===================== + view_dashboard_favorites_error1=Failed to load favorite Resources.~ + view_dashboardManager_error=Failed to save dashboard to server~ + view_dashboardManager_saved=Saved dashboard {0} to server~ + view_dashboardManager_success=Saved dashboard~ + view_dashboardManager_deleted=Successfully deleted dashboard {0}~ + view_dashboards_title=Dashboard~ + view_dashboards_confirm1=Are you sure you want to delete~ + view_dashboardsManager_error1=Failed to add new dashboard~ + // dup in common + view_dashboardsManager_inventory_title=Inventory Summary~ + view_dashboardsManager_mashup_title=RHQ News~ + view_dashboardsManager_message_title=Welcome To RHQ~ + view_dashboardsManager_message_title_details=<h1>Welcome to RHQ</h1>\n<p>The RHQ project is an abstraction and plug-in based systems management suite that provides extensible and integrated systems management for multiple products and platforms across a set of core features. The project is designed with layered modules that provide a flexible architecture for deployment. It delivers a core user interface that delivers audited and historical management across an entire enterprise. A Server/Agent architecture provides remote management and plugins implement all specific support for managed products.</p>\n <p>This default dashboard can be edited by clicking the (edit mode) button above.</p>~ + view_dashboardsManager_tagcloud_title=Tag Cloud~ + view_portlet_autodiscovery_config_platform_selection = Number of platforms to display~ + view_portlet_autodiscovery_help_msg = This portlet offers the ability to import newly discovered resources into the inventory for monitoring and management or to ignore them from further action.~ + view_portlet_autodiscovery_title = Discovery Queue~ + view_portlet_favoriteResources_msg=This portlet displays your favorite resources~ + view_portlet_favoriteResources_title=Favorite Resources~ + view_portlet_generic_help=No help available for this portlet~ + view_portlet_generic_unconfigured=No settings available for this portlet~ + view_portlet_graph_configure_resource_graph=The resource to graph~ + view_portlet_graph_configure_metricDefinition_graph=The metric definition id to graph~ + view_portlet_graph_configure_title=Graph Config~ + view_portlet_graph_configure_title_desc=Configuration of the graph portlet~ + view_portlet_graph_help_msg = This Portlet supports the graphing of a resource metric.~ + view_portlet_graph_help_title = Graph Portlet~ + view_portlet_graph_help_unconfigured=This graph is unconfigured, click the settings button to configure.~ + view_portlet_graph_title = Resource Graph~ + view_portlet_inventory_error1=Failed to retrieve inventory summary~ + view_portlet_mashup_config_title=MashupPorlet Configuration~ + view_portlet_mashup_config_title_desc=The configuration settings for the mashup portlet.~ + view_portlet_mashup_help=This portlet can include a web page via an HTTP request into an iframe on the dashboard.~ + view_portlet_mashup_unconfigured=Page address not yet configured, click the settings button to setup this portlet.~ + view_portlet_message_config_title=MessagePortlet Configuration~ + view_portlet_message_config_title_desc=The configuration settings for the message portlet.~ + view_portlet_message_help=This portlet can display an HTML message on the dashboard.~ + view_portlet_message_title=Message~ + view_portlet_message_unconfigured=Message not yet configured, click the settings button to setup this portlet.~ + view_portlet_operations_config_completed_maximum=Maximum number of Completed operations to display.~ + view_portlet_operations_config_completed_enable=Whether to enable completed operations results grouping for dashboard.~ + view_portlet_operations_config_scheduled_enable=Whether to enable scheduled operations results grouping for dashboard.~ + view_portlet_operations_config_scheduled_maximum=Maximum number of Scheduled operations to display.~ + view_portlet_operations_config_completed=completed operations~ + view_portlet_operations_config_show_last=show Last~ + view_portlet_operations_config_show_next=show Next~ + view_portlet_operations_config_title=OperationsPortlet Configuration~ + view_portlet_operations_config_title_desc=The configuration settings for the Operations portlet.~ + view_portlet_operations_disabled=(Results currently disabled. Change settings to enable results.~ + view_portlet_operations_help_msg=This portlet displays both operations that have occurred and are scheduled to occur.~ + view_portlet_platform_help_msg = This portlet displays information about platforms in inventory.~ + view_portlet_platform_platform_error_1 = Failed to load platform metrics~ + view_portlet_platform_title = Platforms Summary~ + view_portlet_platform_type_error_1 = Could not load type data~ + view_portlet_problem_resources_config_display_maximum=Maximum number of Problem resources to display.~ + view_portlet_problem_resources_config_display_range=Show problem resources going back this many hours.~ + view_portlet_problem_resources_config_display_range2 = From {0} to {1}~ + view_portlet_problem_resources_config_problem_label=problem resources on dashboard.~ + view_portlet_problem_resources_config_title=ProblemResourcesPortlet Configuration~ + view_portlet_problem_resources_config_title_desc=The configuration settings for the Problem resources portlet.~ + view_portlet_problem_resources_help=This portlet displays resources that have reported alerts or Down availability.~ + view_portlet_problem_resources_title=Has Alerts or Currently Unavailable~ + view_portlet_recentAlerts_config_members=Select Members~ + view_portlet_recentAlerts_config_priority_label = priority Alerts,~ + view_portlet_recentAlerts_config_when=within the past~ + view_portlet_recentAlerts_help_msg = Displays recent alerts fired on resources visible to the current user login.~ + // dup in common + view_portlet_recentAlerts_title = Recent Alerts~ + view_portlet_recentlyAdded_approved_platforms=recently approved platforms on dashboard.~ + view_portlet_recentlyAdded_error1=Failed to load recently added resources~ + view_portlet_recentlyAdded_help_msg=This portlet displays resources that have recently been imported into the inventory.~ + view_portlet_recentlyAdded_title =Recently Added Portlet~ + view_portlet_tagCloud_help=portlet displays the relative tag counts in the system visible to the current user.~ + view_portlet_tagCloud_title=TagCloud~ + + #=================== Inventory ===================== + view_inventory_adq = Discovery Queue~ + view_inventory_sectionHelp = From this section, newly discovered Resources, inventoried Resources, and Groups can be viewed and managed.~ + view_inventory_cannotGetGlobalPerms = Could not determine global permissions - assuming none.~ + view_inventory_problemGroups=Problem Groups~ + view_inventory_collectionInterval=Collection Interval~ + view_inventory_mixed=mixed~ + view_inventory_downServers=Down Servers~ + view_inventory_groups = Groups~ + view_inventory_allGroups = All Groups~ + view_inventory_allResources = All Resources~ + view_inventory_platforms = Platforms~ + view_inventory_servers = Servers~ + view_inventory_services = Services~ + view_inventory_dynagroupDefs = Dynagroup Definitions~ + view_metric_traits=Traits~ + view_metric_viewTraitHistory=Value History for Trait [{0}]~ + view_inventory_eventHistory_groupEventHistory=Group Event History~ + view_inventory_eventHistory_resourceEventHistory=Resource Event History~ + view_inventory_eventHistory_sourceFilter=Source Filter~ + view_inventory_eventHistory_detailsFilter=Details Filter~ + view_inventory_eventHistory_severityFilter=Severity Filter~ + view_inventory_eventHistory_timestamp=Timestamp~ + view_inventory_eventHistory_severity=Severity~ + view_inventory_eventHistory_details=Details~ + view_inventory_eventHistory_sourceLocation=Source Location~ + view_inventory_eventHistory_deleteSuccessful=You have successfully deleted [{0}] events for [{1}]~ + view_inventory_eventHistory_deleteFailed=Failed to deleted selected events for [{0}]~ + view_inventory_eventHistory_purgeSuccessful=You have successfully purged [{0}] events for [{1}]~ + view_inventory_eventHistory_purgeFailed=Failed to purge events for [{0}]~ + view_inventory_eventDetails_loadFailed=An error occurred loading the event details~ + view_inventory_groups_resourceGroups=Resource Groups~ + view_inventory_groups_children=Children~ + view_inventory_groups_descendants=Descendants~ + view_inventory_groups_deleteSuccessful=You have successfully deleted the selected resource groups~ + view_inventory_groups_deleteFailed=Failed to delete the selected resource groups~ + view_inventory_groups_loadFailed=Failed to load group composite data~ + view_inventory_resource_loadFailed=Resource with id [{0}] does not exist or is not accessible~ + view_inventory_resources_deleteConfirm=Are you sure you want to delete the selected resources?~ + view_inventory_resources_deleteSuccessful=You have successfully deleted the selected resources~ + view_inventory_resources_deleteFailed=Failed to delete the selected resources~ + view_inventory_resources_loadFailed=Failed to load resource composite data~ + view_inventory_resources_title=Member Resources~ + view_inventory_resources_title_children=Child Resources~ + view_inventory_resources_title_members=Member Resources~ + view_resource_monitor_availability_loadFailed=Failed to load availability history~ + view_resource_monitor_graphs_noneAvailable=No graphs available~ + view_resource_monitor_graphs_loadFailed=Failed to load graph data~ + view_resource_monitor_graphs_lookupFailed=Failed to find resource for graph~ + view_resource_monitor_graph_instructions=Point your mouse to a data point on the chart~ + view_resource_monitor_graph_live_tooltip=Click for a live graph of current values~ + view_resource_monitor_detailed_graph_label=Detailed Graph~ + view_resource_monitor_calltime_title=Call Time Data~ + view_resource_monitor_calltime_destination=Call Destination~ + view_resource_monitor_calltime_count=Count~ + view_resource_monitor_calltime_minimum=Minimum~ + view_resource_monitor_calltime_average=Average~ + view_resource_monitor_calltime_maximum=Maximum~ + view_resource_monitor_calltime_total=Total~ + view_resource_monitor_calltime_loadFailed=Could not load call time data~ + view_resource_monitor_calltime_lookupFailed=Could not load resource for call time~ + view_resource_monitor_calltime_editFailed=Call time data can not be edited~ + view_resource_monitor_schedules_title=Resource Metric Collection Schedules~ + view_tree_common_loadFailed_generic=Failed to load data for tree~ + view_tree_common_loadFailed_root=Failed to load root for tree~ + view_tree_common_loadFailed_descendants=Failed to load descendants for tree~ + view_tree_common_loadFailed_children=Failed to load children for node~ + view_tree_common_loadFailed_selection=Failed to select this node~ + view_tree_common_loadFailed_node=Failed to load data for this node~ + view_tree_common_loadFailed_create=Failed to create view for this node~ + view_tree_common_loadFailed_update=Failed to update view for this node~ + view_tree_common_contextMenu_type_name_label=Type: {0} + view_tree_common_contextMenu_pluginConfiguration=Plugin Configuration~ + view_tree_common_contextMenu_resourceConfiguration=Resource Configuration~ + view_tree_common_contextMenu_editPluginConfiguration=Edit [{0}] Plugin Configuration~ + view_tree_common_contextMenu_editResourceConfiguration=Edit [{0}] Resource Configuration~ + view_tree_common_contextMenu_operations=Operations~ + view_tree_common_contextMenu_operations_loadFailed=Failure to start wizard for running operations~ + view_tree_common_contextMenu_measurements=Measurements~ + view_tree_common_contextMenu_addChartToDashboard=Add chart to dashboard [{0}]~ + view_tree_common_contextMenu_chart=Chart~ + view_tree_common_contextMenu_saveChartToDashboardSuccessful=You have saved dashboard [{0}]~ + view_tree_common_contextMenu_saveChartToDashboardFailure=Failed to save the dashboard~ + view_tree_common_contextMenu_loadFailed_dashboard=Failed to load user dashboards + view_tree_common_contextMenu_loadFailed_manualAddChildren=Failed to load platform manual add children~ + view_tabs_common_summary=Summary~ + view_tabs_common_overview=Overview~ + view_tabs_common_dashboard=Dashboard~ + view_tabs_common_timeline=Timeline~ + view_tabs_common_monitoring=Monitoring~ + view_tabs_common_graphs=Graphs~ + view_tabs_common_tables=Tables~ + view_tabs_common_traits=Traits~ + view_tabs_common_availability=Availability~ + view_tabs_common_schedules=Schedules~ + view_tabs_common_calltime=Calltime~ + view_tabs_common_inventory=Inventory~ + view_tabs_common_groups=Groups~ + view_tabs_common_group_membership=Group Membership~ + view_tabs_common_members=Members~ + view_tabs_common_child_resources=Child Resources~ + view_tabs_common_child_history=Child History~ + view_tabs_common_connectionSettings=Connection Settings~ + view_tabs_common_connectionSettingsHistory=Connection Settings History~ + view_tabs_common_operations=Operations~ + view_tabs_common_history=History~ + view_tabs_common_scheduled=Scheduled~ + view_tabs_common_alerts=Alerts~ + view_tabs_common_definitions=Definitions~ + view_tabs_common_current=Current~ + view_tabs_common_events=Events~ + view_tabs_common_configuration=Configuration~ + view_tabs_common_content=Content~ + view_tabs_common_deployed=Deployed~ + view_tabs_common_new=New~ + view_tabs_common_subscriptions=Subscriptions~ + view_titleBar_common_updateTagsSuccessful=The tags for [{0}] have been updated~ + view_titleBar_common_updateTagsFailure=Failed to update the tags for [{0}]~ + view_titleBar_common_loadTagsFailure=Failed to load the tags for [{0}]~ + view_titleBar_common_clickToRemoveFav=Click to remove this as a favorite~ + view_titleBar_common_clickToAddFav=Click to add this as a favorite~ + view_titleBar_common_removedFav=You have removed [{0}] as one of your favorites~ + view_titleBar_common_addedFav=You have added [{0}] as a favorite~ + view_titleBar_common_removedFavFailure=Failed to remove [{0}] as one of your favorites~ + view_titleBar_common_addedFavFailure=Failed to add [{0}] as a favorite~ + view_dynagroup_expressionSet=Expression Set~ + view_dynagroup_recalculationInterval=Recalculation Interval~ + view_dynagroup_lastCalculationTime=Last Calculation Time~ + view_dynagroup_nextCalculationTime=Next Calculation Time~ + view_dynagroup_definitionCreated=You have successfully created a group definition named [{0}]~ + view_dynagroup_definitionLoadFailure=Failed to load group definitions~ + view_dynagroup_definitionAlreadyExists=A group definition already exists with this name~ + view_dynagroup_saveSuccessful=You have successfully saved the group definition named [{0}]~ + view_dynagroup_saveFailure=Failed to save the group definition named [{0}]~ + view_dynagroup_singleSaveFailure=An error occurred - there should have been one created, but instead there were [{0}] created~ + view_dynagroup_saveAndRecalculate=Save & Recalculate~ + view_dynagroup_recalculate=Recalculate~ + view_dynagroup_recalcSuccessful=You have successfully recalculated this group definition~ + view_dynagroup_recalcFailure=Failed to recalculated this group definition~ + view_dynagroup_recalcSuccessfulSelection=You have successfully recalculated [{0}] group definitions~ + view_dynagroup_recalcFailureSelection=Failed to recalculated the selected group definitions~ + view_dynagroup_deleteSuccessfulSelection=You have successfully deleted [{0}] group definitions~ + view_dynagroup_deleteFailureSelection=Failed to delete the selected group definitions~ + view_dynagroup_children=DynaGroup Children~ + view_dynagroup_newGroupDefinition=New Group Definition~ + view_dynagroup_editing=Editing [{0}]~ + view_dynagroup_expression=Expression~ + view_dynagroup_recursive=Recursive~ + view_dynagroup_loadDefinitionFailure=Failed to load group definition [{0}]~ + view_dynagroup_loadDefinitionMissing=There is no group definition with the ID of [{0}]~ + view_dynagroup_permUnknown=Could not determine if you have the proper permissions - access is denied~ + view_dynagroup_permDenied=You do not have permission to view group definitions~ + view_dynagroup_definitions=DynaGroup Definitions~ + view_group_membership_saveFailure=Failed to update membership of group [{0}]~ + view_group_membership_saveSuccessful=You have updated the membership of group [{0}]~ + view_group_resConfig_edit_saveTooltip=Update the configurations of all group members~ + view_group_resConfig_edit_noperm=You do not have permission to edit this group configuration~ + view_group_resConfig_edit_saveInitiated_concise=The group configuration updates have been initiated~ + view_group_resConfig_edit_saveInitiated_full=The group configuration updates have been initiated for the [{0}] compatible group named [{1}]~ + view_group_resConfig_edit_saveFailure=Failed to initiate group configuration update for [{0}] compatible group named [{1}]~ + view_group_resConfig_edit_valid=All configuration properties have valid values, so the configuration can now be saved~ + view_group_resConfig_edit_invalid=The following configuration properties have invalid values and must be corrected before the configuration can be saved: [{0}]~ + view_group_pluginConfig_view_noperm=You do not have permissions to see the connection settings~ + view_group_pluginConfig_view_groupProperties=Group Properties~ + view_group_pluginConfig_table_title=Group Connection Settings History~ + view_group_pluginConfig_table_statusDetails=Status Details~ + view_group_pluginConfig_table_viewSettings=View Settings~ + view_group_pluginConfig_table_viewMemberHistory=View Member History~ + view_group_pluginConfig_table_deleteSuccessful=You have deleted [{0}] history items~ + view_group_pluginConfig_table_deleteFailure=Failed to delete group plugin config history~ + view_group_pluginConfig_table_msg1=View Member History for status of each individual resource~ + view_group_pluginConfig_table_statusSuccess=This group configuration update was successful~ + view_group_pluginConfig_table_statusInprogress=This group configuration update is still in progress~ + view_group_pluginConfig_table_statusNochange=No changes were made to this group configuration~ + view_group_pluginConfig_table_statusFailure=This group configuration update failed~ + view_group_pluginConfig_table_clickStatusIcon=Click the status icon for full details~ + view_group_pluginConfig_members_title=Group Connection Settings Member Histories~ + view_group_pluginConfig_members_statusDetails=Status Details~ + view_group_pluginConfig_members_statusSuccess=This configuration update was successful~ + view_group_pluginConfig_members_statusInprogress=This configuration update is still in progress~ + view_group_pluginConfig_members_statusNochange=No changes were made to this configuration~ + view_group_pluginConfig_members_statusFailure=This configuration update failed for an unknown reason~ + view_group_pluginConfig_members_fetchFailure=Failed to get plugin config update history for members of group [{0}]~ + view_group_pluginConfig_edit_currentGroupProperties=Current Group Properties~ + view_group_pluginConfig_edit_saveTooltip=Update the connection settings of all group members~ + view_group_pluginConfig_edit_noperm=You do not have permission to edit this group connection settings~ + view_group_pluginConfig_edit_saveInitiated_concise=The group connection setting updates have been initiated~ + view_group_pluginConfig_edit_saveInitiated_full=The group connection setting updates have been initiated for the [{0}] compatible group named [{1}]~ + view_group_pluginConfig_edit_saveFailure=Failed to initiate group connection setting update for [{0}] compatible group named [{1}]~ + view_group_pluginConfig_edit_valid=All connection setting properties have valid values, so the connection settings can now be saved~ + view_group_pluginConfig_edit_invalid=The following connection setting properties have invalid values and must be corrected before the connection settings can be saved: [{0}]~ + view_group_meas_schedules_title=Group Metric Collection Schedules~ + view_group_summary_nameUpdateFailure=Failed to change the name of the resource group with ID [{0}] - could not change from [{1}] to [{2}]~ + view_group_summary_nameUpdateSuccessful=You have changed the name of the resource group with ID [{0}] from [{1}] to [{2}]~ + view_group_summary_memberType=Member Type~ + view_group_summary_memberCount=Member Count~ + view_group_summary_dynamic=Dynamic~ + view_group_summary_recursive=Recursive~ + view_group_summary_groupDefinition=Group Definition~ + view_group_summary_mixed=Mixed~ + view_group_summary_descUpdateFailure=Failed to change the description of the resource group with ID [{0}]~ + view_group_summary_descUpdateSuccessful=You have changed the description of this resource group~ + view_group_summary_dynamicNote=Dynamic group names and descriptions are managed, and therefore are not editable~ + + # Connection Settings Details + #------------------------------------------ + view_connectionSettingsDetails_noPermission = You do not have permission to edit this Resource''s connection settings.~ + view_connectionSettingsDetails_error_updateFailure = Failed to update connection settings.~ + view_connectionSettingsDetails_messageConcise_updateSuccess = Connection settings updated.~ + view_connectionSettingsDetails_messageDetailed_updateSuccess = Connection settings updated for Resource [{0}].~ + view_connectionSettingsDetails_allPropertiesValid = All connection settings have valid values, so the settings can now be saved.~ + view_connectionSettingsDetails_somePropertiesInvalid = The following connection settings have invalid values: {0}. The values must be corrected before the settings can be saved.~ + + # Resource Resource Groups + #----------------------------------------- + view_resourceResourceGroupList_error_fetchFailure = Failed to fetch Resource''s groups.~ + view_resourceResourceGroupList_error_updateFailure = Failed to update assigned Resource groups.~ + view_resourceResourceGroupList_message_updateSuccess = Group membership updated for [{0}]. + + # Configuration Details + #------------------------------- + view_configurationDetails_noPermission = You do not have permission to edit this Resource''s configuration.~ + view_configurationDetails_error_updateFailure = Failed to update configuration.~ + view_configurationDetails_messageConcise = Configuration updated.~ + view_configurationDetails_messageDetailed = Configuration updated for Resource [{0}].~ + view_configurationDetails_allPropertiesValid = All configuration properties have valid values, so the configuration can now be saved.~ + view_configurationDetails_somePropertiesInvalid = The following configuration properties have invalid values: {0}. The values must be corrected before the configuration can be saved.~ + + # Configuration History List + view_configurationHistoryList_title = Configuration History~ + view_configurationHistoryList_itemNamePlural = configuration history items + + # Configuration History Details + #------------------------------------------ + view_configurationHistoryDetails_dialogTitle = Configuration Details~ + view_configurationHistoryDetails_error_loadFailure = Unable to load configuration history.~ + + # Operation History List + #--------------------------------- + view_operationHistoryList_title = Operation History~ + view_operationHistoryList_button_runOperation = Run Operation~ + + # Operation History Details + #-------------------------------------- + view_operationHistoryDetails_error_fetchFailure = Failure loading operation history.~ + + # Operation Create Wizard + #------------------------------------- + view_operationCreateWizard_title = Operation Wizard~ + view_operationCreateWizard_header = Execute {0} on {1}~ + view_operationCreateWizard_button_execute = Execute~ + view_operationCreateWizard_button_executeImmediately = Execute Immediately~ + view_operationCreateWizard_error_scheduleOperationFailure = Failed to schedule operation execution.~ + view_operationCreateWizard_message_scheduleOperationSuccess = Schedule operation [{0}] on Resource [{1}] with cron string [{2}].~ + view_operationCreateWizard_parametersStep_name = Operation Parameters~ + view_operationCreateWizard_parametersStep_noParameters = This operation does not take any parameters.~ + view_operationCreateWizard_schedulingStep_name = Schedule~ + view_operationCreateWizard_schedulingStep_label_start = Start~ + view_operationCreateWizard_schedulingStep_label_schedule = Schedule~ + view_operationCreateWizard_schedulingStep_label_recurrence = Recurrence~ + view_operationCreateWizard_schedulingStep_label_runAt = Run At~ + view_operationCreateWizard_schedulingStep_label_nMinutes = n Minutes~ + view_operationCreateWizard_schedulingStep_label_hourly = Hourly~ + view_operationCreateWizard_schedulingStep_label_daily = Daily~ + view_operationCreateWizard_schedulingStep_label_weekly = Weekly~ + view_operationCreateWizard_schedulingStep_label_monthly = Monthly~ + view_operationCreateWizard_schedulingStep_label_timePeriod = Time Period~ + view_operationCreateWizard_schedulingStep_label_startDate = Start Date~ + view_operationCreateWizard_schedulingStep_label_recurrenceEnd = Recurrence End~ + view_operationCreateWizard_schedulingStep_label_endDate = End Date~ + view_operationCreateWizard_schedulingStep_label_willExecuteImmediately = Will execute immediately~ + view_operationCreateWizard_schedulingStep_label_onceAt = Once At~ + view_operationCreateWizard_schedulingStep_label_date = Date~ + view_operationCreateWizard_schedulingStep_label_time = Time~ + view_operationCreateWizard_schedulingStep_label_everyNMinutes = Every n Minutes~ + view_operationCreateWizard_schedulingStep_label_minuteInterval = Minute Interval~ + view_operationCreateWizard_schedulingStep_label_hourlyAt = Hourly At~ + view_operationCreateWizard_schedulingStep_label_minuteOfHour = Minute of Hour~ + view_operationCreateWizard_schedulingStep_label_dailyAt = Daily At~ + view_operationCreateWizard_schedulingStep_label_timeOfDay = Time of Day~ + view_operationCreateWizard_schedulingStep_label_weeklyOn = Weekly On~ + view_operationCreateWizard_schedulingStep_label_dayOfWeek = Day of Week~ + view_operationCreateWizard_schedulingStep_label_monthlyOn = Monthly On~ + view_operationCreateWizard_schedulingStep_label_dayOfMonth = Day of Month~ + + # Summary Overview Form + #------------------------------------- + view_summaryOverviewForm_field_type = Type~ + view_summaryOverviewForm_field_name = Name~ + view_summaryOverviewForm_field_description = Description~ + view_summaryOverviewForm_field_location = Location~ + view_summaryOverviewForm_field_version = Version~ + view_summaryOverviewForm_field_parent = Parent~ + + + #==================== Reports ====================== + + view_reportsTop_title = Reports~ + view_reportsTop_description = This section provides access to global reports.~ + view_reports_platforms = Cpu And Memory Utilization~ + view_reports_subsystems = Subsystems~ + + view_measurementOob_title = Suspect Metrics~ + + view_tagCloud_title = Tag Cloud~ + view_tagCloud_error_fetchFailure = Failed to load tags.~ + view_tagCloud_error_tagUsedCount = Tag used {0} times.~ + + view_taggedResources_title = Tagged Resources~ + + + #===================== Test ======================= + view_testTop_title = Test~ + view_testTop_description = This section contains pages for testing various GUI components.~ + + #=================== Top Level ===================== + + # About Box + #---------- + view_aboutBox_allRightsReserved = All Rights Reserved.~ + view_aboutBox_buildNumber = Build Number:~ + view_aboutBox_failedToLoad = Failed to load product information.~ + view_aboutBox_homepage = Homepage~ + view_aboutBox_jbossByRedHat = JBoss by Red Hat~ + view_aboutBox_title = About {0}~ + view_aboutBox_version = Version:~ + + # CoreGUI + #-------------- + view_core_error_1 = New Alerts lookup failed~ + view_core_loggedInAs = Logged in as {0}~ + view_core_loggedOut = Logged out~ + view_core_recentAlerts = [{0}] recent alerts~ + view_core_uncaught = Globally uncaught exception~ + + # Login + #-------------- + view_login_invalidEmail = Invalid e-mail address~ + view_login_login = Login~ + view_login_logout = Logout~ + view_login_noBackend = The backend datasource is unavailable.~ + view_login_noLdap = Note: Optional retrieval of ldap details unsuccessful. Manual entry is required.~ + view_login_noUser = The username or password provided does not match our records.~ + view_login_prompt = Please Login~ + view_login_registerLater = (Logout - Complete registration later.)~ + view_login_registerLdapSuccess = Succesfully registered the new LDAP User.~ + view_login_registerUser = Register User~ + view_login_welcome = Welcome to JBoss ON! <br/><br/> Enter/update the following fields to complete your registration process.<br/> Once you click "OK" you will be logged in.<br/><br/>~ + + + # Menu Bar + #-------------- + view_menuBar_help = Help~ + view_menuBar_logout = Logout~ + + # Search Bar, GUI + #----------------- + view_searchBar_search = Search~ + view_searchBar_resources = Resources~ + view_searchBar_resourceGroups = Resource Groups~ + # TODO: i18n pluralization + view_searchBar_welcomeMessage = search for {0}s~ + view_searchBar_defaultPattern = name your pattern~ + view_searchBar_error_selectSavedSearch = ''Error selecting saved search''~ + + view_searchGUI_loginStatus = Unable to determine login status, check server status~ + + # Message Center + #-------------------------- + view_messageCenter_button_messages = Messages~ + view_messageCenter_noRecentMessages = No Recent Messages~ + view_messageCenter_messageTitle= Message Center~ + view_messageCenter_messageSeverity= Severity~ + view_messageCenter_messageTime= Time~ + view_messageCenter_messageDetail= Detail~
commit da647cc55a4f482c78964397589c7f443a3df63c Author: John Mazzitelli mazz@redhat.com Date: Thu Nov 18 10:00:19 2010 -0500
i18n
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeDataSource.java index a083ac9..7cdb894 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeDataSource.java @@ -67,15 +67,15 @@ public class BundleTreeDataSource extends RPCDataSource { protected List<DataSourceField> addDataSourceFields() { List<DataSourceField> fields = super.addDataSourceFields();
- DataSourceField idDataField = new DataSourceTextField("id", "ID"); + DataSourceField idDataField = new DataSourceTextField("id", MSG.common_title_id()); idDataField.setPrimaryKey(true); fields.add(idDataField);
- DataSourceTextField nameDataField = new DataSourceTextField("name", "Name"); + DataSourceTextField nameDataField = new DataSourceTextField("name", MSG.common_title_name()); nameDataField.setCanEdit(false); fields.add(nameDataField);
- DataSourceTextField parentIdField = new DataSourceTextField("parentId", "Parent ID"); + DataSourceTextField parentIdField = new DataSourceTextField("parentId", MSG.common_title_id_parent()); parentIdField.setForeignKey("id"); fields.add(parentIdField);
@@ -96,7 +96,7 @@ public class BundleTreeDataSource extends RPCDataSource {
bundleService.findBundlesByCriteria(criteria, new AsyncCallback<PageList<Bundle>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to load bundle data", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_bundle_tree_loadFailure(), caught); response.setStatus(DSResponse.STATUS_FAILURE); processResponse(request.getRequestId(), response); } @@ -114,7 +114,7 @@ public class BundleTreeDataSource extends RPCDataSource { criteria.addFilterBundleId(bundleId); bundleService.findBundleVersionsByCriteria(criteria, new AsyncCallback<PageList<BundleVersion>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to load bundle data", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_bundle_tree_loadFailure(), caught); response.setStatus(DSResponse.STATUS_FAILURE); processResponse(request.getRequestId(), response); } @@ -133,7 +133,7 @@ public class BundleTreeDataSource extends RPCDataSource { bundleService.findBundleDeploymentsByCriteria(criteria, new AsyncCallback<PageList<BundleDeployment>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to load bundle", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_bundle_tree_loadFailure(), caught); }
public void onSuccess(PageList<BundleDeployment> result) { @@ -148,7 +148,7 @@ public class BundleTreeDataSource extends RPCDataSource { bundleService.findBundleDestinationsByCriteria(criteria, new AsyncCallback<PageList<BundleDestination>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to load bundle destinations", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_bundle_tree_loadFailure(), caught); }
public void onSuccess(PageList<BundleDestination> result) { @@ -156,11 +156,8 @@ public class BundleTreeDataSource extends RPCDataSource { processResponse(request.getRequestId(), response); } }); - } - } - }
@Override @@ -175,23 +172,23 @@ public class BundleTreeDataSource extends RPCDataSource { }
List<ListGridRecord> records = new ArrayList<ListGridRecord>(); - + for (Object item : list) { records.add(copyValues(item)); if (item instanceof Bundle) { Bundle bundle = (Bundle) item;
- TreeNode versionNode = new TreeNode("Versions"); + TreeNode versionNode = new TreeNode(MSG.view_bundle_versions()); versionNode.setID(bundle.getId() + "_versions"); versionNode.setParentID(String.valueOf(bundle.getId())); - versionNode.setName("Versions"); - versionNode.setAttribute("name", "Versions"); + versionNode.setName(MSG.view_bundle_versions()); + versionNode.setAttribute("name", MSG.view_bundle_versions()); records.add(versionNode);
- TreeNode deploymentsNode = new TreeNode("Destinations"); + TreeNode deploymentsNode = new TreeNode(MSG.view_bundle_destinations()); deploymentsNode.setID(bundle.getId() + "_destinations"); deploymentsNode.setParentID(String.valueOf(bundle.getId())); - deploymentsNode.setName("Destinations"); + deploymentsNode.setName(MSG.view_bundle_versions()); records.add(deploymentsNode); } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionListView.java index 69e182c..68fd97a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionListView.java @@ -41,7 +41,7 @@ public class BundleVersionListView extends Table { }
public BundleVersionListView(String locatorId, Criteria criteria) { - super(locatorId, "Bundle Versions", criteria); + super(locatorId, MSG.view_bundle_bundleVersions(), criteria); setHeaderIcon("subsystems/bundle/BundleVersion_24.png"); BundleVersionDataSource bundleVersionsDataSource = new BundleVersionDataSource(); setDataSource(bundleVersionsDataSource); 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 de63f77..807ec93 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 @@ -84,8 +84,8 @@ public class BundleVersionView extends LocatableVLayout implements BookmarkableV
// tabs.addTab(createUpdateHistoryTab());
- addMember(new BackButton(extendLocatorId("BackButton"), "Back to Bundle: " + version.getBundle().getName(), - "Bundles/Bundle/" + version.getBundle().getId())); + addMember(new BackButton(extendLocatorId("BackButton"), MSG.view_bundle_version_backToBundle() + ": " + + version.getBundle().getName(), "Bundles/Bundle/" + version.getBundle().getId()));
addMember(new HeaderLabel(Canvas.getImgURL("subsystems/bundle/BundleVersion_24.png"), version.getName() + ": " + version.getVersion())); @@ -106,14 +106,14 @@ public class BundleVersionView extends LocatableVLayout implements BookmarkableV }
private Tab createSummaryTab() { - LocatableTab tab = new LocatableTab(extendLocatorId("Summary"), "Summary"); + LocatableTab tab = new LocatableTab(extendLocatorId("Summary"), MSG.common_title_summary());
LocatableDynamicForm form = new LocatableDynamicForm(tab.getLocatorId()); form.setWidth100(); form.setHeight100(); form.setNumCols(4);
- StaticTextItem versionItem = new StaticTextItem("version", "Version"); + StaticTextItem versionItem = new StaticTextItem("version", MSG.common_title_version()); versionItem.setValue(version.getVersion());
CanvasItem tagItem = new CanvasItem("tag"); @@ -124,12 +124,14 @@ public class BundleVersionView extends LocatableVLayout implements BookmarkableV GWTServiceLookup.getTagService().updateBundleVersionTags(version.getId(), tags, new AsyncCallback<Void>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to update bundle version's tags", caught); + CoreGUI.getErrorHandler().handleError( + MSG.view_bundle_version_bundleVersionTagUpdateFailure(), caught); }
public void onSuccess(Void result) { CoreGUI.getMessageCenter().notify( - new Message("Bundle Version tags updated", Message.Severity.Info)); + new Message(MSG.view_bundle_version_bundleVersionTagUpdateSuccessful(), + Message.Severity.Info)); } }); } @@ -138,16 +140,16 @@ public class BundleVersionView extends LocatableVLayout implements BookmarkableV tagItem.setCanvas(tagEditor); tagItem.setRowSpan(4);
- StaticTextItem descriptionItem = new StaticTextItem("description", "Description"); + StaticTextItem descriptionItem = new StaticTextItem("description", MSG.common_title_description()); descriptionItem.setValue(version.getDescription());
- StaticTextItem liveDeploymentsItem = new StaticTextItem("deployments", "Deployments"); + StaticTextItem liveDeploymentsItem = new StaticTextItem("deployments", MSG.view_bundle_deployments()); liveDeploymentsItem.setValue(version.getBundleDeployments().size());
- StaticTextItem filesItems = new StaticTextItem("files", "Files"); + StaticTextItem filesItems = new StaticTextItem("files", MSG.view_bundle_files()); filesItems.setValue(version.getBundleFiles().size());
- TextAreaItem recipeItem = new TextAreaItem("recipe", "Recipe"); + TextAreaItem recipeItem = new TextAreaItem("recipe", MSG.view_bundle_recipe()); recipeItem.setDisabled(true); recipeItem.setTitleOrientation(TitleOrientation.TOP); recipeItem.setColSpan(4); @@ -163,7 +165,7 @@ public class BundleVersionView extends LocatableVLayout implements BookmarkableV }
private Tab createLiveDeploymentsTab() { - LocatableTab tab = new LocatableTab(extendLocatorId("Deployments"), "Deployments"); + LocatableTab tab = new LocatableTab(extendLocatorId("Deployments"), MSG.view_bundle_deployments());
Criteria criteria = new Criteria(); criteria.setAttribute("bundleVersionId", version.getId()); @@ -174,7 +176,7 @@ public class BundleVersionView extends LocatableVLayout implements BookmarkableV }
private Tab createFilesTab() { - LocatableTab tab = new LocatableTab(extendLocatorId("Files"), "Files"); + LocatableTab tab = new LocatableTab(extendLocatorId("Files"), MSG.view_bundle_files());
FileListView filesView = new FileListView(tab.getLocatorId(), version.getId());
@@ -199,7 +201,7 @@ public class BundleVersionView extends LocatableVLayout implements BookmarkableV GWTServiceLookup.getBundleService().findBundleVersionsByCriteria(criteria, new AsyncCallback<PageList<BundleVersion>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to load budle version", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_bundle_version_loadFailure(), caught); }
public void onSuccess(PageList<BundleVersion> result) { 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 c398661..305871a 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 @@ -52,15 +52,15 @@ public class FileListView extends LocatableVLayout {
private void viewFiles(PageList<BundleFile> files) {
- Table table = new Table(extendLocatorId("BundleFiles"), "Bundle Files"); + Table table = new Table(extendLocatorId("BundleFiles"), MSG.view_bundle_bundleFiles());
- ListGridField id = new ListGridField("id", "Id"); + ListGridField id = new ListGridField("id", MSG.common_title_id()); id.setWidth("20%");
- ListGridField name = new ListGridField("name", "Name"); + ListGridField name = new ListGridField("name", MSG.common_title_name()); name.setWidth("60%");
- ListGridField size = new ListGridField("size", "File Size"); + ListGridField size = new ListGridField("size", MSG.view_bundle_fileListView_fileSize()); name.setWidth("20%");
// To get the ListGrid the Table must be initialized (via onInit()) by adding to the Canvas @@ -81,7 +81,7 @@ public class FileListView extends LocatableVLayout { GWTServiceLookup.getBundleService().findBundleFilesByCriteria(criteria, new AsyncCallback<PageList<BundleFile>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to load bundle file data", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_bundle_fileListView_loadFailure(), caught); }
public void onSuccess(PageList<BundleFile> result) {
commit 27f80c3dedd8d7c1bb3a8725682aa51e4285d3a3 Author: Lukas Krejci lkrejci@redhat.com Date: Thu Nov 18 14:21:43 2010 +0100
BZ 568917 - Implementing ContentFacet on ScriptComponent so that the support for uploading a new script is complete.
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/RemoteDownloader.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/RemoteDownloader.java index dd408d9..39ed50c 100644 --- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/RemoteDownloader.java +++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/RemoteDownloader.java @@ -46,15 +46,20 @@ import org.rhq.plugins.jbossas5.util.ManagedComponentUtils; public class RemoteDownloader implements PackageDownloader {
private ResourceContext<?> resourceContext; + private boolean resourceExists; private ProfileServiceConnection profileServiceConnection; private static final Log LOG = LogFactory.getLog(RemoteDownloader.class);
/** - * @param resourceContext + * @param resourceContext the resource context if the resource exists or + * the parent resource context if the resource doesn't exist yet + * @param resourceExists this tells the downloader which API to use. This has to go + * hand in hand with the resourceContext that is being provided. * @param profileServiceConnection */ - public RemoteDownloader(ResourceContext<?> resourceContext, ProfileServiceConnection profileServiceConnection) { - this.resourceContext = resourceContext; + public RemoteDownloader(ResourceContext<?> resourceContext, boolean resourceExists, ProfileServiceConnection profileServiceConnection) { + this.resourceContext = resourceContext; + this.resourceExists = resourceExists; this.profileServiceConnection = profileServiceConnection; }
@@ -77,8 +82,13 @@ public class RemoteDownloader implements PackageDownloader { os = new BufferedOutputStream(new FileOutputStream(contentCopy)); ContentContext contentContext = resourceContext.getContentContext(); ContentServices contentServices = contentContext.getContentServices(); - contentServices.downloadPackageBitsForChildResource(contentContext, resourceType.getName(), key, os); - + + if (resourceExists) { + contentServices.downloadPackageBits(contentContext, key, os, true); + } else { + contentServices.downloadPackageBitsForChildResource(contentContext, resourceType.getName(), key, os); + } + return contentCopy; } catch (IOException e) { throw new IllegalStateException("Failed to copy the deployed archive to destination.", e); diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/ScriptDeployer.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/ScriptDeployer.java index 63248f4..dac95a8 100644 --- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/ScriptDeployer.java +++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/ScriptDeployer.java @@ -22,6 +22,8 @@ package org.rhq.plugins.jbossas5.deploy; import java.io.File;
import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.content.transfer.ContentResponseResult; +import org.rhq.core.domain.content.transfer.DeployIndividualPackageResponse; import org.rhq.core.domain.content.transfer.ResourcePackageDetails; import org.rhq.core.domain.resource.CreateResourceStatus; import org.rhq.core.domain.resource.ResourceType; @@ -97,4 +99,56 @@ public class ScriptDeployer implements Deployer { } }
+ public DeployIndividualPackageResponse update(ResourcePackageDetails existingPackage, ResourceType resourceType) { + File script = null; + DeployIndividualPackageResponse response = new DeployIndividualPackageResponse(existingPackage.getKey()); + + try { + + ResourcePackageDetails details = existingPackage; + script = downloader.prepareArchive(details.getKey(), resourceType); + + String targetFileName = script.getName(); + + Configuration deploymentConfig = details.getDeploymentTimeConfiguration(); + if (deploymentConfig != null) { + targetFileName = deploymentConfig.getSimpleValue(PROP_TARGET_FILE_NAME, targetFileName); + } + + File target = new File(binDir, targetFileName); + + if (!ScriptFileFinder.getScriptFileFilter(systemInfo).accept(target)) { + response.setResult(ContentResponseResult.FAILURE); + response.setErrorMessage("The supplied filename has a wrong extension. One of: " + + ScriptFileFinder.getSupportedFileExtensions(systemInfo) + " was expected."); + + return response; + } + + if (!target.exists()) { + response.setResult(ContentResponseResult.FAILURE); + response.setErrorMessage("A file called '" + targetFileName + + "' already exists in the server bin directory."); + + return response; + } + + FileUtil.copyFile(script, target); + //this should be the case, but let's just make sure the script is executable. + target.setExecutable(true, false); + + response.setResult(ContentResponseResult.SUCCESS); + + return response; + } catch (Exception e) { + response.setErrorMessage(e.getMessage()); + response.setResult(ContentResponseResult.FAILURE); + + return response; + } finally { + if (script != null) { + downloader.destroyArchive(script); + } + } + } } diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/CreateChildResourceFacetDelegate.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/CreateChildResourceFacetDelegate.java index 1998ba8..5a9bed1 100644 --- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/CreateChildResourceFacetDelegate.java +++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/CreateChildResourceFacetDelegate.java @@ -150,7 +150,7 @@ public class CreateChildResourceFacetDelegate implements CreateChildResourceFace ProfileServiceConnection profileServiceConnection = this.component.getConnection();
PackageDownloader downloader = runningEmbedded() ? new LocalDownloader() : new RemoteDownloader( - component.getResourceContext(), profileServiceConnection); + component.getResourceContext(), false, profileServiceConnection);
if (ScriptComponent.TYPE_NAME.equals(resourceType.getName())) { String jbossHome = component.getResourceContext().getPluginConfiguration() diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/script/ScriptComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/script/ScriptComponent.java index deaf284..fd283f5 100644 --- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/script/ScriptComponent.java +++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/script/ScriptComponent.java @@ -23,11 +23,16 @@ package org.rhq.plugins.jbossas5.script;
import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.IOException; +import java.io.InputStream; import java.util.ArrayList; +import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.StringTokenizer; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -37,7 +42,17 @@ import org.apache.commons.logging.LogFactory; import org.jetbrains.annotations.NotNull; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.domain.content.PackageDetailsKey; +import org.rhq.core.domain.content.PackageType; +import org.rhq.core.domain.content.transfer.ContentResponseResult; +import org.rhq.core.domain.content.transfer.DeployIndividualPackageResponse; +import org.rhq.core.domain.content.transfer.DeployPackageStep; +import org.rhq.core.domain.content.transfer.DeployPackagesResponse; +import org.rhq.core.domain.content.transfer.RemovePackagesResponse; +import org.rhq.core.domain.content.transfer.ResourcePackageDetails; import org.rhq.core.domain.measurement.AvailabilityType; +import org.rhq.core.pluginapi.content.ContentFacet; +import org.rhq.core.pluginapi.content.ContentServices; import org.rhq.core.pluginapi.inventory.DeleteResourceFacet; import org.rhq.core.pluginapi.inventory.ResourceComponent; import org.rhq.core.pluginapi.inventory.ResourceContext; @@ -47,15 +62,23 @@ import org.rhq.core.pluginapi.util.ProcessExecutionUtility; import org.rhq.core.system.ProcessExecution; import org.rhq.core.system.ProcessExecutionResults; import org.rhq.core.system.SystemInfo; +import org.rhq.core.util.MessageDigestGenerator; import org.rhq.plugins.jbossas5.ApplicationServerComponent; +import org.rhq.plugins.jbossas5.ApplicationServerPluginConfigurationProperties; +import org.rhq.plugins.jbossas5.connection.ProfileServiceConnection; +import org.rhq.plugins.jbossas5.deploy.Deployer; +import org.rhq.plugins.jbossas5.deploy.RemoteDownloader; +import org.rhq.plugins.jbossas5.deploy.ScriptDeployer;
/** * A JON service that provides the ability to execute a script. * * @author Ian Springer + * @author Lukas Krejci */ -public class ScriptComponent implements ResourceComponent<ApplicationServerComponent>, OperationFacet, DeleteResourceFacet { +public class ScriptComponent implements ResourceComponent<ApplicationServerComponent>, OperationFacet, DeleteResourceFacet, ContentFacet { public static final String TYPE_NAME = "Script"; + public static final String PACKAGE_TYPE = "script";
public static final String PATH_CONFIG_PROP = "path"; public static final String ENVIRONMENT_VARIABLES_CONFIG_PROP = "environmentVariables"; @@ -67,6 +90,9 @@ public class ScriptComponent implements ResourceComponent<ApplicationServerCompo private static final String EXIT_CODE_RESULT_PROP = "exitCode"; private static final String OUTPUT_RESULT_PROP = "output";
+ private static final String PACKAGE_VERSION = "none"; + private static final String PACKAGE_ARCHITECTURE = "noarch"; + private final Log log = LogFactory.getLog(this.getClass());
private ResourceContext<ApplicationServerComponent> resourceContext; @@ -142,6 +168,83 @@ public class ScriptComponent implements ResourceComponent<ApplicationServerCompo } }
+ public List<DeployPackageStep> generateInstallationSteps(ResourcePackageDetails packageDetails) { + return null; + } + + public DeployPackagesResponse deployPackages(Set<ResourcePackageDetails> packages, ContentServices contentServices) { + DeployPackagesResponse response = new DeployPackagesResponse(); + if (packages.size() != 1) { + log.warn("Request to deploy a script containing multiple files, which is obivously illegal: " + packages); + response.setOverallRequestResult(ContentResponseResult.FAILURE); + response.setOverallRequestErrorMessage("Only one script can be updated at a time."); + return response; + } + + try { + String jbossHomeDir = resourceContext.getParentResourceComponent().getResourceContext().getPluginConfiguration().getSimpleValue(ApplicationServerPluginConfigurationProperties.HOME_DIR, null); + SystemInfo systemInfo = resourceContext.getSystemInformation(); + ProfileServiceConnection profileServiceConnection = resourceContext.getParentResourceComponent().getConnection(); + + ScriptDeployer deployer = new ScriptDeployer(jbossHomeDir, systemInfo, new RemoteDownloader(resourceContext, true, profileServiceConnection)); + ResourcePackageDetails packageDetails = packages.iterator().next(); + + DeployIndividualPackageResponse scriptUpdateResult = deployer.update(packageDetails, resourceContext.getResourceType()); + + response.setOverallRequestResult(scriptUpdateResult.getResult()); + response.addPackageResponse(scriptUpdateResult); + } catch (Exception e) { + response.setOverallRequestErrorMessage(e.getMessage()); + response.setOverallRequestResult(ContentResponseResult.FAILURE); + } + + return response; + } + + public RemovePackagesResponse removePackages(Set<ResourcePackageDetails> packages) { + throw new UnsupportedOperationException("Cannot remove a package backing a script."); + } + + public Set<ResourcePackageDetails> discoverDeployedPackages(PackageType type) { + Set<ResourcePackageDetails> results = new HashSet<ResourcePackageDetails>(); + if (PACKAGE_TYPE.equals(type.getName())) { + File scriptFile = new File(resourceContext.getResourceKey()); + + PackageDetailsKey key = new PackageDetailsKey(scriptFile.getName(), PACKAGE_VERSION, PACKAGE_TYPE, PACKAGE_ARCHITECTURE); + ResourcePackageDetails details = new ResourcePackageDetails(key); + details.setDisplayName(scriptFile.getName()); + details.setFileName(scriptFile.getAbsolutePath()); + details.setFileSize(scriptFile.length()); + details.setLocation(scriptFile.getAbsolutePath()); + details.setFileCreatedDate(scriptFile.lastModified()); + details.setInstallationTimestamp(System.currentTimeMillis()); + try { + details.setSHA256(new MessageDigestGenerator(MessageDigestGenerator.SHA_256).calcDigestString(scriptFile)); + } catch (IOException e) { + log.warn("Failed to compute the SHA256 digest of the script: " + scriptFile.getAbsolutePath(), e); + } + results.add(details); + } + + return results; + } + + public InputStream retrievePackageBits(ResourcePackageDetails packageDetails) { + String jbossHomeDir = resourceContext.getParentResourceComponent().getResourceContext().getPluginConfiguration().getSimpleValue(ApplicationServerPluginConfigurationProperties.HOME_DIR, null); + File binDir = new File(jbossHomeDir, "bin"); + + String scriptName = packageDetails.getKey().getName(); + + File script = new File(binDir, scriptName); + + try { + return new FileInputStream(script); + } catch (FileNotFoundException e) { + log.warn("Failed to retrieve package bits for script " + packageDetails, e); + return null; + } + } + private void setCommandLineArguments(Configuration params, ProcessExecution processExecution) { List<String> processExecutionArguments = processExecution.getArguments(); if (null == processExecutionArguments) {
commit 9bf79bfb1f8ec9d6694d30192b9df0351efa9004 Merge: d961337... 1957616... Author: Heiko W. Rupp hwr@redhat.com Date: Thu Nov 18 09:33:34 2010 +0100
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit 1957616d40a17eccb9221463720c876eaea8c4ab Author: Jay Shaughnessy jshaughn@redhat.com Date: Wed Nov 17 22:52:54 2010 -0500
I18N work - Refactor of VIEW_ID from string to ViewName to allow separation between the name, used in view paths, and the title, used for display in the section trees. Previously the name was used everywhere, with deCamelCase logic for display.
Also, packages: org.rhq.core.client org.rhq.core.domain.measurement org.rhq.core.rebind org.rhq.enterprise.gui.coregui.client org.rhq.enterprise.gui.coregui.client.admin
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/core/domain/measurement/MeasurementConverterClient.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/core/domain/measurement/MeasurementConverterClient.java index f084ec0..64eea4a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/core/domain/measurement/MeasurementConverterClient.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/core/domain/measurement/MeasurementConverterClient.java @@ -29,10 +29,14 @@ import com.google.gwt.i18n.client.NumberFormat;
import org.rhq.core.domain.measurement.composite.MeasurementNumericValueAndUnits; import org.rhq.core.domain.measurement.util.MeasurementConversionException; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.Messages;
public class MeasurementConverterClient { + private static final Messages MSG = CoreGUI.getMessages(); + private static final int MAX_PRECISION_DIGITS = 4; - private static final String NULL_OR_NAN_FORMATTED_VALUE = "--no data available--"; + private static final String NULL_OR_NAN_FORMATTED_VALUE = MSG.view_measure_nan();
private static NumberFormat getDefaultNumberFormat() { NumberFormat nf = NumberFormat.getFormat("0.0"); @@ -122,7 +126,6 @@ public class MeasurementConverterClient { targetUnits = fittedUnits; }
- @SuppressWarnings("unused") Set<String> existingStrings; // technically this *is* unused because int precisionDigits = 0; boolean scaleWithMorePrecision = true; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/core/rebind/RecordBuilderGenerator.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/core/rebind/RecordBuilderGenerator.java index 1196b78..940b7de 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/core/rebind/RecordBuilderGenerator.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/core/rebind/RecordBuilderGenerator.java @@ -18,6 +18,10 @@ */ package org.rhq.core.rebind;
+import java.io.PrintWriter; + +import javax.persistence.Entity; + import com.google.gwt.core.ext.Generator; import com.google.gwt.core.ext.GeneratorContext; import com.google.gwt.core.ext.TreeLogger; @@ -29,10 +33,6 @@ import com.google.gwt.core.ext.typeinfo.TypeOracle; import com.google.gwt.user.rebind.ClassSourceFileComposerFactory; import com.google.gwt.user.rebind.SourceWriter;
-import javax.persistence.Entity; - -import java.io.PrintWriter; - /** * This is the start to a rebinder for our domain entities to allow for the * easy generation of Smart's Record objects. @@ -57,7 +57,8 @@ public class RecordBuilderGenerator extends Generator { * Create a new type that satisfies the rebind request. */ @Override - public String generate(TreeLogger logger, GeneratorContext context, String typeName) throws UnableToCompleteException { + public String generate(TreeLogger logger, GeneratorContext context, String typeName) + throws UnableToCompleteException {
System.out.println("classType " + typeName);
@@ -83,11 +84,8 @@ public class RecordBuilderGenerator extends Generator { return typeOracle; }
- @SuppressWarnings("unused") protected void writeSource() throws UnableToCompleteException {
- - JField[] fields = requestedClass.getFields();
writeBuildRecordMethod(fields, sourceWriter); @@ -100,24 +98,22 @@ public class RecordBuilderGenerator extends Generator { return "__" + baseClass.getSimpleSourceName() + "_RecordBuilder"; }
- private SourceWriter getSourceWriter(TreeLogger logger, GeneratorContext ctx, - String packageName, String className, String superclassName) { + private SourceWriter getSourceWriter(TreeLogger logger, GeneratorContext ctx, String packageName, String className, + String superclassName) {
PrintWriter printWriter = ctx.tryCreate(logger, packageName, className); if (printWriter == null) { return null; }
- ClassSourceFileComposerFactory composerFactory = new ClassSourceFileComposerFactory( - packageName, className); + ClassSourceFileComposerFactory composerFactory = new ClassSourceFileComposerFactory(packageName, className);
composerFactory.setSuperclass(superclassName);
return composerFactory.createSourceWriter(ctx, printWriter); }
- private boolean init(TreeLogger logger, GeneratorContext context, - String typeName) throws UnableToCompleteException { + private boolean init(TreeLogger logger, GeneratorContext context, String typeName) throws UnableToCompleteException { this.logger = logger; typeOracle = context.getTypeOracle(); assert typeOracle != null; @@ -125,12 +121,8 @@ public class RecordBuilderGenerator extends Generator { try { requestedClass = typeOracle.getType(typeName); } catch (NotFoundException e) { - logger.log( - TreeLogger.ERROR, - "Could not find type '" - + typeName - + "'; please see the log, as this usually indicates a previous error ", - e); + logger.log(TreeLogger.ERROR, "Could not find type '" + typeName + + "'; please see the log, as this usually indicates a previous error ", e); throw new UnableToCompleteException(); }
@@ -139,7 +131,7 @@ public class RecordBuilderGenerator extends Generator { return false; }
- System.out.println("$$$$$$$$Making a record builder for: "+ typeName); + System.out.println("$$$$$$$$Making a record builder for: " + typeName);
// Get the stub class name, and see if its source file exists. // @@ -147,20 +139,21 @@ public class RecordBuilderGenerator extends Generator { packageName = requestedClass.getPackage().getName(); qualifiedStubClassName = packageName + "." + simpleStubClassName;
- sourceWriter = getSourceWriter(logger, context, packageName, - simpleStubClassName, requestedClass.getQualifiedSourceName()); + sourceWriter = getSourceWriter(logger, context, packageName, simpleStubClassName, requestedClass + .getQualifiedSourceName());
return sourceWriter != null; }
private void writeBuildRecordMethod(JField[] fields, SourceWriter sw) { sw.println(); - sw.println("protected final com.smartgwt.client.data.Record buildRecord(" + requestedClass.getQualifiedSourceName() + " entity) throws Throwable {"); + sw.println("protected final com.smartgwt.client.data.Record buildRecord(" + + requestedClass.getQualifiedSourceName() + " entity) throws Throwable {"); sw.indent();
sw.println("com.smartgwt.client.data.Record record = new com.smartgwt.client.data.Record();");
- for (JField field :fields) { + for (JField field : fields) { sw.println("record.setAttribute("" + field.getName() + "", " + field.getName() + ");"); } sw.println("return record;"); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java index dae9e37..6b56f11 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java @@ -41,9 +41,9 @@ import org.rhq.enterprise.gui.coregui.client.admin.AdministrationView; import org.rhq.enterprise.gui.coregui.client.alert.AlertHistoryView; import org.rhq.enterprise.gui.coregui.client.bundle.BundleTopView; import org.rhq.enterprise.gui.coregui.client.dashboard.DashboardsView; +import org.rhq.enterprise.gui.coregui.client.inventory.InventoryView; import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.ResourceGroupDetailView; import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.ResourceGroupTopView; -import org.rhq.enterprise.gui.coregui.client.inventory.InventoryView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.ResourceTopView; import org.rhq.enterprise.gui.coregui.client.menu.MenuBarView; import org.rhq.enterprise.gui.coregui.client.report.ReportTopView; @@ -63,7 +63,9 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility; * @author Ian Springer */ public class CoreGUI implements EntryPoint, ValueChangeHandler<String> { - private static final String DEFAULT_VIEW_PATH = DashboardsView.VIEW_ID; + private static final Messages MSG = CoreGUI.getMessages(); + + private static final String DEFAULT_VIEW_PATH = DashboardsView.VIEW_ID.getName();
// just to avoid constructing this over and over private static final String TREE_NAV_VIEW_PATTERN = "(" + ResourceTopView.VIEW_ID + "|" @@ -120,7 +122,7 @@ public class CoreGUI implements EntryPoint, ValueChangeHandler<String> {
GWT.setUncaughtExceptionHandler(new GWT.UncaughtExceptionHandler() { public void onUncaughtException(Throwable e) { - getErrorHandler().handleError("Globally uncaught exception", e); + getErrorHandler().handleError(MSG.view_core_uncaught(), e); } });
@@ -191,31 +193,31 @@ public class CoreGUI implements EntryPoint, ValueChangeHandler<String> { public Canvas createContent(String breadcrumbName) { Canvas canvas;
- if (breadcrumbName.equals(AdministrationView.VIEW_ID)) { + if (breadcrumbName.equals(AdministrationView.VIEW_ID.getName())) { canvas = new AdministrationView(); - } else if (breadcrumbName.equals(InventoryView.VIEW_ID)) { + } else if (breadcrumbName.equals(InventoryView.VIEW_ID.getName())) { canvas = new InventoryView(); - } else if (breadcrumbName.equals(ResourceTopView.VIEW_ID)) { - canvas = new ResourceTopView("Resource"); - } else if (breadcrumbName.equals(ResourceGroupTopView.VIEW_ID)) { - canvas = new ResourceGroupTopView("Group"); - } else if (breadcrumbName.equals(DashboardsView.VIEW_ID)) { - canvas = new DashboardsView("Dashboard"); - } else if (breadcrumbName.equals(BundleTopView.VIEW_ID)) { - canvas = new BundleTopView("Bundle"); + } else if (breadcrumbName.equals(ResourceTopView.VIEW_ID.getName())) { + canvas = new ResourceTopView(breadcrumbName); + } else if (breadcrumbName.equals(ResourceGroupTopView.VIEW_ID.getName())) { + canvas = new ResourceGroupTopView(breadcrumbName); + } else if (breadcrumbName.equals(DashboardsView.VIEW_ID.getName())) { + canvas = new DashboardsView(breadcrumbName); + } else if (breadcrumbName.equals(BundleTopView.VIEW_ID.getName())) { + canvas = new BundleTopView(breadcrumbName); } else if (breadcrumbName.equals("LogOut")) { // TODO: don't make LogOut a history event, just perform the logout action by responding to click event - LoginView logoutView = new LoginView(); + LoginView logoutView = new LoginView("Login"); canvas = logoutView; UserSessionManager.logout(); logoutView.showLoginDialog(); - } else if (breadcrumbName.equals(TaggedView.VIEW_ID)) { - canvas = new TaggedView("Tag"); + } else if (breadcrumbName.equals(TaggedView.VIEW_ID.getName())) { + canvas = new TaggedView(breadcrumbName); } else if (breadcrumbName.equals("Subsystems")) { canvas = new AlertHistoryView("Alert"); - } else if (breadcrumbName.equals(ReportTopView.VIEW_ID)) { + } else if (breadcrumbName.equals(ReportTopView.VIEW_ID.getName())) { canvas = new ReportTopView(); - } else if (breadcrumbName.equals(TestTopView.VIEW_ID)) { + } else if (breadcrumbName.equals(TestTopView.VIEW_ID.getName())) { canvas = new TestTopView(); } else { canvas = null; @@ -329,12 +331,12 @@ public class CoreGUI implements EntryPoint, ValueChangeHandler<String> {
if (this.currentCanvas instanceof BookmarkableView) { if (this.currentCanvas instanceof InitializableView) { - final InitializableView initializableView = (InitializableView)this.currentCanvas; + final InitializableView initializableView = (InitializableView) this.currentCanvas; final long startTime = System.currentTimeMillis(); final Timer timer = new Timer() { public void run() { if (initializableView.isInitialized()) { - ((BookmarkableView)currentCanvas).renderView(viewPath.next()); + ((BookmarkableView) currentCanvas).renderView(viewPath.next()); } else { long elapsedMillis = System.currentTimeMillis() - startTime; if (elapsedMillis < 5000) { @@ -345,12 +347,12 @@ public class CoreGUI implements EntryPoint, ValueChangeHandler<String> { } }; if (initializableView.isInitialized()) { - ((BookmarkableView)currentCanvas).renderView(viewPath.next()); + ((BookmarkableView) currentCanvas).renderView(viewPath.next()); } else { timer.schedule(100); } } else { - ((BookmarkableView)currentCanvas).renderView(viewPath.next()); + ((BookmarkableView) currentCanvas).renderView(viewPath.next()); } }
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 87520b7..1c9e15b 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 @@ -119,11 +119,11 @@ public class Footer extends LocatableToolStrip { }
public void refreshLoggedIn() { - setContents("Logged in as " + UserSessionManager.getSessionSubject().getName()); + setContents(MSG.view_core_loggedInAs(UserSessionManager.getSessionSubject().getName())); }
public void refreshLoggedOut() { - setContents("Logged out"); + setContents(MSG.view_core_loggedOut()); } }
@@ -158,15 +158,15 @@ public class Footer extends LocatableToolStrip { GWTServiceLookup.getAlertService().findAlertsByCriteria(alertCriteria, new AsyncCallback<PageList<Alert>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Latest alerts lookup failed", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_core_error_1(), caught); }
public void onSuccess(PageList<Alert> result) { if (result.isEmpty()) { - setContents("no recent alerts"); + setContents(MSG.view_core_recentAlerts("0")); setIcon("subsystems/alert/Alert_LOW_16.png"); } else { - setContents(result.getTotalSize() + " recent alerts"); + setContents(MSG.view_core_recentAlerts(Integer.toString(result.getTotalSize()))); setIcon("subsystems/alert/Alert_HIGH_16.png"); } } 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 841d8e0..ae10b19 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 @@ -35,7 +35,6 @@ import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.types.Alignment; import com.smartgwt.client.types.FormErrorOrientation; import com.smartgwt.client.types.VerticalAlignment; -import com.smartgwt.client.widgets.Canvas; import com.smartgwt.client.widgets.HTMLFlow; import com.smartgwt.client.widgets.IButton; import com.smartgwt.client.widgets.Img; @@ -68,12 +67,15 @@ 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.BrowserUtility; import org.rhq.enterprise.gui.coregui.client.util.message.Message; +import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableCanvas; +import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm; +import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableIButton;
/** * @author Greg Hinkle * @author Joseph Marques */ -public class LoginView extends Canvas { +public class LoginView extends LocatableCanvas {
private static boolean loginShowing = false;
@@ -83,7 +85,8 @@ public class LoginView extends Canvas { private SubmitItem loginButton; private ValuesManager valuesManager = new ValuesManager();
- public LoginView() { + public LoginView(String locatorId) { + super(locatorId); }
//registration fields @@ -111,7 +114,7 @@ public class LoginView extends Canvas { loginShowing = true; UserSessionManager.logout();
- form = new DynamicForm(); + form = new LocatableDynamicForm("LoginView"); form.setMargin(25); form.setAutoFocus(true); form.setShowErrorText(true); @@ -122,17 +125,17 @@ public class LoginView extends Canvas { logo.setShowTitle(false);
HeaderItem header = new HeaderItem(); - header.setValue("Please Login"); + header.setValue(MSG.view_login_prompt());
- TextItem user = new TextItem("user", "User"); + TextItem user = new TextItem("user", MSG.common_title_user()); user.setRequired(true); user.setAttribute("autoComplete", "native");
- final PasswordItem password = new PasswordItem("password", "Password"); + final PasswordItem password = new PasswordItem("password", MSG.dataSource_users_field_password()); password.setRequired(true); password.setAttribute("autoComplete", "native");
- loginButton = new SubmitItem("login", "Login"); + loginButton = new SubmitItem("login", MSG.view_login_login()); loginButton.setAlign(Alignment.CENTER); loginButton.setColSpan(2);
@@ -201,35 +204,33 @@ public class LoginView extends Canvas {
VLayout column = new VLayout(); HeaderItem header = new HeaderItem(); - header - .setValue("Welcome to JBoss ON! <br/><br/> Enter/update the following fields to complete your registration process." - + "<br/> Once you click "OK" you will be logged in.<br/><br/>"); + header.setValue(MSG.view_login_welcome()); //build ui elements for registration screen - first = new TextItem(FIRST, "First Name"); + first = new TextItem(FIRST, MSG.dataSource_users_field_firstName()); { first.setRequired(true); first.setWrapTitle(false); first.setWidth(fieldWidth); } - last = new TextItem(LAST, "Last Name"); + last = new TextItem(LAST, MSG.dataSource_users_field_lastName()); { last.setWrapTitle(false); last.setWidth(fieldWidth); last.setRequired(true); } - final TextItem username = new TextItem(USERNAME, "Username"); + final TextItem username = new TextItem(USERNAME, MSG.dataSource_users_field_name()); { username.setValue(user);
username.setDisabled(true); username.setWidth(fieldWidth); } - email = new TextItem(EMAIL, "Email"); + email = new TextItem(EMAIL, MSG.dataSource_users_field_emailAddress()); email.setRequired(true); email.setWidth(fieldWidth); - phone = new TextItem(PHONE, "Phone"); + phone = new TextItem(PHONE, MSG.dataSource_users_field_phoneNumber()); phone.setWidth(fieldWidth); - department = new TextItem(DEPARTMENT, "Department"); + department = new TextItem(DEPARTMENT, MSG.dataSource_users_field_department()); department.setWidth(fieldWidth); SpacerItem space = new SpacerItem(); space.setColSpan(1); @@ -256,7 +257,7 @@ public class LoginView extends Canvas { .trim().isEmpty())); //check for session timeout if (UserSessionManager.isLoggedOut() || (credentialsEmpty)) { - resetLogin(); + resetLogin(LoginView.this.extendLocatorId("Register")); return; }
@@ -272,7 +273,7 @@ public class LoginView extends Canvas { form.setValue(DEPARTMENT, String.valueOf(department.getValue())); form.setValue(SESSIONID, sessionId); form.setValue(PASSWORD, password); - registerLdapUser(form, callback); + registerLdapUser(LoginView.this.extendLocatorId("RegisterLdap"), form, callback); } }
@@ -307,20 +308,20 @@ public class LoginView extends Canvas { }
public void onFailure(Throwable caught) { - form.setFieldErrors(FIRST, - "Note: Optional retrieval of ldap details unsuccessful. Manual entry required.", true); - Log.debug("Optional LDAP detail retrieval did not succeed. Registration prepopulation will not occur."); + form.setFieldErrors(FIRST, MSG.view_login_noLdap(), true); + Log + .debug("Optional LDAP detail retrieval did not succeed. Registration prepopulation will not occur."); } });
- IButton resetButton = new IButton("Reset"); + IButton resetButton = new LocatableIButton(MSG.common_button_reset()); resetButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent event) { //F5 refresh check? If they've reloaded the form for some reason then bail. boolean credentialsEmpty = ((user == null) || (user.trim().isEmpty()) || (password == null) || (password .trim().isEmpty())); if (UserSessionManager.isLoggedOut() || credentialsEmpty) { - resetLogin(); + resetLogin(LoginView.this.extendLocatorId("Reset")); return; }
@@ -341,16 +342,16 @@ public class LoginView extends Canvas { }); row.addMember(resetButton);
- IButton logout = new IButton("Logout"); + IButton logout = new LocatableIButton(MSG.view_login_logout()); logout.addClickHandler(new ClickHandler() { public void onClick(ClickEvent event) { UserSessionManager.logout(); - resetLogin(); + resetLogin(LoginView.this.extendLocatorId("Reset")); return; } }); row.addMember(logout); - Label logoutLabel = new Label("(Logout - Complete registration later.)"); + Label logoutLabel = new Label(MSG.view_login_registerLater()); logoutLabel.setWrap(false); row.addMember(logoutLabel); column.addMember(row); @@ -359,7 +360,7 @@ public class LoginView extends Canvas { window = new Window(); window.setWidth(800); window.setHeight(300); - window.setTitle("Register User"); + window.setTitle(MSG.view_login_registerUser());
// forced focused, static size, can't close / dismiss window.setIsModal(true); @@ -377,11 +378,11 @@ public class LoginView extends Canvas {
/** Go through steps of invalidating this login and piping them back to CoreGUI Login. */ - private void resetLogin() { + private void resetLogin(String locatorId) { window.destroy(); loginShowing = false; UserSessionManager.logout(); - new LoginView().showLoginDialog(); + new LoginView(locatorId).showLoginDialog(); }
/**Uses the information from the populated form to create the Subject for the new LDAP user. @@ -389,7 +390,8 @@ public class LoginView extends Canvas { * @param populatedForm - validated data * @param callback */ - protected void registerLdapUser(DynamicForm populatedForm, final AsyncCallback<Subject> callback) { + protected void registerLdapUser(final String locatorId, DynamicForm populatedForm, + final AsyncCallback<Subject> callback) {
final Subject newSubject = new Subject(); newSubject.setId(0);//enforce registration element for LDAP processing @@ -446,14 +448,14 @@ public class LoginView extends Canvas { Log.debug("Failed to register LDAP subject '" + newSubject.getName() + "' " + caught.getMessage()); //TODO: pass in warning message to Login Dialog. - new LoginView().showLoginDialog(); + new LoginView(locatorId).showLoginDialog(); }
public void onSuccess(Subject checked) { Log.trace("Successfully registered LDAP subject '" + checked + "'.");
CoreGUI.getMessageCenter().notify( - new Message("Succesfully registered the new ldap Subject.", Message.Severity.Info)); + new Message(MSG.view_login_registerLdapSuccess(), Message.Severity.Info)); Log.trace("Succesfully registered the new ldap Subject."); window.destroy(); loginShowing = false; @@ -467,7 +469,7 @@ public class LoginView extends Canvas { window.destroy(); loginShowing = false; //TODO: pass informative message to login. - new LoginView().showLoginDialog(); + new LoginView(locatorId).showLoginDialog(); } }
@@ -492,7 +494,7 @@ public class LoginView extends Canvas { } if (name.equals(EMAIL)) { RegExpValidator emailValidator = new RegExpValidator(); - emailValidator.setErrorMessage("Invalid email address"); + emailValidator.setErrorMessage(MSG.view_login_invalidEmail()); emailValidator.setExpression("^([a-zA-Z0-9_.\-+])+@(([a-zA-Z0-9\-])+\.)+[a-zA-Z0-9]{2,4}$"); item.setValidators(emailValidator); } @@ -545,9 +547,9 @@ public class LoginView extends Canvas {
private void handleError(int statusCode) { if (statusCode == 401) { - form.setFieldErrors("login", "The username or password provided does not match our records", true); + form.setFieldErrors("login", MSG.view_login_noUser(), true); } else { - form.setFieldErrors("login", "The backend data source is unavailable", true); + form.setFieldErrors("login", MSG.view_login_noBackend(), true); } loginButton.setDisabled(false); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/SearchGUI.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/SearchGUI.java index 0932e6f..97d784e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/SearchGUI.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/SearchGUI.java @@ -29,6 +29,7 @@ import org.rhq.enterprise.gui.coregui.client.search.SearchBar; * @author Joseph Marques */ public class SearchGUI implements EntryPoint { + private static final Messages MSG = CoreGUI.getMessages();
public static SearchGUI singleton = new SearchGUI(); private SearchBar searchBar; @@ -49,7 +50,7 @@ public class SearchGUI implements EntryPoint { UserSessionManager.checkLoginStatus(null, null, new AsyncCallback<Subject>() { @Override public void onFailure(Throwable caught) { - SC.say("Unable to determine login status, check server status"); + SC.say(MSG.view_searchGUI_loginStatus()); }
@Override diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserPermissionsManager.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserPermissionsManager.java index fbf32a9..acbb575 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserPermissionsManager.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserPermissionsManager.java @@ -44,6 +44,7 @@ import org.rhq.enterprise.gui.coregui.client.util.message.MessageCenter; * @author Ian Springer */ public class UserPermissionsManager { + private static final Messages MSG = CoreGUI.getMessages();
private static final UserPermissionsManager INSTANCE = new UserPermissionsManager(); private static final AuthorizationGWTServiceAsync AUTHORIZATION_SERVICE = GWTServiceLookup @@ -179,8 +180,8 @@ public class UserPermissionsManager { private void loadGlobalPermissions() { AUTHORIZATION_SERVICE.getExplicitGlobalPermissions(new AsyncCallback<Set<Permission>>() { public void onFailure(Throwable throwable) { - MESSAGE_CENTER.notify(new Message("Failed to load your global permissions - assuming none for now.", - throwable, Message.Severity.Error, EnumSet.of(Message.Option.BackgroundJobResult))); + MESSAGE_CENTER.notify(new Message(MSG.util_userPerm_loadFailGlobal(), throwable, + Message.Severity.Error, EnumSet.of(Message.Option.BackgroundJobResult))); UserPermissionsManager.this.globalPermissions.clear(); UserPermissionsManager.this.globalCacheDirty = true; notifyGlobalPermissionsLoadedListener(); @@ -204,9 +205,9 @@ public class UserPermissionsManager { private void loadCurrentResourcePermissions() { AUTHORIZATION_SERVICE.getExplicitResourcePermissions(this.currentId, new AsyncCallback<Set<Permission>>() { public void onFailure(Throwable throwable) { - MESSAGE_CENTER.notify(new Message("Failed to load your permissions for Resource with id [" - + UserPermissionsManager.this.currentId + "] - assuming none for now.", throwable, - Message.Severity.Error, EnumSet.of(Message.Option.BackgroundJobResult))); + MESSAGE_CENTER.notify(new Message(MSG.util_userPerm_loadFailResource(Integer + .toString(UserPermissionsManager.this.currentId)), throwable, Message.Severity.Error, EnumSet + .of(Message.Option.BackgroundJobResult))); UserPermissionsManager.this.resourcePermissions.clear(); UserPermissionsManager.this.resourceCacheDirty = true; notifyResourcePermissionsLoadedListener(); @@ -223,9 +224,9 @@ public class UserPermissionsManager { private void loadCurrentGroupPermissions() { AUTHORIZATION_SERVICE.getExplicitGroupPermissions(this.currentId, new AsyncCallback<Set<Permission>>() { public void onFailure(Throwable throwable) { - MESSAGE_CENTER.notify(new Message("Failed to load your permissions for group with id [" - + UserPermissionsManager.this.currentId + "] - assuming none for now.", throwable, - Message.Severity.Error, EnumSet.of(Message.Option.BackgroundJobResult))); + MESSAGE_CENTER.notify(new Message(MSG.util_userPerm_loadFailGroup(Integer + .toString(UserPermissionsManager.this.currentId)), throwable, Message.Severity.Error, EnumSet + .of(Message.Option.BackgroundJobResult))); UserPermissionsManager.this.resourcePermissions.clear(); UserPermissionsManager.this.resourceCacheDirty = true; notifyResourcePermissionsLoadedListener(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserSessionManager.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserSessionManager.java index 759d3e3..179ecbe 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserSessionManager.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserSessionManager.java @@ -57,12 +57,16 @@ import org.rhq.enterprise.gui.coregui.client.util.preferences.UserPreferences; * @author Joseph Marques */ public class UserSessionManager { + private static final Messages MSG = CoreGUI.getMessages(); + public static int SESSION_TIMEOUT = 29 * 60 * 1000; // 29 mins, just shorter than the 30-min web session timeout private static int LOGOUT_DELAY = 5 * 1000; // wait 5 seconds for in-flight requests to complete before logout
public static final String SESSION_NAME = "RHQ_Session"; private static final UserPermissionsManager USER_PERMISSIONS_MANAGER = UserPermissionsManager.getInstance();
+ private static final String LOCATOR_ID = "SessionManagerLogin"; + private static Subject sessionSubject; private static UserPreferences userPreferences;
@@ -78,7 +82,7 @@ public class UserSessionManager { public void run() { Log.info("Session timer expired."); sessionState = State.IS_LOGGED_OUT; - new LoginView().showLoginDialog(); // log user out, show login dialog + new LoginView(LOCATOR_ID).showLoginDialog(); // log user out, show login dialog } }; private static Timer logoutTimer = new Timer() { @@ -156,7 +160,7 @@ public class UserSessionManager { Log .trace("Unable to locate information critical to ldap registration/account lookup. Log back in."); sessionState = State.IS_LOGGED_OUT; - new LoginView().showLoginDialog(); + new LoginView(LOCATOR_ID).showLoginDialog(); return; }
@@ -185,8 +189,8 @@ public class UserSessionManager { if (results.size() == 0) {//no case insensitive matches found, launch registration Log.trace("Proceeding with registration for ldap user '" + user + "'."); sessionState = State.IS_REGISTERING; - new LoginView().showRegistrationDialog(subject.getName(), sessionId, - password, callback); + new LoginView(LOCATOR_ID).showRegistrationDialog(subject.getName(), + sessionId, password, callback); return; } else {//launch case sensitive code handling Subject locatedSubject = results.get(0); @@ -204,7 +208,7 @@ public class UserSessionManager { Log.debug("Failed to complete ldap processing for subject:" + caught.getMessage()); //TODO: pass message to login dialog. - new LoginView().showLoginDialog(); + new LoginView(LOCATOR_ID).showLoginDialog(); return; }
@@ -232,11 +236,11 @@ public class UserSessionManager { GWTServiceLookup.getSubjectService().findSubjectsByCriteria(criteria, new AsyncCallback<PageList<Subject>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError( - "UserSessionManager: Failed to load user's subject", caught); + CoreGUI.getErrorHandler().handleError(MSG.util_userSession_loadFailSubject(), + caught); Log.info("Failed to load user's subject"); //TODO: pass message to login ui. - new LoginView().showLoginDialog(); + new LoginView(LOCATOR_ID).showLoginDialog(); return; }
@@ -277,7 +281,7 @@ public class UserSessionManager { }//end of server side session check; } else {//invalid client session. Back to login sessionState = State.IS_LOGGED_OUT; - new LoginView().showLoginDialog(); + new LoginView(LOCATOR_ID).showLoginDialog(); return; } } @@ -369,7 +373,7 @@ public class UserSessionManager { sessionState = State.IS_LOGGED_OUT; Log.info("Destroying session timer..."); sessionTimer.cancel(); - + USER_PERMISSIONS_MANAGER.clearCache();
// log out the web session on the server-side in a delayed fashion, @@ -383,7 +387,7 @@ public class UserSessionManager { GWTServiceLookup.getSubjectService().logout(UserSessionManager.getSessionSubject(), new AsyncCallback<Void>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to logout.", caught); + CoreGUI.getErrorHandler().handleError(MSG.util_userSession_logoutFail(), caught); }
public void onSuccess(Void result) { @@ -392,7 +396,7 @@ public class UserSessionManager { }); } } catch (Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to logout.", caught); + CoreGUI.getErrorHandler().handleError(MSG.util_userSession_logoutFail(), caught); } }
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 a439288..c253fda 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 @@ -33,6 +33,7 @@ import org.rhq.enterprise.gui.coregui.client.components.view.AbstractSectionedLe 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;
/** * The Administration top-level view. @@ -41,27 +42,32 @@ import org.rhq.enterprise.gui.coregui.client.components.view.ViewFactory; * @author Ian Springer */ public class AdministrationView extends AbstractSectionedLeftNavigationView { - public static final String VIEW_ID = "Administration"; + public static final ViewName VIEW_ID = new ViewName("Administration", MSG.view_admin_administration());
- public static final String SECTION_SECURITY_VIEW_ID = "Security"; - public static final String SECTION_TOPOLOGY_VIEW_ID = "Topology"; - public static final String SECTION_CONFIGURATION_VIEW_ID = "Configuration"; + public static final ViewName SECTION_SECURITY_VIEW_ID = new ViewName("Security", MSG.view_admin_security()); + public static final ViewName SECTION_TOPOLOGY_VIEW_ID = new ViewName("Topology", MSG.view_admin_topology()); + public static final ViewName SECTION_CONFIGURATION_VIEW_ID = new ViewName("Configuration", MSG + .view_admin_configuration());
// TODO these iframe page view ids should go away in favor of the gwt view page view_id, when available - private static final String PAGE_SERVERS_VIEW_ID = "Servers"; - private static final String PAGE_AGENTS_VIEW_ID = "Agents"; - private static final String PAGE_AFFINITY_GROUPS_VIEW_ID = "AffinityGroups"; - private static final String PAGE_PARTITION_EVENTS_VIEW_ID = "PartitionEvents"; + private static final ViewName PAGE_SERVERS_VIEW_ID = new ViewName("Servers", MSG.view_adminTopology_servers()); + private static final ViewName PAGE_AGENTS_VIEW_ID = new ViewName("Agents", MSG.view_adminTopology_agents()); + private static final ViewName PAGE_AFFINITY_GROUPS_VIEW_ID = new ViewName("AffinityGroups", MSG + .view_adminTopology_affinityGroups()); + private static final ViewName PAGE_PARTITION_EVENTS_VIEW_ID = new ViewName("PartitionEvents", MSG + .view_adminTopology_partitionEvents());
- private static final String PAGE_SYSTEM_SETTINGS_VIEW_ID = "SystemSettings"; - private static final String PAGE_TEMPLATES_VIEW_ID = "Templates"; - private static final String PAGE_DOWNLOADS_VIEW_ID = "Downloads"; - private static final String PAGE_LICENSE_VIEW_ID = "License"; - private static final String PAGE_PLUGINS_VIEW_ID = "Plugins"; + // TODO these iframe page view ids should go away in favor of the gwt view page view_id, when available + private static final ViewName PAGE_SYSTEM_SETTINGS_VIEW_ID = new ViewName("SystemSettings", MSG + .view_adminConfig_systemSettings()); + private static final ViewName PAGE_TEMPLATES_VIEW_ID = new ViewName("Templates", MSG.view_adminConfig_templates()); + private static final ViewName PAGE_DOWNLOADS_VIEW_ID = new ViewName("Downloads", MSG.view_adminConfig_downloads()); + private static final ViewName PAGE_LICENSE_VIEW_ID = new ViewName("License", MSG.view_adminConfig_license()); + private static final ViewName PAGE_PLUGINS_VIEW_ID = new ViewName("Plugins", MSG.view_adminConfig_plugins());
public AdministrationView() { // This is a top level view, so our locator id can simply be our view id. - super(VIEW_ID); + super(VIEW_ID.getName()); }
@Override @@ -108,28 +114,28 @@ public class AdministrationView extends AbstractSectionedLeftNavigationView { private NavigationSection buildTopologySection() { NavigationItem serversItem = new NavigationItem(PAGE_SERVERS_VIEW_ID, null, new ViewFactory() { public Canvas createView() { - return new FullHTMLPane(extendLocatorId(PAGE_SERVERS_VIEW_ID), + return new FullHTMLPane(extendLocatorId(PAGE_SERVERS_VIEW_ID.getName()), "/rhq/ha/listServers-plain.xhtml?nomenu=true"); } });
NavigationItem agentsItem = new NavigationItem(PAGE_AGENTS_VIEW_ID, null, new ViewFactory() { public Canvas createView() { - return new FullHTMLPane(extendLocatorId(PAGE_AGENTS_VIEW_ID), + return new FullHTMLPane(extendLocatorId(PAGE_AGENTS_VIEW_ID.getName()), "/rhq/ha/listAgents-plain.xhtml?nomenu=true"); } });
NavigationItem affinityGroupsItem = new NavigationItem(PAGE_AFFINITY_GROUPS_VIEW_ID, null, new ViewFactory() { public Canvas createView() { - return new FullHTMLPane(extendLocatorId(PAGE_AFFINITY_GROUPS_VIEW_ID), + return new FullHTMLPane(extendLocatorId(PAGE_AFFINITY_GROUPS_VIEW_ID.getName()), "/rhq/ha/listAffinityGroups-plain.xhtml?nomenu=true"); } });
NavigationItem partitionEventsItem = new NavigationItem(PAGE_PARTITION_EVENTS_VIEW_ID, null, new ViewFactory() { public Canvas createView() { - return new FullHTMLPane(extendLocatorId(PAGE_PARTITION_EVENTS_VIEW_ID), + return new FullHTMLPane(extendLocatorId(PAGE_PARTITION_EVENTS_VIEW_ID.getName()), "/rhq/ha/listPartitionEvents-plain.xhtml?nomenu=true"); } }); @@ -148,35 +154,35 @@ public class AdministrationView extends AbstractSectionedLeftNavigationView { private NavigationSection buildConfigurationSection() { NavigationItem systemSettingsItem = new NavigationItem(PAGE_SYSTEM_SETTINGS_VIEW_ID, null, new ViewFactory() { public Canvas createView() { - return new FullHTMLPane(extendLocatorId(PAGE_SYSTEM_SETTINGS_VIEW_ID), + return new FullHTMLPane(extendLocatorId(PAGE_SYSTEM_SETTINGS_VIEW_ID.getName()), "/admin/config/Config.do?mode=edit&nomenu=true"); } });
NavigationItem templatesItem = new NavigationItem(PAGE_TEMPLATES_VIEW_ID, null, new ViewFactory() { public Canvas createView() { - return new ResourceTypeTreeView(extendLocatorId(PAGE_TEMPLATES_VIEW_ID)); + return new ResourceTypeTreeView(extendLocatorId(PAGE_TEMPLATES_VIEW_ID.getName())); } }); templatesItem.setRefreshRequired(true); // we always need a new page
NavigationItem downloadsItem = new NavigationItem(PAGE_DOWNLOADS_VIEW_ID, null, new ViewFactory() { public Canvas createView() { - return new FullHTMLPane(extendLocatorId(PAGE_DOWNLOADS_VIEW_ID), + return new FullHTMLPane(extendLocatorId(PAGE_DOWNLOADS_VIEW_ID.getName()), "/rhq/admin/downloads-body.xhtml?nomenu=true"); } });
NavigationItem licenseItem = new NavigationItem(PAGE_LICENSE_VIEW_ID, null, new ViewFactory() { public Canvas createView() { - return new FullHTMLPane(extendLocatorId(PAGE_LICENSE_VIEW_ID), + return new FullHTMLPane(extendLocatorId(PAGE_LICENSE_VIEW_ID.getName()), "/admin/license/LicenseAdmin.do?mode=view&nomenu=true"); } });
NavigationItem pluginsItem = new NavigationItem(PAGE_PLUGINS_VIEW_ID, null, new ViewFactory() { public Canvas createView() { - return new FullHTMLPane(extendLocatorId(PAGE_PLUGINS_VIEW_ID), + return new FullHTMLPane(extendLocatorId(PAGE_PLUGINS_VIEW_ID.getName()), "/rhq/admin/plugin/plugin-list-plain.xhtml?nomenu=true"); } }); 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 eb07c45..86e7f11 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 @@ -48,6 +48,7 @@ import org.rhq.core.domain.install.remote.RemoteAccessInfo; import org.rhq.core.domain.measurement.MeasurementConverterClient; import org.rhq.core.domain.measurement.MeasurementUnits; import org.rhq.enterprise.gui.coregui.client.CoreGUI; +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.RemoteInstallGWTServiceAsync; import org.rhq.enterprise.gui.coregui.client.util.message.Message; @@ -58,7 +59,8 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; * @author Greg Hinkle */ public class RemoteAgentInstallView extends LocatableVLayout { - public static final String VIEW_ID = "RemoteAgentInstall"; + public static final ViewName VIEW_ID = new ViewName("RemoteAgentInstall", MSG + .view_adminTopology_remoteAgentInstall());
private RemoteInstallGWTServiceAsync remoteInstallService = GWTServiceLookup.getRemoteInstallService();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java index dbf0f76..393293c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java @@ -26,6 +26,7 @@ import org.rhq.enterprise.gui.coregui.client.BookmarkableView; import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableAction; import org.rhq.enterprise.gui.coregui.client.components.table.TableAction; import org.rhq.enterprise.gui.coregui.client.components.table.TableSection; +import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
/** * A table that lists all roles and provides the ability to view details of or delete those roles and to create new @@ -35,7 +36,7 @@ import org.rhq.enterprise.gui.coregui.client.components.table.TableSection; * @author Ian Springer */ public class RolesView extends TableSection implements BookmarkableView { - public static final String VIEW_ID = "Roles"; + public static final ViewName VIEW_ID = new ViewName("Roles", MSG.view_adminSecurity_roles());
private static final int ID_SUPERUSER = 1; private static final int ID_ALL_RESOURCES = 2; @@ -44,7 +45,7 @@ public class RolesView extends TableSection implements BookmarkableView { private static final String HEADER_ICON = "global/Role_16.png";
public RolesView(String locatorId) { - super(locatorId, "Roles"); + super(locatorId, MSG.view_adminSecurity_roles());
final RolesDataSource datasource = RolesDataSource.getInstance(); setDataSource(datasource); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java index 905abbc..7118d31 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java @@ -28,6 +28,7 @@ import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableActio import org.rhq.enterprise.gui.coregui.client.components.table.TableAction; import org.rhq.enterprise.gui.coregui.client.components.table.TableActionEnablement; import org.rhq.enterprise.gui.coregui.client.components.table.TableSection; +import org.rhq.enterprise.gui.coregui.client.components.view.ViewName; import org.rhq.enterprise.gui.coregui.client.util.message.Message;
/** @@ -39,12 +40,10 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message; */ public class UsersView extends TableSection {
- public static final String VIEW_ID = "Users"; + public static final ViewName VIEW_ID = new ViewName("Users", MSG.view_adminSecurity_users()); public static final String VIEW_PATH = AdministrationView.VIEW_ID + "/" + AdministrationView.SECTION_SECURITY_VIEW_ID + "/" + VIEW_ID;
- private static final String TITLE = "Users"; - private static final int ID_OVERLORD = 1; private static final int ID_RHQADMIN = 2;
@@ -53,7 +52,7 @@ public class UsersView extends TableSection { private static Message message;
public UsersView(String locatorId) { - super(locatorId, TITLE); + super(locatorId, MSG.view_adminSecurity_users());
final UsersDataSource dataSource = UsersDataSource.getInstance();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java index deb6727..b6f34ca 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java @@ -40,6 +40,7 @@ import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableActio import org.rhq.enterprise.gui.coregui.client.components.table.TableActionEnablement; import org.rhq.enterprise.gui.coregui.client.components.table.TableSection; import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter; +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.message.Message;
@@ -57,8 +58,7 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message; */ public class AlertHistoryView extends TableSection { // TODO: Create a subclass for the subsystem view. - public static final String SUBSYSTEM_VIEW_ID = "RecentAlerts"; - private static final String SUBSYSTEM_VIEW_TITLE = "Recent Alerts"; + public static final ViewName SUBSYSTEM_VIEW_ID = new ViewName("RecentAlerts", MSG.common_title_recent_alerts());
private static SortSpecifier DEFAULT_SORT_SPECIFIER = new SortSpecifier(AlertCriteria.SORT_FIELD_CTIME, SortDirection.DESCENDING); @@ -67,7 +67,7 @@ public class AlertHistoryView extends TableSection {
// for subsystem views public AlertHistoryView(String locatorId) { - this(locatorId, SUBSYSTEM_VIEW_TITLE, EntityContext.forSubsystemView(), false); + this(locatorId, SUBSYSTEM_VIEW_ID.getTitle(), EntityContext.forSubsystemView(), false); }
protected AlertHistoryView(String locatorId, String tableTitle, EntityContext context, boolean hasWriteAccess) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleTopView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleTopView.java index fa823e3..e08a373 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleTopView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleTopView.java @@ -31,6 +31,7 @@ import org.rhq.enterprise.gui.coregui.client.ViewPath; import org.rhq.enterprise.gui.coregui.client.bundle.list.BundleView; import org.rhq.enterprise.gui.coregui.client.bundle.list.BundlesListView; import org.rhq.enterprise.gui.coregui.client.bundle.tree.BundleTreeView; +import org.rhq.enterprise.gui.coregui.client.components.view.ViewName; import org.rhq.enterprise.gui.coregui.client.content.repository.tree.ContentRepositoryTreeView; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableSectionStack; @@ -39,7 +40,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableSectionStack * @author Greg Hinkle */ public class BundleTopView extends LocatableHLayout implements BookmarkableView { - public static final String VIEW_ID = "Bundles"; + public static final ViewName VIEW_ID = new ViewName("Bundles", MSG.view_bundle_bundles());
private BundleTreeView bundleTreeView;
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 13c8835..db654e7 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 @@ -99,7 +99,7 @@ public class BundleView extends LocatableVLayout implements BookmarkableView {
this.bundle = bundle;
- addMember(new BackButton(extendLocatorId("BackButton"), "Back to All Bundles", BundleTopView.VIEW_ID)); + addMember(new BackButton(extendLocatorId("BackButton"), "Back to All Bundles", BundleTopView.VIEW_ID.getTitle()));
headerLabel = new HeaderLabel("subsystems/bundle/Bundle_24.png", bundle.getName());
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tree/EnhancedTreeNode.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tree/EnhancedTreeNode.java index a2b8b37..ec81e48 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tree/EnhancedTreeNode.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tree/EnhancedTreeNode.java @@ -44,6 +44,15 @@ public class EnhancedTreeNode extends TreeNode { } }
+ public EnhancedTreeNode(String name, String title, TreeNode... children) { + super(name, children); + if (!(null == title || "".equals(title.trim()))) { + setTitle(title); + } else if (name != null) { + setTitle(StringUtils.deCamelCase(name)); + } + } + @Override public void setName(String name) { super.setName(name); 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 46ddd52..bee3bb6 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 @@ -121,13 +121,13 @@ public abstract class AbstractSectionedLeftNavigationView extends LocatableHLayo TreeNode[] treeNodes = new TreeNode[navigationItems.size()]; for (int i = 0, navigationItemsSize = navigationItems.size(); i < navigationItemsSize; i++) { NavigationItem item = navigationItems.get(i); - final TreeNode treeNode = new EnhancedTreeNode(item.getName()); + final TreeNode treeNode = new EnhancedTreeNode(item.getName(), item.getTitle()); treeNode.setIcon(item.getIcon()); treeNode.setEnabled(item.isEnabled()); treeNodes[i] = treeNode; }
- TreeNode rootNode = new EnhancedTreeNode(navigationSection.getName(), treeNodes); + TreeNode rootNode = new EnhancedTreeNode(navigationSection.getName(), navigationSection.getTitle(), treeNodes); Tree tree = new Tree(); tree.setRoot(rootNode); treeGrid.setData(tree); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/NavigationItem.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/NavigationItem.java index 90339d3..2319d4d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/NavigationItem.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/NavigationItem.java @@ -23,26 +23,34 @@ package org.rhq.enterprise.gui.coregui.client.components.view; * @author Ian Springer */ public class NavigationItem { - private final String name; + private final ViewName viewName; private final String icon; private final ViewFactory viewFactory; private final boolean enabled;
private boolean refreshRequired = false;
- public NavigationItem(String name, String icon, ViewFactory viewFactory) { + public NavigationItem(ViewName name, String icon, ViewFactory viewFactory) { this(name, icon, viewFactory, true); }
- public NavigationItem(String name, String icon, ViewFactory viewFactory, boolean enabled) { + public NavigationItem(ViewName name, String icon, ViewFactory viewFactory, boolean enabled) { this.icon = icon; - this.name = name; + this.viewName = name; this.viewFactory = viewFactory; this.enabled = enabled; }
+ public ViewName getViewName() { + return viewName; + } + public String getName() { - return name; + return viewName.getName(); + } + + public String getTitle() { + return viewName.getTitle(); }
public String getIcon() { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/NavigationSection.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/NavigationSection.java index f4d04fb..31e9567 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/NavigationSection.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/NavigationSection.java @@ -28,12 +28,12 @@ import java.util.Map; * @author Ian Springer */ public class NavigationSection { - private String name; + private ViewName viewName; private List<NavigationItem> navigationItems; private Map<String, NavigationItem> navigationItemsByName;
- public NavigationSection(String name, NavigationItem ... navigationItems) { - this.name = name; + public NavigationSection(ViewName name, NavigationItem... navigationItems) { + this.viewName = name; this.navigationItems = Arrays.asList(navigationItems); this.navigationItemsByName = new LinkedHashMap<String, NavigationItem>(navigationItems.length); for (NavigationItem navigationItem : navigationItems) { @@ -41,8 +41,16 @@ public class NavigationSection { } }
+ public ViewName getViewName() { + return viewName; + } + public String getName() { - return name; + return viewName.getName(); + } + + public String getTitle() { + return viewName.getTitle(); }
public List<NavigationItem> getNavigationItems() { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/ViewName.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/ViewName.java new file mode 100644 index 0000000..ebececd --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/ViewName.java @@ -0,0 +1,38 @@ +package org.rhq.enterprise.gui.coregui.client.components.view; + +import org.rhq.core.domain.util.StringUtils; + +public class ViewName { + + private String name; + private String title; + + public ViewName(String name) { + this(name, null); + } + + public ViewName(String name, String title) { + super(); + this.name = name; + this.title = (null == title || "".equals(title.trim())) ? StringUtils.deCamelCase(name) : title; + } + + public String getName() { + return name; + } + + public String getTitle() { + return title; + } + + /* + * Return just the name so String construction of view path works as expected + * (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return name; + } + +} 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 9592684..ad5550d 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 @@ -49,6 +49,7 @@ import org.rhq.core.domain.dashboard.DashboardPortlet; import org.rhq.enterprise.gui.coregui.client.BookmarkableView; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.ViewPath; +import org.rhq.enterprise.gui.coregui.client.components.view.ViewName; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.inventory.queue.AutodiscoveryPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.recent.alerts.RecentAlertsPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.recent.imported.RecentlyAddedView; @@ -69,7 +70,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; * @author Greg Hinkle */ public class DashboardsView extends LocatableVLayout implements BookmarkableView { - public static final String VIEW_ID = MSG.view_dashboards_title(); + public static final ViewName VIEW_ID = new ViewName("Dashboard", MSG.view_dashboards_title());
private TabSet tabSet;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformPortletView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformPortletView.java index e7fa7fa..4a563c7 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformPortletView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformPortletView.java @@ -46,6 +46,7 @@ import org.rhq.core.domain.resource.ResourceCategory; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.components.view.ViewName; 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; @@ -59,7 +60,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableListGrid; * @author Greg Hinkle */ public class PlatformPortletView extends LocatableListGrid implements Portlet { - public static final String VIEW_ID = "CpuAndMemoryUtilization"; + public static final ViewName VIEW_ID = new ViewName("CpuAndMemoryUtilization", MSG.view_reports_platforms());
private MeasurementDataGWTServiceAsync measurementService = GWTServiceLookup.getMeasurementDataService(); private ResourceTypeGWTServiceAsync typeService = GWTServiceLookup.getResourceTypeGWTService(); 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 af5518a..fb4b084 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 @@ -37,6 +37,7 @@ import org.rhq.enterprise.gui.coregui.client.components.view.AbstractSectionedLe 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.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField; import org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupListView; @@ -53,32 +54,37 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.discovery.Resour * @author Ian Springer */ public class InventoryView extends AbstractSectionedLeftNavigationView { - public static final String VIEW_ID = "Inventory"; + public static final ViewName VIEW_ID = new ViewName("Inventory", MSG.common_title_inventory());
// view IDs for Resources section - private static final String RESOURCES_SECTION_VIEW_ID = "Resources"; + private static final ViewName RESOURCES_SECTION_VIEW_ID = new ViewName("Resources", MSG + .view_inventory_resources_title());
- private static final String PAGE_AUTODISCOVERY_QUEUE = "AutodiscoveryQueue"; - private static final String PAGE_ALL_RESOURCES = "AllResources"; - private static final String PAGE_PLATFORMS = "Platforms"; - private static final String PAGE_SERVERS = "Servers"; - private static final String PAGE_SERVICES = "Services"; - private static final String PAGE_DOWN_SERVERS = "DownServers"; + private static final ViewName PAGE_AUTODISCOVERY_QUEUE = new ViewName("AutodiscoveryQueue", MSG + .view_inventory_adq()); + private static final ViewName PAGE_ALL_RESOURCES = new ViewName("AllResources", MSG.view_inventory_allResources()); + private static final ViewName PAGE_PLATFORMS = new ViewName("Platforms", MSG.view_inventory_platforms()); + private static final ViewName PAGE_SERVERS = new ViewName("Servers", MSG.view_inventory_servers()); + private static final ViewName PAGE_SERVICES = new ViewName("Services", MSG.view_inventory_services()); + private static final ViewName PAGE_DOWN_SERVERS = new ViewName("DownServers", MSG.view_inventory_downServers());
// view IDs for Groups section - private static final String GROUPS_SECTION_VIEW_ID = "Groups"; + private static final ViewName GROUPS_SECTION_VIEW_ID = new ViewName("Groups", MSG.view_inventory_groups());
- private static final String PAGE_DYNAGROUP_DEFINITIONS = "DynagroupDefinitions"; - private static final String PAGE_ALL_GROUPS = "AllGroups"; - private static final String PAGE_COMPATIBLE_GROUPS = "CompatibleGroups"; - private static final String PAGE_MIXED_GROUPS = "MixedGroups"; - private static final String PAGE_PROBLEM_GROUPS = "ProblemGroups"; + private static final ViewName PAGE_DYNAGROUP_DEFINITIONS = new ViewName("DynagroupDefinitions", MSG + .view_inventory_dynagroupDefs()); + private static final ViewName PAGE_ALL_GROUPS = new ViewName("AllGroups", MSG.view_inventory_allGroups()); + private static final ViewName PAGE_COMPATIBLE_GROUPS = new ViewName("CompatibleGroups", MSG + .common_title_compatibleGroups()); + private static final ViewName PAGE_MIXED_GROUPS = new ViewName("MixedGroups", MSG.common_title_mixedGroups()); + private static final ViewName PAGE_PROBLEM_GROUPS = new ViewName("ProblemGroups", MSG + .view_inventory_problemGroups());
private Set<Permission> globalPermissions;
public InventoryView() { // This is a top level view, so our locator id can simply be our view id. - super(VIEW_ID); + super(VIEW_ID.getName()); }
@Override @@ -123,40 +129,40 @@ public class InventoryView extends AbstractSectionedLeftNavigationView { NavigationItem autodiscoveryQueueItem = new NavigationItem(PAGE_AUTODISCOVERY_QUEUE, "global/Recent_16.png", new ViewFactory() { public Canvas createView() { - return new ResourceAutodiscoveryView(extendLocatorId(PAGE_AUTODISCOVERY_QUEUE)); + return new ResourceAutodiscoveryView(extendLocatorId(PAGE_AUTODISCOVERY_QUEUE.getName())); } }, this.globalPermissions.contains(Permission.MANAGE_INVENTORY));
// TODO: Specify an icon for this item. NavigationItem allResourcesItem = new NavigationItem(PAGE_ALL_RESOURCES, null, new ViewFactory() { public Canvas createView() { - return new ResourceSearchView(extendLocatorId(PAGE_ALL_RESOURCES), null, PAGE_ALL_RESOURCES, - "types/Platform_up_24.png", "types/Server_up_24.png", "types/Service_up_24.png"); + return new ResourceSearchView(extendLocatorId(PAGE_ALL_RESOURCES.getName()), null, PAGE_ALL_RESOURCES + .getTitle(), "types/Platform_up_24.png", "types/Server_up_24.png", "types/Service_up_24.png"); } });
NavigationItem platformsItem = new NavigationItem(PAGE_PLATFORMS, "types/Platform_up_16.png", new ViewFactory() { public Canvas createView() { - return new ResourceSearchView(extendLocatorId(PAGE_PLATFORMS), new Criteria( + return new ResourceSearchView(extendLocatorId(PAGE_PLATFORMS.getName()), new Criteria( ResourceDataSourceField.CATEGORY.propertyName(), ResourceCategory.PLATFORM.name()), - PAGE_PLATFORMS, "types/Platform_up_24.png"); + PAGE_PLATFORMS.getTitle(), "types/Platform_up_24.png"); } });
NavigationItem serversItem = new NavigationItem(PAGE_SERVERS, "types/Server_up_16.png", new ViewFactory() { public Canvas createView() { - return new ResourceSearchView(extendLocatorId(PAGE_SERVERS), new Criteria( - ResourceDataSourceField.CATEGORY.propertyName(), ResourceCategory.SERVER.name()), PAGE_SERVERS, - "types/Server_up_24.png"); + return new ResourceSearchView(extendLocatorId(PAGE_SERVERS.getName()), new Criteria( + ResourceDataSourceField.CATEGORY.propertyName(), ResourceCategory.SERVER.name()), PAGE_SERVERS + .getTitle(), "types/Server_up_24.png"); } });
NavigationItem servicesItem = new NavigationItem(PAGE_SERVICES, "types/Service_up_16.png", new ViewFactory() { public Canvas createView() { - return new ResourceSearchView(extendLocatorId(PAGE_SERVICES), new Criteria( - ResourceDataSourceField.CATEGORY.propertyName(), ResourceCategory.SERVICE.name()), PAGE_SERVICES, - "types/Service_up_24.png"); + return new ResourceSearchView(extendLocatorId(PAGE_SERVICES.getName()), new Criteria( + ResourceDataSourceField.CATEGORY.propertyName(), ResourceCategory.SERVICE.name()), PAGE_SERVICES + .getTitle(), "types/Service_up_24.png"); } });
@@ -168,7 +174,7 @@ public class InventoryView extends AbstractSectionedLeftNavigationView { criteria.addCriteria(ResourceDataSourceField.CATEGORY.propertyName(), ResourceCategory.SERVER .name()); // TODO (ips, 10/28/10): Should we include down platforms too? - return new ResourceSearchView(extendLocatorId(PAGE_DOWN_SERVERS), criteria, MSG + return new ResourceSearchView(extendLocatorId(PAGE_DOWN_SERVERS.getName()), criteria, MSG .view_inventory_downServers()); } }); @@ -182,33 +188,33 @@ public class InventoryView extends AbstractSectionedLeftNavigationView { "types/GroupDefinition_16.png", new ViewFactory() { public Canvas createView() { // TODO: Do we have a 24x24 groupdef icon? - return new GroupDefinitionListView(extendLocatorId(PAGE_DYNAGROUP_DEFINITIONS), + return new GroupDefinitionListView(extendLocatorId(PAGE_DYNAGROUP_DEFINITIONS.getName()), "types/GroupDefinition_16.png"); } }, this.globalPermissions.contains(Permission.MANAGE_INVENTORY));
NavigationItem allGroupsItem = new NavigationItem(PAGE_ALL_GROUPS, "types/Group_up_16.png", new ViewFactory() { public Canvas createView() { - return new ResourceGroupListView(extendLocatorId(PAGE_ALL_GROUPS), null, - MSG.view_inventory_allGroups(), "types/Cluster_up_24.png", "types/Group_up_24.png"); + return new ResourceGroupListView(extendLocatorId(PAGE_ALL_GROUPS.getName()), null, PAGE_ALL_GROUPS + .getTitle(), "types/Cluster_up_24.png", "types/Group_up_24.png"); } });
NavigationItem compatibleGroupsItem = new NavigationItem(PAGE_COMPATIBLE_GROUPS, "types/Cluster_up_16.png", new ViewFactory() { public Canvas createView() { - return new ResourceGroupListView(extendLocatorId(PAGE_COMPATIBLE_GROUPS), new Criteria( - ResourceGroupDataSourceField.CATEGORY.propertyName(), GroupCategory.COMPATIBLE.name()), MSG - .common_title_compatibleGroups(), "types/Cluster_up_24.png"); + return new ResourceGroupListView(extendLocatorId(PAGE_COMPATIBLE_GROUPS.getName()), new Criteria( + ResourceGroupDataSourceField.CATEGORY.propertyName(), GroupCategory.COMPATIBLE.name()), + PAGE_COMPATIBLE_GROUPS.getTitle(), "types/Cluster_up_24.png"); } });
NavigationItem mixedGroupsItem = new NavigationItem(PAGE_MIXED_GROUPS, "types/Group_up_16.png", new ViewFactory() { public Canvas createView() { - return new ResourceGroupListView(extendLocatorId(PAGE_MIXED_GROUPS), new Criteria( - ResourceGroupDataSourceField.CATEGORY.propertyName(), GroupCategory.MIXED.name()), MSG - .common_title_mixedGroups(), "types/Group_up_24.png"); + return new ResourceGroupListView(extendLocatorId(PAGE_MIXED_GROUPS.getName()), new Criteria( + ResourceGroupDataSourceField.CATEGORY.propertyName(), GroupCategory.MIXED.name()), + PAGE_MIXED_GROUPS.getTitle(), "types/Group_up_24.png"); } });
@@ -217,8 +223,8 @@ public class InventoryView extends AbstractSectionedLeftNavigationView { public Canvas createView() { // TODO: There is no underlying support for this criteria. Also, there should not be an active New // button on this page. - return new ResourceGroupListView(extendLocatorId(PAGE_PROBLEM_GROUPS), new Criteria("availability", - "down"), MSG.view_inventory_problemGroups(), "types/Cluster_down_16.png"); + return new ResourceGroupListView(extendLocatorId(PAGE_PROBLEM_GROUPS.getName()), new Criteria( + "availability", "down"), PAGE_PROBLEM_GROUPS.getTitle(), "types/Cluster_down_16.png"); } });
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTopView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTopView.java index 5c8670e..874d407 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTopView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTopView.java @@ -26,13 +26,14 @@ import com.smartgwt.client.widgets.Canvas;
import org.rhq.enterprise.gui.coregui.client.BookmarkableView; import org.rhq.enterprise.gui.coregui.client.ViewPath; +import org.rhq.enterprise.gui.coregui.client.components.view.ViewName; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
/** * @author Greg Hinkle */ public class ResourceGroupTopView extends LocatableHLayout implements BookmarkableView { - public static final String VIEW_ID = "ResourceGroup"; + public static final ViewName VIEW_ID = new ViewName("ResourceGroup", MSG.common_title_resource_group());
private Canvas contentCanvas; private ResourceGroupTreeView treeView; @@ -50,7 +51,7 @@ public class ResourceGroupTopView extends LocatableHLayout implements Bookmarkab setHeight100();
treeView = new ResourceGroupTreeView(extendLocatorId("Tree")); - detailView = new ResourceGroupDetailView(extendLocatorId("Detail"), ResourceGroupTopView.VIEW_ID); + detailView = new ResourceGroupDetailView(extendLocatorId("Detail"), ResourceGroupTopView.VIEW_ID.getName()); addMember(treeView);
contentCanvas = new Canvas(); 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 29647f1..b8f8445 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 @@ -370,7 +370,7 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo new Message(MSG.view_inventory_resource_loadFailed(String.valueOf(resourceId)), Message.Severity.Warning));
- CoreGUI.goToView(InventoryView.VIEW_ID); + CoreGUI.goToView(InventoryView.VIEW_ID.getName()); }
public void onSuccess(PageList<ResourceComposite> result) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTopView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTopView.java index 836b35e..09c75e6 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTopView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTopView.java @@ -22,6 +22,7 @@ import com.smartgwt.client.widgets.Canvas;
import org.rhq.enterprise.gui.coregui.client.BookmarkableView; import org.rhq.enterprise.gui.coregui.client.ViewPath; +import org.rhq.enterprise.gui.coregui.client.components.view.ViewName; import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.ResourceGroupDetailView; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
@@ -29,7 +30,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout; * @author Greg Hinkle */ public class ResourceTopView extends LocatableHLayout implements BookmarkableView { - public static final String VIEW_ID = "Resource"; + public static final ViewName VIEW_ID = new ViewName("Resource", MSG.common_title_resource());
private Canvas contentCanvas; private ResourceTreeView treeView; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java index 1e933ef..767b151 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java @@ -35,14 +35,14 @@ import org.rhq.enterprise.gui.coregui.client.components.configuration.Configurat import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableAction; import org.rhq.enterprise.gui.coregui.client.components.table.TableActionEnablement; import org.rhq.enterprise.gui.coregui.client.components.table.TableSection; +import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
/** * @author Greg Hinkle */ public class ConfigurationHistoryView extends TableSection { - - public static final String VIEW_ID = "RecentConfigurationChanges"; - private static final String TITLE = MSG.view_configurationHistoryList_title(); + public static final ViewName VIEW_ID = new ViewName("RecentConfigurationChanges", MSG + .view_configurationHistoryList_title());
private Integer resourceId;
@@ -50,7 +50,7 @@ public class ConfigurationHistoryView extends TableSection { * Use this constructor to view config histories for all viewable Resources. */ public ConfigurationHistoryView(String locatorId) { - super(locatorId, TITLE); + super(locatorId, VIEW_ID.getTitle()); final ConfigurationHistoryDataSource datasource = new ConfigurationHistoryDataSource(); setDataSource(datasource); } @@ -61,7 +61,7 @@ public class ConfigurationHistoryView extends TableSection { * @param resourceId a Resource ID */ public ConfigurationHistoryView(String locatorId, int resourceId) { - super(locatorId, TITLE, createCriteria(resourceId)); + super(locatorId, VIEW_ID.getTitle(), createCriteria(resourceId)); this.resourceId = resourceId; ConfigurationHistoryDataSource datasource = new ConfigurationHistoryDataSource(); setDataSource(datasource); @@ -124,15 +124,14 @@ public class ConfigurationHistoryView extends TableSection {
setListGridFields(fields.toArray(new ListGridField[fields.size()]));
- addTableAction(extendLocatorId("Delete"), MSG.common_button_delete(), - MSG.common_msg_deleteConfirm(MSG.common_msg_deleteConfirm(MSG.view_configurationHistoryList_itemNamePlural())), - new AbstractTableAction( - TableActionEnablement.ANY) { - public void executeAction(ListGridRecord[] selection, Object actionValue) { - // TODO: Implement this method. - CoreGUI.getErrorHandler().handleError("Not implemented"); - } - }); + addTableAction(extendLocatorId("Delete"), MSG.common_button_delete(), MSG.common_msg_deleteConfirm(MSG + .common_msg_deleteConfirm(MSG.view_configurationHistoryList_itemNamePlural())), new AbstractTableAction( + TableActionEnablement.ANY) { + public void executeAction(ListGridRecord[] selection, Object actionValue) { + // TODO: Implement this method. + CoreGUI.getErrorHandler().handleError("Not implemented"); + } + });
addTableAction(extendLocatorId("Compare"), MSG.common_button_compare(), null, new AbstractTableAction( TableActionEnablement.MULTIPLE) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryView.java index 662dff7..3b7accc 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryView.java @@ -36,6 +36,7 @@ import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.domain.resource.composite.ResourceComposite; import org.rhq.enterprise.gui.coregui.client.components.table.TableSection; +import org.rhq.enterprise.gui.coregui.client.components.view.ViewName; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation.create.OperationCreateWizard; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation.detail.OperationDetailsView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; @@ -46,15 +47,13 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableMenu; * @author Greg Hinkle */ public class OperationHistoryView extends TableSection { - - public static final String VIEW_ID = "RecentOperations"; - private static final String TITLE = MSG.view_operationHistoryList_title(); + public static final ViewName VIEW_ID = new ViewName("RecentOperations", MSG.common_title_recent_operations());
private ResourceComposite composite; private Resource resource;
public OperationHistoryView(String locatorId) { - super(locatorId, TITLE); + super(locatorId, VIEW_ID.getTitle()); setWidth100(); setHeight100();
@@ -63,9 +62,8 @@ public class OperationHistoryView extends TableSection { }
public OperationHistoryView(String locatorId, ResourceComposite resourceComposite) { - super(locatorId, TITLE, new Criteria(OperationHistoryDataSource.CriteriaField.RESOURCE_ID, - String.valueOf(resourceComposite.getResource() - .getId()))); + super(locatorId, VIEW_ID.getTitle(), new Criteria(OperationHistoryDataSource.CriteriaField.RESOURCE_ID, String + .valueOf(resourceComposite.getResource().getId()))); this.composite = resourceComposite; this.resource = resourceComposite.getResource();
@@ -134,9 +132,8 @@ public class OperationHistoryView extends TableSection { } });
- IMenuButton operationsButton = new LocatableIMenuButton(this.extendLocatorId("Run"), - MSG.view_operationHistoryList_button_runOperation(), - operationMenu); + IMenuButton operationsButton = new LocatableIMenuButton(this.extendLocatorId("Run"), MSG + .view_operationHistoryList_button_runOperation(), operationMenu); operationsButton.setShowMenuBelow(false); operationsButton.setAutoFit(true); addExtraWidget(operationsButton); 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 212b8e1..38bfba0 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 @@ -34,6 +34,7 @@ import com.smartgwt.client.widgets.toolbar.ToolStrip; import org.rhq.enterprise.gui.coregui.client.admin.AdministrationView; import org.rhq.enterprise.gui.coregui.client.bundle.BundleTopView; import org.rhq.enterprise.gui.coregui.client.components.AboutModalWindow; +import org.rhq.enterprise.gui.coregui.client.components.view.ViewName; import org.rhq.enterprise.gui.coregui.client.dashboard.DashboardsView; import org.rhq.enterprise.gui.coregui.client.inventory.InventoryView; import org.rhq.enterprise.gui.coregui.client.report.ReportTopView; @@ -47,10 +48,10 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility; */ public class MenuBarView extends LocatableVLayout {
- public static final String[] SECTIONS = {DashboardsView.VIEW_ID, InventoryView.VIEW_ID, ReportTopView.VIEW_ID, - BundleTopView.VIEW_ID, AdministrationView.VIEW_ID}; + public static final ViewName[] SECTIONS = { DashboardsView.VIEW_ID, InventoryView.VIEW_ID, ReportTopView.VIEW_ID, + BundleTopView.VIEW_ID, AdministrationView.VIEW_ID };
- private String currentlySelectedSection = DashboardsView.VIEW_ID; + private String currentlySelectedSection = DashboardsView.VIEW_ID.getName();
public MenuBarView(String locatorId) { super(locatorId); @@ -111,7 +112,7 @@ public class MenuBarView extends LocatableVLayout { "<table style="height: 34px;" cellpadding="0" cellspacing="0"><tr>");
headerString.append("<td style="width: 1px;"><img src="images/header/header_bg_line.png"/></td>"); - for (String section : SECTIONS) { + for (ViewName section : SECTIONS) {
String styleClass = "TopSectionLink"; if (section.equals(currentlySelectedSection)) { @@ -119,9 +120,9 @@ public class MenuBarView extends LocatableVLayout { }
// Set explicit identifiers because the generated scLocator is not getting picked up by Selenium. - headerString.append("<td id="").append(section).append("" class="").append(styleClass) - .append("" onclick="document.location='#").append(section).append("'" >"); - headerString.append(section); + headerString.append("<td id="").append(section).append("" class="").append(styleClass).append( + "" onclick="document.location='#").append(section).append("'" >"); + headerString.append(section.getTitle()); headerString.append("</td>\n");
headerString.append("<td style="width: 1px;"><img src="images/header/header_bg_line.png"/></td>"); @@ -147,5 +148,5 @@ public class MenuBarView extends LocatableVLayout {
return layout; } - + } 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 57ed643..5e1e957 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 @@ -34,6 +34,7 @@ import org.rhq.enterprise.gui.coregui.client.components.view.AbstractSectionedLe 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.dashboard.portlets.platform.PlatformPortletView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configuration.ConfigurationHistoryView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation.OperationHistoryView; @@ -47,14 +48,14 @@ import org.rhq.enterprise.gui.coregui.client.report.tag.TaggedView; * @author Ian Springer */ public class ReportTopView extends AbstractSectionedLeftNavigationView { - public static final String VIEW_ID = "Reports"; + public static final ViewName VIEW_ID = new ViewName("Reports", MSG.view_reportsTop_title());
- private static final String SUBSYSTEMS_SECTION_VIEW_ID = "Subsystems"; - private static final String INVENTORY_SECTION_VIEW_ID = "Inventory"; + private static final ViewName SUBSYSTEMS_SECTION_VIEW_ID = new ViewName("Subsystems", MSG.view_reports_subsystems()); + private static final ViewName INVENTORY_SECTION_VIEW_ID = new ViewName("Inventory", MSG.common_title_inventory());
public ReportTopView() { // This is a top level view, so our locator id can simply be our view id. - super(VIEW_ID); + super(VIEW_ID.getName()); }
@Override @@ -81,65 +82,64 @@ public class ReportTopView extends AbstractSectionedLeftNavigationView { private NavigationSection buildSubsystemsSection() { NavigationItem tagItem = new NavigationItem(TaggedView.VIEW_ID, "global/Cloud_16.png", new ViewFactory() { public Canvas createView() { - return new TaggedView(extendLocatorId("Tag")); + return new TaggedView(extendLocatorId(TaggedView.VIEW_ID.getName())); } });
NavigationItem suspectMetricsItem = new NavigationItem(MeasurementOOBView.VIEW_ID, "subsystems/monitor/Monitor_failed_16.png", new ViewFactory() { - public Canvas createView() { - return new MeasurementOOBView(extendLocatorId("SuspectMetrics")); - } - }); + public Canvas createView() { + return new MeasurementOOBView(extendLocatorId(MeasurementOOBView.VIEW_ID.getName())); + } + });
NavigationItem recentConfigurationChangesItem = new NavigationItem(ConfigurationHistoryView.VIEW_ID, "subsystems/configure/Configure_16.png", new ViewFactory() { - public Canvas createView() { - return new ConfigurationHistoryView(extendLocatorId("ConfigHistory")); - } - }); + public Canvas createView() { + return new ConfigurationHistoryView(extendLocatorId(ConfigurationHistoryView.VIEW_ID.getName())); + } + });
NavigationItem recentOperationsItem = new NavigationItem(OperationHistoryView.VIEW_ID, "subsystems/control/Operation_16.png", new ViewFactory() { - public Canvas createView() { - return new OperationHistoryView(extendLocatorId("RecentOps")); - } - }); + public Canvas createView() { + return new OperationHistoryView(extendLocatorId(OperationHistoryView.VIEW_ID.getName())); + } + });
NavigationItem recentAlertsItem = new NavigationItem(AlertHistoryView.SUBSYSTEM_VIEW_ID, "subsystems/alert/Alert_LOW_16.png", new ViewFactory() { - public Canvas createView() { - return new AlertHistoryView(extendLocatorId("RecentAlerts")); - } - }); + public Canvas createView() { + return new AlertHistoryView(extendLocatorId(AlertHistoryView.SUBSYSTEM_VIEW_ID.getName())); + } + });
- NavigationItem alertDefinitionsItem = new NavigationItem("AlertDefinitions", + NavigationItem alertDefinitionsItem = new NavigationItem(new ViewName("AlertDefinitions"), "subsystems/alert/Alerts_16.png", new ViewFactory() { - public Canvas createView() { - return null; // TODO: mazz - } - }); + public Canvas createView() { + return null; // TODO: mazz + } + });
return new NavigationSection(SUBSYSTEMS_SECTION_VIEW_ID, tagItem, suspectMetricsItem, recentConfigurationChangesItem, recentOperationsItem, recentAlertsItem, alertDefinitionsItem); }
private NavigationSection buildInventorySection() { - NavigationItem - inventorySummaryItem = new NavigationItem("InventorySummary", "subsystems/inventory/Inventory_16.png", - new ViewFactory() { + NavigationItem inventorySummaryItem = new NavigationItem(new ViewName("InventorySummary", MSG + .common_title_inventorySummary()), "subsystems/inventory/Inventory_16.png", new ViewFactory() { public Canvas createView() { return new FullHTMLPane(extendLocatorId("InventorySummary"), "/rhq/admin/report/resourceInstallReport-body.xhtml"); } });
- NavigationItem platformSystemInfoItem = new NavigationItem(PlatformPortletView.VIEW_ID, "types/Platform_up_16.png", - new ViewFactory() { - public Canvas createView() { - return new PlatformPortletView(extendLocatorId("Platforms")); - } - }); + NavigationItem platformSystemInfoItem = new NavigationItem(PlatformPortletView.VIEW_ID, + "types/Platform_up_16.png", new ViewFactory() { + public Canvas createView() { + return new PlatformPortletView(extendLocatorId(PlatformPortletView.VIEW_ID.getName())); + } + });
return new NavigationSection(INVENTORY_SECTION_VIEW_ID, inventorySummaryItem, platformSystemInfoItem); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBView.java index 33a706c..e70a673 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBView.java @@ -26,17 +26,17 @@ import com.smartgwt.client.widgets.grid.CellFormatter; import com.smartgwt.client.widgets.grid.ListGridRecord;
import org.rhq.enterprise.gui.coregui.client.components.table.Table; +import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
/** * @author Greg Hinkle */ public class MeasurementOOBView extends Table {
- public static final String VIEW_ID = "SuspectMetrics"; - private static final String TITLE = MSG.view_measurementOob_title(); + public static final ViewName VIEW_ID = new ViewName("SuspectMetrics", MSG.view_measurementOob_title());
public MeasurementOOBView(String locatorId) { - super(locatorId, TITLE); + super(locatorId, VIEW_ID.getTitle());
setDataSource(new MeasurementOOBDataSource()); } 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 1c61a5e..192b0f6 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 @@ -34,6 +34,7 @@ import org.rhq.enterprise.gui.coregui.client.bundle.destination.BundleDestinatio import org.rhq.enterprise.gui.coregui.client.bundle.list.BundlesListView; import org.rhq.enterprise.gui.coregui.client.bundle.version.BundleVersionListView; import org.rhq.enterprise.gui.coregui.client.components.table.Table; +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.LocatableTileLayout; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; @@ -43,7 +44,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; */ public class TaggedView extends LocatableVLayout implements BookmarkableView {
- public static final String VIEW_ID = "Tag"; + public static final ViewName VIEW_ID = new ViewName("Tag", MSG.view_tags_tags());
private TagCloudView tagCloudView;
@@ -103,8 +104,8 @@ public class TaggedView extends LocatableVLayout implements BookmarkableView { criteria); tiles.add(bundleDestinationListView);
- ResourceSearchView resourceView = new ResourceSearchView(getLocatorId(), criteria, - MSG.view_taggedResources_title()); + ResourceSearchView resourceView = new ResourceSearchView(getLocatorId(), criteria, MSG + .view_taggedResources_title()); tiles.add(resourceView);
for (Table t : tiles) { @@ -124,5 +125,5 @@ public class TaggedView extends LocatableVLayout implements BookmarkableView { viewTag(tagString); } } - + } 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 d1e1c85..522bc5d 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 @@ -28,6 +28,7 @@ import org.rhq.enterprise.gui.coregui.client.components.view.AbstractSectionedLe 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.inventory.resource.selection.ResourceSelector; import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeTreeView; import org.rhq.enterprise.gui.coregui.client.test.configuration.TestConfigurationView; @@ -41,28 +42,27 @@ import org.rhq.enterprise.gui.coregui.client.test.i18n.TestPluralizationView; * @author Ian Springer */ public class TestTopView extends AbstractSectionedLeftNavigationView { - - public static final String VIEW_ID = "Test"; + public static final ViewName VIEW_ID = new ViewName("Test");
// view IDs for Inventory section - private static final String INVENTORY_SECTION_VIEW_ID = "Inventory"; + private static final ViewName INVENTORY_SECTION_VIEW_ID = new ViewName("Inventory");
- private static final String PAGE_RESOURCE_SELECTOR = "ResourceSelector"; - private static final String PAGE_TYPE_TREE = "TypeTree"; + private static final ViewName PAGE_RESOURCE_SELECTOR = new ViewName("ResourceSelector"); + private static final ViewName PAGE_TYPE_TREE = new ViewName("TypeTree");
// view IDs for Configuration section - private static final String CONFIGURATION_SECTION_VIEW_ID = "Configuration"; + private static final ViewName CONFIGURATION_SECTION_VIEW_ID = new ViewName("Configuration");
- private static final String PAGE_CONFIG_EDITOR = "ConfigEditor"; - private static final String PAGE_GROUP_CONFIG_EDITOR = "GroupConfigEditor"; + private static final ViewName PAGE_CONFIG_EDITOR = new ViewName("ConfigEditor"); + private static final ViewName PAGE_GROUP_CONFIG_EDITOR = new ViewName("GroupConfigEditor");
// view IDs for Misc section - private static final String MISC_SECTION_VIEW_ID = "Misc"; - private static final String PAGE_PLURALIZATION_TEST = "PluralizationTest"; + private static final ViewName MISC_SECTION_VIEW_ID = new ViewName("Misc"); + private static final ViewName PAGE_PLURALIZATION_TEST = new ViewName("PluralizationTest");
public TestTopView() { // This is a top level view, so our locator id can simply be our view id. - super(VIEW_ID); + super(VIEW_ID.getName()); }
protected Canvas defaultView() { @@ -91,13 +91,13 @@ public class TestTopView extends AbstractSectionedLeftNavigationView { private NavigationSection buildInventorySection() { NavigationItem resourceSelectorItem = new NavigationItem(PAGE_RESOURCE_SELECTOR, null, new ViewFactory() { public Canvas createView() { - return new ResourceSelector(extendLocatorId(PAGE_RESOURCE_SELECTOR)); + return new ResourceSelector(extendLocatorId(PAGE_RESOURCE_SELECTOR.getName())); } });
NavigationItem typeTreeItem = new NavigationItem(PAGE_TYPE_TREE, null, new ViewFactory() { public Canvas createView() { - return new ResourceTypeTreeView(extendLocatorId(PAGE_TYPE_TREE)); + return new ResourceTypeTreeView(extendLocatorId(PAGE_TYPE_TREE.getName())); } });
@@ -107,13 +107,13 @@ public class TestTopView extends AbstractSectionedLeftNavigationView { private NavigationSection buildConfigurationSection() { NavigationItem configEditorItem = new NavigationItem(PAGE_CONFIG_EDITOR, null, new ViewFactory() { public Canvas createView() { - return new TestConfigurationView(extendLocatorId(PAGE_CONFIG_EDITOR)); + return new TestConfigurationView(extendLocatorId(PAGE_CONFIG_EDITOR.getName())); } });
NavigationItem groupConfigEditorItem = new NavigationItem(PAGE_GROUP_CONFIG_EDITOR, null, new ViewFactory() { public Canvas createView() { - return new TestGroupConfigurationView(extendLocatorId(PAGE_GROUP_CONFIG_EDITOR)); + return new TestGroupConfigurationView(extendLocatorId(PAGE_GROUP_CONFIG_EDITOR.getName())); } });
@@ -123,7 +123,7 @@ public class TestTopView extends AbstractSectionedLeftNavigationView { private NavigationSection buildMiscSection() { NavigationItem pluralizationItem = new NavigationItem(PAGE_PLURALIZATION_TEST, null, new ViewFactory() { public Canvas createView() { - return new TestPluralizationView(extendLocatorId(PAGE_PLURALIZATION_TEST)); + return new TestPluralizationView(extendLocatorId(PAGE_PLURALIZATION_TEST.getName())); } });
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableCanvas.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableCanvas.java new file mode 100644 index 0000000..41e7fa4 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableCanvas.java @@ -0,0 +1,34 @@ +package org.rhq.enterprise.gui.coregui.client.util.selenium; + +import com.smartgwt.client.widgets.Canvas; + +/** + * Wrapper for com.smartgwt.client.widgets.Canvas that sets the ID for use with selenium scLocators. + * + * @author Jay Shaughnessy + */ +public class LocatableCanvas extends Canvas implements Locatable { + + private String locatorId; + + /** + * <pre> + * ID Format: "simpleClassname_locatorId" + * </pre> + * @param locatorId not null or empty. + */ + public LocatableCanvas(String locatorId) { + super(); + this.locatorId = locatorId; + SeleniumUtility.setID(this, locatorId); + } + + public String getLocatorId() { + return locatorId; + } + + public String extendLocatorId(String extension) { + return this.locatorId + "_" + extension; + } + +} diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index d8c930b..18d2094 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -107,8 +107,9 @@ common_title_recent_alerts = Recent Alerts~ common_title_recent_operations=Recent Operations~ common_title_remove_column=Remove Column~ common_title_resource = Resource~ +common_title_resource_group = Resource Group~ common_title_resource_inventory=Resource Inventory~ -ommon_title_resource_id=Resource ID~ +common_title_resource_id=Resource ID~ common_title_resource_name=Resource Name~ common_title_scheduled_operations=Scheduled Operations~ common_title_selected_resources=Selected Resources~ @@ -571,7 +572,7 @@ view_portlet_operations_config_scheduled_enable=Whether to enable scheduled oper view_portlet_operations_config_scheduled_maximum=Maximum number of Scheduled operations to display.~ view_portlet_operations_config_completed=completed operations~ view_portlet_operations_config_show_last=show Last~ -view_portlet_operations_config_show_next=show Next~ +view_portlet_operations_config_show_next=show Next~ view_portlet_operations_config_title=OperationsPortlet Configuration~ view_portlet_operations_config_title_desc=The configuration settings for the Operations portlet.~ view_portlet_operations_disabled=(Results currently disabled. Change settings to enable results.~ @@ -592,7 +593,7 @@ view_portlet_recentAlerts_config_members=Select Members~ view_portlet_recentAlerts_config_priority_label = priority Alerts,~ view_portlet_recentAlerts_config_when=within the past~ view_portlet_recentAlerts_help_msg = Displays recent alerts fired on resources visible to the current user login.~ -# dup in common +// dup in common view_portlet_recentAlerts_title = Recent Alerts~ view_portlet_recentlyAdded_approved_platforms=recently approved platforms on dashboard.~ view_portlet_recentlyAdded_error1=Failed to load recently added resources~ @@ -962,7 +963,8 @@ view_searchGUI_loginStatus = Unable to determine login status, check server stat #-------------------------- view_messageCenter_button_messages = Messages~ view_messageCenter_noRecentMessages = No Recent Messages~ -view_messageCenter_messageTitle= Title~ +view_messageCenter_messageTitle= Message Center~ view_messageCenter_messageSeverity= Severity~ view_messageCenter_messageTime= Time~ view_messageCenter_messageDetail= Detail~ +
commit 5369dcf865a26b34927d25cff27ede259b573274 Author: Ian Springer ian.springer@redhat.com Date: Wed Nov 17 19:13:30 2010 -0500
i18n - resource operations views
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryDataSource.java index 2190de5..7735f69 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryDataSource.java @@ -44,6 +44,24 @@ import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; */ public class OperationHistoryDataSource extends RPCDataSource<ResourceOperationHistory> {
+ public static abstract class Field { + public static final String ID = "id"; + public static final String OPERATION_NAME = "operationName"; + public static final String RESOURCE = "resource"; + public static final String STATUS = "status"; + public static final String STARTED_TIME = "startedTime"; + public static final String CREATED_TIME = "createdTime"; + public static final String DURATION = "duration"; + public static final String SUBJECT = "subject"; + public static final String OPERATION_DEFINITION = "operationDefinition"; + public static final String ERROR_MESSAGE = "errorMessage"; + public static final String PARAMETERS = "parameters"; + } + + public static abstract class CriteriaField { + public static final String RESOURCE_ID = "resourceId"; + } + private OperationGWTServiceAsync operationService = GWTServiceLookup.getOperationService();
public OperationHistoryDataSource() { @@ -55,20 +73,20 @@ public class OperationHistoryDataSource extends RPCDataSource<ResourceOperationH protected List<DataSourceField> addDataSourceFields() { List<DataSourceField> fields = super.addDataSourceFields();
- DataSourceIntegerField idField = new DataSourceIntegerField("id"); + DataSourceIntegerField idField = new DataSourceIntegerField(Field.ID); idField.setPrimaryKey(true); fields.add(idField);
- DataSourceTextField nameField = new DataSourceTextField("operationName"); + DataSourceTextField nameField = new DataSourceTextField(Field.OPERATION_NAME); fields.add(nameField);
- DataSourceTextField resourceField = new DataSourceTextField("resource"); + DataSourceTextField resourceField = new DataSourceTextField(Field.RESOURCE); fields.add(resourceField);
- DataSourceTextField statusField = new DataSourceTextField("status"); + DataSourceTextField statusField = new DataSourceTextField(Field.STATUS); fields.add(statusField);
- DataSourceTextField startedField = new DataSourceTextField("startedTime"); + DataSourceTextField startedField = new DataSourceTextField(Field.STARTED_TIME); startedField.setType(FieldType.DATETIME); fields.add(startedField);
@@ -79,9 +97,9 @@ public class OperationHistoryDataSource extends RPCDataSource<ResourceOperationH protected void executeFetch(final DSRequest request, final DSResponse response) { ResourceOperationHistoryCriteria criteria = new ResourceOperationHistoryCriteria();
- if (request.getCriteria().getValues().containsKey("resourceId")) { + if (request.getCriteria().getValues().containsKey(CriteriaField.RESOURCE_ID)) { criteria.addFilterResourceIds(Integer - .parseInt((String) request.getCriteria().getValues().get("resourceId"))); + .parseInt((String) request.getCriteria().getValues().get(CriteriaField.RESOURCE_ID))); }
criteria.setPageControl(getPageControl(request)); @@ -89,7 +107,8 @@ public class OperationHistoryDataSource extends RPCDataSource<ResourceOperationH operationService.findResourceOperationHistoriesByCriteria(criteria, new AsyncCallback<PageList<ResourceOperationHistory>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failure loading operation histories", caught); + CoreGUI.getErrorHandler().handleError(MSG.dataSource_operationHistory_error_fetchFailure(), + caught); }
public void onSuccess(PageList<ResourceOperationHistory> result) { @@ -101,25 +120,25 @@ public class OperationHistoryDataSource extends RPCDataSource<ResourceOperationH
@Override public ResourceOperationHistory copyValues(Record from) { - throw new UnsupportedOperationException("ResourceOperationHistory is read only"); + throw new UnsupportedOperationException("ResourceOperationHistory is read only."); }
@Override public ListGridRecord copyValues(ResourceOperationHistory from) { ListGridRecord record = new ListGridRecord(); - record.setAttribute("id", from.getId()); - record.setAttribute("createdTime", from.getCreatedTime()); - record.setAttribute("startedTime", new Date(from.getStartedTime())); - record.setAttribute("duration", from.getDuration()); - record.setAttribute("resource", from.getResource()); - record.setAttribute("subject", from.getSubjectName()); - record.setAttribute("operationDefinition", from.getOperationDefinition()); - record.setAttribute("operationName", from.getOperationDefinition().getDisplayName()); - record.setAttribute("errorMessage", from.getErrorMessage()); - record.setAttribute("status", from.getStatus().name()); - record.setAttribute("parameters", from.getParameters()); - - record.setAttribute("entity", from); + record.setAttribute(Field.ID, from.getId()); + record.setAttribute(Field.CREATED_TIME, from.getCreatedTime()); + record.setAttribute(Field.STARTED_TIME, new Date(from.getStartedTime())); + record.setAttribute(Field.DURATION, from.getDuration()); + record.setAttribute(Field.RESOURCE, from.getResource()); + record.setAttribute(Field.SUBJECT, from.getSubjectName()); + record.setAttribute(Field.OPERATION_DEFINITION, from.getOperationDefinition()); + record.setAttribute(Field.OPERATION_NAME, from.getOperationDefinition().getDisplayName()); + record.setAttribute(Field.ERROR_MESSAGE, from.getErrorMessage()); + record.setAttribute(Field.STATUS, from.getStatus().name()); + record.setAttribute(Field.PARAMETERS, from.getParameters()); + return record; } + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryView.java index 5e03c44..662dff7 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryView.java @@ -46,13 +46,15 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableMenu; * @author Greg Hinkle */ public class OperationHistoryView extends TableSection { + public static final String VIEW_ID = "RecentOperations"; + private static final String TITLE = MSG.view_operationHistoryList_title();
private ResourceComposite composite; private Resource resource;
public OperationHistoryView(String locatorId) { - super(locatorId, "Operation History"); + super(locatorId, TITLE); setWidth100(); setHeight100();
@@ -61,7 +63,8 @@ public class OperationHistoryView extends TableSection { }
public OperationHistoryView(String locatorId, ResourceComposite resourceComposite) { - super(locatorId, "Operation History", new Criteria("resourceId", String.valueOf(resourceComposite.getResource() + super(locatorId, TITLE, new Criteria(OperationHistoryDataSource.CriteriaField.RESOURCE_ID, + String.valueOf(resourceComposite.getResource() .getId()))); this.composite = resourceComposite; this.resource = resourceComposite.getResource(); @@ -73,10 +76,10 @@ public class OperationHistoryView extends TableSection { @Override protected void configureTable() {
- getListGrid().getField("id").setWidth(40); - getListGrid().getField("operationName").setWidth("*"); - getListGrid().getField("status").setWidth(100); - getListGrid().getField("status").setCellFormatter(new CellFormatter() { + getListGrid().getField(OperationHistoryDataSource.Field.ID).setWidth(40); + getListGrid().getField(OperationHistoryDataSource.Field.OPERATION_NAME).setWidth("*"); + getListGrid().getField(OperationHistoryDataSource.Field.STATUS).setWidth(100); + getListGrid().getField(OperationHistoryDataSource.Field.STATUS).setCellFormatter(new CellFormatter() { public String format(Object o, ListGridRecord listGridRecord, int i, int i1) { OperationRequestStatus status = OperationRequestStatus.valueOf((String) o); String icon = ""; @@ -99,18 +102,18 @@ public class OperationHistoryView extends TableSection { } });
- getListGrid().getField("startedTime").setWidth(120); + getListGrid().getField(OperationHistoryDataSource.Field.STARTED_TIME).setWidth(120);
if (this.resource == null) { - getListGrid().getField("resource").setWidth(300); - getListGrid().getField("resource").setCellFormatter(new CellFormatter() { + getListGrid().getField(OperationHistoryDataSource.Field.RESOURCE).setWidth(300); + getListGrid().getField(OperationHistoryDataSource.Field.RESOURCE).setCellFormatter(new CellFormatter() { public String format(Object o, ListGridRecord listGridRecord, int i, int i1) { Resource res = (Resource) o; return "<a href="#Resource/" + res.getId() + "">" + res.getName() + "</a>"; } }); } else { - getListGrid().hideField("resource"); + getListGrid().hideField(OperationHistoryDataSource.Field.RESOURCE); }
if (resource != null && composite.getResourcePermission().isControl()) { @@ -131,7 +134,8 @@ public class OperationHistoryView extends TableSection { } });
- IMenuButton operationsButton = new LocatableIMenuButton(this.extendLocatorId("Run"), "Run Operation", + IMenuButton operationsButton = new LocatableIMenuButton(this.extendLocatorId("Run"), + MSG.view_operationHistoryList_button_runOperation(), operationMenu); operationsButton.setShowMenuBelow(false); operationsButton.setAutoFit(true); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationWizard.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationWizard.java index 26f7108..47d7dae 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationWizard.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationWizard.java @@ -28,6 +28,7 @@ import com.smartgwt.client.widgets.layout.VLayout; /** * @author Greg Hinkle */ +// TODO (ips, 11/17/10): Can this class be deleted? public class OperationWizard extends VLayout{
private Resource resource; @@ -38,15 +39,6 @@ public class OperationWizard extends VLayout{ this.operation = operation; }
- - @Override - protected void onDraw() { - super.onDraw(); - - } - - - public static void startPopupOperationWizard(Resource resource, String operation) { final Window dialog = new Window(); dialog.setTitle("Execute Operation"); @@ -64,6 +56,6 @@ public class OperationWizard extends VLayout{ }); dialog.addItem(new OperationWizard(resource, operation)); dialog.show(); - } + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/ExecutionSchedule.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/ExecutionSchedule.java index c471dc7..1f3f517 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/ExecutionSchedule.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/ExecutionSchedule.java @@ -29,11 +29,14 @@ import com.google.gwt.i18n.client.DateTimeFormat; */ public class ExecutionSchedule implements Serializable {
- public enum Start { Immediately, Future };
+ public enum End { + Never, EndOn + }; + public enum Recurr { Once, EveryNMinutes, Hourly, Daily, Weekly, Monthly }; @@ -274,7 +277,6 @@ public class ExecutionSchedule implements Serializable {
}
- public String suffix(int num) { int last = num % 10; switch (last) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationCreateWizard.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationCreateWizard.java index e76e2ca..654ed0a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationCreateWizard.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationCreateWizard.java @@ -23,6 +23,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List;
+import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.widgets.IButton; import com.smartgwt.client.widgets.events.ClickEvent; @@ -70,7 +71,7 @@ public class OperationCreateWizard extends AbstractWizard { steps.add(schedulingStep); setSteps(steps);
- executeNowButton = new IButton("Execute Immediately"); + executeNowButton = new IButton(MSG.view_operationCreateWizard_button_executeImmediately()); executeNowButton.setAutoFit(true); executeNowButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { @@ -78,7 +79,7 @@ public class OperationCreateWizard extends AbstractWizard { } });
- executeButton = new IButton("Execute"); + executeButton = new IButton(MSG.view_operationCreateWizard_button_execute()); executeButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { execute(); @@ -90,11 +91,11 @@ public class OperationCreateWizard extends AbstractWizard { }
public String getWindowTitle() { - return "Operation Wizard"; + return MSG.view_operationCreateWizard_title(); }
public String getTitle() { - return "Execute " + operationDefinition.getDisplayName() + " on " + resource.getName(); + return MSG.view_operationCreateWizard_header(operationDefinition.getDisplayName(), resource.getName()); }
public String getSubtitle() { @@ -113,7 +114,7 @@ public class OperationCreateWizard extends AbstractWizard { }
private void execute() { - com.allen_sauer.gwt.log.client.Log.info("TODO Executed operation!!"); + Log.info("TODO Executed operation!!");
OperationGWTServiceAsync operationService = GWTServiceLookup.getOperationService();
@@ -123,13 +124,13 @@ public class OperationCreateWizard extends AbstractWizard { GWTServiceLookup.getOperationService().scheduleResourceOperation(resource.getId(), operationDefinition.getName(), parameters, schedule, " testing ", 0, new AsyncCallback<Void>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to schedule operation execution", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_operationCreateWizard_error_scheduleOperationFailure(), + caught); }
public void onSuccess(Void result) { - - String message = "Schedule operation [" + operationDefinition.getName() + "] on resource [" - + resource.getId() + "] with cron string [" + schedule.getCronString() + "]"; + String message = MSG.view_operationCreateWizard_message_scheduleOperationSuccess( + operationDefinition.getName(), String.valueOf(resource.getId()), schedule.getCronString());
CoreGUI.getMessageCenter().notify(new Message(message, Message.Severity.Info)); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationParametersStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationParametersStep.java index e32b2fd..05489c8 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationParametersStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationParametersStep.java @@ -53,7 +53,7 @@ public class OperationParametersStep extends AbstractWizardStep { } return configurationEditor; } else { - return new HTMLFlow("This operation does not take any parameters."); + return new HTMLFlow(MSG.view_operationCreateWizard_parametersStep_noParameters()); } }
@@ -62,10 +62,11 @@ public class OperationParametersStep extends AbstractWizardStep { }
public String getName() { - return "Operation Parameters"; + return MSG.view_operationCreateWizard_parametersStep_name(); }
public Configuration getParameterConfiguration() { return configurationEditor != null ? configurationEditor.getConfiguration() : null; } + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationSchedulingStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationSchedulingStep.java index 674f366..f90fd69 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationSchedulingStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationSchedulingStep.java @@ -18,10 +18,12 @@ */ package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation.create;
+import java.util.ArrayList; import java.util.Date; import java.util.EnumSet; import java.util.HashSet; import java.util.LinkedHashMap; +import java.util.List;
import com.smartgwt.client.types.FormErrorOrientation; import com.smartgwt.client.types.TimeFormatter; @@ -70,51 +72,54 @@ public class OperationSchedulingStep extends AbstractWizardStep implements ItemC // form.setColWidths("15%", "35%", "15%", "*"); form.setValidateOnChange(true);
- final RadioGroupItem start = new RadioGroupItem("start", "Start"); + final RadioGroupItem start = new RadioGroupItem("start", + MSG.view_operationCreateWizard_schedulingStep_name()); start.setColSpan(3); start.setValueMap(enumValueMap(ExecutionSchedule.Start.class)); // "Immediately", "Future" start.setRedrawOnChange(true); start.setValue("Immediately");
HeaderItem scheduleHeader = new HeaderItem("scheduleHeader"); - scheduleHeader.setValue("Schedule"); + scheduleHeader.setValue(MSG.view_operationCreateWizard_schedulingStep_label_schedule()); scheduleHeader.setShowIfCondition(new FormItemIfFunction() { public boolean execute(FormItem formItem, Object o, DynamicForm dynamicForm) { return !"Immediately".equals(form.getValueAsString("start")); } });
- RadioGroupItem recurr = new RadioGroupItem("recurr", "Recurrence"); + RadioGroupItem recurr = new RadioGroupItem("recurr", + MSG.view_operationCreateWizard_schedulingStep_label_recurrence()); recurr.setValueMap(enumValueMap(ExecutionSchedule.Recurr.class)); // "Once", "EveryNMinutes", "Hourly", "Daily", "Weekly", "Monthly"); recurr.setRedrawOnChange(true); - recurr.setValue("Once"); + recurr.setValue(ExecutionSchedule.Recurr.Once.name()); recurr.setShowIfCondition(new FormItemIfFunction() { public boolean execute(FormItem formItem, Object o, DynamicForm dynamicForm) { - return !"Immediately".equals(form.getValueAsString("start")); + return !ExecutionSchedule.Start.Immediately.name().equals(form.getValueAsString("start")); } });
- CanvasItem onceForm = new CanvasItem("once", "Run At"); + CanvasItem onceForm = new CanvasItem("once", MSG.view_operationCreateWizard_schedulingStep_label_onceAt()); onceForm.setShowTitle(false); onceForm.setCanvas(getOnceForm()); onceForm.setShowIfCondition(new FormItemIfFunction() { public boolean execute(FormItem formItem, Object o, DynamicForm dynamicForm) { - return !"Immediately".equals(form.getValueAsString("start")) + return !ExecutionSchedule.Start.Immediately.name().equals(form.getValueAsString("start")) && ExecutionSchedule.Recurr.Once.name().equals(form.getValueAsString("recurr")); } });
- CanvasItem everyNMinuteForm = new CanvasItem("everyNMinutesForm", "NMinutes"); + CanvasItem everyNMinuteForm = new CanvasItem("everyNMinutesForm", + MSG.view_operationCreateWizard_schedulingStep_label_everyNMinutes()); everyNMinuteForm.setShowTitle(false); everyNMinuteForm.setCanvas(getEveryNMinutesForm()); everyNMinuteForm.setShowIfCondition(new FormItemIfFunction() { public boolean execute(FormItem formItem, Object o, DynamicForm dynamicForm) { - return !"Immediately".equals(form.getValueAsString("start")) + return !ExecutionSchedule.Start.Immediately.name().equals(form.getValueAsString("start")) && ExecutionSchedule.Recurr.EveryNMinutes.name().equals(form.getValueAsString("recurr")); } });
- CanvasItem hourlyForm = new CanvasItem("hourlyForm", "Hourly"); + CanvasItem hourlyForm = new CanvasItem("hourlyForm", MSG.view_operationCreateWizard_schedulingStep_label_hourly()); hourlyForm.setShowTitle(false); hourlyForm.setCanvas(getHourlyForm()); hourlyForm.setShowIfCondition(new FormItemIfFunction() { @@ -124,73 +129,74 @@ public class OperationSchedulingStep extends AbstractWizardStep implements ItemC } });
- CanvasItem dailyForm = new CanvasItem("daily", "Days"); + CanvasItem dailyForm = new CanvasItem("daily", MSG.view_operationCreateWizard_schedulingStep_label_daily()); dailyForm.setShowTitle(false); dailyForm.setCanvas(getDailyForm()); dailyForm.setShowIfCondition(new FormItemIfFunction() { public boolean execute(FormItem formItem, Object o, DynamicForm dynamicForm) { - return !"Immediately".equals(form.getValueAsString("start")) - && "Daily".equals(form.getValueAsString("recurr")); + return !ExecutionSchedule.Start.Immediately.name().equals(form.getValueAsString("start")) + && ExecutionSchedule.Recurr.Daily.name().equals(form.getValueAsString("recurr")); } });
- CanvasItem weeklyForm = new CanvasItem("weekly", "Weekly"); + CanvasItem weeklyForm = new CanvasItem("weekly", MSG.view_operationCreateWizard_schedulingStep_label_weekly()); weeklyForm.setShowTitle(false); weeklyForm.setCanvas(getWeeklyForm()); weeklyForm.setShowIfCondition(new FormItemIfFunction() { public boolean execute(FormItem formItem, Object o, DynamicForm dynamicForm) { - return !"Immediately".equals(form.getValueAsString("start")) - && "Weekly".equals(form.getValueAsString("recurr")); + return !ExecutionSchedule.Start.Immediately.name().equals(form.getValueAsString("start")) + && ExecutionSchedule.Recurr.Weekly.name().equals(form.getValueAsString("recurr")); } });
- CanvasItem monthlyForm = new CanvasItem("monthly", "Monthly"); + CanvasItem monthlyForm = new CanvasItem("monthly", MSG.view_operationCreateWizard_schedulingStep_label_monthly()); monthlyForm.setShowTitle(false); monthlyForm.setCanvas(getMonthlyForm()); monthlyForm.setShowIfCondition(new FormItemIfFunction() { public boolean execute(FormItem formItem, Object o, DynamicForm dynamicForm) { - return !"Immediately".equals(form.getValueAsString("start")) - && "Monthly".equals(form.getValueAsString("recurr")); + return !ExecutionSchedule.Start.Immediately.name().equals(form.getValueAsString("start")) + && ExecutionSchedule.Recurr.Monthly.name().equals(form.getValueAsString("recurr")); } });
HeaderItem rangeHeader = new HeaderItem("timePeriod"); - rangeHeader.setValue("Time Period"); + rangeHeader.setValue(MSG.view_operationCreateWizard_schedulingStep_label_timePeriod()); rangeHeader.setShowIfCondition(new FormItemIfFunction() { public boolean execute(FormItem formItem, Object o, DynamicForm dynamicForm) { - return !"Immediately".equals(form.getValueAsString("start")) - && !"Once".equals(form.getValueAsString("recurr")); + return !ExecutionSchedule.Start.Immediately.name().equals(form.getValueAsString("start")) + && !ExecutionSchedule.Recurr.Once.name().equals(form.getValueAsString("recurr")); } });
- DateItem startDate = new DateItem("startDate", "Start Date"); + DateItem startDate = new DateItem("startDate", MSG.view_operationCreateWizard_schedulingStep_label_startDate()); startDate.setStartRow(true); startDate.setStartDate(new Date()); startDate.setShowIfCondition(new FormItemIfFunction() { public boolean execute(FormItem formItem, Object o, DynamicForm dynamicForm) { - return !"Immediately".equals(form.getValueAsString("start")) + return !ExecutionSchedule.Start.Immediately.name().equals(form.getValueAsString("start")) && !"Once".equals(form.getValueAsString("recurr")); } });
- final RadioGroupItem end = new RadioGroupItem("endType", "Recurrence End"); + final RadioGroupItem end = new RadioGroupItem("endType", MSG.view_operationCreateWizard_schedulingStep_label_endDate()); end.setShowIfCondition(new FormItemIfFunction() { public boolean execute(FormItem formItem, Object o, DynamicForm dynamicForm) { - return !"Immediately".equals(form.getValueAsString("start")) + return !ExecutionSchedule.Start.Immediately.name().equals(form.getValueAsString("start")) && !"Once".equals(form.getValueAsString("recurr")); } }); end.setStartRow(true); + // TODO: i18n end.setValueMap("Never", "End On"); end.setRedrawOnChange(true); end.setValue("Never");
- DateItem endDate = new DateItem("endDate", "End Date"); + DateItem endDate = new DateItem("endDate", MSG.view_operationCreateWizard_schedulingStep_label_endDate()); endDate.setStartRow(true); endDate.setStartDate(new Date()); endDate.setShowIfCondition(new FormItemIfFunction() { public boolean execute(FormItem formItem, Object o, DynamicForm dynamicForm) { - return !"Immediately".equals(form.getValueAsString("start")) + return !ExecutionSchedule.Start.Immediately.name().equals(form.getValueAsString("start")) && !"Once".equals(form.getValueAsString("recurr")) && !"Never".equals(form.getValueAsString("endType")); } @@ -203,7 +209,7 @@ public class OperationSchedulingStep extends AbstractWizardStep implements ItemC });
StaticTextItem messageItem = new StaticTextItem("message"); - messageItem.setValue("Will execute immediately"); + messageItem.setValue(MSG.view_operationCreateWizard_schedulingStep_label_willExecuteImmediately()); messageItem.setStartRow(true); messageItem.setColSpan(3); messageItem.setShowTitle(false); @@ -223,16 +229,16 @@ public class OperationSchedulingStep extends AbstractWizardStep implements ItemC form.setValuesManager(valuesManager); form.setPadding(10); form.setIsGroup(true); - form.setGroupTitle("Once At"); + form.setGroupTitle(MSG.view_operationCreateWizard_schedulingStep_label_onceAt()); form.addItemChangedHandler(this);
form.setWrapItemTitles(false); form.setNumCols(2);
- DateItem startDate = new DateItem("onceStartDate", "Date"); + DateItem startDate = new DateItem("onceStartDate", MSG.view_operationCreateWizard_schedulingStep_label_startDate()); startDate.setValue(new Date());
- TimeItem startTime = new TimeItem("onceStartDate", "Time"); + TimeItem startTime = new TimeItem("onceStartDate", MSG.view_operationCreateWizard_schedulingStep_label_startDate()); startTime.setValue(new Date()); startTime.setDisplayFormat(TimeFormatter.TOSHORTPADDEDTIME); startTime.setUseMask(true); @@ -245,7 +251,7 @@ public class OperationSchedulingStep extends AbstractWizardStep implements ItemC form.setValuesManager(valuesManager); form.setPadding(10); form.setIsGroup(true); - form.setGroupTitle("Every N Minutes"); + form.setGroupTitle(MSG.view_operationCreateWizard_schedulingStep_label_everyNMinutes()); form.addItemChangedHandler(this);
form.setWrapItemTitles(false); @@ -253,7 +259,7 @@ public class OperationSchedulingStep extends AbstractWizardStep implements ItemC
IntegerItem everyNMinutes = new IntegerItem(); everyNMinutes.setName("minuteInterval"); - everyNMinutes.setTitle("Minute Interval"); + everyNMinutes.setTitle(MSG.view_operationCreateWizard_schedulingStep_label_minuteInterval()); everyNMinutes.setValue(60);
form.setItems(everyNMinutes); @@ -265,7 +271,7 @@ public class OperationSchedulingStep extends AbstractWizardStep implements ItemC form.setValuesManager(valuesManager); form.setPadding(10); form.setIsGroup(true); - form.setGroupTitle("Hourly At"); + form.setGroupTitle(MSG.view_operationCreateWizard_schedulingStep_label_hourly()); form.addItemChangedHandler(this);
form.setWrapItemTitles(false); @@ -273,7 +279,7 @@ public class OperationSchedulingStep extends AbstractWizardStep implements ItemC
IntegerItem minuteOfHour = new IntegerItem(); minuteOfHour.setName("minuteOfHour"); - minuteOfHour.setTitle("Minute of Hour"); + minuteOfHour.setTitle(MSG.view_operationCreateWizard_schedulingStep_label_minuteOfHour()); minuteOfHour.setValue(5);
form.setItems(minuteOfHour); @@ -286,10 +292,10 @@ public class OperationSchedulingStep extends AbstractWizardStep implements ItemC form.setPadding(10); form.setWrapItemTitles(false); form.setIsGroup(true); - form.setGroupTitle("Daily At"); + form.setGroupTitle(MSG.view_operationCreateWizard_schedulingStep_label_daily()); form.addItemChangedHandler(this);
- TimeItem timeOfDay = new TimeItem("timeOfDay", "Time Of Day"); + TimeItem timeOfDay = new TimeItem("timeOfDay", MSG.view_operationCreateWizard_schedulingStep_label_timeOfDay()); timeOfDay.setValue(new Date()); timeOfDay.setDisplayFormat(TimeFormatter.TOSHORTPADDEDTIME); timeOfDay.setUseMask(true); @@ -303,21 +309,25 @@ public class OperationSchedulingStep extends AbstractWizardStep implements ItemC form.setValuesManager(valuesManager); form.setPadding(10); form.setIsGroup(true); - form.setGroupTitle("Weekly On"); + form.setGroupTitle(MSG.view_operationCreateWizard_schedulingStep_label_weekly()); form.addItemChangedHandler(this);
form.setWrapItemTitles(false);
- TimeItem timeOfDay = new TimeItem("timeOfDay", "Time Of Day"); + TimeItem timeOfDay = new TimeItem("dayOfWeek", MSG.view_operationCreateWizard_schedulingStep_label_dayOfWeek()); timeOfDay.setValue(new Date()); timeOfDay.setDisplayFormat(TimeFormatter.TOSHORTPADDEDTIME); timeOfDay.setUseMask(true);
- String[] days = { "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" }; + ExecutionSchedule.DayOfWeek[] daysOfWeek = ExecutionSchedule.DayOfWeek.values(); + List<String> dayList = new ArrayList<String>(); + for (ExecutionSchedule.DayOfWeek dayOfWeek : daysOfWeek) { + dayList.add(dayOfWeek.name()); + } FormItem[] items = new FormItem[8]; items[0] = timeOfDay; int i = 1; - for (String day : days) { + for (String day : dayList) { CheckboxItem dayItem = new CheckboxItem(day); dayItem.setShowTitle(false); items[i++] = dayItem; @@ -332,15 +342,15 @@ public class OperationSchedulingStep extends AbstractWizardStep implements ItemC form.setPadding(10); form.setWrapItemTitles(false); form.setIsGroup(true); - form.setGroupTitle("Monthly On"); + form.setGroupTitle(MSG.view_operationCreateWizard_schedulingStep_label_monthly()); form.addItemChangedHandler(this);
IntegerItem dayItem = new IntegerItem(); dayItem.setName("dayOfMonth"); - dayItem.setTitle("Day of Month"); + dayItem.setTitle(MSG.view_operationCreateWizard_schedulingStep_label_dayOfMonth()); dayItem.setValue(1);
- TimeItem timeOfDay = new TimeItem("timeOfDay", "Time Of Day"); + TimeItem timeOfDay = new TimeItem("timeOfDay", MSG.view_operationCreateWizard_schedulingStep_label_timeOfDay()); timeOfDay.setValue(new Date()); timeOfDay.setDisplayFormat(TimeFormatter.TOSHORTPADDEDTIME); timeOfDay.setUseMask(true); @@ -354,7 +364,7 @@ public class OperationSchedulingStep extends AbstractWizardStep implements ItemC }
public String getName() { - return "Schedule"; + return MSG.view_operationCreateWizard_schedulingStep_name(); }
public void onItemChanged(ItemChangedEvent itemChangeEvent) { @@ -404,4 +414,5 @@ public class OperationSchedulingStep extends AbstractWizardStep implements ItemC public ExecutionSchedule getExecutionSchedule() { return executionSchedule; } + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/detail/OperationDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/detail/OperationDetailsView.java index cc3aa63..de6abed 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/detail/OperationDetailsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/detail/OperationDetailsView.java @@ -38,6 +38,7 @@ import org.rhq.enterprise.gui.coregui.client.ViewId; 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.detail.operation.OperationHistoryDataSource; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/** @@ -45,7 +46,6 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; */ public class OperationDetailsView extends LocatableVLayout implements BookmarkableView {
- private int historyId; private OperationDefinition definition; private ResourceOperationHistory operationHistory;
@@ -98,19 +98,19 @@ public class OperationDetailsView extends LocatableVLayout implements Bookmarkab form.setWidth100(); form.setWrapItemTitles(false);
- StaticTextItem operationItem = new StaticTextItem("operation", "Operation"); + StaticTextItem operationItem = new StaticTextItem(OperationHistoryDataSource.Field.OPERATION_NAME, "Operation"); operationItem.setValue(definition.getName());
- StaticTextItem submittedItem = new StaticTextItem("submitted", "Date Submitted"); + StaticTextItem submittedItem = new StaticTextItem(OperationHistoryDataSource.Field.STARTED_TIME, "Date Submitted"); submittedItem.setValue(new Date(operationHistory.getStartedTime()));
StaticTextItem completedItem = new StaticTextItem("completed", "Date Completed"); completedItem.setValue(new Date(operationHistory.getStartedTime() + operationHistory.getDuration()));
- StaticTextItem requesterItem = new StaticTextItem("requester", "Requester"); + StaticTextItem requesterItem = new StaticTextItem(OperationHistoryDataSource.Field.SUBJECT, "Requester"); requesterItem.setValue(operationHistory.getSubjectName());
- StaticTextItem statusItem = new StaticTextItem("status", "Status"); + StaticTextItem statusItem = new StaticTextItem(OperationHistoryDataSource.Field.STATUS, "Status"); statusItem.setValue(operationHistory.getStatus().name());
/* @@ -159,7 +159,8 @@ public class OperationDetailsView extends LocatableVLayout implements Bookmarkab GWTServiceLookup.getOperationService().findResourceOperationHistoriesByCriteria(criteria, new AsyncCallback<PageList<ResourceOperationHistory>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failure loading operation history", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_operationHistoryDetails_error_fetchFailure(), + caught); }
public void onSuccess(PageList<ResourceOperationHistory> result) { @@ -184,16 +185,13 @@ public class OperationDetailsView extends LocatableVLayout implements Bookmarkab window.centerInPage(); window.addItem(detailsView); window.show(); - }
@Override public void renderView(ViewPath viewPath) { - - historyId = viewPath.getCurrentAsInt(); - - viewId = viewPath.getCurrent(); - + this.viewId = viewPath.getCurrent(); + int historyId = viewPath.getCurrentAsInt(); lookupDetails(historyId); } + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java index 196d0b5..9f8b723 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java @@ -419,8 +419,8 @@ public abstract class RPCDataSource<T> extends DataSource { int[] intermediates = criteria.getAttributeAsIntArray(paramName); resultArray = (S[]) new Integer[intermediates.length]; int index = 0; - for (Integer next : intermediates) { - resultArray[index++] = (S) next; + for (int next : intermediates) { + resultArray[index++] = (S) Integer.valueOf(next); } } else if (type == String.class) { String[] intermediates = criteria.getAttributeAsStringArray(paramName); @@ -440,7 +440,7 @@ public abstract class RPCDataSource<T> extends DataSource { throw new IllegalArgumentException(MSG.dataSource_rpc_error_unsupportedArrayFilterType(type.getName())); }
- Log.debug("Result array = " + resultArray); + Log.debug("Result array = " + Arrays.toString(resultArray));
return resultArray; } diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index 367577e..d8c930b 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -108,7 +108,7 @@ common_title_recent_operations=Recent Operations~ common_title_remove_column=Remove Column~ common_title_resource = Resource~ common_title_resource_inventory=Resource Inventory~ -common_title_resource_id=Resource ID~ +ommon_title_resource_id=Resource ID~ common_title_resource_name=Resource Name~ common_title_scheduled_operations=Scheduled Operations~ common_title_selected_resources=Selected Resources~ @@ -162,7 +162,6 @@ common_calendar_october_short=oct common_calendar_november_short=nov common_calendar_december_short=dec
- #=================== Widgets =====================
# Record Editor @@ -311,6 +310,9 @@ dataSource_measurementOob_error_fetchFailure = Failed to load measurement OOB in dataSource_definitions_loadFailed=Failed to load metric definitions~ dataSource_schedules_loadFailed=Failed to load metric schedules~ dataSource_schedules_field_resourceGroupId=Group ID~ +dataSource_definitions_loadFailed=Failed to load metric definitions~ +dataSource_schedules_loadFailed=Failed to load metric schedules~ +dataSource_schedules_field_resourceGroupId=Group ID~
dataSource_schedules_enableFailure_resource=Failed to enable the collection of [{0}] metrics for resource with ID [{1}]. The metrics were: [{2}]~ dataSource_schedules_enableFailure_group=Failed to enable the collection of [{0}] metrics for group with ID [{1}]. The metrics were: [{2}]~ @@ -569,7 +571,7 @@ view_portlet_operations_config_scheduled_enable=Whether to enable scheduled oper view_portlet_operations_config_scheduled_maximum=Maximum number of Scheduled operations to display.~ view_portlet_operations_config_completed=completed operations~ view_portlet_operations_config_show_last=show Last~ -view_portlet_operations_config_show_next=show Next~ +view_portlet_operations_config_show_next=show Next~ view_portlet_operations_config_title=OperationsPortlet Configuration~ view_portlet_operations_config_title_desc=The configuration settings for the Operations portlet.~ view_portlet_operations_disabled=(Results currently disabled. Change settings to enable results.~ @@ -590,7 +592,7 @@ view_portlet_recentAlerts_config_members=Select Members~ view_portlet_recentAlerts_config_priority_label = priority Alerts,~ view_portlet_recentAlerts_config_when=within the past~ view_portlet_recentAlerts_help_msg = Displays recent alerts fired on resources visible to the current user login.~ -// dup in common +# dup in common view_portlet_recentAlerts_title = Recent Alerts~ view_portlet_recentlyAdded_approved_platforms=recently approved platforms on dashboard.~ view_portlet_recentlyAdded_error1=Failed to load recently added resources~ @@ -839,7 +841,50 @@ view_configurationHistoryDetails_error_loadFailure = Unable to load configuratio # Operation History List #--------------------------------- view_operationHistoryList_title = Operation History~ -view_operationHistoryList_button_runOperation = Run Operation +view_operationHistoryList_button_runOperation = Run Operation~ + +# Operation History Details +#-------------------------------------- +view_operationHistoryDetails_error_fetchFailure = Failure loading operation history.~ + +# Operation Create Wizard +#------------------------------------- +view_operationCreateWizard_title = Operation Wizard~ +view_operationCreateWizard_header = Execute {0} on {1}~ +view_operationCreateWizard_button_execute = Execute~ +view_operationCreateWizard_button_executeImmediately = Execute Immediately~ +view_operationCreateWizard_error_scheduleOperationFailure = Failed to schedule operation execution.~ +view_operationCreateWizard_message_scheduleOperationSuccess = Schedule operation [{0}] on Resource [{1}] with cron string [{2}].~ +view_operationCreateWizard_parametersStep_name = Operation Parameters~ +view_operationCreateWizard_parametersStep_noParameters = This operation does not take any parameters.~ +view_operationCreateWizard_schedulingStep_name = Schedule +view_operationCreateWizard_schedulingStep_label_start = Start +view_operationCreateWizard_schedulingStep_label_schedule = Schedule +view_operationCreateWizard_schedulingStep_label_recurrence = Recurrence +view_operationCreateWizard_schedulingStep_label_runAt = Run At +view_operationCreateWizard_schedulingStep_label_nMinutes = n Minutes +view_operationCreateWizard_schedulingStep_label_hourly = Hourly +view_operationCreateWizard_schedulingStep_label_daily = Daily +view_operationCreateWizard_schedulingStep_label_weekly = Weekly +view_operationCreateWizard_schedulingStep_label_monthly = Monthly +view_operationCreateWizard_schedulingStep_label_timePeriod = Time Period +view_operationCreateWizard_schedulingStep_label_startDate = Start Date +view_operationCreateWizard_schedulingStep_label_recurrenceEnd = Recurrence End +view_operationCreateWizard_schedulingStep_label_endDate = End Date +view_operationCreateWizard_schedulingStep_label_willExecuteImmediately = Will execute immediately +view_operationCreateWizard_schedulingStep_label_onceAt = Once At +view_operationCreateWizard_schedulingStep_label_date = Date +view_operationCreateWizard_schedulingStep_label_time = Time +view_operationCreateWizard_schedulingStep_label_everyNMinutes = Every n Minutes +view_operationCreateWizard_schedulingStep_label_minuteInterval = Minute Interval +view_operationCreateWizard_schedulingStep_label_hourlyAt = Hourly At +view_operationCreateWizard_schedulingStep_label_minuteOfHour = Minute of Hour +view_operationCreateWizard_schedulingStep_label_dailyAt = Daily At +view_operationCreateWizard_schedulingStep_label_timeOfDay = Time of Day +view_operationCreateWizard_schedulingStep_label_weeklyOn = Weekly On +view_operationCreateWizard_schedulingStep_label_dayOfWeek = Day of Week +view_operationCreateWizard_schedulingStep_label_monthlyOn = Monthly On +view_operationCreateWizard_schedulingStep_label_dayOfMonth = Day of Month
#==================== Reports ======================
commit b1537305a30ade59f796b4c54d83c6c39a01fae6 Author: Joseph Marques joseph@redhat.com Date: Wed Nov 17 18:50:04 2010 -0500
i18n for org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.traits
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/traits/TraitsDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/traits/TraitsDataSource.java index 1ec2946..eea99dd 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/traits/TraitsDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/traits/TraitsDataSource.java @@ -21,7 +21,6 @@ package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitori import java.util.List;
import com.smartgwt.client.data.DataSourceField; -import com.smartgwt.client.data.Record; import com.smartgwt.client.data.fields.DataSourceIntegerField; import com.smartgwt.client.widgets.grid.ListGridRecord;
@@ -41,7 +40,7 @@ public class TraitsDataSource extends AbstractMeasurementDataTraitDataSource { List<DataSourceField> fields = super.addDataSourceFields();
DataSourceIntegerField resourceIdField = new DataSourceIntegerField( - MeasurementDataTraitCriteria.FILTER_FIELD_RESOURCE_ID, "Resource Id"); + MeasurementDataTraitCriteria.FILTER_FIELD_RESOURCE_ID, MSG.common_title_resource_id()); resourceIdField.setHidden(true); fields.add(0, resourceIdField);
commit c5102314ffcf5b443960378d325bd0e2c3943ce0 Author: Joseph Marques joseph@redhat.com Date: Wed Nov 17 18:46:27 2010 -0500
i18n for org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.schedules
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/SchedulesDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/SchedulesDataSource.java index eb9da82..902efa7 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/SchedulesDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/SchedulesDataSource.java @@ -93,17 +93,18 @@ public class SchedulesDataSource extends AbstractMeasurementScheduleCompositeDat @Override public void onFailure(Throwable throwable) { CoreGUI.getErrorHandler().handleError( - MSG.dataSource_schedules_enableFailure(String.valueOf(measurementDefinitionIds.length), String - .valueOf(resourceGroupId), measurementDefinitionDisplayNames.toString()), throwable); + MSG.dataSource_schedules_enableFailure_group(String.valueOf(measurementDefinitionIds.length), + String.valueOf(resourceGroupId), measurementDefinitionDisplayNames.toString()), throwable); }
@Override public void onSuccess(Void aVoid) { CoreGUI.getMessageCenter().notify( new Message(MSG.dataSource_schedules_enableSuccessful_concise(String - .valueOf(measurementDefinitionIds.length)), MSG.dataSource_schedules_enableSuccessful_full( - String.valueOf(measurementDefinitionIds.length), String.valueOf(resourceGroupId), - measurementDefinitionDisplayNames.toString()), Message.Severity.Info)); + .valueOf(measurementDefinitionIds.length)), MSG + .dataSource_schedules_enableSuccessful_full_group(String + .valueOf(measurementDefinitionIds.length), String.valueOf(resourceGroupId), + measurementDefinitionDisplayNames.toString()), Message.Severity.Info)); measurementScheduleListView.refresh(); } }); @@ -118,8 +119,8 @@ public class SchedulesDataSource extends AbstractMeasurementScheduleCompositeDat @Override public void onFailure(Throwable throwable) { CoreGUI.getErrorHandler().handleError( - MSG.dataSource_schedules_disableFailure(String.valueOf(measurementDefinitionIds.length), String - .valueOf(resourceGroupId), measurementDefinitionDisplayNames.toString()), throwable); + MSG.dataSource_schedules_disableFailure_group(String.valueOf(measurementDefinitionIds.length), + String.valueOf(resourceGroupId), measurementDefinitionDisplayNames.toString()), throwable); }
@Override @@ -127,7 +128,7 @@ public class SchedulesDataSource extends AbstractMeasurementScheduleCompositeDat CoreGUI.getMessageCenter().notify( new Message(MSG.dataSource_schedules_disableSuccessful_concise(String .valueOf(measurementDefinitionIds.length)), MSG - .dataSource_schedules_disableSuccessful_full(String + .dataSource_schedules_disableSuccessful_full_group(String .valueOf(measurementDefinitionIds.length), String.valueOf(resourceGroupId), measurementDefinitionDisplayNames.toString()), Message.Severity.Info)); measurementScheduleListView.refresh(); @@ -145,9 +146,9 @@ public class SchedulesDataSource extends AbstractMeasurementScheduleCompositeDat @Override public void onFailure(Throwable throwable) { CoreGUI.getErrorHandler().handleError( - MSG.dataSource_schedules_updateFailure(String.valueOf(measurementDefinitionIds.length), String - .valueOf(resourceGroupId), measurementDefinitionDisplayNames.toString(), String - .valueOf(collectionInterval / 1000)), throwable); + MSG.dataSource_schedules_updateFailure_group(String.valueOf(measurementDefinitionIds.length), + String.valueOf(resourceGroupId), measurementDefinitionDisplayNames.toString(), String + .valueOf(collectionInterval / 1000)), throwable); }
@Override @@ -155,10 +156,10 @@ public class SchedulesDataSource extends AbstractMeasurementScheduleCompositeDat String collIntervalStr = String.valueOf(collectionInterval / 1000); CoreGUI.getMessageCenter().notify( new Message(MSG.dataSource_schedules_updateSuccessful_concise(collIntervalStr, String - .valueOf(measurementDefinitionIds.length)), MSG.dataSource_schedules_updateSuccessful_full( - collIntervalStr, String.valueOf(measurementDefinitionIds.length), String - .valueOf(resourceGroupId), measurementDefinitionDisplayNames.toString()), - Message.Severity.Info)); + .valueOf(measurementDefinitionIds.length)), MSG + .dataSource_schedules_updateSuccessful_full_group(collIntervalStr, String + .valueOf(measurementDefinitionIds.length), String.valueOf(resourceGroupId), + measurementDefinitionDisplayNames.toString()), Message.Severity.Info)); measurementScheduleListView.refresh(); } }); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/schedules/SchedulesDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/schedules/SchedulesDataSource.java index f60147a..c131931 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/schedules/SchedulesDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/schedules/SchedulesDataSource.java @@ -24,7 +24,6 @@ import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.data.Criteria; import com.smartgwt.client.data.DSRequest; import com.smartgwt.client.data.DataSourceField; -import com.smartgwt.client.data.Record; import com.smartgwt.client.data.fields.DataSourceIntegerField; import com.smartgwt.client.widgets.grid.ListGridRecord;
@@ -56,7 +55,7 @@ public class SchedulesDataSource extends AbstractMeasurementScheduleCompositeDat List<DataSourceField> fields = super.addDataSourceFields();
DataSourceField resourceIdField = new DataSourceIntegerField( - MeasurementScheduleCriteria.FILTER_FIELD_RESOURCE_ID, "Resource Id"); + MeasurementScheduleCriteria.FILTER_FIELD_RESOURCE_ID, MSG.common_title_resource_id()); resourceIdField.setHidden(true); fields.add(resourceIdField);
@@ -79,21 +78,25 @@ public class SchedulesDataSource extends AbstractMeasurementScheduleCompositeDat
@Override protected void enableSchedules(final AbstractMeasurementScheduleListView measurementScheduleListView, - int[] measurementDefinitionIds, final List<String> measurementDefinitionDisplayNames) { + final int[] measurementDefinitionIds, final List<String> measurementDefinitionDisplayNames) { this.measurementService.enableSchedulesForResource(this.resourceId, measurementDefinitionIds, new AsyncCallback<Void>() { @Override public void onFailure(Throwable throwable) { CoreGUI.getErrorHandler().handleError( - "Failed to enable collection of metrics " + measurementDefinitionDisplayNames - + " for Resource with id [" + resourceId + "].", throwable); + MSG.dataSource_schedules_enableFailure_resource( + String.valueOf(measurementDefinitionIds.length), String.valueOf(resourceId), + measurementDefinitionDisplayNames.toString()), throwable); }
@Override public void onSuccess(Void aVoid) { CoreGUI.getMessageCenter().notify( - new Message("Enabled collection of metrics " + measurementDefinitionDisplayNames - + " for Resource with id [" + resourceId + "].", Message.Severity.Info)); + new Message(MSG.dataSource_schedules_enableSuccessful_concise(String + .valueOf(measurementDefinitionIds.length)), MSG + .dataSource_schedules_enableSuccessful_full_resource(String + .valueOf(measurementDefinitionIds.length), String.valueOf(resourceId), + measurementDefinitionDisplayNames.toString()), Message.Severity.Info)); measurementScheduleListView.refresh(); } }); @@ -101,21 +104,25 @@ public class SchedulesDataSource extends AbstractMeasurementScheduleCompositeDat
@Override protected void disableSchedules(final AbstractMeasurementScheduleListView measurementScheduleListView, - int[] measurementDefinitionIds, final List<String> measurementDefinitionDisplayNames) { + final int[] measurementDefinitionIds, final List<String> measurementDefinitionDisplayNames) { this.measurementService.disableSchedulesForResource(this.resourceId, measurementDefinitionIds, new AsyncCallback<Void>() { @Override public void onFailure(Throwable throwable) { CoreGUI.getErrorHandler().handleError( - "Failed to disable collection of metrics " + measurementDefinitionDisplayNames - + " for Resource with id [" + resourceId + "].", throwable); + MSG.dataSource_schedules_disableFailure_resource(String + .valueOf(measurementDefinitionIds.length), String.valueOf(resourceId), + measurementDefinitionDisplayNames.toString()), throwable); }
@Override public void onSuccess(Void aVoid) { CoreGUI.getMessageCenter().notify( - new Message("Disabled collection of metrics " + measurementDefinitionDisplayNames - + " for Resource with id [" + resourceId + "].", Message.Severity.Info)); + new Message(MSG.dataSource_schedules_disableSuccessful_concise(String + .valueOf(measurementDefinitionIds.length)), MSG + .dataSource_schedules_disableSuccessful_full_resource(String + .valueOf(measurementDefinitionIds.length), String.valueOf(resourceId), + measurementDefinitionDisplayNames.toString()), Message.Severity.Info)); measurementScheduleListView.refresh(); } }); @@ -123,24 +130,28 @@ public class SchedulesDataSource extends AbstractMeasurementScheduleCompositeDat
@Override protected void updateSchedules(final AbstractMeasurementScheduleListView measurementScheduleListView, - int[] measurementDefinitionIds, final List<String> measurementDefinitionDisplayNames, + final int[] measurementDefinitionIds, final List<String> measurementDefinitionDisplayNames, final long collectionInterval) { this.measurementService.updateSchedulesForResource(this.resourceId, measurementDefinitionIds, collectionInterval, new AsyncCallback<Void>() { @Override public void onFailure(Throwable throwable) { CoreGUI.getErrorHandler().handleError( - "Failed to set collection interval to " + (collectionInterval / 1000) + " seconds for metrics " - + measurementDefinitionDisplayNames + " for Resource with id [" + resourceId + "].", + MSG.dataSource_schedules_updateFailure_resource( + String.valueOf(measurementDefinitionIds.length), String.valueOf(resourceId), + measurementDefinitionDisplayNames.toString(), String.valueOf(collectionInterval / 1000)), throwable); }
@Override public void onSuccess(Void aVoid) { + String collIntervalStr = String.valueOf(collectionInterval / 1000); CoreGUI.getMessageCenter().notify( - new Message("Collection interval for metrics " + measurementDefinitionDisplayNames - + " for Resource with id [" + resourceId + "] set to " + (collectionInterval / 1000) - + " seconds.", Message.Severity.Info)); + new Message(MSG.dataSource_schedules_updateSuccessful_concise(collIntervalStr, String + .valueOf(measurementDefinitionIds.length)), MSG + .dataSource_schedules_updateSuccessful_full_resource(collIntervalStr, String + .valueOf(measurementDefinitionIds.length), String.valueOf(resourceId), + measurementDefinitionDisplayNames.toString()), Message.Severity.Info)); measurementScheduleListView.refresh(); } }); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/schedules/SchedulesView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/schedules/SchedulesView.java index 782b227..813ac07 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/schedules/SchedulesView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/schedules/SchedulesView.java @@ -30,7 +30,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractMeasuremen */ public class SchedulesView extends AbstractMeasurementScheduleListView {
- private static final String TITLE = "Metric Collection Schedules"; + private static final String TITLE = MSG.view_resource_monitor_schedules_title();
private static final String[] EXCLUDED_FIELD_NAMES = new String[] { MeasurementScheduleCriteria.FILTER_FIELD_RESOURCE_ID };
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index a0c5291..367577e 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -108,6 +108,7 @@ common_title_recent_operations=Recent Operations~ common_title_remove_column=Remove Column~ common_title_resource = Resource~ common_title_resource_inventory=Resource Inventory~ +common_title_resource_id=Resource ID~ common_title_resource_name=Resource Name~ common_title_scheduled_operations=Scheduled Operations~ common_title_selected_resources=Selected Resources~ @@ -310,15 +311,28 @@ dataSource_measurementOob_error_fetchFailure = Failed to load measurement OOB in dataSource_definitions_loadFailed=Failed to load metric definitions~ dataSource_schedules_loadFailed=Failed to load metric schedules~ dataSource_schedules_field_resourceGroupId=Group ID~ -dataSource_schedules_enableFailure=Failed to enable the collection of [{0}] metrics for resource group with ID [{1}]. The metrics were: [{2}]~ + +dataSource_schedules_enableFailure_resource=Failed to enable the collection of [{0}] metrics for resource with ID [{1}]. The metrics were: [{2}]~ +dataSource_schedules_enableFailure_group=Failed to enable the collection of [{0}] metrics for group with ID [{1}]. The metrics were: [{2}]~ + dataSource_schedules_enableSuccessful_concise=You have enabled the collection of [{0}] measurements~ -dataSource_schedules_enableSuccessful_full=You have enabled the collection of [{0}] measurements for the resource group with ID [{1}]. The enabled measurements are: [{2}]~ -dataSource_schedules_disableFailure=Failed to disable the collection of [{0}] metrics for resource group with ID [{1}]. The metrics were: [{2}]~ +dataSource_schedules_enableSuccessful_full_resource=You have enabled the collection of [{0}] measurements for the resource with ID [{1}]. The enabled measurements are: [{2}]~ +dataSource_schedules_enableSuccessful_full_group=You have enabled the collection of [{0}] measurements for the resource group with ID [{1}]. The enabled measurements are: [{2}]~ + +dataSource_schedules_disableFailure_resource=Failed to disable the collection of [{0}] metrics for resource with ID [{1}]. The metrics were: [{2}]~ +dataSource_schedules_disableFailure_group=Failed to disable the collection of [{0}] metrics for resource group with ID [{1}]. The metrics were: [{2}]~ + dataSource_schedules_disableSuccessful_concise=You have disabled the collection of [{0}] measurements~ -dataSource_schedules_disableSuccessful_full=You have disabled the collection of [{0}] measurements for the resource group with ID [{1}]. The disabled measurements are: [{2}]~ -dataSource_schedules_updateFailure=Failed to set the collection interval of [{0}] metrics for resource group with ID [{1}]. The metrics were: [{2}]. The collection interval was to be [{3}] seconds.~ +dataSource_schedules_disableSuccessful_full_resource=You have disabled the collection of [{0}] measurements for the resource with ID [{1}]. The disabled measurements are: [{2}]~ +dataSource_schedules_disableSuccessful_full_group=You have disabled the collection of [{0}] measurements for the resource group with ID [{1}]. The disabled measurements are: [{2}]~ + +dataSource_schedules_updateFailure_resource=Failed to set the collection interval of [{0}] metrics for resource with ID [{1}]. The metrics were: [{2}]. The collection interval was to be [{3}] seconds.~ +dataSource_schedules_updateFailure_group=Failed to set the collection interval of [{0}] metrics for resource group with ID [{1}]. The metrics were: [{2}]. The collection interval was to be [{3}] seconds.~ + dataSource_schedules_updateSuccessful_concise=A new collection interval of [{0}] seconds has been set on [{1}] measurements~ -dataSource_schedules_updateSuccessful_full=A new collection interval of [{0}] seconds has been set on [{1}] measurements for resource group with ID [{2}]. The updated measurements are: [{3}]~ +dataSource_schedules_updateSuccessful_full_resource=A new collection interval of [{0}] seconds has been set on [{1}] measurements for resource with ID [{2}]. The updated measurements are: [{3}]~ +dataSource_schedules_updateSuccessful_full_group=A new collection interval of [{0}] seconds has been set on [{1}] measurements for resource group with ID [{2}]. The updated measurements are: [{3}]~ +
# Problem Resources #------------------------------ @@ -647,6 +661,7 @@ view_resource_monitor_calltime_total=Total~ view_resource_monitor_calltime_loadFailed=Could not load call time data~ view_resource_monitor_calltime_lookupFailed=Could not load resource for call time~ view_resource_monitor_calltime_editFailed=Call time data can not be edited~ +view_resource_monitor_schedules_title=Resource Metric Collection Schedules~ view_tree_common_loadFailed_generic=Failed to load data for tree~ view_tree_common_loadFailed_root=Failed to load root for tree~ view_tree_common_loadFailed_descendants=Failed to load descendants for tree~
commit 32b4a6278837805caa9e38670d3af34fd8d143cc Author: Joseph Marques joseph@redhat.com Date: Wed Nov 17 18:09:13 2010 -0500
i18n for org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.calltime
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/calltime/CallTimeDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/calltime/CallTimeDataSource.java index 1b36cb0..85bf0f0 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/calltime/CallTimeDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/calltime/CallTimeDataSource.java @@ -53,17 +53,21 @@ public class CallTimeDataSource extends RPCDataSource<CallTimeDataComposite> { protected List<DataSourceField> addDataSourceFields() { List<DataSourceField> fields = super.addDataSourceFields();
- DataSourceTextField callDestination = new DataSourceTextField("callDestination", "Call Destination"); + DataSourceTextField callDestination = new DataSourceTextField("callDestination", MSG + .view_resource_monitor_calltime_destination()); fields.add(callDestination); - DataSourceIntegerField count = new DataSourceIntegerField("count"); + DataSourceIntegerField count = new DataSourceIntegerField("count", MSG.view_resource_monitor_calltime_count()); fields.add(count); - DataSourceIntegerField minimum = new DataSourceIntegerField("minimum"); + DataSourceIntegerField minimum = new DataSourceIntegerField("minimum", MSG + .view_resource_monitor_calltime_minimum()); fields.add(minimum); - DataSourceIntegerField average = new DataSourceIntegerField("average"); + DataSourceIntegerField average = new DataSourceIntegerField("average", MSG + .view_resource_monitor_calltime_average()); fields.add(average); - DataSourceIntegerField maximum = new DataSourceIntegerField("maximum"); + DataSourceIntegerField maximum = new DataSourceIntegerField("maximum", MSG + .view_resource_monitor_calltime_maximum()); fields.add(maximum); - DataSourceIntegerField total = new DataSourceIntegerField("total"); + DataSourceIntegerField total = new DataSourceIntegerField("total", MSG.view_resource_monitor_calltime_total()); fields.add(total);
return fields; @@ -80,7 +84,7 @@ public class CallTimeDataSource extends RPCDataSource<CallTimeDataComposite> { GWTServiceLookup.getMeasurementDataService().findCallTimeDataForResource(scheduleId, eightHoursAgo, now, pc, new AsyncCallback<PageList<CallTimeDataComposite>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Could not load call time data", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_resource_monitor_calltime_loadFailed(), caught); }
public void onSuccess(PageList<CallTimeDataComposite> result) { @@ -95,7 +99,7 @@ public class CallTimeDataSource extends RPCDataSource<CallTimeDataComposite> {
@Override public CallTimeDataComposite copyValues(Record from) { - throw new UnsupportedOperationException("Calltime not editable"); + throw new UnsupportedOperationException(MSG.view_resource_monitor_calltime_editFailed()); }
public void setGraphs(Record[] records) { @@ -111,7 +115,7 @@ public class CallTimeDataSource extends RPCDataSource<CallTimeDataComposite> { int maxWidth = (int) ((record.getAttributeAsInt("maximum") / maxMaximum) * 100d);
if (record instanceof ListGridRecord) { - ListGridRecord listGridRecord = (ListGridRecord)record; + ListGridRecord listGridRecord = (ListGridRecord) record; listGridRecord.setBackgroundComponent(new HTMLFlow("<div style="width: " + minWidth + "%; height: 33%; background-color: #A5B391;"> </div>" + "<div style="width: " + avgWidth + "%; height: 33%; background-color: #A5B391;"> </div>" + "<div style="width: " + maxWidth diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/calltime/CallTimeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/calltime/CallTimeView.java index a8ad454..b13d5ee 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/calltime/CallTimeView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/calltime/CallTimeView.java @@ -73,8 +73,8 @@ public class CallTimeView extends LocatableLayout { GWTServiceLookup.getResourceService().findResourcesByCriteria(criteria, new AsyncCallback<PageList<Resource>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to load resource for call time", - caught); + CoreGUI.getErrorHandler().handleError( + MSG.view_resource_monitor_calltime_lookupFailed(), caught); }
public void onSuccess(PageList<Resource> result) { @@ -112,25 +112,26 @@ public class CallTimeView extends LocatableLayout {
public void setup() {
- Table table = new Table(extendLocatorId("Table"), "Call Time Data", new Criteria("scheduleId", String - .valueOf(scheduleId))); + Table table = new Table(extendLocatorId("Table"), MSG.view_resource_monitor_calltime_title(), new Criteria( + "scheduleId", String.valueOf(scheduleId))); table.getListGrid().setAlternateRecordStyles(false); table.setDataSource(new CallTimeDataSource()); table.getListGrid().setUseAllDataSourceFields(true);
final NumberFormat format = NumberFormat.getFormat("0");
- ListGridField callDestination = new ListGridField("callDestination", "Call Destination"); - ListGridField count = new ListGridField("count", 70); - ListGridField minimum = new ListGridField("minimum", 70); - ListGridField average = new ListGridField("average", 70); + ListGridField callDestination = new ListGridField("callDestination", MSG + .view_resource_monitor_calltime_destination()); + ListGridField count = new ListGridField("count", MSG.view_resource_monitor_calltime_count(), 70); + ListGridField minimum = new ListGridField("minimum", MSG.view_resource_monitor_calltime_minimum(), 70); + ListGridField average = new ListGridField("average", MSG.view_resource_monitor_calltime_average(), 70); average.setCellFormatter(new CellFormatter() { public String format(Object o, ListGridRecord listGridRecord, int i, int i1) { return format.format(((Number) o).doubleValue()); } }); - ListGridField maximum = new ListGridField("maximum", 70); - ListGridField total = new ListGridField("total", 70); + ListGridField maximum = new ListGridField("maximum", MSG.view_resource_monitor_calltime_maximum(), 70); + ListGridField total = new ListGridField("total", MSG.view_resource_monitor_calltime_total(), 70);
table.getListGrid().setFields(callDestination, count, minimum, average, maximum, total);
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index a1bba52..a0c5291 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -637,6 +637,16 @@ view_resource_monitor_graphs_lookupFailed=Failed to find resource for graph~ view_resource_monitor_graph_instructions=Point your mouse to a data point on the chart~ view_resource_monitor_graph_live_tooltip=Click for a live graph of current values~ view_resource_monitor_detailed_graph_label=Detailed Graph~ +view_resource_monitor_calltime_title=Call Time Data~ +view_resource_monitor_calltime_destination=Call Destination~ +view_resource_monitor_calltime_count=Count~ +view_resource_monitor_calltime_minimum=Minimum~ +view_resource_monitor_calltime_average=Average~ +view_resource_monitor_calltime_maximum=Maximum~ +view_resource_monitor_calltime_total=Total~ +view_resource_monitor_calltime_loadFailed=Could not load call time data~ +view_resource_monitor_calltime_lookupFailed=Could not load resource for call time~ +view_resource_monitor_calltime_editFailed=Call time data can not be edited~ view_tree_common_loadFailed_generic=Failed to load data for tree~ view_tree_common_loadFailed_root=Failed to load root for tree~ view_tree_common_loadFailed_descendants=Failed to load descendants for tree~
commit 845b952460943a34ca1663f08d8e7dec6961b8b8 Author: Joseph Marques joseph@redhat.com Date: Wed Nov 17 17:56:32 2010 -0500
i18n for org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/AvailabilityBarView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/AvailabilityBarView.java index 0efea7e..835f8e5 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/AvailabilityBarView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/AvailabilityBarView.java @@ -19,14 +19,12 @@ package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring;
import com.google.gwt.user.client.rpc.AsyncCallback; -import com.smartgwt.client.widgets.HTMLFlow; import com.smartgwt.client.widgets.Img; import com.smartgwt.client.widgets.events.MouseOutEvent; import com.smartgwt.client.widgets.events.MouseOutHandler; import com.smartgwt.client.widgets.events.MouseOverEvent; import com.smartgwt.client.widgets.events.MouseOverHandler; import com.smartgwt.client.widgets.layout.HLayout; -import com.smartgwt.client.widgets.layout.VLayout;
import org.rhq.core.domain.measurement.Availability; import org.rhq.core.domain.measurement.AvailabilityType; @@ -37,6 +35,7 @@ import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; import org.rhq.core.domain.util.PageOrdering; import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.Messages; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
/** @@ -44,10 +43,10 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; */ public class AvailabilityBarView extends HLayout {
+ Messages MSG = CoreGUI.getMessages();
private Resource resource;
- public AvailabilityBarView(Resource resource) { this.resource = resource; setHeight(28); @@ -55,56 +54,48 @@ public class AvailabilityBarView extends HLayout { setMargin(10); }
- @Override protected void onInit() { super.onInit();
- PageControl pc = PageControl.getUnlimitedInstance(); pc.initDefaultOrderingField("av.startTime", PageOrdering.ASC);
- GWTServiceLookup.getAvailabilityService().findAvailabilityForResource( - resource.getId(), pc, - new AsyncCallback<PageList<Availability>>() { - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to load availability history", caught); - } + GWTServiceLookup.getAvailabilityService().findAvailabilityForResource(resource.getId(), pc, + new AsyncCallback<PageList<Availability>>() { + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_resource_monitor_availability_loadFailed(), caught); + }
- public void onSuccess(PageList<Availability> result) { - update(result); - } + public void onSuccess(PageList<Availability> result) { + update(result); } - ); + }); }
private void update(PageList<Availability> result) {
long start = result.get(0).getStartTime().getTime(); - long end = result.get(result.size() - 1).getEndTime() != null ? result.get(result.size() - 1).getEndTime().getTime() : System.currentTimeMillis(); + long end = result.get(result.size() - 1).getEndTime() != null ? result.get(result.size() - 1).getEndTime() + .getTime() : System.currentTimeMillis();
long diff = end - start;
- - Img leftCap = new Img("availBar/leftCap.png",8,28); + Img leftCap = new Img("availBar/leftCap.png", 8, 28); addMember(leftCap);
for (Availability a : result) {
long endTime = a.getEndTime() != null ? a.getEndTime().getTime() : System.currentTimeMillis();
- double width = (((double) (endTime - a.getStartTime().getTime()) / diff) * 100); String widthString = width + "%"; if (width == 0) { widthString = "2px"; }
- String imagePath = a.getAvailabilityType() == AvailabilityType.UP ? "availBar/up.png" : "availBar/down.png";
- - final Img section = new Img(imagePath); section.setHeight(28); section.setOpacity(60); @@ -121,51 +112,47 @@ public class AvailabilityBarView extends HLayout { } });
- long duration = endTime - a.getStartTime().getTime();
- String durationString = MeasurementConverterClient.format((double)duration, MeasurementUnits.MILLISECONDS, true); - - section.setTooltip("<div style="white-space: nowrap;"><b>Availability: </b>" + a.getAvailabilityType().name() + - "<br/><b>Start: </b>" + a.getStartTime() + - "<br/><b>End: </b>" + a.getEndTime() + - "<br/><b>Duration: </b>" + durationString); + String durationString = MeasurementConverterClient.format((double) duration, MeasurementUnits.MILLISECONDS, + true);
+ section.setTooltip("<div style="white-space: nowrap;"><b>" + MSG.common_title_availability() + ": </b>" + + a.getAvailabilityType().name() + "<br/><b>" + MSG.common_title_start() + ": </b>" + a.getStartTime() + + "<br/><b>" + MSG.common_title_end() + ": </b>" + a.getEndTime() + "<br/><b>" + + MSG.common_title_duration() + ": </b>" + durationString);
addMember(section);
} - Img rightCap = new Img("availBar/rightCap.png",8,28); + Img rightCap = new Img("availBar/rightCap.png", 8, 28); addMember(rightCap);
+ /* StringBuffer buf = new StringBuffer("<table cellpadding="0" cellspacing="0" width="100%"><tr height="28">");
+ buf.append("<td width="8px" class="availBarLeftCap"> </td>");
- /* StringBuffer buf = new StringBuffer("<table cellpadding="0" cellspacing="0" width="100%"><tr height="28">"); + for (Availability a : result) {
- buf.append("<td width="8px" class="availBarLeftCap"> </td>"); + long endTime = a.getEndTime() != null ? a.getEndTime().getTime() : System.currentTimeMillis();
- for (Availability a : result) { - - long endTime = a.getEndTime() != null ? a.getEndTime().getTime() : System.currentTimeMillis(); + double width = (((double) (endTime - a.getStartTime().getTime()) / diff) * 100); + String widthString = width + "%"; + if (width == 0) { + widthString = "2px"; + }
- - double width = (((double) (endTime - a.getStartTime().getTime()) / diff) * 100); - String widthString = width + "%"; - if (width == 0) { - widthString = "2px"; - } - - buf.append("<td width="" + widthString + "" class="" + (a.getAvailabilityType() == AvailabilityType.UP ? "availBarUp" : "availBarDown") + ""> </td>"); - } - buf.append("<td width="8px" class="availBarRightCap"> </td>"); - buf.append("</tr></table>"); + buf.append("<td width="" + widthString + "" class="" + (a.getAvailabilityType() == AvailabilityType.UP ? "availBarUp" : "availBarDown") + ""> </td>"); + } + buf.append("<td width="8px" class="availBarRightCap"> </td>"); + buf.append("</tr></table>");
- HTMLFlow bar = new HTMLFlow(buf.toString()); + HTMLFlow bar = new HTMLFlow(buf.toString());
- addMember(bar);*/ + addMember(bar);*/
} } 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 a503a9e..becbd02 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 @@ -49,7 +49,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; public class GraphListView extends LocatableVLayout implements ResourceSelectListener {
private Resource resource; - private Label loadingLabel = new Label("Loading..."); + private Label loadingLabel = new Label(MSG.common_msg_loading());
public GraphListView(String locatorId, Resource resource) { super(locatorId); @@ -107,13 +107,14 @@ public class GraphListView extends LocatableVLayout implements ResourceSelectLis System.currentTimeMillis() - (1000L * 60 * 60 * 8), System.currentTimeMillis(), 60, new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to load data for graphs", caught); - loadingLabel.setContents("failed to load graphs"); + CoreGUI.getErrorHandler().handleError(MSG.view_resource_monitor_graphs_loadFailed(), + caught); + loadingLabel.setContents(MSG.view_resource_monitor_graphs_loadFailed()); }
public void onSuccess(List<List<MeasurementDataNumericHighLowComposite>> result) { if (result.isEmpty()) { - loadingLabel.setContents("No graphs available"); + loadingLabel.setContents(MSG.view_resource_monitor_graphs_noneAvailable()); } else { loadingLabel.hide(); int i = 0; 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 2855a22..6d6f5bc 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 @@ -69,7 +69,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableWindow; */ public class LiveGraphView extends LocatableVLayout {
- private static final String INSTRUCTIONS = "Point your mouse to a data point on the chart"; + private static final String INSTRUCTIONS = MSG.view_resource_monitor_graph_instructions();
private final Label selectedPointLabel = new Label(INSTRUCTIONS); private final Label positionLabel = new Label(); @@ -226,7 +226,8 @@ public class LiveGraphView extends LocatableVLayout { dataService.findLiveData(resourceId, new int[] { definition.getId() }, new AsyncCallback<Set<MeasurementData>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to load live data", caught); + CoreGUI.getErrorHandler() + .handleError(MSG.view_resource_monitor_graphs_loadFailed(), caught); }
public void onSuccess(Set<MeasurementData> result) { @@ -271,7 +272,7 @@ public class LiveGraphView extends LocatableVLayout { public static void displayAsDialog(String locatorId, int resourceId, MeasurementDefinition def) { final LiveGraphView graph = new LiveGraphView(locatorId, resourceId, def); final Window graphPopup = new LocatableWindow(locatorId); - graphPopup.setTitle("Detailed Graph"); + graphPopup.setTitle(MSG.view_resource_monitor_detailed_graph_label()); graphPopup.setWidth(800); graphPopup.setHeight(400); graphPopup.setIsModal(true); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceScheduledMetricDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceScheduledMetricDatasource.java index 10c21fa..b255539 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceScheduledMetricDatasource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceScheduledMetricDatasource.java @@ -57,26 +57,26 @@ public class ResourceScheduledMetricDatasource extends RPCDataSource<Measurement protected List<DataSourceField> addDataSourceFields() { List<DataSourceField> fields = super.addDataSourceFields();
- DataSourceIntegerField id = new DataSourceIntegerField("id"); + DataSourceIntegerField id = new DataSourceIntegerField("id", MSG.common_title_id()); id.setPrimaryKey(true); fields.add(id);
- DataSourceTextField name = new DataSourceTextField("name"); + DataSourceTextField name = new DataSourceTextField("name", MSG.common_title_name()); fields.add(name);
- DataSourceTextField displayName = new DataSourceTextField("displayName"); + DataSourceTextField displayName = new DataSourceTextField("displayName", MSG.common_title_display_name()); fields.add(displayName);
- DataSourceTextField description = new DataSourceTextField("description"); + DataSourceTextField description = new DataSourceTextField("description", MSG.common_title_description()); fields.add(description);
- DataSourceTextField units = new DataSourceTextField("units"); + DataSourceTextField units = new DataSourceTextField("units", MSG.common_title_units()); fields.add(units);
- DataSourceTextField numericType = new DataSourceTextField("numericType"); + DataSourceTextField numericType = new DataSourceTextField("numericType", MSG.common_title_numeric_type()); fields.add(numericType);
- DataSourceTextField category = new DataSourceTextField("category"); + DataSourceTextField category = new DataSourceTextField("category", MSG.common_title_category()); fields.add(category);
return fields; @@ -92,7 +92,7 @@ public class ResourceScheduledMetricDatasource extends RPCDataSource<Measurement GWTServiceLookup.getMeasurementDataService().findMeasurementDefinitionsByCriteria(criteria, new AsyncCallback<PageList<MeasurementDefinition>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to load metric definitions", caught); + CoreGUI.getErrorHandler().handleError(MSG.dataSource_definitions_loadFailed(), caught); }
public void onSuccess(PageList<MeasurementDefinition> result) { @@ -110,7 +110,7 @@ public class ResourceScheduledMetricDatasource extends RPCDataSource<Measurement GWTServiceLookup.getMeasurementDataService().findMeasurementSchedulesByCriteria(criteria, new AsyncCallback<PageList<MeasurementSchedule>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to load metric schedules", caught); + CoreGUI.getErrorHandler().handleError(MSG.dataSource_schedules_loadFailed(), caught); }
public void onSuccess(PageList<MeasurementSchedule> result) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/SmallGraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/SmallGraphView.java index ef3b3a8..da91f8c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/SmallGraphView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/SmallGraphView.java @@ -72,10 +72,13 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableWidgetCanvas */ public class SmallGraphView extends LocatableVLayout {
- private static final String INSTRUCTIONS = "Point your mouse to a data point on the chart"; + private static final String INSTRUCTIONS = MSG.view_resource_monitor_graph_instructions();
- private static final String[] MONTH_NAMES = { "jan", "feb", "mar", "apr", "may", "jun", "jul", "aug", "sep", "oct", - "nov", "dec" }; + private static final String[] MONTH_NAMES = { MSG.common_calendar_january_short(), + MSG.common_calendar_february_short(), MSG.common_calendar_march_short(), MSG.common_calendar_april_short(), + MSG.common_calendar_may_short(), MSG.common_calendar_june_short(), MSG.common_calendar_july_short(), + MSG.common_calendar_august_short(), MSG.common_calendar_september_short(), MSG.common_calendar_october_short(), + MSG.common_calendar_november_short(), MSG.common_calendar_december_short() };
private final Label selectedPointLabel = new Label(INSTRUCTIONS); private final Label positionLabel = new Label(); @@ -149,7 +152,7 @@ public class SmallGraphView extends LocatableVLayout { resourceCriteria.addFilterId(resourceId); resourceService.findResourcesByCriteria(resourceCriteria, new AsyncCallback<PageList<Resource>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to find resource for graph", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_resource_monitor_graphs_lookupFailed(), caught); }
public void onSuccess(PageList<Resource> result) { @@ -170,7 +173,7 @@ public class SmallGraphView extends LocatableVLayout { new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() { public void onFailure(Throwable caught) { CoreGUI.getErrorHandler().handleError( - "Failed to load data for graph", caught); + MSG.view_resource_monitor_graphs_loadFailed(), caught); }
public void onSuccess( @@ -228,7 +231,7 @@ public class SmallGraphView extends LocatableVLayout { titleLayout.addMember(title);
Img liveGraph = new LocatableImg(getLocatorId(), "subsystems/monitor/Monitor_16.png", 16, 16); - liveGraph.setTooltip("Click for a live graph of current values"); + liveGraph.setTooltip(MSG.view_resource_monitor_graph_live_tooltip());
liveGraph.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { @@ -371,7 +374,7 @@ public class SmallGraphView extends LocatableVLayout { private void displayAsDialog(String locatorId) { SmallGraphView graph = new SmallGraphView(locatorId, resourceId, definition, data); Window graphPopup = new Window(); - graphPopup.setTitle("Detailed Graph"); + graphPopup.setTitle(MSG.view_resource_monitor_detailed_graph_label()); graphPopup.setWidth(800); graphPopup.setHeight(400); graphPopup.setIsModal(true); diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index b211a94..a1bba52 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -75,6 +75,8 @@ common_title_dateCreated=Date Created~ common_title_default=Default~ common_title_description=Description~ common_title_display=Display~ +common_title_display_name=Display Name~ +common_title_duration=Duration~ common_title_edit_mode=Edit Mode~ common_title_enabled=Enabled?~ common_title_end = End~ @@ -94,6 +96,7 @@ common_title_mixedGroups = Mixed Groups~ common_title_mixedGroups_total=Mixed Group Total~ common_title_name = Name~ common_title_new_dashboard=New Dashboard~ +common_title_numeric_type=Numeric Type~ common_title_operations=Operations~ common_title_operations_range=Operation Range~ common_title_over=Over~ @@ -120,6 +123,7 @@ common_title_summary_counts=Summary Counts~ common_title_timestamp =Date/Time~ common_title_total=Total~ common_title_type = Type~ +common_title_units = Units~ common_title_user=User~ common_title_value = Value~ common_title_version = Version~ @@ -142,6 +146,21 @@ common_val_yes_lower = yes~ common_val_never=Never~ common_val_na=N/A~
+# Common Calendar +#-------------- +common_calendar_january_short=jan +common_calendar_february_short=feb +common_calendar_march_short=mar +common_calendar_april_short=apr +common_calendar_may_short=may +common_calendar_june_short=jun +common_calendar_july_short=jul +common_calendar_august_short=aug +common_calendar_september_short=sept +common_calendar_october_short=oct +common_calendar_november_short=nov +common_calendar_december_short=dec +
#=================== Widgets =====================
@@ -288,6 +307,8 @@ dataSource_measurementOob_error_fetchFailure = Failed to load measurement OOB in
# Measurements #---------------------- +dataSource_definitions_loadFailed=Failed to load metric definitions~ +dataSource_schedules_loadFailed=Failed to load metric schedules~ dataSource_schedules_field_resourceGroupId=Group ID~ dataSource_schedules_enableFailure=Failed to enable the collection of [{0}] metrics for resource group with ID [{1}]. The metrics were: [{2}]~ dataSource_schedules_enableSuccessful_concise=You have enabled the collection of [{0}] measurements~ @@ -609,6 +630,13 @@ view_inventory_resources_loadFailed=Failed to load resource composite data~ view_inventory_resources_title=Member Resources~ view_inventory_resources_title_children=Child Resources~ view_inventory_resources_title_members=Member Resources~ +view_resource_monitor_availability_loadFailed=Failed to load availability history~ +view_resource_monitor_graphs_noneAvailable=No graphs available~ +view_resource_monitor_graphs_loadFailed=Failed to load graph data~ +view_resource_monitor_graphs_lookupFailed=Failed to find resource for graph~ +view_resource_monitor_graph_instructions=Point your mouse to a data point on the chart~ +view_resource_monitor_graph_live_tooltip=Click for a live graph of current values~ +view_resource_monitor_detailed_graph_label=Detailed Graph~ view_tree_common_loadFailed_generic=Failed to load data for tree~ view_tree_common_loadFailed_root=Failed to load root for tree~ view_tree_common_loadFailed_descendants=Failed to load descendants for tree~
commit ff9ab0d59e660a7795757770caef522546c15e02 Merge: f05e1c7... e3cadf8... Author: Simeon Pinder spinder@redhat.com Date: Wed Nov 17 17:54:24 2010 -0500
Merge branch 'master' of ssh://spinder@git.fedorahosted.org/git/rhq/rhq into track-master2
commit f05e1c7d9f702f0f2c74a3f2b58342c269fd8858 Author: Simeon Pinder spinder@redhat.com Date: Wed Nov 17 17:45:57 2010 -0500
i18n refactor.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationsPortlet.java index 121084b..999d49b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationsPortlet.java @@ -61,7 +61,7 @@ public class OperationsPortlet extends LocatableVLayout implements CustomSetting public static final String OPERATIONS_RANGE_COMPLETED = "operations-range-completed"; public static final String OPERATIONS_RANGE_SCHEDULED = "operations-range-scheduled"; //portlet key - public static final String KEY = MSG.view_group_contextMenu_operations(); + public static final String KEY = MSG.common_title_operations(); private static final String TITLE = KEY; private static String recentOperations = MSG.common_title_recent_operations(); private static String scheduledOperations = MSG.common_title_scheduled_operations();
commit e3cadf857241ca60edd4f008f0663c319a30c3fe Author: John Mazzitelli mazz@redhat.com Date: Wed Nov 17 17:41:46 2010 -0500
autofit the tree grid rows
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 2a0357f..a7eebd0 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 @@ -24,6 +24,7 @@ import java.util.List; import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.data.Criteria; import com.smartgwt.client.data.DataSource; +import com.smartgwt.client.types.Autofit; import com.smartgwt.client.types.SelectionAppearance; import com.smartgwt.client.types.VerticalAlignment; import com.smartgwt.client.widgets.HTMLFlow; @@ -129,6 +130,9 @@ public class ResourceAutodiscoveryView extends LocatableVLayout { treeGrid.setDataSource(dataSource); treeGrid.setAutoFetchData(true); treeGrid.setResizeFieldsInRealTime(true); + treeGrid.setAutoFitData(Autofit.HORIZONTAL); + treeGrid.setWrapCells(true); + treeGrid.setFixedRecordHeights(false);
final TreeGridField name, key, type, description, status, ctime; name = new TreeGridField("name");
commit ff626f7c64a1e1c1dc8b5552853e89a9c20da585 Author: Simeon Pinder spinder@redhat.com Date: Wed Nov 17 17:39:52 2010 -0500
more i18n
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index 1c46fac..b211a94 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -111,6 +111,7 @@ common_title_selected_resources=Selected Resources~ common_title_server_total=Server Total~ common_title_service_total=Service Total~ common_title_settings=Settings~ +common_title_show=Show~ common_title_start = Start~ common_title_status=Status~ common_title_tag_cloud=Tag Cloud~ @@ -509,7 +510,10 @@ view_portlet_favoriteResources_msg=This portlet displays your favorite resources view_portlet_favoriteResources_title=Favorite Resources~ view_portlet_generic_help=No help available for this portlet~ view_portlet_generic_unconfigured=No settings available for this portlet~ +view_portlet_graph_configure_resource_graph=The resource to graph~ +view_portlet_graph_configure_metricDefinition_graph=The metric definition id to graph~ view_portlet_graph_configure_title=Graph Config~ +view_portlet_graph_configure_title_desc=Configuration of the graph portlet~ view_portlet_graph_help_msg = This Portlet supports the graphing of a resource metric.~ view_portlet_graph_help_title = Graph Portlet~ view_portlet_graph_help_unconfigured=This graph is unconfigured, click the settings button to configure.~ @@ -864,4 +868,3 @@ view_messageCenter_messageTitle= Title~ view_messageCenter_messageSeverity= Severity~ view_messageCenter_messageTime= Time~ view_messageCenter_messageDetail= Detail~ -
commit 8c51bd68c5ccadc880797ccd2e70a3d78bb279f8 Merge: b74b057... f635f52... Author: Simeon Pinder spinder@redhat.com Date: Wed Nov 17 17:33:24 2010 -0500
Merge branch 'master' of ssh://spinder@git.fedorahosted.org/git/rhq/rhq into track-master2
commit b74b0579bccdb6f5e937ea8402cc4d6bbfe8e530 Author: Simeon Pinder spinder@redhat.com Date: Wed Nov 17 17:32:57 2010 -0500
i18n.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/GraphPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/GraphPortlet.java index e134a71..0175f28 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/GraphPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/GraphPortlet.java @@ -75,12 +75,12 @@ public class GraphPortlet extends SmallGraphView implements CustomSettingsPortle }
public ConfigurationDefinition getConfigurationDefinition() { - ConfigurationDefinition def = new ConfigurationDefinition("Graph Config", "Configuration of the graph portlet"); - def - .put(new PropertyDefinitionSimple(CFG_RESOURCE_ID, "The resource to graph", true, - PropertySimpleType.INTEGER)); - def.put(new PropertyDefinitionSimple(CFG_DEFINITION_ID, "The metric definition id to graph", true, + ConfigurationDefinition def = new ConfigurationDefinition(MSG.view_portlet_graph_configure_title(), MSG + .view_portlet_graph_configure_title_desc()); + def.put(new PropertyDefinitionSimple(CFG_RESOURCE_ID, MSG.view_portlet_graph_configure_resource_graph(), true, PropertySimpleType.INTEGER)); + def.put(new PropertyDefinitionSimple(CFG_DEFINITION_ID, MSG + .view_portlet_graph_configure_metricDefinition_graph(), true, PropertySimpleType.INTEGER));
return def; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedView.java index 9c71e67..7e93964 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedView.java @@ -131,7 +131,7 @@ public class RecentlyAddedView extends LocatableVLayout implements CustomSetting
//-------------combobox for number of recently added resources to display on the dashboard final SelectItem maximumRecentlyAddedComboBox = new SelectItem(RECENTLY_ADDED_SHOW_MAX); - maximumRecentlyAddedComboBox.setTitle("Show"); + maximumRecentlyAddedComboBox.setTitle(MSG.common_title_show()); maximumRecentlyAddedComboBox.setHint("<nobr><b> " + MSG.view_portlet_recentlyAdded_approved_platforms() + "</b></nobr>"); //spinder 9/3/10: the following is required workaround to disable editability of combobox.
commit f635f52fbe0e71464d95f36cfd3babf141bd00d9 Author: Joseph Marques joseph@redhat.com Date: Wed Nov 17 17:25:44 2010 -0500
remove files that are no longer used
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/alert/AlertEditOldStyleView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/alert/AlertEditOldStyleView.java deleted file mode 100644 index 74f8f17..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/alert/AlertEditOldStyleView.java +++ /dev/null @@ -1,206 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2010 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 as published by - * the Free Software Foundation version 2 of the License. - * - * 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 for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.alert; - -import java.util.LinkedHashMap; - -import com.smartgwt.client.widgets.Window; -import com.smartgwt.client.widgets.form.DynamicForm; -import com.smartgwt.client.widgets.form.ValuesManager; -import com.smartgwt.client.widgets.form.fields.HeaderItem; -import com.smartgwt.client.widgets.form.fields.RadioGroupItem; -import com.smartgwt.client.widgets.form.fields.SelectItem; -import com.smartgwt.client.widgets.form.fields.SpacerItem; -import com.smartgwt.client.widgets.form.fields.TextAreaItem; -import com.smartgwt.client.widgets.form.fields.TextItem; -import com.smartgwt.client.widgets.layout.VLayout; - -import org.rhq.core.domain.alert.AlertPriority; -import org.rhq.enterprise.gui.coregui.client.components.form.RadioGroupWithComponentsItem; - -/** - * @author Greg Hinkle - */ -public class AlertEditOldStyleView extends VLayout { - - public AlertEditOldStyleView() { - setWidth100(); - } - - - public void displayAsDialog() { - Window window = new Window(); - window.setTitle("Alert Editor"); - window.setWidth(800); - window.setHeight(800); - window.setIsModal(true); - window.setShowModalMask(true); - window.setCanDragResize(true); - window.centerInPage(); - window.addItem(this); - window.show(); - } - - - @Override - protected void onDraw() { - super.onDraw(); - - addMember(buildEditForm()); - - - } - - - public DynamicForm buildEditForm() { - - ValuesManager vm = new ValuesManager(); - DynamicForm form = new DynamicForm(); - form.setTitleSuffix(""); - form.setValuesManager(vm); - - HeaderItem alertPropertiesHeader = new HeaderItem(); - alertPropertiesHeader.setValue("Alert Properties"); - - TextItem alertName = new TextItem("alertName", "Name"); - alertName.setRequired(true); - - TextAreaItem description = new TextAreaItem("alertDescription", "Description"); - - SelectItem priority = new SelectItem("alertPriority", "Priority"); - LinkedHashMap<String, String> valueMap = new LinkedHashMap<String, String>(); - valueMap.put(AlertPriority.LOW.name(), "Low"); - valueMap.put(AlertPriority.MEDIUM.name(), "Medium"); - valueMap.put(AlertPriority.HIGH.name(), "High"); - priority.setValueMap(valueMap); - priority.setImageURLPrefix("alerts/Alert_"); - priority.setImageURLSuffix("_16.png"); - priority.setValue("LOW"); - - - - RadioGroupItem active = new RadioGroupItem("alertActive","Active"); - active.setValueMap("Yes","No"); - active.setValue("Yes"); - - - - HeaderItem conditionsHeader = new HeaderItem(); - conditionsHeader.setValue("Alert Conditions"); - - LinkedHashMap valuesMap = new LinkedHashMap(); - - valuesMap.put("Metric", buildMetricSectionCavans(vm)); - - valuesMap.put("InventoryProperty", buildInventoryPropertySectionCavans(vm)); - valuesMap.put("Event", "Events"); - valuesMap.put("Configuration", "Configuration Change"); - - - RadioGroupWithComponentsItem conditionGroup = new RadioGroupWithComponentsItem("radioTest", "Test", valuesMap, form); - - - - - form.setItems(alertPropertiesHeader, alertName, description, priority, active, conditionsHeader, conditionGroup); - - - return form; - - } - - private DynamicForm buildMetricSectionCavans(ValuesManager vm) { - - DynamicForm form = new DynamicForm(); - form.setTitleSuffix(""); - form.setColWidths("10%"); - form.setValuesManager(vm); - - - SelectItem metricSelect = new SelectItem("metric", "Metric"); - metricSelect.setRequired(true); - metricSelect.setEmptyDisplayValue("Select..."); - metricSelect.setValueMap("CPU Usage", "Free Memory", "Swap Used", "User CPU", "System CPU"); - - - LinkedHashMap valueMap = new LinkedHashMap(); - - - DynamicForm subForm1 = new DynamicForm(); - subForm1.setTitleSuffix(""); - subForm1.setValuesManager(vm); - subForm1.setNumCols(6); - SelectItem metricConditionComparison = new SelectItem("metricConditionKind", "is"); - metricConditionComparison.setValueMap("> (greater than)", "= (equals)", "< (less than)"); - - TextItem metricConditionValue = new TextItem("metricConditionValue"); - metricConditionValue.setShowTitle(false); - metricConditionValue.setHint("Absolute Value"); - - subForm1.setItems(metricConditionComparison, metricConditionValue); - - valueMap.put("Value", subForm1); - - - DynamicForm subForm2 = new DynamicForm(); - subForm2.setTitleSuffix(""); - subForm2.setValuesManager(vm); - subForm2.setNumCols(8); - SelectItem baselineConditionComparison = new SelectItem("baselineConditionKind", "is"); - baselineConditionComparison.setValueMap("> (greater than)", "= (equals)", "< (less than)"); - - TextItem baselineConditionValue = new TextItem("baselineConditionValue"); - baselineConditionValue.setShowTitle(false); - baselineConditionValue.setHint("%"); - - SelectItem baselineRange = new SelectItem("baselineRange", "of"); - baselineRange.setValueMap("25 MB (min value)", "78 MB (avg value)", "322 MB (Max Value)"); - - subForm2.setItems(baselineConditionComparison, baselineConditionValue, baselineRange); - - - valueMap.put("Baseline", subForm2); - - - valueMap.put("valueChanges", "Value Changes"); - - - RadioGroupWithComponentsItem metricConditionType = new RadioGroupWithComponentsItem("metricConditionType", null, valueMap, form); - metricConditionType.setShowTitle(false); - - form.setItems(metricSelect, new SpacerItem(), metricConditionType); - return form; - } - - - private DynamicForm buildInventoryPropertySectionCavans(ValuesManager vm) { - DynamicForm form = new DynamicForm(); - form.setValuesManager(vm); - - - SelectItem inventoryProperty = new SelectItem("inventoryPropert", "Inventory Property"); - inventoryProperty.setValueMap("OS Version", "Architecture", "Vendor", "RAM", "CPU Speed"); - inventoryProperty.setHint("value changes"); - - form.setItems(inventoryProperty); - - - return form; - } -} \ No newline at end of file diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/alert/AlertEditView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/alert/AlertEditView.java deleted file mode 100644 index f9ed1b2..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/alert/AlertEditView.java +++ /dev/null @@ -1,455 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2010 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 as published by - * the Free Software Foundation version 2 of the License. - * - * 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 for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.alert; - -import java.util.ArrayList; -import java.util.EnumSet; -import java.util.LinkedHashMap; - -import com.smartgwt.client.widgets.Canvas; -import com.smartgwt.client.widgets.Label; -import com.smartgwt.client.widgets.Window; -import com.smartgwt.client.widgets.form.DynamicForm; -import com.smartgwt.client.widgets.form.FormItemIfFunction; -import com.smartgwt.client.widgets.form.ValuesManager; -import com.smartgwt.client.widgets.form.fields.BlurbItem; -import com.smartgwt.client.widgets.form.fields.CanvasItem; -import com.smartgwt.client.widgets.form.fields.FormItem; -import com.smartgwt.client.widgets.form.fields.HeaderItem; -import com.smartgwt.client.widgets.form.fields.RadioGroupItem; -import com.smartgwt.client.widgets.form.fields.SelectItem; -import com.smartgwt.client.widgets.form.fields.SpacerItem; -import com.smartgwt.client.widgets.form.fields.StaticTextItem; -import com.smartgwt.client.widgets.form.fields.TextAreaItem; -import com.smartgwt.client.widgets.form.fields.TextItem; -import com.smartgwt.client.widgets.form.fields.events.ChangedEvent; -import com.smartgwt.client.widgets.form.fields.events.ChangedHandler; -import com.smartgwt.client.widgets.form.fields.events.ClickEvent; -import com.smartgwt.client.widgets.form.fields.events.ClickHandler; -import com.smartgwt.client.widgets.layout.VLayout; - -import org.rhq.core.domain.alert.AlertConditionCategory; -import org.rhq.core.domain.alert.AlertPriority; -import org.rhq.core.domain.measurement.DataType; -import org.rhq.core.domain.measurement.MeasurementDefinition; -import org.rhq.core.domain.operation.OperationDefinition; -import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.ResourceType; -import org.rhq.enterprise.gui.coregui.client.components.form.RadioGroupWithComponentsItem; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; - -/** - * @author Greg Hinkle - */ -public class AlertEditView extends VLayout { - - private Resource resource; - private ResourceType resourceType; - - public AlertEditView(Resource resource) { - this.resource = resource; - setWidth100(); - } - - - public void displayAsDialog() { - Window window = new Window(); - window.setTitle("Alert Editor"); - window.setWidth(800); - window.setHeight(800); - window.setIsModal(true); - window.setShowModalMask(true); - window.setCanDragResize(true); - window.centerInPage(); - window.addItem(this); - window.show(); - } - - - @Override - protected void onDraw() { - super.onDraw(); - - ResourceTypeRepository.Cache.getInstance().getResourceTypes(resource.getResourceType().getId(), - EnumSet.of(ResourceTypeRepository.MetadataType.measurements, ResourceTypeRepository.MetadataType.operations), - new ResourceTypeRepository.TypeLoadedCallback() { - public void onTypesLoaded(ResourceType type) { - resourceType = type; - addMember(buildEditForm()); - - addMember(buildConditionSection(0)); - } - }); - } - - - public DynamicForm buildEditForm() { - - ValuesManager vm = new ValuesManager(); - DynamicForm form = new DynamicForm(); - form.setNumCols(4); - form.setTitleSuffix(""); - form.setValuesManager(vm); - - HeaderItem alertPropertiesHeader = new HeaderItem(); - alertPropertiesHeader.setValue("Alert Properties"); - - TextItem alertName = new TextItem("alertName", "Name"); - alertName.setRequired(true); - - TextAreaItem description = new TextAreaItem("alertDescription", "Description"); - - SelectItem priority = new SelectItem("alertPriority", "Priority"); - LinkedHashMap<String, String> valueMap = new LinkedHashMap<String, String>(); - valueMap.put(AlertPriority.LOW.name(), "Low"); - valueMap.put(AlertPriority.MEDIUM.name(), "Medium"); - valueMap.put(AlertPriority.HIGH.name(), "High"); - priority.setValueMap(valueMap); - - LinkedHashMap<String, String> iconMap = new LinkedHashMap<String, String>(); - iconMap.put(AlertPriority.LOW.name(), AlertPriority.LOW.name()); - iconMap.put(AlertPriority.MEDIUM.name(), AlertPriority.MEDIUM.name()); - iconMap.put(AlertPriority.HIGH.name(), AlertPriority.HIGH.name()); - priority.setValueIcons(iconMap); - priority.setImageURLPrefix("subsystems/alert/Alert_"); - priority.setImageURLSuffix("_16.png"); - priority.setValue("LOW"); - - - RadioGroupItem active = new RadioGroupItem("alertActive", "Active"); - - active.setValueMap("Yes", "No"); - active.setValue("Yes"); - - - HeaderItem conditionsHeader = new HeaderItem(); - conditionsHeader.setValue("Alert Conditions"); - - -/* - LinkedHashMap valuesMap = new LinkedHashMap(); - valuesMap.put("Metric", buildMetricSectionCavans(vm)); - valuesMap.put("InventoryProperty", buildInventoryPropertySectionCavans(vm)); - valuesMap.put("Event", "Events"); - valuesMap.put("Configuration", "Configuration Change"); - RadioGroupWithComponentsItem conditionGroup = new RadioGroupWithComponentsItem("radioTest", "Test", valuesMap, form); -*/ - - form.setItems(alertPropertiesHeader, alertName, priority, description, active, conditionsHeader); - - - return form; - - } - - - /* - AVAILABILITY("Resource Availability"), // - THRESHOLD("Measurement Threshold"), // - BASELINE("Measurement Baseline"), // - CHANGE("Measurement Value Change"), // - TRAIT("Measurement Trait"), // - CONTROL("Control Action"), // - ALERT("Alert Fired"), // - RESOURCE_CONFIG("Resource Configuration Property Value Change"), // - EVENT("Log Event"); - */ - - - private DynamicForm buildConditionSection(final int ci) { - - final DynamicForm form = new DynamicForm(); - - ValuesManager vm = new ValuesManager(); - form.setValuesManager(vm); - - form.setNumCols(3); - form.setColWidths("30", "120", "*"); - ArrayList<FormItem> items = new ArrayList<FormItem>(); - - - RadioGroupItem conditionType = new RadioGroupItem("conditionType" + ci, "Condition Type"); - conditionType.setImageURLPrefix("subsystems/"); - conditionType.setImageURLSuffix("_16.png"); - items.add(conditionType); - - LinkedHashMap<String, String> valueMap = new LinkedHashMap<String, String>(); - valueMap.put(AlertConditionCategory.AVAILABILITY.name(), AlertConditionCategory.AVAILABILITY.getDisplayName()); - valueMap.put("metric", "Metric"); - valueMap.put(AlertConditionCategory.TRAIT.name(), AlertConditionCategory.TRAIT.getDisplayName()); - valueMap.put(AlertConditionCategory.CONTROL.name(), AlertConditionCategory.CONTROL.getDisplayName()); - valueMap.put(AlertConditionCategory.EVENT.name(), AlertConditionCategory.EVENT.getDisplayName()); - conditionType.setValueMap(valueMap); - conditionType.setRedrawOnChange(true); - - - LinkedHashMap<String, String> iconMap = new LinkedHashMap<String, String>(); - iconMap.put(AlertConditionCategory.AVAILABILITY.name(), "availability/availability_red"); - iconMap.put("metric", "monitor/Monitor_failed"); - iconMap.put(AlertConditionCategory.TRAIT.name(), "inventory/Inventory"); - iconMap.put(AlertConditionCategory.CONTROL.name(), "control/Operation"); - iconMap.put(AlertConditionCategory.EVENT.name(), "event/Events_error"); - - conditionType.setValueIcons(iconMap); - conditionType.setValue(AlertConditionCategory.AVAILABILITY.name()); -// conditionType.setValueIconSize(24);http://localhost:7080/coregui/images/availability/availability_red - conditionType.setShowIcons(true); - -/* - for (final String key : valueMap.keySet()) { - BlurbItem icon = new BlurbItem(); - icon.setColSpan(1); - icon.setEndRow(false); - icon.setValue(Canvas.imgHTML("subsystems/" + iconMap.get(key) + "_24.png")); - icon.setShowTitle(false); - icon.setWidth(30); - icon.setHeight(30); - items.add(icon); - - final RadioGroupItem radio = new RadioGroupItem("conditionType" + ci); - radio.setStartRow(false); - radio.setShowTitle(false); - radio.setValueMap(valueMap.get(key)); - radio.setRedrawOnChange(true); - items.add(radio); - - icon.addClickHandler(new ClickHandler() { - public void onClick(ClickEvent clickEvent) { - radio.setValue(key); - } - }); - - }*/ - - CanvasItem availCanvas = buildAvailabilitySectionCanvas(vm); - availCanvas.setShowIfCondition(new FormItemIfFunction() { - public boolean execute(FormItem formItem, Object o, DynamicForm dynamicForm) { - return AlertConditionCategory.AVAILABILITY.name().equals(form.getValue("conditionType" + ci)); - } - }); - items.add(availCanvas); - - CanvasItem metricCanvas = buildMetricSectionCavans(vm); - metricCanvas.setShowIfCondition(new FormItemIfFunction() { - public boolean execute(FormItem formItem, Object o, DynamicForm dynamicForm) { - return "metric".equals(form.getValue("conditionType" + ci)); - } - }); - items.add(metricCanvas); - - - CanvasItem propertyCanvas = buildInventoryPropertySectionCavans(vm); - propertyCanvas.setShowIfCondition(new FormItemIfFunction() { - public boolean execute(FormItem formItem, Object o, DynamicForm dynamicForm) { - return AlertConditionCategory.TRAIT.name().equals(form.getValue("conditionType" + ci)); - } - }); - items.add(propertyCanvas); - - - CanvasItem operationCanvas = buildOperationsSectionCanvas(vm); - operationCanvas.setShowIfCondition(new FormItemIfFunction() { - public boolean execute(FormItem formItem, Object o, DynamicForm dynamicForm) { - return AlertConditionCategory.CONTROL.name().equals(form.getValue("conditionType" + ci)); - } - }); - items.add(operationCanvas); - - - form.setItems(items.toArray(new FormItem[items.size()])); - return form; - } - - private CanvasItem buildAvailabilitySectionCanvas(ValuesManager vm) { - DynamicForm form = new DynamicForm(); - form.setTitleSuffix(""); - form.setColWidths("10%"); - form.setValuesManager(vm); - - - SelectItem metricSelect = new SelectItem("availChange", "Avaialability Change"); - metricSelect.setRequired(true); - metricSelect.setEmptyDisplayValue("Select..."); - metricSelect.setValueMap("Goes UP", "Goes DOWN"); - - - form.setItems(metricSelect); - - - CanvasItem canvasItem = new CanvasItem("metricConditionCanvas"); - canvasItem.setShowTitle(false); - canvasItem.setCanvas(form); - - return canvasItem; - - } - - private CanvasItem buildOperationsSectionCanvas(ValuesManager vm) { - final DynamicForm form = new DynamicForm(); - form.setTitleSuffix(""); - form.setColWidths("10%"); - form.setValuesManager(vm); - - - final SelectItem operationSelect = new SelectItem("operation", "Operation"); - operationSelect.setRequired(true); - operationSelect.setEmptyDisplayValue("Select..."); - operationSelect.setShowHint(true); - - - LinkedHashMap<String, String> operations = new LinkedHashMap<String, String>(); - for (OperationDefinition def : resourceType.getOperationDefinitions()) { - operations.put(def.getName(), def.getDisplayName()); - } - operationSelect.setValueMap(operations); - operationSelect.setRedrawOnChange(true); - - operationSelect.addChangedHandler(new ChangedHandler() { - public void onChanged(ChangedEvent changedEvent) { - for (OperationDefinition def : resourceType.getOperationDefinitions()) { - - if (def.getName().equals(operationSelect.getValue())) { - operationSelect.setHint(def.getDescription()); - } - } - } - }); - - - form.setItems(operationSelect); - - CanvasItem canvasItem = new CanvasItem("operationConditionCanvas"); - canvasItem.setShowTitle(false); - canvasItem.setCanvas(form); - - return canvasItem; - - } - - private CanvasItem buildMetricSectionCavans(ValuesManager vm) { - - DynamicForm form = new DynamicForm(); - form.setTitleSuffix(""); - form.setColWidths("10%", "90%"); - form.setValuesManager(vm); - - - final SelectItem metricSelect = new SelectItem("metric", "Metric"); - metricSelect.setRequired(true); - metricSelect.setEmptyDisplayValue("Select..."); - metricSelect.setWidth(200); - - LinkedHashMap<String, String> metrics = new LinkedHashMap<String, String>(); - for (MeasurementDefinition def : resourceType.getMetricDefinitions()) { - if (def.getDataType() == DataType.MEASUREMENT) { - metrics.put(def.getName(), def.getDisplayName()); - } - } - metricSelect.setValueMap(metrics); - - - metricSelect.addChangedHandler(new ChangedHandler() { - public void onChanged(ChangedEvent changedEvent) { - for (MeasurementDefinition def : resourceType.getMetricDefinitions()) { - - if (def.getName().equals(metricSelect.getValue())) { - metricSelect.setHint(def.getDescription()); - } - } - } - }); - - - - - - LinkedHashMap valueMap = new LinkedHashMap(); - - - DynamicForm subForm1 = new DynamicForm(); - subForm1.setTitleSuffix(""); - subForm1.setValuesManager(vm); - subForm1.setNumCols(6); - SelectItem metricConditionComparison = new SelectItem("metricConditionKind", "is"); - metricConditionComparison.setValueMap("> (greater than)", "= (equals)", "< (less than)"); - - TextItem metricConditionValue = new TextItem("metricConditionValue"); - metricConditionValue.setShowTitle(false); - metricConditionValue.setHint("Absolute Value"); - - subForm1.setItems(metricConditionComparison, metricConditionValue); - - valueMap.put("Value", subForm1); - - - DynamicForm subForm2 = new DynamicForm(); - subForm2.setTitleSuffix(""); - subForm2.setValuesManager(vm); - subForm2.setNumCols(8); - SelectItem baselineConditionComparison = new SelectItem("baselineConditionKind", "is"); - baselineConditionComparison.setValueMap("> (greater than)", "= (equals)", "< (less than)"); - - TextItem baselineConditionValue = new TextItem("baselineConditionValue"); - baselineConditionValue.setShowTitle(false); - baselineConditionValue.setHint("%"); - - SelectItem baselineRange = new SelectItem("baselineRange", "of"); - baselineRange.setValueMap("25 MB (min value)", "78 MB (avg value)", "322 MB (Max Value)"); - - subForm2.setItems(baselineConditionComparison, baselineConditionValue, baselineRange); - - - valueMap.put("Baseline", subForm2); - - - valueMap.put("valueChanges", new Label("Value Changes")); - - - RadioGroupWithComponentsItem metricConditionType = new RadioGroupWithComponentsItem("metricConditionType", null, valueMap, form); - metricConditionType.setShowTitle(false); - - form.setItems(metricSelect, new SpacerItem(), metricConditionType); - - CanvasItem canvasItem = new CanvasItem("metricConditionCanvas"); - canvasItem.setShowTitle(false); - canvasItem.setCanvas(form); - - return canvasItem; - } - - - private CanvasItem buildInventoryPropertySectionCavans(ValuesManager vm) { - DynamicForm form = new DynamicForm(); - form.setValuesManager(vm); - - - SelectItem inventoryProperty = new SelectItem("inventoryPropert", "Inventory Property"); - inventoryProperty.setValueMap("OS Version", "Architecture", "Vendor", "RAM", "CPU Speed"); - inventoryProperty.setHint("value changes"); - - form.setItems(inventoryProperty); - - - CanvasItem canvasItem = new CanvasItem("inventoryPropertyCanvas"); - canvasItem.setShowTitle(false); - canvasItem.setCanvas(form); - - return canvasItem; - } -}
commit ee12c0e22afce2aea640634a82be374e09f54ecc Author: John Mazzitelli mazz@redhat.com Date: Wed Nov 17 17:21:30 2010 -0500
new messages
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index 5541161..1c46fac 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -58,11 +58,15 @@ common_label_week=week~
# Common Titles #-------------- +common_title_add_column=Add Column~ +common_title_add_portlet=Add Portlet~ common_title_alert_range=Alert Range~ common_title_availability = Availability~ common_title_average_metrics=Average Metrics per Minute~ common_title_available_resources=Available Resources~ +common_title_background=Background~ common_title_category = Category~ +common_title_columns=Columns~ common_title_compatibleGroups = Compatible Groups~ common_title_compatibleGroups_total=Compatible Group Total~ common_title_custom=Custom~ @@ -74,12 +78,14 @@ common_title_display=Display~ common_title_edit_mode=Edit Mode~ common_title_enabled=Enabled?~ common_title_end = End~ +common_title_favorites=Favorites~ common_title_generalProp = General Properties~ common_title_group_def_total=Group Definition Total~ common_title_icon = icon~ common_title_id = ID~ common_title_id_parent = Parent ID~ common_title_inventory = Inventory~ +common_title_inventorySummary = Inventory Summary~ common_title_lastUpdated=Last Updated~ common_title_lastUpdatedBy=Last Updated By~ common_title_mashup=Mashup~ @@ -94,7 +100,9 @@ common_title_over=Over~ common_title_platform_total=Platform Total~ common_title_plugin = Plugin~ common_title_recently_added = Recently Added Resources~ +common_title_recent_alerts = Recent Alerts~ common_title_recent_operations=Recent Operations~ +common_title_remove_column=Remove Column~ common_title_resource = Resource~ common_title_resource_inventory=Resource Inventory~ common_title_resource_name=Resource Name~ @@ -102,6 +110,7 @@ common_title_scheduled_operations=Scheduled Operations~ common_title_selected_resources=Selected Resources~ common_title_server_total=Server Total~ common_title_service_total=Service Total~ +common_title_settings=Settings~ common_title_start = Start~ common_title_status=Status~ common_title_tag_cloud=Tag Cloud~ @@ -184,7 +193,8 @@ widget_resourceFactoryWizard_execute1=Failed to create a new resource - there is widget_resourceFactoryWizard_execute2=Failed to create a new resource~ widget_resourceFactoryWizard_createSubmitType=A request to create a resource of type [{0}] has been submitted successfully.~ widget_resourceFactoryWizard_createSubmit=A request to create a resource with the name of [{0}] has been submitted successfully.~ -widget_resourceFactoryWizard_failedToType=Failed to get backing package type for new resource~ +widget_resourceFactoryWizard_failedToGetType=Failed to get backing package type for new resource~ +widget_resourceFactoryWizard_failedToDeleteVersion=Failed to delete package version while canceling a resource create~
#===================== Utils ======================
@@ -313,6 +323,10 @@ dataSource_scheduledOperations_field_operation = Operation~ dataSource_scheduledOperations_field_time = Date/Time~ dataSource_scheduledOperations_error_fetchFailure = Failed to load scheduled operations.
+# Operation History +#--------------------------- +dataSource_operationHistory_error_fetchFailure = Failure loading operation histories.~ + # Configuration History #------------------------------- dataSource_configurationHistory_field_id = ID~ @@ -351,8 +365,32 @@ view_adminConfig_templates = Templates~ #-------------------------------- view_adminUsersDetails_dataTypeName = user~
-#==================== Bundles ====================== +# Auto Discovery Queue +#---------------------------- +view_autoDiscoveryQ_title=Autodiscovery Queue~ +view_autoDiscoveryQ_import=Import~ +view_autoDiscoveryQ_ignore=Ignore~ +view_autoDiscoveryQ_ignored=Ignored~ +view_autoDiscoveryQ_unignore=Unignore~ +view_autoDiscoveryQ_new=New~ +view_autoDiscoveryQ_newAndIgnored=New and Ignored~ +view_autoDiscoveryQ_importFailure=Failed to import resources~ +view_autoDiscoveryQ_importSuccessful=You have successfully imported the selected resources.~ +view_autoDiscoveryQ_ignoreFailure=Failed to ignore resources~ +view_autoDiscoveryQ_ignoreSuccessful=You have successfully ignored the selected resources.~ +view_autoDiscoveryQ_unignoreFailure=Failed to unignore resources~ +view_autoDiscoveryQ_unignoreSuccessful=You have successfully unignored the selected resources.~ +view_autoDiscoveryQ_noperm=(Required manage inventory permissions missing. See Administrator to change)~ +view_autoDiscoveryQ_noItems=No items to show~ +view_autoDiscoveryQ_field_parentId=Parent ID~ +view_autoDiscoveryQ_field_name=Resource Name~ +view_autoDiscoveryQ_field_key=Resource Key~ +view_autoDiscoveryQ_field_discoveryTime=Discovery Time~ +view_autoDiscoveryQ_field_inventoryStatus=Inventory Status~ +view_autoDiscoveryQ_loadFailure=Failed to load the inventory discovery queue~
+#==================== Bundles ====================== +view_bundle_bundles = Bundles~
#=================== Components =====================
@@ -409,6 +447,7 @@ view_tableSection_backButton = Back to List~ view_tableSection_error_noId = Table [{0}] record is missing 'id' attribute - please report this bug.~ view_tableSection_error_badId = Can not show detail for [{0}]. Illegal 'id': [{1}]. Please report this bug~
+view_tags_tags = Tags view_tags_error_1 = Failed to load Tags~ view_tags_title = Tags:~ view_tags_tooltip_1 = Click to remove this Tag~ @@ -449,14 +488,15 @@ view_type_parentId=Parent ID~ view_type_typeTreeLoadFailure=Failed to load resource type tree data~
#=================== Dashboard ===================== -view_dashboardManager_error=Failed to store dashboard to server~ - +view_dashboard_favorites_error1=Failed to load favorite Resources.~ +view_dashboardManager_error=Failed to save dashboard to server~ +view_dashboardManager_saved=Saved dashboard {0} to server~ view_dashboardManager_success=Saved dashboard~ - +view_dashboardManager_deleted=Successfully deleted dashboard {0}~ view_dashboards_title=Dashboard~ view_dashboards_confirm1=Are you sure you want to delete~ - view_dashboardsManager_error1=Failed to add new dashboard~ +// dup in common view_dashboardsManager_inventory_title=Inventory Summary~ view_dashboardsManager_mashup_title=RHQ News~ view_dashboardsManager_message_title=Welcome To RHQ~ @@ -467,6 +507,9 @@ view_portlet_autodiscovery_help_msg = This portlet offers the ability to import view_portlet_autodiscovery_title = Discovery Queue~ view_portlet_favoriteResources_msg=This portlet displays your favorite resources~ view_portlet_favoriteResources_title=Favorite Resources~ +view_portlet_generic_help=No help available for this portlet~ +view_portlet_generic_unconfigured=No settings available for this portlet~ +view_portlet_graph_configure_title=Graph Config~ view_portlet_graph_help_msg = This Portlet supports the graphing of a resource metric.~ view_portlet_graph_help_title = Graph Portlet~ view_portlet_graph_help_unconfigured=This graph is unconfigured, click the settings button to configure.~ @@ -487,7 +530,7 @@ view_portlet_operations_config_scheduled_enable=Whether to enable scheduled oper view_portlet_operations_config_scheduled_maximum=Maximum number of Scheduled operations to display.~ view_portlet_operations_config_completed=completed operations~ view_portlet_operations_config_show_last=show Last~ -view_portlet_operations_config_show_next=show Next~ +view_portlet_operations_config_show_next=show Next~ view_portlet_operations_config_title=OperationsPortlet Configuration~ view_portlet_operations_config_title_desc=The configuration settings for the Operations portlet.~ view_portlet_operations_disabled=(Results currently disabled. Change settings to enable results.~ @@ -508,6 +551,7 @@ view_portlet_recentAlerts_config_members=Select Members~ view_portlet_recentAlerts_config_priority_label = priority Alerts,~ view_portlet_recentAlerts_config_when=within the past~ view_portlet_recentAlerts_help_msg = Displays recent alerts fired on resources visible to the current user login.~ +// dup in common view_portlet_recentAlerts_title = Recent Alerts~ view_portlet_recentlyAdded_approved_platforms=recently approved platforms on dashboard.~ view_portlet_recentlyAdded_error1=Failed to load recently added resources~ @@ -735,11 +779,17 @@ view_configurationHistoryList_itemNamePlural = configuration history items view_configurationHistoryDetails_dialogTitle = Configuration Details~ view_configurationHistoryDetails_error_loadFailure = Unable to load configuration history.~
+# Operation History List +#--------------------------------- +view_operationHistoryList_title = Operation History~ +view_operationHistoryList_button_runOperation = Run Operation
#==================== Reports ======================
view_reportsTop_title = Reports~ view_reportsTop_description = This section provides access to global reports.~ +view_reports_platforms = Cpu And Memory Utilization~ +view_reports_subsystems = Subsystems~
view_measurementOob_title = Suspect Metrics~
@@ -814,3 +864,4 @@ view_messageCenter_messageTitle= Title~ view_messageCenter_messageSeverity= Severity~ view_messageCenter_messageTime= Time~ view_messageCenter_messageDetail= Detail~ +
commit 53d3c028b2bd4805eb9c767dc6668e59a6a93425 Author: John Mazzitelli mazz@redhat.com Date: Wed Nov 17 17:20:53 2010 -0500
i18n
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/AutodiscoveryQueueDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/AutodiscoveryQueueDataSource.java index 3645614..882f9ab 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/AutodiscoveryQueueDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/AutodiscoveryQueueDataSource.java @@ -43,6 +43,7 @@ import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageOrdering; import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.Messages; import org.rhq.enterprise.gui.coregui.client.gwt.AuthorizationGWTServiceAsync; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGWTServiceAsync; @@ -52,12 +53,19 @@ import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGWTServiceAsync; */ public class AutodiscoveryQueueDataSource extends DataSource {
+ private static Messages MSG = CoreGUI.getMessages(); + + public static final String NEW = MSG.view_autoDiscoveryQ_new(); + public static final String IGNORED = MSG.view_autoDiscoveryQ_ignored(); + public static final String NEW_AND_IGNORED = MSG.view_autoDiscoveryQ_newAndIgnored(); + + private static final String NO_MANAGE_INVENTORY_PERMS_EMPTY_MESSAGE = MSG.view_autoDiscoveryQ_noperm(); + private static final String EMPTY_MESSAGE = MSG.view_autoDiscoveryQ_noItems(); + private int unlimited = -1; private int maximumPlatformsToDisplay = -1; private ResourceGWTServiceAsync resourceService = GWTServiceLookup.getResourceService(); private AuthorizationGWTServiceAsync authorizationService = GWTServiceLookup.getAuthorizationService(); - public static final String NO_MANAGE_INVENTORY_PERMS_EMPTY_MESSAGE = "(Required manage inventory permissions missing. See Administrator to change)"; - public static final String EMPTY_MESSAGE = "No items to show"; private TreeGrid dataContainerReference = null; private static final Permission MANAGE_INVENTORY = Permission.MANAGE_INVENTORY;
@@ -66,23 +74,27 @@ public class AutodiscoveryQueueDataSource extends DataSource { setDataProtocol(DSProtocol.CLIENTCUSTOM); setDataFormat(DSDataFormat.CUSTOM);
- DataSourceTextField idField = new DataSourceTextField("id", "ID"); + DataSourceTextField idField = new DataSourceTextField("id", MSG.common_title_id()); idField.setPrimaryKey(true);
- DataSourceTextField parentIdField = new DataSourceTextField("parentId", "Parent ID"); + DataSourceTextField parentIdField = new DataSourceTextField("parentId", MSG + .view_autoDiscoveryQ_field_parentId()); parentIdField.setForeignKey("id");
- DataSourceTextField resourceNameField = new DataSourceTextField("name", "Resource Name"); + DataSourceTextField resourceNameField = new DataSourceTextField("name", MSG.view_autoDiscoveryQ_field_name());
- DataSourceTextField resourceKeyField = new DataSourceTextField("resourceKey", "Resource Key"); + DataSourceTextField resourceKeyField = new DataSourceTextField("resourceKey", MSG + .view_autoDiscoveryQ_field_key());
- DataSourceTextField resourceTypeField = new DataSourceTextField("typeName", "Type"); + DataSourceTextField resourceTypeField = new DataSourceTextField("typeName", MSG.common_title_type());
- DataSourceTextField descriptionField = new DataSourceTextField("description", "Description"); + DataSourceTextField descriptionField = new DataSourceTextField("description", MSG.common_title_description());
- DataSourceTextField timestampField = new DataSourceTextField("ctime", "Discovery Time"); + DataSourceTextField timestampField = new DataSourceTextField("ctime", MSG + .view_autoDiscoveryQ_field_discoveryTime());
- DataSourceTextField statusField = new DataSourceTextField("status", "Inventory Status"); + DataSourceTextField statusField = new DataSourceTextField("status", MSG + .view_autoDiscoveryQ_field_inventoryStatus());
setFields(idField, parentIdField, resourceNameField, resourceKeyField, resourceTypeField, descriptionField, statusField, timestampField); @@ -114,11 +126,11 @@ public class AutodiscoveryQueueDataSource extends DataSource {
final HashSet<InventoryStatus> statuses = new HashSet<InventoryStatus>();
- String statusesString = request.getCriteria().getAttributeAsString("statuses"); + String statusesString = request.getCriteria().getAttributeAsString("status"); if (statusesString != null) { - if ("New".equals(statusesString)) { + if (NEW.equals(statusesString)) { statuses.add(InventoryStatus.NEW); - } else if ("Ignored".equals(statusesString)) { + } else if (IGNORED.equals(statusesString)) { statuses.add(InventoryStatus.IGNORED); } else { statuses.add(InventoryStatus.NEW); @@ -139,8 +151,7 @@ public class AutodiscoveryQueueDataSource extends DataSource { resourceService.getQueuedPlatformsAndServers(statuses, pc, new AsyncCallback<Map<Resource, List<Resource>>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to load inventory discovery queue", - caught); + CoreGUI.getErrorHandler().handleError(MSG.view_autoDiscoveryQ_loadFailure(), caught); }
public void onSuccess(Map<Resource, List<Resource>> result) { 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 ed16d79..2a0357f 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,7 +59,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; * @author Greg Hinkle */ public class ResourceAutodiscoveryView extends LocatableVLayout { - private static final String TITLE = "Autodiscovery Queue"; + private static final String TITLE = MSG.view_autoDiscoveryQ_title(); private static final String HEADER_ICON = "global/Recent_16.png";
private boolean simple; @@ -97,9 +97,10 @@ public class ResourceAutodiscoveryView extends LocatableVLayout { title.setStyleName("HeaderLabel");
DynamicForm form = new LocatableDynamicForm(this.extendLocatorId("Status")); - final SelectItem statusSelectItem = new SelectItem("status", "Status"); - statusSelectItem.setValueMap("New", "Ignored", "New and Ignored"); - statusSelectItem.setValue("New"); + final SelectItem statusSelectItem = new SelectItem("status", MSG.common_title_status()); + statusSelectItem.setValueMap(AutodiscoveryQueueDataSource.NEW, AutodiscoveryQueueDataSource.IGNORED, + AutodiscoveryQueueDataSource.NEW_AND_IGNORED); + statusSelectItem.setValue(AutodiscoveryQueueDataSource.NEW); form.setItems(statusSelectItem);
statusSelectItem.addChangedHandler(new ChangedHandler() { @@ -157,9 +158,12 @@ public class ResourceAutodiscoveryView extends LocatableVLayout {
addMember(footer);
- final IButton importButton = new LocatableIButton(this.extendLocatorId("Import"), "Import"); - final IButton ignoreButton = new LocatableIButton(this.extendLocatorId("Ignore"), "Ignore"); - final IButton unignoreButton = new LocatableIButton(this.extendLocatorId("Unignore"), "Unignore"); + final IButton importButton = new LocatableIButton(this.extendLocatorId("Import"), MSG + .view_autoDiscoveryQ_import()); + final IButton ignoreButton = new LocatableIButton(this.extendLocatorId("Ignore"), MSG + .view_autoDiscoveryQ_ignore()); + final IButton unignoreButton = new LocatableIButton(this.extendLocatorId("Unignore"), MSG + .view_autoDiscoveryQ_unignore());
footer.addMember(importButton); footer.addMember(ignoreButton); @@ -182,12 +186,12 @@ public class ResourceAutodiscoveryView extends LocatableVLayout { public void onClick(ClickEvent clickEvent) { resourceService.importResources(getSelectedIds(), new AsyncCallback<Void>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to import resources", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_autoDiscoveryQ_importFailure(), caught); }
public void onSuccess(Void result) { CoreGUI.getMessageCenter().notify( - new Message("Successfully imported the selected resources", Message.Severity.Info)); + new Message(MSG.view_autoDiscoveryQ_importSuccessful(), Message.Severity.Info)); treeGrid.invalidateCache(); } }); @@ -198,12 +202,12 @@ public class ResourceAutodiscoveryView extends LocatableVLayout { public void onClick(ClickEvent clickEvent) { resourceService.ignoreResources(getSelectedIds(), new AsyncCallback<Void>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to ignore resources", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_autoDiscoveryQ_ignoreFailure(), caught); }
public void onSuccess(Void result) { CoreGUI.getMessageCenter().notify( - new Message("Successfully ignored the selected resources", Message.Severity.Info)); + new Message(MSG.view_autoDiscoveryQ_ignoreSuccessful(), Message.Severity.Info)); treeGrid.invalidateCache(); } }); @@ -214,12 +218,12 @@ public class ResourceAutodiscoveryView extends LocatableVLayout { public void onClick(ClickEvent clickEvent) { resourceService.unignoreResources(getSelectedIds(), new AsyncCallback<Void>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to unignore resources", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_autoDiscoveryQ_unignoreFailure(), caught); }
public void onSuccess(Void result) { CoreGUI.getMessageCenter().notify( - new Message("Successfully unignored the selected resources", Message.Severity.Info)); + new Message(MSG.view_autoDiscoveryQ_unignoreSuccessful(), Message.Severity.Info)); treeGrid.invalidateCache(); } }); 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 cf01870..63d8220 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 @@ -60,6 +60,6 @@ public class ResourceFactoryConfigurationStep extends AbstractWizardStep { }
public String getName() { - return "Edit Configuration"; + return MSG.widget_resourceFactoryWizard_editConfigStepName(); } } \ No newline at end of file diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryCreateWizard.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryCreateWizard.java index 66b1020..33982e9 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryCreateWizard.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryCreateWizard.java @@ -55,14 +55,16 @@ public class ResourceFactoryCreateWizard extends AbstractResourceFactoryWizard { switch (childType.getCreationDataType()) {
case CONTENT: { - String archPrompt = packageType.isSupportsArchitecture() ? "Package Architecture" : null; + String archPrompt = packageType.isSupportsArchitecture() ? MSG.widget_resourceFactoryWizard_archPrompt() + : null;
ConfigurationDefinition deployTimeConfigDef = packageType.getDeploymentConfigurationDefinition(); this.setNewResourceConfigurationDefinition(deployTimeConfigDef); Map<String, ConfigurationTemplate> templates = deployTimeConfigDef.getTemplates();
- steps.add(new ResourceFactoryInfoStep(ResourceFactoryCreateWizard.this, null, "Package Version", - archPrompt, "Deployment Time Configuration Templates", templates)); + steps.add(new ResourceFactoryInfoStep(ResourceFactoryCreateWizard.this, null, MSG + .widget_resourceFactoryWizard_versionPrompt(), archPrompt, MSG + .widget_resourceFactoryWizard_contentTemplatePrompt(), templates));
steps.add(new ResourceFactoryPackageStep(ResourceFactoryCreateWizard.this));
@@ -78,8 +80,9 @@ public class ResourceFactoryCreateWizard extends AbstractResourceFactoryWizard { ConfigurationDefinition resourceConfigDef = getChildType().getResourceConfigurationDefinition(); this.setNewResourceConfigurationDefinition(resourceConfigDef); Map<String, ConfigurationTemplate> templates = resourceConfigDef.getTemplates(); - steps.add(new ResourceFactoryInfoStep(ResourceFactoryCreateWizard.this, "New Resource Name", - "Resource Configuration Templates", templates)); + steps.add(new ResourceFactoryInfoStep(ResourceFactoryCreateWizard.this, MSG + .widget_resourceFactoryWizard_namePrompt(), MSG.widget_resourceFactoryWizard_configTemplatePrompt(), + templates));
steps.add(new ResourceFactoryConfigurationStep(ResourceFactoryCreateWizard.this));
@@ -92,11 +95,11 @@ public class ResourceFactoryCreateWizard extends AbstractResourceFactoryWizard { }
public String getWindowTitle() { - return "Resource Create Wizard"; + return MSG.widget_resourceFactoryWizard_createWizardWindowTitle(); }
public String getTitle() { - return "Create New Resource of Type: " + getChildType().getName(); + return MSG.widget_resourceFactoryWizard_createWizardTitle(getChildType().getName()); }
public String getSubtitle() { @@ -115,21 +118,21 @@ public class ResourceFactoryCreateWizard extends AbstractResourceFactoryWizard { Integer packageVersionId = this.getNewResourcePackageVersionId();
if (null == packageVersionId) { - CoreGUI.getErrorHandler().handleError("Failed to create new resource, no PackageVersion"); + CoreGUI.getErrorHandler().handleError(MSG.widget_resourceFactoryWizard_execute1()); getView().closeDialog(); }
GWTServiceLookup.getResourceService().createResource(parentResourceId, createTypeId, (String) null, deployTimeConfiguration, packageVersionId, new AsyncCallback<Void>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to create new resource", caught); + CoreGUI.getErrorHandler().handleError(MSG.widget_resourceFactoryWizard_execute2(), caught); getView().closeDialog(); }
public void onSuccess(Void result) { CoreGUI.getMessageCenter().notify( - new Message("Submitted request to create new resource of type [" + getChildType().getName() - + "]", Message.Severity.Info)); + new Message(MSG.widget_resourceFactoryWizard_createSubmitType(getChildType().getName()), + Message.Severity.Info)); getView().closeDialog(); } }); @@ -144,13 +147,13 @@ public class ResourceFactoryCreateWizard extends AbstractResourceFactoryWizard { GWTServiceLookup.getResourceService().createResource(parentResourceId, createTypeId, newResourceName, resourceConfiguration, new AsyncCallback<Void>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to create new resource", caught); + CoreGUI.getErrorHandler().handleError(MSG.widget_resourceFactoryWizard_execute2(), caught); getView().closeDialog(); }
public void onSuccess(Void result) { CoreGUI.getMessageCenter().notify( - new Message("Submitted request to create new resource [" + newResourceName + "]", + new Message(MSG.widget_resourceFactoryWizard_createSubmit(newResourceName), Message.Severity.Info)); getView().closeDialog(); } @@ -192,7 +195,7 @@ public class ResourceFactoryCreateWizard extends AbstractResourceFactoryWizard { new AsyncCallback<PackageType>() { public void onFailure(Throwable caught) { CoreGUI.getErrorHandler().handleError( - "Failed to get backing package type for new resource", caught); + MSG.widget_resourceFactoryWizard_failedToGetType(), caught); }
public void onSuccess(PackageType result) { @@ -225,8 +228,8 @@ public class ResourceFactoryCreateWizard extends AbstractResourceFactoryWizard { GWTServiceLookup.getContentService().deletePackageVersion(this.newResourcePackageVersionId, new AsyncCallback<Void>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError( - "Failed to delete PackageVersion in CreateResource Cancel.", caught); + CoreGUI.getErrorHandler().handleError(MSG.widget_resourceFactoryWizard_failedToDeleteVersion(), + caught); }
public void onSuccess(Void ignore) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryImportWizard.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryImportWizard.java index 80fab2a..2723440 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryImportWizard.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryImportWizard.java @@ -53,7 +53,8 @@ public class ResourceFactoryImportWizard extends AbstractResourceFactoryWizard { // skip the info step if the type has only the default template to offer for user selection. Map<String, ConfigurationTemplate> templates = childType.getPluginConfigurationDefinition().getTemplates(); if (templates.size() > 1) { - this.infoStep = new ResourceFactoryInfoStep(this, null, "Connection Settings Templates", templates); + this.infoStep = new ResourceFactoryInfoStep(this, null, MSG.widget_resourceFactoryWizard_templatePrompt(), + templates); steps.add(infoStep); }
@@ -65,11 +66,11 @@ public class ResourceFactoryImportWizard extends AbstractResourceFactoryWizard { }
public String getWindowTitle() { - return "Resource Import Wizard"; + return MSG.widget_resourceFactoryWizard_importWizardWindowTitle(); }
public String getTitle() { - return "Import Resource of Type: " + getChildType().getName(); + return MSG.widget_resourceFactoryWizard_importWizardTitle(getChildType().getName()); }
public void execute() { @@ -81,13 +82,13 @@ public class ResourceFactoryImportWizard extends AbstractResourceFactoryWizard { GWTServiceLookup.getResourceService().manuallyAddResource(createTypeId, parentResourceId, newConfiguration, new AsyncCallback<Resource>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to manually import resource", caught); + CoreGUI.getErrorHandler().handleError(MSG.widget_resourceFactoryWizard_importFailure(), caught); getView().closeDialog(); }
public void onSuccess(Resource result) { CoreGUI.getMessageCenter().notify( - new Message("Submitted request to manually import [" + getChildType().getName() + "]", + new Message(MSG.widget_resourceFactoryWizard_importSubmitted(getChildType().getName()), Message.Severity.Info)); getView().closeDialog(); } @@ -104,5 +105,4 @@ public class ResourceFactoryImportWizard extends AbstractResourceFactoryWizard { } }); } - } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryInfoStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryInfoStep.java index bc74953..69c1c7e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryInfoStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryInfoStep.java @@ -179,7 +179,7 @@ public class ResourceFactoryInfoStep extends AbstractWizardStep { }
public String getName() { - return "Resource Information"; + return MSG.widget_resourceFactoryWizard_infoStepName(); }
public String getResourceName() { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryPackageStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryPackageStep.java index 50742ea..ddde67d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryPackageStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryPackageStep.java @@ -80,8 +80,7 @@ public class ResourceFactoryPackageStep extends AbstractWizardStep { wizard.getView().hideMessage();
if (form.isUploadInProgress()) { - handleUploadError("Upload is in progress... This can take several minutes for large distribution files.", - false); + handleUploadError(MSG.widget_resourceFactoryWizard_uploadInProgress(), false); return false; }
@@ -96,7 +95,7 @@ public class ResourceFactoryPackageStep extends AbstractWizardStep { }
public String getName() { - return "Upload Resource Content File"; + return MSG.widget_resourceFactoryWizard_uploadFileStepName(); }
private void handleUploadError(String errorMessage, boolean sendToMessageCenter) { @@ -107,7 +106,8 @@ public class ResourceFactoryPackageStep extends AbstractWizardStep { }
if (sendToMessageCenter) { - CoreGUI.getMessageCenter().notify(new Message("Failed to upload file. " + errorMessage, Severity.Error)); + CoreGUI.getMessageCenter().notify( + new Message(MSG.widget_resourceFactoryWizard_uploadFailure() + ": " + errorMessage, Severity.Error)); } }
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceGroupSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceGroupSelector.java index 99d77da..d296cdb 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceGroupSelector.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceGroupSelector.java @@ -46,10 +46,10 @@ public class ResourceGroupSelector extends AbstractSelector<ResourceGroup> { availableFilterForm.setWidth100(); availableFilterForm.setNumCols(4);
- final TextItem search = new TextItem("search", "Search"); + final TextItem search = new TextItem("search", MSG.common_label_search());
- SelectItem groupCategorySelect = new SelectItem("groupCategory", "Group Category"); - groupCategorySelect.setValueMap("Compatible", "Mixed"); + SelectItem groupCategorySelect = new SelectItem("groupCategory", MSG.widget_resourceSelector_groupCategory()); + groupCategorySelect.setValueMap("Compatible", "Mixed"); // I don't think we can i18n these, may need these literal values - need to double check this groupCategorySelect.setAllowEmptyValue(true); availableFilterForm.setItems(search, groupCategorySelect, new SpacerItem());
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 d55b87d..907339e 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 @@ -19,7 +19,6 @@
package org.rhq.enterprise.gui.coregui.client.inventory.resource.selection;
-import java.util.HashSet; import java.util.Set;
import com.google.gwt.user.client.Timer; @@ -95,7 +94,7 @@ public class ResourcePicker extends LocatableWindow { LocatableDynamicForm form = new LocatableDynamicForm(extendLocatorId("buttons")); form.setLayoutAlign(Alignment.CENTER);
- ButtonItem ok = new ButtonItem("ok", "OK"); + ButtonItem ok = new ButtonItem("ok", MSG.common_button_ok()); ok.setStartRow(true); ok.setEndRow(false); ok.addClickHandler(new ClickHandler() { @@ -104,7 +103,7 @@ public class ResourcePicker extends LocatableWindow { ok(); } }); - ButtonItem cancel = new ButtonItem("cancel", "Cancel"); + ButtonItem cancel = new ButtonItem("cancel", MSG.common_button_cancel()); cancel.addClickHandler(new ClickHandler() { @Override public void onClick(ClickEvent event) { @@ -130,7 +129,7 @@ public class ResourcePicker extends LocatableWindow { }
protected String getDefaultTitle() { - return "Select Resources"; + return MSG.widget_resourceSelector_selectMultipleResources(); }
protected ResourceSelector getResourceSelector() { @@ -149,7 +148,7 @@ public class ResourcePicker extends LocatableWindow { Set<Integer> selection = selector.getSelection();
if (selection == null || selection.isEmpty()) { - showWarningMessage("Please select one of more resources"); + showWarningMessage(MSG.widget_resourceSelector_pleaseSelectMultipleResource()); } else { if (handler.ok(selection)) { selector = null; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceSelector.java index e33e36b..77c3485 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceSelector.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceSelector.java @@ -67,15 +67,15 @@ public class ResourceSelector extends AbstractSelector<Resource> { availableFilterForm = new LocatableDynamicForm("ResSelectAvailFilterForm"); availableFilterForm.setNumCols(6); availableFilterForm.setWidth("75%"); - final TextItem search = new TextItem("search", "Search"); + final TextItem search = new TextItem("search", MSG.common_label_search()); final SelectItem categorySelect;
- typeSelectItem = new IPickTreeItem("type", "Type"); + typeSelectItem = new IPickTreeItem("type", MSG.common_title_type()); typeSelectItem.setDataSource(new ResourceTypePluginTreeDataSource()); typeSelectItem.setValueField("id"); typeSelectItem.setCanSelectParentItems(true); typeSelectItem.setLoadDataOnDemand(false); - typeSelectItem.setEmptyMenuMessage("Loading..."); + typeSelectItem.setEmptyMenuMessage(MSG.common_msg_loading()); typeSelectItem.setShowIcons(true);
if (this.forceResourceTypeFilter) { @@ -85,7 +85,7 @@ public class ResourceSelector extends AbstractSelector<Resource> { typeSelectItem.setVisible(false); }
- categorySelect = new SelectItem("category", "Category"); + categorySelect = new SelectItem("category", MSG.common_title_category()); LinkedHashMap<String, String> valueMap = buildResourceCategoryValueMap(); categorySelect.setValueMap(valueMap); categorySelect.setAllowEmptyValue(true); @@ -142,7 +142,7 @@ public class ResourceSelector extends AbstractSelector<Resource> {
@Override protected String getItemTitle() { - return "resource"; + return "resource"; }
/** transfers selected data to the assigned grid. This operation mimics button click from ResourceSelection. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/SelectedResourceDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/SelectedResourceDataSource.java index 742a83f..9b39130 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/SelectedResourceDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/SelectedResourceDataSource.java @@ -20,8 +20,6 @@ package org.rhq.enterprise.gui.coregui.client.inventory.resource.selection;
import java.util.ArrayList;
-import com.smartgwt.client.widgets.events.DropEvent; -import com.smartgwt.client.widgets.events.DropHandler; import com.smartgwt.client.widgets.grid.ListGrid; import com.smartgwt.client.widgets.grid.ListGridRecord; import com.smartgwt.client.widgets.grid.events.RecordDropEvent; @@ -36,11 +34,9 @@ public class SelectedResourceDataSource extends ResourceDatasource {
private ArrayList<Integer> selection;
- ListGrid availableGrid; ListGrid assignedGrid;
- public SelectedResourceDataSource(ArrayList<Integer> selection, ListGrid availableGrid, ListGrid assignedGrid) { this.selection = selection; if (this.selection == null) { @@ -49,7 +45,6 @@ public class SelectedResourceDataSource extends ResourceDatasource { this.availableGrid = availableGrid; this.assignedGrid = assignedGrid;
- assignedGrid.addRecordDropHandler(new RecordDropHandler() { public void onRecordDrop(RecordDropEvent recordDropEvent) { for (ListGridRecord record : recordDropEvent.getDropRecords()) { @@ -62,12 +57,4 @@ public class SelectedResourceDataSource extends ResourceDatasource { } }); } - - - - - - - - } 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 3c71f8c..46f8ba0 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 @@ -33,7 +33,7 @@ public class SingleResourcePicker extends ResourcePicker {
@Override protected String getDefaultTitle() { - return "Select a Resource"; + return MSG.widget_resourceSelector_selectResource(); }
@Override @@ -46,7 +46,7 @@ public class SingleResourcePicker extends ResourcePicker { Set<Integer> selection = getResourceSelector().getSelection();
if (selection == null || selection.size() != 1) { - showWarningMessage("Please select a Resource."); + showWarningMessage(MSG.widget_resourceSelector_pleaseSelectResource()); } else { if (handler.ok(selection)) { markForDestroy(); 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 5970507..cfa47e2 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 @@ -20,7 +20,6 @@ package org.rhq.enterprise.gui.coregui.client.inventory.resource.type;
import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.data.Record; -import com.smartgwt.client.widgets.layout.VLayout; import com.smartgwt.client.widgets.tree.TreeGrid; import com.smartgwt.client.widgets.tree.TreeGridField; import com.smartgwt.client.widgets.tree.TreeNode; @@ -32,15 +31,17 @@ 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.gwt.ResourceTypeGWTServiceAsync; +import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/** * @author Greg Hinkle */ -public class PluginTypeTreeView extends VLayout { +public class PluginTypeTreeView extends LocatableVLayout {
private ResourceTypeGWTServiceAsync resourceTypeService = GWTServiceLookup.getResourceTypeGWTService();
- public PluginTypeTreeView() { + public PluginTypeTreeView(String locatorId) { + super(locatorId); setWidth100(); setHeight100(); } @@ -49,16 +50,14 @@ public class PluginTypeTreeView extends VLayout { protected void onDraw() { super.onDraw();
- final TreeGrid treeGrid = new CustomResourceTypeTreeGrid();
treeGrid.setHeight100();
- treeGrid.setTitle("Resource Types"); + treeGrid.setTitle(MSG.view_type_resourceTypes()); treeGrid.setAnimateFolders(false); treeGrid.setResizeFieldsInRealTime(true);
- final TreeGridField name, plugin, category; name = new TreeGridField("name"); plugin = new TreeGridField("plugin"); @@ -72,21 +71,19 @@ public class PluginTypeTreeView extends VLayout { criteria.fetchParentResourceTypes(true); criteria.setPageControl(PageControl.getUnlimitedInstance());
- resourceTypeService.findResourceTypesByCriteria(criteria, - new AsyncCallback<PageList<ResourceType>>() { - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to load inventory discovery queue", caught); - } + resourceTypeService.findResourceTypesByCriteria(criteria, new AsyncCallback<PageList<ResourceType>>() { + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError("Failed to load", caught); + }
- public void onSuccess(PageList<ResourceType> result) { + public void onSuccess(PageList<ResourceType> result) {
- treeGrid.getTree().linkNodes(ResourceTypePluginTreeDataSource.buildNodes(result)); + treeGrid.getTree().linkNodes(ResourceTypePluginTreeDataSource.buildNodes(result));
- } - }); + } + }); }
- public static class CustomResourceTypeTreeGrid extends TreeGrid { @Override protected String getIcon(Record record, boolean defaultState) { @@ -95,15 +92,16 @@ public class PluginTypeTreeView extends VLayout { boolean open = getTree().isOpen((TreeNode) record);
if (record instanceof ResourceTypePluginTreeDataSource.ResourceTypeTreeNode) { - ResourceType resourceType = ((ResourceTypePluginTreeDataSource.ResourceTypeTreeNode) record).getResourceType(); + ResourceType resourceType = ((ResourceTypePluginTreeDataSource.ResourceTypeTreeNode) record) + .getResourceType();
switch (resourceType.getCategory()) { - case PLATFORM: - return "types/Platform_up_16.png"; - case SERVER: - return "types/Server_up_16.png"; - case SERVICE: - return "types/Service_up_16.png"; + case PLATFORM: + return "types/Platform_up_16.png"; + case SERVER: + return "types/Server_up_16.png"; + case SERVICE: + return "types/Service_up_16.png"; } } else if (record instanceof ResourceTypePluginTreeDataSource.PluginTreeNode) { return "types/plugin_16.png"; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypePluginTreeDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypePluginTreeDataSource.java index 03a2198..d064680 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypePluginTreeDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypePluginTreeDataSource.java @@ -38,6 +38,7 @@ import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; import org.rhq.core.domain.util.PageOrdering; import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.Messages; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.gwt.ResourceTypeGWTServiceAsync;
@@ -46,6 +47,8 @@ import org.rhq.enterprise.gui.coregui.client.gwt.ResourceTypeGWTServiceAsync; */ public class ResourceTypePluginTreeDataSource extends DataSource {
+ private Messages MSG = CoreGUI.getMessages(); + private ResourceTypeGWTServiceAsync resourceTypeService = GWTServiceLookup.getResourceTypeGWTService();
public ResourceTypePluginTreeDataSource() { @@ -54,17 +57,17 @@ public class ResourceTypePluginTreeDataSource extends DataSource { setDataProtocol(DSProtocol.CLIENTCUSTOM); setDataFormat(DSDataFormat.CUSTOM);
- DataSourceTextField idField = new DataSourceTextField("id", "ID"); + DataSourceTextField idField = new DataSourceTextField("id", MSG.common_title_id()); idField.setPrimaryKey(true);
- DataSourceTextField parentIdField = new DataSourceTextField("parentId", "Parent ID"); + DataSourceTextField parentIdField = new DataSourceTextField("parentId", MSG.view_type_parentId()); parentIdField.setForeignKey("id");
- DataSourceTextField resourceNameField = new DataSourceTextField("name", "Name"); + DataSourceTextField resourceNameField = new DataSourceTextField("name", MSG.common_title_name());
- DataSourceTextField resourceKeyField = new DataSourceTextField("plugin", "Plugin"); + DataSourceTextField resourceKeyField = new DataSourceTextField("plugin", MSG.common_title_plugin());
- DataSourceTextField resourceTypeField = new DataSourceTextField("category", "Category"); + DataSourceTextField resourceTypeField = new DataSourceTextField("category", MSG.common_title_category());
setFields(idField, parentIdField, resourceNameField, resourceKeyField, resourceTypeField); } @@ -98,7 +101,7 @@ public class ResourceTypePluginTreeDataSource extends DataSource {
resourceTypeService.findResourceTypesByCriteria(criteria, new AsyncCallback<PageList<ResourceType>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to load resource type tree data", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_type_typeTreeLoadFailure(), caught); }
public void onSuccess(PageList<ResourceType> result) { @@ -175,6 +178,8 @@ public class ResourceTypePluginTreeDataSource extends DataSource {
public static class PluginTreeNode extends TreeNode {
+ private static String pluginStr = CoreGUI.getMessages().common_title_plugin(); + String id;
PluginTreeNode(String pluginName) { @@ -183,7 +188,7 @@ public class ResourceTypePluginTreeDataSource extends DataSource { this.id = pluginName; setParentID(null);
- setAttribute("name", pluginName + " Plugin"); + setAttribute("name", pluginName + " " + pluginStr); // setAttribute("plugin",pluginName); setIcon("types/plugin_16.png"); // todo doesn't work setEnabled(true); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java index c998010..19624d0 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java @@ -93,7 +93,7 @@ public class ResourceTypeRepository { return; }
- long start = System.currentTimeMillis(); + //long start = System.currentTimeMillis();
Set<Integer> types = new HashSet<Integer>(); for (Resource res : resources) { @@ -126,7 +126,7 @@ public class ResourceTypeRepository { return; }
- long start = System.currentTimeMillis(); + // long start = System.currentTimeMillis();
Set<Integer> types = new HashSet<Integer>(); for (ResourceGroup group : groups) { @@ -301,7 +301,7 @@ public class ResourceTypeRepository { cachedType.setSubCategory(type.getSubCategory()); break; default: - System.err.println("ERROR: metadataType " + metadataType.name() + Log.error("ERROR: metadataType " + metadataType.name() + " not merged into cached ResourceType."); } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeTreeDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeTreeDataSource.java index 356e565..9e36ac3 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeTreeDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeTreeDataSource.java @@ -18,8 +18,6 @@ */ package org.rhq.enterprise.gui.coregui.client.inventory.resource.type;
-import java.util.ArrayList; -import java.util.HashMap; import java.util.HashSet;
import com.google.gwt.user.client.rpc.AsyncCallback; @@ -38,6 +36,7 @@ import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; import org.rhq.core.domain.util.PageOrdering; import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.Messages; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.gwt.ResourceTypeGWTServiceAsync;
@@ -45,7 +44,7 @@ import org.rhq.enterprise.gui.coregui.client.gwt.ResourceTypeGWTServiceAsync; * @author Greg Hinkle */ public class ResourceTypeTreeDataSource extends DataSource { - + private Messages MSG = CoreGUI.getMessages();
private ResourceTypeGWTServiceAsync resourceTypeService = GWTServiceLookup.getResourceTypeGWTService();
@@ -55,19 +54,17 @@ public class ResourceTypeTreeDataSource extends DataSource { setDataProtocol(DSProtocol.CLIENTCUSTOM); setDataFormat(DSDataFormat.CUSTOM);
- - DataSourceTextField idField = new DataSourceTextField("id", "ID"); + DataSourceTextField idField = new DataSourceTextField("id", MSG.common_title_id()); idField.setPrimaryKey(true);
- DataSourceTextField parentIdField = new DataSourceTextField("parentId", "Parent ID"); + DataSourceTextField parentIdField = new DataSourceTextField("parentId", MSG.view_type_parentId()); parentIdField.setForeignKey("id");
- DataSourceTextField resourceNameField = new DataSourceTextField("name", "Name"); + DataSourceTextField resourceNameField = new DataSourceTextField("name", MSG.common_title_name());
- DataSourceTextField resourceKeyField = new DataSourceTextField("plugin", "Plugin"); - - DataSourceTextField resourceTypeField = new DataSourceTextField("category", "Category"); + DataSourceTextField resourceKeyField = new DataSourceTextField("plugin", MSG.common_title_plugin());
+ DataSourceTextField resourceTypeField = new DataSourceTextField("category", MSG.common_title_category());
setFields(idField, parentIdField, resourceNameField, resourceKeyField, resourceTypeField); } @@ -78,17 +75,16 @@ public class ResourceTypeTreeDataSource extends DataSource { // Asume success response.setStatus(0); switch (request.getOperationType()) { - case FETCH: - executeFetch(request, response); - break; - default: - break; + case FETCH: + executeFetch(request, response); + break; + default: + break; }
return request.getData(); }
- protected void executeFetch(final DSRequest request, final DSResponse response) {
String parentIdString = request.getCriteria().getAttributeAsString("parentId"); @@ -96,26 +92,23 @@ public class ResourceTypeTreeDataSource extends DataSource { processResponse(request.getRequestId(), response); } else {
- ResourceTypeCriteria criteria = new ResourceTypeCriteria(); criteria.fetchParentResourceTypes(true); criteria.setPageControl(PageControl.getUnlimitedInstance());
- resourceTypeService.findResourceTypesByCriteria(criteria, - new AsyncCallback<PageList<ResourceType>>() { - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to load resource type tree data", caught); - } - - public void onSuccess(PageList<ResourceType> result) { - response.setData(buildNodes(result)); - processResponse(request.getRequestId(), response); - } - }); + resourceTypeService.findResourceTypesByCriteria(criteria, new AsyncCallback<PageList<ResourceType>>() { + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_type_typeTreeLoadFailure(), caught); + } + + public void onSuccess(PageList<ResourceType> result) { + response.setData(buildNodes(result)); + processResponse(request.getRequestId(), response); + } + }); } }
- public static TreeNode[] buildNodes(PageList<ResourceType> result) {
HashSet<TreeNode> nodes = new HashSet<TreeNode>(); @@ -125,7 +118,8 @@ public class ResourceTypeTreeDataSource extends DataSource {
for (ResourceType type : result) {
- if (type.getCategory() != ResourceCategory.PLATFORM && (type.getParentResourceTypes() == null || type.getParentResourceTypes().isEmpty())) { + if (type.getCategory() != ResourceCategory.PLATFORM + && (type.getParentResourceTypes() == null || type.getParentResourceTypes().isEmpty())) { noParentNonPlatformNodes.add(type);
} else if (type.getParentResourceTypes() == null || type.getParentResourceTypes().isEmpty()) { @@ -144,12 +138,10 @@ public class ResourceTypeTreeDataSource extends DataSource { } }
- TreeNode[] treeNodes = nodes.toArray(new TreeNode[nodes.size()]); return treeNodes; }
- /** * Returns a prepopulated PageControl based on the provided DSRequest. This will set sort fields, * pagination, but *not* filter fields. @@ -163,7 +155,8 @@ public class ResourceTypeTreeDataSource extends DataSource { if (request.getStartRow() == null || request.getEndRow() == null) { pageControl = new PageControl(); } else { - pageControl = PageControl.getExplicitPageControl(request.getStartRow(), request.getEndRow() - request.getStartRow()); + pageControl = PageControl.getExplicitPageControl(request.getStartRow(), request.getEndRow() + - request.getStartRow()); }
// Initialize sorting. @@ -180,7 +173,6 @@ public class ResourceTypeTreeDataSource extends DataSource { return pageControl; }
- public static class PluginTreeNode extends TreeNode {
String id; @@ -192,17 +184,20 @@ public class ResourceTypeTreeDataSource extends DataSource { setParentID(null);
setAttribute("name", pluginName); -// setAttribute("plugin",pluginName); + // setAttribute("plugin",pluginName); }
@Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false;
PluginTreeNode that = (PluginTreeNode) o;
- if (!id.equals(that.id)) return false; + if (!id.equals(that.id)) + return false;
return true; } @@ -238,20 +233,23 @@ public class ResourceTypeTreeDataSource extends DataSource { setIsFolder(true); }
- public ResourceType getResourceType() { return resourceType; }
@Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false;
ResourceTypeTreeNode that = (ResourceTypeTreeNode) o;
- if (!id.equals(that.id)) return false; - if (parentId != null ? !parentId.equals(that.parentId) : that.parentId != null) return false; + if (!id.equals(that.id)) + return false; + if (parentId != null ? !parentId.equals(that.parentId) : that.parentId != null) + return false;
return true; } 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 15c0a1e..99aa414 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 @@ -56,7 +56,7 @@ public class ResourceTypeTreeView extends LocatableVLayout {
treeGrid.setHeight100();
- treeGrid.setTitle("Resource Types"); + treeGrid.setTitle(MSG.view_type_resourceTypes()); treeGrid.setAnimateFolders(false); treeGrid.setResizeFieldsInRealTime(true);
@@ -75,7 +75,7 @@ public class ResourceTypeTreeView extends LocatableVLayout {
resourceTypeService.findResourceTypesByCriteria(criteria, new AsyncCallback<PageList<ResourceType>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to load inventory discovery queue", caught); + CoreGUI.getErrorHandler().handleError("Failed to load", caught); }
public void onSuccess(PageList<ResourceType> result) { @@ -96,7 +96,7 @@ public class ResourceTypeTreeView extends LocatableVLayout { protected String getIcon(Record record, boolean defaultState) {
if (record instanceof TreeNode) { - boolean open = getTree().isOpen((TreeNode) record); + // boolean open = getTree().isOpen((TreeNode) record);
if (record instanceof ResourceTypeTreeDataSource.ResourceTypeTreeNode) { ResourceType resourceType = ((ResourceTypeTreeDataSource.ResourceTypeTreeNode) record)
commit 200dc2eccbac701a99798e35c2886ada8fc013f9 Merge: 1e2871e... e29b78e... Author: Simeon Pinder spinder@redhat.com Date: Wed Nov 17 17:20:38 2010 -0500
Merge branch 'master' of ssh://spinder@git.fedorahosted.org/git/rhq/rhq into track-master2
commit e29b78e6e083385c0d4c1fed377db9546584533c Author: Joseph Marques joseph@redhat.com Date: Wed Nov 17 17:15:29 2010 -0500
consolidate properties for titleBar, contextMenu, and tabs
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupContextMenu.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupContextMenu.java index f916baf..92153ec 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupContextMenu.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupContextMenu.java @@ -92,7 +92,7 @@ public class ResourceGroupContextMenu extends LocatableMenu {
addItem(new MenuItem("Type: " + resourceType.getName()));
- MenuItem editPluginConfiguration = new MenuItem(MSG.view_group_contextMenu_pluginConfiguration()); + MenuItem editPluginConfiguration = new MenuItem(MSG.view_tree_common_contextMenu_pluginConfiguration()); editPluginConfiguration.addClickHandler(new ClickHandler() { public void onClick(MenuItemClickEvent event) { int groupId = group.getId(); @@ -116,14 +116,14 @@ public class ResourceGroupContextMenu extends LocatableMenu { editPluginConfiguration.setEnabled(resourceType.getPluginConfigurationDefinition() != null); addItem(editPluginConfiguration);
- MenuItem editResourceConfiguration = new MenuItem(MSG.view_group_contextMenu_resourceConfiguration()); + MenuItem editResourceConfiguration = new MenuItem(MSG.view_tree_common_contextMenu_resourceConfiguration()); editResourceConfiguration.addClickHandler(new ClickHandler() { public void onClick(MenuItemClickEvent event) { int groupId = group.getId(); int resourceTypeId = resourceType.getId();
final Window configEditor = new Window(); - configEditor.setTitle(MSG.view_group_contextMenu_editResourceConfiguration(group.getName())); + configEditor.setTitle(MSG.view_tree_common_contextMenu_editResourceConfiguration(group.getName())); configEditor.setWidth(800); configEditor.setHeight(800); configEditor.setIsModal(true); @@ -149,7 +149,7 @@ public class ResourceGroupContextMenu extends LocatableMenu { addItem(new MenuItemSeparator());
// Operations Menu - MenuItem operations = new MenuItem(MSG.view_group_contextMenu_operations()); + MenuItem operations = new MenuItem(MSG.view_tree_common_contextMenu_operations()); Menu opSubMenu = new Menu(); if (resourceType.getOperationDefinitions() != null) { for (final OperationDefinition operationDefinition : resourceType.getOperationDefinitions()) { @@ -247,7 +247,7 @@ public class ResourceGroupContextMenu extends LocatableMenu { }
private MenuItem buildMetricsMenu(final ResourceType type) { - MenuItem measurements = new MenuItem(MSG.view_group_contextMenu_measurements()); + MenuItem measurements = new MenuItem(MSG.view_tree_common_contextMenu_measurements()); final Menu measurementsSubMenu = new Menu();
GWTServiceLookup.getDashboardService().findDashboardsForSubject(new AsyncCallback<List<Dashboard>>() { @@ -266,7 +266,7 @@ public class ResourceGroupContextMenu extends LocatableMenu { defItem.setSubmenu(defSubItem);
for (final Dashboard d : result) { - MenuItem addToDBItem = new MenuItem(MSG.view_group_contextMenu_addChartToDashboard(d + MenuItem addToDBItem = new MenuItem(MSG.view_tree_common_contextMenu_addChartToDashboard(d .getName())); defSubItem.addItem(addToDBItem);
@@ -274,7 +274,7 @@ public class ResourceGroupContextMenu extends LocatableMenu { public void onClick(MenuItemClickEvent menuItemClickEvent) {
DashboardPortlet p = new DashboardPortlet(def.getDisplayName() + " " - + MSG.view_group_contextMenu_chart(), GraphPortlet.KEY, 250); + + MSG.view_tree_common_contextMenu_chart(), GraphPortlet.KEY, 250); p.getConfiguration().put( new PropertySimple(GraphPortlet.CFG_RESOURCE_GROUP_ID, currentGroup.getId())); p.getConfiguration().put( @@ -286,14 +286,18 @@ public class ResourceGroupContextMenu extends LocatableMenu { new AsyncCallback<Dashboard>() { public void onFailure(Throwable caught) { CoreGUI.getErrorHandler().handleError( - MSG.view_group_contextMenu_saveChartToDashboardFailure(), caught); + MSG.view_tree_common_contextMenu_saveChartToDashboardFailure(), + caught); }
public void onSuccess(Dashboard result) { - CoreGUI.getMessageCenter().notify( - new Message(MSG - .view_group_contextMenu_saveChartToDashboardSuccessful(result - .getName()), Message.Severity.Info)); + CoreGUI + .getMessageCenter() + .notify( + new Message( + MSG + .view_tree_common_contextMenu_saveChartToDashboardSuccessful(result + .getName()), Message.Severity.Info)); } });
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 674fc17..7c82422 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 @@ -143,62 +143,62 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource protected List<TwoLevelTab> createTabs() { List<TwoLevelTab> tabs = new ArrayList<TwoLevelTab>();
- summaryTab = new TwoLevelTab(getTabSet().extendLocatorId("Summary"), MSG.view_group_tabs_summary(), + summaryTab = new TwoLevelTab(getTabSet().extendLocatorId("Summary"), MSG.view_tabs_common_summary(), "/images/icons/Service_up_16.png"); - summaryOverview = new SubTab(summaryTab.extendLocatorId("Overview"), MSG.view_group_tabs_overview(), null); - summaryTimeline = new SubTab(summaryTab.extendLocatorId("Timeline"), MSG.view_group_tabs_timeline(), null); + summaryOverview = new SubTab(summaryTab.extendLocatorId("Overview"), MSG.view_tabs_common_overview(), null); + summaryTimeline = new SubTab(summaryTab.extendLocatorId("Timeline"), MSG.view_tabs_common_timeline(), null); summaryTab.registerSubTabs(summaryOverview, summaryTimeline); tabs.add(summaryTab);
- monitoringTab = new TwoLevelTab(getTabSet().extendLocatorId("Monitoring"), MSG.view_group_tabs_monitoring(), + monitoringTab = new TwoLevelTab(getTabSet().extendLocatorId("Monitoring"), MSG.view_tabs_common_monitoring(), "/images/icons/Monitor_grey_16.png"); - monitorGraphs = new SubTab(monitoringTab.extendLocatorId("Graphs"), MSG.view_group_tabs_graphs(), null); - monitorTables = new SubTab(monitoringTab.extendLocatorId("Tables"), MSG.view_group_tabs_tables(), null); - monitorTraits = new SubTab(monitoringTab.extendLocatorId("Traits"), MSG.view_group_tabs_traits(), null); + monitorGraphs = new SubTab(monitoringTab.extendLocatorId("Graphs"), MSG.view_tabs_common_graphs(), null); + monitorTables = new SubTab(monitoringTab.extendLocatorId("Tables"), MSG.view_tabs_common_tables(), null); + monitorTraits = new SubTab(monitoringTab.extendLocatorId("Traits"), MSG.view_tabs_common_traits(), null);
- monitorSched = new SubTab(monitoringTab.extendLocatorId("Schedules"), MSG.view_group_tabs_schedules(), null); - monitorCallTime = new SubTab(monitoringTab.extendLocatorId("CallTime"), MSG.view_group_tabs_calltime(), null); + monitorSched = new SubTab(monitoringTab.extendLocatorId("Schedules"), MSG.view_tabs_common_schedules(), null); + monitorCallTime = new SubTab(monitoringTab.extendLocatorId("CallTime"), MSG.view_tabs_common_calltime(), null); monitoringTab.registerSubTabs(monitorGraphs, monitorTables, monitorTraits, monitorSched, monitorCallTime); tabs.add(monitoringTab);
- inventoryTab = new TwoLevelTab(getTabSet().extendLocatorId("Inventory"), MSG.view_group_tabs_inventory(), + inventoryTab = new TwoLevelTab(getTabSet().extendLocatorId("Inventory"), MSG.view_tabs_common_inventory(), "/images/icons/Inventory_grey_16.png"); - inventoryMembers = new SubTab(inventoryTab.extendLocatorId("Members"), MSG.view_group_tabs_members(), null); + inventoryMembers = new SubTab(inventoryTab.extendLocatorId("Members"), MSG.view_tabs_common_members(), null); inventoryConn = new SubTab(inventoryTab.extendLocatorId("ConnectionSettings"), MSG - .view_group_tabs_connectionSettings(), null); + .view_tabs_common_connectionSettings(), null); inventoryConnHistory = new SubTab(inventoryTab.extendLocatorId("ConnectionSettingsHistory"), MSG - .view_group_tabs_connectionSettingsHistory(), null); + .view_tabs_common_connectionSettingsHistory(), null); inventoryMembership = new SubTab(inventoryTab.extendLocatorId("Membership"), "Membership", null); // TODO this will merge with Members inventoryTab.registerSubTabs(this.inventoryMembers, this.inventoryConn, this.inventoryConnHistory, this.inventoryMembership); tabs.add(inventoryTab);
- operationsTab = new TwoLevelTab(getTabSet().extendLocatorId("Operations"), MSG.view_group_tabs_operations(), + operationsTab = new TwoLevelTab(getTabSet().extendLocatorId("Operations"), MSG.view_tabs_common_operations(), "/images/icons/Operation_grey_16.png"); - this.opHistory = new SubTab(operationsTab.extendLocatorId("History"), MSG.view_group_tabs_history(), null); - this.opSched = new SubTab(operationsTab.extendLocatorId("Scheduled"), MSG.view_group_tabs_scheduled(), null); + this.opHistory = new SubTab(operationsTab.extendLocatorId("History"), MSG.view_tabs_common_history(), null); + this.opSched = new SubTab(operationsTab.extendLocatorId("Scheduled"), MSG.view_tabs_common_scheduled(), null); operationsTab.registerSubTabs(this.opHistory, this.opSched); tabs.add(operationsTab);
- alertsTab = new TwoLevelTab(getTabSet().extendLocatorId("Alerts"), MSG.view_group_tabs_alerts(), + alertsTab = new TwoLevelTab(getTabSet().extendLocatorId("Alerts"), MSG.view_tabs_common_alerts(), "/images/icons/Alert_grey_16.png"); - this.alertHistory = new SubTab(alertsTab.extendLocatorId("History"), MSG.view_group_tabs_history(), null); - this.alertDef = new SubTab(alertsTab.extendLocatorId("Definitions"), MSG.view_group_tabs_definitions(), null); + this.alertHistory = new SubTab(alertsTab.extendLocatorId("History"), MSG.view_tabs_common_history(), null); + this.alertDef = new SubTab(alertsTab.extendLocatorId("Definitions"), MSG.view_tabs_common_definitions(), null); alertsTab.registerSubTabs(alertHistory, alertDef); tabs.add(alertsTab);
configurationTab = new TwoLevelTab(getTabSet().extendLocatorId("Configuration"), MSG - .view_group_tabs_configuration(), "/images/icons/Configure_grey_16.png"); - this.configCurrent = new SubTab(configurationTab.extendLocatorId("Current"), MSG.view_group_tabs_current(), + .view_tabs_common_configuration(), "/images/icons/Configure_grey_16.png"); + this.configCurrent = new SubTab(configurationTab.extendLocatorId("Current"), MSG.view_tabs_common_current(), null); - this.configHistory = new SubTab(configurationTab.extendLocatorId("History"), MSG.view_group_tabs_history(), + this.configHistory = new SubTab(configurationTab.extendLocatorId("History"), MSG.view_tabs_common_history(), null); configurationTab.registerSubTabs(this.configCurrent, this.configHistory); tabs.add(configurationTab);
- eventsTab = new TwoLevelTab(getTabSet().extendLocatorId("Events"), MSG.view_group_tabs_events(), + eventsTab = new TwoLevelTab(getTabSet().extendLocatorId("Events"), MSG.view_tabs_common_events(), "/images/icons/Events_grey_16.png"); - this.eventHistory = new SubTab(eventsTab.extendLocatorId("History"), MSG.view_group_tabs_history(), null); + this.eventHistory = new SubTab(eventsTab.extendLocatorId("History"), MSG.view_tabs_common_history(), null); eventsTab.registerSubTabs(eventHistory); tabs.add(eventsTab);
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 438a46e..c99e1ca 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 @@ -96,12 +96,12 @@ public class ResourceGroupTitleBar extends LocatableHLayout { new AsyncCallback<Void>() { public void onFailure(Throwable caught) { CoreGUI.getErrorHandler().handleError( - MSG.view_group_titleBar_updateTagsFailure(group.getName()), caught); + MSG.view_titleBar_common_updateTagsFailure(group.getName()), caught); }
public void onSuccess(Void result) { CoreGUI.getMessageCenter().notify( - new Message(MSG.view_group_titleBar_updateTagsSuccessful(group.getName()), + new Message(MSG.view_titleBar_common_updateTagsSuccessful(group.getName()), Message.Severity.Info)); // update what is essentially our local cache group.setTags(tags); @@ -128,7 +128,7 @@ public class ResourceGroupTitleBar extends LocatableHLayout { GWTServiceLookup.getResourceGroupService().findResourceGroupsByCriteria(criteria, new AsyncCallback<PageList<ResourceGroup>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_group_titleBar_loadTagsFailure(group.getName()), + CoreGUI.getErrorHandler().handleError(MSG.view_titleBar_common_loadTagsFailure(group.getName()), caught); }
@@ -167,9 +167,9 @@ public class ResourceGroupTitleBar extends LocatableHLayout { private void updateFavoriteButton() { this.favoriteButton.setSrc(favorite ? FAV_ICON : NOT_FAV_ICON); if (favorite) { - this.favoriteButton.setTooltip(MSG.view_group_titleBar_clickToRemoveFav()); + this.favoriteButton.setTooltip(MSG.view_titleBar_common_clickToRemoveFav()); } else { - this.favoriteButton.setTooltip(MSG.view_group_titleBar_clickToAddFav()); + this.favoriteButton.setTooltip(MSG.view_titleBar_common_clickToAddFav()); } }
@@ -188,9 +188,9 @@ public class ResourceGroupTitleBar extends LocatableHLayout { public void onSuccess(Subject subject) { String m; if (favorite) { - m = MSG.view_group_titleBar_addedFav(ResourceGroupTitleBar.this.group.getName()); + m = MSG.view_titleBar_common_addedFav(ResourceGroupTitleBar.this.group.getName()); } else { - m = MSG.view_group_titleBar_removedFav(ResourceGroupTitleBar.this.group.getName()); + m = MSG.view_titleBar_common_removedFav(ResourceGroupTitleBar.this.group.getName()); } CoreGUI.getMessageCenter().notify(new Message(m, Message.Severity.Info)); updateFavoriteButton(); @@ -199,9 +199,9 @@ public class ResourceGroupTitleBar extends LocatableHLayout { public void onFailure(Throwable throwable) { String m; if (favorite) { - m = MSG.view_group_titleBar_addedFavFailure(ResourceGroupTitleBar.this.group.getName()); + m = MSG.view_titleBar_common_addedFavFailure(ResourceGroupTitleBar.this.group.getName()); } else { - m = MSG.view_group_titleBar_removedFavFailure(ResourceGroupTitleBar.this.group.getName()); + m = MSG.view_titleBar_common_removedFavFailure(ResourceGroupTitleBar.this.group.getName()); } CoreGUI.getMessageCenter().notify(new Message(m, Message.Severity.Error)); // Revert back to our original favorite status, since the server update failed. diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index b548590..5541161 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -651,45 +651,6 @@ view_dynagroup_loadDefinitionMissing=There is no group definition with the ID of view_dynagroup_permUnknown=Could not determine if you have the proper permissions - access is denied~ view_dynagroup_permDenied=You do not have permission to view group definitions~ view_dynagroup_definitions=DynaGroup Definitions~ -view_group_titleBar_updateTagsSuccessful=The tags for the resource group [{0}] have been updated~ -view_group_titleBar_updateTagsFailure=Failed to update the tags for resource group [{0}]~ -view_group_titleBar_loadTagsFailure=Failed to load the tags for resource group [{0}]~ -view_group_titleBar_clickToRemoveFav=Click to remove this group as a favorite~ -view_group_titleBar_clickToAddFav=Click to add this group as a favorite~ -view_group_titleBar_removedFav=You have removed group [{0}] as one of your favorites~ -view_group_titleBar_addedFav=You have added group [{0}] as a favorite~ -view_group_titleBar_removedFavFailure=Failed to remove group [{0}] as one of your favorites~ -view_group_titleBar_addedFavFailure=Failed to add group [{0}] as a favorite~ -view_group_contextMenu_pluginConfiguration=Plugin Configuration~ -view_group_contextMenu_resourceConfiguration=Resource Configuration~ -view_group_contextMenu_editResourceConfiguration=Edit [{0}] Resource Configuration~ -view_group_contextMenu_operations=Operations~ -view_group_contextMenu_measurements=Measurements~ -view_group_contextMenu_addChartToDashboard=Add chart to dashboard [{0}]~ -view_group_contextMenu_chart=Chart~ -view_group_contextMenu_saveChartToDashboardSuccessful=You have saved dashboard [{0}]~ -view_group_contextMenu_saveChartToDashboardFailure=Failed to save the dashboard~ -view_group_tabs_summary=Summary~ -view_group_tabs_overview=Overview~ -view_group_tabs_timeline=Timeline~ -view_group_tabs_monitoring=Monitoring~ -view_group_tabs_graphs=Graphs~ -view_group_tabs_tables=Tables~ -view_group_tabs_traits=Traits~ -view_group_tabs_schedules=Schedules~ -view_group_tabs_calltime=Calltime~ -view_group_tabs_inventory=Inventory~ -view_group_tabs_members=Members~ -view_group_tabs_connectionSettings=Connection Settings~ -view_group_tabs_connectionSettingsHistory=Connection Settings History~ -view_group_tabs_operations=Operations~ -view_group_tabs_history=History~ -view_group_tabs_scheduled=Scheduled~ -view_group_tabs_alerts=Alerts~ -view_group_tabs_definitions=Definitions~ -view_group_tabs_current=Current~ -view_group_tabs_events=Events~ -view_group_tabs_configuration=Configuration~ view_group_membership_saveFailure=Failed to update membership of group [{0}]~ view_group_membership_saveSuccessful=You have updated the membership of group [{0}]~ view_group_resConfig_edit_saveTooltip=Update the configurations of all group members~
commit 5f319735a944cf7c9e8b078af2705a75d7116d15 Author: Joseph Marques joseph@redhat.com Date: Wed Nov 17 17:09:11 2010 -0500
i18n for org.rhq.enterprise.gui.coregui.client.inventory.resource.detail
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/NewResourceTreeDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/NewResourceTreeDataSource.java index ddda348..db193e1 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/NewResourceTreeDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/NewResourceTreeDataSource.java @@ -28,6 +28,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map;
+import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.data.DSRequest; import com.smartgwt.client.data.DSResponse; @@ -48,6 +49,7 @@ import org.rhq.core.domain.resource.ResourceSubCategory; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.Messages; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGWTServiceAsync; import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; @@ -60,6 +62,8 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTyp @Deprecated public class NewResourceTreeDataSource extends DataSource {
+ Messages MSG = CoreGUI.getMessages(); + int rootId;
private ResourceGWTServiceAsync resourceService = GWTServiceLookup.getResourceService(); @@ -69,22 +73,23 @@ public class NewResourceTreeDataSource extends DataSource { setDataProtocol(DSProtocol.CLIENTCUSTOM); setDataFormat(DSDataFormat.CUSTOM);
- this.rootId = rootId;
- DataSourceField idDataField = new DataSourceTextField("id", "ID"); + DataSourceField idDataField = new DataSourceTextField("id", MSG.common_title_id()); idDataField.setPrimaryKey(true);
- DataSourceTextField nameDataField = new DataSourceTextField("name", "Name"); + DataSourceTextField nameDataField = new DataSourceTextField("name", MSG.common_title_name()); nameDataField.setCanEdit(false);
- DataSourceTextField descriptionDataField = new DataSourceTextField("description", "Description"); + DataSourceTextField descriptionDataField = new DataSourceTextField("description", MSG + .common_title_description()); descriptionDataField.setCanEdit(false);
- DataSourceImageField availabilityDataField = new DataSourceImageField("currentAvailability", "Availability"); + DataSourceImageField availabilityDataField = new DataSourceImageField("currentAvailability", MSG + .common_title_availability()); descriptionDataField.setCanEdit(false);
- DataSourceTextField parentIdField = new DataSourceTextField("parentId", "Parent ID"); + DataSourceTextField parentIdField = new DataSourceTextField("parentId", MSG.common_title_id_parent()); parentIdField.setForeignKey("id"); // parentIdField.setRootValue(rootId);
@@ -107,27 +112,26 @@ public class NewResourceTreeDataSource extends DataSource { // Asume success response.setStatus(0); switch (request.getOperationType()) { - case ADD: - //executeAdd(request, response); - break; - case FETCH: - executeFetch(requestId, request, response); - break; - case REMOVE: - //executeRemove(lstRec); - break; - case UPDATE: - //executeAdd(lstRec, false); - break; - - default: - break; + case ADD: + //executeAdd(request, response); + break; + case FETCH: + executeFetch(requestId, request, response); + break; + case REMOVE: + //executeRemove(lstRec); + break; + case UPDATE: + //executeAdd(lstRec, false); + break; + + default: + break; }
return request.getData(); }
- public void executeFetch(final String requestId, final DSRequest request, final DSResponse response) { final long start = System.currentTimeMillis();
@@ -136,12 +140,12 @@ public class NewResourceTreeDataSource extends DataSource { ResourceCriteria criteria = new ResourceCriteria();
if (p == null) { - com.allen_sauer.gwt.log.client.Log.info("DataSourceTree: Loading initial data"); + Log.info("DataSourceTree: Loading initial data");
criteria.addFilterId(rootId);
} else { - com.allen_sauer.gwt.log.client.Log.info("DataSourceTree: Loading " + p); + Log.info("DataSourceTree: Loading " + p);
criteria.addFilterParentResourceId(Integer.parseInt(p)); } @@ -151,7 +155,7 @@ public class NewResourceTreeDataSource extends DataSource {
resourceService.findResourcesByCriteria(criteria, new AsyncCallback<PageList<Resource>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to load resource data for tree", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_tree_common_loadFailed_generic(), caught); response.setStatus(RPCResponse.STATUS_FAILURE); processResponse(requestId, response); } @@ -164,15 +168,17 @@ public class NewResourceTreeDataSource extends DataSource {
private void processIncomingData(List<Resource> result, final DSResponse response, final String requestId) {
- ResourceTypeRepository.Cache.getInstance().loadResourceTypes(result, - EnumSet.of(ResourceTypeRepository.MetadataType.operations, ResourceTypeRepository.MetadataType.children, ResourceTypeRepository.MetadataType.subCategory), - new ResourceTypeRepository.ResourceTypeLoadedCallback() { - public void onResourceTypeLoaded(List<Resource> result) { -// response.setData(buildNodes(result)); - processResponse(requestId, response); + ResourceTypeRepository.Cache.getInstance().loadResourceTypes( + result, + EnumSet.of(ResourceTypeRepository.MetadataType.operations, ResourceTypeRepository.MetadataType.children, + ResourceTypeRepository.MetadataType.subCategory), + new ResourceTypeRepository.ResourceTypeLoadedCallback() { + public void onResourceTypeLoaded(List<Resource> result) { + // response.setData(buildNodes(result)); + processResponse(requestId, response);
- } - }); + } + }); }
/** @@ -196,20 +202,19 @@ public class NewResourceTreeDataSource extends DataSource { }
return rootNode; -// return introduceTypeFolders(records); + // return introduceTypeFolders(records); }
private static void buildTree(TreeNode parent, Resource parentResource, Map<Integer, Resource> resources) {
HashMap<ResourceType, TypeTreeNode> types = new HashMap<ResourceType, TypeTreeNode>();
- ArrayList<ResourceTreeNode> childNodes = new ArrayList<ResourceTreeNode>();
for (Resource res : resources.values()) { if (res.getParentResource() != null && res.getParentResource().getId() == parentResource.getId()) {
-// parent.setChildren(); + // parent.setChildren();
ResourceTreeNode child = new ResourceTreeNode(res);
@@ -224,20 +229,16 @@ public class NewResourceTreeDataSource extends DataSource {
}
- - - private static TreeNode[] introduceTypeFolders(ResourceTreeNode[] nodes) { ArrayList<TreeNode> built = new ArrayList<TreeNode>(); HashMap<ResourceSubCategory, CategoryTreeNode> categories = new HashMap<ResourceSubCategory, CategoryTreeNode>(); HashMap<ResourceType, TypeTreeNode> types = new HashMap<ResourceType, TypeTreeNode>();
- for (ResourceTreeNode node : nodes) { built.add(node);
if (!types.containsKey(node.getResourceType()) - && node.getResourceType().getCategory() != ResourceCategory.PLATFORM) { + && node.getResourceType().getCategory() != ResourceCategory.PLATFORM) {
String parentResourceId = String.valueOf(node.getResource().getParentResource().getId());
@@ -296,7 +297,6 @@ public class NewResourceTreeDataSource extends DataSource { } }
- public static class TypeTreeNode extends TreeNode {
private TypeTreeNode(String parentId, String parentResourceId, String type) { @@ -320,28 +320,27 @@ public class NewResourceTreeDataSource extends DataSource {
String id = String.valueOf(resource.getId()); String parentId = resource.getParentResource() == null ? null - : (resource.getParentResource().getId() + "_" + resource.getResourceType().getName()); + : (resource.getParentResource().getId() + "_" + resource.getResourceType().getName());
// com.allen_sauer.gwt.log.client.Log.info(id + " / " + parentId);
setID(id); setParentID(parentId);
- setAttribute("id", id); setAttribute("parentId", parentId);
// setAttribute("parentKey", resource.getParentResource() == null ? 0 : (resource.getParentResource().getId() + resource.getResourceType().getName()));
setAttribute("name", resource.getName()); -// setAttribute("description", resource.getDescription()); + // setAttribute("description", resource.getDescription()); setAttribute( - "currentAvailability", - resource.getCurrentAvailability().getAvailabilityType() == AvailabilityType.UP ? "/images/icons/availability_green_16.png" - : "/images/icons/availability_red_16.png"); + "currentAvailability", + resource.getCurrentAvailability().getAvailabilityType() == AvailabilityType.UP ? "/images/icons/availability_green_16.png" + : "/images/icons/availability_red_16.png");
setIsFolder((resource.getResourceType().getChildResourceTypes() != null && !resource.getResourceType() - .getChildResourceTypes().isEmpty())); + .getChildResourceTypes().isEmpty())); }
public Resource getResource() { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/NewResourceTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/NewResourceTreeView.java index 6fef545..9ce25ab 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/NewResourceTreeView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/NewResourceTreeView.java @@ -23,6 +23,7 @@ import java.util.EnumSet; import java.util.HashMap; import java.util.List;
+import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.user.client.History; import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.types.SelectionStyle; @@ -127,7 +128,7 @@ public class NewResourceTreeView extends LocatableVLayout { if (treeGrid.getSelectedRecord() instanceof ResourceTreeDatasource.ResourceTreeNode) { ResourceTreeDatasource.ResourceTreeNode node = (ResourceTreeDatasource.ResourceTreeNode) treeGrid .getSelectedRecord(); - com.allen_sauer.gwt.log.client.Log.info("Resource selected in tree: " + node.getResource()); + Log.info("Resource selected in tree: " + node.getResource());
String newToken = "Resource/" + node.getResource().getId(); String currentToken = History.getToken(); @@ -187,16 +188,16 @@ public class NewResourceTreeView extends LocatableVLayout { private void buildResourceContextMenu(final Resource resource, final ResourceType resourceType) { contextMenu.setItems(new MenuItem(resource.getName()));
- contextMenu.addItem(new MenuItem("Type: " + resourceType.getName())); + contextMenu.addItem(new MenuItem(MSG.view_tree_common_contextMenu_type_name_label(resourceType.getName())));
- MenuItem editPluginConfiguration = new MenuItem("Plugin Configuration"); + MenuItem editPluginConfiguration = new MenuItem(MSG.view_tree_common_contextMenu_pluginConfiguration()); editPluginConfiguration.addClickHandler(new ClickHandler() { public void onClick(MenuItemClickEvent event) { int resourceId = resource.getId(); int resourceTypeId = resourceType.getId();
Window configEditor = new Window(); - configEditor.setTitle("Edit " + resource.getName() + " plugin configuration"); + configEditor.setTitle(MSG.view_tree_common_contextMenu_editPluginConfiguration(resource.getName())); configEditor.setWidth(800); configEditor.setHeight(800); configEditor.setIsModal(true); @@ -212,14 +213,14 @@ public class NewResourceTreeView extends LocatableVLayout { editPluginConfiguration.setEnabled(resourceType.getPluginConfigurationDefinition() != null); contextMenu.addItem(editPluginConfiguration);
- MenuItem editResourceConfiguration = new MenuItem("Resource Configuration"); + MenuItem editResourceConfiguration = new MenuItem(MSG.view_tree_common_contextMenu_resourceConfiguration()); editResourceConfiguration.addClickHandler(new ClickHandler() { public void onClick(MenuItemClickEvent event) { int resourceId = resource.getId(); int resourceTypeId = resourceType.getId();
final Window configEditor = new Window(); - configEditor.setTitle("Edit " + resource.getName() + " resource configuration"); + configEditor.setTitle(MSG.view_tree_common_contextMenu_editResourceConfiguration(resource.getName())); configEditor.setWidth(800); configEditor.setHeight(800); configEditor.setIsModal(true); @@ -244,7 +245,7 @@ public class NewResourceTreeView extends LocatableVLayout { contextMenu.addItem(new MenuItemSeparator());
// Operations Menu - MenuItem operations = new MenuItem("Operations"); + MenuItem operations = new MenuItem(MSG.view_tree_common_contextMenu_operations()); Menu opSubMenu = new Menu(); for (final OperationDefinition operationDefinition : resourceType.getOperationDefinitions()) { MenuItem operationItem = new MenuItem(operationDefinition.getDisplayName()); @@ -263,7 +264,7 @@ public class NewResourceTreeView extends LocatableVLayout { contextMenu.addItem(buildMetricsMenu(resourceType));
// Create Menu - MenuItem createChildMenu = new MenuItem("Create Child"); + MenuItem createChildMenu = new MenuItem(MSG.common_button_create_child()); Menu createChildSubMenu = new Menu(); for (final ResourceType childType : resourceType.getChildResourceTypes()) { if (childType.isCreatable()) { @@ -282,7 +283,7 @@ public class NewResourceTreeView extends LocatableVLayout { contextMenu.addItem(createChildMenu);
// Manually Add Menu - MenuItem importChildMenu = new MenuItem("Import"); + MenuItem importChildMenu = new MenuItem(MSG.common_button_import()); Menu importChildSubMenu = new Menu(); for (ResourceType childType : resourceType.getChildResourceTypes()) { if (childType.isSupportsManualAdd()) { @@ -306,7 +307,8 @@ public class NewResourceTreeView extends LocatableVLayout { criteria.fetchParentResourceTypes(true); rts.findResourceTypesByCriteria(criteria, new AsyncCallback<PageList<ResourceType>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to load platform manual add children", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_tree_common_contextMenu_loadFailed_manualAddChildren(), + caught); }
public void onSuccess(PageList<ResourceType> result) { @@ -326,7 +328,7 @@ public class NewResourceTreeView extends LocatableVLayout {
GWTServiceLookup.getDashboardService().findDashboardsForSubject(new AsyncCallback<List<Dashboard>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to load user dashboards", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_tree_common_contextMenu_loadFailed_dashboard(), caught); }
public void onSuccess(List<Dashboard> result) { @@ -339,7 +341,8 @@ public class NewResourceTreeView extends LocatableVLayout { defItem.setSubmenu(defSubItem);
for (final Dashboard d : result) { - MenuItem addToDBItem = new MenuItem("Add chart to Dashboard: " + d.getName()); + MenuItem addToDBItem = new MenuItem(MSG.view_tree_common_contextMenu_addChartToDashboard(d + .getName())); defSubItem.addItem(addToDBItem);
addToDBItem.addClickHandler(new ClickHandler() { @@ -357,14 +360,15 @@ public class NewResourceTreeView extends LocatableVLayout { GWTServiceLookup.getDashboardService().storeDashboard(d, new AsyncCallback<Dashboard>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to save dashboard to server", - caught); + CoreGUI.getErrorHandler().handleError( + MSG.view_tree_common_contextMenu_saveChartToDashboardFailure(), caught); }
public void onSuccess(Dashboard result) { CoreGUI.getMessageCenter().notify( - new Message("Saved dashboard " + result.getName() + " to server", - Message.Severity.Info)); + new Message(MSG + .view_tree_common_contextMenu_saveChartToDashboardSuccessful(result + .getName()), Message.Severity.Info)); } });
@@ -431,7 +435,7 @@ public class NewResourceTreeView extends LocatableVLayout {
resourceService.getPlatformForResource(selectedResource.getId(), new AsyncCallback<Resource>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("adasdf", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_tree_common_loadFailed_root(), caught); }
public void onSuccess(Resource result) { @@ -443,7 +447,8 @@ public class NewResourceTreeView extends LocatableVLayout {
resourceService.findResourcesByCriteria(criteria, new AsyncCallback<PageList<Resource>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("lkasldf", caught); + CoreGUI.getErrorHandler() + .handleError(MSG.view_tree_common_loadFailed_descendants(), caught); }
public void onSuccess(PageList<Resource> result) { 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 356aa5b..29647f1 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 @@ -121,70 +121,80 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo protected List<TwoLevelTab> createTabs() { List<TwoLevelTab> tabs = new ArrayList<TwoLevelTab>();
- summaryTab = new TwoLevelTab(getTabSet().extendLocatorId("Summary"), "Summary", + summaryTab = new TwoLevelTab(getTabSet().extendLocatorId("Summary"), MSG.view_tabs_common_summary(), "/images/icons/Service_up_16.png"); - summaryOverview = new SubTab(summaryTab.extendLocatorId("Overview"), "Overview", null); - summaryDashboard = new SubTab(summaryTab.extendLocatorId("Dashboard"), "Dashboard", null); - summaryTimeline = new SubTab(summaryTab.extendLocatorId("Timeline"), "Timeline", null); + summaryOverview = new SubTab(summaryTab.extendLocatorId("Overview"), MSG.view_tabs_common_overview(), null); + summaryDashboard = new SubTab(summaryTab.extendLocatorId("Dashboard"), MSG.view_tabs_common_dashboard(), null); + summaryTimeline = new SubTab(summaryTab.extendLocatorId("Timeline"), MSG.view_tabs_common_timeline(), null); summaryTab.registerSubTabs(summaryOverview, summaryDashboard, summaryTimeline); tabs.add(summaryTab);
- monitoringTab = new TwoLevelTab(getTabSet().extendLocatorId("Monitoring"), "Monitoring", + monitoringTab = new TwoLevelTab(getTabSet().extendLocatorId("Monitoring"), MSG.view_tabs_common_monitoring(), "/images/icons/Monitor_grey_16.png"); - monitorGraphs = new SubTab(monitoringTab.extendLocatorId("Graphs"), "Graphs", null); - monitorTables = new SubTab(monitoringTab.extendLocatorId("Tables"), "Tables", null); - monitorTraits = new SubTab(monitoringTab.extendLocatorId("Traits"), "Traits", null); - monitorAvail = new SubTab(monitoringTab.extendLocatorId("Availability"), "Availability", null); - monitorSched = new SubTab(monitoringTab.extendLocatorId("Schedules"), "Schedules", null); - monitorCallTime = new SubTab(monitoringTab.extendLocatorId("CallTime"), "Call Time", null); + monitorGraphs = new SubTab(monitoringTab.extendLocatorId("Graphs"), MSG.view_tabs_common_graphs(), null); + monitorTables = new SubTab(monitoringTab.extendLocatorId("Tables"), MSG.view_tabs_common_tables(), null); + monitorTraits = new SubTab(monitoringTab.extendLocatorId("Traits"), MSG.view_tabs_common_traits(), null); + monitorAvail = new SubTab(monitoringTab.extendLocatorId("Availability"), MSG.view_tabs_common_availability(), + null); + monitorSched = new SubTab(monitoringTab.extendLocatorId("Schedules"), MSG.view_tabs_common_schedules(), null); + monitorCallTime = new SubTab(monitoringTab.extendLocatorId("CallTime"), MSG.view_tabs_common_calltime(), null); monitoringTab.registerSubTabs(monitorGraphs, monitorTables, monitorTraits, monitorAvail, monitorSched, monitorCallTime); tabs.add(monitoringTab);
- inventoryTab = new TwoLevelTab(getTabSet().extendLocatorId("Inventory"), "Inventory", + inventoryTab = new TwoLevelTab(getTabSet().extendLocatorId("Inventory"), MSG.view_tabs_common_inventory(), "/images/icons/Inventory_grey_16.png"); - inventoryChildren = new SubTab(inventoryTab.extendLocatorId("Children"), "Child Resources", null); - inventoryChildHistory = new SubTab(inventoryTab.extendLocatorId("ChildHist"), "Child History", null); - inventoryConn = new SubTab(inventoryTab.extendLocatorId("ConnectionSettings"), "Connection Settings", null); - inventoryConnHistory = new SubTab(inventoryTab.extendLocatorId("ConnSetHist"), "Connection Settings History", - null); - inventoryGroups = new SubTab(inventoryTab.extendLocatorId("Groups"), "Groups", null); - inventoryGroupMembership = new SubTab(inventoryTab.extendLocatorId("GroupMembership"), "Group Membership", null); + inventoryChildren = new SubTab(inventoryTab.extendLocatorId("Children"), + MSG.view_tabs_common_child_resources(), null); + inventoryChildHistory = new SubTab(inventoryTab.extendLocatorId("ChildHist"), MSG + .view_tabs_common_child_history(), null); + inventoryConn = new SubTab(inventoryTab.extendLocatorId("ConnectionSettings"), MSG + .view_tabs_common_connectionSettings(), null); + inventoryConnHistory = new SubTab(inventoryTab.extendLocatorId("ConnSetHist"), MSG + .view_tabs_common_connectionSettingsHistory(), null); + inventoryGroups = new SubTab(inventoryTab.extendLocatorId("Groups"), MSG.view_tabs_common_groups(), null); + inventoryGroupMembership = new SubTab(inventoryTab.extendLocatorId("GroupMembership"), MSG + .view_tabs_common_group_membership(), null); inventoryTab.registerSubTabs(this.inventoryChildren, this.inventoryChildHistory, this.inventoryConn, this.inventoryConnHistory, this.inventoryGroups, this.inventoryGroupMembership); tabs.add(inventoryTab);
- operationsTab = new TwoLevelTab(getTabSet().extendLocatorId("Operations"), "Operations", + operationsTab = new TwoLevelTab(getTabSet().extendLocatorId("Operations"), MSG.view_tabs_common_operations(), "/images/icons/Operation_grey_16.png"); - this.opHistory = new SubTab(operationsTab.extendLocatorId("History"), "History", null); - this.opSched = new SubTab(operationsTab.extendLocatorId("Scheduled"), "Scheduled", null); + this.opHistory = new SubTab(operationsTab.extendLocatorId("History"), MSG.view_tabs_common_history(), null); + this.opSched = new SubTab(operationsTab.extendLocatorId("Scheduled"), MSG.view_tabs_common_scheduled(), null); operationsTab.registerSubTabs(this.opHistory, this.opSched); tabs.add(operationsTab);
- alertsTab = new TwoLevelTab(getTabSet().extendLocatorId("Alerts"), "Alerts", "/images/icons/Alert_grey_16.png"); - this.alertHistory = new SubTab(alertsTab.extendLocatorId("History"), "History", null); - this.alertDef = new SubTab(alertsTab.extendLocatorId("Definitions"), "Definitions", null); + alertsTab = new TwoLevelTab(getTabSet().extendLocatorId("Alerts"), MSG.view_tabs_common_alerts(), + "/images/icons/Alert_grey_16.png"); + this.alertHistory = new SubTab(alertsTab.extendLocatorId("History"), MSG.view_tabs_common_history(), null); + this.alertDef = new SubTab(alertsTab.extendLocatorId("Definitions"), MSG.view_tabs_common_definitions(), null); alertsTab.registerSubTabs(alertHistory, alertDef); tabs.add(alertsTab);
- configurationTab = new TwoLevelTab(getTabSet().extendLocatorId("Configuration"), "Configuration", - "/images/icons/Configure_grey_16.png"); - this.configCurrent = new SubTab(configurationTab.extendLocatorId("Current"), "Current", null); - this.configHistory = new SubTab(configurationTab.extendLocatorId("History"), "History", null); + configurationTab = new TwoLevelTab(getTabSet().extendLocatorId("Configuration"), MSG + .view_tabs_common_configuration(), "/images/icons/Configure_grey_16.png"); + this.configCurrent = new SubTab(configurationTab.extendLocatorId("Current"), MSG.view_tabs_common_current(), + null); + this.configHistory = new SubTab(configurationTab.extendLocatorId("History"), MSG.view_tabs_common_history(), + null); configurationTab.registerSubTabs(this.configCurrent, this.configHistory); tabs.add(configurationTab);
- eventsTab = new TwoLevelTab(getTabSet().extendLocatorId("Events"), "Events", "/images/icons/Events_grey_16.png"); - this.eventHistory = new SubTab(eventsTab.extendLocatorId("History"), "History", null); + eventsTab = new TwoLevelTab(getTabSet().extendLocatorId("Events"), MSG.view_tabs_common_events(), + "/images/icons/Events_grey_16.png"); + this.eventHistory = new SubTab(eventsTab.extendLocatorId("History"), MSG.view_tabs_common_history(), null); eventsTab.registerSubTabs(eventHistory); tabs.add(eventsTab);
- contentTab = new TwoLevelTab(getTabSet().extendLocatorId("Content"), "Content", + contentTab = new TwoLevelTab(getTabSet().extendLocatorId("Content"), MSG.view_tabs_common_content(), "/images/icons/Content_grey_16.png"); - this.contentDeployed = new SubTab(contentTab.extendLocatorId("Deployed"), "Deployed", null); - this.contentNew = new SubTab(contentTab.extendLocatorId("New"), "New", null); - this.contentSubscrip = new SubTab(contentTab.extendLocatorId("Subscriptions"), "Subscriptions", null); - this.contentHistory = new SubTab(contentTab.extendLocatorId("History"), "History", null); + this.contentDeployed = new SubTab(contentTab.extendLocatorId("Deployed"), MSG.view_tabs_common_deployed(), null); + this.contentNew = new SubTab(contentTab.extendLocatorId("New"), MSG.view_tabs_common_new(), null); + this.contentSubscrip = new SubTab(contentTab.extendLocatorId("Subscriptions"), MSG + .view_tabs_common_subscriptions(), null); + this.contentHistory = new SubTab(contentTab.extendLocatorId("History"), MSG.view_tabs_common_history(), null); contentTab.registerSubTabs(contentDeployed, contentNew, contentSubscrip, contentHistory); tabs.add(contentTab);
@@ -357,7 +367,7 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo new AsyncCallback<PageList<ResourceComposite>>() { public void onFailure(Throwable caught) { CoreGUI.getMessageCenter().notify( - new Message("Resource with id [" + resourceId + "] does not exist or is not accessible.", + new Message(MSG.view_inventory_resource_loadFailed(String.valueOf(resourceId)), Message.Severity.Warning));
CoreGUI.goToView(InventoryView.VIEW_ID); @@ -366,7 +376,7 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo public void onSuccess(PageList<ResourceComposite> result) { if (result.isEmpty()) { //noinspection ThrowableInstanceNeverThrown - onFailure(new Exception("Resource with id [" + resourceId + "] does not exist.")); + onFailure(new Exception(MSG.view_inventory_resource_loadFailed(String.valueOf(resourceId)))); } else { final ResourceComposite resourceComposite = result.get(0); // First load the user's permissions for the Resource. 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 bc1e0b7..c025e46 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 @@ -100,7 +100,8 @@ public class ResourceTitleBar extends LocatableHLayout {
public void onSuccess(Void result) { CoreGUI.getMessageCenter().notify( - new Message("Resource tags updated", Message.Severity.Info)); + new Message(MSG.view_titleBar_common_updateTagsSuccessful(resource.getName()), + Message.Severity.Info)); // update what is essentially our local cache resource.setTags(tags); } @@ -124,7 +125,8 @@ public class ResourceTitleBar extends LocatableHLayout { GWTServiceLookup.getResourceService().findResourcesByCriteria(criteria, new AsyncCallback<PageList<Resource>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Could not load resource tags", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_titleBar_common_loadTagsFailure(resource.getName()), + caught); }
public void onSuccess(PageList<Resource> result) { @@ -164,7 +166,11 @@ public class ResourceTitleBar extends LocatableHLayout {
private void updateFavoriteButton() { this.favoriteButton.setSrc(favorite ? FAV_ICON : NOT_FAV_ICON); - this.favoriteButton.setTooltip("Click to " + (favorite ? "remove" : "add") + " this Resource as a favorite."); + if (favorite) { + this.favoriteButton.setTooltip(MSG.view_titleBar_common_clickToRemoveFav()); + } else { + this.favoriteButton.setTooltip(MSG.view_titleBar_common_clickToAddFav()); + } }
private Set<Integer> toggleFavoriteLocally() { @@ -181,16 +187,25 @@ public class ResourceTitleBar extends LocatableHLayout {
public class UpdateFavoritesCallback implements AsyncCallback<Subject> { public void onSuccess(Subject subject) { - CoreGUI.getMessageCenter().notify( - new Message((favorite ? "Added " : "Removed ") + " Resource " - + ResourceTitleBar.this.resource.getName() + " as a favorite.", Message.Severity.Info)); + String msg = null; + if (favorite) { + msg = MSG.view_titleBar_common_addedFav(resource.getName()); + } else { + msg = MSG.view_titleBar_common_removedFav(resource.getName()); + } + CoreGUI.getMessageCenter().notify(new Message(msg, Message.Severity.Info)); updateFavoriteButton(); }
public void onFailure(Throwable throwable) { - CoreGUI.getMessageCenter().notify( - new Message("Failed to " + (favorite ? "add " : "remove ") + " Resource " - + ResourceTitleBar.this.resource.getName() + " as a favorite.", Message.Severity.Error)); + String msg = null; + if (favorite) { + msg = MSG.view_titleBar_common_addedFavFailure(resource.getName()); + } else { + msg = MSG.view_titleBar_common_removedFavFailure(resource.getName()); + } + CoreGUI.getMessageCenter().notify(new Message(msg, Message.Severity.Info)); + // Revert back to our original favorite status, since the server update failed. toggleFavoriteLocally(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java index 43d6b8c..2da1ce5 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java @@ -24,6 +24,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set;
+import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.data.DSRequest; import com.smartgwt.client.data.DSResponse; @@ -41,6 +42,7 @@ import org.rhq.core.domain.resource.ResourceSubCategory; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.Messages; import org.rhq.enterprise.gui.coregui.client.components.tree.EnhancedTreeNode; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGWTServiceAsync; @@ -55,6 +57,9 @@ import org.rhq.enterprise.gui.coregui.client.util.StringUtility; * @author Ian Springer */ public class ResourceTreeDatasource extends DataSource { + + Messages MSG = CoreGUI.getMessages(); + private List<Resource> initialData; private List<Resource> lockedData;
@@ -68,16 +73,17 @@ public class ResourceTreeDatasource extends DataSource { this.initialData = initialData; this.lockedData = (null != lockedData) ? lockedData : new ArrayList<Resource>();
- DataSourceField idDataField = new DataSourceTextField("id", "ID"); + DataSourceField idDataField = new DataSourceTextField("id", MSG.common_title_id()); idDataField.setPrimaryKey(true);
- DataSourceTextField nameDataField = new DataSourceTextField("name", "Name"); + DataSourceTextField nameDataField = new DataSourceTextField("name", MSG.common_title_name()); nameDataField.setCanEdit(false);
- DataSourceTextField descriptionDataField = new DataSourceTextField("description", "Description"); + DataSourceTextField descriptionDataField = new DataSourceTextField("description", MSG + .common_title_description()); descriptionDataField.setCanEdit(false);
- DataSourceTextField parentIdField = new DataSourceTextField("parentId", "Parent ID"); + DataSourceTextField parentIdField = new DataSourceTextField("parentId", MSG.common_title_id_parent()); parentIdField.setForeignKey("id");
this.setDropExtraFields(false); @@ -115,7 +121,7 @@ public class ResourceTreeDatasource extends DataSource { public void executeFetch(final String requestId, final DSRequest request, final DSResponse response) { //final long start = System.currentTimeMillis();
- String parentResourceId = request.getCriteria().getAttribute("parentId"); + final String parentResourceId = request.getCriteria().getAttribute("parentId"); //com.allen_sauer.gwt.log.client.Log.info("All attributes: " + Arrays.toString(request.getCriteria().getAttributes()));
ResourceCriteria criteria = new ResourceCriteria(); @@ -124,7 +130,7 @@ public class ResourceTreeDatasource extends DataSource { // If this gets called more than once it's a problem. Don't load initial data more than once. // Subsequent fetches should be due to parent node tree expansion if (null != this.initialData) { - com.allen_sauer.gwt.log.client.Log.debug("ResourceTreeDatasource: Loading initial data..."); + Log.debug("ResourceTreeDatasource: Loading initial data...");
processIncomingData(this.initialData, response, requestId); response.setStatus(DSResponse.STATUS_SUCCESS); @@ -135,14 +141,13 @@ public class ResourceTreeDatasource extends DataSource { }
} else { - com.allen_sauer.gwt.log.client.Log.debug("ResourceTreeDatasource: Loading Resource [" + parentResourceId - + "]..."); + Log.debug("ResourceTreeDatasource: Loading Resource [" + parentResourceId + "]...");
criteria.addFilterParentResourceId(Integer.parseInt(parentResourceId));
resourceService.findResourcesByCriteria(criteria, new AsyncCallback<PageList<Resource>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to load resource data for tree", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_tree_common_loadFailed_children(), caught); response.setStatus(RPCResponse.STATUS_FAILURE); processResponse(requestId, response); } @@ -204,7 +209,7 @@ public class ResourceTreeDatasource extends DataSource {
for (ResourceTreeNode resourceNode : resourceNodes) { if (allNodeIds.contains(resourceNode.getID())) { - com.allen_sauer.gwt.log.client.Log.debug("Duplicate ResourceTreeNode - Skipping: " + resourceNode); + Log.debug("Duplicate ResourceTreeNode - Skipping: " + resourceNode); continue; }
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 21476d3..bd8b9b0 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 @@ -28,6 +28,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map;
+import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.user.client.History; import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.data.DSCallback; @@ -149,7 +150,7 @@ public class ResourceTreeView extends LocatableVLayout { ResourceTreeNode resourceNode = (ResourceTreeNode) selectedRecord;
if (!resourceNode.isLocked()) { - System.out.println("Resource Node selected in tree: " + selectedRecord); + Log.info("Resource Node selected in tree: " + selectedRecord);
selectedNodeId = resourceNode.getID(); String viewPath = "Resource/" + resourceNode.getResource().getId(); @@ -164,13 +165,14 @@ public class ResourceTreeView extends LocatableVLayout { } } } else if (selectedRecord instanceof AutoGroupTreeNode) { - com.allen_sauer.gwt.log.client.Log.info("AutoGroup Node selected in tree: " + selectedRecord); + Log.info("AutoGroup Node selected in tree: " + selectedRecord);
AutoGroupTreeNode agNode = (AutoGroupTreeNode) selectedRecord; selectedNodeId = agNode.getID(); getAutoGroupBackingGroup(agNode, new AsyncCallback<ResourceGroup>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to select autogroup node", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_tree_common_loadFailed_selection(), + caught); }
public void onSuccess(ResourceGroup result) { @@ -231,7 +233,7 @@ public class ResourceTreeView extends LocatableVLayout { criteria.addFilterVisible(false); resourceGroupService.findResourceGroupsByCriteria(criteria, new AsyncCallback<PageList<ResourceGroup>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to fetch autogroup backing group", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_tree_common_loadFailed_node(), caught); }
public void onSuccess(PageList<ResourceGroup> result) { @@ -246,7 +248,7 @@ public class ResourceTreeView extends LocatableVLayout { resourceGroupService.createPrivateResourceGroup(backingGroup, childIds, new AsyncCallback<ResourceGroup>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to create resource autogroup", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_tree_common_loadFailed_create(), caught); }
public void onSuccess(ResourceGroup result) { @@ -268,8 +270,7 @@ public class ResourceTreeView extends LocatableVLayout { resourceGroupService.setAssignedResources(backingGroup.getId(), childIds, false, new AsyncCallback<Void>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError( - "Failed to set assigned members for autogroup backing group", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_tree_common_loadFailed_update(), caught); }
public void onSuccess(Void result) { @@ -341,7 +342,7 @@ public class ResourceTreeView extends LocatableVLayout { private void showContextMenu(AutoGroupTreeNode agNode) { getAutoGroupBackingGroup(agNode, new AsyncCallback<ResourceGroup>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to select AutoGroup node", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_tree_common_loadFailed_selection(), caught); }
public void onSuccess(ResourceGroup result) { @@ -369,16 +370,17 @@ public class ResourceTreeView extends LocatableVLayout { private void buildResourceContextMenu(final Resource resource, final ResourceType resourceType) { resourceContextMenu.setItems(new MenuItem(resource.getName()));
- resourceContextMenu.addItem(new MenuItem("Type: " + resourceType.getName())); + resourceContextMenu.addItem(new MenuItem(MSG.view_tree_common_contextMenu_type_name_label(resourceType + .getName())));
- MenuItem editPluginConfiguration = new MenuItem("Plugin Configuration"); + MenuItem editPluginConfiguration = new MenuItem(MSG.view_tree_common_contextMenu_pluginConfiguration()); editPluginConfiguration.addClickHandler(new ClickHandler() { public void onClick(MenuItemClickEvent event) { int resourceId = resource.getId(); int resourceTypeId = resourceType.getId();
Window configEditor = new Window(); - configEditor.setTitle("Edit " + resource.getName() + " plugin configuration"); + configEditor.setTitle(MSG.view_tree_common_contextMenu_editPluginConfiguration(resource.getName())); configEditor.setWidth(800); configEditor.setHeight(800); configEditor.setIsModal(true); @@ -394,14 +396,14 @@ public class ResourceTreeView extends LocatableVLayout { editPluginConfiguration.setEnabled(resourceType.getPluginConfigurationDefinition() != null); resourceContextMenu.addItem(editPluginConfiguration);
- MenuItem editResourceConfiguration = new MenuItem("Resource Configuration"); + MenuItem editResourceConfiguration = new MenuItem(MSG.view_tree_common_contextMenu_resourceConfiguration()); editResourceConfiguration.addClickHandler(new ClickHandler() { public void onClick(MenuItemClickEvent event) { int resourceId = resource.getId(); int resourceTypeId = resourceType.getId();
final Window configEditor = new Window(); - configEditor.setTitle("Edit " + resource.getName() + " resource configuration"); + configEditor.setTitle(MSG.view_tree_common_contextMenu_editResourceConfiguration(resource.getName())); configEditor.setWidth(800); configEditor.setHeight(800); configEditor.setIsModal(true); @@ -426,7 +428,7 @@ public class ResourceTreeView extends LocatableVLayout { resourceContextMenu.addItem(new MenuItemSeparator());
// Operations Menu - MenuItem operations = new MenuItem("Operations"); + MenuItem operations = new MenuItem(MSG.view_tree_common_contextMenu_operations()); Menu opSubMenu = new Menu(); for (final OperationDefinition operationDefinition : resourceType.getOperationDefinitions()) { MenuItem operationItem = new MenuItem(operationDefinition.getDisplayName()); @@ -441,8 +443,8 @@ public class ResourceTreeView extends LocatableVLayout { GWTServiceLookup.getResourceService().findResourcesByCriteria(criteria, new AsyncCallback<PageList<Resource>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler() - .handleError("Failed to get resource to run operation", caught); + CoreGUI.getErrorHandler().handleError( + MSG.view_tree_common_contextMenu_operations_loadFailed(), caught); }
public void onSuccess(PageList<Resource> result) { @@ -462,7 +464,7 @@ public class ResourceTreeView extends LocatableVLayout { resourceContextMenu.addItem(buildMetricsMenu(resourceType));
// Create Menu - MenuItem createChildMenu = new MenuItem("Create Child"); + MenuItem createChildMenu = new MenuItem(MSG.common_button_create_child()); Menu createChildSubMenu = new Menu(); for (final ResourceType childType : resourceType.getChildResourceTypes()) { if (childType.isCreatable()) { @@ -483,7 +485,7 @@ public class ResourceTreeView extends LocatableVLayout { resourceContextMenu.addItem(createChildMenu);
// Manually Add Menu - MenuItem importChildMenu = new MenuItem("Import"); + MenuItem importChildMenu = new MenuItem(MSG.common_button_import()); Menu importChildSubMenu = new Menu(); for (final ResourceType childType : resourceType.getChildResourceTypes()) { if (childType.isSupportsManualAdd()) { @@ -516,7 +518,8 @@ public class ResourceTreeView extends LocatableVLayout { criteria.fetchParentResourceTypes(true); rts.findResourceTypesByCriteria(criteria, new AsyncCallback<PageList<ResourceType>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to load platform manual add children", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_tree_common_contextMenu_loadFailed_manualAddChildren(), + caught); }
public void onSuccess(PageList<ResourceType> result) { @@ -538,12 +541,12 @@ public class ResourceTreeView extends LocatableVLayout { }
private MenuItem buildMetricsMenu(final ResourceType type) { - MenuItem measurements = new MenuItem("Measurements"); + MenuItem measurements = new MenuItem(MSG.view_tree_common_contextMenu_measurements()); final Menu measurementsSubMenu = new Menu();
GWTServiceLookup.getDashboardService().findDashboardsForSubject(new AsyncCallback<List<Dashboard>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to load user dashboards", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_tree_common_contextMenu_loadFailed_dashboard(), caught); }
public void onSuccess(List<Dashboard> result) { @@ -556,7 +559,8 @@ public class ResourceTreeView extends LocatableVLayout { defItem.setSubmenu(defSubItem);
for (final Dashboard d : result) { - MenuItem addToDBItem = new MenuItem("Add chart to Dashboard: " + d.getName()); + MenuItem addToDBItem = new MenuItem(MSG.view_tree_common_contextMenu_addChartToDashboard(d + .getName())); defSubItem.addItem(addToDBItem);
addToDBItem.addClickHandler(new ClickHandler() { @@ -575,14 +579,15 @@ public class ResourceTreeView extends LocatableVLayout { GWTServiceLookup.getDashboardService().storeDashboard(d, new AsyncCallback<Dashboard>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to save dashboard to server", - caught); + CoreGUI.getErrorHandler().handleError( + MSG.view_tree_common_contextMenu_saveChartToDashboardFailure(), caught); }
public void onSuccess(Dashboard result) { CoreGUI.getMessageCenter().notify( - new Message("Saved dashboard " + result.getName() + " to server", - Message.Severity.Info)); + new Message(MSG + .view_tree_common_contextMenu_saveChartToDashboardSuccessful(result + .getName()), Message.Severity.Info)); } });
@@ -640,7 +645,7 @@ public class ResourceTreeView extends LocatableVLayout { new AsyncCallback<List<ResourceLineageComposite>>() {
public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to lookup platform for tree", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_tree_common_loadFailed_root(), caught); }
public void onSuccess(List<ResourceLineageComposite> result) { @@ -673,7 +678,7 @@ public class ResourceTreeView extends LocatableVLayout {
treeGrid.fetchData(treeGrid.getCriteria(), new DSCallback() { public void execute(DSResponse response, Object rawData, DSRequest request) { - System.out.println("Done fetching data for tree."); + Log.info("Done fetching data for tree."); updateSelection();
if (null != callback) { @@ -701,8 +706,8 @@ public class ResourceTreeView extends LocatableVLayout {
} else { CoreGUI.getMessageCenter().notify( - new Message("Failed to select Resource [" + selectedResourceId - + "] in tree.", Message.Severity.Warning)); + new Message(MSG.view_tree_common_loadFailed_selection(), + Message.Severity.Warning)); }
} @@ -732,7 +737,7 @@ public class ResourceTreeView extends LocatableVLayout { criteria.fetchResourceType(true); resourceGroupService.findResourceGroupsByCriteria(criteria, new AsyncCallback<PageList<ResourceGroup>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to fetch autogroup backing group", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_tree_common_loadFailed_node(), caught); }
public void onSuccess(PageList<ResourceGroup> result) { @@ -742,7 +747,7 @@ public class ResourceTreeView extends LocatableVLayout {
@Override public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to load tree", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_tree_common_loadFailed_children(), caught); }
@Override diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index ed4b0c4..b548590 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -78,6 +78,7 @@ common_title_generalProp = General Properties~ common_title_group_def_total=Group Definition Total~ common_title_icon = icon~ common_title_id = ID~ +common_title_id_parent = Parent ID~ common_title_inventory = Inventory~ common_title_lastUpdated=Last Updated~ common_title_lastUpdatedBy=Last Updated By~ @@ -552,6 +553,7 @@ view_inventory_groups_descendants=Descendants~ view_inventory_groups_deleteSuccessful=You have successfully deleted the selected resource groups~ view_inventory_groups_deleteFailed=Failed to delete the selected resource groups~ view_inventory_groups_loadFailed=Failed to load group composite data~ +view_inventory_resource_loadFailed=Resource with id [{0}] does not exist or is not accessible~ view_inventory_resources_deleteConfirm=Are you sure you want to delete the selected resources?~ view_inventory_resources_deleteSuccessful=You have successfully deleted the selected resources~ view_inventory_resources_deleteFailed=Failed to delete the selected resources~ @@ -559,6 +561,68 @@ view_inventory_resources_loadFailed=Failed to load resource composite data~ view_inventory_resources_title=Member Resources~ view_inventory_resources_title_children=Child Resources~ view_inventory_resources_title_members=Member Resources~ +view_tree_common_loadFailed_generic=Failed to load data for tree~ +view_tree_common_loadFailed_root=Failed to load root for tree~ +view_tree_common_loadFailed_descendants=Failed to load descendants for tree~ +view_tree_common_loadFailed_children=Failed to load children for node~ +view_tree_common_loadFailed_selection=Failed to select this node~ +view_tree_common_loadFailed_node=Failed to load data for this node~ +view_tree_common_loadFailed_create=Failed to create view for this node~ +view_tree_common_loadFailed_update=Failed to update view for this node~ +view_tree_common_contextMenu_type_name_label=Type: {0} +view_tree_common_contextMenu_pluginConfiguration=Plugin Configuration~ +view_tree_common_contextMenu_resourceConfiguration=Resource Configuration~ +view_tree_common_contextMenu_editPluginConfiguration=Edit [{0}] Plugin Configuration~ +view_tree_common_contextMenu_editResourceConfiguration=Edit [{0}] Resource Configuration~ +view_tree_common_contextMenu_operations=Operations~ +view_tree_common_contextMenu_operations_loadFailed=Failure to start wizard for running operations~ +view_tree_common_contextMenu_measurements=Measurements~ +view_tree_common_contextMenu_addChartToDashboard=Add chart to dashboard [{0}]~ +view_tree_common_contextMenu_chart=Chart~ +view_tree_common_contextMenu_saveChartToDashboardSuccessful=You have saved dashboard [{0}]~ +view_tree_common_contextMenu_saveChartToDashboardFailure=Failed to save the dashboard~ +view_tree_common_contextMenu_loadFailed_dashboard=Failed to load user dashboards +view_tree_common_contextMenu_loadFailed_manualAddChildren=Failed to load platform manual add children~ +view_tabs_common_summary=Summary~ +view_tabs_common_overview=Overview~ +view_tabs_common_dashboard=Dashboard~ +view_tabs_common_timeline=Timeline~ +view_tabs_common_monitoring=Monitoring~ +view_tabs_common_graphs=Graphs~ +view_tabs_common_tables=Tables~ +view_tabs_common_traits=Traits~ +view_tabs_common_availability=Availability~ +view_tabs_common_schedules=Schedules~ +view_tabs_common_calltime=Calltime~ +view_tabs_common_inventory=Inventory~ +view_tabs_common_groups=Groups~ +view_tabs_common_group_membership=Group Membership~ +view_tabs_common_members=Members~ +view_tabs_common_child_resources=Child Resources~ +view_tabs_common_child_history=Child History~ +view_tabs_common_connectionSettings=Connection Settings~ +view_tabs_common_connectionSettingsHistory=Connection Settings History~ +view_tabs_common_operations=Operations~ +view_tabs_common_history=History~ +view_tabs_common_scheduled=Scheduled~ +view_tabs_common_alerts=Alerts~ +view_tabs_common_definitions=Definitions~ +view_tabs_common_current=Current~ +view_tabs_common_events=Events~ +view_tabs_common_configuration=Configuration~ +view_tabs_common_content=Content~ +view_tabs_common_deployed=Deployed~ +view_tabs_common_new=New~ +view_tabs_common_subscriptions=Subscriptions~ +view_titleBar_common_updateTagsSuccessful=The tags for [{0}] have been updated~ +view_titleBar_common_updateTagsFailure=Failed to update the tags for [{0}]~ +view_titleBar_common_loadTagsFailure=Failed to load the tags for [{0}]~ +view_titleBar_common_clickToRemoveFav=Click to remove this as a favorite~ +view_titleBar_common_clickToAddFav=Click to add this as a favorite~ +view_titleBar_common_removedFav=You have removed [{0}] as one of your favorites~ +view_titleBar_common_addedFav=You have added [{0}] as a favorite~ +view_titleBar_common_removedFavFailure=Failed to remove [{0}] as one of your favorites~ +view_titleBar_common_addedFavFailure=Failed to add [{0}] as a favorite~ view_dynagroup_expressionSet=Expression Set~ view_dynagroup_recalculationInterval=Recalculation Interval~ view_dynagroup_lastCalculationTime=Last Calculation Time~
commit f8ab2b95de1c37619df13f7e65983bf1644823f8 Author: Joseph Marques joseph@redhat.com Date: Wed Nov 17 17:05:55 2010 -0500
fix compile error
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java index f86063e..196d0b5 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java @@ -122,8 +122,8 @@ public abstract class RPCDataSource<T> extends DataSource { break; } } catch (Throwable t) { - CoreGUI.getErrorHandler().handleError(MSG.dataSource_rpc_error_transformRequestFailure( - request.getOperationType().name()), t); + CoreGUI.getErrorHandler().handleError( + MSG.dataSource_rpc_error_transformRequestFailure(request.getOperationType().name()), t); return null; } return request.getData(); @@ -419,7 +419,7 @@ public abstract class RPCDataSource<T> extends DataSource { int[] intermediates = criteria.getAttributeAsIntArray(paramName); resultArray = (S[]) new Integer[intermediates.length]; int index = 0; - for (int next : intermediates) { + for (Integer next : intermediates) { resultArray[index++] = (S) next; } } else if (type == String.class) { @@ -519,5 +519,5 @@ public abstract class RPCDataSource<T> extends DataSource { protected boolean userStillLoggedIn() { return UserSessionManager.isLoggedIn(); } - + }
commit 1e2871ecc601621557a0582874e6bc6d1c129682 Author: Simeon Pinder spinder@redhat.com Date: Wed Nov 17 16:59:33 2010 -0500
more i18n.
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 ddf9c4c..c02e802 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 @@ -117,7 +117,7 @@ public class DashboardView extends LocatableVLayout { editForm.setAutoWidth(); editForm.setNumCols(9);
- TextItem nameItem = new TextItem("name", "Dashboard Name"); + TextItem nameItem = new TextItem("name", MSG.common_title_dashboard_name()); nameItem.setValue(storedDashboard.getName()); nameItem.addChangedHandler(new ChangedHandler() { public void onChanged(ChangedEvent changedEvent) { @@ -128,10 +128,10 @@ public class DashboardView extends LocatableVLayout { });
final StaticTextItem numColItem = new StaticTextItem(); - numColItem.setTitle("Columns"); + numColItem.setTitle(MSG.common_title_columns()); numColItem.setValue(storedDashboard.getColumns());
- ButtonItem addColumn = new ButtonItem("addColumn", "Add Column"); + ButtonItem addColumn = new ButtonItem("addColumn", MSG.common_title_add_column()); // addColumn.setIcon("silk/application_side_expand.png"); addColumn.setAutoFit(true); addColumn.setStartRow(false); @@ -146,7 +146,7 @@ public class DashboardView extends LocatableVLayout { } });
- ButtonItem removeColumn = new ButtonItem("removeColumn", "Remove Column"); + ButtonItem removeColumn = new ButtonItem("removeColumn", MSG.common_title_remove_column()); // removeColumn.setIcon("silk/application_side_contract.png"); removeColumn.setAutoFit(true); removeColumn.setStartRow(false); @@ -173,7 +173,8 @@ public class DashboardView extends LocatableVLayout { addPorletMenu.addItem(new MenuItem(portletName)); }
- addPortlet = new LocatableIMenuButton(extendLocatorId("AddPortal"), "Add Portlet", addPorletMenu); + addPortlet = new LocatableIMenuButton(extendLocatorId("AddPortal"), MSG.common_title_add_portlet(), + addPorletMenu);
// addPortlet = new ButtonItem("addPortlet", "Add Portlet"); addPortlet.setIcon("[skin]/images/actions/add.png"); @@ -194,7 +195,7 @@ public class DashboardView extends LocatableVLayout {
ColorPickerItem picker = new ColorPickerItem();
- picker.setTitle("Background"); + picker.setTitle(MSG.common_title_background()); picker.addChangedHandler(new ChangedHandler() { public void onChanged(ChangedEvent changedEvent) { Object v = changedEvent.getValue(); @@ -277,12 +278,12 @@ public class DashboardView extends LocatableVLayout { public void save() { GWTServiceLookup.getDashboardService().storeDashboard(storedDashboard, new AsyncCallback<Dashboard>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to save dashboard to server", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_dashboardManager_error(), caught); }
public void onSuccess(Dashboard result) { CoreGUI.getMessageCenter().notify( - new Message("Saved dashboard " + result.getName() + " to server", Message.Severity.Info)); + new Message(MSG.view_dashboardManager_saved(result.getName()), Message.Severity.Info)); storedDashboard = result;
updateConfigs(result); @@ -308,7 +309,7 @@ public class DashboardView extends LocatableVLayout {
public void onSuccess(Void result) { CoreGUI.getMessageCenter().notify( - new Message("Successfully deleted dashboard " + storedDashboard.getName(), Message.Severity.Info)); + new Message(MSG.view_dashboardManager_deleted(storedDashboard.getName()), Message.Severity.Info)); } }); } 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 bf0f629..9592684 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 @@ -69,7 +69,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; * @author Greg Hinkle */ public class DashboardsView extends LocatableVLayout implements BookmarkableView { - public static final String VIEW_ID = "Dashboard"; + public static final String VIEW_ID = MSG.view_dashboards_title();
private TabSet tabSet;
@@ -101,7 +101,7 @@ public class DashboardsView extends LocatableVLayout implements BookmarkableView
dashboardService.findDashboardsForSubject(new AsyncCallback<List<Dashboard>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to load user dashboards", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_dashboardsManager_error1(), caught); }
public void onSuccess(List<Dashboard> result) { @@ -117,7 +117,7 @@ public class DashboardsView extends LocatableVLayout implements BookmarkableView removeMembers(getMembers()); this.dashboards = dashboards; this.dashboardsByName = new HashMap(dashboards.size()); - for (Dashboard dashboard: dashboards) { + for (Dashboard dashboard : dashboards) { this.dashboardsByName.put(dashboard.getName(), dashboard); }
@@ -128,17 +128,19 @@ public class DashboardsView extends LocatableVLayout implements BookmarkableView
tabSet.setCanCloseTabs(true);
- editButton = new LocatableIButton(extendLocatorId("Mode"), editMode ? "View Mode" : "Edit Mode"); + editButton = new LocatableIButton(extendLocatorId("Mode"), editMode ? MSG.common_title_view_mode() : MSG + .common_title_edit_mode()); editButton.setAutoFit(true); editButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { editMode = !editMode; - editButton.setTitle(editMode ? "View Mode" : "Edit Mode"); + editButton.setTitle(editMode ? MSG.common_title_view_mode() : MSG.common_title_edit_mode()); selectedDashboardView.setEditMode(editMode); } });
- final IButton newDashboardButton = new LocatableIButton(extendLocatorId("New"), "New Dashboard"); + final IButton newDashboardButton = new LocatableIButton(extendLocatorId("New"), MSG + .common_title_new_dashboard()); newDashboardButton.setAutoFit(true); newDashboardButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { @@ -177,7 +179,7 @@ public class DashboardsView extends LocatableVLayout implements BookmarkableView tabSet.addCloseClickHandler(new CloseClickHandler() { public void onCloseClick(final TabCloseClickEvent tabCloseClickEvent) { final DashboardView dashboardView = (DashboardView) tabCloseClickEvent.getTab().getPane(); - SC.ask("Are you sure you want to delete [" + tabCloseClickEvent.getTab().getTitle() + "]?", + SC.ask(MSG.view_dashboards_confirm1() + " [" + tabCloseClickEvent.getTab().getTitle() + "]?", new BooleanCallback() { public void execute(Boolean aBoolean) { if (aBoolean) { @@ -197,51 +199,49 @@ public class DashboardsView extends LocatableVLayout implements BookmarkableView protected Dashboard getDefaultDashboard() {
Dashboard dashboard = new Dashboard(); - dashboard.setName("Default"); + dashboard.setName(MSG.common_title_default()); dashboard.setColumns(2); dashboard.setColumnWidths("32%", "68%"); dashboard.getConfiguration().put(new PropertySimple(Dashboard.CFG_BACKGROUND, "#F1F2F3"));
- DashboardPortlet summary = new DashboardPortlet("Inventory Summary", InventorySummaryView.KEY, 230); + DashboardPortlet summary = new DashboardPortlet(MSG.view_dashboardsManager_inventory_title(), + InventorySummaryView.KEY, 230); dashboard.addPortlet(summary, 0, 0);
- DashboardPortlet tagCloud = new DashboardPortlet("Tag Cloud", TagCloudPortlet.KEY, 200); + DashboardPortlet tagCloud = new DashboardPortlet(MSG.view_dashboardsManager_tagcloud_title(), + TagCloudPortlet.KEY, 200); dashboard.addPortlet(tagCloud, 0, 1);
// Experimental // StoredPortlet platformSummary = new StoredPortlet("Platform Summary", PlatformPortletView.KEY, 300); // col2.add(platformSummary);
- DashboardPortlet welcome = new DashboardPortlet("Welcome To RHQ", MessagePortlet.KEY, 180); + DashboardPortlet welcome = new DashboardPortlet(MSG.view_dashboardsManager_message_title(), MessagePortlet.KEY, + 180); welcome.getConfiguration().put( - new PropertySimple("message", "<h1>Welcome to RHQ</h1>\n" - + "<p>The RHQ project is an abstraction and plug-in based systems management suite that provides " - + "extensible and integrated systems management for multiple products and platforms across a set " - + "of core features. The project is designed with layered modules that provide a flexible " - + "architecture for deployment. It delivers a core user interface that delivers audited and " - + "historical management across an entire enterprise. A Server/Agent architecture provides " - + "remote management and plugins implement all specific support for managed products.</p>\n" - + "<p>This default dashboard can be edited by clicking the "edit mode" button above.</p>")); + new PropertySimple("message", MSG.view_dashboardsManager_message_title_details())); dashboard.addPortlet(welcome, 1, 0);
- DashboardPortlet news = new DashboardPortlet("RHQ News", MashupPortlet.KEY, 320); + DashboardPortlet news = new DashboardPortlet(MSG.view_dashboardsManager_mashup_title(), MashupPortlet.KEY, 320); news.getConfiguration().put( new PropertySimple("address", "http://rhq-project.org/display/RHQ/RHQ+News?decorator=popup")); dashboard.addPortlet(news, 1, 1); // - DashboardPortlet discoveryQueue = new DashboardPortlet("Discovery Queue", AutodiscoveryPortlet.KEY, 250); + DashboardPortlet discoveryQueue = new DashboardPortlet(MSG.view_portlet_autodiscovery_title(), + AutodiscoveryPortlet.KEY, 250); dashboard.addPortlet(discoveryQueue, 1, 2);
DashboardPortlet recentAlerts = new DashboardPortlet(RecentAlertsPortlet.KEY, RecentAlertsPortlet.KEY, 250); dashboard.addPortlet(recentAlerts, 1, 3);
- DashboardPortlet recentlyAdded = new DashboardPortlet("Recently Added Resources", RecentlyAddedView.KEY, 250); + DashboardPortlet recentlyAdded = new DashboardPortlet(MSG.common_title_recently_added(), RecentlyAddedView.KEY, + 250); dashboard.addPortlet(recentlyAdded, 1, 4);
- DashboardPortlet operations = new DashboardPortlet("Operations", OperationsPortlet.KEY, 500); + DashboardPortlet operations = new DashboardPortlet(MSG.common_title_operations(), OperationsPortlet.KEY, 500); dashboard.addPortlet(operations, 1, 5);
- DashboardPortlet problemResources = new DashboardPortlet("Has Alerts or Currently Unavailable", + DashboardPortlet problemResources = new DashboardPortlet(MSG.view_portlet_problem_resources_title(), ProblemResourcesPortlet.KEY, 250); //initialize config for the problemResources portlet. problemResources.getConfiguration() @@ -262,7 +262,7 @@ public class DashboardsView extends LocatableVLayout implements BookmarkableView int i = 0; String availableDashboardName = null; while (availableDashboardName == null) { - String candidateDashboardName = "Custom" + i++; + String candidateDashboardName = MSG.common_title_custom() + i++; if (!this.dashboardsByName.containsKey(candidateDashboardName)) { availableDashboardName = candidateDashboardName; } @@ -276,7 +276,7 @@ public class DashboardsView extends LocatableVLayout implements BookmarkableView
dashboardService.storeDashboard(dashboard, new AsyncCallback<Dashboard>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to add new dashboard", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_dashboardsManager_error1(), caught); }
public void onSuccess(Dashboard result) { @@ -291,7 +291,7 @@ public class DashboardsView extends LocatableVLayout implements BookmarkableView
tabSet.selectTab(tab); editMode = true; - editButton.setTitle(editMode ? "View Mode" : "Edit Mode"); + editButton.setTitle(editMode ? MSG.common_title_view_mode() : MSG.common_title_edit_mode()); dashboardView.setEditMode(editMode);
} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletHelpWindow.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletHelpWindow.java index 6013893..80fe610 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletHelpWindow.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletHelpWindow.java @@ -23,20 +23,16 @@
package org.rhq.enterprise.gui.coregui.client.dashboard;
-import com.smartgwt.client.types.Alignment; import com.smartgwt.client.types.LayoutPolicy; import com.smartgwt.client.types.Overflow; import com.smartgwt.client.widgets.Canvas; -import com.smartgwt.client.widgets.IButton; import com.smartgwt.client.widgets.Label; import com.smartgwt.client.widgets.Window; -import com.smartgwt.client.widgets.events.ClickEvent; -import com.smartgwt.client.widgets.events.ClickHandler; -import com.smartgwt.client.widgets.form.DynamicForm; -import com.smartgwt.client.widgets.layout.HLayout; import com.smartgwt.client.widgets.layout.VLayout;
import org.rhq.core.domain.dashboard.DashboardPortlet; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.Messages;
/** * This is a window for displaying portlet settings. The window contains a form which in turn will contain the @@ -49,7 +45,7 @@ import org.rhq.core.domain.dashboard.DashboardPortlet; * @author John Sanda */ public class PortletHelpWindow extends Window { - + private static Messages MSG = CoreGUI.getMessages(); private DashboardPortlet storedPortlet; private Portlet view;
@@ -57,11 +53,9 @@ public class PortletHelpWindow extends Window { this.storedPortlet = storedPortlet; this.view = view;
- - - setTitle(storedPortlet.getName() + " Help"); + setTitle(storedPortlet.getName() + " " + MSG.view_menuBar_help()); setOverflow(Overflow.VISIBLE); -// setAutoSize(true); + // setAutoSize(true);
setHeight(400); setWidth(400); @@ -72,7 +66,6 @@ public class PortletHelpWindow extends Window { setDismissOnOutsideClick(true); }
- @Override protected void onInit() { super.onInit(); @@ -89,10 +82,9 @@ public class PortletHelpWindow extends Window { if (c != null) { layout.addMember(c); } else { - layout.addMember(new Label("No help available for this portlet")); + layout.addMember(new Label(MSG.view_portlet_generic_help())); }
- addItem(layout);
} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletSettingsWindow.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletSettingsWindow.java index 22227f6..c610cdb 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletSettingsWindow.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletSettingsWindow.java @@ -64,7 +64,7 @@ public class PortletSettingsWindow extends LocatableWindow { this.parentWindow = parentWindow; this.storedPortlet = storedPortlet; this.view = view; - setTitle(storedPortlet.getName() + " Settings"); + setTitle(storedPortlet.getName() + " " + MSG.common_title_settings()); setOverflow(Overflow.VISIBLE); setMinWidth(400); setMinHeight(400); @@ -90,13 +90,13 @@ public class PortletSettingsWindow extends LocatableWindow { final DynamicForm form = ((CustomSettingsPortlet) view).getCustomSettingsForm(); layout.addMember(form);
- IButton cancel = new LocatableIButton(this.extendLocatorId("Cancel"), "Cancel"); + IButton cancel = new LocatableIButton(this.extendLocatorId("Cancel"), MSG.common_button_cancel()); cancel.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { PortletSettingsWindow.this.destroy(); } }); - IButton save = new LocatableIButton(this.extendLocatorId("Save"), "Save"); + IButton save = new LocatableIButton(this.extendLocatorId("Save"), MSG.common_button_save()); save.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { if (form.validate()) { @@ -125,13 +125,13 @@ public class PortletSettingsWindow extends LocatableWindow { editor.setHeight(400); layout.addMember(editor);
- IButton cancel = new LocatableIButton(this.extendLocatorId("Cancel"), "Cancel"); + IButton cancel = new LocatableIButton(this.extendLocatorId("Cancel"), MSG.common_button_cancel()); cancel.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { PortletSettingsWindow.this.destroy(); } }); - IButton save = new LocatableIButton(this.extendLocatorId("Save"), "Save"); + IButton save = new LocatableIButton(this.extendLocatorId("Save"), MSG.common_button_cancel()); save.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { if (editor.validate()) { @@ -153,7 +153,7 @@ public class PortletSettingsWindow extends LocatableWindow { layout.addMember(buttons);
} else { - layout.addMember(new Label("No settings available for this portlet")); + layout.addMember(new Label(MSG.view_portlet_generic_unconfigured())); }
addItem(layout); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationsPortlet.java index fe4bead..121084b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationsPortlet.java @@ -61,20 +61,20 @@ public class OperationsPortlet extends LocatableVLayout implements CustomSetting public static final String OPERATIONS_RANGE_COMPLETED = "operations-range-completed"; public static final String OPERATIONS_RANGE_SCHEDULED = "operations-range-scheduled"; //portlet key - public static final String KEY = "Operations"; + public static final String KEY = MSG.view_group_contextMenu_operations(); private static final String TITLE = KEY; - private static String recentOperations = "Recent Operations"; - private static String scheduledOperations = "Scheduled Operations"; - public static String RANGE_DISABLED_MESSAGE = "(Results currently disabled. Change settings to enable results.)"; + private static String recentOperations = MSG.common_title_recent_operations(); + private static String scheduledOperations = MSG.common_title_scheduled_operations(); + public static String RANGE_DISABLED_MESSAGE = MSG.view_portlet_operations_disabled(); //TODO: change this to use the Smart GWT default value. - public static String RANGE_DISABLED_MESSAGE_DEFAULT = "No items to show."; + public static String RANGE_DISABLED_MESSAGE_DEFAULT = MSG.common_msg_noItemsToShow(); //ListGrids for operations private LocatableListGrid recentOperationsGrid = null; private LocatableListGrid scheduledOperationsGrid = null; private DashboardPortlet storedPortlet = null; private RecentOperationsDataSource dataSourceCompleted; private ScheduledOperationsDataSource dataSourceScheduled; - public static String unlimited = "unlimited"; + public static String unlimited = MSG.common_label_unlimited(); public static String defaultValue = unlimited; public static boolean defaultEnabled = true;
@@ -103,7 +103,7 @@ public class OperationsPortlet extends LocatableVLayout implements CustomSetting //defining header span String[] completedRows = new String[] { RecentOperationsDataSource.FIELD_LOCATION, RecentOperationsDataSource.FIELD_OPERATION, RecentOperationsDataSource.FIELD_RESOURCE, - RecentOperationsDataSource.FIELD_STATUS, RecentOperationsDataSource.FIELD_TIME}; + RecentOperationsDataSource.FIELD_STATUS, RecentOperationsDataSource.FIELD_TIME }; recentOperationsGrid.setHeaderSpans(new HeaderSpan(recentOperations, completedRows)); recentOperationsGrid.setHeaderSpanHeight(20); recentOperationsGrid.setHeaderHeight(40); @@ -186,7 +186,7 @@ public class OperationsPortlet extends LocatableVLayout implements CustomSetting
@Override public Canvas getHelpCanvas() { - return new HTMLFlow("This portlet displays both operations that have occurred and are scheduled to occur."); + return new HTMLFlow(MSG.view_portlet_operations_help_msg()); }
/** Constructs the dynamic form instance using 1 column and multiple row layouts. @@ -200,7 +200,8 @@ public class OperationsPortlet extends LocatableVLayout implements CustomSetting VStack column = new VStack();
//label - LocatableLabel operationRange = new LocatableLabel(extendLocatorId("operation-range"), "Operation Range"); + LocatableLabel operationRange = new LocatableLabel(extendLocatorId("operation-range"), MSG + .common_title_operations_range()); column.addMember(operationRange);
//horizontal layout @@ -209,7 +210,7 @@ public class OperationsPortlet extends LocatableVLayout implements CustomSetting //checkbox indicating whether to apply completed operations grouping settings final CheckboxItem enableCompletedOperationsGrouping = new CheckboxItem(); enableCompletedOperationsGrouping.setName(OPERATIONS_RANGE_COMPLETED_ENABLED); - enableCompletedOperationsGrouping.setTitle(" show Last "); + enableCompletedOperationsGrouping.setTitle(" " + MSG.view_portlet_operations_config_show_last() + " "); //add change listener enableCompletedOperationsGrouping.addChangeHandler(new ChangeHandler() { public void onChange(ChangeEvent event) { @@ -234,7 +235,8 @@ public class OperationsPortlet extends LocatableVLayout implements CustomSetting //-------------combobox for number of completed scheduled ops to display on the dashboard final SelectItem maximumCompletedOperationsComboBox = new SelectItem(OPERATIONS_RANGE_COMPLETED); maximumCompletedOperationsComboBox.setTitle(""); - maximumCompletedOperationsComboBox.setHint("<nobr><b> completed operations.</b></nobr>"); + maximumCompletedOperationsComboBox.setHint("<nobr><b> " + MSG.view_portlet_operations_config_completed() + + ".</b></nobr>"); //spinder: required to disable editability maximumCompletedOperationsComboBox.setType("selection"); //define acceptable values for display amount @@ -271,7 +273,7 @@ public class OperationsPortlet extends LocatableVLayout implements CustomSetting
final CheckboxItem enableScheduledOperationsGrouping = new CheckboxItem(); enableScheduledOperationsGrouping.setName(OPERATIONS_RANGE_SCHEDULED_ENABLED); - enableScheduledOperationsGrouping.setTitle(" show Next "); + enableScheduledOperationsGrouping.setTitle(" " + MSG.view_portlet_operations_config_show_next() + " "); enableScheduledOperationsGrouping.addChangeHandler(new ChangeHandler() { public void onChange(ChangeEvent event) { String selectedItem = "" + event.getValue(); @@ -296,7 +298,8 @@ public class OperationsPortlet extends LocatableVLayout implements CustomSetting //------------- Build second combobox for timeframe for problem resources search. final SelectItem maximumScheduledOperationsComboBox = new SelectItem(OPERATIONS_RANGE_SCHEDULED); maximumScheduledOperationsComboBox.setTitle(""); - maximumScheduledOperationsComboBox.setHint("<nobr><b> scheduled operations.</b></nobr>"); + maximumScheduledOperationsComboBox.setHint("<nobr><b> " + MSG.common_label_scheduled_operations() + + ".</b></nobr>"); maximumScheduledOperationsComboBox.setType("selection"); maximumScheduledOperationsComboBox.setValueMap(acceptableDisplayValues); maximumScheduledOperationsComboBox.setWidth(100); @@ -378,21 +381,17 @@ public class OperationsPortlet extends LocatableVLayout implements CustomSetting }
public ConfigurationDefinition getConfigurationDefinition() { - ConfigurationDefinition definition = new ConfigurationDefinition("OperationsPortlet Configuration", - "The configuration settings for the Operations portlet."); - - definition.put(new PropertyDefinitionSimple(OPERATIONS_RANGE_COMPLETED, - "Maximum number of Completed operations to display.", true, PropertySimpleType.STRING)); - definition.put(new PropertyDefinitionSimple(OPERATIONS_RANGE_SCHEDULED, - "Maximum number of Scheduled operations to display.", true, PropertySimpleType.STRING)); - definition - .put(new PropertyDefinitionSimple(OPERATIONS_RANGE_COMPLETED_ENABLED, - "Whether to enable completed operations results grouping for dashboard.", true, - PropertySimpleType.BOOLEAN)); - definition - .put(new PropertyDefinitionSimple(OPERATIONS_RANGE_SCHEDULED_ENABLED, - "Whether to enable scheduled operations results grouping for dashboard.", true, - PropertySimpleType.BOOLEAN)); + ConfigurationDefinition definition = new ConfigurationDefinition(MSG.view_portlet_operations_config_title(), + MSG.view_portlet_operations_config_title_desc()); + + definition.put(new PropertyDefinitionSimple(OPERATIONS_RANGE_COMPLETED, MSG + .view_portlet_operations_config_completed_maximum(), true, PropertySimpleType.STRING)); + definition.put(new PropertyDefinitionSimple(OPERATIONS_RANGE_SCHEDULED, MSG + .view_portlet_operations_config_scheduled_maximum(), true, PropertySimpleType.STRING)); + definition.put(new PropertyDefinitionSimple(OPERATIONS_RANGE_COMPLETED_ENABLED, MSG + .view_portlet_operations_config_completed_enable(), true, PropertySimpleType.BOOLEAN)); + definition.put(new PropertyDefinitionSimple(OPERATIONS_RANGE_SCHEDULED_ENABLED, MSG + .view_portlet_operations_config_scheduled_enable(), true, PropertySimpleType.BOOLEAN));
return definition; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java index d233d5b..a582132 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java @@ -60,14 +60,14 @@ public class ProblemResourcesPortlet extends Table implements CustomSettingsPort //keys for smart gwt elements. should be unique public static final String PROBLEM_RESOURCE_SHOW_HRS = "max-problems-query-span"; public static final String PROBLEM_RESOURCE_SHOW_MAX = "max-problems-shown"; - public static final String KEY = "Has Alerts or Currently Unavailable"; + public static final String KEY = MSG.view_portlet_problem_resources_title(); private static final String TITLE = KEY; private DashboardPortlet storedPortlet; //reference to datasource private ProblemResourcesDataSource dataSource;
//constants - public static final String unlimited = "unlimited"; + public static final String unlimited = MSG.common_label_unlimited(); public static final String defaultValue = unlimited;
public ProblemResourcesPortlet(String locatorId) { @@ -150,7 +150,7 @@ public class ProblemResourcesPortlet extends Table implements CustomSettingsPort
@Override public Canvas getHelpCanvas() { - return new HTMLFlow("This portlet displays resources that have reported alerts or Down availability."); + return new HTMLFlow(MSG.view_portlet_problem_resources_help()); }
/** Build custom for to dispaly the Portlet Configuration settings. @@ -162,8 +162,9 @@ public class ProblemResourcesPortlet extends Table implements CustomSettingsPort
//-------------combobox for number of resource to display on the dashboard final SelectItem maximumProblemResourcesComboBox = new SelectItem(PROBLEM_RESOURCE_SHOW_MAX); - maximumProblemResourcesComboBox.setTitle("Display"); - maximumProblemResourcesComboBox.setHint("<nobr><b> problem resources on dashboard.</b></nobr>"); + maximumProblemResourcesComboBox.setTitle(MSG.common_title_display()); + maximumProblemResourcesComboBox.setHint("<nobr><b> " + + MSG.view_portlet_problem_resources_config_problem_label() + "</b></nobr>"); //spinder 9/3/10: the following is required workaround to disable editability of combobox. maximumProblemResourcesComboBox.setType("selection"); //define acceptable values for display amount @@ -187,8 +188,8 @@ public class ProblemResourcesPortlet extends Table implements CustomSettingsPort
//------------- Build second combobox for timeframe for problem resources search. final SelectItem maximumTimeProblemResourcesComboBox = new SelectItem(PROBLEM_RESOURCE_SHOW_HRS); - maximumTimeProblemResourcesComboBox.setTitle("Over "); - maximumTimeProblemResourcesComboBox.setHint("<nobr><b> hours </b></nobr>"); + maximumTimeProblemResourcesComboBox.setTitle(MSG.common_title_over() + " "); + maximumTimeProblemResourcesComboBox.setHint("<nobr><b> " + MSG.common_label_hours() + " </b></nobr>"); //spinder 9/3/10: the following is required workaround to disable editability of combobox. maximumTimeProblemResourcesComboBox.setType("selection"); //define acceptable values for display amount @@ -240,13 +241,13 @@ public class ProblemResourcesPortlet extends Table implements CustomSettingsPort }
public ConfigurationDefinition getConfigurationDefinition() { - ConfigurationDefinition definition = new ConfigurationDefinition("ProblemResourcesPortlet Configuration", - "The configuration settings for the Problem resources portlet."); + ConfigurationDefinition definition = new ConfigurationDefinition(MSG + .view_portlet_problem_resources_config_title(), MSG.view_portlet_problem_resources_config_title_desc());
- definition.put(new PropertyDefinitionSimple(PROBLEM_RESOURCE_SHOW_MAX, - "Maximum number of Problem resources to display.", true, PropertySimpleType.INTEGER)); - definition.put(new PropertyDefinitionSimple(PROBLEM_RESOURCE_SHOW_HRS, - "Show problem resources going back this many hours.", true, PropertySimpleType.INTEGER)); + definition.put(new PropertyDefinitionSimple(PROBLEM_RESOURCE_SHOW_MAX, MSG + .view_portlet_problem_resources_config_display_maximum(), true, PropertySimpleType.INTEGER)); + definition.put(new PropertyDefinitionSimple(PROBLEM_RESOURCE_SHOW_HRS, MSG + .view_portlet_problem_resources_config_display_range(), true, PropertySimpleType.INTEGER));
return definition; } @@ -273,7 +274,7 @@ public class ProblemResourcesPortlet extends Table implements CustomSettingsPort } } //remove selected count as portlet is view only. Selection not used. - getTableInfo().setContents("Total: " + getListGrid().getTotalRows()); + getTableInfo().setContents(MSG.common_title_total() + ": " + getListGrid().getTotalRows()); } }
@@ -301,7 +302,9 @@ class TimeRange extends LocatableHLayout implements TableWidget { @Override public void refresh(ListGrid listGrid) { this.label.setWidth(400); - this.label.setContents("From " + portlet.getTimeRange()[0] + " to " + portlet.getTimeRange()[1]); + // this.label.setContents("From " + portlet.getTimeRange()[0] + " to " + portlet.getTimeRange()[1]); + this.label.setContents(MSG.view_portlet_problem_resources_config_display_range2(portlet.getTimeRange()[0], + portlet.getTimeRange()[1])); }
@Override diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryView.java index e012146..09013ef 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryView.java @@ -49,7 +49,7 @@ public class InventorySummaryView extends LocatableVLayout implements Portlet { private ResourceBossGWTServiceAsync resourceBossService = GWTServiceLookup.getResourceBossService();
private LocatableDynamicForm form; - public static final String KEY = "Summary Counts"; + public static final String KEY = MSG.common_title_summary_counts();
public InventorySummaryView(String locatorId) { super(locatorId); @@ -60,7 +60,7 @@ public class InventorySummaryView extends LocatableVLayout implements Portlet { private void loadInventoryViewDiata() { resourceBossService.getInventorySummaryForLoggedInUser(new AsyncCallback<InventorySummary>() { public void onFailure(Throwable throwable) { - CoreGUI.getErrorHandler().handleError("Failed to retrieve inventory summary", throwable); + CoreGUI.getErrorHandler().handleError(MSG.view_portlet_inventory_error1(), throwable); }
public void onSuccess(InventorySummary summary) { @@ -71,33 +71,34 @@ public class InventorySummaryView extends LocatableVLayout implements Portlet { // headerItem.setValue("Inventory Summary"); // formItems.add(headerItem);
- StaticTextItem platformTotal = createSummaryRow("platformTotal", "Platform Total", summary - .getPlatformCount(), "Inventory/Resources/Platforms"); + StaticTextItem platformTotal = createSummaryRow("platformTotal", MSG.common_title_platform_total(), + summary.getPlatformCount(), "Inventory/Resources/Platforms"); formItems.add(platformTotal);
- StaticTextItem serverTotal = createSummaryRow("serverTotal", "Server Total", summary.getServerCount(), - "Inventory/Resources/Servers"); + StaticTextItem serverTotal = createSummaryRow("serverTotal", MSG.common_title_server_total(), summary + .getServerCount(), "Inventory/Resources/Servers"); formItems.add(serverTotal);
- StaticTextItem serviceTotal = createSummaryRow("serviceTotal", "Service Total", summary - .getServiceCount(), "Inventory/Resources/Services"); + StaticTextItem serviceTotal = createSummaryRow("serviceTotal", MSG.common_title_service_total(), + summary.getServiceCount(), "Inventory/Resources/Services"); formItems.add(serviceTotal);
- StaticTextItem compatibleGroupTotal = createSummaryRow("compatibleGroupTotal", - "Compatible Group Total", summary.getCompatibleGroupCount(), "Inventory/Groups/CompatibleGroups"); + StaticTextItem compatibleGroupTotal = createSummaryRow("compatibleGroupTotal", MSG + .common_title_compatibleGroups_total(), summary.getCompatibleGroupCount(), + "Inventory/Groups/CompatibleGroups"); formItems.add(compatibleGroupTotal);
- StaticTextItem mixedGroupTotal = createSummaryRow("mixedGroupTotal", "Mixed Group Total", summary - .getMixedGroupCount(), "Inventory/Groups/MixedGroups"); + StaticTextItem mixedGroupTotal = createSummaryRow("mixedGroupTotal", MSG + .common_title_mixedGroups_total(), summary.getMixedGroupCount(), "Inventory/Groups/MixedGroups"); formItems.add(mixedGroupTotal);
- StaticTextItem groupDefinitionTotal = createSummaryRow("groupDefinitionTotal", - "Group Definition Total", summary.getGroupDefinitionCount(), "Inventory/Groups/DynagroupManager"); + StaticTextItem groupDefinitionTotal = createSummaryRow("groupDefinitionTotal", MSG + .common_title_group_def_total(), summary.getGroupDefinitionCount(), + "Inventory/Groups/DynagroupManager"); formItems.add(groupDefinitionTotal);
- StaticTextItem avergeMetricsTotal = createSummaryRow("averageMetricsTotal", - "Average Metrics per Minute", summary.getScheduledMeasurementsPerMinute(), - null); + StaticTextItem avergeMetricsTotal = createSummaryRow("averageMetricsTotal", MSG + .common_title_average_metrics(), summary.getScheduledMeasurementsPerMinute(), null); formItems.add(avergeMetricsTotal);
form.setItems(formItems.toArray(new FormItem[formItems.size()])); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/TagCloudPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/TagCloudPortlet.java index db78ffc..374d482 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/TagCloudPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/TagCloudPortlet.java @@ -36,7 +36,7 @@ import org.rhq.enterprise.gui.coregui.client.report.tag.TagCloudView; */ public class TagCloudPortlet extends TagCloudView implements Portlet {
- public static final String KEY = "TagCloud"; + public static final String KEY = MSG.view_portlet_tagCloud_title();
public TagCloudPortlet(String locatorId) { super(locatorId, true); @@ -47,8 +47,8 @@ public class TagCloudPortlet extends TagCloudView implements Portlet { }
public Canvas getHelpCanvas() { - return new HTMLFlow("The <b>Tag Cloud</b> portlet displays the relative tag counts in the system visible " - + "to the current user."); + return new HTMLFlow(MSG.common_title_the() + " <b>" + MSG.common_title_tag_cloud() + "</b> " + + MSG.view_portlet_tagCloud_help()); }
public static final class Factory implements PortletViewFactory { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/util/MashupPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/util/MashupPortlet.java index 48f3a0e..8d6af1c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/util/MashupPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/util/MashupPortlet.java @@ -41,7 +41,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHTMLPane; */ public class MashupPortlet extends LocatableHTMLPane implements ConfigurablePortlet {
- public static final String KEY = "Mashup"; + public static final String KEY = MSG.common_title_mashup();
public MashupPortlet(String locatorId) { super(locatorId); @@ -58,19 +58,20 @@ public class MashupPortlet extends LocatableHTMLPane implements ConfigurablePort if (url != null) { setContentsURL(url); } else { - setContents("<i>Page address not yet configured, click the settings button to setup this portlet."); + setContents("<i>" + MSG.view_portlet_mashup_unconfigured()); } }
public Canvas getHelpCanvas() { - return new HTMLFlow("This portlet can include a web page via an HTTP request into an iframe on the dashboard."); + return new HTMLFlow(MSG.view_portlet_mashup_help()); }
public ConfigurationDefinition getConfigurationDefinition() { - ConfigurationDefinition definition = new ConfigurationDefinition("MashupPorlet Configuration", - "The configuration settings for the mashup portlet."); + ConfigurationDefinition definition = new ConfigurationDefinition(MSG.view_portlet_mashup_config_title(), MSG + .view_portlet_mashup_config_title_desc());
- definition.put(new PropertyDefinitionSimple("address", "Web Address", true, PropertySimpleType.STRING)); + definition.put(new PropertyDefinitionSimple("address", MSG.common_title_web_address(), true, + PropertySimpleType.STRING));
return definition; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/util/MessagePortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/util/MessagePortlet.java index f72bd8c..bb37906 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/util/MessagePortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/util/MessagePortlet.java @@ -41,7 +41,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHTMLPane; */ public class MessagePortlet extends LocatableHTMLPane implements ConfigurablePortlet {
- public static final String KEY = "Message"; + public static final String KEY = MSG.view_portlet_message_title();
public MessagePortlet(String locatorId) { super(locatorId); @@ -53,19 +53,20 @@ public class MessagePortlet extends LocatableHTMLPane implements ConfigurablePor if (contents != null) { setContents(contents); } else { - setContents("<i>Message not yet configured, click the settings button to setup this portlet."); + setContents("<i>" + MSG.view_portlet_message_unconfigured()); } }
public Canvas getHelpCanvas() { - return new HTMLFlow("This portlet can display an HTML message on the dashboard."); + return new HTMLFlow(MSG.view_portlet_message_help()); }
public ConfigurationDefinition getConfigurationDefinition() { - ConfigurationDefinition definition = new ConfigurationDefinition("MessagePortlet Configuration", - "The configuration settings for the message portlet."); + ConfigurationDefinition definition = new ConfigurationDefinition(MSG.view_portlet_message_config_title(), MSG + .view_portlet_message_config_title_desc());
- definition.put(new PropertyDefinitionSimple("message", "Message", true, PropertySimpleType.LONG_STRING)); + definition.put(new PropertyDefinitionSimple("message", MSG.view_portlet_message_title(), true, + PropertySimpleType.LONG_STRING));
return definition; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/store/DashboardManager.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/store/DashboardManager.java index bf53761..7bd5225 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/store/DashboardManager.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/store/DashboardManager.java @@ -22,12 +22,11 @@ */ package org.rhq.enterprise.gui.coregui.client.dashboard.store;
-import java.util.HashSet; - import com.google.gwt.user.client.rpc.AsyncCallback;
import org.rhq.core.domain.dashboard.Dashboard; import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.Messages; 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.message.Message; @@ -36,20 +35,20 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message; * @author Greg Hinkle */ public class DashboardManager { - - + private static Messages MSG = CoreGUI.getMessages(); private static DashboardGWTServiceAsync dashboardService = GWTServiceLookup.getDashboardService(); -
public static void storeDashboard(final Dashboard dashboard) {
dashboardService.storeDashboard(dashboard, new AsyncCallback<Dashboard>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to store dashboard to server " + dashboard.getName() ,caught); + CoreGUI.getErrorHandler().handleError(MSG.view_dashboardManager_error() + " " + dashboard.getName(), + caught); }
public void onSuccess(Dashboard result) { - CoreGUI.getMessageCenter().notify(new Message("Saved dashboard " + result.getName(), Message.Severity.Info)); + CoreGUI.getMessageCenter().notify( + new Message(MSG.view_dashboardManager_success() + " " + result.getName(), Message.Severity.Info)); } });
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/footer/FavoritesButton.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/footer/FavoritesButton.java index 5557d50..39e3094 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/footer/FavoritesButton.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/footer/FavoritesButton.java @@ -44,7 +44,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableIMenuButton; public class FavoritesButton extends LocatableIMenuButton {
public FavoritesButton(String locatorId) { - super(locatorId, "Favorites"); + super(locatorId, MSG.common_title_favorites());
final Menu favoritesMenu = new Menu(); setMenu(favoritesMenu); @@ -83,7 +83,7 @@ public class FavoritesButton extends LocatableIMenuButton { GWTServiceLookup.getResourceService().findResourcesByCriteria(criteria, new AsyncCallback<PageList<Resource>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to load favorite Resources.", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_dashboard_favorites_error1(), caught); }
public void onSuccess(PageList<Resource> resources) {
commit 354f93149000f3e03e47e33de7db6c09414e36ce Author: Ian Springer ian.springer@redhat.com Date: Wed Nov 17 16:24:11 2010 -0500
i18n - resource connection settings views
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 b3a5709..fcfbf05 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 @@ -52,6 +52,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; */ public class PluginConfigurationEditView extends LocatableVLayout implements PropertyValueChangeListener, RefreshableView { + private Resource resource; private ResourcePermission resourcePermission; private ConfigurationEditor editor; @@ -73,7 +74,7 @@ public class PluginConfigurationEditView extends LocatableVLayout
toolStrip.addMember(new LayoutSpacer());
- this.saveButton = new LocatableIButton(this.extendLocatorId("Save"), "Save"); + this.saveButton = new LocatableIButton(this.extendLocatorId("Save"), MSG.common_button_save()); this.saveButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { save(); @@ -86,7 +87,7 @@ public class PluginConfigurationEditView extends LocatableVLayout refresh();
if (!this.resourcePermission.isInventory()) { - Message message = new Message("You do not have permission to edit this Resource's connection settings.", + Message message = new Message(MSG.view_connectionSettingsDetails_noPermission(), Message.Severity.Info, EnumSet.of(Message.Option.Transient)); CoreGUI.getMessageCenter().notify(message); } @@ -115,13 +116,14 @@ public class PluginConfigurationEditView extends LocatableVLayout GWTServiceLookup.getConfigurationService().updatePluginConfiguration(resource.getId(), updatedConfiguration, new AsyncCallback<PluginConfigurationUpdate>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to update connection settings.", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_connectionSettingsDetails_error_updateFailure(), + caught); }
public void onSuccess(PluginConfigurationUpdate result) { CoreGUI.getMessageCenter().notify( - new Message("Connection settings updated.", - "Connection settings updated for Resource [" + resource.getName() + "].")); + new Message(MSG.view_connectionSettingsDetails_messageConcise_updateSuccess(), + MSG.view_connectionSettingsDetails_messageDetailed_updateSuccess(resource.getName()))); refresh(); } }); @@ -135,12 +137,11 @@ public class PluginConfigurationEditView extends LocatableVLayout Set<String> invalidPropertyNames = event.getInvalidPropertyNames(); if (invalidPropertyNames.isEmpty()) { this.saveButton.enable(); - message = new Message("All connection settings have valid values, so the settings can now be saved.", + message = new Message(MSG.view_connectionSettingsDetails_allPropertiesValid(), Message.Severity.Info, EnumSet.of(Message.Option.Transient, Message.Option.Sticky)); } else { this.saveButton.disable(); - message = new Message("The following connection settings have invalid values: " + invalidPropertyNames - + ". The values must be corrected before the settings can be saved.", + message = new Message(MSG.view_connectionSettingsDetails_somePropertiesInvalid(invalidPropertyNames.toString()), Message.Severity.Error, EnumSet.of(Message.Option.Transient, Message.Option.Sticky)); } messageCenter.notify(message); @@ -148,4 +149,5 @@ public class PluginConfigurationEditView extends LocatableVLayout this.saveButton.enable(); } } + } \ No newline at end of file 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 6a178ea..e1fdce5 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 @@ -47,4 +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 7e2c344..8b34aee 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 @@ -19,7 +19,6 @@
package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.inventory;
-import java.util.HashSet; import java.util.Set;
import com.google.gwt.user.client.rpc.AsyncCallback; @@ -66,7 +65,7 @@ public class ResourceResourceGroupsView extends LocatableVLayout {
toolStrip.addMember(new LayoutSpacer());
- IButton saveButton = new LocatableIButton(this.extendLocatorId("Save"), "Save"); + IButton saveButton = new LocatableIButton(this.extendLocatorId("Save"), MSG.common_button_save()); saveButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { save(); @@ -81,7 +80,7 @@ public class ResourceResourceGroupsView extends LocatableVLayout { c.fetchExplicitGroups(true); GWTServiceLookup.getResourceService().findResourcesByCriteria(c, new AsyncCallback<PageList<Resource>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to fetch Resource's Groups", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_resourceResourceGroupList_error_fetchFailure(), caught); }
public void onSuccess(PageList<Resource> result) { @@ -100,13 +99,14 @@ public class ResourceResourceGroupsView extends LocatableVLayout { GWTServiceLookup.getResourceGroupService().setAssignedResourceGroupsForResource(this.resource.getId(), resourceGroupIds, true, new AsyncCallback<Void>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to update configuration", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_resourceResourceGroupList_error_updateFailure(), + caught); }
public void onSuccess(Void result) { CoreGUI.getMessageCenter().notify( - new Message("Group membership updated for [" - + ResourceResourceGroupsView.this.resource.getName() + "]", Message.Severity.Info)); + new Message(MSG.view_resourceResourceGroupList_message_updateSuccess( + ResourceResourceGroupsView.this.resource.getName()), Message.Severity.Info)); CoreGUI.refresh(); } }); diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index dbca63a..ed4b0c4 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -17,6 +17,7 @@ common_button_advanced = Advanced...~ common_button_apply = Apply~ common_button_cancel = Cancel~ common_button_close = Close~ +common_button_compare = Compare~ common_button_create_child = Create Child~ common_button_delete = Delete~ common_button_disable = Disable~ @@ -32,9 +33,8 @@ common_button_refresh = "Refresh"~ common_button_reset = Reset~ common_button_save = Save~ common_button_search = Search~ -common_button_uninventory = Uninventory~ -common_button_compare = Compare~ common_button_showDetails = Show Details...~ +common_button_uninventory = Uninventory~
# Common Labels #------------------------ @@ -65,7 +65,10 @@ common_title_available_resources=Available Resources~ common_title_category = Category~ common_title_compatibleGroups = Compatible Groups~ common_title_compatibleGroups_total=Compatible Group Total~ +common_title_custom=Custom~ +common_title_dashboard_name=Dashboard Name~ common_title_dateCreated=Date Created~ +common_title_default=Default~ common_title_description=Description~ common_title_display=Display~ common_title_edit_mode=Edit Mode~ @@ -84,6 +87,7 @@ common_title_mixedGroups = Mixed Groups~ common_title_mixedGroups_total=Mixed Group Total~ common_title_name = Name~ common_title_new_dashboard=New Dashboard~ +common_title_operations=Operations~ common_title_operations_range=Operation Range~ common_title_over=Over~ common_title_platform_total=Platform Total~ @@ -163,14 +167,23 @@ widget_resourceFactoryWizard_uploadFileStepName=Upload Resource Content File~ widget_resourceFactoryWizard_uploadFailure=Failed to upload file~ widget_resourceFactoryWizard_editConfigStepName=Edit Configuration~ widget_resourceFactoryWizard_infoStepName=Resource Information~ +widget_resourceFactoryWizard_namePrompt=New Resource Name~ widget_resourceFactoryWizard_templatePrompt=Connection Settings Template~ widget_resourceFactoryWizard_contentTemplatePrompt=Deployment Time Configuration Templates~ +widget_resourceFactoryWizard_configTemplatePrompt=Resource Configuration Templates~ widget_resourceFactoryWizard_archPrompt=Package Architecture~ widget_resourceFactoryWizard_versionPrompt=Package Version~ widget_resourceFactoryWizard_importWizardWindowTitle=Resource Import Wizard~ widget_resourceFactoryWizard_importWizardTitle=Import Resource of Type [{0}]~ widget_resourceFactoryWizard_importFailure=Failed to manually import resource~ widget_resourceFactoryWizard_importSubmitted=A request to import a new resource of type [{0}] has been submitted~ +widget_resourceFactoryWizard_createWizardWindowTitle=Resource Create Wizard~ +widget_resourceFactoryWizard_createWizardTitle=Create New Resource of Type [{0}]~ +widget_resourceFactoryWizard_execute1=Failed to create a new resource - there is no package version~ +widget_resourceFactoryWizard_execute2=Failed to create a new resource~ +widget_resourceFactoryWizard_createSubmitType=A request to create a resource of type [{0}] has been submitted successfully.~ +widget_resourceFactoryWizard_createSubmit=A request to create a resource with the name of [{0}] has been submitted successfully.~ +widget_resourceFactoryWizard_failedToType=Failed to get backing package type for new resource~
#===================== Utils ======================
@@ -436,9 +449,18 @@ view_type_typeTreeLoadFailure=Failed to load resource type tree data~
#=================== Dashboard ===================== view_dashboardManager_error=Failed to store dashboard to server~ + view_dashboardManager_success=Saved dashboard~
view_dashboards_title=Dashboard~ +view_dashboards_confirm1=Are you sure you want to delete~ + +view_dashboardsManager_error1=Failed to add new dashboard~ +view_dashboardsManager_inventory_title=Inventory Summary~ +view_dashboardsManager_mashup_title=RHQ News~ +view_dashboardsManager_message_title=Welcome To RHQ~ +view_dashboardsManager_message_title_details=<h1>Welcome to RHQ</h1>\n<p>The RHQ project is an abstraction and plug-in based systems management suite that provides extensible and integrated systems management for multiple products and platforms across a set of core features. The project is designed with layered modules that provide a flexible architecture for deployment. It delivers a core user interface that delivers audited and historical management across an entire enterprise. A Server/Agent architecture provides remote management and plugins implement all specific support for managed products.</p>\n <p>This default dashboard can be edited by clicking the (edit mode) button above.</p>~ +view_dashboardsManager_tagcloud_title=Tag Cloud~ view_portlet_autodiscovery_config_platform_selection = Number of platforms to display~ view_portlet_autodiscovery_help_msg = This portlet offers the ability to import newly discovered resources into the inventory for monitoring and management or to ignore them from further action.~ view_portlet_autodiscovery_title = Discovery Queue~ @@ -501,11 +523,13 @@ view_inventory_problemGroups=Problem Groups~ view_inventory_collectionInterval=Collection Interval~ view_inventory_mixed=mixed~ view_inventory_downServers=Down Servers~ -view_inventory_allGroups=All Groups~ -view_inventory_allResources=All Resources~ -view_inventory_platforms=Platforms~ -view_inventory_servers=Servers~ -view_inventory_services=Services~ +view_inventory_groups = Groups~ +view_inventory_allGroups = All Groups~ +view_inventory_allResources = All Resources~ +view_inventory_platforms = Platforms~ +view_inventory_servers = Servers~ +view_inventory_services = Services~ +view_inventory_dynagroupDefs = Dynagroup Definitions~ view_metric_traits=Traits~ view_metric_viewTraitHistory=Value History for Trait [{0}]~ view_inventory_eventHistory_groupEventHistory=Group Event History~ @@ -653,6 +677,21 @@ view_group_summary_descUpdateFailure=Failed to change the description of the res view_group_summary_descUpdateSuccessful=You have changed the description of this resource group~ view_group_summary_dynamicNote=Dynamic group names and descriptions are managed, and therefore are not editable~
+# Connection Settings Details +#------------------------------------------ +view_connectionSettingsDetails_noPermission = You do not have permission to edit this Resource''s connection settings.~ +view_connectionSettingsDetails_error_updateFailure = Failed to update connection settings.~ +view_connectionSettingsDetails_messageConcise_updateSuccess = Connection settings updated.~ +view_connectionSettingsDetails_messageDetailed_updateSuccess = Connection settings updated for Resource [{0}].~ +view_connectionSettingsDetails_allPropertiesValid = All connection settings have valid values, so the settings can now be saved.~ +view_connectionSettingsDetails_somePropertiesInvalid = The following connection settings have invalid values: {0}. The values must be corrected before the settings can be saved.~ + +# Resource Resource Groups +#----------------------------------------- +view_resourceResourceGroupList_error_fetchFailure = Failed to fetch Resource''s groups.~ +view_resourceResourceGroupList_error_updateFailure = Failed to update assigned Resource groups.~ +view_resourceResourceGroupList_message_updateSuccess = Group membership updated for [{0}]. + # Configuration Details #------------------------------- view_configurationDetails_noPermission = You do not have permission to edit this Resource''s configuration.~
commit 419c859bc2f3e4594a9c63e62fe529ae394106fc Author: Ian Springer ian.springer@redhat.com Date: Wed Nov 17 15:58:49 2010 -0500
i18n - resource config views
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 dda7db7..9264867 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 @@ -59,7 +59,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; public abstract class AbstractRecordEditor<DS extends RPCDataSource> extends LocatableVLayout implements BookmarkableView, DetailsView {
- private static final Label LOADING_LABEL = new Label("Loading..."); + private static final Label LOADING_LABEL = new Label(MSG.widget_recordEditor_label_loading()); private static final String FIELD_ID = "id"; private static final String FIELD_NAME = "name";
@@ -352,4 +352,5 @@ public abstract class AbstractRecordEditor<DS extends RPCDataSource> extends Loc private static String capitalize(String itemTitle) { return Character.toUpperCase(itemTitle.charAt(0)) + itemTitle.substring(1); } + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDataSource.java index 4933639..5f4c167 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDataSource.java @@ -44,6 +44,23 @@ import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; */ public class ConfigurationHistoryDataSource extends RPCDataSource<ResourceConfigurationUpdate> {
+ public static abstract class Field { + public static final String ID = "id"; + public static final String RESOURCE = "resource"; + public static final String CREATED_TIME = "createdTime"; + public static final String STATUS = "status"; + public static final String SUBJECT = "subject"; + public static final String RESOURCE_TYPE_ID = "resourceTypeId"; + public static final String CONFIGURATION = "configuration"; + public static final String DURATION = "duration"; + public static final String ERROR_MESSAGE = "errorMessage"; + public static final String MODIFIED_TIME = "modifiedTime"; + } + + public static abstract class CriteriaField { + public static final String RESOURCE_ID = "resourceId"; + } + private ConfigurationGWTServiceAsync configurationService = GWTServiceLookup.getConfigurationService();
public ConfigurationHistoryDataSource() { @@ -56,21 +73,26 @@ public class ConfigurationHistoryDataSource extends RPCDataSource<ResourceConfig protected List<DataSourceField> addDataSourceFields() { List<DataSourceField> fields = super.addDataSourceFields();
- DataSourceIntegerField idField = new DataSourceIntegerField("id"); + DataSourceIntegerField idField = new DataSourceIntegerField(Field.ID, + MSG.dataSource_configurationHistory_field_id()); idField.setPrimaryKey(true); fields.add(idField);
- DataSourceTextField resourceField = new DataSourceTextField("resource", "Resource"); + DataSourceTextField resourceField = new DataSourceTextField(Field.RESOURCE, + MSG.dataSource_configurationHistory_field_resource()); fields.add(resourceField);
- DataSourceTextField submittedField = new DataSourceTextField("createdTime", "Created"); + DataSourceTextField submittedField = new DataSourceTextField(Field.CREATED_TIME, + MSG.dataSource_configurationHistory_field_createdTime()); submittedField.setType(FieldType.DATETIME); fields.add(submittedField);
- DataSourceTextField statusField = new DataSourceTextField("status", "Status"); + DataSourceTextField statusField = new DataSourceTextField(Field.STATUS, + MSG.dataSource_configurationHistory_field_status()); fields.add(statusField);
- DataSourceTextField subjectField = new DataSourceTextField("subject", "Subject"); + DataSourceTextField subjectField = new DataSourceTextField(Field.SUBJECT, + MSG.dataSource_configurationHistory_field_subject()); fields.add(subjectField);
return fields; @@ -85,7 +107,7 @@ public class ConfigurationHistoryDataSource extends RPCDataSource<ResourceConfig
criteria.setPageControl(getPageControl(request));
- Integer resourceId = (Integer) request.getCriteria().getValues().get("resourceId"); + Integer resourceId = (Integer) request.getCriteria().getValues().get(CriteriaField.RESOURCE_ID); if (resourceId != null) { criteria.addFilterResourceIds(resourceId); } @@ -93,7 +115,8 @@ public class ConfigurationHistoryDataSource extends RPCDataSource<ResourceConfig configurationService.findResourceConfigurationUpdatesByCriteria(criteria, new AsyncCallback<PageList<ResourceConfigurationUpdate>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Unable to load configuration history", caught); + CoreGUI.getErrorHandler().handleError(MSG.dataSource_configurationHistory_error_fetchFailure(), + caught); response.setStatus(DSResponse.STATUS_FAILURE); processResponse(request.getRequestId(), response); } @@ -108,24 +131,23 @@ public class ConfigurationHistoryDataSource extends RPCDataSource<ResourceConfig
@Override public ResourceConfigurationUpdate copyValues(Record from) { - return null; // TODO: Implement this method. + throw new UnsupportedOperationException("Updates are not supported."); }
@Override public ListGridRecord copyValues(ResourceConfigurationUpdate from) { ListGridRecord record = new ListGridRecord(); - record.setAttribute("id", from.getId()); - record.setAttribute("resource", from.getResource()); - record.setAttribute("resourceTypeId", from.getResource().getResourceType().getId()); - record.setAttribute("subject", from.getSubjectName()); - record.setAttribute("configuration", from.getConfiguration()); - record.setAttribute("createdTime", new Date(from.getCreatedTime())); - record.setAttribute("duration", from.getDuration()); - record.setAttribute("errorMessage", from.getErrorMessage()); - record.setAttribute("modifiedTime", new Date(from.getModifiedTime())); - record.setAttribute("status", from.getStatus().name()); - - record.setAttribute("entity", from); + record.setAttribute(Field.ID, from.getId()); + record.setAttribute(Field.RESOURCE, from.getResource()); + record.setAttribute(Field.RESOURCE_TYPE_ID, from.getResource().getResourceType().getId()); + record.setAttribute(Field.SUBJECT, from.getSubjectName()); + record.setAttribute(Field.CONFIGURATION, from.getConfiguration()); + record.setAttribute(Field.CREATED_TIME, new Date(from.getCreatedTime())); + record.setAttribute(Field.DURATION, from.getDuration()); + record.setAttribute(Field.ERROR_MESSAGE, from.getErrorMessage()); + record.setAttribute(Field.MODIFIED_TIME, new Date(from.getModifiedTime())); + record.setAttribute(Field.STATUS, from.getStatus().name()); + return record; } } 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 5b13ffd..cc48ae9 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 @@ -40,9 +40,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; * @author Greg Hinkle */ public class ConfigurationHistoryDetailView extends LocatableVLayout implements BookmarkableView { - - private int configurationUpdateId; - + public ConfigurationHistoryDetailView(String locatorId) { super(locatorId);
@@ -50,12 +48,6 @@ public class ConfigurationHistoryDetailView extends LocatableVLayout implements setHeight100(); }
- @Override - protected void onDraw() { - super.onDraw(); - - } - private void displayHistory(final ResourceConfigurationUpdate update) {
ResourceTypeRepository.Cache.getInstance().getResourceTypes(update.getResource().getResourceType().getId(), @@ -63,9 +55,7 @@ public class ConfigurationHistoryDetailView extends LocatableVLayout implements new ResourceTypeRepository.TypeLoadedCallback() {
public void onTypesLoaded(ResourceType type) { - ConfigurationDefinition definition = type.getResourceConfigurationDefinition(); - ConfigurationEditor editor = new ConfigurationEditor("ResConfigHist-" + update.getResource().getName(), definition, update.getConfiguration()); editor.setReadOnly(true); @@ -76,9 +66,8 @@ public class ConfigurationHistoryDetailView extends LocatableVLayout implements }
public void displayInDialog() { - Window window = new Window(); - window.setTitle("Configuration Details"); + window.setTitle(MSG.view_configurationHistoryDetails_dialogTitle()); window.setWidth(800); window.setHeight(800); window.setIsModal(true); @@ -102,7 +91,8 @@ public class ConfigurationHistoryDetailView extends LocatableVLayout implements GWTServiceLookup.getConfigurationService().findResourceConfigurationUpdatesByCriteria(criteria, new AsyncCallback<PageList<ResourceConfigurationUpdate>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Unable to load configuration history", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_configurationHistoryDetails_error_loadFailure(), + caught); }
public void onSuccess(PageList<ResourceConfigurationUpdate> result) { @@ -111,6 +101,5 @@ public class ConfigurationHistoryDetailView extends LocatableVLayout implements displayHistory(update); } }); - } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java index 1e908d2..1e933ef 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java @@ -19,11 +19,12 @@ package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configuration;
import java.util.ArrayList; +import java.util.List;
import com.smartgwt.client.data.Criteria; import com.smartgwt.client.widgets.Canvas; import com.smartgwt.client.widgets.grid.CellFormatter; -import com.smartgwt.client.widgets.grid.ListGrid; +import com.smartgwt.client.widgets.grid.ListGridField; import com.smartgwt.client.widgets.grid.ListGridRecord;
import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; @@ -39,8 +40,9 @@ import org.rhq.enterprise.gui.coregui.client.components.table.TableSection; * @author Greg Hinkle */ public class ConfigurationHistoryView extends TableSection { + public static final String VIEW_ID = "RecentConfigurationChanges"; - private static final String TITLE = "Configuration History"; + private static final String TITLE = MSG.view_configurationHistoryList_title();
private Integer resourceId;
@@ -67,7 +69,7 @@ public class ConfigurationHistoryView extends TableSection {
private static Criteria createCriteria(int resourceId) { Criteria criteria = new Criteria(); - criteria.addCriteria("resourceId", Integer.valueOf(resourceId)); + criteria.addCriteria(ConfigurationHistoryDataSource.CriteriaField.RESOURCE_ID, resourceId); return criteria; }
@@ -75,24 +77,27 @@ public class ConfigurationHistoryView extends TableSection { protected void configureTable() { super.configureTable();
- ListGrid grid = getListGrid(); + List<ListGridField> fields = new ArrayList<ListGridField>();
- grid.getField("id").setWidth(60); - grid.getField("createdTime").setWidth(200); + ListGridField idField = new ListGridField(ConfigurationHistoryDataSource.Field.ID, 60); + fields.add(idField);
- if (resourceId != null) { - grid.hideField("resource"); - } else { - grid.getField("resource").setCellFormatter(new CellFormatter() { + ListGridField createdTimeField = new ListGridField(ConfigurationHistoryDataSource.Field.CREATED_TIME, 200); + fields.add(createdTimeField); + + if (this.resourceId == null) { + ListGridField resourceField = new ListGridField(ConfigurationHistoryDataSource.Field.RESOURCE); + resourceField.setCellFormatter(new CellFormatter() { public String format(Object o, ListGridRecord listGridRecord, int i, int i1) { Resource res = (Resource) o; return "<a href="#Resource/" + res.getId() + "">" + res.getName() + "</a>"; } }); + fields.add(resourceField); }
- grid.getField("status").setWidth(100); - grid.getField("status").setCellFormatter(new CellFormatter() { + ListGridField statusField = new ListGridField(ConfigurationHistoryDataSource.Field.STATUS, 100); + statusField.setCellFormatter(new CellFormatter() { public String format(Object o, ListGridRecord listGridRecord, int i, int i1) { ConfigurationUpdateStatus status = ConfigurationUpdateStatus.valueOf((String) o); String icon = ""; @@ -112,11 +117,16 @@ public class ConfigurationHistoryView extends TableSection { return Canvas.imgHTML("subsystems/configure/Configure" + icon + "_16.png", 16, 16) + o; } }); + fields.add(statusField); + + ListGridField subjectField = new ListGridField(ConfigurationHistoryDataSource.Field.SUBJECT, 150); + fields.add(subjectField);
- grid.getField("subject").setWidth(150); + setListGridFields(fields.toArray(new ListGridField[fields.size()]));
- addTableAction(extendLocatorId("Delete"), "Delete", - "Are you sure you want to delete # configuration history items?", new AbstractTableAction( + addTableAction(extendLocatorId("Delete"), MSG.common_button_delete(), + MSG.common_msg_deleteConfirm(MSG.common_msg_deleteConfirm(MSG.view_configurationHistoryList_itemNamePlural())), + new AbstractTableAction( TableActionEnablement.ANY) { public void executeAction(ListGridRecord[] selection, Object actionValue) { // TODO: Implement this method. @@ -124,7 +134,7 @@ public class ConfigurationHistoryView extends TableSection { } });
- addTableAction(extendLocatorId("Compare"), "Compare", null, new AbstractTableAction( + addTableAction(extendLocatorId("Compare"), MSG.common_button_compare(), null, new AbstractTableAction( TableActionEnablement.MULTIPLE) { public void executeAction(ListGridRecord[] selection, Object actionValue) { ArrayList<ResourceConfigurationUpdate> configs = new ArrayList<ResourceConfigurationUpdate>(); @@ -137,7 +147,7 @@ public class ConfigurationHistoryView extends TableSection { } });
- addTableAction(extendLocatorId("ShowDetail"), "Show Details", null, new AbstractTableAction( + addTableAction(extendLocatorId("ShowDetail"), MSG.common_button_showDetails(), null, new AbstractTableAction( TableActionEnablement.SINGLE) { public void executeAction(ListGridRecord[] selection, Object actionValue) { ListGridRecord record = selection[0]; @@ -152,7 +162,6 @@ public class ConfigurationHistoryView extends TableSection { ConfigurationHistoryDetailView detailView = new ConfigurationHistoryDetailView(this.getLocatorId());
return detailView; - }
// -------- Static Utility loaders ------------ 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 875fc0d..525b6a3 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 @@ -53,6 +53,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; */ public class ResourceConfigurationEditView extends LocatableVLayout implements PropertyValueChangeListener, RefreshableView { + private Resource resource; private ResourcePermission resourcePermission; private ConfigurationEditor editor; @@ -74,7 +75,7 @@ public class ResourceConfigurationEditView extends LocatableVLayout
toolStrip.addMember(new LayoutSpacer());
- this.saveButton = new LocatableIButton(this.extendLocatorId("Save"), "Save"); + this.saveButton = new LocatableIButton(this.extendLocatorId("Save"), MSG.common_button_save()); this.saveButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { save(); @@ -86,7 +87,7 @@ public class ResourceConfigurationEditView extends LocatableVLayout refresh();
if (!this.resourcePermission.isConfigureWrite()) { - Message message = new Message("You do not have permission to edit this Resource's configuration.", + Message message = new Message(MSG.view_configurationDetails_noPermission(), Message.Severity.Info, EnumSet.of(Message.Option.Transient, Message.Option.Sticky)); CoreGUI.getMessageCenter().notify(message); } @@ -115,13 +116,13 @@ public class ResourceConfigurationEditView extends LocatableVLayout GWTServiceLookup.getConfigurationService().updateResourceConfiguration(resource.getId(), updatedConfiguration, new AsyncCallback<ResourceConfigurationUpdate>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to update configuration.", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_configurationDetails_error_updateFailure(), caught); }
public void onSuccess(ResourceConfigurationUpdate result) { CoreGUI.getMessageCenter().notify( - new Message("Configuration updated.", - "Configuration updated for Resource [" + resource.getName() + "].", + new Message(MSG.view_configurationDetails_messageConcise(), + MSG.view_configurationDetails_messageDetailed(resource.getName()), Message.Severity.Info)); refresh(); } @@ -136,12 +137,11 @@ public class ResourceConfigurationEditView extends LocatableVLayout Set<String> invalidPropertyNames = event.getInvalidPropertyNames(); if (invalidPropertyNames.isEmpty()) { this.saveButton.enable(); - message = new Message("All configuration properties have valid values, so the configuration can now be saved.", + message = new Message(MSG.view_configurationDetails_allPropertiesValid(), Message.Severity.Info, EnumSet.of(Message.Option.Transient, Message.Option.Sticky)); } else { this.saveButton.disable(); - message = new Message("The following configuration properties have invalid values: " - + invalidPropertyNames + ". The values must be corrected before the configuration can be saved.", + message = new Message(MSG.view_configurationDetails_somePropertiesInvalid(invalidPropertyNames.toString()), Message.Severity.Error, EnumSet.of(Message.Option.Transient, Message.Option.Sticky)); } messageCenter.notify(message); @@ -149,4 +149,5 @@ public class ResourceConfigurationEditView extends LocatableVLayout this.saveButton.enable(); } } + } diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index e8bf31f..dbca63a 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -33,7 +33,8 @@ common_button_reset = Reset~ common_button_save = Save~ common_button_search = Search~ common_button_uninventory = Uninventory~ - +common_button_compare = Compare~ +common_button_showDetails = Show Details...~
# Common Labels #------------------------ @@ -48,6 +49,8 @@ common_label_items=items~ common_label_milliseconds=milliseconds~ common_label_minutes=minutes~ common_label_month=month~ +common_label_search=Search~ +common_label_scheduled_operations=scheduled operations~ common_label_seconds=seconds~ common_label_selected_resources = selected resources~ common_label_unlimited = unlimited~ @@ -57,23 +60,33 @@ common_label_week=week~ #-------------- common_title_alert_range=Alert Range~ common_title_availability = Availability~ +common_title_average_metrics=Average Metrics per Minute~ common_title_available_resources=Available Resources~ common_title_category = Category~ common_title_compatibleGroups = Compatible Groups~ +common_title_compatibleGroups_total=Compatible Group Total~ common_title_dateCreated=Date Created~ common_title_description=Description~ +common_title_display=Display~ +common_title_edit_mode=Edit Mode~ common_title_enabled=Enabled?~ common_title_end = End~ common_title_generalProp = General Properties~ +common_title_group_def_total=Group Definition Total~ common_title_icon = icon~ common_title_id = ID~ common_title_inventory = Inventory~ common_title_lastUpdated=Last Updated~ common_title_lastUpdatedBy=Last Updated By~ +common_title_mashup=Mashup~ common_title_metric = Metric~ common_title_mixedGroups = Mixed Groups~ +common_title_mixedGroups_total=Mixed Group Total~ common_title_name = Name~ +common_title_new_dashboard=New Dashboard~ common_title_operations_range=Operation Range~ +common_title_over=Over~ +common_title_platform_total=Platform Total~ common_title_plugin = Plugin~ common_title_recently_added = Recently Added Resources~ common_title_recent_operations=Recent Operations~ @@ -82,13 +95,21 @@ common_title_resource_inventory=Resource Inventory~ common_title_resource_name=Resource Name~ common_title_scheduled_operations=Scheduled Operations~ common_title_selected_resources=Selected Resources~ +common_title_server_total=Server Total~ +common_title_service_total=Service Total~ common_title_start = Start~ common_title_status=Status~ +common_title_tag_cloud=Tag Cloud~ +common_title_the=The +common_title_summary_counts=Summary Counts~ common_title_timestamp =Date/Time~ +common_title_total=Total~ common_title_type = Type~ common_title_user=User~ common_title_value = Value~ common_title_version = Version~ +common_title_view_mode=View Mode~ +common_title_web_address=Web Address~
# Common Messages #-------------- @@ -127,6 +148,29 @@ widget_recordEditor_info_recordsDeletedConcise = {0} {1} deleted.~ widget_recordEditor_info_recordsDeletedDetailed = {0} {1} deleted: {2}.~ widget_recordEditor_error_unsupportedOperationType = Unsupported operation type: [{0}]~
+# Resource Selector/Picker +#-------------------------------- +widget_resourceSelector_selectResource=Select a Resource~ +widget_resourceSelector_pleaseSelectResource=Please select a resource~ +widget_resourceSelector_selectMultipleResources=Select Resources~ +widget_resourceSelector_pleaseSelectMultipleResource=Please select one or more resources~ +widget_resourceSelector_groupCategory=Group Category~ + +# Resource Factory Wizard +#-------------------------------- +widget_resourceFactoryWizard_uploadInProgress=The upload is in progress... This can take several minutes to complete for large distribution files.~ +widget_resourceFactoryWizard_uploadFileStepName=Upload Resource Content File~ +widget_resourceFactoryWizard_uploadFailure=Failed to upload file~ +widget_resourceFactoryWizard_editConfigStepName=Edit Configuration~ +widget_resourceFactoryWizard_infoStepName=Resource Information~ +widget_resourceFactoryWizard_templatePrompt=Connection Settings Template~ +widget_resourceFactoryWizard_contentTemplatePrompt=Deployment Time Configuration Templates~ +widget_resourceFactoryWizard_archPrompt=Package Architecture~ +widget_resourceFactoryWizard_versionPrompt=Package Version~ +widget_resourceFactoryWizard_importWizardWindowTitle=Resource Import Wizard~ +widget_resourceFactoryWizard_importWizardTitle=Import Resource of Type [{0}]~ +widget_resourceFactoryWizard_importFailure=Failed to manually import resource~ +widget_resourceFactoryWizard_importSubmitted=A request to import a new resource of type [{0}] has been submitted~
#===================== Utils ======================
@@ -179,7 +223,7 @@ dataSource_ContentRepoTree_field_parentId = Parent ID~
# Users #------ -// dup in common +###### dup in common dataSource_users_field_id = ID~ dataSource_users_field_name = User Name~ dataSource_users_field_ldap = LDAP Login?~ @@ -255,28 +299,39 @@ dataSource_scheduledOperations_field_operation = Operation~ dataSource_scheduledOperations_field_time = Date/Time~ dataSource_scheduledOperations_error_fetchFailure = Failed to load scheduled operations.
+# Configuration History +#------------------------------- +dataSource_configurationHistory_field_id = ID~ +dataSource_configurationHistory_field_resource = Resource~ +dataSource_configurationHistory_field_createdTime = Created~ +dataSource_configurationHistory_field_status = Status~ +dataSource_configurationHistory_field_subject = Subject~ +dataSource_configurationHistory_error_fetchFailure = Unable to load configuration history.~ +
#********************************** VIEW-SPECIFIC *************************************
#================= Administration ==================
view_admin_administration = Administration~ -view_admin_affinityGroups = Affinity Groups~ -view_admin_agents = Agents~ view_admin_configuration = Configuration~ -view_admin_downloads = Downloads~ -view_admin_license = License~ -view_admin_paritionEvents = Partition Events~ -view_admin_plugins = Plugins~ view_admin_security = Security~ -view_admin_servers = Servers~ -view_admin_systemSettings = System Settings~ -view_admin_templates = Templates~ view_admin_topology = Topology~
-# Administration/Security/Users -#------------------------------ -view_adminUsers_title = Users~ +view_adminSecurity_users = Users~ +view_adminSecurity_roles = Roles~ + +view_adminTopology_affinityGroups = Affinity Groups~ +view_adminTopology_agents = Agents~ +view_adminTopology_partitionEvents = Partition Events~ +view_adminTopology_remoteAgentInstall = Remote Agent Install~ +view_adminTopology_servers = Servers~ + +view_adminConfig_downloads = Downloads~ +view_adminConfig_license = License~ +view_adminConfig_plugins = Plugins~ +view_adminConfig_systemSettings = System Settings~ +view_adminConfig_templates = Templates~
# Administration/Security/Users/# #-------------------------------- @@ -374,7 +429,16 @@ view_groupCreateWizard_createFailure=Failed to create the resource group~ view_groupCreateWizard_createSuccessful_concise=You have created a new resource group. [<a href="{0}">View Group</a>]~ view_groupCreateWizard_createSuccessful_full=You have created a new [{0}] resource group with the name [{1}] that contains [{2}] member resources~
+# Resource Type / Plugin View/Datasources +view_type_resourceTypes=Resource Types~ +view_type_parentId=Parent ID~ +view_type_typeTreeLoadFailure=Failed to load resource type tree data~ + #=================== Dashboard ===================== +view_dashboardManager_error=Failed to store dashboard to server~ +view_dashboardManager_success=Saved dashboard~ + +view_dashboards_title=Dashboard~ view_portlet_autodiscovery_config_platform_selection = Number of platforms to display~ view_portlet_autodiscovery_help_msg = This portlet offers the ability to import newly discovered resources into the inventory for monitoring and management or to ignore them from further action.~ view_portlet_autodiscovery_title = Discovery Queue~ @@ -384,14 +448,39 @@ view_portlet_graph_help_msg = This Portlet supports the graphing of a resource m view_portlet_graph_help_title = Graph Portlet~ view_portlet_graph_help_unconfigured=This graph is unconfigured, click the settings button to configure.~ view_portlet_graph_title = Resource Graph~ +view_portlet_inventory_error1=Failed to retrieve inventory summary~ +view_portlet_mashup_config_title=MashupPorlet Configuration~ +view_portlet_mashup_config_title_desc=The configuration settings for the mashup portlet.~ +view_portlet_mashup_help=This portlet can include a web page via an HTTP request into an iframe on the dashboard.~ +view_portlet_mashup_unconfigured=Page address not yet configured, click the settings button to setup this portlet.~ +view_portlet_message_config_title=MessagePortlet Configuration~ +view_portlet_message_config_title_desc=The configuration settings for the message portlet.~ +view_portlet_message_help=This portlet can display an HTML message on the dashboard.~ +view_portlet_message_title=Message~ +view_portlet_message_unconfigured=Message not yet configured, click the settings button to setup this portlet.~ +view_portlet_operations_config_completed_maximum=Maximum number of Completed operations to display.~ +view_portlet_operations_config_completed_enable=Whether to enable completed operations results grouping for dashboard.~ +view_portlet_operations_config_scheduled_enable=Whether to enable scheduled operations results grouping for dashboard.~ +view_portlet_operations_config_scheduled_maximum=Maximum number of Scheduled operations to display.~ view_portlet_operations_config_completed=completed operations~ view_portlet_operations_config_show_last=show Last~ +view_portlet_operations_config_show_next=show Next~ +view_portlet_operations_config_title=OperationsPortlet Configuration~ +view_portlet_operations_config_title_desc=The configuration settings for the Operations portlet.~ view_portlet_operations_disabled=(Results currently disabled. Change settings to enable results.~ view_portlet_operations_help_msg=This portlet displays both operations that have occurred and are scheduled to occur.~ view_portlet_platform_help_msg = This portlet displays information about platforms in inventory.~ view_portlet_platform_platform_error_1 = Failed to load platform metrics~ view_portlet_platform_title = Platforms Summary~ view_portlet_platform_type_error_1 = Could not load type data~ +view_portlet_problem_resources_config_display_maximum=Maximum number of Problem resources to display.~ +view_portlet_problem_resources_config_display_range=Show problem resources going back this many hours.~ +view_portlet_problem_resources_config_display_range2 = From {0} to {1}~ +view_portlet_problem_resources_config_problem_label=problem resources on dashboard.~ +view_portlet_problem_resources_config_title=ProblemResourcesPortlet Configuration~ +view_portlet_problem_resources_config_title_desc=The configuration settings for the Problem resources portlet.~ +view_portlet_problem_resources_help=This portlet displays resources that have reported alerts or Down availability.~ +view_portlet_problem_resources_title=Has Alerts or Currently Unavailable~ view_portlet_recentAlerts_config_members=Select Members~ view_portlet_recentAlerts_config_priority_label = priority Alerts,~ view_portlet_recentAlerts_config_when=within the past~ @@ -401,8 +490,11 @@ view_portlet_recentlyAdded_approved_platforms=recently approved platforms on das view_portlet_recentlyAdded_error1=Failed to load recently added resources~ view_portlet_recentlyAdded_help_msg=This portlet displays resources that have recently been imported into the inventory.~ view_portlet_recentlyAdded_title =Recently Added Portlet~ +view_portlet_tagCloud_help=portlet displays the relative tag counts in the system visible to the current user.~ +view_portlet_tagCloud_title=TagCloud~
#=================== Inventory ===================== +view_inventory_adq = Discovery Queue~ view_inventory_sectionHelp = From this section, newly discovered Resources, inventoried Resources, and Groups can be viewed and managed.~ view_inventory_cannotGetGlobalPerms = Could not determine global permissions - assuming none.~ view_inventory_problemGroups=Problem Groups~ @@ -410,6 +502,10 @@ view_inventory_collectionInterval=Collection Interval~ view_inventory_mixed=mixed~ view_inventory_downServers=Down Servers~ view_inventory_allGroups=All Groups~ +view_inventory_allResources=All Resources~ +view_inventory_platforms=Platforms~ +view_inventory_servers=Servers~ +view_inventory_services=Services~ view_metric_traits=Traits~ view_metric_viewTraitHistory=Value History for Trait [{0}]~ view_inventory_eventHistory_groupEventHistory=Group Event History~ @@ -557,6 +653,24 @@ view_group_summary_descUpdateFailure=Failed to change the description of the res view_group_summary_descUpdateSuccessful=You have changed the description of this resource group~ view_group_summary_dynamicNote=Dynamic group names and descriptions are managed, and therefore are not editable~
+# Configuration Details +#------------------------------- +view_configurationDetails_noPermission = You do not have permission to edit this Resource''s configuration.~ +view_configurationDetails_error_updateFailure = Failed to update configuration.~ +view_configurationDetails_messageConcise = Configuration updated.~ +view_configurationDetails_messageDetailed = Configuration updated for Resource [{0}].~ +view_configurationDetails_allPropertiesValid = All configuration properties have valid values, so the configuration can now be saved.~ +view_configurationDetails_somePropertiesInvalid = The following configuration properties have invalid values: {0}. The values must be corrected before the configuration can be saved.~ + +# Configuration History List +view_configurationHistoryList_title = Configuration History~ +view_configurationHistoryList_itemNamePlural = configuration history items + +# Configuration History Details +#------------------------------------------ +view_configurationHistoryDetails_dialogTitle = Configuration Details~ +view_configurationHistoryDetails_error_loadFailure = Unable to load configuration history.~ +
#==================== Reports ======================
commit 8164146dee50593b356effc183f739309eed3718 Author: Joseph Marques joseph@redhat.com Date: Wed Nov 17 14:54:12 2010 -0500
do not parameterize verbs or terminology, keep the translations simple
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java index 9236ec3..d3e4922 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java @@ -53,8 +53,8 @@ public class ResourceCompositeSearchView extends ResourceSearchView {
super.configureTable();
- addTableAction(extendLocatorId("Delete"), MSG.common_button_delete(), MSG.common_msg_actionConfirm("delete", - "resources"), new AbstractTableAction(TableActionEnablement.ANY) { + addTableAction(extendLocatorId("Delete"), MSG.common_button_delete(), MSG + .view_inventory_resources_deleteConfirm(), new AbstractTableAction(TableActionEnablement.ANY) {
// only enabled if all selected are a deletable type and if the user has delete permission // on the resources. @@ -84,13 +84,12 @@ public class ResourceCompositeSearchView extends ResourceSearchView {
resourceManager.deleteResources(resourceIds, new AsyncCallback<List<DeleteResourceHistory>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.common_msg_actionFailure("delete", "resources"), - caught); + CoreGUI.getErrorHandler().handleError(MSG.view_inventory_resources_deleteFailed(), caught); }
public void onSuccess(List<DeleteResourceHistory> result) { CoreGUI.getMessageCenter().notify( - new Message(MSG.common_msg_actionSuccess("deleted", "resources"), Severity.Info)); + new Message(MSG.view_inventory_resources_deleteSuccessful(), Severity.Info));
ResourceCompositeSearchView.this.refresh(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java index d13d949..078461f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java @@ -142,21 +142,20 @@ public class ResourceSearchView extends Table { setListGridFields(iconField, nameField, descriptionField, typeNameField, pluginNameField, categoryField, availabilityField);
- addTableAction(extendLocatorId("Uninventory"), MSG.common_button_uninventory(), MSG.common_msg_actionConfirm( - "uninventory", "resources"), new AbstractTableAction(TableActionEnablement.ANY) { + addTableAction(extendLocatorId("Uninventory"), MSG.common_button_uninventory(), MSG + .view_inventory_resources_deleteConfirm(), new AbstractTableAction(TableActionEnablement.ANY) { public void executeAction(ListGridRecord[] selection, Object actionValue) { int[] resourceIds = TableUtility.getIds(selection); ResourceGWTServiceAsync resourceManager = GWTServiceLookup.getResourceService();
resourceManager.uninventoryResources(resourceIds, new AsyncCallback<List<Integer>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.common_msg_actionFailure("uninventory", "resource"), - caught); + CoreGUI.getErrorHandler().handleError(MSG.view_inventory_resources_deleteFailed(), caught); }
public void onSuccess(List<Integer> result) { CoreGUI.getMessageCenter().notify( - new Message(MSG.common_msg_actionSuccess("uninventoried", "resource"), Severity.Info)); + new Message(MSG.view_inventory_resources_deleteSuccessful(), Severity.Info));
ResourceSearchView.this.refresh(); } diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index 34b2f47..e8bf31f 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -92,9 +92,6 @@ common_title_version = Version~
# Common Messages #-------------- -common_msg_actionConfirm = Are you sure you want to {0} the # selected {1}?~ -common_msg_actionFailure = Failed to {0} the selected {1}?~ -common_msg_actionSuccess = Successfully {0} the selected {1}?~ common_msg_areYouSure = Are You Sure?~ common_msg_deleteConfirm = Are you sure you want to delete the # selected {0}?~ common_msg_loading = Loading...~ @@ -435,6 +432,10 @@ view_inventory_groups_descendants=Descendants~ view_inventory_groups_deleteSuccessful=You have successfully deleted the selected resource groups~ view_inventory_groups_deleteFailed=Failed to delete the selected resource groups~ view_inventory_groups_loadFailed=Failed to load group composite data~ +view_inventory_resources_deleteConfirm=Are you sure you want to delete the selected resources?~ +view_inventory_resources_deleteSuccessful=You have successfully deleted the selected resources~ +view_inventory_resources_deleteFailed=Failed to delete the selected resources~ +view_inventory_resources_loadFailed=Failed to load resource composite data~ view_inventory_resources_title=Member Resources~ view_inventory_resources_title_children=Child Resources~ view_inventory_resources_title_members=Member Resources~
commit bc40dbfbf5afd397505a299f87101779a552234a Author: Joseph Marques joseph@redhat.com Date: Wed Nov 17 14:38:06 2010 -0500
i18n for org.rhq.enterprise.gui.coregui.client.inventory.resource
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java index b890997..33dd19b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java @@ -61,7 +61,7 @@ public class ResourceCompositeDataSource extends RPCDataSource<ResourceComposite protected List<DataSourceField> addDataSourceFields() { List<DataSourceField> fields = super.addDataSourceFields();
- DataSourceField idDataField = new DataSourceIntegerField("id", "ID", 50); + DataSourceField idDataField = new DataSourceIntegerField("id", MSG.common_title_id(), 50); idDataField.setPrimaryKey(true); idDataField.setCanEdit(false); fields.add(idDataField); @@ -102,7 +102,7 @@ public class ResourceCompositeDataSource extends RPCDataSource<ResourceComposite getResourceService().findResourceCompositesByCriteria(criteria, new AsyncCallback<PageList<ResourceComposite>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to fetch resource data", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_inventory_resources_loadFailed(), caught); response.setStatus(RPCResponse.STATUS_FAILURE); processResponse(request.getRequestId(), response); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java index 8d9e42b..9236ec3 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java @@ -53,49 +53,50 @@ public class ResourceCompositeSearchView extends ResourceSearchView {
super.configureTable();
- addTableAction(extendLocatorId("Delete"), "Delete", "Are you sure you want to delete # resources?", - new AbstractTableAction(TableActionEnablement.ANY) { - - // only enabled if all selected are a deletable type and if the user has delete permission - // on the resources. - public boolean isEnabled(ListGridRecord[] selection) { - boolean isEnabled = super.isEnabled(selection); - - if (isEnabled) { - for (ListGridRecord record : selection) { - ResourceComposite resComposite = (ResourceComposite) record - .getAttributeAsObject("resourceComposite"); - Resource res = resComposite.getResource(); - if (!(isEnabled = res.getResourceType().isDeletable())) { - break; - } - ResourcePermission resPermission = resComposite.getResourcePermission(); - if (!(isEnabled = resPermission.isDeleteResource())) { - break; - } + addTableAction(extendLocatorId("Delete"), MSG.common_button_delete(), MSG.common_msg_actionConfirm("delete", + "resources"), new AbstractTableAction(TableActionEnablement.ANY) { + + // only enabled if all selected are a deletable type and if the user has delete permission + // on the resources. + public boolean isEnabled(ListGridRecord[] selection) { + boolean isEnabled = super.isEnabled(selection); + + if (isEnabled) { + for (ListGridRecord record : selection) { + ResourceComposite resComposite = (ResourceComposite) record + .getAttributeAsObject("resourceComposite"); + Resource res = resComposite.getResource(); + if (!(isEnabled = res.getResourceType().isDeletable())) { + break; + } + ResourcePermission resPermission = resComposite.getResourcePermission(); + if (!(isEnabled = resPermission.isDeleteResource())) { + break; } } - return isEnabled; } + return isEnabled; + }
- public void executeAction(ListGridRecord[] selection, Object actionValue) { - int[] resourceIds = TableUtility.getIds(selection); - ResourceGWTServiceAsync resourceManager = GWTServiceLookup.getResourceService(); + public void executeAction(ListGridRecord[] selection, Object actionValue) { + int[] resourceIds = TableUtility.getIds(selection); + ResourceGWTServiceAsync resourceManager = GWTServiceLookup.getResourceService();
- resourceManager.deleteResources(resourceIds, new AsyncCallback<List<DeleteResourceHistory>>() { - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to delete all selected resources", caught); - } + resourceManager.deleteResources(resourceIds, new AsyncCallback<List<DeleteResourceHistory>>() { + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.common_msg_actionFailure("delete", "resources"), + caught); + }
- public void onSuccess(List<DeleteResourceHistory> result) { - CoreGUI.getMessageCenter().notify( - new Message("Successfully deleted " + result.size() + " resources", Severity.Info)); + public void onSuccess(List<DeleteResourceHistory> result) { + CoreGUI.getMessageCenter().notify( + new Message(MSG.common_msg_actionSuccess("deleted", "resources"), Severity.Info));
- ResourceCompositeSearchView.this.refresh(); - } - }); - } - }); + ResourceCompositeSearchView.this.refresh(); + } + }); + } + });
if (this.parentResourceComposite.getResourcePermission().isCreateChildResources()) { ResourceType parentType = parentResourceComposite.getResource().getResourceType(); @@ -108,14 +109,14 @@ public class ResourceCompositeSearchView extends ResourceSearchView { importTypeValueMap.put(childType.getName(), childType); } } - addTableAction(extendLocatorId("Import"), "Import...", null, importTypeValueMap, new AbstractTableAction( - TableActionEnablement.ALWAYS) { + addTableAction(extendLocatorId("Import"), MSG.common_button_import(), null, importTypeValueMap, + new AbstractTableAction(TableActionEnablement.ALWAYS) {
- public void executeAction(ListGridRecord[] selection, Object actionValue) { - ResourceFactoryImportWizard.showImportWizard(parentResourceComposite.getResource(), - (ResourceType) actionValue); - } - }); + public void executeAction(ListGridRecord[] selection, Object actionValue) { + ResourceFactoryImportWizard.showImportWizard(parentResourceComposite.getResource(), + (ResourceType) actionValue); + } + });
// creatable child type menu LinkedHashMap<String, ResourceType> createTypeValueMap = new LinkedHashMap<String, ResourceType>(); @@ -126,8 +127,8 @@ public class ResourceCompositeSearchView extends ResourceSearchView { } } if (!createTypeValueMap.isEmpty()) { - addTableAction(extendLocatorId("CreateChild"), "Create Child...", null, createTypeValueMap, - new AbstractTableAction(TableActionEnablement.ALWAYS) { + addTableAction(extendLocatorId("CreateChild"), MSG.common_button_create_child(), null, + createTypeValueMap, new AbstractTableAction(TableActionEnablement.ALWAYS) {
public void executeAction(ListGridRecord[] selection, Object actionValue) { ResourceFactoryCreateWizard.showCreateWizard(parentResourceComposite.getResource(), @@ -148,12 +149,12 @@ public class ResourceCompositeSearchView extends ResourceSearchView {
public static ResourceCompositeSearchView getChildrenOf(String locatorId, ResourceComposite parentResourceComposite) { return new ResourceCompositeSearchView(locatorId, parentResourceComposite, new Criteria("parentId", String - .valueOf(parentResourceComposite.getResource().getId())), "Child Resources"); + .valueOf(parentResourceComposite.getResource().getId())), MSG.view_inventory_resources_title_children()); }
public static ResourceCompositeSearchView getMembersOf(String locatorId, int groupId) { return new ResourceCompositeSearchView(locatorId, (ResourceComposite) null, new Criteria("groupId", String - .valueOf(groupId)), "Member Resources"); + .valueOf(groupId)), MSG.view_inventory_resources_title_members()); }
} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDataSourceField.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDataSourceField.java index be80e8e..b689133 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDataSourceField.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDataSourceField.java @@ -25,19 +25,21 @@ package org.rhq.enterprise.gui.coregui.client.inventory.resource;
import com.smartgwt.client.widgets.grid.ListGridField;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI; + public enum ResourceDataSourceField {
- NAME("name", "Name"), + NAME("name", CoreGUI.getMessages().common_title_name()),
- DESCRIPTION("description", "Description"), + DESCRIPTION("description", CoreGUI.getMessages().common_title_description()),
- TYPE("resourceType.name", "Type"), + TYPE("resourceType.name", CoreGUI.getMessages().common_title_type()),
- PLUGIN("pluginName", "Plugin"), + PLUGIN("pluginName", CoreGUI.getMessages().common_title_plugin()),
- CATEGORY("resourceType.category", "Category"), + CATEGORY("resourceType.category", CoreGUI.getMessages().common_title_category()),
- AVAILABILITY("currentAvailability", "Availability"); + AVAILABILITY("currentAvailability", CoreGUI.getMessages().common_title_availability());
/** * Corresponds to a property name of Resource (e.g. resourceType.name). diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java index 2a198a4..515c0b5 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java @@ -73,7 +73,7 @@ public class ResourceDatasource extends RPCDataSource<Resource> { protected List<DataSourceField> addDataSourceFields() { List<DataSourceField> fields = super.addDataSourceFields();
- DataSourceField idDataField = new DataSourceIntegerField("id", "ID", 50); + DataSourceField idDataField = new DataSourceIntegerField("id", MSG.common_title_id(), 50); idDataField.setPrimaryKey(true); idDataField.setCanEdit(false); fields.add(idDataField); @@ -113,7 +113,7 @@ public class ResourceDatasource extends RPCDataSource<Resource> {
resourceService.findResourcesByCriteria(criteria, new AsyncCallback<PageList<Resource>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to fetch resource data", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_inventory_resources_loadFailed(), caught); response.setStatus(RPCResponse.STATUS_FAILURE); processResponse(request.getRequestId(), response); } @@ -172,8 +172,8 @@ public class ResourceDatasource extends RPCDataSource<Resource> { record .setAttribute( AVAILABILITY.propertyName(), - from.getCurrentAvailability().getAvailabilityType() == AvailabilityType.UP ? - "/images/icons/availability_green_16.png" : "/images/icons/availability_red_16.png"); + from.getCurrentAvailability().getAvailabilityType() == AvailabilityType.UP ? "/images/icons/availability_green_16.png" + : "/images/icons/availability_red_16.png");
return record; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java index 49199db..d13d949 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java @@ -54,7 +54,7 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity; */ public class ResourceSearchView extends Table {
- private static final String DEFAULT_TITLE = "Resources"; + private static final String DEFAULT_TITLE = MSG.view_inventory_resources_title();
private List<ResourceSelectListener> selectListeners = new ArrayList<ResourceSelectListener>();
@@ -115,7 +115,7 @@ public class ResourceSearchView extends Table { @Override protected void configureTable() {
- ListGridField iconField = new ListGridField("icon", "Icon", 40); + ListGridField iconField = new ListGridField("icon", MSG.common_title_icon(), 40); iconField.setType(ListGridFieldType.IMAGE); iconField.setImageURLPrefix("types/");
@@ -142,28 +142,27 @@ public class ResourceSearchView extends Table { setListGridFields(iconField, nameField, descriptionField, typeNameField, pluginNameField, categoryField, availabilityField);
- addTableAction(extendLocatorId("Uninventory"), "Uninventory", - "Are you sure you want to uninventory # resources?", new AbstractTableAction(TableActionEnablement.ANY) { - public void executeAction(ListGridRecord[] selection, Object actionValue) { - int[] resourceIds = TableUtility.getIds(selection); - ResourceGWTServiceAsync resourceManager = GWTServiceLookup.getResourceService(); - - resourceManager.uninventoryResources(resourceIds, new AsyncCallback<List<Integer>>() { - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to uninventory selected resources", caught); - } - - public void onSuccess(List<Integer> result) { - CoreGUI.getMessageCenter() - .notify( - new Message("Successfully uninventoried " + result.size() + " resources", - Severity.Info)); - - ResourceSearchView.this.refresh(); - } - }); - } - }); + addTableAction(extendLocatorId("Uninventory"), MSG.common_button_uninventory(), MSG.common_msg_actionConfirm( + "uninventory", "resources"), new AbstractTableAction(TableActionEnablement.ANY) { + public void executeAction(ListGridRecord[] selection, Object actionValue) { + int[] resourceIds = TableUtility.getIds(selection); + ResourceGWTServiceAsync resourceManager = GWTServiceLookup.getResourceService(); + + resourceManager.uninventoryResources(resourceIds, new AsyncCallback<List<Integer>>() { + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.common_msg_actionFailure("uninventory", "resource"), + caught); + } + + public void onSuccess(List<Integer> result) { + CoreGUI.getMessageCenter().notify( + new Message(MSG.common_msg_actionSuccess("uninventoried", "resource"), Severity.Info)); + + ResourceSearchView.this.refresh(); + } + }); + } + });
/*searchBox.addKeyPressHandler(new KeyPressHandler() { public void onKeyPress(KeyPressEvent event) { @@ -196,12 +195,13 @@ public class ResourceSearchView extends Table { // -------- Static Utility loaders ------------
public static ResourceSearchView getChildrenOf(String locatorId, int resourceId) { - return new ResourceSearchView(locatorId, new Criteria("parentId", String.valueOf(resourceId)), - "Child Resources"); + return new ResourceSearchView(locatorId, new Criteria("parentId", String.valueOf(resourceId)), MSG + .view_inventory_resources_title_children()); }
public static ResourceSearchView getMembersOf(String locatorId, int groupId) { - return new ResourceSearchView(locatorId, new Criteria("groupId", String.valueOf(groupId)), "Member Resources"); + return new ResourceSearchView(locatorId, new Criteria("groupId", String.valueOf(groupId)), MSG + .view_inventory_resources_title_members()); }
} diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index e31f8b2..34b2f47 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -17,10 +17,12 @@ common_button_advanced = Advanced...~ common_button_apply = Apply~ common_button_cancel = Cancel~ common_button_close = Close~ +common_button_create_child = Create Child~ common_button_delete = Delete~ common_button_disable = Disable~ common_button_enable = Enable~ common_button_finish = Finish~ +common_button_import = Import~ common_button_new = New~ common_button_next = Next~ common_button_ok = OK~ @@ -30,6 +32,7 @@ common_button_refresh = "Refresh"~ common_button_reset = Reset~ common_button_save = Save~ common_button_search = Search~ +common_button_uninventory = Uninventory~
# Common Labels @@ -89,6 +92,9 @@ common_title_version = Version~
# Common Messages #-------------- +common_msg_actionConfirm = Are you sure you want to {0} the # selected {1}?~ +common_msg_actionFailure = Failed to {0} the selected {1}?~ +common_msg_actionSuccess = Successfully {0} the selected {1}?~ common_msg_areYouSure = Are You Sure?~ common_msg_deleteConfirm = Are you sure you want to delete the # selected {0}?~ common_msg_loading = Loading...~ @@ -429,6 +435,9 @@ view_inventory_groups_descendants=Descendants~ view_inventory_groups_deleteSuccessful=You have successfully deleted the selected resource groups~ view_inventory_groups_deleteFailed=Failed to delete the selected resource groups~ view_inventory_groups_loadFailed=Failed to load group composite data~ +view_inventory_resources_title=Member Resources~ +view_inventory_resources_title_children=Child Resources~ +view_inventory_resources_title_members=Member Resources~ view_dynagroup_expressionSet=Expression Set~ view_dynagroup_recalculationInterval=Recalculation Interval~ view_dynagroup_lastCalculationTime=Last Calculation Time~
commit c883764a7c21cc5d07e284717088ba3dfdf5bdf9 Author: Ian Springer ian.springer@redhat.com Date: Wed Nov 17 14:32:50 2010 -0500
i18n
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/ErrorHandler.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/ErrorHandler.java index 0e1aeb4..52971d7 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/ErrorHandler.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/ErrorHandler.java @@ -21,6 +21,7 @@ package org.rhq.enterprise.gui.coregui.client.util; import java.util.ArrayList;
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;
/** @@ -29,6 +30,8 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message; */ public class ErrorHandler {
+ protected static final Messages MSG = CoreGUI.getMessages(); + public void handleError(String message) { handleError(message, null); } @@ -57,7 +60,7 @@ public class ErrorHandler { indent = indent + " "; } } else { - results.append(">> exception was null <<"); + results.append(">> " + MSG.util_errorHandler_nullException() + " <<"); }
return results.toString(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/FormUtility.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/FormUtility.java index 9f118a7..26e67a8 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/FormUtility.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/FormUtility.java @@ -27,8 +27,9 @@ import com.smartgwt.client.widgets.form.fields.FormItem; * @author Joseph Marques */ public class FormUtility { + private FormUtility() { - // statuc utility class only + // static utility class only }
public static String getStringSafely(FormItem item) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/HighlightingDatasourceTextField.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/HighlightingDatasourceTextField.java index 7eb6a62..0e9dfca 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/HighlightingDatasourceTextField.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/HighlightingDatasourceTextField.java @@ -44,4 +44,5 @@ public class HighlightingDatasourceTextField extends DataSourceTextField { public HighlightingDatasourceTextField(String name) { super(name); } + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/MeasurementUtility.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/MeasurementUtility.java index 1dd89ce..001d685 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/MeasurementUtility.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/MeasurementUtility.java @@ -1,5 +1,3 @@ -package org.rhq.enterprise.gui.coregui.client.util; - /* * RHQ Management Platform * Copyright (C) 2005-2010 Red Hat, Inc. @@ -18,6 +16,8 @@ package org.rhq.enterprise.gui.coregui.client.util; * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +package org.rhq.enterprise.gui.coregui.client.util; + import java.util.ArrayList; import java.util.List;
@@ -25,8 +25,8 @@ import com.google.gwt.i18n.client.DateTimeFormat;
public class MeasurementUtility {
- private static DateTimeFormat formatter = DateTimeFormat.getFormat("MMM d, hh:mm a"); - private static DateTimeFormat formatterYear = DateTimeFormat.getFormat("MMM d, yyyy hh:mm a"); + private static final DateTimeFormat FORMATTER = DateTimeFormat.getFormat("MMM d, hh:mm a"); + private static final DateTimeFormat FORMATTER_YEAR = DateTimeFormat.getFormat("MMM d, yyyy hh:mm a");
//Time constants public static final int UNIT_COLLECTION_POINTS = 1; @@ -43,16 +43,15 @@ public class MeasurementUtility { public static final long WEEKS = 604800000;
/** - * five minutes in millisecond increments + * one year in milliseconds */ - public static final long FIVE_MINUTES = 300000; public static final long ONE_YEAR = WEEKS * 52;
/** * Method calculateTimeFrame * <p/> - * Returns a two element<code>List</code> of <code>Long</code> objects representing the begin and end times (in - * milliseconds since the epoch) of the timeframe. Returns null instead if the time unit is indicated as + * Returns a two element <code>List</code> of <code>Long</code> objects representing the begin and end times (in + * milliseconds since the epoch) of the time frame. Returns null instead if the time unit is indicated as * <code>UNIT_COLLECTION_POINTS</code>. Ported to GWT from MeasurementUtils(i:server side dep * ii:old DateFormat doesn't play well with GWT). * @@ -103,7 +102,7 @@ public class MeasurementUtility { * @return DateTimeFormat */ public static DateTimeFormat getDateTimeFormatter() { - return formatter; + return FORMATTER; }
/**Utility to return shared DateTimeFormat("MMM d, yyyy hh:mm a"); @@ -111,7 +110,7 @@ public class MeasurementUtility { * @return DateTimeFormat */ public static DateTimeFormat getDateTimeYearFormatter() { - return formatterYear; + return FORMATTER_YEAR; }
} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java index 3fcdd3b..f86063e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java @@ -122,7 +122,8 @@ public abstract class RPCDataSource<T> extends DataSource { break; } } catch (Throwable t) { - CoreGUI.getErrorHandler().handleError("Failure in datasource [" + request.getOperationType() + "]", t); + CoreGUI.getErrorHandler().handleError(MSG.dataSource_rpc_error_transformRequestFailure( + request.getOperationType().name()), t); return null; } return request.getData(); @@ -419,7 +420,7 @@ public abstract class RPCDataSource<T> extends DataSource { resultArray = (S[]) new Integer[intermediates.length]; int index = 0; for (int next : intermediates) { - resultArray[index++] = (S) (Integer) next; + resultArray[index++] = (S) next; } } else if (type == String.class) { String[] intermediates = criteria.getAttributeAsStringArray(paramName); @@ -434,12 +435,12 @@ public abstract class RPCDataSource<T> extends DataSource { for (String next : intermediates) { buffer.add((S) Enum.valueOf((Class<? extends Enum>) type, next)); } - resultArray = buffer.toArray((S[]) getEnumArray(type, buffer.size())); + resultArray = buffer.toArray(getEnumArray(type, buffer.size())); } else { - throw new IllegalArgumentException("No support for passing array filters of type " + type); + throw new IllegalArgumentException(MSG.dataSource_rpc_error_unsupportedArrayFilterType(type.getName())); }
- com.allen_sauer.gwt.log.client.Log.debug("Result array = " + resultArray); + Log.debug("Result array = " + resultArray);
return resultArray; } @@ -453,8 +454,7 @@ public abstract class RPCDataSource<T> extends DataSource { } else if (genericEnumType == EventSeverity.class) { return (S[]) new EventSeverity[size]; } else { - throw new IllegalArgumentException("Please add an appropriate code block for enum " + genericEnumType - + " to RPCDataSource.getEnumArray(Class)"); + throw new IllegalArgumentException(MSG.dataSource_rpc_error_unsupportedEnumType(genericEnumType.getName())); } }
@@ -506,8 +506,8 @@ public abstract class RPCDataSource<T> extends DataSource { textField.setLength(Boolean.FALSE.toString().length()); textField.setRequired(required); LinkedHashMap<String, String> valueMap = new LinkedHashMap<String, String>(); - valueMap.put(Boolean.TRUE.toString(), "yes"); - valueMap.put(Boolean.FALSE.toString(), "no"); + valueMap.put(Boolean.TRUE.toString(), MSG.dataSource_rpc_yes()); + valueMap.put(Boolean.FALSE.toString(), MSG.dataSource_rpc_no()); textField.setValueMap(valueMap); return textField; } @@ -519,4 +519,5 @@ public abstract class RPCDataSource<T> extends DataSource { protected boolean userStillLoggedIn() { return UserSessionManager.isLoggedIn(); } + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/StringUtility.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/StringUtility.java index 14ce7e6..8cd92bc 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/StringUtility.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/StringUtility.java @@ -27,6 +27,7 @@ package org.rhq.enterprise.gui.coregui.client.util; * @author Ian Springer */ public class StringUtility { + public static String pluralize(String singularNoun) { String pluralNoun; if (singularNoun.endsWith("y") && !singularNoun.endsWith("ay") && !singularNoun.endsWith("ey") diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/TableUtility.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/TableUtility.java index 602595d..154776b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/TableUtility.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/TableUtility.java @@ -30,8 +30,9 @@ import org.rhq.enterprise.gui.coregui.client.components.table.Table; * @author Joseph Marques */ public class TableUtility { + private TableUtility() { - // statuc utility class only + // static utility class only }
public static int[] getIds(ListGridRecord[] selections) { @@ -51,4 +52,5 @@ public class TableUtility { } return ids; } + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/TreeUtility.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/TreeUtility.java index 17049a8..2917f6d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/TreeUtility.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/TreeUtility.java @@ -28,6 +28,7 @@ import org.rhq.enterprise.gui.coregui.client.components.tree.EnhancedTreeNode; * @author Ian Springer */ public class TreeUtility { + public static void printTree(Tree tree) { TreeNode rootNode = tree.getRoot(); printTreeNode(tree, rootNode); @@ -66,4 +67,5 @@ public class TreeUtility {
private TreeUtility() { } + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/WidgetUtility.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/WidgetUtility.java index 5714634..43d56cb 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/WidgetUtility.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/WidgetUtility.java @@ -18,6 +18,7 @@ */ package org.rhq.enterprise.gui.coregui.client.util;
+import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.user.client.ui.Widget; import com.smartgwt.client.widgets.BaseWidget; import com.smartgwt.client.widgets.Canvas; @@ -35,6 +36,7 @@ import java.util.List; * @author Ian Springer */ public class WidgetUtility { + private WidgetUtility() { }
@@ -165,7 +167,7 @@ public class WidgetUtility { indent.append(" "); }
- com.allen_sauer.gwt.log.client.Log.info(indent + simpleClassName + "[id=" + id + ", title=" + title + ", flags=[" + flags + "]]"); + Log.info(indent + simpleClassName + "[id=" + id + ", title=" + title + ", flags=[" + flags + "]]"); }
private static List<Widget> getChildren(Widget widget) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/WidgetsField.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/WidgetsField.java index ba8413a..9f64d17 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/WidgetsField.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/WidgetsField.java @@ -20,12 +20,13 @@ * 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;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI; + public enum WidgetsField {
- UNLIMITED("unlimited", "Unlimited"); + UNLIMITED("unlimited", CoreGUI.getMessages().util_widgetsField_unlimited());
// DESCRIPTION("description", "Description"), // diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index 3b31689..e31f8b2 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -70,11 +70,14 @@ common_title_lastUpdatedBy=Last Updated By~ common_title_metric = Metric~ common_title_mixedGroups = Mixed Groups~ common_title_name = Name~ +common_title_operations_range=Operation Range~ common_title_plugin = Plugin~ common_title_recently_added = Recently Added Resources~ +common_title_recent_operations=Recent Operations~ common_title_resource = Resource~ common_title_resource_inventory=Resource Inventory~ common_title_resource_name=Resource Name~ +common_title_scheduled_operations=Scheduled Operations~ common_title_selected_resources=Selected Resources~ common_title_start = Start~ common_title_status=Status~ @@ -136,9 +139,35 @@ util_monitoringRequestCallback_error_checkServerStatusFailure = Unable to determ #---------------------- util_rpcManager_activeRequests = {0} Active Requests~
+# User Permissions Manager +#-------------------------- +util_userPerm_loadFailGlobal = Failed to load your global permissions - none granted.~ +util_userPerm_loadFailGroup = Failed to load your permissions for Resource Group with id [{0}] - none granted.~ +util_userPerm_loadFailResource = Failed to load your permissions for Resource with id [{0}] - none granted.~ + +# User Session Manager +#-------------------------- +util_userSession_loadFailSubject = UserSessionManager: Failed to load user Subject~ +util_userSession_logoutFail = Failed to logout.~ + +# Error Handler +#-------------------- +util_errorHandler_nullException = exception was null~ + +# Widgets Field +#--------------------- +util_widgetsField_unlimited = Unlimited~
#================== DataSources ====================
+# RPC (abstract) +#----------------------- +dataSource_rpc_error_transformRequestFailure = Failure in datasource while processing {0} request.~ +dataSource_rpc_error_unsupportedArrayFilterType = No support for passing array filters of type {0}.~ +dataSource_rpc_error_unsupportedEnumType = Please add an appropriate code block for enum {0} to RPCDataSource.getEnumArray(Class)~ +dataSource_rpc_yes = yes~ +dataSource_rpc_no = no~ + # ContentRepositoryTree #------ dataSource_ContentRepoTree_error_load = Error loading repositories~ @@ -228,6 +257,19 @@ dataSource_scheduledOperations_error_fetchFailure = Failed to load scheduled ope
#================= Administration ==================
+view_admin_administration = Administration~ +view_admin_affinityGroups = Affinity Groups~ +view_admin_agents = Agents~ +view_admin_configuration = Configuration~ +view_admin_downloads = Downloads~ +view_admin_license = License~ +view_admin_paritionEvents = Partition Events~ +view_admin_plugins = Plugins~ +view_admin_security = Security~ +view_admin_servers = Servers~ +view_admin_systemSettings = System Settings~ +view_admin_templates = Templates~ +view_admin_topology = Topology~
# Administration/Security/Users #------------------------------ @@ -339,6 +381,10 @@ view_portlet_graph_help_msg = This Portlet supports the graphing of a resource m view_portlet_graph_help_title = Graph Portlet~ view_portlet_graph_help_unconfigured=This graph is unconfigured, click the settings button to configure.~ view_portlet_graph_title = Resource Graph~ +view_portlet_operations_config_completed=completed operations~ +view_portlet_operations_config_show_last=show Last~ +view_portlet_operations_disabled=(Results currently disabled. Change settings to enable results.~ +view_portlet_operations_help_msg=This portlet displays both operations that have occurred and are scheduled to occur.~ view_portlet_platform_help_msg = This portlet displays information about platforms in inventory.~ view_portlet_platform_platform_error_1 = Failed to load platform metrics~ view_portlet_platform_title = Platforms Summary~ @@ -522,23 +568,36 @@ view_testTop_description = This section contains pages for testing various GUI c
#=================== Top Level =====================
+# About Box +#---------- +view_aboutBox_allRightsReserved = All Rights Reserved.~ +view_aboutBox_buildNumber = Build Number:~ +view_aboutBox_failedToLoad = Failed to load product information.~ +view_aboutBox_homepage = Homepage~ +view_aboutBox_jbossByRedHat = JBoss by Red Hat~ +view_aboutBox_title = About {0}~ +view_aboutBox_version = Version:~ + # CoreGUI #-------------- view_core_error_1 = New Alerts lookup failed~ view_core_loggedInAs = Logged in as {0}~ view_core_loggedOut = Logged out~ view_core_recentAlerts = [{0}] recent alerts~ -view_core_registerLater = (Logout - Complete registration later.)~ -view_core_registerLdapSuccess = Succesfully registered the new LDAP User.~ -view_core_registerUser = Register User~ view_core_uncaught = Globally uncaught exception~
# Login #-------------- +view_login_invalidEmail = Invalid e-mail address~ view_login_login = Login~ view_login_logout = Logout~ +view_login_noBackend = The backend datasource is unavailable.~ view_login_noLdap = Note: Optional retrieval of ldap details unsuccessful. Manual entry is required.~ +view_login_noUser = The username or password provided does not match our records.~ view_login_prompt = Please Login~ +view_login_registerLater = (Logout - Complete registration later.)~ +view_login_registerLdapSuccess = Succesfully registered the new LDAP User.~ +view_login_registerUser = Register User~ view_login_welcome = Welcome to JBoss ON! <br/><br/> Enter/update the following fields to complete your registration process.<br/> Once you click "OK" you will be logged in.<br/><br/>~
@@ -547,7 +606,7 @@ view_login_welcome = Welcome to JBoss ON! <br/><br/> Enter/update the following view_menuBar_help = Help~ view_menuBar_logout = Logout~
-# Search Bar +# Search Bar, GUI #----------------- view_searchBar_search = Search~ view_searchBar_resources = Resources~ @@ -557,6 +616,8 @@ view_searchBar_welcomeMessage = search for {0}s~ view_searchBar_defaultPattern = name your pattern~ view_searchBar_error_selectSavedSearch = ''Error selecting saved search''~
+view_searchGUI_loginStatus = Unable to determine login status, check server status~ + # Message Center #-------------------------- view_messageCenter_button_messages = Messages~ @@ -565,13 +626,3 @@ view_messageCenter_messageTitle= Title~ view_messageCenter_messageSeverity= Severity~ view_messageCenter_messageTime= Time~ view_messageCenter_messageDetail= Detail~ - -# About Box -#---------- -view_aboutBox_allRightsReserved = All Rights Reserved.~ -view_aboutBox_buildNumber = Build Number:~ -view_aboutBox_failedToLoad = Failed to load product information.~ -view_aboutBox_homepage = Homepage~ -view_aboutBox_jbossByRedHat = JBoss by Red Hat~ -view_aboutBox_title = About {0}~ -view_aboutBox_version = Version:~
commit 628599d6a231b4a35221b421bac367fdfb1aa07b Merge: be24d10... dfc0b48... Author: Simeon Pinder spinder@redhat.com Date: Wed Nov 17 14:10:39 2010 -0500
Merge branch 'track-master2'
commit be24d107b182042a5917f3bde7afff807ee8c30e Author: Joseph Marques joseph@redhat.com Date: Wed Nov 17 13:52:28 2010 -0500
example showing support for i18n via GWT java interface classes
* TestMessages is the interface class that defines translation for the default locale (in this case 'en') * TestMessages_<locale>.propertie define other supported locales * The module's *.gwt.xml file must specify the list of supported locales, which will determine how many different permutations will be compiled * TestPluralizationView shows how pluralization rules work across locales.. For English, visit /coregui/CoreGUI.html#Test/Misc/PluralizationTest or /coregui/CoreGUI.html?locale=en#Test/Misc/PluralizationTest For German, visit /coregui/CoreGUI.html?locale=de#Test/Misc/PluralizationTest For French, visit /coregui/CoreGUI.html?locale=fr#Test/Misc/PluralizationTest
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/i18n/TestMessages.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/i18n/TestMessages.java new file mode 100644 index 0000000..6ffba7c --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/i18n/TestMessages.java @@ -0,0 +1,57 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2010 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 as published by + * the Free Software Foundation version 2 of the License. + * + * 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 for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.i18n; + +import com.google.gwt.i18n.client.Messages; +import com.google.gwt.i18n.client.LocalizableResource.DefaultLocale; + +/* + * @PluralText takes an array of strings. The even indexes represent plural form names, while the odd indexes + * correspond to the text for the associated plural form. Example: + * + * @PluralText( { "one", "There is a single item in your cart.", + * "two", "There are two items in your cart.", + * "few", "There are a few items in your cart.", + * "many", "There are many items in your cart." } ) + * + * As of GWT 2.0.4, the following plural forms exist: + * + * none one two eighteleven + * few paucal many other + * + * However, not all of them are applicable to each locale. When implementing a new localization, refer to the + * appropriate subclass of "com.google.gwt.i18n.client.impl.plurals.DefaultRule" to obtain the necessary plural + * form subset which must be implemented to correctly support that locale. + * + * The rules implemented in these various subclasses are taken from: + * + * http://translate.sourceforge.net/wiki/l10n/pluralforms + */ +@DefaultLocale("en") +public interface TestMessages extends Messages { + + /** + * @param subject the name of the user + * @param cartItems the number of cart items + * @return a message specifying the number of items in the user's cart + */ + @DefaultMessage("{0}, there are {1,number} items in your cart") + @PluralText( { "one", "{0}, there is {1,number} item in your cart" }) + String cartLabel(String subject, @PluralCount int cartItems); +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/i18n/TestMessages_de.properties b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/i18n/TestMessages_de.properties new file mode 100644 index 0000000..2a8b4b8 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/i18n/TestMessages_de.properties @@ -0,0 +1,2 @@ +cartLabel = {0}, there are {1} items in your German cart +cartLabel[one] = {0}, there is {1} item in your German cart \ No newline at end of file diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/i18n/TestMessages_fr.properties b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/i18n/TestMessages_fr.properties new file mode 100644 index 0000000..1ff16a6 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/i18n/TestMessages_fr.properties @@ -0,0 +1,2 @@ +cartLabel = {0}, there are {1} items in your French cart +cartLabel[one] = {0}, there is {1} item in your French cart \ No newline at end of file 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 cf617f8..d1e1c85 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 @@ -32,6 +32,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.selection.Resour import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeTreeView; import org.rhq.enterprise.gui.coregui.client.test.configuration.TestConfigurationView; import org.rhq.enterprise.gui.coregui.client.test.configuration.TestGroupConfigurationView; +import org.rhq.enterprise.gui.coregui.client.test.i18n.TestPluralizationView;
/** * 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 @@ -55,6 +56,10 @@ public class TestTopView extends AbstractSectionedLeftNavigationView { private static final String PAGE_CONFIG_EDITOR = "ConfigEditor"; private static final String PAGE_GROUP_CONFIG_EDITOR = "GroupConfigEditor";
+ // view IDs for Misc section + private static final String MISC_SECTION_VIEW_ID = "Misc"; + private static final String PAGE_PLURALIZATION_TEST = "PluralizationTest"; + public TestTopView() { // This is a top level view, so our locator id can simply be our view id. super(VIEW_ID); @@ -77,19 +82,20 @@ public class TestTopView extends AbstractSectionedLeftNavigationView { NavigationSection configurationSection = buildConfigurationSection(); sections.add(configurationSection);
+ NavigationSection miscSection = buildMiscSection(); + sections.add(miscSection); + return sections; }
private NavigationSection buildInventorySection() { - NavigationItem resourceSelectorItem = new NavigationItem(PAGE_RESOURCE_SELECTOR, null, - new ViewFactory() { + NavigationItem resourceSelectorItem = new NavigationItem(PAGE_RESOURCE_SELECTOR, null, new ViewFactory() { public Canvas createView() { return new ResourceSelector(extendLocatorId(PAGE_RESOURCE_SELECTOR)); } });
- NavigationItem typeTreeItem = new NavigationItem(PAGE_TYPE_TREE, null, - new ViewFactory() { + NavigationItem typeTreeItem = new NavigationItem(PAGE_TYPE_TREE, null, new ViewFactory() { public Canvas createView() { return new ResourceTypeTreeView(extendLocatorId(PAGE_TYPE_TREE)); } @@ -99,15 +105,13 @@ public class TestTopView extends AbstractSectionedLeftNavigationView { }
private NavigationSection buildConfigurationSection() { - NavigationItem configEditorItem = new NavigationItem(PAGE_CONFIG_EDITOR, null, - new ViewFactory() { + NavigationItem configEditorItem = new NavigationItem(PAGE_CONFIG_EDITOR, null, new ViewFactory() { public Canvas createView() { return new TestConfigurationView(extendLocatorId(PAGE_CONFIG_EDITOR)); } });
- NavigationItem groupConfigEditorItem = new NavigationItem(PAGE_GROUP_CONFIG_EDITOR, null, - new ViewFactory() { + NavigationItem groupConfigEditorItem = new NavigationItem(PAGE_GROUP_CONFIG_EDITOR, null, new ViewFactory() { public Canvas createView() { return new TestGroupConfigurationView(extendLocatorId(PAGE_GROUP_CONFIG_EDITOR)); } @@ -115,4 +119,14 @@ public class TestTopView extends AbstractSectionedLeftNavigationView {
return new NavigationSection(CONFIGURATION_SECTION_VIEW_ID, configEditorItem, groupConfigEditorItem); } + + private NavigationSection buildMiscSection() { + NavigationItem pluralizationItem = new NavigationItem(PAGE_PLURALIZATION_TEST, null, new ViewFactory() { + public Canvas createView() { + return new TestPluralizationView(extendLocatorId(PAGE_PLURALIZATION_TEST)); + } + }); + + return new NavigationSection(MISC_SECTION_VIEW_ID, pluralizationItem); + } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/i18n/TestPluralizationView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/i18n/TestPluralizationView.java new file mode 100644 index 0000000..fa237ef --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/i18n/TestPluralizationView.java @@ -0,0 +1,62 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2010 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 as published by + * the Free Software Foundation version 2 of the License. + * + * 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 for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.test.i18n; + +import com.google.gwt.core.client.GWT; +import com.smartgwt.client.widgets.Label; + +import org.rhq.enterprise.gui.coregui.client.i18n.TestMessages; +import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; + +/** + * A test class to show how GWT-based i18n can support pluralization + * + * @author Joseph Marques + */ +public class TestPluralizationView extends LocatableVLayout { + + public TestPluralizationView(String locatorId) { + super(locatorId); + } + + @Override + protected void onDraw() { + super.onDraw(); + build(); + } + + public void build() { + TestMessages testMessages = GWT.create(TestMessages.class); + + StringBuilder text = new StringBuilder(); + String subject = "rhqadmin"; + for (int cartItems = 0; cartItems < 5; cartItems++) { + if (cartItems != 0) { + text.append("<br/>"); + } + String nextText = "Count " + cartItems + " --> " + testMessages.cartLabel(subject, cartItems); + text.append(nextText); + } + + Label label = new Label(text.toString()); + label.setWrap(false); + addMember(label); + } + +} diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml index 13f4660..dce2135 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml @@ -86,11 +86,15 @@ --> <set-property name="user.agent" value="${gwt.userAgent}"/>
+ <!-- Support for locales ('en' need not be specified as long as @DefaultLocale annotates + the Constants, ConstantsWithLookup, and Messages class). Note, these other locales + must have a file suffixed with _<locale>.properties in the same package/directory as + the corresponding GWT i18n interface class resides.--> + <extend-property name="locale" values="de,fr"/>
<entry-point class='org.rhq.enterprise.gui.coregui.client.CoreGUI'/> <entry-point class='org.rhq.enterprise.gui.coregui.client.SearchGUI'/>
- <servlet path="/AlertGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.AlertGWTServiceImpl"/> <servlet path="/AlertDefinitionGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.AlertDefinitionGWTServiceImpl"/> <servlet path="/AlertTemplateGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.AlertTemplateGWTServiceImpl"/>
commit 76d2848c5aa34c4eae987c91225974c6727f1217 Author: Joseph Marques joseph@redhat.com Date: Tue Nov 16 15:47:46 2010 -0500
add support for rendering interationalized characters in coregui
* note: all relevant source and .properties files should be set to UTF-8 in your IDE of choice
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html index 5dd3c64..de84de2 100644 --- a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html +++ b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html @@ -8,6 +8,8 @@ var isomorphicDir = "org.rhq.enterprise.gui.coregui.CoreGUI/sc/"; </script>
+ <!-- support internationalized characters --> + <meta http-equiv="content-type" content="text/html;charset=utf-8" />
<link rel="stylesheet" href="CoreGUI.css">
commit dfc0b48ba5ddbef667a01137ef8f781ba211dcd1 Merge: 8915cfc... c19cf49... Author: Simeon Pinder spinder@redhat.com Date: Wed Nov 17 13:46:03 2010 -0500
Merge branch 'master' of ssh://spinder@git.fedorahosted.org/git/rhq/rhq into track-master2
commit c19cf499eab342221de175ce53cb752a6d78467c Author: Ian Springer ian.springer@redhat.com Date: Wed Nov 17 12:20:37 2010 -0500
more i18n
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationsPortlet.java index 2484d63..fe4bead 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationsPortlet.java @@ -101,11 +101,11 @@ public class OperationsPortlet extends LocatableVLayout implements CustomSetting recentOperationsGrid.setTitle(recentOperations); recentOperationsGrid.setWidth100(); //defining header span - String[] completedRows = new String[] { RecentOperationsDataSource.location, - RecentOperationsDataSource.operation, RecentOperationsDataSource.resource, - RecentOperationsDataSource.status, RecentOperationsDataSource.time }; + String[] completedRows = new String[] { RecentOperationsDataSource.FIELD_LOCATION, + RecentOperationsDataSource.FIELD_OPERATION, RecentOperationsDataSource.FIELD_RESOURCE, + RecentOperationsDataSource.FIELD_STATUS, RecentOperationsDataSource.FIELD_TIME}; recentOperationsGrid.setHeaderSpans(new HeaderSpan(recentOperations, completedRows)); - recentOperationsGrid.setHeaderSpanHeight(new Integer(20)); + recentOperationsGrid.setHeaderSpanHeight(20); recentOperationsGrid.setHeaderHeight(40); recentOperationsGrid.setResizeFieldsInRealTime(true); recentOperationsGrid.setCellHeight(50); @@ -118,11 +118,11 @@ public class OperationsPortlet extends LocatableVLayout implements CustomSetting scheduledOperationsGrid.setAutoFetchData(true); scheduledOperationsGrid.setTitle(scheduledOperations); scheduledOperationsGrid.setWidth100(); - String[] scheduledRows = new String[] { ScheduledOperationsDataSource.location, - ScheduledOperationsDataSource.operation, ScheduledOperationsDataSource.resource, - ScheduledOperationsDataSource.time }; + String[] scheduledRows = new String[] { ScheduledOperationsDataSource.FIELD_LOCATION, + ScheduledOperationsDataSource.FIELD_OPERATION, ScheduledOperationsDataSource.FIELD_RESOURCE, + ScheduledOperationsDataSource.FIELD_TIME }; scheduledOperationsGrid.setHeaderSpans(new HeaderSpan(scheduledOperations, scheduledRows)); - scheduledOperationsGrid.setHeaderSpanHeight(new Integer(20)); + scheduledOperationsGrid.setHeaderSpanHeight(20); scheduledOperationsGrid.setHeaderHeight(40);
scheduledOperationsGrid.setTitle(scheduledOperations); @@ -142,7 +142,7 @@ public class OperationsPortlet extends LocatableVLayout implements CustomSetting if ((property != null) && (property.getStringValue() != null)) { //retrieve and translate to int String retrieved = property.getStringValue(); - if (retrieved.equals(unlimited)) { + if (unlimited.equals(retrieved)) { getDataSourceCompleted().setOperationsRangeCompleted(-1); } else { getDataSourceCompleted().setOperationsRangeCompleted(Integer.parseInt(retrieved)); @@ -156,7 +156,7 @@ public class OperationsPortlet extends LocatableVLayout implements CustomSetting if ((property != null) && (property.getStringValue() != null)) { //retrieve and translate to int String retrieved = property.getStringValue(); - if (retrieved.equals(unlimited)) { + if (unlimited.equals(retrieved)) { getDataSourceScheduled().setOperationsRangeScheduled(-1); } else { getDataSourceScheduled().setOperationsRangeScheduled(Integer.parseInt(retrieved)); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/RecentOperationsDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/RecentOperationsDataSource.java index 46878e8..8705262 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/RecentOperationsDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/RecentOperationsDataSource.java @@ -1,5 +1,3 @@ -package org.rhq.enterprise.gui.coregui.client.operation; - /* * RHQ Management Platform * Copyright (C) 2005-2010 Red Hat, Inc. @@ -18,6 +16,8 @@ package org.rhq.enterprise.gui.coregui.client.operation; * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +package org.rhq.enterprise.gui.coregui.client.operation; + import java.util.Date; import java.util.List;
@@ -41,25 +41,27 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.resource.disambiguation.ReportDecorator; import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
-/** Responsible for defining and populating the Smart GWT datasource details and - * translating the deserialized content into specific record entries for display +/** + * Responsible for defining and populating the Smart GWT datasource details and + * translating the deserialized content into specific record entries for display * * @author Simeon Pinder */ public class RecentOperationsDataSource extends RPCDataSource<DisambiguationReport<ResourceOperationLastCompletedComposite>> { - //ui keys - public static final String resource = "resource"; - public static final String location = "location"; - public static final String operation = "operation"; - public static final String time = "time"; - public static final String status = "status"; + + // fields + public static final String FIELD_RESOURCE = "resource"; + public static final String FIELD_LOCATION = "location"; + public static final String FIELD_OPERATION = "operation"; + public static final String FIELD_TIME = "time"; + public static final String FIELD_STATUS = "status"; + private Portlet portlet;
//config attributes private boolean operationsRangeLastEnabled = false; - private int operationsRangeCompleted = -1; - public static String RANGE_DISABLED_MESSAGE = "(Results currently disabled. Change settings to enable results.)"; + private int operationsRangeCompleted = -1;
/** Build list of fields for the datasource and then adds them to it. */ @@ -74,20 +76,25 @@ public class RecentOperationsDataSource extends protected List<DataSourceField> addDataSourceFields() { List<DataSourceField> fields = super.addDataSourceFields();
- DataSourceTextField resourceField = new DataSourceTextField(resource, "Resource"); + DataSourceTextField resourceField = new DataSourceTextField(FIELD_RESOURCE, + MSG.dataSource_recentOperations_field_resource()); resourceField.setPrimaryKey(true); fields.add(resourceField);
- DataSourceTextField locationField = new DataSourceTextField(location, "Location", 200); + DataSourceTextField locationField = new DataSourceTextField(FIELD_LOCATION, + MSG.dataSource_recentOperations_field_location(), 200); fields.add(locationField);
- DataSourceTextField operationField = new DataSourceTextField(operation, "Operation"); + DataSourceTextField operationField = new DataSourceTextField(FIELD_OPERATION, + MSG.dataSource_recentOperations_field_operation()); fields.add(operationField);
- DataSourceDateTimeField timeField = new DataSourceDateTimeField(time, "Date/Time"); + DataSourceDateTimeField timeField = new DataSourceDateTimeField(FIELD_TIME, + MSG.dataSource_recentOperations_field_time()); fields.add(timeField);
- DataSourceTextField statusField = new DataSourceTextField(status, "Status"); + DataSourceTextField statusField = new DataSourceTextField(FIELD_STATUS, + MSG.dataSource_recentOperations_field_status()); fields.add(statusField);
return fields; @@ -127,7 +134,7 @@ public class RecentOperationsDataSource extends new AsyncCallback<List<DisambiguationReport<ResourceOperationLastCompletedComposite>>>() {
public void onFailure(Throwable throwable) { - CoreGUI.getErrorHandler().handleError("Failed to load recently completed operations.", + CoreGUI.getErrorHandler().handleError(MSG.dataSource_recentOperations_error_fetchFailure(), throwable); }
@@ -170,17 +177,17 @@ public class RecentOperationsDataSource extends for (DisambiguationReport<ResourceOperationLastCompletedComposite> report : list) { ListGridRecord record = new ListGridRecord(); //disambiguated Resource name, decorated with html anchors to problem resources - record.setAttribute(resource, ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL, + record.setAttribute(FIELD_RESOURCE, ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL, report.getResourceType(), report.getOriginal().getResourceName(), report.getOriginal() .getResourceId(), true)); //disambiguated resource lineage, decorated with html anchors - record.setAttribute(location, ReportDecorator.decorateResourceLineage(report.getParents(), true)); + record.setAttribute(FIELD_LOCATION, ReportDecorator.decorateResourceLineage(report.getParents(), true)); //operation name. - record.setAttribute(operation, report.getOriginal().getOperationName()); + record.setAttribute(FIELD_OPERATION, report.getOriginal().getOperationName()); //timestamp. - record.setAttribute(time, new Date(report.getOriginal().getOperationStartTime())); + record.setAttribute(FIELD_TIME, new Date(report.getOriginal().getOperationStartTime())); String link = generateResourceOperationStatusLink(report); - record.setAttribute(status, link); + record.setAttribute(FIELD_STATUS, link);
dataValues[indx++] = record; } @@ -221,12 +228,12 @@ public class RecentOperationsDataSource extends @Override public ListGridRecord copyValues(DisambiguationReport<ResourceOperationLastCompletedComposite> from) { ListGridRecord record = new ListGridRecord(); - record.setAttribute(resource, ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL, + record.setAttribute(FIELD_RESOURCE, ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL, from.getResourceType(), from.getOriginal().getResourceName(), from.getOriginal().getResourceId(), true)); - record.setAttribute(location, ReportDecorator.decorateResourceLineage(from.getParents(), true)); - record.setAttribute(operation, from.getOriginal().getOperationName()); - record.setAttribute(time, from.getOriginal().getOperationStartTime()); - record.setAttribute(status, generateResourceOperationStatusLink(from)); + record.setAttribute(FIELD_LOCATION, ReportDecorator.decorateResourceLineage(from.getParents(), true)); + record.setAttribute(FIELD_OPERATION, from.getOriginal().getOperationName()); + record.setAttribute(FIELD_TIME, from.getOriginal().getOperationStartTime()); + record.setAttribute(FIELD_STATUS, generateResourceOperationStatusLink(from));
record.setAttribute("entity", from);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/ScheduledOperationsDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/ScheduledOperationsDataSource.java index 7faaa46..c88b58e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/ScheduledOperationsDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/ScheduledOperationsDataSource.java @@ -1,5 +1,3 @@ -package org.rhq.enterprise.gui.coregui.client.operation; - /* * RHQ Management Platform * Copyright (C) 2005-2010 Red Hat, Inc. @@ -18,6 +16,8 @@ package org.rhq.enterprise.gui.coregui.client.operation; * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +package org.rhq.enterprise.gui.coregui.client.operation; + import java.util.Date; import java.util.List;
@@ -40,17 +40,21 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.resource.disambiguation.ReportDecorator; import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
-/** Responsible for defining and populating the Smart GWT datasource details and - * translating the deserialized content into specific record entries for display +/** + * Responsible for defining and populating the Smart GWT datasource details and + * translating the deserialized content into specific record entries for display * * @author Simeon Pinder */ public class ScheduledOperationsDataSource extends RPCDataSource<DisambiguationReport<ResourceOperationScheduleComposite>> { - public static final String resource = "resource"; - public static final String location = "location"; - public static final String operation = "operation"; - public static final String time = "time"; + + // fields + public static final String FIELD_RESOURCE = "resource"; + public static final String FIELD_LOCATION = "location"; + public static final String FIELD_OPERATION = "operation"; + public static final String FIELD_TIME = "time"; + //config settings private boolean operationsRangeNextEnabled = false; private int operationsRangeScheduled = -1; @@ -69,17 +73,21 @@ public class ScheduledOperationsDataSource extends protected List<DataSourceField> addDataSourceFields() { List<DataSourceField> fields = super.addDataSourceFields();
- DataSourceTextField resourceField = new DataSourceTextField(resource, "Resource"); + DataSourceTextField resourceField = new DataSourceTextField(FIELD_RESOURCE, + MSG.dataSource_scheduledOperations_field_resource()); resourceField.setPrimaryKey(true); fields.add(resourceField);
- DataSourceTextField locationField = new DataSourceTextField(location, "Location", 200); + DataSourceTextField locationField = new DataSourceTextField(FIELD_LOCATION, + MSG.dataSource_scheduledOperations_field_location(), 200); fields.add(locationField);
- DataSourceTextField operationField = new DataSourceTextField(operation, "Operation"); + DataSourceTextField operationField = new DataSourceTextField(FIELD_OPERATION, + MSG.dataSource_scheduledOperations_field_operation()); fields.add(operationField);
- DataSourceDateTimeField timeField = new DataSourceDateTimeField(time, "Date/Time"); + DataSourceDateTimeField timeField = new DataSourceDateTimeField(FIELD_TIME, + MSG.dataSource_scheduledOperations_field_time()); fields.add(timeField);
return fields; @@ -120,7 +128,8 @@ public class ScheduledOperationsDataSource extends new AsyncCallback<List<DisambiguationReport<ResourceOperationScheduleComposite>>>() {
public void onFailure(Throwable throwable) { - CoreGUI.getErrorHandler().handleError("Failed to load scheduled operations.", throwable); + CoreGUI.getErrorHandler().handleError(MSG.dataSource_scheduledOperations_error_fetchFailure(), + throwable); }
public void onSuccess( @@ -162,15 +171,15 @@ public class ScheduledOperationsDataSource extends ListGridRecord record = new ListGridRecord();
//disambiguated Resource name, decorated with html anchors to problem resources - record.setAttribute(resource, ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL, + record.setAttribute(FIELD_RESOURCE, ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL, report.getResourceType(), report.getOriginal().getResourceName(), report.getOriginal() .getResourceId(), true)); //disambiguated resource lineage, decorated with html anchors - record.setAttribute(location, ReportDecorator.decorateResourceLineage(report.getParents(), true)); + record.setAttribute(FIELD_LOCATION, ReportDecorator.decorateResourceLineage(report.getParents(), true)); //operation name. - record.setAttribute(operation, report.getOriginal().getOperationName()); + record.setAttribute(FIELD_OPERATION, report.getOriginal().getOperationName()); //timestamp. - record.setAttribute(time, new Date(report.getOriginal().getOperationNextFireTime())); + record.setAttribute(FIELD_TIME, new Date(report.getOriginal().getOperationNextFireTime()));
dataValues[indx++] = record; } @@ -186,11 +195,11 @@ public class ScheduledOperationsDataSource extends @Override public ListGridRecord copyValues(DisambiguationReport<ResourceOperationScheduleComposite> from) { ListGridRecord record = new ListGridRecord(); - record.setAttribute(resource, ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL, + record.setAttribute(FIELD_RESOURCE, ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL, from.getResourceType(), from.getOriginal().getResourceName(), from.getOriginal().getResourceId(), true)); - record.setAttribute(location, ReportDecorator.decorateResourceLineage(from.getParents(), true)); - record.setAttribute(operation, from.getOriginal().getOperationName()); - record.setAttribute(time, from.getOriginal().getOperationNextFireTime()); + record.setAttribute(FIELD_LOCATION, ReportDecorator.decorateResourceLineage(from.getParents(), true)); + record.setAttribute(FIELD_OPERATION, from.getOriginal().getOperationName()); + record.setAttribute(FIELD_TIME, from.getOriginal().getOperationNextFireTime());
record.setAttribute("entity", from);
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index de2cb19..3b31689 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -33,6 +33,7 @@ common_button_search = Search~
# Common Labels +#------------------------ common_label_all = ALL~ common_label_all_resources = all resources~ common_label_day=day~ @@ -185,6 +186,7 @@ dataSource_measurementOob_field_factor = Out of Range Factor (%)~ dataSource_measurementOob_error_fetchFailure = Failed to load measurement OOB information~
# Measurements +#---------------------- dataSource_schedules_field_resourceGroupId=Group ID~ dataSource_schedules_enableFailure=Failed to enable the collection of [{0}] metrics for resource group with ID [{1}]. The metrics were: [{2}]~ dataSource_schedules_enableSuccessful_concise=You have enabled the collection of [{0}] measurements~ @@ -204,6 +206,23 @@ dataSource_problemResources_field_alerts = Alerts~ dataSource_problemResources_field_available = Current Availability~ dataSource_problemResources_error_fetchFailure = Failed to load Resources with alerts/unavailability.~
+# Recent Operations +#---------------------------- +dataSource_recentOperations_field_resource = Resource~ +dataSource_recentOperations_field_location = Location~ +dataSource_recentOperations_field_operation = Operation~ +dataSource_recentOperations_field_time = Date/Time~ +dataSource_recentOperations_field_status = Status~ +dataSource_recentOperations_error_fetchFailure = Failed to load recently completed operations. + +# Scheduled Operations +#--------------------------------- +dataSource_scheduledOperations_field_resource = Resource~ +dataSource_scheduledOperations_field_location = Location~ +dataSource_scheduledOperations_field_operation = Operation~ +dataSource_scheduledOperations_field_time = Date/Time~ +dataSource_scheduledOperations_error_fetchFailure = Failed to load scheduled operations. +
#********************************** VIEW-SPECIFIC *************************************
@@ -509,11 +528,19 @@ view_core_error_1 = New Alerts lookup failed~ view_core_loggedInAs = Logged in as {0}~ view_core_loggedOut = Logged out~ view_core_recentAlerts = [{0}] recent alerts~ +view_core_registerLater = (Logout - Complete registration later.)~ +view_core_registerLdapSuccess = Succesfully registered the new LDAP User.~ +view_core_registerUser = Register User~ view_core_uncaught = Globally uncaught exception~
# Login #-------------- +view_login_login = Login~ +view_login_logout = Logout~ +view_login_noLdap = Note: Optional retrieval of ldap details unsuccessful. Manual entry is required.~ view_login_prompt = Please Login~ +view_login_welcome = Welcome to JBoss ON! <br/><br/> Enter/update the following fields to complete your registration process.<br/> Once you click "OK" you will be logged in.<br/><br/>~ +
# Menu Bar #--------------
commit 8915cfce2a9c089907e576d6f9f2288725cd06a1 Merge: c94e04f... d6d45fb... Author: Simeon Pinder spinder@redhat.com Date: Wed Nov 17 12:17:50 2010 -0500
Merge branch 'master' of ssh://spinder@git.fedorahosted.org/git/rhq/rhq into track-master2
Conflicts: modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
commit c94e04fd74a5e9b56384d706b9565bb91d6f1caa Author: Simeon Pinder spinder@redhat.com Date: Wed Nov 17 12:11:08 2010 -0500
i18n
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourceDS.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourceDS.java index 45ae251..d7a545b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourceDS.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourceDS.java @@ -65,13 +65,15 @@ public class RecentlyAddedResourceDS extends DataSource { DataSourceTextField idField = new DataSourceTextField("id", MSG.common_title_id()); idField.setPrimaryKey(true);
- DataSourceTextField parentIdField = new DataSourceTextField("parentId", "Parent ID"); + DataSourceTextField parentIdField = new DataSourceTextField("parentId", MSG + .dataSource_measurementOob_field_parentName() + + " " + MSG.dataSource_users_field_id()); parentIdField.setForeignKey("id");
- DataSourceTextField resourceNameField = new DataSourceTextField("name", "Resource Name"); + DataSourceTextField resourceNameField = new DataSourceTextField("name", MSG.common_title_resource_name()); resourceNameField.setPrimaryKey(true);
- DataSourceTextField timestampField = new DataSourceTextField("timestamp", "Date/Time"); + DataSourceTextField timestampField = new DataSourceTextField("timestamp", MSG.common_title_timestamp());
setFields(idField, parentIdField, resourceNameField, timestampField); } @@ -135,7 +137,7 @@ public class RecentlyAddedResourceDS extends DataSource { GWTServiceLookup.getResourceService().findRecentlyAddedResources(ctime, maxItems, new AsyncCallback<List<RecentlyAddedResourceComposite>>() { public void onFailure(Throwable throwable) { - CoreGUI.getErrorHandler().handleError("Failed to load recently added resources", throwable); + CoreGUI.getErrorHandler().handleError(MSG.view_portlet_recentlyAdded_error1(), throwable); }
public void onSuccess(List<RecentlyAddedResourceComposite> recentlyAddedList) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedView.java index 31bcf9d..9c71e67 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedView.java @@ -45,13 +45,13 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
public class RecentlyAddedView extends LocatableVLayout implements CustomSettingsPortlet {
- public static final String KEY = "Recently Added Portlet"; + public static final String KEY = MSG.view_portlet_recentlyAdded_title();
private boolean simple = true; private DashboardPortlet storedPortlet; private RecentlyAddedResourceDS dataSource; private TreeGrid treeGrid = null; - public static final String unlimited = "unlimited"; + public static final String unlimited = MSG.common_label_unlimited(); public static final String defaultValue = unlimited;
private static final String RECENTLY_ADDED_SHOW_MAX = "recently-added-show-amount"; @@ -69,11 +69,11 @@ public class RecentlyAddedView extends LocatableVLayout implements CustomSetting treeGrid = new TreeGrid(); treeGrid.setDataSource(getDataSource()); treeGrid.setAutoFetchData(true); - treeGrid.setTitle("Recently Added Resources"); + treeGrid.setTitle(MSG.common_title_recently_added()); treeGrid.setResizeFieldsInRealTime(true); treeGrid.setTreeFieldTitle("Resource Name");
- ListGridField resourceNameField = new ListGridField("name", "Resource Name"); + ListGridField resourceNameField = new ListGridField("name", MSG.common_title_resource_name());
resourceNameField.setCellFormatter(new CellFormatter() { public String format(Object o, ListGridRecord listGridRecord, int i, int i1) { @@ -81,12 +81,12 @@ public class RecentlyAddedView extends LocatableVLayout implements CustomSetting } });
- ListGridField timestampField = new ListGridField("timestamp", "Date/Time"); + ListGridField timestampField = new ListGridField("timestamp", MSG.common_title_timestamp());
treeGrid.setFields(resourceNameField, timestampField);
if (!simple) { - addMember(new HeaderLabel("Recently Added Resources")); + addMember(new HeaderLabel(MSG.common_title_recently_added())); }
addMember(treeGrid); @@ -123,7 +123,7 @@ public class RecentlyAddedView extends LocatableVLayout implements CustomSetting }
public Canvas getHelpCanvas() { - return new HTMLFlow("This portlet displays resources that have recently been imported into the inventory."); + return new HTMLFlow(MSG.view_portlet_recentlyAdded_help_msg()); }
public DynamicForm getCustomSettingsForm() { @@ -132,7 +132,8 @@ public class RecentlyAddedView extends LocatableVLayout implements CustomSetting //-------------combobox for number of recently added resources to display on the dashboard final SelectItem maximumRecentlyAddedComboBox = new SelectItem(RECENTLY_ADDED_SHOW_MAX); maximumRecentlyAddedComboBox.setTitle("Show"); - maximumRecentlyAddedComboBox.setHint("<nobr><b> recently approved platforms on dashboard.</b></nobr>"); + maximumRecentlyAddedComboBox.setHint("<nobr><b> " + MSG.view_portlet_recentlyAdded_approved_platforms() + + "</b></nobr>"); //spinder 9/3/10: the following is required workaround to disable editability of combobox. maximumRecentlyAddedComboBox.setType("selection"); //define acceptable values for display amount @@ -157,7 +158,7 @@ public class RecentlyAddedView extends LocatableVLayout implements CustomSetting //------------- Build second combobox for timeframe for problem resources search. final SelectItem maximumTimeRecentlyAddedComboBox = new SelectItem(RECENTLY_ADDED_SHOW_HRS); maximumTimeRecentlyAddedComboBox.setTitle("Over "); - maximumTimeRecentlyAddedComboBox.setHint("<nobr><b> hours </b></nobr>"); + maximumTimeRecentlyAddedComboBox.setHint("<nobr><b> " + MSG.common_label_hours() + " </b></nobr>"); //spinder 9/3/10: the following is required workaround to disable editability of combobox. maximumTimeRecentlyAddedComboBox.setType("selection"); //define acceptable values for display amount diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index 968d9d2..be5b047 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -65,7 +65,6 @@ common_title_icon = icon~ common_title_id = Id~ common_title_inventory = Inventory~ common_title_lastUpdated=Last Updated~ -common_title_lastUpdatedBy=Last Updated By~ common_title_metric = Metric~ common_title_mixedGroups = Mixed Groups~ common_title_name = Name~ @@ -73,7 +72,6 @@ common_title_plugin = Plugin~ common_title_recently_added = Recently Added Resources~ common_title_resource = Resource~ common_title_resource_inventory=Resource Inventory~ -common_title_resource_name=Resource Name~ common_title_selected_resources=Selected Resources~ common_title_start = Start~ common_title_status=Status~ @@ -99,7 +97,6 @@ common_val_yes_lower = yes~ common_val_never=Never~ common_val_na=N/A~
- #=================== Widgets =====================
# Record Editor @@ -120,22 +117,6 @@ widget_recordEditor_info_recordsDeletedConcise = {0} {1} deleted.~ widget_recordEditor_info_recordsDeletedDetailed = {0} {1} deleted: {2}.~ widget_recordEditor_error_unsupportedOperationType = Unsupported operation type: [{0}]~
- -#===================== Utils ====================== - -# Disambiguation Report Decorator -#------------------------------------------------- -util_disambiguationReportDecorator_pluginSuffix = ({0} plugin)~ - -# Monitoring Request Callback -#------------------------------------------ -util_monitoringRequestCallback_error_checkServerStatusFailure = Unable to determine login status - check Server status.~ - -# RPC Manager -#---------------------- -util_rpcManager_activeRequests = {0} Active Requests~ - - #================== DataSources ====================
# ContentRepositoryTree @@ -198,15 +179,6 @@ dataSource_schedules_updateFailure=Failed to set the collection interval of [{0} dataSource_schedules_updateSuccessful_concise=A new collection interval of [{0}] seconds has been set on [{1}] measurements~ dataSource_schedules_updateSuccessful_full=A new collection interval of [{0}] seconds has been set on [{1}] measurements for resource group with ID [{2}]. The updated measurements are: [{3}]~
-# Problem Resources -#------------------------------ -dataSource_problemResources_field_resource = Resource~ -dataSource_problemResources_field_location = Location~ -dataSource_problemResources_field_alerts = Alerts~ -dataSource_problemResources_field_available = Current Availability~ -dataSource_problemResources_error_fetchFailure = Failed to load Resources with alerts/unavailability.~ - - #********************************** VIEW-SPECIFIC *************************************
#================= Administration ================== @@ -258,7 +230,6 @@ view_groupConfigEdit_valsDiffForProp = Member Values for Property [{0}]~
view_leftNav_unknownPage = Unknown page name [{0}] for section [{1}] - URL is invalid.~
-view_measure_nan = --no data available--~ view_measureRange_day = 1 Day~ view_measureRange_days = {0} Days~ view_measureRange_hour = 1 Hour~ @@ -302,15 +273,7 @@ view_upload_success = File successfully uploaded~ view_upload_upload = Upload~ view_upload_uploadFile = UploadFile~
-# Group Create Wizard -view_groupCreateWizard_membersStepName=Select Members~ -view_groupCreateWizard_createStepName=Group Settings~ -view_groupCreateWizard_createStep_recursive=Recursive~ -view_groupCreateWizard_title=Create Group~ -view_groupCreateWizard_windowTitle=Create Group~ -view_groupCreateWizard_createFailure=Failed to create the resource group~ -view_groupCreateWizard_createSuccessful_concise=You have created a new resource group. [<a href="{0}">View Group</a>]~ -view_groupCreateWizard_createSuccessful_full=You have created a new [{0}] resource group with the name [{1}] that contains [{2}] member resources~ +
#=================== Dashboard ===================== view_portlet_autodiscovery_config_platform_selection = Number of platforms to display~ @@ -331,9 +294,7 @@ view_portlet_recentAlerts_config_priority_label = priority Alerts,~ view_portlet_recentAlerts_config_when=within the past~ view_portlet_recentAlerts_help_msg = Displays recent alerts fired on resources visible to the current user login.~ view_portlet_recentAlerts_title = Recent Alerts~ -view_portlet_recentlyAdded_approved_platforms=recently approved platforms on dashboard.~ view_portlet_recentlyAdded_error1=Failed to load recently added resources~ -view_portlet_recentlyAdded_help_msg=This portlet displays resources that have recently been imported into the inventory.~ view_portlet_recentlyAdded_title =Recently Added Portlet~
#=================== Inventory ===================== @@ -472,19 +433,8 @@ view_group_pluginConfig_edit_saveInitiated_full=The group connection setting upd view_group_pluginConfig_edit_saveFailure=Failed to initiate group connection setting update for [{0}] compatible group named [{1}]~ view_group_pluginConfig_edit_valid=All connection setting properties have valid values, so the connection settings can now be saved~ view_group_pluginConfig_edit_invalid=The following connection setting properties have invalid values and must be corrected before the connection settings can be saved: [{0}]~ -view_group_meas_schedules_title=Group Metric Collection Schedules~ -view_group_summary_nameUpdateFailure=Failed to change the name of the resource group with ID [{0}] - could not change from [{1}] to [{2}]~ -view_group_summary_nameUpdateSuccessful=You have changed the name of the resource group with ID [{0}] from [{1}] to [{2}]~ -view_group_summary_memberType=Member Type~ -view_group_summary_memberCount=Member Count~ -view_group_summary_dynamic=Dynamic~ -view_group_summary_recursive=Recursive~ -view_group_summary_groupDefinition=Group Definition~ -view_group_summary_mixed=Mixed~ -view_group_summary_descUpdateFailure=Failed to change the description of the resource group with ID [{0}]~ -view_group_summary_descUpdateSuccessful=You have changed the description of this resource group~ -view_group_summary_dynamicNote=Dynamic group names and descriptions are managed, and therefore are not editable~ - +view_group_meas_schedules_title=Group Metric Collection Schedules +view_group_summary_updateSuccessful=The name of the resource group with ID [{0}] was changed from [{1}] to [{2}]
#==================== Reports ======================
@@ -500,24 +450,8 @@ view_tagCloud_error_tagUsedCount = Tag used {0} times.~ view_taggedResources_title = Tagged Resources~
-#===================== Test ======================= -view_testTop_title = Test~ -view_testTop_description = This section contains pages for testing various GUI components.~ - #=================== Top Level =====================
-# CoreGUI -#-------------- -view_core_error_1 = New Alerts lookup failed~ -view_core_loggedInAs = Logged in as {0}~ -view_core_loggedOut = Logged out~ -view_core_recentAlerts = [{0}] recent alerts~ -view_core_uncaught = Globally uncaught exception~ - -# Login -#-------------- -view_login_prompt = Please Login - # Menu Bar #-------------- view_menuBar_help = Help~ @@ -528,19 +462,6 @@ view_menuBar_logout = Logout~ view_searchBar_search = Search~ view_searchBar_resources = Resources~ view_searchBar_resourceGroups = Resource Groups~ -# TODO: i18n pluralization -view_searchBar_welcomeMessage = search for {0}s~ -view_searchBar_defaultPattern = name your pattern~ -view_searchBar_error_selectSavedSearch = ''Error selecting saved search''~ - -# Message Center -#-------------------------- -view_messageCenter_button_messages = Messages~ -view_messageCenter_noRecentMessages = No Recent Messages~ -view_messageCenter_messageTitle= Title~ -view_messageCenter_messageSeverity= Severity~ -view_messageCenter_messageTitle= Time~ -view_messageCenter_messageTitle= Detail~
# About Box #----------
commit d6d45fb340f742b38b38939dbeb86adfae977e68 Author: Ian Springer ian.springer@redhat.com Date: Wed Nov 17 11:54:52 2010 -0500
i18n (is fun)
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/ProblemResourcesDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/ProblemResourcesDataSource.java index 380d16b..7e65e88 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/ProblemResourcesDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/ProblemResourcesDataSource.java @@ -47,10 +47,12 @@ import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; * @author Simeon Pinder */ public class ProblemResourcesDataSource extends RPCDataSource<DisambiguationReport<ProblemResourceComposite>> { - public static final String resource = "resource"; - public static final String location = "location"; - public static final String alerts = "alerts"; - public static final String available = "available"; + + public static final String FIELD_RESOURCE = "resource"; + public static final String FIELD_LOCATION = "location"; + public static final String FIELD_ALERTS = "alerts"; + public static final String FIELD_AVAILABLE = "available"; + private Portlet portlet = null; private long oldestDate = -1; //configure elements @@ -72,17 +74,21 @@ public class ProblemResourcesDataSource extends RPCDataSource<DisambiguationRepo protected List<DataSourceField> addDataSourceFields() { List<DataSourceField> fields = super.addDataSourceFields();
- DataSourceTextField resourceField = new DataSourceTextField(resource, "Resource"); + DataSourceTextField resourceField = new DataSourceTextField(FIELD_RESOURCE, + MSG.dataSource_problemResources_field_resource()); resourceField.setPrimaryKey(true); fields.add(resourceField);
- DataSourceTextField locationField = new DataSourceTextField(location, "Location"); + DataSourceTextField locationField = new DataSourceTextField(FIELD_LOCATION, + MSG.dataSource_problemResources_field_location()); fields.add(locationField);
- DataSourceTextField alertsField = new DataSourceTextField(alerts, "Alerts"); + DataSourceTextField alertsField = new DataSourceTextField(FIELD_ALERTS, + MSG.dataSource_problemResources_field_alerts()); fields.add(alertsField);
- DataSourceImageField availabilityField = new DataSourceImageField(available, "Current Availability"); + DataSourceImageField availabilityField = new DataSourceImageField(FIELD_AVAILABLE, + MSG.dataSource_problemResources_field_available()); fields.add(availabilityField);
return fields; @@ -118,7 +124,7 @@ public class ProblemResourcesDataSource extends RPCDataSource<DisambiguationRepo new AsyncCallback<List<DisambiguationReport<ProblemResourceComposite>>>() {
public void onFailure(Throwable throwable) { - CoreGUI.getErrorHandler().handleError("Failed to load resources with alerts/unavailability.", + CoreGUI.getErrorHandler().handleError(MSG.dataSource_problemResources_error_fetchFailure(), throwable); }
@@ -159,18 +165,18 @@ public class ProblemResourcesDataSource extends RPCDataSource<DisambiguationRepo for (DisambiguationReport<ProblemResourceComposite> report : list) { ListGridRecord record = new ListGridRecord(); //disambiguated Resource name, decorated with html anchors to problem resources - record.setAttribute(resource, ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL, + record.setAttribute(FIELD_RESOURCE, ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL, report.getResourceType(), report.getOriginal().getResourceName(), report.getOriginal() .getResourceId(), true)); //disambiguated resource lineage, decorated with html anchors - record.setAttribute(location, ReportDecorator.decorateResourceLineage(report.getParents(), true)); + record.setAttribute(FIELD_LOCATION, ReportDecorator.decorateResourceLineage(report.getParents(), true)); //alert cnt. - record.setAttribute(alerts, report.getOriginal().getNumAlerts()); + record.setAttribute(FIELD_ALERTS, report.getOriginal().getNumAlerts()); //populate availability icon if (report.getOriginal().getAvailabilityType().compareTo(AvailabilityType.DOWN) == 0) { - record.setAttribute(available, "/images/icons/availability_red_16.png"); + record.setAttribute(FIELD_AVAILABLE, "/images/icons/availability_red_16.png"); } else { - record.setAttribute(available, "/images/icons/availability_green_16.png"); + record.setAttribute(FIELD_AVAILABLE, "/images/icons/availability_green_16.png"); }
dataValues[indx++] = record; @@ -182,14 +188,14 @@ public class ProblemResourcesDataSource extends RPCDataSource<DisambiguationRepo @Override public ListGridRecord copyValues(DisambiguationReport<ProblemResourceComposite> from) { ListGridRecord record = new ListGridRecord(); - record.setAttribute(resource, ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL, + record.setAttribute(FIELD_RESOURCE, ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL, from.getResourceType(), from.getOriginal().getResourceName(), from.getOriginal().getResourceId(), true)); - record.setAttribute(location, ReportDecorator.decorateResourceLineage(from.getParents(), true)); - record.setAttribute(alerts, from.getOriginal().getNumAlerts()); + record.setAttribute(FIELD_LOCATION, ReportDecorator.decorateResourceLineage(from.getParents(), true)); + record.setAttribute(FIELD_ALERTS, from.getOriginal().getNumAlerts()); if (from.getOriginal().getAvailabilityType().compareTo(AvailabilityType.DOWN) == 0) { - record.setAttribute(available, "/images/icons/availability_red_16.png"); + record.setAttribute(FIELD_AVAILABLE, "/images/icons/availability_red_16.png"); } else { - record.setAttribute(available, "/images/icons/availability_green_16.png"); + record.setAttribute(FIELD_AVAILABLE, "/images/icons/availability_green_16.png"); }
record.setAttribute("entity", from); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/disambiguation/ReportDecorator.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/disambiguation/ReportDecorator.java index 30b68d7..0d4481f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/disambiguation/ReportDecorator.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/disambiguation/ReportDecorator.java @@ -6,6 +6,8 @@ import java.util.List; import org.rhq.core.domain.resource.composite.DisambiguationReport; import org.rhq.core.domain.resource.composite.DisambiguationReport.Resource; import org.rhq.core.domain.resource.composite.DisambiguationReport.ResourceType; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.Messages;
/** * Class handles some of the data decoration that used to be done for legacy struts @@ -17,6 +19,8 @@ import org.rhq.core.domain.resource.composite.DisambiguationReport.ResourceType; */ public class ReportDecorator {
+ private static final Messages MSG = CoreGUI.getMessages(); + //TODO: pull value from more bookmarking/history definition public final static String GWT_RESOURCE_URL = "#Resource/"; public static final String DEFAULT_SEPARATOR = " > "; @@ -60,7 +64,7 @@ public class ReportDecorator { if (type != null) { decorated += type.getName(); if (type.getPlugin() != null) { - decorated += " (" + type.getPlugin() + " plugin)"; + decorated += " " + MSG.util_disambiguationReportDecorator_pluginSuffix(type.getPlugin()); } decorated += " "; } @@ -116,11 +120,10 @@ public class ReportDecorator { private static StringBuilder writeResource(StringBuilder existing, String url, ResourceType resourceType) { if (!resourceType.isSingleton()) { - existing.append(resourceType.getName()).append(" ");
if (resourceType.getPlugin() != null) { - existing.append("(").append(resourceType.getPlugin()).append(" plugin) "); + existing.append(MSG.util_disambiguationReportDecorator_pluginSuffix(resourceType.getPlugin())); } }
@@ -129,7 +132,7 @@ public class ReportDecorator { }
if (resourceType.isSingleton() && resourceType.getPlugin() != null) { - existing.append(" (").append(resourceType.getPlugin()).append(" plugin)"); + existing.append(" ").append(MSG.util_disambiguationReportDecorator_pluginSuffix(resourceType.getPlugin())); } return existing; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchBar.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchBar.java index 42c830b..7d330d1 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchBar.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchBar.java @@ -18,6 +18,7 @@ */ package org.rhq.enterprise.gui.coregui.client.search;
+import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.event.dom.client.BlurEvent; import com.google.gwt.event.dom.client.BlurHandler; import com.google.gwt.event.dom.client.ClickEvent; @@ -47,6 +48,8 @@ import com.google.gwt.user.client.ui.TextBox;
import org.rhq.core.domain.search.SavedSearch; import org.rhq.core.domain.search.SearchSubsystem; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.Messages; import org.rhq.enterprise.gui.coregui.client.search.favorites.SavedSearchGrid; import org.rhq.enterprise.gui.coregui.client.search.favorites.SavedSearchManager; import org.rhq.enterprise.gui.coregui.client.search.favorites.SavedSearchGrid.PatternSelectionHandler; @@ -57,9 +60,11 @@ import org.rhq.enterprise.gui.coregui.client.search.suggest.SuggestTextBox_v3; */ public class SearchBar extends SimplePanel {
+ private static final Messages MSG = CoreGUI.getMessages(); + public String welcomeMessage;
- public static final String DEFAULT_PATTERN_NAME = "name your pattern"; + public static final String DEFAULT_PATTERN_NAME = MSG.view_searchBar_defaultPattern();
private static final String IMAGE_DIR = "/coregui/images/search/";
@@ -140,7 +145,7 @@ public class SearchBar extends SimplePanel { }
public SearchBar() { - com.allen_sauer.gwt.log.client.Log.info("Loading SearchBar..."); + Log.info("Loading SearchBar...");
// in the future, will be instantiated directly from a higher-level widget if (existsOnPage()) { @@ -174,7 +179,7 @@ public class SearchBar extends SimplePanel { Integer savedSearchId = Integer.valueOf(defaultSavedSearchPatternId); activateSavedSearch(savedSearchId); } catch (Exception e) { - this.autoCompletePatternField.setText("'Error selecting saved search'"); + this.autoCompletePatternField.setText(MSG.view_searchBar_error_selectSavedSearch()); click(searchButton); // execute the search, which will help to further highlight the error } } @@ -194,7 +199,7 @@ public class SearchBar extends SimplePanel { public void setSearchSubsystem(SearchSubsystem searchSubsystem) { this.searchSubsystem = searchSubsystem;
- this.welcomeMessage = "search for " + searchSubsystem.getName().toLowerCase() + "s"; + this.welcomeMessage = MSG.view_searchBar_welcomeMessage(this.searchSubsystem.getName());
this.autoCompletePatternField.setText(welcomeMessage); } @@ -383,7 +388,7 @@ public class SearchBar extends SimplePanel { class PatternNameFieldEventHandler implements KeyPressHandler, ClickHandler, BlurHandler { public void onKeyPress(KeyPressEvent event) { if (event.getCharCode() == KeyCodes.KEY_ENTER) { - SearchLogger.debug("key press pattern name field"); + Log.debug("key press pattern name field"); turnNameFieldIntoLabel(); } } @@ -468,7 +473,7 @@ public class SearchBar extends SimplePanel { }
public void handleSelection(int rowIndex, int columnIndex, String patternName) { - SearchLogger.debug("SavedSearchesEventHandler.handleSelection(" + rowIndex + "," + columnIndex + "," + Log.debug("SavedSearchesEventHandler.handleSelection(" + rowIndex + "," + columnIndex + "," + patternName + ")"); if (columnIndex == 1) { savedSearchManager.removePatternByName(patternName); @@ -503,7 +508,7 @@ public class SearchBar extends SimplePanel { public void activateSavedSearch(Integer savedSearchId) { SavedSearch savedSearch = savedSearchManager.getSavedSearchById(savedSearchId); if (savedSearch == null) { - SearchLogger.debug("activateSavedSearch: no known saved search with id '" + savedSearchId + "'"); + Log.debug("activateSavedSearch: no known saved search with id '" + savedSearchId + "'"); return; // no saved search existing with the specified id } activateSavedSearch(savedSearch); @@ -512,7 +517,7 @@ public class SearchBar extends SimplePanel { public void activateSavedSearch(String savedSearchName) { SavedSearch savedSearch = savedSearchManager.getSavedSearchByName(savedSearchName); if (savedSearch == null) { - SearchLogger.debug("activateSavedSearch: no known saved search with name '" + savedSearchName + "'"); + Log.debug("activateSavedSearch: no known saved search with name '" + savedSearchName + "'"); return; // no saved search existing with the specified name } activateSavedSearch(savedSearch); @@ -522,7 +527,7 @@ public class SearchBar extends SimplePanel { currentSearch = ""; autoCompletePatternField.setValue(savedSearch.getPattern(), true); patternNameField.setValue(savedSearch.getName(), true); - SearchLogger.debug("search results change: [" + savedSearch.getName() + "," + savedSearch.getPattern() + "]"); + Log.debug("search results change: [" + savedSearch.getName() + "," + savedSearch.getPattern() + "]"); turnNameFieldIntoLabel(); savedSearchesPanel.hide(); click(searchButton); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchLogger.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchLogger.java deleted file mode 100644 index c482a97..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchLogger.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.rhq.enterprise.gui.coregui.client.search; - -import com.allen_sauer.gwt.log.client.Log; - -public class SearchLogger { - - public static void debug(String message) { - Log.debug("SearchBar: " + message); - } - -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchGrid.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchGrid.java index c250f7c..fd5c55f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchGrid.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchGrid.java @@ -20,6 +20,7 @@ package org.rhq.enterprise.gui.coregui.client.search.favorites;
import java.util.List;
+import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Element; import com.google.gwt.user.client.Event; @@ -27,7 +28,6 @@ import com.google.gwt.user.client.ui.Grid;
import org.rhq.core.domain.search.SavedSearch; import org.rhq.enterprise.gui.coregui.client.search.SearchBar; -import org.rhq.enterprise.gui.coregui.client.search.SearchLogger;
/** * @author Joseph Marques @@ -88,7 +88,7 @@ public class SavedSearchGrid extends Grid { int startIndex = text.indexOf('>') + 1; int endIndex = text.toLowerCase().indexOf("</span>", startIndex); String patternName = text.substring(startIndex, endIndex); - SearchLogger.debug("Selected '" + patternName + " at row=" + rowIndex + ", col=" + columnIndex); + Log.debug("Selected '" + patternName + " at row=" + rowIndex + ", col=" + columnIndex); patternSelectionHandler.handleSelection(rowIndex, columnIndex, patternName); if (columnIndex == 0) { onRowOut(tr); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchManager.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchManager.java index ac069cb..21a4f5f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchManager.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchManager.java @@ -24,6 +24,7 @@ import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List;
+import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.user.client.rpc.AsyncCallback;
import org.rhq.core.domain.auth.Subject; @@ -33,7 +34,6 @@ import org.rhq.enterprise.gui.coregui.client.UserSessionManager; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.gwt.SearchGWTServiceAsync; import org.rhq.enterprise.gui.coregui.client.search.SearchBar; -import org.rhq.enterprise.gui.coregui.client.search.SearchLogger;
/** * @author Joseph Marques @@ -79,7 +79,7 @@ public class SavedSearchManager { searchService.createSavedSearch(newSavedSearch, new AsyncCallback<Integer>() {
public void onFailure(Throwable caught) { - SearchLogger.debug("Error: created saved search [" + name + "] with pattern [" + pattern + "]: " + Log.debug("Error: created saved search [" + name + "] with pattern [" + pattern + "]: " + caught.getMessage()); }
@@ -93,7 +93,7 @@ public class SavedSearchManager { searchService.updateSavedSearch(savedSearch, new AsyncCallback<Void>() {
public void onFailure(Throwable caught) { - SearchLogger.debug("Error: updating saved search [" + name + "] with pattern [" + pattern + "]: " + Log.debug("Error: updating saved search [" + name + "] with pattern [" + pattern + "]: " + caught.getMessage()); }
@@ -122,7 +122,7 @@ public class SavedSearchManager { searchService.deleteSavedSearch(savedSearch.getId(), new AsyncCallback<Void>() {
public void onFailure(Throwable caught) { - SearchLogger.debug("Error: removing saved search [" + name + "]: " + caught.getMessage()); + Log.debug("Error: removing saved search [" + name + "]: " + caught.getMessage()); }
public void onSuccess(Void result) { @@ -142,7 +142,7 @@ public class SavedSearchManager {
public void onFailure(Throwable caught) { savedSearch.setName(oldName); // revive old name because server-side change failed - SearchLogger.debug("Error: renaming saved search from [" + oldName + "] to [" + newName + "]: " + Log.debug("Error: renaming saved search from [" + oldName + "] to [" + newName + "]: " + caught.getMessage()); }
@@ -182,7 +182,7 @@ public class SavedSearchManager {
public void onFailure(Throwable caught) { try { - SearchLogger.debug("Error: loading saved searches: " + caught.getMessage()); + Log.debug("Error: loading saved searches: " + caught.getMessage()); } finally { searchBar.onSavedSearchManagerLoaded(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox_v3.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox_v3.java index 5ac3651..fd3ecc8 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox_v3.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox_v3.java @@ -23,6 +23,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.List;
+import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.event.dom.client.BlurHandler; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; @@ -64,7 +65,6 @@ import org.rhq.core.domain.search.SearchSuggestion.Kind; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.gwt.SearchGWTServiceAsync; import org.rhq.enterprise.gui.coregui.client.search.SearchBar; -import org.rhq.enterprise.gui.coregui.client.search.SearchLogger;
public class SuggestTextBox_v3 extends Composite implements HasText, HasAllFocusHandlers, HasValue<String>, HasSelectionHandlers<Suggestion> { @@ -708,7 +708,7 @@ public class SuggestTextBox_v3 extends Composite implements HasText, HasAllFocus if (searchSuggestion.getKind() == SearchSuggestion.Kind.GlobalSavedSearch || searchSuggestion.getKind() == SearchSuggestion.Kind.UserSavedSearch) { // execute saved searches immediately, since they presumably constitute complete expressions - SearchLogger.debug("selected '" + searchSuggestion.getLabel() + "' saved search suggestion"); + Log.debug("selected '" + searchSuggestion.getLabel() + "' saved search suggestion"); searchBar.activateSavedSearch(searchSuggestion.getValue()); } else { // selecting a simple suggestion or advanced suggestion 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 3714034..cf617f8 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 @@ -40,6 +40,7 @@ import org.rhq.enterprise.gui.coregui.client.test.configuration.TestGroupConfigu * @author Ian Springer */ public class TestTopView extends AbstractSectionedLeftNavigationView { + public static final String VIEW_ID = "Test";
// view IDs for Inventory section @@ -60,8 +61,7 @@ public class TestTopView extends AbstractSectionedLeftNavigationView { }
protected Canvas defaultView() { - String contents = "<h1>Test</h1>\n" - + "This section contains pages for testing various GUI components."; + String contents = "<h1>" + MSG.view_testTop_title() + "</h1>\n" + MSG.view_testTop_description(); HTMLFlow flow = new HTMLFlow(contents); flow.setPadding(20); return flow; 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 1f7ccaf..206c78a 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 @@ -70,7 +70,7 @@ public class TestConfigurationView
toolStrip.addMember(new LayoutSpacer());
- this.saveButton = new LocatableIButton(this.extendLocatorId("Save"), "Save"); + this.saveButton = new LocatableIButton(this.extendLocatorId("Save"), MSG.common_button_save()); this.saveButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { save(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/CanvasUtility.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/CanvasUtility.java index 59495f8..0721562 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/CanvasUtility.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/CanvasUtility.java @@ -26,7 +26,6 @@ import com.smartgwt.client.widgets.Canvas; */ public class CanvasUtility {
- public static void blink(Canvas canvas) {
canvas.animateFade(10, new FadeAnimationCallback(3,canvas,false)); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/ErrorHandler.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/ErrorHandler.java index 1b97a65..0e1aeb4 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/ErrorHandler.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/ErrorHandler.java @@ -28,6 +28,7 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message; * @author Joseph Marques */ public class ErrorHandler { + public void handleError(String message) { handleError(message, null); } @@ -77,4 +78,5 @@ public class ErrorHandler {
return list.toArray(new String[list.size()]); } + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenter.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenter.java index a464b5e..1a4845d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenter.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenter.java @@ -28,6 +28,7 @@ import com.allen_sauer.gwt.log.client.Log; * @author Greg Hinkle */ public class MessageCenter { + private LinkedList<Message> messages = new LinkedList<Message>(); private List<MessageListener> listeners = new ArrayList<MessageListener>();
@@ -64,7 +65,7 @@ public class MessageCenter { }
private void log(Message message) { - String formattedMessage = "On " + message.getFired() + " MessageCenter received " + message.getConciseMessage(); + String formattedMessage = "On " + message.getFired() + ", MessageCenter received " + message.getConciseMessage(); if (message.severity == Message.Severity.Info) { Log.info(formattedMessage); } else if (message.severity == Message.Severity.Warning) { @@ -77,4 +78,5 @@ public class MessageCenter { Log.debug(formattedMessage); } } + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java index 1a6968d..0a3f94c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java @@ -54,6 +54,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableWindow; * @author Greg Hinkle */ public class MessageCenterView extends LocatableHLayout implements MessageCenter.MessageListener { + public static final String LOCATOR_ID = "MessageCenter";
public MessageCenterView(String locatorId) { @@ -71,7 +72,8 @@ public class MessageCenterView extends LocatableHLayout implements MessageCenter
final Menu recentEventsMenu = new LocatableMenu(this.extendLocatorId("Messages"));
- IMenuButton recentEventsButton = new LocatableIMenuButton(extendLocatorId("RecentEvents"), "Messages", + IMenuButton recentEventsButton = new LocatableIMenuButton(extendLocatorId("RecentEvents"), + MSG.view_messageCenter_messageTitle(), recentEventsMenu); recentEventsButton.setTop(5); recentEventsButton.setShowMenuBelow(false); @@ -82,7 +84,7 @@ public class MessageCenterView extends LocatableHLayout implements MessageCenter public void onClick(ClickEvent clickEvent) { List<Message> messages = CoreGUI.getMessageCenter().getMessages(); if (messages.isEmpty()) { - recentEventsMenu.setItems(new MenuItem("No recent messages.")); + recentEventsMenu.setItems(new MenuItem(MSG.view_messageCenter_noRecentMessages())); } else { MenuItem[] items = new MenuItem[messages.size()]; for (int i = 0, messagesSize = messages.size(); i < messagesSize; i++) { @@ -116,24 +118,24 @@ public class MessageCenterView extends LocatableHLayout implements MessageCenter DynamicForm form = new LocatableDynamicForm(extendLocatorId("Details")); form.setWrapItemTitles(false);
- StaticTextItem title = new StaticTextItem("title", "Title"); + StaticTextItem title = new StaticTextItem("title", MSG.view_messageCenter_messageTitle()); title.setValue(message.conciseMessage);
- StaticTextItem severity = new StaticTextItem("severity", "Severity"); + StaticTextItem severity = new StaticTextItem("severity", MSG.view_messageCenter_messageSeverity()); FormItemIcon severityIcon = new FormItemIcon(); severityIcon.setSrc(getSeverityIcon(message.severity)); severity.setIcons(severityIcon); severity.setValue(message.severity.name());
- StaticTextItem date = new StaticTextItem("time", "Time"); + StaticTextItem date = new StaticTextItem("time", MSG.view_messageCenter_messageTime()); date.setValue(message.fired);
- StaticTextItem detail = new StaticTextItem("detail", "Detail"); + StaticTextItem detail = new StaticTextItem("detail", MSG.view_messageCenter_messageDetail()); detail.setTitleOrientation(TitleOrientation.TOP); detail.setValue(message.detailedMessage); detail.setColSpan(2);
- ButtonItem okButton = new ButtonItem("Ok", "Ok"); + ButtonItem okButton = new ButtonItem("ok", MSG.common_button_ok()); okButton.setColSpan(2); okButton.setAlign(Alignment.CENTER);
@@ -231,4 +233,5 @@ public class MessageCenterView extends LocatableHLayout implements MessageCenter } return iconSrc; } + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferenceChangeListener.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferenceChangeListener.java index d1e321c..17bcbdb 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferenceChangeListener.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferenceChangeListener.java @@ -23,8 +23,6 @@ package org.rhq.enterprise.gui.coregui.client.util.preferences; */ public interface UserPreferenceChangeListener {
- - void onPreferrenceChange(UserPreferenceChangeEvent event); - + void onPreferenceChange(UserPreferenceChangeEvent event);
} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferences.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferences.java index d85d464..839d5e6 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferences.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferences.java @@ -101,7 +101,7 @@ public class UserPreferences {
UserPreferenceChangeEvent event = new UserPreferenceChangeEvent(name, value, oldValue); for (UserPreferenceChangeListener listener : changeListeners) { - listener.onPreferrenceChange(event); + listener.onPreferenceChange(event); } }
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/MonitoringRequestCallback.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/MonitoringRequestCallback.java index 0ee7b22..51e6b40 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/MonitoringRequestCallback.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/MonitoringRequestCallback.java @@ -28,6 +28,8 @@ import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.util.SC;
import org.rhq.core.domain.auth.Subject; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.Messages; import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
/** @@ -36,6 +38,8 @@ import org.rhq.enterprise.gui.coregui.client.UserSessionManager; */ public class MonitoringRequestCallback implements RequestCallback {
+ private static final Messages MSG = CoreGUI.getMessages(); + private int id; private String name; private long start = System.currentTimeMillis(); @@ -75,7 +79,7 @@ public class MonitoringRequestCallback implements RequestCallback {
@Override public void onFailure(Throwable caught) { - SC.say("Unable to determine login status - check Server status."); + SC.say(MSG.util_monitoringRequestCallback_error_checkServerStatusFailure()); } }); } @@ -94,7 +98,7 @@ public class MonitoringRequestCallback implements RequestCallback { }
public String toString() { - return "id=" + id + ", name=" + name + ", age=" + age(); + return "MonitoringRequestCallback{id=" + id + ", name=" + name + ", age=" + age() + "}"; }
} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/RPCManager.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/RPCManager.java index 72c6bf2..b4799c3 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/RPCManager.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/RPCManager.java @@ -24,12 +24,17 @@ import java.util.Set; import com.allen_sauer.gwt.log.client.Log; import com.smartgwt.client.widgets.Img;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.Messages; + /** * @author Greg Hinkle * @author Joseph Marques */ public class RPCManager {
+ private static final Messages MSG = CoreGUI.getMessages(); + private static final RPCManager INSTANCE = new RPCManager(); private static int nextCallId = 0;
@@ -83,8 +88,9 @@ public class RPCManager { if (getQueueDepth() > 0) { activityIndicator.show();
- StringBuilder buf = new StringBuilder().append("<b>").append(inProgress.size()).append( - " active requests</b>"); + int numberOfActiveRequests = inProgress.size(); + String message = MSG.util_rpcManager_activeRequests(String.valueOf(numberOfActiveRequests)); + StringBuilder buf = new StringBuilder().append("<b>").append(message).append("</b>"); for (MonitoringRequestCallback callback : inProgress) { buf.append("<br/>"); buf.append(callback); @@ -95,4 +101,5 @@ public class RPCManager { activityIndicator.hide(); } } + } diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index 0fa4733..de2cb19 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -183,8 +183,6 @@ dataSource_measurementOob_field_formattedBaseband = Band~ dataSource_measurementOob_field_formattedOutlier = Outlier~ dataSource_measurementOob_field_factor = Out of Range Factor (%)~ dataSource_measurementOob_error_fetchFailure = Failed to load measurement OOB information~ -dataSource_measurementOob_field_resourceName = -dataSource_measurementOob_field_resourceName =
# Measurements dataSource_schedules_field_resourceGroupId=Group ID~ @@ -427,7 +425,6 @@ view_group_tabs_connectionSettings=Connection Settings~ view_group_tabs_connectionSettingsHistory=Connection Settings History~ view_group_tabs_operations=Operations~ view_group_tabs_history=History~ -view_group_tabs_schedules=Schedules~ view_group_tabs_scheduled=Scheduled~ view_group_tabs_alerts=Alerts~ view_group_tabs_definitions=Definitions~ @@ -516,7 +513,7 @@ view_core_uncaught = Globally uncaught exception~
# Login #-------------- -view_login_prompt = Please Login +view_login_prompt = Please Login~
# Menu Bar #-------------- @@ -539,8 +536,8 @@ view_messageCenter_button_messages = Messages~ view_messageCenter_noRecentMessages = No Recent Messages~ view_messageCenter_messageTitle= Title~ view_messageCenter_messageSeverity= Severity~ -view_messageCenter_messageTitle= Time~ -view_messageCenter_messageTitle= Detail~ +view_messageCenter_messageTime= Time~ +view_messageCenter_messageDetail= Detail~
# About Box #---------- @@ -551,4 +548,3 @@ view_aboutBox_homepage = Homepage~ view_aboutBox_jbossByRedHat = JBoss by Red Hat~ view_aboutBox_title = About {0}~ view_aboutBox_version = Version:~ -
commit 8e9d469a876a37f890d441966eeb22c26c2dc638 Merge: 95b291d... e4e9737... Author: Simeon Pinder spinder@redhat.com Date: Wed Nov 17 11:47:20 2010 -0500
Merge branch 'master' of ssh://spinder@git.fedorahosted.org/git/rhq/rhq into track-master2
Conflicts: modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
diff --cc modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index c38aa5f,0fa4733..968d9d2 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@@ -58,9 -62,10 +62,10 @@@ common_title_enabled=Enabled? common_title_end = End~ common_title_generalProp = General Properties~ common_title_icon = icon~ -common_title_id = ID~ +common_title_id = Id~ common_title_inventory = Inventory~ common_title_lastUpdated=Last Updated~ + common_title_lastUpdatedBy=Last Updated By~ common_title_metric = Metric~ common_title_mixedGroups = Mixed Groups~ common_title_name = Name~
commit e4e973745db5155bf0b0a00c5179b48ff5d23a9b Author: John Mazzitelli mazz@redhat.com Date: Wed Nov 17 11:40:09 2010 -0500
i18n messages
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index 76440b1..0fa4733 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -65,6 +65,7 @@ common_title_icon = icon~ common_title_id = ID~ common_title_inventory = Inventory~ common_title_lastUpdated=Last Updated~ +common_title_lastUpdatedBy=Last Updated By~ common_title_metric = Metric~ common_title_mixedGroups = Mixed Groups~ common_title_name = Name~ @@ -72,6 +73,7 @@ common_title_plugin = Plugin~ common_title_recently_added = Recently Added Resources~ common_title_resource = Resource~ common_title_resource_inventory=Resource Inventory~ +common_title_resource_name=Resource Name~ common_title_selected_resources=Selected Resources~ common_title_start = Start~ common_title_status=Status~ @@ -97,6 +99,7 @@ common_val_yes_lower = yes~ common_val_never=Never~ common_val_na=N/A~
+ #=================== Widgets =====================
# Record Editor @@ -117,6 +120,22 @@ widget_recordEditor_info_recordsDeletedConcise = {0} {1} deleted.~ widget_recordEditor_info_recordsDeletedDetailed = {0} {1} deleted: {2}.~ widget_recordEditor_error_unsupportedOperationType = Unsupported operation type: [{0}]~
+ +#===================== Utils ====================== + +# Disambiguation Report Decorator +#------------------------------------------------- +util_disambiguationReportDecorator_pluginSuffix = ({0} plugin)~ + +# Monitoring Request Callback +#------------------------------------------ +util_monitoringRequestCallback_error_checkServerStatusFailure = Unable to determine login status - check Server status.~ + +# RPC Manager +#---------------------- +util_rpcManager_activeRequests = {0} Active Requests~ + + #================== DataSources ====================
# ContentRepositoryTree @@ -179,6 +198,15 @@ dataSource_schedules_updateFailure=Failed to set the collection interval of [{0} dataSource_schedules_updateSuccessful_concise=A new collection interval of [{0}] seconds has been set on [{1}] measurements~ dataSource_schedules_updateSuccessful_full=A new collection interval of [{0}] seconds has been set on [{1}] measurements for resource group with ID [{2}]. The updated measurements are: [{3}]~
+# Problem Resources +#------------------------------ +dataSource_problemResources_field_resource = Resource~ +dataSource_problemResources_field_location = Location~ +dataSource_problemResources_field_alerts = Alerts~ +dataSource_problemResources_field_available = Current Availability~ +dataSource_problemResources_error_fetchFailure = Failed to load Resources with alerts/unavailability.~ + + #********************************** VIEW-SPECIFIC *************************************
#================= Administration ================== @@ -230,6 +258,7 @@ view_groupConfigEdit_valsDiffForProp = Member Values for Property [{0}]~
view_leftNav_unknownPage = Unknown page name [{0}] for section [{1}] - URL is invalid.~
+view_measure_nan = --no data available--~ view_measureRange_day = 1 Day~ view_measureRange_days = {0} Days~ view_measureRange_hour = 1 Hour~ @@ -273,7 +302,15 @@ view_upload_success = File successfully uploaded~ view_upload_upload = Upload~ view_upload_uploadFile = UploadFile~
- +# Group Create Wizard +view_groupCreateWizard_membersStepName=Select Members~ +view_groupCreateWizard_createStepName=Group Settings~ +view_groupCreateWizard_createStep_recursive=Recursive~ +view_groupCreateWizard_title=Create Group~ +view_groupCreateWizard_windowTitle=Create Group~ +view_groupCreateWizard_createFailure=Failed to create the resource group~ +view_groupCreateWizard_createSuccessful_concise=You have created a new resource group. [<a href="{0}">View Group</a>]~ +view_groupCreateWizard_createSuccessful_full=You have created a new [{0}] resource group with the name [{1}] that contains [{2}] member resources~
#=================== Dashboard ===================== view_portlet_autodiscovery_config_platform_selection = Number of platforms to display~ @@ -294,7 +331,9 @@ view_portlet_recentAlerts_config_priority_label = priority Alerts,~ view_portlet_recentAlerts_config_when=within the past~ view_portlet_recentAlerts_help_msg = Displays recent alerts fired on resources visible to the current user login.~ view_portlet_recentAlerts_title = Recent Alerts~ +view_portlet_recentlyAdded_approved_platforms=recently approved platforms on dashboard.~ view_portlet_recentlyAdded_error1=Failed to load recently added resources~ +view_portlet_recentlyAdded_help_msg=This portlet displays resources that have recently been imported into the inventory.~ view_portlet_recentlyAdded_title =Recently Added Portlet~
#=================== Inventory ===================== @@ -433,8 +472,19 @@ view_group_pluginConfig_edit_saveInitiated_full=The group connection setting upd view_group_pluginConfig_edit_saveFailure=Failed to initiate group connection setting update for [{0}] compatible group named [{1}]~ view_group_pluginConfig_edit_valid=All connection setting properties have valid values, so the connection settings can now be saved~ view_group_pluginConfig_edit_invalid=The following connection setting properties have invalid values and must be corrected before the connection settings can be saved: [{0}]~ -view_group_meas_schedules_title=Group Metric Collection Schedules -view_group_summary_updateSuccessful=The name of the resource group with ID [{0}] was changed from [{1}] to [{2}] +view_group_meas_schedules_title=Group Metric Collection Schedules~ +view_group_summary_nameUpdateFailure=Failed to change the name of the resource group with ID [{0}] - could not change from [{1}] to [{2}]~ +view_group_summary_nameUpdateSuccessful=You have changed the name of the resource group with ID [{0}] from [{1}] to [{2}]~ +view_group_summary_memberType=Member Type~ +view_group_summary_memberCount=Member Count~ +view_group_summary_dynamic=Dynamic~ +view_group_summary_recursive=Recursive~ +view_group_summary_groupDefinition=Group Definition~ +view_group_summary_mixed=Mixed~ +view_group_summary_descUpdateFailure=Failed to change the description of the resource group with ID [{0}]~ +view_group_summary_descUpdateSuccessful=You have changed the description of this resource group~ +view_group_summary_dynamicNote=Dynamic group names and descriptions are managed, and therefore are not editable~ +
#==================== Reports ======================
@@ -450,8 +500,24 @@ view_tagCloud_error_tagUsedCount = Tag used {0} times.~ view_taggedResources_title = Tagged Resources~
+#===================== Test ======================= +view_testTop_title = Test~ +view_testTop_description = This section contains pages for testing various GUI components.~ + #=================== Top Level =====================
+# CoreGUI +#-------------- +view_core_error_1 = New Alerts lookup failed~ +view_core_loggedInAs = Logged in as {0}~ +view_core_loggedOut = Logged out~ +view_core_recentAlerts = [{0}] recent alerts~ +view_core_uncaught = Globally uncaught exception~ + +# Login +#-------------- +view_login_prompt = Please Login + # Menu Bar #-------------- view_menuBar_help = Help~ @@ -462,6 +528,19 @@ view_menuBar_logout = Logout~ view_searchBar_search = Search~ view_searchBar_resources = Resources~ view_searchBar_resourceGroups = Resource Groups~ +# TODO: i18n pluralization +view_searchBar_welcomeMessage = search for {0}s~ +view_searchBar_defaultPattern = name your pattern~ +view_searchBar_error_selectSavedSearch = ''Error selecting saved search''~ + +# Message Center +#-------------------------- +view_messageCenter_button_messages = Messages~ +view_messageCenter_noRecentMessages = No Recent Messages~ +view_messageCenter_messageTitle= Title~ +view_messageCenter_messageSeverity= Severity~ +view_messageCenter_messageTitle= Time~ +view_messageCenter_messageTitle= Detail~
# About Box #----------
commit 6a80c2f4eb332fbcba4ec570840845c8f1634300 Author: John Mazzitelli mazz@redhat.com Date: Wed Nov 17 11:38:27 2010 -0500
i18n
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/Wizard.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/Wizard.java index b82ebd4..8b38b39 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/Wizard.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/Wizard.java @@ -22,11 +22,16 @@ import java.util.List;
import com.smartgwt.client.widgets.IButton;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.Messages; + /** * @author Greg Hinkle */ public interface Wizard {
+ Messages MSG = CoreGUI.getMessages(); + String getWindowTitle();
String getTitle(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardStep.java index c21a564..958f0ed 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardStep.java @@ -20,11 +20,16 @@ package org.rhq.enterprise.gui.coregui.client.components.wizard;
import com.smartgwt.client.widgets.Canvas;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.Messages; + /** * @author Greg Hinkle */ public interface WizardStep {
+ Messages MSG = CoreGUI.getMessages(); + Canvas getCanvas();
boolean nextPage(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/SchedulesDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/SchedulesDataSource.java index 77b600f..eb9da82 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/SchedulesDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/SchedulesDataSource.java @@ -25,7 +25,6 @@ import com.smartgwt.client.data.Criteria; import com.smartgwt.client.data.DSRequest; import com.smartgwt.client.data.DSResponse; import com.smartgwt.client.data.DataSourceField; -import com.smartgwt.client.data.Record; import com.smartgwt.client.data.fields.DataSourceIntegerField; import com.smartgwt.client.widgets.grid.ListGridRecord;
@@ -57,7 +56,8 @@ public class SchedulesDataSource extends AbstractMeasurementScheduleCompositeDat List<DataSourceField> fields = super.addDataSourceFields();
DataSourceField resourceGroupIdField = new DataSourceIntegerField( - MeasurementScheduleCriteria.FILTER_FIELD_RESOURCE_GROUP_ID, "Resource Group Id"); + MeasurementScheduleCriteria.FILTER_FIELD_RESOURCE_GROUP_ID, MSG + .dataSource_schedules_field_resourceGroupId()); resourceGroupIdField.setHidden(true); fields.add(resourceGroupIdField);
@@ -87,22 +87,23 @@ public class SchedulesDataSource extends AbstractMeasurementScheduleCompositeDat @Override protected void enableSchedules(final AbstractMeasurementScheduleListView measurementScheduleListView, final int[] measurementDefinitionIds, final List<String> measurementDefinitionDisplayNames) { - final String s = (measurementDefinitionIds.length > 1) ? "s" : ""; + this.measurementService.enableSchedulesForCompatibleGroup(this.resourceGroupId, measurementDefinitionIds, new AsyncCallback<Void>() { @Override public void onFailure(Throwable throwable) { CoreGUI.getErrorHandler().handleError( - "Failed to enable collection of metric" + s + " " + measurementDefinitionDisplayNames - + " for Resource group with id [" + resourceGroupId + "].", throwable); + MSG.dataSource_schedules_enableFailure(String.valueOf(measurementDefinitionIds.length), String + .valueOf(resourceGroupId), measurementDefinitionDisplayNames.toString()), throwable); }
@Override public void onSuccess(Void aVoid) { CoreGUI.getMessageCenter().notify( - new Message("Enabled collection of selected metric" + s + ".", "Enabled collection of metric" - + s + " " + measurementDefinitionDisplayNames + " for Resource group with id [" - + resourceGroupId + "].", Message.Severity.Info)); + new Message(MSG.dataSource_schedules_enableSuccessful_concise(String + .valueOf(measurementDefinitionIds.length)), MSG.dataSource_schedules_enableSuccessful_full( + String.valueOf(measurementDefinitionIds.length), String.valueOf(resourceGroupId), + measurementDefinitionDisplayNames.toString()), Message.Severity.Info)); measurementScheduleListView.refresh(); } }); @@ -110,23 +111,25 @@ public class SchedulesDataSource extends AbstractMeasurementScheduleCompositeDat
@Override protected void disableSchedules(final AbstractMeasurementScheduleListView measurementScheduleListView, - int[] measurementDefinitionIds, final List<String> measurementDefinitionDisplayNames) { - final String s = (measurementDefinitionIds.length > 1) ? "s" : ""; + final int[] measurementDefinitionIds, final List<String> measurementDefinitionDisplayNames) { + this.measurementService.disableSchedulesForCompatibleGroup(this.resourceGroupId, measurementDefinitionIds, new AsyncCallback<Void>() { @Override public void onFailure(Throwable throwable) { CoreGUI.getErrorHandler().handleError( - "Failed to disable collection of metric" + s + " " + measurementDefinitionDisplayNames - + " for Resource group with id [" + resourceGroupId + "].", throwable); + MSG.dataSource_schedules_disableFailure(String.valueOf(measurementDefinitionIds.length), String + .valueOf(resourceGroupId), measurementDefinitionDisplayNames.toString()), throwable); }
@Override public void onSuccess(Void aVoid) { CoreGUI.getMessageCenter().notify( - new Message("Disabled collection of selected metric" + s + ".", "Disabled collection of metric" - + s + " " + measurementDefinitionDisplayNames + " for Resource group with id [" - + resourceGroupId + "].", Message.Severity.Info)); + new Message(MSG.dataSource_schedules_disableSuccessful_concise(String + .valueOf(measurementDefinitionIds.length)), MSG + .dataSource_schedules_disableSuccessful_full(String + .valueOf(measurementDefinitionIds.length), String.valueOf(resourceGroupId), + measurementDefinitionDisplayNames.toString()), Message.Severity.Info)); measurementScheduleListView.refresh(); } }); @@ -134,26 +137,28 @@ public class SchedulesDataSource extends AbstractMeasurementScheduleCompositeDat
@Override protected void updateSchedules(final AbstractMeasurementScheduleListView measurementScheduleListView, - int[] measurementDefinitionIds, final List<String> measurementDefinitionDisplayNames, + final int[] measurementDefinitionIds, final List<String> measurementDefinitionDisplayNames, final long collectionInterval) { - final String s = (measurementDefinitionIds.length > 1) ? "s" : ""; + this.measurementService.updateSchedulesForCompatibleGroup(this.resourceGroupId, measurementDefinitionIds, collectionInterval, new AsyncCallback<Void>() { @Override public void onFailure(Throwable throwable) { CoreGUI.getErrorHandler().handleError( - "Failed to set collection interval to " + (collectionInterval / 1000) + " seconds for metric" - + s + " " + measurementDefinitionDisplayNames + " for Resource group with id [" - + resourceGroupId + "].", throwable); + MSG.dataSource_schedules_updateFailure(String.valueOf(measurementDefinitionIds.length), String + .valueOf(resourceGroupId), measurementDefinitionDisplayNames.toString(), String + .valueOf(collectionInterval / 1000)), throwable); }
@Override public void onSuccess(Void aVoid) { + String collIntervalStr = String.valueOf(collectionInterval / 1000); CoreGUI.getMessageCenter().notify( - new Message("Updated collection intervals of selected metric" + s + ".", - "Collection interval for metric" + s + " " + measurementDefinitionDisplayNames - + " for Resource group with id [" + resourceGroupId + "] set to " - + (collectionInterval / 1000) + " seconds.", Message.Severity.Info)); + new Message(MSG.dataSource_schedules_updateSuccessful_concise(collIntervalStr, String + .valueOf(measurementDefinitionIds.length)), MSG.dataSource_schedules_updateSuccessful_full( + collIntervalStr, String.valueOf(measurementDefinitionIds.length), String + .valueOf(resourceGroupId), measurementDefinitionDisplayNames.toString()), + Message.Severity.Info)); measurementScheduleListView.refresh(); } }); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/SchedulesView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/SchedulesView.java index eb7a19a..0f59f7d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/SchedulesView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/SchedulesView.java @@ -29,7 +29,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractMeasuremen * @author Ian Springer */ public class SchedulesView extends AbstractMeasurementScheduleListView { - private static final String TITLE = "Group Metric Collection Schedules"; + private static final String TITLE = MSG.view_group_meas_schedules_title();
private static final String[] EXCLUDED_FIELD_NAMES = new String[] { MeasurementScheduleCriteria.FILTER_FIELD_RESOURCE_GROUP_ID };
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsDataSource.java index 2d5fb90..777cc74 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsDataSource.java @@ -21,7 +21,6 @@ package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring import java.util.List;
import com.smartgwt.client.data.DataSourceField; -import com.smartgwt.client.data.Record; import com.smartgwt.client.data.fields.DataSourceIntegerField; import com.smartgwt.client.data.fields.DataSourceTextField; import com.smartgwt.client.widgets.grid.ListGridRecord; @@ -47,12 +46,12 @@ public class TraitsDataSource extends AbstractMeasurementDataTraitDataSource { List<DataSourceField> fields = super.addDataSourceFields();
DataSourceIntegerField groupIdField = new DataSourceIntegerField( - MeasurementDataTraitCriteria.FILTER_FIELD_GROUP_ID, "Group Id"); + MeasurementDataTraitCriteria.FILTER_FIELD_GROUP_ID, MSG.dataSource_traits_group_field_groupId()); groupIdField.setHidden(true); fields.add(0, groupIdField);
DataSourceTextField resourceNameField = new DataSourceTextField( - MeasurementDataTraitCriteria.SORT_FIELD_RESOURCE_NAME, "Member Resource"); + MeasurementDataTraitCriteria.SORT_FIELD_RESOURCE_NAME, MSG.dataSource_traits_group_field_memberResource()); fields.add(0, resourceNameField);
return fields; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/OverviewView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/OverviewView.java index 2027fd2..53809d5 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/OverviewView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/OverviewView.java @@ -80,7 +80,7 @@ public class OverviewView extends LocatableVLayout {
final FormItem nameItem = (dynamic) ? new StaticTextItem() : new TogglableTextItem(); nameItem.setName("name"); - nameItem.setTitle("Name"); + nameItem.setTitle(MSG.common_title_name()); nameItem.setValue(group.getName()); if (nameItem instanceof TogglableTextItem) { final TogglableTextItem togglableNameItem = (TogglableTextItem) nameItem; @@ -94,8 +94,8 @@ public class OverviewView extends LocatableVLayout { OverviewView.this.resourceGroupService.updateResourceGroup(group, false, new AsyncCallback<Void>() { public void onFailure(Throwable caught) { CoreGUI.getErrorHandler().handleError( - "Failed to change name of Resource group with id " + group.getId() + " from "" - + oldName + "" to "" + newName + "".", caught); + MSG.view_group_summary_nameUpdateFailure(String.valueOf(group.getId()), oldName, + newName), caught); // We failed to update it on the Server, so change back the ResourceGroup and the form item // to the original value. group.setName(oldName); @@ -104,8 +104,8 @@ public class OverviewView extends LocatableVLayout {
public void onSuccess(Void result) { CoreGUI.getMessageCenter().notify( - new Message("Name of Resource group with id " + group.getId() + " was changed from "" - + oldName + "" to "" + newName + "".", Message.Severity.Info)); + new Message(MSG.view_group_summary_nameUpdateSuccessful(String.valueOf(group.getId()), + oldName, newName), Message.Severity.Info)); } }); } @@ -113,24 +113,25 @@ public class OverviewView extends LocatableVLayout { } formItems.add(nameItem);
- StaticTextItem typeItem = new StaticTextItem("memberType", "Member Type"); + StaticTextItem typeItem = new StaticTextItem("memberType", MSG.view_group_summary_memberType()); ResourceType type = group.getResourceType(); if (type != null) { - typeItem.setTooltip("Plugin: " + type.getPlugin() + "\n<br>" + "Type: " + type.getName()); + typeItem.setTooltip(MSG.common_title_plugin() + ": " + type.getPlugin() + "\n<br>" + + MSG.common_title_type() + ": " + type.getName()); typeItem.setValue(type.getName() + " (" + type.getPlugin() + ")"); } else { - typeItem.setValue("<i>Mixed</i>"); + typeItem.setValue("<i>" + MSG.view_group_summary_mixed() + "</i>"); } formItems.add(typeItem);
- StaticTextItem countItem = new StaticTextItem("memberCount", "Member Count"); + StaticTextItem countItem = new StaticTextItem("memberCount", MSG.view_group_summary_memberCount()); long memberCount = this.groupComposite.getImplicitUp() + this.groupComposite.getImplicitDown(); countItem.setValue(memberCount); formItems.add(countItem);
final FormItem descriptionItem = (dynamic) ? new StaticTextItem() : new TogglableTextItem(); descriptionItem.setName("description"); - descriptionItem.setTitle("Description"); + descriptionItem.setTitle(MSG.common_title_description()); descriptionItem.setValue(group.getDescription()); if (descriptionItem instanceof TogglableTextItem) { final TogglableTextItem togglableDescriptionItem = (TogglableTextItem) descriptionItem; @@ -144,8 +145,7 @@ public class OverviewView extends LocatableVLayout { OverviewView.this.resourceGroupService.updateResourceGroup(group, false, new AsyncCallback<Void>() { public void onFailure(Throwable caught) { CoreGUI.getErrorHandler().handleError( - "Failed to change description of Resource group with id " + group.getId() + " from "" - + oldDescription + "" to "" + newDescription + "".", caught); + MSG.view_group_summary_descUpdateFailure(String.valueOf(group.getId())), caught); // We failed to update it on the Server, so change back the ResourceGroup and the form item // to the original value. group.setDescription(oldDescription); @@ -154,9 +154,7 @@ public class OverviewView extends LocatableVLayout {
public void onSuccess(Void result) { CoreGUI.getMessageCenter().notify( - new Message("Description of Resource group with id " + group.getId() - + " was changed from "" + oldDescription + "" to "" + newDescription + "".", - Message.Severity.Info)); + new Message(MSG.view_group_summary_descUpdateSuccessful(), Message.Severity.Info)); } }); } @@ -164,28 +162,29 @@ public class OverviewView extends LocatableVLayout { } formItems.add(descriptionItem);
- StaticTextItem dynamicItem = new StaticTextItem("dynamic", "Dynamic?"); - dynamicItem.setValue(dynamic ? "yes" : "no"); + StaticTextItem dynamicItem = new StaticTextItem("dynamic", MSG.view_group_summary_dynamic()); + dynamicItem.setValue(dynamic ? MSG.common_val_yes_lower() : MSG.common_val_no_lower()); formItems.add(dynamicItem);
- StaticTextItem recursiveItem = new StaticTextItem("recursive", "Recursive?"); - recursiveItem.setValue((group.isRecursive()) ? "yes" : "no"); + StaticTextItem recursiveItem = new StaticTextItem("recursive", MSG.view_group_summary_recursive()); + recursiveItem.setValue((group.isRecursive()) ? MSG.common_val_yes_lower() : MSG.common_val_no_lower()); formItems.add(recursiveItem);
- StaticTextItem createdItem = new StaticTextItem("created", "Created"); + StaticTextItem createdItem = new StaticTextItem("created", MSG.common_title_dateCreated()); createdItem.setValue(new Date(group.getCtime())); formItems.add(createdItem);
- StaticTextItem lastModifiedItem = new StaticTextItem("lastModified", "Last Modified"); + StaticTextItem lastModifiedItem = new StaticTextItem("lastModified", MSG.common_title_lastUpdated()); lastModifiedItem.setValue(new Date(group.getMtime())); formItems.add(lastModifiedItem);
- StaticTextItem lastModifiedByItem = new StaticTextItem("lastModifiedBy", "Last Modified By"); + StaticTextItem lastModifiedByItem = new StaticTextItem("lastModifiedBy", MSG.common_title_lastUpdatedBy()); lastModifiedByItem.setValue(group.getModifiedBy()); formItems.add(lastModifiedByItem);
if (dynamic) { - StaticTextItem groupDefinitionItem = new StaticTextItem("groupDefinition", "Group Definition"); + StaticTextItem groupDefinitionItem = new StaticTextItem("groupDefinition", MSG + .view_group_summary_groupDefinition()); GroupDefinition groupDefinition = group.getGroupDefinition(); String groupDefinitionUrl = LinkManager.getGroupDefinitionLink(groupDefinition.getId()); groupDefinitionItem @@ -202,8 +201,7 @@ public class OverviewView extends LocatableVLayout { addMember(spacer);
HTMLFlow note = new HTMLFlow(); - note - .setContents("<b>*</b> Dynamic group names and descriptions are managed, and therefore are not editable."); + note.setContents("<b>*</b> " + MSG.view_group_summary_dynamicNote()); note.setAlign(Alignment.CENTER); addMember(note); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateStep.java index 61c1cc1..d12da80 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateStep.java @@ -50,14 +50,14 @@ public class GroupCreateStep extends AbstractWizardStep { form.setWidth100(); form.setNumCols(2);
- TextItem name = new TextItem("name", "Name"); + TextItem name = new TextItem("name", MSG.common_title_name()); name.setRequired(true); name.setWidth(300);
- TextAreaItem description = new AutoFitTextAreaItem("description", "Description"); + TextAreaItem description = new AutoFitTextAreaItem("description", MSG.common_title_description()); description.setWidth(300);
- CheckboxItem recursive = new CheckboxItem("recursive", "Recursive"); + CheckboxItem recursive = new CheckboxItem("recursive", MSG.view_groupCreateWizard_createStep_recursive());
form.setFields(name, description, recursive); } @@ -70,7 +70,7 @@ public class GroupCreateStep extends AbstractWizardStep { }
public String getName() { - return "Group Settings"; + return MSG.view_groupCreateWizard_createStepName(); }
public ResourceGroup getGroup() { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateWizard.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateWizard.java index 4e66027..e437e31 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateWizard.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateWizard.java @@ -60,11 +60,11 @@ public class GroupCreateWizard extends AbstractWizard { }
public String getWindowTitle() { - return "Create Group"; + return MSG.view_groupCreateWizard_windowTitle(); }
public String getTitle() { - return "Create Group"; + return MSG.view_groupCreateWizard_title(); }
public String getSubtitle() { @@ -86,15 +86,15 @@ public class GroupCreateWizard extends AbstractWizard { groupService.createResourceGroup(createStep.getGroup(), memberStep.getSelectedResourceIds(), new AsyncCallback<ResourceGroup>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to create Resource group.", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_groupCreateWizard_createFailure(), caught); }
public void onSuccess(ResourceGroup result) { String groupUrl = LinkManager.getResourceGroupLink(result.getId()); - String conciseMessage = "Resource group created. [<a href='" + groupUrl + "'>View Group</a>]"; - String detailedMessage = - "Created new " + result.getGroupCategory().name().toLowerCase() + " Resource group '" - + result.getName() + "' with " + memberStep.getSelectedResourceIds().length + " members."; + String conciseMessage = MSG.view_groupCreateWizard_createSuccessful_concise(groupUrl); + String detailedMessage = MSG.view_groupCreateWizard_createSuccessful_full(result.getGroupCategory() + .name().toLowerCase(), result.getName(), String + .valueOf(memberStep.getSelectedResourceIds().length)); CoreGUI.getMessageCenter().notify(new Message(conciseMessage, detailedMessage)); resourceGroupListView.refresh(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupMembersStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupMembersStep.java index d24ac3c..3151742 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupMembersStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupMembersStep.java @@ -54,7 +54,7 @@ public class GroupMembersStep extends AbstractWizardStep { }
public String getName() { - return "Select Members"; + return MSG.view_groupCreateWizard_membersStepName(); }
public int[] getSelectedResourceIds() {
commit 45a4e1becd7f6d77035d8d3b3abd0fb5333f24a7 Author: Jay Shaughnessy jshaughn@redhat.com Date: Wed Nov 17 10:55:04 2010 -0500
I18N work - Packages: org.rhq.enterprise.gui.coregui.client.components.tagging org.rhq.enterprise.gui.coregui.client.components.tree org.rhq.enterprise.gui.coregui.client.components.upload org.rhq.enterprise.gui.coregui.client.components.view org.rhq.enterprise.gui.coregui.client.components.wizard org.rhq.enterprise.gui.coregui.client.content.repository.tree
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 01235c4..9c8f9ab 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 @@ -118,7 +118,7 @@ public class TagEditorView extends LocatableLayout { if (!vertical) layout.setMembersMargin(8);
- HTMLFlow title = new HTMLFlow("<b>Tags:</b>"); + HTMLFlow title = new HTMLFlow("<b>" + MSG.view_tags_title() + "</b>"); title.setAutoWidth(); layout.addMember(title);
@@ -140,7 +140,7 @@ public class TagEditorView extends LocatableLayout {
final Img remove = new LocatableImg(tagLayout.extendLocatorId("Remove"), "[skin]/images/actions/remove.png", 16, 16); - remove.setTooltip("Click to remove this tag"); + remove.setTooltip(MSG.view_tags_tooltip_1()); remove.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { tags.remove(tag); @@ -173,7 +173,7 @@ public class TagEditorView extends LocatableLayout { final Img modeImg = new LocatableImg(((Locatable) layout).getLocatorId(), "[skin]/images/actions/add.png", 16, 16);
- modeImg.setTooltip("Click to edit tags"); + modeImg.setTooltip(MSG.view_tags_tooltip_2()); modeImg.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) {
@@ -203,7 +203,7 @@ public class TagEditorView extends LocatableLayout { criteria.addSortName(PageOrdering.ASC); GWTServiceLookup.getTagService().findTagsByCriteria(criteria, new AsyncCallback<PageList<Tag>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to load tags", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_tags_error_1(), caught); }
public void onSuccess(PageList<Tag> result) { @@ -220,8 +220,7 @@ public class TagEditorView extends LocatableLayout { tagInput.setDisplayField("tag"); tagInput.setType("comboBox"); tagInput.setTextMatchStyle(TextMatchStyle.SUBSTRING); - tagInput - .setTooltip("Enter a tag in the format "(namespace:)(semantic=)tagname" (e.g. it:env=QA, or owner=John)"); + tagInput.setTooltip(MSG.view_tags_tooltip_3()); /*tagInput.addBlurHandler(new BlurHandler() { public void onBlur(BlurEvent blurEvent) { String tag = form.getValueAsString("tag"); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tagging/TaggingDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tagging/TaggingDataSource.java index f190c51..a1bd824 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tagging/TaggingDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tagging/TaggingDataSource.java @@ -43,7 +43,7 @@ public class TaggingDataSource extends RPCDataSource<Tag> { @Override protected void executeFetch(final DSRequest request, final DSResponse response) {
- TagCriteria criteria = new TagCriteria(); + // TagCriteria criteria = new TagCriteria();
String search = (String) request.getCriteria().getValues().get("tag"); if (search != null) { @@ -53,7 +53,7 @@ public class TaggingDataSource extends RPCDataSource<Tag> {
GWTServiceLookup.getTagService().findTagsByCriteria(new TagCriteria(), new AsyncCallback<PageList<Tag>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to load tags", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_tags_error_1(), caught); response.setStatus(DSResponse.STATUS_FAILURE); processResponse(request.getRequestId(), response); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/BundleDistributionFileUploadForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/BundleDistributionFileUploadForm.java index acb99f3..10a3429 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/BundleDistributionFileUploadForm.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/BundleDistributionFileUploadForm.java @@ -28,7 +28,7 @@ public class BundleDistributionFileUploadForm extends FileUploadForm {
public BundleDistributionFileUploadForm(String locatorId, boolean showUploadButton) {
- super(locatorId, "Distribution File", "0", true, showUploadButton, null); + super(locatorId, MSG.view_upload_bundleDistFile(), "0", true, showUploadButton, null);
setAction(GWT.getModuleBaseURL() + "BundleDistributionFileUploadServlet"); } @@ -64,7 +64,7 @@ public class BundleDistributionFileUploadForm extends FileUploadForm { try { id = Integer.parseInt(bundleVersionIdString); } catch (Exception e) { - CoreGUI.getErrorHandler().handleError("Bad distribution file upload results", e); + CoreGUI.getErrorHandler().handleError(MSG.view_upload_error_bundleDistFile(), e); } return id; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/BundleFileUploadForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/BundleFileUploadForm.java index 651703e..73c3e2e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/BundleFileUploadForm.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/BundleFileUploadForm.java @@ -55,7 +55,7 @@ public class BundleFileUploadForm extends FileUploadForm { }
protected boolean processSubmitCompleteResults(String submitCompleteEventResults) { - return !submitCompleteEventResults.contains("Failed to upload file"); + return !submitCompleteEventResults.contains(MSG.view_upload_error_file()); }
} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/DynamicCallbackFormHandlerCollection.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/DynamicCallbackFormHandlerCollection.java index 13cb47f..3fdb31b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/DynamicCallbackFormHandlerCollection.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/DynamicCallbackFormHandlerCollection.java @@ -1,10 +1,7 @@ - package org.rhq.enterprise.gui.coregui.client.components.upload;
import java.util.ArrayList;
-import com.google.gwt.user.client.ui.FormSubmitCompleteEvent; - /** * Helper class for widgets that accept * {@link com.google.gwt.user.client.ui.FormHandler FormHandlers}. This subclass @@ -14,21 +11,21 @@ import com.google.gwt.user.client.ui.FormSubmitCompleteEvent; @SuppressWarnings("serial") public class DynamicCallbackFormHandlerCollection extends ArrayList<DynamicFormHandler> {
- /** - * Fires a {@link DynamicFormHandler#onSubmitComplete(DynamicFormSubmitCompleteEvent)} + /** + * Fires a {@link DynamicFormHandler#onSubmitComplete(DynamicFormSubmitCompleteEvent)} * on all handlers in the collection. - * - * @param sender - * the object sending the event - * @param results - * the results of the form submission - */ - public void fireOnComplete(DynamicCallbackForm sender, String results) { - DynamicFormSubmitCompleteEvent event = new DynamicFormSubmitCompleteEvent(sender, results); + * + * @param sender + * the object sending the event + * @param results + * the results of the form submission + */ + public void fireOnComplete(DynamicCallbackForm sender, String results) { + DynamicFormSubmitCompleteEvent event = new DynamicFormSubmitCompleteEvent(sender, results);
- for (DynamicFormHandler handler : this) { - handler.onSubmitComplete(event); - } - } + for (DynamicFormHandler handler : this) { + handler.onSubmitComplete(event); + } + }
} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/FileUploadForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/FileUploadForm.java index fb1e870..bf834d8 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/FileUploadForm.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/FileUploadForm.java @@ -139,21 +139,21 @@ public class FileUploadForm extends DynamicCallbackForm { setUploadError(null);
if (uploadInProgress) { - String message = "Can not submit, upload is currently in progress"; + String message = MSG.view_upload_inProgress(); setUploadError(message); return; }
Object value = fileUploadItem.getValue(); if (value == null || value.toString().length() == 0) { - String message = "[" + name + "] Please select a file to upload"; + String message = MSG.view_upload_prompt_1(name); icon.setIcons(iconRed); icon.setTooltip(message); setUploadError(message); // note - don't even submit this definite failure } else { icon.setIcons(iconLoading); - icon.setTooltip("Loading..."); + icon.setTooltip(MSG.common_msg_loading()); uploadInProgress = true; super.submitForm(); } @@ -179,7 +179,7 @@ public class FileUploadForm extends DynamicCallbackForm { fileUploadItem.setShowTitle(showNameLabel); onDrawItems.add(fileUploadItem);
- uploadButton = new ButtonItem("Upload"); + uploadButton = new ButtonItem(MSG.view_upload_upload()); uploadButton.setVisible(this.showUploadButton); uploadButton.setStartRow(false); uploadButton.setEndRow(false); @@ -196,16 +196,16 @@ public class FileUploadForm extends DynamicCallbackForm { if (uploadResult != null) { if (uploadResult.booleanValue()) { icon.setIcons(iconGreen); - icon.setTooltip("File has already been uploaded"); + icon.setTooltip(MSG.view_upload_alreadyUploaded()); } else { - String message = "File upload has previously failed"; + String message = MSG.view_upload_tooltip_2(); icon.setIcons(iconRed); icon.setTooltip(message); setUploadError(message); } } else { icon.setIcons(iconGrey); - icon.setTooltip("Select a file to upload, then click the 'Upload' button or 'Next'"); + icon.setTooltip(MSG.view_upload_tooltip_1()); } icon.setShowIcons(true); onDrawItems.add(icon); @@ -222,9 +222,8 @@ public class FileUploadForm extends DynamicCallbackForm { if (processSubmitCompleteResults(results)) { uploadResult = Boolean.TRUE; icon.setIcons(iconGreen); - icon.setTooltip("Uploaded file successfully"); - CoreGUI.getMessageCenter() - .notify(new Message("Uploaded file successfully", results, Severity.Info)); + icon.setTooltip(MSG.view_upload_success()); + CoreGUI.getMessageCenter().notify(new Message(MSG.view_upload_success(), results, Severity.Info)); icon.hide(); icon.show(); } else { @@ -235,7 +234,7 @@ public class FileUploadForm extends DynamicCallbackForm { setUploadError(cause); icon.setTooltip(cause); CoreGUI.getMessageCenter().notify( - new Message("File [" + name + "] upload failed", results, Severity.Error)); + new Message(MSG.view_upload_error_fileName(name), results, Severity.Error)); icon.hide(); icon.show(); } @@ -249,7 +248,7 @@ public class FileUploadForm extends DynamicCallbackForm { uploadInProgress = false;
uploadResult = Boolean.FALSE; - String cause = "File [" + name + "] upload failed, check for invalid file path."; + String cause = MSG.view_upload_error_fileName_2(name); icon.setIcons(iconRed); icon.setTooltip(cause); setUploadError(cause); @@ -304,7 +303,7 @@ public class FileUploadForm extends DynamicCallbackForm { begin = end + 1; } } catch (Exception e) { - CoreGUI.getErrorHandler().handleError("Unexpected file upload results: " + results, e); + CoreGUI.getErrorHandler().handleError(MSG.view_upload_error_results(results), e); }
return files; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/PackageVersionFileUploadForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/PackageVersionFileUploadForm.java index b88172c..80019f2 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/PackageVersionFileUploadForm.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/PackageVersionFileUploadForm.java @@ -96,7 +96,7 @@ public class PackageVersionFileUploadForm extends FileUploadForm { try { id = Integer.parseInt(packageVersionIdString); } catch (Exception e) { - CoreGUI.getErrorHandler().handleError("Bad package version file upload results", e); + CoreGUI.getErrorHandler().handleError(MSG.view_upload_error_packageVersionFile(), e); } return id; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/TextFileRetrieverForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/TextFileRetrieverForm.java index 0617e63..93282ee 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/TextFileRetrieverForm.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/TextFileRetrieverForm.java @@ -63,7 +63,7 @@ public class TextFileRetrieverForm extends DynamicCallbackForm {
setNumCols(4);
- textFile = new UploadItem("textFile", "Upload File"); + textFile = new UploadItem("textFile", MSG.view_upload_prompt_2()); textFile.setEndRow(false);
uploadButton = new ButtonItem("Upload"); @@ -105,10 +105,10 @@ public class TextFileRetrieverForm extends DynamicCallbackForm { FormItemIcon loadedIcon = new FormItemIcon(); if (ok) { loadedIcon.setSrc("/images/icons/availability_green_16.png"); - CoreGUI.getMessageCenter().notify(new Message("Uploaded file successfully", Severity.Info)); + CoreGUI.getMessageCenter().notify(new Message(MSG.view_upload_success(), Severity.Info)); } else { loadedIcon.setSrc("/images/icons/availability_red_16.png"); - CoreGUI.getMessageCenter().notify(new Message("File upload failed", Severity.Error)); + CoreGUI.getMessageCenter().notify(new Message(MSG.view_upload_error_file(), Severity.Error)); } loadedIcon.setWidth(16); loadedIcon.setHeight(16); 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 525b824..46ddd52 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 @@ -239,8 +239,7 @@ public abstract class AbstractSectionedLeftNavigationView extends LocatableHLayo if (node != null) { treeGrid.selectSingleRecord(node); } else { - CoreGUI.getErrorHandler().handleError( - "Unknown page name '" + pageName + "' for section '" + sectionName + "' - URL is invalid."); + CoreGUI.getErrorHandler().handleError(MSG.view_leftNav_unknownPage(pageName, sectionName)); } } } 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 19e6719..cbd57ab 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 @@ -36,16 +36,19 @@ import com.smartgwt.client.widgets.layout.LayoutSpacer; import com.smartgwt.client.widgets.layout.VLayout; import com.smartgwt.client.widgets.toolbar.ToolStrip;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.Messages; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableIButton;
/** * @author Greg Hinkle */ public class WizardView extends VLayout { + static private final Messages MSG = CoreGUI.getMessages();
- static private final String CANCEL = "Cancel"; - static private final String NEXT = "Next"; - static private final String PREVIOUS = "Previous"; + static private final String CANCEL = MSG.common_button_cancel(); + static private final String NEXT = MSG.common_button_next(); + static private final String PREVIOUS = MSG.common_button_previous();
private Window wizardWindow; private Wizard wizard; @@ -222,9 +225,9 @@ public class WizardView extends VLayout {
boolean last = (stepIndex == (wizardSteps.size() - 1)); if (last) { - nextButton.setTitle("Finish"); + nextButton.setTitle(MSG.common_button_finish()); } else { - nextButton.setTitle("Next"); + nextButton.setTitle(MSG.common_button_next()); }
for (IButton button : customButtons) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/content/repository/tree/ContentRepositoryTreeDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/content/repository/tree/ContentRepositoryTreeDataSource.java index 9984f33..ab2f634 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/content/repository/tree/ContentRepositoryTreeDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/content/repository/tree/ContentRepositoryTreeDataSource.java @@ -58,15 +58,16 @@ public class ContentRepositoryTreeDataSource extends RPCDataSource<Repo> { protected List<DataSourceField> addDataSourceFields() { List<DataSourceField> fields = super.addDataSourceFields();
- DataSourceField idDataField = new DataSourceTextField("id", "ID"); + DataSourceField idDataField = new DataSourceTextField("id", MSG.common_title_id()); idDataField.setPrimaryKey(true); fields.add(idDataField);
- DataSourceTextField nameDataField = new DataSourceTextField("name", "Name"); + DataSourceTextField nameDataField = new DataSourceTextField("name", MSG.common_title_name()); nameDataField.setCanEdit(false); fields.add(nameDataField);
- DataSourceTextField parentIdField = new DataSourceTextField("parentId", "Parent ID"); + DataSourceTextField parentIdField = new DataSourceTextField("parentId", MSG + .dataSource_ContentRepoTree_field_parentId()); parentIdField.setForeignKey("id"); fields.add(parentIdField);
@@ -80,7 +81,7 @@ public class ContentRepositoryTreeDataSource extends RPCDataSource<Repo> {
repoService.findReposByCriteria(criteria, new AsyncCallback<PageList<Repo>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to load repositories", caught); + CoreGUI.getErrorHandler().handleError(MSG.dataSource_ContentRepoTree_error_load(), caught); }
public void onSuccess(PageList<Repo> result) { diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index 27aa50d..76440b1 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -20,8 +20,11 @@ common_button_close = Close~ common_button_delete = Delete~ common_button_disable = Disable~ common_button_enable = Enable~ +common_button_finish = Finish~ common_button_new = New~ +common_button_next = Next~ common_button_ok = OK~ +common_button_previous = Previous~ common_button_purgeAll=Purge All~ common_button_refresh = "Refresh"~ common_button_reset = Reset~ @@ -59,18 +62,20 @@ common_title_enabled=Enabled?~ common_title_end = End~ common_title_generalProp = General Properties~ common_title_icon = icon~ -common_title_id = Id~ +common_title_id = ID~ common_title_inventory = Inventory~ common_title_lastUpdated=Last Updated~ common_title_metric = Metric~ common_title_mixedGroups = Mixed Groups~ common_title_name = Name~ common_title_plugin = Plugin~ +common_title_recently_added = Recently Added Resources~ common_title_resource = Resource~ common_title_resource_inventory=Resource Inventory~ common_title_selected_resources=Selected Resources~ common_title_start = Start~ common_title_status=Status~ +common_title_timestamp =Date/Time~ common_title_type = Type~ common_title_user=User~ common_title_value = Value~ @@ -114,8 +119,15 @@ widget_recordEditor_error_unsupportedOperationType = Unsupported operation type:
#================== DataSources ====================
+# ContentRepositoryTree +#------ +dataSource_ContentRepoTree_error_load = Error loading repositories~ +dataSource_ContentRepoTree_field_parentId = Parent ID~ + + # Users #------ +// dup in common dataSource_users_field_id = ID~ dataSource_users_field_name = User Name~ dataSource_users_field_ldap = LDAP Login?~ @@ -140,6 +152,8 @@ dataSource_traits_field_primaryKey=Primary Key~ dataSource_traits_field_definitionID=Definition ID~ dataSource_traits_field_lastChanged=Last Changed~ dataSource_traits_field_trait=Trait~ +dataSource_traits_group_field_groupId=Group ID~ +dataSource_traits_group_field_memberResource=Member Resource~
# Measurement OOBs #--------------------------------- @@ -153,6 +167,17 @@ dataSource_measurementOob_error_fetchFailure = Failed to load measurement OOB in dataSource_measurementOob_field_resourceName = dataSource_measurementOob_field_resourceName =
+# Measurements +dataSource_schedules_field_resourceGroupId=Group ID~ +dataSource_schedules_enableFailure=Failed to enable the collection of [{0}] metrics for resource group with ID [{1}]. The metrics were: [{2}]~ +dataSource_schedules_enableSuccessful_concise=You have enabled the collection of [{0}] measurements~ +dataSource_schedules_enableSuccessful_full=You have enabled the collection of [{0}] measurements for the resource group with ID [{1}]. The enabled measurements are: [{2}]~ +dataSource_schedules_disableFailure=Failed to disable the collection of [{0}] metrics for resource group with ID [{1}]. The metrics were: [{2}]~ +dataSource_schedules_disableSuccessful_concise=You have disabled the collection of [{0}] measurements~ +dataSource_schedules_disableSuccessful_full=You have disabled the collection of [{0}] measurements for the resource group with ID [{1}]. The disabled measurements are: [{2}]~ +dataSource_schedules_updateFailure=Failed to set the collection interval of [{0}] metrics for resource group with ID [{1}]. The metrics were: [{2}]. The collection interval was to be [{3}] seconds.~ +dataSource_schedules_updateSuccessful_concise=A new collection interval of [{0}] seconds has been set on [{1}] measurements~ +dataSource_schedules_updateSuccessful_full=A new collection interval of [{0}] seconds has been set on [{1}] measurements for resource group with ID [{2}]. The updated measurements are: [{3}]~
#********************************** VIEW-SPECIFIC *************************************
@@ -203,6 +228,8 @@ view_groupConfigEdit_unset = Unset~ view_groupConfigEdit_valsDiff = member values differ~ view_groupConfigEdit_valsDiffForProp = Member Values for Property [{0}]~
+view_leftNav_unknownPage = Unknown page name [{0}] for section [{1}] - URL is invalid.~ + view_measureRange_day = 1 Day~ view_measureRange_days = {0} Days~ view_measureRange_hour = 1 Hour~ @@ -229,6 +256,7 @@ view_tags_tooltip_2 = Click to edit Tags~ view_tags_tooltip_3 = Enter a Tag in the format: (namespace:)(semantic=)tagname (e.g. it:env=QA, or owner=John)
# File Upload (various) +view_upload_alreadyUploaded = File has already been uploaded~ view_upload_bundleDistFile = Distribution File~ view_upload_error_bundleDistFile = Error uploading Bundle Distribution File~ view_upload_error_file = Error uploading file~ @@ -237,11 +265,11 @@ view_upload_error_fileName_2 = Error uploading file [{0}], check for invalid fil view_upload_error_packageVersionFile = Error uploading Package Version File~ view_upload_error_results = Error uploading file, unexpected results: [{0}]~ view_upload_inProgress = Can not submit, upload is currently in progress~ -view_upload_prompt_1 = [{0}] Please select a file to upload~ +view_upload_prompt_1 = [{0}] File to Upload~ view_upload_prompt_2 = File to Upload~ -view_upload_tooltip_1 = File has already been uploaded~ -view_upload_tooltip_2 = Select a file to upload, then click Upload or Next~ -view_upload_tooltip_3 = Uploaded file successfully~ +view_upload_tooltip_1 = Select a file to upload, then click Upload or Next~ +view_upload_tooltip_2 = File upload had previously failed~ +view_upload_success = File successfully uploaded~ view_upload_upload = Upload~ view_upload_uploadFile = UploadFile~
@@ -266,7 +294,8 @@ view_portlet_recentAlerts_config_priority_label = priority Alerts,~ view_portlet_recentAlerts_config_when=within the past~ view_portlet_recentAlerts_help_msg = Displays recent alerts fired on resources visible to the current user login.~ view_portlet_recentAlerts_title = Recent Alerts~ - +view_portlet_recentlyAdded_error1=Failed to load recently added resources~ +view_portlet_recentlyAdded_title =Recently Added Portlet~
#=================== Inventory ===================== view_inventory_sectionHelp = From this section, newly discovered Resources, inventoried Resources, and Groups can be viewed and managed.~ @@ -404,7 +433,8 @@ view_group_pluginConfig_edit_saveInitiated_full=The group connection setting upd view_group_pluginConfig_edit_saveFailure=Failed to initiate group connection setting update for [{0}] compatible group named [{1}]~ view_group_pluginConfig_edit_valid=All connection setting properties have valid values, so the connection settings can now be saved~ view_group_pluginConfig_edit_invalid=The following connection setting properties have invalid values and must be corrected before the connection settings can be saved: [{0}]~ - +view_group_meas_schedules_title=Group Metric Collection Schedules +view_group_summary_updateSuccessful=The name of the resource group with ID [{0}] was changed from [{1}] to [{2}]
#==================== Reports ======================
@@ -442,3 +472,4 @@ view_aboutBox_homepage = Homepage~ view_aboutBox_jbossByRedHat = JBoss by Red Hat~ view_aboutBox_title = About {0}~ view_aboutBox_version = Version:~ +
commit d9613378b632700856ee9c1b76e5d9a5864784e0 Author: Heiko W. Rupp hwr@redhat.com Date: Wed Nov 17 16:53:48 2010 +0100
BZ 653846 speed up PC initialization by only parsing the plugin descriptor once.
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginManager.java index d9976cb..873b3a6 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginManager.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginManager.java @@ -94,7 +94,7 @@ public class PluginManager implements ContainerService { /** * Finds all plugins using the plugin finder defined in the * {@link #setConfiguration(PluginContainerConfiguration) plugin container configuration} and - * {@link #loadPlugin(URL, ClassLoader) loads} each plugin found. + * {@link #loadPlugin(java.net.URL, ClassLoader, org.rhq.core.clientapi.descriptor.plugin.PluginDescriptor) loads} each plugin found. * * @see ContainerService#initialize() */ @@ -118,6 +118,8 @@ public class PluginManager implements ContainerService {
// build our empty class loader manager - we use it to create and manage our plugin's classloaders Map<String, URL> pluginNamesUrls = new HashMap<String, URL>(); + // Save descriptors for later use, so we don't need to parse them twice. + Map<URL, PluginDescriptor> descriptors = new HashMap<URL, PluginDescriptor>(); PluginDependencyGraph graph = new PluginDependencyGraph(); boolean createResourceCL = configuration.isCreateResourceClassloaders(); this.classLoaderManager = new ClassLoaderManager(pluginNamesUrls, graph, rootCL, tmpDir, createResourceCL); @@ -134,6 +136,7 @@ public class PluginManager implements ContainerService { if (!disabledPlugins.contains(descriptor.getName())) { AgentPluginDescriptorUtil.addPluginToDependencyGraph(graph, descriptor); pluginNamesUrls.put(descriptor.getName(), url); + descriptors.put(url, descriptor); } else { log.info("Not loading disabled plugin: " + url); } @@ -153,7 +156,8 @@ public class PluginManager implements ContainerService {
try { ClassLoader pluginClassLoader = this.classLoaderManager.obtainPluginClassLoader(nextPlugin); - loadPlugin(pluginUrl, pluginClassLoader); + PluginDescriptor descriptor = descriptors.get(pluginUrl); + loadPlugin(pluginUrl, pluginClassLoader, descriptor); } catch (Throwable t) { // for some reason, the plugin failed to load - it will be ignored, its depending plugins will also fail later log.error("Plugin [" + nextPlugin + "] at [" + pluginUrl @@ -165,7 +169,7 @@ public class PluginManager implements ContainerService { } else { // TODO (ips, 10/21/10): I don't think this block of code is needed any longer. I am commenting it for // now, but it should eventually be deleted. - // Loading a null plugin loads the plugin using the current classloader (for unit test testing) + // Loading a null plugin loads the plugin using the current classloader (for unit test testing) //log.info("Loading the null plugin which uses non-isolated classloader"); //loadPlugin(null, thisClassLoader); } @@ -283,7 +287,7 @@ public class PluginManager implements ContainerService {
/** * Returns the manager of all classloaders created for the plugin manager. - * + * * @return the classloader manager for all plugins */ public ClassLoaderManager getClassLoaderManager() { @@ -303,19 +307,19 @@ public class PluginManager implements ContainerService { * This will create a {@link PluginEnvironment} for the plugin at the given URL. The plugin's descriptor is parsed. * Once this method returns, the plugin's components are ready to be created and used. * + * * @param pluginUrl the new plugin's jar location * @param classLoader the new plugin's classloader - * + * @param pluginDescriptor THe already parsed plugin descriptor for this plugin * @throws PluginContainerException if the plugin fails to load */ - private void loadPlugin(URL pluginUrl, ClassLoader classLoader) throws PluginContainerException { + private void loadPlugin(URL pluginUrl, ClassLoader classLoader, PluginDescriptor pluginDescriptor) throws PluginContainerException {
if (log.isDebugEnabled()) { log.debug("Loading plugin from [" + pluginUrl + "] in classloader [" + classLoader + "]..."); }
PluginDescriptorLoader pluginDescriptorLoader = new PluginDescriptorLoader(pluginUrl, classLoader); - PluginDescriptor pluginDescriptor = pluginDescriptorLoader.loadPluginDescriptor(); PluginEnvironment pluginEnvironment = new PluginEnvironment(pluginDescriptor.getName(), pluginDescriptorLoader); String pluginName = pluginEnvironment.getPluginName();
@@ -396,4 +400,4 @@ public class PluginManager implements ContainerService {
return; } -} \ No newline at end of file +}
commit 8478f29bd32cc1fb1a655be432b3fe9c60e09f50 Author: Ian Springer ian.springer@redhat.com Date: Wed Nov 17 10:52:36 2010 -0500
i18n
diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index 84109e2..ff43e0d 100644 --- a/modules/enterprise/gui/coregui/pom.xml +++ b/modules/enterprise/gui/coregui/pom.xml @@ -93,7 +93,8 @@ <scope>provided</scope> <!-- by rhq.ear --> </dependency> - + + <!-- =============== 3rd Party Deps =============== -->
<dependency> diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/DropDownMenuBarView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/DropDownMenuBarView.java deleted file mode 100644 index f6e1730..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/DropDownMenuBarView.java +++ /dev/null @@ -1,233 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2010 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.menu; - -import com.google.gwt.user.client.History; -import com.google.gwt.user.client.Window; -import com.smartgwt.client.widgets.Img; -import com.smartgwt.client.widgets.events.ClickEvent; -import com.smartgwt.client.widgets.events.ClickHandler; -import com.smartgwt.client.widgets.layout.HLayout; -import com.smartgwt.client.widgets.menu.Menu; -import com.smartgwt.client.widgets.menu.MenuBar; -import com.smartgwt.client.widgets.menu.MenuItem; -import com.smartgwt.client.widgets.menu.MenuItemSeparator; -import com.smartgwt.client.widgets.menu.events.MenuItemClickEvent; - -import org.rhq.enterprise.gui.coregui.client.LinkManager; -import org.rhq.enterprise.gui.coregui.client.components.AboutModalWindow; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; - -/** - * @author Greg Hinkle - */ -public class DropDownMenuBarView extends LocatableVLayout { - - private AboutModalWindow aboutModalWindow; - - public DropDownMenuBarView(String locatorId) { - super(locatorId, 5); - - setHeight(50); - setWidth100(); - - } - - protected void onDraw3() { - super.onDraw(); - - this.aboutModalWindow = new AboutModalWindow(); - - HLayout topBar = new HLayout(); - topBar.setHeight(28); - topBar.setStyleName("topMenuBar"); - // url("./images/cssButton/button_stretch.png") repeat-x scroll 0 0 #DDDDDD - // topBar.setBackgroundImage("[SKIN]/cssButton/button_stretch.png"); - // topBar.setBackgroundRepeat(BkgndRepeat.REPEAT_X); - - Img logo = new Img("header/rhq_logo_28px.png", 80, 28); - logo.addClickHandler(new com.smartgwt.client.widgets.events.ClickHandler() { - public void onClick(com.smartgwt.client.widgets.events.ClickEvent event) { - DropDownMenuBarView.this.aboutModalWindow.show(); - } - }); - - topBar.addMember(logo); - - // Create a menu bar - final MenuBar menu = new MenuBar(); - menu.setHeight(28); - - Menu subsystemsMenu = new Menu(); - - subsystemsMenu.setTitle("Subsystems"); - subsystemsMenu.addItem(new EMenuItem("Configuration Changes", LinkManager.getSubsystemConfigurationLink(), - "subsystems/configure/Configure_16.png"));//, new LinkCommand("#config")); - subsystemsMenu.addItem(new EMenuItem("Suspect Metrics", LinkManager.getSubsystemSuspectMetricsLink(), - "subsystems/monitor/Monitor_failed_16.png"));//, new LinkCommand("#config")); - subsystemsMenu.addItem(new EMenuItem("Operations", LinkManager.getSubsystemOperationHistoryLink(), - "subsystems/control/Operation_16.png"));//, new LinkCommand("#config")); - subsystemsMenu.addItem(new EMenuItem("Alerts", LinkManager.getSubsystemAlertHistoryLink(), - "subsystems/alert/Alert_HIGH_16.png"));//, new LinkCommand("#config")); - subsystemsMenu.addItem(new EMenuItem("Alert Definitions", LinkManager.getSubsystemAlertDefsLink(), - "subsystems/alert/Alerts_16.png"));//, new LinkCommand("#config")); - - final Menu overviewMenu = new Menu(); - overviewMenu.setTitle("Overview"); - overviewMenu.setStyleName("SimpleMenuBarButton"); - overviewMenu.setBorder("none"); - com.smartgwt.client.widgets.menu.MenuItem subsystemsSubMenuItem = new com.smartgwt.client.widgets.menu.MenuItem( - "Subsystems"); - subsystemsSubMenuItem.setSubmenu(subsystemsMenu); - overviewMenu.addItem(subsystemsSubMenuItem); - overviewMenu.addItem(new EMenuItem("AutoDiscovery Queue", LinkManager.getAutodiscoveryQueueLink()));//,new LinkCommand("#cofng")); - overviewMenu.addItem(new EMenuItem("Dashboard", LinkManager.getDashboardLink()));//,new LinkCommand("#cofng")); - - Menu resourcesMenu = new Menu(); - resourcesMenu.setTitle("Resources"); - resourcesMenu.setStyleName("SimpleMenuBarButton"); - resourcesMenu.setBorder("none"); - resourcesMenu.setStyleName("menuBarMenuButton"); - resourcesMenu.addItem(new EMenuItem("All Resources", LinkManager.getHubAllResourcesLink()));//, new LinkCommand("#fsdf")); - resourcesMenu - .addItem(new EMenuItem("Platforms", LinkManager.getHubPlatformsLink(), "types/Platform_up_16.png"));//, new LinkCommand("#fsdf")); - resourcesMenu.addItem(new EMenuItem("Servers", LinkManager.getHubServerssLink(), "types/Server_up_16.png"));//, new LinkCommand("#fsdf")); - resourcesMenu.addItem(new EMenuItem("Services", LinkManager.getHubServicesLink(), "types/Service_up_16.png"));//, new LinkCommand("#fsdf")); - resourcesMenu.addItem(new MenuItemSeparator()); - - final FavoritesMenu favoritesMenu = new FavoritesMenu(); - resourcesMenu.addItem(favoritesMenu); - menu.addClickHandler(new ClickHandler() { - public void onClick(ClickEvent clickEvent) { - com.allen_sauer.gwt.log.client.Log.info("over here"); - favoritesMenu.refresh(); - } - }); - - Menu groupsMenu = new Menu(); - groupsMenu.setStyleName("menuBarMenuButton"); - groupsMenu.setTitle("Groups"); - groupsMenu.addItem(new EMenuItem("All Groups", LinkManager.getHubAllGroupsLink())); //, new LinkCommand("#sf")); - groupsMenu.addItem(new EMenuItem("Compatible Groups", LinkManager.getHubCompatibleGroupsLink())); //, new LinkCommand("#sf")); - groupsMenu.addItem(new EMenuItem("Mixed Groups", LinkManager.getHubMixedGroupsLink())); //, new LinkCommand("#sf")); - groupsMenu.addItem(new EMenuItem("Group Definitions", LinkManager.getHubGroupDefinitionsLink())); //, new LinkCommand("#sf")); - groupsMenu.addItem(new MenuItemSeparator()); - groupsMenu.addItem(new EMenuItem("New Group", LinkManager.getHubNewGroupLink())); //, new LinkCommand("#sf")); - groupsMenu.addItem(new EMenuItem("New Group Definition", LinkManager.getHubNewGroupDefLink())); //, new LinkCommand("#sf")); - groupsMenu.addItem(new MenuItemSeparator()); - // groupsMenu.addItem(new MenuItem("Favorites")); //, new LinkCommand("#sf")); - - Menu securityMenu = new Menu(); - securityMenu.setTitle("Security"); - securityMenu.addItem(new EMenuItem("Users", LinkManager.getAdminUsersLink())); - securityMenu.addItem(new EMenuItem("Roles", LinkManager.getAdminRolesLink())); - MenuItem securitySubMenuItem = new MenuItem("Security"); - securitySubMenuItem.setSubmenu(securityMenu); - - Menu sysConfigMenu = new Menu(); - sysConfigMenu.setTitle("System Configuration"); - sysConfigMenu.addItem(new EMenuItem("Settings", LinkManager.getAdminSysConfigLink())); - sysConfigMenu.addItem(new EMenuItem("Plugins", LinkManager.getAdminPluginsLink())); - sysConfigMenu.addItem(new EMenuItem("Templates", LinkManager.getAdminTemplatesLink())); - MenuItem sysConfigSubMenuItem = new MenuItem("System Configuration"); - sysConfigSubMenuItem.setSubmenu(sysConfigMenu); - - Menu contentMenu = new Menu(); - contentMenu.setTitle("Content"); - contentMenu.addItem(new EMenuItem("Bundles", "#Bundles")); - contentMenu.addItem(new EMenuItem("Content Providers", LinkManager.getAdminContentProvidersLink())); - contentMenu.addItem(new EMenuItem("Content Repositories", LinkManager.getAdminContentReposLink())); - MenuItem contentSubMenuItem = new MenuItem("Content"); - contentSubMenuItem.setSubmenu(contentMenu); - - Menu haMenu = new Menu(); - haMenu.setTitle("High Availability"); - haMenu.addItem(new EMenuItem("Servers", LinkManager.getHAServersLink())); - haMenu.addItem(new EMenuItem("Agents", LinkManager.getHAAgentsLink())); - haMenu.addItem(new EMenuItem("Affinity Groups", LinkManager.getHAAffinityGroupsLink())); - haMenu.addItem(new EMenuItem("Partition Events", LinkManager.getHAEventsLink())); - MenuItem haSubMentItem = new MenuItem("High Availability"); - haSubMentItem.setSubmenu(haMenu); - - Menu reportsMenu = new Menu(); - reportsMenu.setTitle("Reports"); - reportsMenu.addItem(new EMenuItem("Resource Version Inventory Report", LinkManager.getReportsInventoryLink())); - MenuItem reportsSubMenuItem = new MenuItem("Reports"); - reportsSubMenuItem.setSubmenu(reportsMenu); - - Menu adminMenu = new Menu(); - adminMenu.setTitle("Administration"); - adminMenu.addItem(securitySubMenuItem); - adminMenu.addItem(sysConfigSubMenuItem); - adminMenu.addItem(contentSubMenuItem); - adminMenu.addItem(haSubMentItem); - adminMenu.addItem(reportsSubMenuItem); - adminMenu.addItem(new EMenuItem("Downloads", LinkManager.getAdminDownloadsLink())); - adminMenu.addItem(new EMenuItem("License", LinkManager.getAdminLicenseLink())); - - Menu helpMenu = new Menu(); - helpMenu.setStyleName("menuBarMenuButton"); - helpMenu.setTitle("Help"); - helpMenu.addItem(new EMenuItem("Online Documentation", "http://www.rhq-project.org")); //, new LinkCommand("#sdfs")); - helpMenu.addItem(new EMenuItem("Open a support case", "http://www.rhq-project.org")); //, new LinkCommand("#sdfs")); - // helpMenu.addItem(new MenuItem("About")); //, new LinkCommand("#sdfs")); - - menu.setMenus(overviewMenu, resourcesMenu, groupsMenu, adminMenu, helpMenu); - - topBar.addMember(menu); - - addMember(topBar); - addMember(new SearchBarPane(this.extendLocatorId("Search"))); - - } - - public static class EMenuItem extends com.smartgwt.client.widgets.menu.MenuItem { - - String link; - - public EMenuItem(String title, String link) { - super(title); - this.link = link; - init(); - } - - public EMenuItem(String title, String link, String icon) { - super(title, icon); - this.link = link; - init(); - } - - private void init() { - addClickHandler(new com.smartgwt.client.widgets.menu.events.ClickHandler() { - public void onClick(MenuItemClickEvent menuItemClickEvent) { - if (link.startsWith("#")) { - History.newItem(link.substring(1)); - } else { - Window.Location.assign(link); - } - } - }); - } - } - -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/FavoritesMenu.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/FavoritesMenu.java deleted file mode 100644 index 876f8d5..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/FavoritesMenu.java +++ /dev/null @@ -1,109 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2010 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.menu; - -import java.util.HashMap; -import java.util.Map; -import java.util.Set; - -import com.google.gwt.user.client.History; -import com.google.gwt.user.client.rpc.AsyncCallback; -import com.smartgwt.client.widgets.menu.Menu; -import com.smartgwt.client.widgets.menu.MenuItem; -import com.smartgwt.client.widgets.menu.events.MenuItemClickEvent; - -import org.rhq.core.domain.criteria.ResourceCriteria; -import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.util.PageList; -import org.rhq.enterprise.gui.coregui.client.CoreGUI; -import org.rhq.enterprise.gui.coregui.client.UserSessionManager; -import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; - -/** - * @author Greg Hinkle - */ -public class FavoritesMenu extends MenuItem { - - private Menu submenu; - - public FavoritesMenu() { - super(); - setTitle("Favorites"); - - submenu = new Menu(); - setSubmenu(submenu); - - } - - public void refresh() { - Set<Integer> favorites = UserSessionManager.getUserPreferences().getFavoriteResources(); - - if (!favorites.isEmpty()) { - - Integer[] resourceIds = new Integer[favorites.size()]; - final MenuItem[] items = new MenuItem[favorites.size()]; - final Map<Integer, MenuItem> idToMenuItemMap = new HashMap<Integer, MenuItem>(favorites.size()); - int i = 0; - for (final Integer resourceId : favorites) { - resourceIds[i] = resourceId; - MenuItem item = new MenuItem(String.valueOf(resourceId)); - item.addClickHandler(new com.smartgwt.client.widgets.menu.events.ClickHandler() { - public void onClick(MenuItemClickEvent event) { - History.newItem("Resource/" + resourceId); - } - }); - items[i] = item; - idToMenuItemMap.put(resourceId, item); - i++; - } - - ResourceCriteria criteria = new ResourceCriteria(); - criteria.addFilterIds(resourceIds); - GWTServiceLookup.getResourceService().findResourcesByCriteria(criteria, - new AsyncCallback<PageList<Resource>>() { - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to load favorite Resources.", caught); - } - - public void onSuccess(PageList<Resource> resources) { - for (Resource resource : resources) { - MenuItem item = idToMenuItemMap.get(resource.getId()); - // TODO: Ideally, we should use ResourceManagerLocal.disambiguate() here to obtain - // disambiguated Resource names. - item.setTitle(resource.getName()); - - String category = resource.getResourceType().getCategory().getDisplayName(); - - String avail = (resource.getCurrentAvailability() != null && resource - .getCurrentAvailability().getAvailabilityType() != null) ? (resource - .getCurrentAvailability().getAvailabilityType().name().toLowerCase()) : "down"; - item.setIcon("types/" + category + "_" + avail + "_16.png"); - } - submenu.setItems(items); - } - }); - } - - } - -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/GWTMenuBarView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/GWTMenuBarView.java deleted file mode 100644 index 0c88b06..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/GWTMenuBarView.java +++ /dev/null @@ -1,186 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2010 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 as published by - * the Free Software Foundation version 2 of the License. - * - * 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 for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.coregui.client.menu; - -import com.google.gwt.event.logical.shared.ValueChangeEvent; -import com.google.gwt.event.logical.shared.ValueChangeHandler; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.History; -import com.google.gwt.user.client.ui.Hyperlink; -import com.google.gwt.user.client.ui.MenuBar; -import com.google.gwt.user.client.ui.MenuItem; -import com.smartgwt.client.types.ContentsType; -import com.smartgwt.client.types.VerticalAlignment; -import com.smartgwt.client.util.SC; -import com.smartgwt.client.widgets.HTMLFlow; -import com.smartgwt.client.widgets.Img; -import com.smartgwt.client.widgets.Label; -import com.smartgwt.client.widgets.layout.HLayout; -import com.smartgwt.client.widgets.layout.LayoutSpacer; -import com.smartgwt.client.widgets.layout.VLayout; -import com.smartgwt.client.widgets.toolbar.ToolStrip; - -import org.rhq.enterprise.gui.coregui.client.CoreGUI; -import org.rhq.enterprise.gui.coregui.client.components.AboutModalWindow; - -/** - * - * This is a backup menu bar that is implemented with the standard gwt component. - * It doesn't have many features or look very good. - * - * @author Greg Hinkle - */ -public class GWTMenuBarView extends VLayout { - - private AboutModalWindow aboutModalWindow; - - public static final String[] SECTIONS = {"Dashboard", "Demo", "Inventory", "Bundles", "Administration"}; - - private String selected = "Dashboard"; - - private HTMLFlow linksPane; - - public GWTMenuBarView() { - super(5); - setHeight(50); - setWidth100(); - - - } - - public static class LinkCommand implements Command { - private String href; - - public LinkCommand(String href) { - this.href = href; - } - - public void execute() { - History.newItem(href); - } - } - - - protected void onDraw() { - super.onDraw(); - - - // Create a command that will execute on menu item selection - Command menuCommand = new Command() { - public void execute() { - SC.say("Clicked"); - } - }; - - // Create a menu bar - MenuBar menu = new MenuBar(); - menu.setAutoOpen(true); - menu.setWidth("100%"); - menu.setAnimationEnabled(false); - menu.setStylePrimaryName("gwtMenuBar"); - - - MenuBar subsystemsMenu = new MenuBar(true); - subsystemsMenu.setStylePrimaryName("gwtMenu"); - subsystemsMenu.addItem("Configuration Changes", new LinkCommand("#config")); - subsystemsMenu.addItem("Suspect Metrics", new LinkCommand("#config")); - subsystemsMenu.addItem("Operations", new LinkCommand("#config")); - subsystemsMenu.addItem("Alerts", new LinkCommand("#config")); - subsystemsMenu.addItem("Alert Definitions", new LinkCommand("#config")); - - MenuBar overviewMenu = new MenuBar(true); - overviewMenu.setStylePrimaryName("gwtMenu"); - overviewMenu.addItem("Subsystem Views", subsystemsMenu); - overviewMenu.addItem("AutoDiscovery Queue",new LinkCommand("#cofng")); - overviewMenu.addItem("Dashboard",new LinkCommand("#cofng")); - - - MenuBar resourcesMenu = new MenuBar(true); - resourcesMenu.setStylePrimaryName("gwtMenu"); - resourcesMenu.addItem("All Resources", new LinkCommand("#fsdf")); - resourcesMenu.addItem("Platforms", new LinkCommand("#fsdf")); - resourcesMenu.addItem("Servers", new LinkCommand("#fsdf")); - resourcesMenu.addItem("Services", new LinkCommand("#fsdf")); - resourcesMenu.addSeparator(); -// resourcesMenu.addItem("Favorite Resources",) - - MenuBar groupsMenu = new MenuBar(true); - groupsMenu.setStylePrimaryName("gwtMenu"); - groupsMenu.addItem("All Groups", new LinkCommand("#sf")); - groupsMenu.addItem("Compatible Groups", new LinkCommand("#sf")); - groupsMenu.addItem("Mixed Groups", new LinkCommand("#sf")); - groupsMenu.addItem("Group Definitions", new LinkCommand("#sf")); - groupsMenu.addSeparator(); - groupsMenu.addItem("New Group", new LinkCommand("#sf")); - groupsMenu.addItem("New Group Definition", new LinkCommand("#sf")); - groupsMenu.addSeparator(); - groupsMenu.addItem("Favorites", new LinkCommand("#sf")); - - - - - MenuBar helpMenu = new MenuBar(true); - helpMenu.setStylePrimaryName("gwtMenu"); - helpMenu.addItem("Online Documentation", new LinkCommand("#sdfs")); - helpMenu.addItem("Open a support case", new LinkCommand("#sdfs")); - helpMenu.addItem("About", new LinkCommand("#sdfs")); - - - - menu.addItem(new MenuItem("<img src="images/header/rhq_logo_28px.png"/>", true, new LinkCommand("#about"))); - menu.addItem(new MenuItem("Overview", overviewMenu)); - menu.addItem(new MenuItem("Resources", resourcesMenu)); - menu.addItem(new MenuItem("Groups", groupsMenu)); - menu.addItem(new MenuItem("Help", helpMenu)); - - // Return the menu - menu.ensureDebugId("topMenuBar"); - - - addMember(menu); - } - - private String setupLinks() { - StringBuilder headerString = new StringBuilder( - "<table style="height: 34px;" cellpadding="0" cellspacing="0"><tr>"); - - boolean first = true; - for (String section : SECTIONS) { - if (first) { - headerString.append("<td style="width: 1px;"><img src="images/header/header_bg_line.png"/></td>"); - } - first = false; - - String styleClass = "TopSectionLink"; - if (section.equals(selected)) { - styleClass += "Selected"; - } - - headerString.append("<td class="" + styleClass + "" onclick="document.location='#" + section + "'" >"); - headerString.append(section); - headerString.append("</td>\n"); - - headerString.append("<td style="width: 1px;"><img src="images/header/header_bg_line.png"/></td>"); - } - - headerString.append("</tr></table>"); - - return headerString.toString(); - } -} \ No newline at end of file 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 453d231..212b8e1 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 @@ -119,8 +119,8 @@ public class MenuBarView extends LocatableVLayout { }
// Set explicit identifiers because the generated scLocator is not getting picked up by Selenium. - headerString.append("<td id="" + section + "" class="" + styleClass - + "" onclick="document.location='#" + section + "'" >"); + headerString.append("<td id="").append(section).append("" class="").append(styleClass) + .append("" onclick="document.location='#").append(section).append("'" >"); headerString.append(section); headerString.append("</td>\n");
@@ -138,8 +138,8 @@ public class MenuBarView extends LocatableVLayout { layout.setAlign(Alignment.RIGHT);
LocatableImg helpImage = new LocatableImg("HelpImage", "[SKIN]/actions/help.png", 16, 16); - Hyperlink helpLink = SeleniumUtility.setHtmlId(new Hyperlink("Help", "Help")); - Hyperlink logoutLink = SeleniumUtility.setHtmlId(new Hyperlink("Log Out", "LogOut")); + Hyperlink helpLink = SeleniumUtility.setHtmlId(new Hyperlink(MSG.view_menuBar_help(), "Help")); + Hyperlink logoutLink = SeleniumUtility.setHtmlId(new Hyperlink(MSG.view_menuBar_logout(), "LogOut"));
layout.addMember(helpImage); layout.addMember(helpLink); @@ -147,4 +147,5 @@ public class MenuBarView extends LocatableVLayout {
return layout; } + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/SearchBarPane.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/SearchBarPane.java index f68fdc4..99bb780 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/SearchBarPane.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/SearchBarPane.java @@ -47,7 +47,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
/** - * The search bar, which provides the ability to search for Resource or Resource groups. + * The search bar, which provides the ability to search for Resources or Resource groups. * * @author Greg Hinkle * @author Joseph Marques @@ -62,8 +62,8 @@ public class SearchBarPane extends LocatableHLayout { }
public enum SearchType { - RESOURCE("Resources"), // - GROUP("Resource Groups"); + RESOURCE(MSG.view_searchBar_resources()), // + GROUP(MSG.view_searchBar_resourceGroups());
private String displayName;
@@ -94,7 +94,7 @@ public class SearchBarPane extends LocatableHLayout { form.setNumCols(6); form.setColWidths("120", "140", "400");
- final SelectItem searchType = new SelectItem("searchType", "Search"); + final SelectItem searchType = new SelectItem("searchType", MSG.view_searchBar_search()); String[] valueMap = SearchType.getValueMap(); searchType.setValueMap(valueMap); searchType.setValue(valueMap[0]); @@ -109,7 +109,7 @@ public class SearchBarPane extends LocatableHLayout { ComboBoxItem resourceSearch = getResourceComboBox(); ComboBoxItem groupSearch = getGroupComboBox();
- ButtonItem search = new ButtonItem("Search", "Search"); + ButtonItem search = new ButtonItem("Search", MSG.common_button_search()); search.setStartRow(false); search.setEndRow(false); search.setShowTitle(false); @@ -182,7 +182,7 @@ public class SearchBarPane extends LocatableHLayout { Integer id = (Integer) changedEvent.getValue(); comboBox.setValue("");
- String link = null; + String link; if (searchType == SearchType.RESOURCE) { link = LinkManager.getResourceLink(id); } else if (searchType == SearchType.GROUP) { 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 6828ef8..57ed643 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 @@ -72,7 +72,7 @@ public class ReportTopView extends AbstractSectionedLeftNavigationView {
@Override protected HTMLFlow defaultView() { - String contents = "<h1>Reports</h1>\n" + "This section provides access to global reports."; + String contents = "<h1>" + MSG.view_reportsTop_title() + "</h1>\n" + MSG.view_reportsTop_description(); HTMLFlow flow = new HTMLFlow(contents); flow.setPadding(20); return flow; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBDataSource.java index 55c79f7..f9657b4 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBDataSource.java @@ -58,22 +58,22 @@ public class MeasurementOOBDataSource extends RPCDataSource<MeasurementOOBCompos protected List<DataSourceField> addDataSourceFields() { List<DataSourceField> fields = super.addDataSourceFields();
- DataSourceTextField metricField = new DataSourceTextField("scheduleName", "Metric"); + DataSourceTextField metricField = new DataSourceTextField("scheduleName", MSG.dataSource_measurementOob_field_scheduleName()); fields.add(metricField);
- DataSourceTextField resourceField = new DataSourceTextField("resourceName", "Resource"); + DataSourceTextField resourceField = new DataSourceTextField("resourceName", MSG.dataSource_measurementOob_field_resourceName()); fields.add(resourceField);
- DataSourceTextField parentField = new DataSourceTextField("parentName", "Parent"); + DataSourceTextField parentField = new DataSourceTextField("parentName", MSG.dataSource_measurementOob_field_parentName()); fields.add(parentField);
- DataSourceTextField bandField = new DataSourceTextField("formattedBaseband", "Band"); + DataSourceTextField bandField = new DataSourceTextField("formattedBaseband", MSG.dataSource_measurementOob_field_formattedBaseband()); fields.add(bandField);
- DataSourceTextField outlierField = new DataSourceTextField("formattedOutlier", "Outlier"); + DataSourceTextField outlierField = new DataSourceTextField("formattedOutlier", MSG.dataSource_measurementOob_field_formattedOutlier()); fields.add(outlierField);
- DataSourceTextField factorField = new DataSourceTextField("factor", "Out of range factor (%)"); + DataSourceTextField factorField = new DataSourceTextField("factor", MSG.dataSource_measurementOob_field_factor()); fields.add(factorField);
return fields; @@ -88,7 +88,7 @@ public class MeasurementOOBDataSource extends RPCDataSource<MeasurementOOBCompos GWTServiceLookup.getMeasurementDataService().getSchedulesWithOOBs(null, null, null, pc, new AsyncCallback<PageList<MeasurementOOBComposite>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to load measurement OOB information", caught); + CoreGUI.getErrorHandler().handleError(MSG.dataSource_measurementOob_error_fetchFailure(), caught); }
public void onSuccess(PageList<MeasurementOOBComposite> result) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBView.java index e778e50..33a706c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBView.java @@ -31,17 +31,18 @@ import org.rhq.enterprise.gui.coregui.client.components.table.Table; * @author Greg Hinkle */ public class MeasurementOOBView extends Table { + public static final String VIEW_ID = "SuspectMetrics"; - + private static final String TITLE = MSG.view_measurementOob_title(); + public MeasurementOOBView(String locatorId) { - super(locatorId, "Suspect Metrics"); + super(locatorId, TITLE);
setDataSource(new MeasurementOOBDataSource()); }
@Override protected void configureTable() { - getListGrid().setAlternateRecordStyles(false);
getListGrid().getField("resourceName").setCellFormatter(new CellFormatter() { @@ -49,6 +50,5 @@ public class MeasurementOOBView extends Table { return "<a href="#Resource/" + listGridRecord.getAttribute("resourceId") + "">" + o + "</a>"; } }); - } } 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 654f4c4..b321314 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 @@ -65,7 +65,7 @@ public class TagCloudView extends LocatableVLayout { GWTServiceLookup.getTagService().findTagReportCompositesByCriteria(new TagCriteria(), new AsyncCallback<PageList<TagReportComposite>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to load tags", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_tagCloud_error_fetchFailure(), caught); }
public void onSuccess(PageList<TagReportComposite> result) { @@ -83,7 +83,7 @@ public class TagCloudView extends LocatableVLayout { this.tags = tags;
if (!simple) { - addMember(new HeaderLabel("Tag Cloud")); + addMember(new HeaderLabel(MSG.view_tagCloud_title())); }
long max = 0; @@ -110,16 +110,17 @@ public class TagCloudView extends LocatableVLayout {
int font = (int) ((((double) tag.getTotal()) / (double) max) * (maxFont - minFont)) + minFont;
- buf.append("<a href="#Reports/Inventory/Tag Cloud/" + tag.getTag().toString() + "" style="font-size: " - + font + "pt; margin: 8px;""); + buf.append("<a href="#Reports/Inventory/Tag Cloud/").append(tag.getTag()).append("" style="font-size: ") + .append(font).append("pt; margin: 8px;"");
- buf.append(" title="Tag used " + tag.getTotal() + " times""); + buf.append(" title="").append(MSG.view_tagCloud_error_tagUsedCount(String.valueOf(tag.getTotal()))) + .append(""");
if (tag.getTag().toString().equals(selectedTag)) { buf.append(" class="selectedTag""); }
- buf.append(">" + tag.getTag().toString() + "</a> "); + buf.append(">").append(tag.getTag()).append("</a> "); }
HTMLFlow flow = new HTMLFlow(buf.toString()); 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 20ddd34..1c61a5e 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 @@ -42,12 +42,11 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; * @author Greg Hinkle */ public class TaggedView extends LocatableVLayout implements BookmarkableView { + public static final String VIEW_ID = "Tag";
private TagCloudView tagCloudView;
- private Criteria criteria; - private ArrayList<Table> tiles = new ArrayList<Table>();
private LocatableTileLayout tileLayout; @@ -78,7 +77,7 @@ public class TaggedView extends LocatableVLayout implements BookmarkableView {
Tag tag = new Tag(tagString);
- criteria = new Criteria(); + Criteria criteria = new Criteria(); criteria.addCriteria("tagNamespace", tag.getNamespace()); criteria.addCriteria("tagSemantic", tag.getSemantic()); criteria.addCriteria("tagName", tag.getName()); @@ -104,7 +103,8 @@ public class TaggedView extends LocatableVLayout implements BookmarkableView { criteria); tiles.add(bundleDestinationListView);
- ResourceSearchView resourceView = new ResourceSearchView(getLocatorId(), criteria, "Tagged Resources"); + ResourceSearchView resourceView = new ResourceSearchView(getLocatorId(), criteria, + MSG.view_taggedResources_title()); tiles.add(resourceView);
for (Table t : tiles) { @@ -124,4 +124,5 @@ public class TaggedView extends LocatableVLayout implements BookmarkableView { viewTag(tagString); } } + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchLogger.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchLogger.java index 9ac8bed..c482a97 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchLogger.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchLogger.java @@ -1,9 +1,11 @@ package org.rhq.enterprise.gui.coregui.client.search;
-import com.google.gwt.core.client.GWT; +import com.allen_sauer.gwt.log.client.Log;
public class SearchLogger { + public static void debug(String message) { - GWT.log("SearchBar: " + message); + Log.debug("SearchBar: " + message); } + } diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index b27746c..27aa50d 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -26,6 +26,7 @@ common_button_purgeAll=Purge All~ common_button_refresh = "Refresh"~ common_button_reset = Reset~ common_button_save = Save~ +common_button_search = Search~
# Common Labels @@ -57,6 +58,7 @@ common_title_description=Description~ common_title_enabled=Enabled?~ common_title_end = End~ common_title_generalProp = General Properties~ +common_title_icon = icon~ common_title_id = Id~ common_title_inventory = Inventory~ common_title_lastUpdated=Last Updated~ @@ -110,7 +112,6 @@ widget_recordEditor_info_recordsDeletedConcise = {0} {1} deleted.~ widget_recordEditor_info_recordsDeletedDetailed = {0} {1} deleted: {2}.~ widget_recordEditor_error_unsupportedOperationType = Unsupported operation type: [{0}]~
- #================== DataSources ====================
# Users @@ -126,14 +127,33 @@ dataSource_users_field_emailAddress = Email Address~ dataSource_users_field_phoneNumber = Phone Number~ dataSource_users_field_department = Department~ dataSource_users_field_factive = Login Enabled?~ + +# Platforms +#------ dataSource_platforms_field_cpu=CPU~ dataSource_platforms_field_memory=Memory~ dataSource_platforms_field_swap=Swap~ + +# Traits +#------ dataSource_traits_field_primaryKey=Primary Key~ dataSource_traits_field_definitionID=Definition ID~ dataSource_traits_field_lastChanged=Last Changed~ dataSource_traits_field_trait=Trait~
+# Measurement OOBs +#--------------------------------- +dataSource_measurementOob_field_scheduleName = Metric~ +dataSource_measurementOob_field_resourceName = Resource~ +dataSource_measurementOob_field_parentName = Parent~ +dataSource_measurementOob_field_formattedBaseband = Band~ +dataSource_measurementOob_field_formattedOutlier = Outlier~ +dataSource_measurementOob_field_factor = Out of Range Factor (%)~ +dataSource_measurementOob_error_fetchFailure = Failed to load measurement OOB information~ +dataSource_measurementOob_field_resourceName = +dataSource_measurementOob_field_resourceName = + + #********************************** VIEW-SPECIFIC *************************************
#================= Administration ================== @@ -202,6 +222,30 @@ view_tableSection_backButton = Back to List~ view_tableSection_error_noId = Table [{0}] record is missing 'id' attribute - please report this bug.~ view_tableSection_error_badId = Can not show detail for [{0}]. Illegal 'id': [{1}]. Please report this bug~
+view_tags_error_1 = Failed to load Tags~ +view_tags_title = Tags:~ +view_tags_tooltip_1 = Click to remove this Tag~ +view_tags_tooltip_2 = Click to edit Tags~ +view_tags_tooltip_3 = Enter a Tag in the format: (namespace:)(semantic=)tagname (e.g. it:env=QA, or owner=John) + +# File Upload (various) +view_upload_bundleDistFile = Distribution File~ +view_upload_error_bundleDistFile = Error uploading Bundle Distribution File~ +view_upload_error_file = Error uploading file~ +view_upload_error_fileName = Error uploading file [{0}]~ +view_upload_error_fileName_2 = Error uploading file [{0}], check for invalid file path.~ +view_upload_error_packageVersionFile = Error uploading Package Version File~ +view_upload_error_results = Error uploading file, unexpected results: [{0}]~ +view_upload_inProgress = Can not submit, upload is currently in progress~ +view_upload_prompt_1 = [{0}] Please select a file to upload~ +view_upload_prompt_2 = File to Upload~ +view_upload_tooltip_1 = File has already been uploaded~ +view_upload_tooltip_2 = Select a file to upload, then click Upload or Next~ +view_upload_tooltip_3 = Uploaded file successfully~ +view_upload_upload = Upload~ +view_upload_uploadFile = UploadFile~ + +
#=================== Dashboard ===================== view_portlet_autodiscovery_config_platform_selection = Number of platforms to display~ @@ -361,10 +405,34 @@ view_group_pluginConfig_edit_saveFailure=Failed to initiate group connection set view_group_pluginConfig_edit_valid=All connection setting properties have valid values, so the connection settings can now be saved~ view_group_pluginConfig_edit_invalid=The following connection setting properties have invalid values and must be corrected before the connection settings can be saved: [{0}]~
+ #==================== Reports ======================
+view_reportsTop_title = Reports~ +view_reportsTop_description = This section provides access to global reports.~ + +view_measurementOob_title = Suspect Metrics~ + +view_tagCloud_title = Tag Cloud~ +view_tagCloud_error_fetchFailure = Failed to load tags.~ +view_tagCloud_error_tagUsedCount = Tag used {0} times.~ + +view_taggedResources_title = Tagged Resources~ + + #=================== Top Level =====================
+# Menu Bar +#-------------- +view_menuBar_help = Help~ +view_menuBar_logout = Logout~ + +# Search Bar +#----------------- +view_searchBar_search = Search~ +view_searchBar_resources = Resources~ +view_searchBar_resourceGroups = Resource Groups~ + # About Box #---------- view_aboutBox_allRightsReserved = All Rights Reserved.~ @@ -374,4 +442,3 @@ view_aboutBox_homepage = Homepage~ view_aboutBox_jbossByRedHat = JBoss by Red Hat~ view_aboutBox_title = About {0}~ view_aboutBox_version = Version:~ -
commit 95b291d54f72607ec0d3777475e868f8b9eb7041 Merge: fb43d97... c5fc2e8... Author: Simeon Pinder spinder@redhat.com Date: Wed Nov 17 09:34:45 2010 -0500
Merge branch 'master' of ssh://spinder@git.fedorahosted.org/git/rhq/rhq into track-master2
diff --cc modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index dd06cd3,b27746c..c38aa5f --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@@ -56,9 -57,9 +57,10 @@@ common_title_description=Description common_title_enabled=Enabled?~ common_title_end = End~ common_title_generalProp = General Properties~ +common_title_icon = icon~ common_title_id = Id~ common_title_inventory = Inventory~ + common_title_lastUpdated=Last Updated~ common_title_metric = Metric~ common_title_mixedGroups = Mixed Groups~ common_title_name = Name~
commit fb43d973a7f679be4e0cbffa568d24cc62b6fe82 Author: Simeon Pinder spinder@redhat.com Date: Wed Nov 17 09:34:20 2010 -0500
i18n work.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java index b5e820e..3257661 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java @@ -18,8 +18,6 @@ */ package org.rhq.enterprise.gui.coregui.client.dashboard.portlets.inventory.queue;
-import static org.rhq.enterprise.gui.coregui.client.util.WidgetsField.UNLIMITED; - import com.smartgwt.client.types.VerticalAlignment; import com.smartgwt.client.widgets.Canvas; import com.smartgwt.client.widgets.HTMLFlow; @@ -46,11 +44,10 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout; * @author Greg Hinkle */ public class AutodiscoveryPortlet extends ResourceAutodiscoveryView implements CustomSettingsPortlet { - //ui attributes/properties/indentifiers - public static final String KEY = "Discovery Queue"; + public static final String KEY = MSG.view_portlet_autodiscovery_title(); private static final String AUTODISCOVERY_PLATFORM_MAX = "auto-discovery-platform-max"; - private String unlimited = UNLIMITED.propertyName(); + private String unlimited = MSG.common_label_unlimited(); private String defaultValue = unlimited; //portlet settings and datasource elements private DashboardPortlet storedPortlet; @@ -97,8 +94,7 @@ public class AutodiscoveryPortlet extends ResourceAutodiscoveryView implements C }
public Canvas getHelpCanvas() { - return new HTMLFlow("This portlet offers the ability to import newly discovered resources into the inventory " - + "for monitoring and management or to ingnore them from further action."); + return new HTMLFlow(MSG.view_portlet_autodiscovery_help_msg()); }
/** Build custom for to dispaly the Portlet Configuration settings. @@ -111,7 +107,7 @@ public class AutodiscoveryPortlet extends ResourceAutodiscoveryView implements C //horizontal display component LocatableHLayout row = new LocatableHLayout(extendLocatorId("auto-discovery.configuration")); BlurbItem label = new BlurbItem(form.extendLocatorId("discovery-platform-count-label")); - label.setValue("Number of platforms to display"); + label.setValue(MSG.view_portlet_autodiscovery_config_platform_selection()); label.setWrap(false);
//-------------combobox for number of platforms to display on the dashboard diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java index 13a35c0..8cfdde1 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java @@ -44,7 +44,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceSearchVi */ public class FavoriteResourcesPortlet extends ResourceSearchView implements Portlet {
- public static final String KEY = "Favorite Resources"; + public static final String KEY = MSG.view_portlet_favoriteResources_title();
public static final String CFG_TABLE_PREFS = "tablePreferences";
@@ -99,7 +99,7 @@ public class FavoriteResourcesPortlet extends ResourceSearchView implements Port }
public Canvas getHelpCanvas() { - return new HTMLFlow("This portlet displays your favorite resources"); + return new HTMLFlow(MSG.view_portlet_favoriteResources_msg()); }
public static final class Factory implements PortletViewFactory { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/GraphPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/GraphPortlet.java index e0dd4aa..e134a71 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/GraphPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/GraphPortlet.java @@ -47,7 +47,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitorin */ public class GraphPortlet extends SmallGraphView implements CustomSettingsPortlet {
- public static final String KEY = "Resource Graph"; + public static final String KEY = MSG.view_portlet_graph_title();
private PortletWindow portletWindow; private DashboardPortlet storedPortlet; @@ -71,7 +71,7 @@ public class GraphPortlet extends SmallGraphView implements CustomSettingsPortle }
public Canvas getHelpCanvas() { - return new HTMLFlow("<h3>Graph Portlet</h3>This Portlet supports the graphing of a resource metric."); + return new HTMLFlow("<h3>" + MSG.view_portlet_graph_help_title() + "</h3>" + MSG.view_portlet_graph_help_msg()); }
public ConfigurationDefinition getConfigurationDefinition() { @@ -91,7 +91,7 @@ public class GraphPortlet extends SmallGraphView implements CustomSettingsPortle if (storedPortlet.getConfiguration().getSimple(CFG_RESOURCE_ID) != null) { super.onDraw(); } else { - addMember(new Label("This graph is unconfigured, click the settings button to configure.")); + addMember(new Label(MSG.view_portlet_graph_help_unconfigured())); } }
@@ -99,10 +99,10 @@ public class GraphPortlet extends SmallGraphView implements CustomSettingsPortle final DynamicForm form = new DynamicForm();
final ResourceLookupComboBoxItem resourceLookupComboBoxItem = new ResourceLookupComboBoxItem(CFG_RESOURCE_ID, - "Resource"); + MSG.common_title_resource()); resourceLookupComboBoxItem.setWidth(300);
- final SelectItem metric = new SelectItem(CFG_DEFINITION_ID, "Metric") { + final SelectItem metric = new SelectItem(CFG_DEFINITION_ID, MSG.common_title_metric()) { @Override protected Criteria getPickListFilterCriteria() { Criteria criteria = new Criteria(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformMetricDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformMetricDataSource.java index cf15cc8..38d38a5 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformMetricDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformMetricDataSource.java @@ -21,17 +21,19 @@ package org.rhq.enterprise.gui.coregui.client.dashboard.portlets.platform; import java.util.List;
import com.smartgwt.client.data.DataSourceField; -import com.smartgwt.client.data.Record; import com.smartgwt.client.data.fields.DataSourceTextField; import com.smartgwt.client.widgets.grid.ListGridRecord;
import org.rhq.core.domain.resource.Resource; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.Messages; import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDatasource;
/** * @author Greg Hinkle */ public class PlatformMetricDataSource extends ResourceDatasource { + private static final Messages MSG = CoreGUI.getMessages();
PlatformPortletView view;
@@ -47,12 +49,12 @@ public class PlatformMetricDataSource extends ResourceDatasource { protected List<DataSourceField> addDataSourceFields() { List<DataSourceField> fields = super.addDataSourceFields();
- DataSourceTextField cpuField = new DataSourceTextField("cpu", "CPU"); + DataSourceTextField cpuField = new DataSourceTextField("cpu", MSG.dataSource_platforms_field_cpu()); fields.add(cpuField); - DataSourceTextField memoryField = new DataSourceTextField("memory", "Memory"); + DataSourceTextField memoryField = new DataSourceTextField("memory", MSG.dataSource_platforms_field_memory()); fields.add(memoryField);
- DataSourceTextField swapField = new DataSourceTextField("swap", "Swap"); + DataSourceTextField swapField = new DataSourceTextField("swap", MSG.dataSource_platforms_field_swap()); // todo swap
return fields; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformPortletView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformPortletView.java index 692cec2..e7fa7fa 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformPortletView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformPortletView.java @@ -65,7 +65,7 @@ public class PlatformPortletView extends LocatableListGrid implements Portlet { private ResourceTypeGWTServiceAsync typeService = GWTServiceLookup.getResourceTypeGWTService();
private HashMap<Integer, PlatformMetricDefinitions> platformMetricDefinitionsHashMap = new HashMap<Integer, PlatformMetricDefinitions>(); - public static final String KEY = "Platforms Summary"; + public static final String KEY = MSG.view_portlet_platform_title();
public PlatformPortletView(String locatorId) { super(locatorId); @@ -97,7 +97,7 @@ public class PlatformPortletView extends LocatableListGrid implements Portlet { // TODO GH: Find a way to pass resource type criteria lookups through the type cache typeService.findResourceTypesByCriteria(typeCriteria, new AsyncCallback<PageList<ResourceType>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Couldn't load type data", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_portlet_platform_type_error_1(), caught); }
public void onSuccess(PageList<ResourceType> result) { @@ -109,7 +109,7 @@ public class PlatformPortletView extends LocatableListGrid implements Portlet {
private void buildUI() {
- ListGridField nameField = new ListGridField("name", "Name", 250); + ListGridField nameField = new ListGridField("name", MSG.common_title_name(), 250); nameField.setCellFormatter(new CellFormatter() { public String format(Object o, ListGridRecord listGridRecord, int i, int i1) { return "<a href="#Resource/" + listGridRecord.getAttribute("id") + "">" + o + "</a>"; @@ -133,7 +133,7 @@ public class PlatformPortletView extends LocatableListGrid implements Portlet { measurementService.findLiveData(resource.getId(), pmd.getDefinitionIds(), new AsyncCallback<Set<MeasurementData>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to load platform metrics", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_portlet_platform_type_error_1(), caught); }
public void onSuccess(Set<MeasurementData> result) { @@ -198,7 +198,7 @@ public class PlatformPortletView extends LocatableListGrid implements Portlet { }
public Canvas getHelpCanvas() { - return new HTMLFlow("This portlet displays information about platforms in inventory."); + return new HTMLFlow(MSG.view_portlet_platform_help_msg()); }
public DynamicForm getCustomSettingsForm() { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java index 0340675..d2596c9 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java @@ -41,8 +41,10 @@ import org.rhq.core.domain.configuration.PropertyList; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.dashboard.DashboardPortlet; import org.rhq.core.domain.resource.ResourceType; -import org.rhq.enterprise.gui.coregui.client.alert.AlertPortletDataSource; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.Messages; import org.rhq.enterprise.gui.coregui.client.alert.AlertHistoryView; +import org.rhq.enterprise.gui.coregui.client.alert.AlertPortletDataSource; 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; @@ -59,7 +61,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableLabel; */ public class RecentAlertsPortlet extends AlertHistoryView implements CustomSettingsPortlet {
- public static final String KEY = "Recent Alerts"; + public static final String KEY = MSG.view_portlet_recentAlerts_title(); public static final String TITLE = KEY; //widget keys also used in form population public static final String ALERT_RANGE_DISPLAY_AMOUNT_VALUE = "alert-range-display-amount-value"; @@ -69,26 +71,26 @@ public class RecentAlertsPortlet extends AlertHistoryView implements CustomSetti public static final String ALERT_RANGE_RESOURCE_IDS = "alert-range-resource-ids"; //configuration default information private static final String defaultAlertCountValue = "5"; - private static final String PRIORITY_ALL = "ALL"; + private static final String PRIORITY_ALL = MSG.common_label_all(); private static final String PRIORITY_HIGH = AlertPriority.HIGH.getDisplayName(); private static final String PRIORITY_MEDIUM = AlertPriority.MEDIUM.getDisplayName(); private static final String PRIORITY_LOW = AlertPriority.LOW.getDisplayName(); private static final String defaultPriorityValue = PRIORITY_ALL; - private static final String TIME_30_MINS = "30 minutes"; - private static final String TIME_HOUR = "hour"; - private static final String TIME_12_HRS = "12 hours"; - private static final String TIME_DAY = "day"; - private static final String TIME_WEEK = "week"; - private static final String TIME_MONTH = "month"; + private static final String TIME_30_MINS = "30 " + MSG.common_label_minutes(); + private static final String TIME_HOUR = MSG.common_label_hour(); + private static final String TIME_12_HRS = "12 " + MSG.common_label_hours(); + private static final String TIME_DAY = MSG.common_label_day(); + private static final String TIME_WEEK = MSG.common_label_week(); + private static final String TIME_MONTH = MSG.common_label_month(); private static final String defaultTimeValue = TIME_DAY; - public static final String RESOURCES_ALL = "all resources"; - public static final String RESOURCES_SELECTED = "selected resources"; + public static final String RESOURCES_ALL = MSG.common_label_all_resources(); + public static final String RESOURCES_SELECTED = MSG.common_label_selected_resources(); public static final String defaultResourceValue = RESOURCES_ALL; - private static final String unlimited = "unlimited"; + private static final String unlimited = MSG.common_label_unlimited(); //alert resource labels - public static final String ALERT_LABEL_SELECTED_RESOURCES = "Selected Resources"; - public static final String ALERT_LABEL_AVAILABLE_RESOURCES = "Available Resources"; - public static final String ALERT_LABEL_RESOURCE_INVENTORY = "Resource Inventory"; + public static final String ALERT_LABEL_SELECTED_RESOURCES = MSG.common_title_selected_resources(); + public static final String ALERT_LABEL_AVAILABLE_RESOURCES = MSG.common_title_available_resources(); + public static final String ALERT_LABEL_RESOURCE_INVENTORY = MSG.common_title_resource_inventory(); public static final int ALERT_RESOURCE_SELECTION_WIDTH = 800; public static final String ID = "id"; //shared private UI elements @@ -249,7 +251,7 @@ public class RecentAlertsPortlet extends AlertHistoryView implements CustomSetti }
public Canvas getHelpCanvas() { - return new HTMLFlow("Displays recent alerts fired on resources visible to the current user login."); + return new HTMLFlow(MSG.view_portlet_recentAlerts_help_msg()); }
public DynamicForm getCustomSettingsForm() { @@ -264,7 +266,8 @@ public class RecentAlertsPortlet extends AlertHistoryView implements CustomSetti VLayout column = new VLayout();
//label - LocatableLabel alertRangeLabel = new LocatableLabel("DynamicForm_Label_Alert_Range", "<b>Alert Range</b>"); + LocatableLabel alertRangeLabel = new LocatableLabel("DynamicForm_Label_Alert_Range", "<b>" + + MSG.common_title_alert_range() + "</b>");
//horizontal layout LocatableHLayout row = new LocatableHLayout(extendLocatorId("alert-range-settings-row-1")); @@ -272,10 +275,10 @@ public class RecentAlertsPortlet extends AlertHistoryView implements CustomSetti
//-------------combobox for number of completed scheduled ops to display on the dashboard final SelectItem alertRangeLastComboBox = new SelectItem(ALERT_RANGE_DISPLAY_AMOUNT_VALUE); - alertRangeLastComboBox.setTitle("Last"); + alertRangeLastComboBox.setTitle(MSG.view_measureRange_last()); alertRangeLastComboBox.setType("selection"); //define acceptable values for display amount - String[] acceptableDisplayValues = { "5", "10", "unlimited" }; + String[] acceptableDisplayValues = { "5", "10", MSG.common_label_unlimited() }; alertRangeLastComboBox.setValueMap(acceptableDisplayValues); //set width of dropdown display region alertRangeLastComboBox.setWidth(100); @@ -305,7 +308,8 @@ public class RecentAlertsPortlet extends AlertHistoryView implements CustomSetti //-------------combobox for number of completed scheduled ops to display on the dashboard final SelectItem alertRangePriorityComboBox = new SelectItem(ALERT_RANGE_PRIORITY_VALUE); alertRangePriorityComboBox.setTitle(""); - alertRangePriorityComboBox.setHint("<nobr> <b> priority Alerts,</b></nobr>"); + alertRangePriorityComboBox.setHint("<nobr> <b> " + MSG.view_portlet_recentAlerts_config_priority_label() + + "</b></nobr>"); alertRangePriorityComboBox.setType("selection"); //define acceptable values for display amount String[] acceptablePriorityDisplayValues = { PRIORITY_ALL, PRIORITY_HIGH, PRIORITY_MEDIUM, PRIORITY_LOW }; @@ -345,8 +349,8 @@ public class RecentAlertsPortlet extends AlertHistoryView implements CustomSetti //horizontal layout LocatableHLayout row2 = new LocatableHLayout(extendLocatorId("alert-range-settings-row-2"));
- LocatableLabel alertRangeSpanLabel = new LocatableLabel(extendLocatorId("range-span-label"), - "<b>within the past<b>"); + LocatableLabel alertRangeSpanLabel = new LocatableLabel(extendLocatorId("range-span-label"), "<b>" + + MSG.view_portlet_recentAlerts_config_when() + "<b>"); //------------- Build second combobox for timeframe for problem resources search. final SelectItem alertRangeTimeComboBox = new SelectItem(ALERT_RANGE_TIME_VALUE); alertRangeTimeComboBox.setTitle(""); @@ -564,7 +568,7 @@ public class RecentAlertsPortlet extends AlertHistoryView implements CustomSetti * Also modifies the AssignedGrid to listen for AvailbleGrid completion and act accordingly. */ class AlertResourceSelectorRegion { - + private static final Messages MSG = CoreGUI.getMessages(); private ResourceSelector selector = null;
private Integer[] currentlyAssignedIds; @@ -594,19 +598,20 @@ class AlertResourceSelectorRegion {
public Canvas getCanvas() { if (selector == null) { - selector = new ResourceSelector("Select Members", ResourceType.ANY_PLATFORM_TYPE, true); + selector = new ResourceSelector(MSG.view_portlet_recentAlerts_config_members(), + ResourceType.ANY_PLATFORM_TYPE, true); selector.setWidth100(); selector.setWidth(RecentAlertsPortlet.ALERT_RESOURCE_SELECTION_WIDTH); //widget ui updates - selector.getAvailableGrid().setTitle("Available Resources"); - selector.getAvailableGrid().setEmptyMessage("Loading data..."); - selector.getAssignedGrid().setTitle("Selected Resources"); + selector.getAvailableGrid().setTitle(MSG.common_title_available_resources()); + selector.getAvailableGrid().setEmptyMessage(MSG.common_msg_loading()); + selector.getAssignedGrid().setTitle(MSG.common_title_selected_resources()); //disable display typeFilter. selector.setDisplayResourceTypeFilter(false);
//populate fields for grid. - ListGridField nameField = new ListGridField("name", "Name"); - ListGridField iconField = new ListGridField("icon", "icon", 50); + ListGridField nameField = new ListGridField("name", MSG.common_title_name()); + ListGridField iconField = new ListGridField("icon", MSG.common_title_icon(), 50); iconField.setImageURLPrefix("types/"); iconField.setType(ListGridFieldType.ICON); selector.getAssignedGrid().setFields(iconField, nameField); @@ -630,7 +635,7 @@ class AlertResourceSelectorRegion { selector.getAssignedGrid().invalidateCache(); selector.getAssignedGrid().markForRedraw(); } else {//no selected resources found - selector.getAvailableGrid().setEmptyMessage("No items to show"); + selector.getAvailableGrid().setEmptyMessage(MSG.common_msg_noItemsToShow()); } } }); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourceDS.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourceDS.java index 7d4ab76..45ae251 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourceDS.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourceDS.java @@ -43,12 +43,14 @@ import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.domain.resource.composite.RecentlyAddedResourceComposite; import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.Messages; import org.rhq.enterprise.gui.coregui.client.UserSessionManager; import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility;
public class RecentlyAddedResourceDS extends DataSource { + private static final Messages MSG = CoreGUI.getMessages(); private Portlet portlet; private int maximumRecentlyAddedToDisplay; private int maximumRecentlyAddedWithinHours; @@ -60,7 +62,7 @@ public class RecentlyAddedResourceDS extends DataSource { setDataProtocol(DSProtocol.CLIENTCUSTOM); setDataFormat(DSDataFormat.CUSTOM);
- DataSourceTextField idField = new DataSourceTextField("id", "ID"); + DataSourceTextField idField = new DataSourceTextField("id", MSG.common_title_id()); idField.setPrimaryKey(true);
DataSourceTextField parentIdField = new DataSourceTextField("parentId", "Parent ID"); diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index ccc75e1..dd06cd3 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -56,6 +56,7 @@ common_title_description=Description~ common_title_enabled=Enabled?~ common_title_end = End~ common_title_generalProp = General Properties~ +common_title_icon = icon~ common_title_id = Id~ common_title_inventory = Inventory~ common_title_metric = Metric~
rhq-commits@lists.fedorahosted.org