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 | 30 ++- 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/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 65 ++++++- 18 files changed, 226 insertions(+), 170 deletions(-)
New commits: 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)
rhq-commits@lists.fedorahosted.org