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/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 39 -------- 4 files changed, 49 insertions(+), 84 deletions(-)
New commits: 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~
rhq-commits@lists.fedorahosted.org