modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/SchedulesDataSource.java | 31 +++--- 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/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 27 ++++- 4 files changed, 67 insertions(+), 40 deletions(-)
New commits: 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~
rhq-commits@lists.fedorahosted.org