modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationsPortlet.java | 20 +-- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/RecentOperationsDataSource.java | 63 +++++----- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/ScheduledOperationsDataSource.java | 51 ++++---- modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 27 ++++ 4 files changed, 102 insertions(+), 59 deletions(-)
New commits: commit c19cf499eab342221de175ce53cb752a6d78467c Author: Ian Springer ian.springer@redhat.com Date: Wed Nov 17 12:20:37 2010 -0500
more i18n
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationsPortlet.java index 2484d63..fe4bead 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationsPortlet.java @@ -101,11 +101,11 @@ public class OperationsPortlet extends LocatableVLayout implements CustomSetting recentOperationsGrid.setTitle(recentOperations); recentOperationsGrid.setWidth100(); //defining header span - String[] completedRows = new String[] { RecentOperationsDataSource.location, - RecentOperationsDataSource.operation, RecentOperationsDataSource.resource, - RecentOperationsDataSource.status, RecentOperationsDataSource.time }; + String[] completedRows = new String[] { RecentOperationsDataSource.FIELD_LOCATION, + RecentOperationsDataSource.FIELD_OPERATION, RecentOperationsDataSource.FIELD_RESOURCE, + RecentOperationsDataSource.FIELD_STATUS, RecentOperationsDataSource.FIELD_TIME}; recentOperationsGrid.setHeaderSpans(new HeaderSpan(recentOperations, completedRows)); - recentOperationsGrid.setHeaderSpanHeight(new Integer(20)); + recentOperationsGrid.setHeaderSpanHeight(20); recentOperationsGrid.setHeaderHeight(40); recentOperationsGrid.setResizeFieldsInRealTime(true); recentOperationsGrid.setCellHeight(50); @@ -118,11 +118,11 @@ public class OperationsPortlet extends LocatableVLayout implements CustomSetting scheduledOperationsGrid.setAutoFetchData(true); scheduledOperationsGrid.setTitle(scheduledOperations); scheduledOperationsGrid.setWidth100(); - String[] scheduledRows = new String[] { ScheduledOperationsDataSource.location, - ScheduledOperationsDataSource.operation, ScheduledOperationsDataSource.resource, - ScheduledOperationsDataSource.time }; + String[] scheduledRows = new String[] { ScheduledOperationsDataSource.FIELD_LOCATION, + ScheduledOperationsDataSource.FIELD_OPERATION, ScheduledOperationsDataSource.FIELD_RESOURCE, + ScheduledOperationsDataSource.FIELD_TIME }; scheduledOperationsGrid.setHeaderSpans(new HeaderSpan(scheduledOperations, scheduledRows)); - scheduledOperationsGrid.setHeaderSpanHeight(new Integer(20)); + scheduledOperationsGrid.setHeaderSpanHeight(20); scheduledOperationsGrid.setHeaderHeight(40);
scheduledOperationsGrid.setTitle(scheduledOperations); @@ -142,7 +142,7 @@ public class OperationsPortlet extends LocatableVLayout implements CustomSetting if ((property != null) && (property.getStringValue() != null)) { //retrieve and translate to int String retrieved = property.getStringValue(); - if (retrieved.equals(unlimited)) { + if (unlimited.equals(retrieved)) { getDataSourceCompleted().setOperationsRangeCompleted(-1); } else { getDataSourceCompleted().setOperationsRangeCompleted(Integer.parseInt(retrieved)); @@ -156,7 +156,7 @@ public class OperationsPortlet extends LocatableVLayout implements CustomSetting if ((property != null) && (property.getStringValue() != null)) { //retrieve and translate to int String retrieved = property.getStringValue(); - if (retrieved.equals(unlimited)) { + if (unlimited.equals(retrieved)) { getDataSourceScheduled().setOperationsRangeScheduled(-1); } else { getDataSourceScheduled().setOperationsRangeScheduled(Integer.parseInt(retrieved)); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/RecentOperationsDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/RecentOperationsDataSource.java index 46878e8..8705262 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/RecentOperationsDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/RecentOperationsDataSource.java @@ -1,5 +1,3 @@ -package org.rhq.enterprise.gui.coregui.client.operation; - /* * RHQ Management Platform * Copyright (C) 2005-2010 Red Hat, Inc. @@ -18,6 +16,8 @@ package org.rhq.enterprise.gui.coregui.client.operation; * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +package org.rhq.enterprise.gui.coregui.client.operation; + import java.util.Date; import java.util.List;
@@ -41,25 +41,27 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.resource.disambiguation.ReportDecorator; import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
-/** Responsible for defining and populating the Smart GWT datasource details and - * translating the deserialized content into specific record entries for display +/** + * Responsible for defining and populating the Smart GWT datasource details and + * translating the deserialized content into specific record entries for display * * @author Simeon Pinder */ public class RecentOperationsDataSource extends RPCDataSource<DisambiguationReport<ResourceOperationLastCompletedComposite>> { - //ui keys - public static final String resource = "resource"; - public static final String location = "location"; - public static final String operation = "operation"; - public static final String time = "time"; - public static final String status = "status"; + + // fields + public static final String FIELD_RESOURCE = "resource"; + public static final String FIELD_LOCATION = "location"; + public static final String FIELD_OPERATION = "operation"; + public static final String FIELD_TIME = "time"; + public static final String FIELD_STATUS = "status"; + private Portlet portlet;
//config attributes private boolean operationsRangeLastEnabled = false; - private int operationsRangeCompleted = -1; - public static String RANGE_DISABLED_MESSAGE = "(Results currently disabled. Change settings to enable results.)"; + private int operationsRangeCompleted = -1;
/** Build list of fields for the datasource and then adds them to it. */ @@ -74,20 +76,25 @@ public class RecentOperationsDataSource extends protected List<DataSourceField> addDataSourceFields() { List<DataSourceField> fields = super.addDataSourceFields();
- DataSourceTextField resourceField = new DataSourceTextField(resource, "Resource"); + DataSourceTextField resourceField = new DataSourceTextField(FIELD_RESOURCE, + MSG.dataSource_recentOperations_field_resource()); resourceField.setPrimaryKey(true); fields.add(resourceField);
- DataSourceTextField locationField = new DataSourceTextField(location, "Location", 200); + DataSourceTextField locationField = new DataSourceTextField(FIELD_LOCATION, + MSG.dataSource_recentOperations_field_location(), 200); fields.add(locationField);
- DataSourceTextField operationField = new DataSourceTextField(operation, "Operation"); + DataSourceTextField operationField = new DataSourceTextField(FIELD_OPERATION, + MSG.dataSource_recentOperations_field_operation()); fields.add(operationField);
- DataSourceDateTimeField timeField = new DataSourceDateTimeField(time, "Date/Time"); + DataSourceDateTimeField timeField = new DataSourceDateTimeField(FIELD_TIME, + MSG.dataSource_recentOperations_field_time()); fields.add(timeField);
- DataSourceTextField statusField = new DataSourceTextField(status, "Status"); + DataSourceTextField statusField = new DataSourceTextField(FIELD_STATUS, + MSG.dataSource_recentOperations_field_status()); fields.add(statusField);
return fields; @@ -127,7 +134,7 @@ public class RecentOperationsDataSource extends new AsyncCallback<List<DisambiguationReport<ResourceOperationLastCompletedComposite>>>() {
public void onFailure(Throwable throwable) { - CoreGUI.getErrorHandler().handleError("Failed to load recently completed operations.", + CoreGUI.getErrorHandler().handleError(MSG.dataSource_recentOperations_error_fetchFailure(), throwable); }
@@ -170,17 +177,17 @@ public class RecentOperationsDataSource extends for (DisambiguationReport<ResourceOperationLastCompletedComposite> report : list) { ListGridRecord record = new ListGridRecord(); //disambiguated Resource name, decorated with html anchors to problem resources - record.setAttribute(resource, ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL, + record.setAttribute(FIELD_RESOURCE, ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL, report.getResourceType(), report.getOriginal().getResourceName(), report.getOriginal() .getResourceId(), true)); //disambiguated resource lineage, decorated with html anchors - record.setAttribute(location, ReportDecorator.decorateResourceLineage(report.getParents(), true)); + record.setAttribute(FIELD_LOCATION, ReportDecorator.decorateResourceLineage(report.getParents(), true)); //operation name. - record.setAttribute(operation, report.getOriginal().getOperationName()); + record.setAttribute(FIELD_OPERATION, report.getOriginal().getOperationName()); //timestamp. - record.setAttribute(time, new Date(report.getOriginal().getOperationStartTime())); + record.setAttribute(FIELD_TIME, new Date(report.getOriginal().getOperationStartTime())); String link = generateResourceOperationStatusLink(report); - record.setAttribute(status, link); + record.setAttribute(FIELD_STATUS, link);
dataValues[indx++] = record; } @@ -221,12 +228,12 @@ public class RecentOperationsDataSource extends @Override public ListGridRecord copyValues(DisambiguationReport<ResourceOperationLastCompletedComposite> from) { ListGridRecord record = new ListGridRecord(); - record.setAttribute(resource, ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL, + record.setAttribute(FIELD_RESOURCE, ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL, from.getResourceType(), from.getOriginal().getResourceName(), from.getOriginal().getResourceId(), true)); - record.setAttribute(location, ReportDecorator.decorateResourceLineage(from.getParents(), true)); - record.setAttribute(operation, from.getOriginal().getOperationName()); - record.setAttribute(time, from.getOriginal().getOperationStartTime()); - record.setAttribute(status, generateResourceOperationStatusLink(from)); + record.setAttribute(FIELD_LOCATION, ReportDecorator.decorateResourceLineage(from.getParents(), true)); + record.setAttribute(FIELD_OPERATION, from.getOriginal().getOperationName()); + record.setAttribute(FIELD_TIME, from.getOriginal().getOperationStartTime()); + record.setAttribute(FIELD_STATUS, generateResourceOperationStatusLink(from));
record.setAttribute("entity", from);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/ScheduledOperationsDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/ScheduledOperationsDataSource.java index 7faaa46..c88b58e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/ScheduledOperationsDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/ScheduledOperationsDataSource.java @@ -1,5 +1,3 @@ -package org.rhq.enterprise.gui.coregui.client.operation; - /* * RHQ Management Platform * Copyright (C) 2005-2010 Red Hat, Inc. @@ -18,6 +16,8 @@ package org.rhq.enterprise.gui.coregui.client.operation; * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +package org.rhq.enterprise.gui.coregui.client.operation; + import java.util.Date; import java.util.List;
@@ -40,17 +40,21 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.resource.disambiguation.ReportDecorator; import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
-/** Responsible for defining and populating the Smart GWT datasource details and - * translating the deserialized content into specific record entries for display +/** + * Responsible for defining and populating the Smart GWT datasource details and + * translating the deserialized content into specific record entries for display * * @author Simeon Pinder */ public class ScheduledOperationsDataSource extends RPCDataSource<DisambiguationReport<ResourceOperationScheduleComposite>> { - public static final String resource = "resource"; - public static final String location = "location"; - public static final String operation = "operation"; - public static final String time = "time"; + + // fields + public static final String FIELD_RESOURCE = "resource"; + public static final String FIELD_LOCATION = "location"; + public static final String FIELD_OPERATION = "operation"; + public static final String FIELD_TIME = "time"; + //config settings private boolean operationsRangeNextEnabled = false; private int operationsRangeScheduled = -1; @@ -69,17 +73,21 @@ public class ScheduledOperationsDataSource extends protected List<DataSourceField> addDataSourceFields() { List<DataSourceField> fields = super.addDataSourceFields();
- DataSourceTextField resourceField = new DataSourceTextField(resource, "Resource"); + DataSourceTextField resourceField = new DataSourceTextField(FIELD_RESOURCE, + MSG.dataSource_scheduledOperations_field_resource()); resourceField.setPrimaryKey(true); fields.add(resourceField);
- DataSourceTextField locationField = new DataSourceTextField(location, "Location", 200); + DataSourceTextField locationField = new DataSourceTextField(FIELD_LOCATION, + MSG.dataSource_scheduledOperations_field_location(), 200); fields.add(locationField);
- DataSourceTextField operationField = new DataSourceTextField(operation, "Operation"); + DataSourceTextField operationField = new DataSourceTextField(FIELD_OPERATION, + MSG.dataSource_scheduledOperations_field_operation()); fields.add(operationField);
- DataSourceDateTimeField timeField = new DataSourceDateTimeField(time, "Date/Time"); + DataSourceDateTimeField timeField = new DataSourceDateTimeField(FIELD_TIME, + MSG.dataSource_scheduledOperations_field_time()); fields.add(timeField);
return fields; @@ -120,7 +128,8 @@ public class ScheduledOperationsDataSource extends new AsyncCallback<List<DisambiguationReport<ResourceOperationScheduleComposite>>>() {
public void onFailure(Throwable throwable) { - CoreGUI.getErrorHandler().handleError("Failed to load scheduled operations.", throwable); + CoreGUI.getErrorHandler().handleError(MSG.dataSource_scheduledOperations_error_fetchFailure(), + throwable); }
public void onSuccess( @@ -162,15 +171,15 @@ public class ScheduledOperationsDataSource extends ListGridRecord record = new ListGridRecord();
//disambiguated Resource name, decorated with html anchors to problem resources - record.setAttribute(resource, ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL, + record.setAttribute(FIELD_RESOURCE, ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL, report.getResourceType(), report.getOriginal().getResourceName(), report.getOriginal() .getResourceId(), true)); //disambiguated resource lineage, decorated with html anchors - record.setAttribute(location, ReportDecorator.decorateResourceLineage(report.getParents(), true)); + record.setAttribute(FIELD_LOCATION, ReportDecorator.decorateResourceLineage(report.getParents(), true)); //operation name. - record.setAttribute(operation, report.getOriginal().getOperationName()); + record.setAttribute(FIELD_OPERATION, report.getOriginal().getOperationName()); //timestamp. - record.setAttribute(time, new Date(report.getOriginal().getOperationNextFireTime())); + record.setAttribute(FIELD_TIME, new Date(report.getOriginal().getOperationNextFireTime()));
dataValues[indx++] = record; } @@ -186,11 +195,11 @@ public class ScheduledOperationsDataSource extends @Override public ListGridRecord copyValues(DisambiguationReport<ResourceOperationScheduleComposite> from) { ListGridRecord record = new ListGridRecord(); - record.setAttribute(resource, ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL, + record.setAttribute(FIELD_RESOURCE, ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL, from.getResourceType(), from.getOriginal().getResourceName(), from.getOriginal().getResourceId(), true)); - record.setAttribute(location, ReportDecorator.decorateResourceLineage(from.getParents(), true)); - record.setAttribute(operation, from.getOriginal().getOperationName()); - record.setAttribute(time, from.getOriginal().getOperationNextFireTime()); + record.setAttribute(FIELD_LOCATION, ReportDecorator.decorateResourceLineage(from.getParents(), true)); + record.setAttribute(FIELD_OPERATION, from.getOriginal().getOperationName()); + record.setAttribute(FIELD_TIME, from.getOriginal().getOperationNextFireTime());
record.setAttribute("entity", from);
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index de2cb19..3b31689 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -33,6 +33,7 @@ common_button_search = Search~
# Common Labels +#------------------------ common_label_all = ALL~ common_label_all_resources = all resources~ common_label_day=day~ @@ -185,6 +186,7 @@ dataSource_measurementOob_field_factor = Out of Range Factor (%)~ dataSource_measurementOob_error_fetchFailure = Failed to load measurement OOB information~
# Measurements +#---------------------- dataSource_schedules_field_resourceGroupId=Group ID~ dataSource_schedules_enableFailure=Failed to enable the collection of [{0}] metrics for resource group with ID [{1}]. The metrics were: [{2}]~ dataSource_schedules_enableSuccessful_concise=You have enabled the collection of [{0}] measurements~ @@ -204,6 +206,23 @@ dataSource_problemResources_field_alerts = Alerts~ dataSource_problemResources_field_available = Current Availability~ dataSource_problemResources_error_fetchFailure = Failed to load Resources with alerts/unavailability.~
+# Recent Operations +#---------------------------- +dataSource_recentOperations_field_resource = Resource~ +dataSource_recentOperations_field_location = Location~ +dataSource_recentOperations_field_operation = Operation~ +dataSource_recentOperations_field_time = Date/Time~ +dataSource_recentOperations_field_status = Status~ +dataSource_recentOperations_error_fetchFailure = Failed to load recently completed operations. + +# Scheduled Operations +#--------------------------------- +dataSource_scheduledOperations_field_resource = Resource~ +dataSource_scheduledOperations_field_location = Location~ +dataSource_scheduledOperations_field_operation = Operation~ +dataSource_scheduledOperations_field_time = Date/Time~ +dataSource_scheduledOperations_error_fetchFailure = Failed to load scheduled operations. +
#********************************** VIEW-SPECIFIC *************************************
@@ -509,11 +528,19 @@ view_core_error_1 = New Alerts lookup failed~ view_core_loggedInAs = Logged in as {0}~ view_core_loggedOut = Logged out~ view_core_recentAlerts = [{0}] recent alerts~ +view_core_registerLater = (Logout - Complete registration later.)~ +view_core_registerLdapSuccess = Succesfully registered the new LDAP User.~ +view_core_registerUser = Register User~ view_core_uncaught = Globally uncaught exception~
# Login #-------------- +view_login_login = Login~ +view_login_logout = Logout~ +view_login_noLdap = Note: Optional retrieval of ldap details unsuccessful. Manual entry is required.~ view_login_prompt = Please Login~ +view_login_welcome = Welcome to JBoss ON! <br/><br/> Enter/update the following fields to complete your registration process.<br/> Once you click "OK" you will be logged in.<br/><br/>~ +
# Menu Bar #--------------
rhq-commits@lists.fedorahosted.org