modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryDataSource.java | 63 +++--- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryView.java | 26 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationWizard.java | 12 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/ExecutionSchedule.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationCreateWizard.java | 19 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationParametersStep.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationSchedulingStep.java | 103 +++++----- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/detail/OperationDetailsView.java | 22 -- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java | 6 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 55 ++++- 10 files changed, 195 insertions(+), 122 deletions(-)
New commits: commit 5369dcf865a26b34927d25cff27ede259b573274 Author: Ian Springer ian.springer@redhat.com Date: Wed Nov 17 19:13:30 2010 -0500
i18n - resource operations views
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryDataSource.java index 2190de5..7735f69 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryDataSource.java @@ -44,6 +44,24 @@ import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; */ public class OperationHistoryDataSource extends RPCDataSource<ResourceOperationHistory> {
+ public static abstract class Field { + public static final String ID = "id"; + public static final String OPERATION_NAME = "operationName"; + public static final String RESOURCE = "resource"; + public static final String STATUS = "status"; + public static final String STARTED_TIME = "startedTime"; + public static final String CREATED_TIME = "createdTime"; + public static final String DURATION = "duration"; + public static final String SUBJECT = "subject"; + public static final String OPERATION_DEFINITION = "operationDefinition"; + public static final String ERROR_MESSAGE = "errorMessage"; + public static final String PARAMETERS = "parameters"; + } + + public static abstract class CriteriaField { + public static final String RESOURCE_ID = "resourceId"; + } + private OperationGWTServiceAsync operationService = GWTServiceLookup.getOperationService();
public OperationHistoryDataSource() { @@ -55,20 +73,20 @@ public class OperationHistoryDataSource extends RPCDataSource<ResourceOperationH protected List<DataSourceField> addDataSourceFields() { List<DataSourceField> fields = super.addDataSourceFields();
- DataSourceIntegerField idField = new DataSourceIntegerField("id"); + DataSourceIntegerField idField = new DataSourceIntegerField(Field.ID); idField.setPrimaryKey(true); fields.add(idField);
- DataSourceTextField nameField = new DataSourceTextField("operationName"); + DataSourceTextField nameField = new DataSourceTextField(Field.OPERATION_NAME); fields.add(nameField);
- DataSourceTextField resourceField = new DataSourceTextField("resource"); + DataSourceTextField resourceField = new DataSourceTextField(Field.RESOURCE); fields.add(resourceField);
- DataSourceTextField statusField = new DataSourceTextField("status"); + DataSourceTextField statusField = new DataSourceTextField(Field.STATUS); fields.add(statusField);
- DataSourceTextField startedField = new DataSourceTextField("startedTime"); + DataSourceTextField startedField = new DataSourceTextField(Field.STARTED_TIME); startedField.setType(FieldType.DATETIME); fields.add(startedField);
@@ -79,9 +97,9 @@ public class OperationHistoryDataSource extends RPCDataSource<ResourceOperationH protected void executeFetch(final DSRequest request, final DSResponse response) { ResourceOperationHistoryCriteria criteria = new ResourceOperationHistoryCriteria();
- if (request.getCriteria().getValues().containsKey("resourceId")) { + if (request.getCriteria().getValues().containsKey(CriteriaField.RESOURCE_ID)) { criteria.addFilterResourceIds(Integer - .parseInt((String) request.getCriteria().getValues().get("resourceId"))); + .parseInt((String) request.getCriteria().getValues().get(CriteriaField.RESOURCE_ID))); }
criteria.setPageControl(getPageControl(request)); @@ -89,7 +107,8 @@ public class OperationHistoryDataSource extends RPCDataSource<ResourceOperationH operationService.findResourceOperationHistoriesByCriteria(criteria, new AsyncCallback<PageList<ResourceOperationHistory>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failure loading operation histories", caught); + CoreGUI.getErrorHandler().handleError(MSG.dataSource_operationHistory_error_fetchFailure(), + caught); }
public void onSuccess(PageList<ResourceOperationHistory> result) { @@ -101,25 +120,25 @@ public class OperationHistoryDataSource extends RPCDataSource<ResourceOperationH
@Override public ResourceOperationHistory copyValues(Record from) { - throw new UnsupportedOperationException("ResourceOperationHistory is read only"); + throw new UnsupportedOperationException("ResourceOperationHistory is read only."); }
@Override public ListGridRecord copyValues(ResourceOperationHistory from) { ListGridRecord record = new ListGridRecord(); - record.setAttribute("id", from.getId()); - record.setAttribute("createdTime", from.getCreatedTime()); - record.setAttribute("startedTime", new Date(from.getStartedTime())); - record.setAttribute("duration", from.getDuration()); - record.setAttribute("resource", from.getResource()); - record.setAttribute("subject", from.getSubjectName()); - record.setAttribute("operationDefinition", from.getOperationDefinition()); - record.setAttribute("operationName", from.getOperationDefinition().getDisplayName()); - record.setAttribute("errorMessage", from.getErrorMessage()); - record.setAttribute("status", from.getStatus().name()); - record.setAttribute("parameters", from.getParameters()); - - record.setAttribute("entity", from); + record.setAttribute(Field.ID, from.getId()); + record.setAttribute(Field.CREATED_TIME, from.getCreatedTime()); + record.setAttribute(Field.STARTED_TIME, new Date(from.getStartedTime())); + record.setAttribute(Field.DURATION, from.getDuration()); + record.setAttribute(Field.RESOURCE, from.getResource()); + record.setAttribute(Field.SUBJECT, from.getSubjectName()); + record.setAttribute(Field.OPERATION_DEFINITION, from.getOperationDefinition()); + record.setAttribute(Field.OPERATION_NAME, from.getOperationDefinition().getDisplayName()); + record.setAttribute(Field.ERROR_MESSAGE, from.getErrorMessage()); + record.setAttribute(Field.STATUS, from.getStatus().name()); + record.setAttribute(Field.PARAMETERS, from.getParameters()); + return record; } + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryView.java index 5e03c44..662dff7 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryView.java @@ -46,13 +46,15 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableMenu; * @author Greg Hinkle */ public class OperationHistoryView extends TableSection { + public static final String VIEW_ID = "RecentOperations"; + private static final String TITLE = MSG.view_operationHistoryList_title();
private ResourceComposite composite; private Resource resource;
public OperationHistoryView(String locatorId) { - super(locatorId, "Operation History"); + super(locatorId, TITLE); setWidth100(); setHeight100();
@@ -61,7 +63,8 @@ public class OperationHistoryView extends TableSection { }
public OperationHistoryView(String locatorId, ResourceComposite resourceComposite) { - super(locatorId, "Operation History", new Criteria("resourceId", String.valueOf(resourceComposite.getResource() + super(locatorId, TITLE, new Criteria(OperationHistoryDataSource.CriteriaField.RESOURCE_ID, + String.valueOf(resourceComposite.getResource() .getId()))); this.composite = resourceComposite; this.resource = resourceComposite.getResource(); @@ -73,10 +76,10 @@ public class OperationHistoryView extends TableSection { @Override protected void configureTable() {
- getListGrid().getField("id").setWidth(40); - getListGrid().getField("operationName").setWidth("*"); - getListGrid().getField("status").setWidth(100); - getListGrid().getField("status").setCellFormatter(new CellFormatter() { + getListGrid().getField(OperationHistoryDataSource.Field.ID).setWidth(40); + getListGrid().getField(OperationHistoryDataSource.Field.OPERATION_NAME).setWidth("*"); + getListGrid().getField(OperationHistoryDataSource.Field.STATUS).setWidth(100); + getListGrid().getField(OperationHistoryDataSource.Field.STATUS).setCellFormatter(new CellFormatter() { public String format(Object o, ListGridRecord listGridRecord, int i, int i1) { OperationRequestStatus status = OperationRequestStatus.valueOf((String) o); String icon = ""; @@ -99,18 +102,18 @@ public class OperationHistoryView extends TableSection { } });
- getListGrid().getField("startedTime").setWidth(120); + getListGrid().getField(OperationHistoryDataSource.Field.STARTED_TIME).setWidth(120);
if (this.resource == null) { - getListGrid().getField("resource").setWidth(300); - getListGrid().getField("resource").setCellFormatter(new CellFormatter() { + getListGrid().getField(OperationHistoryDataSource.Field.RESOURCE).setWidth(300); + getListGrid().getField(OperationHistoryDataSource.Field.RESOURCE).setCellFormatter(new CellFormatter() { public String format(Object o, ListGridRecord listGridRecord, int i, int i1) { Resource res = (Resource) o; return "<a href="#Resource/" + res.getId() + "">" + res.getName() + "</a>"; } }); } else { - getListGrid().hideField("resource"); + getListGrid().hideField(OperationHistoryDataSource.Field.RESOURCE); }
if (resource != null && composite.getResourcePermission().isControl()) { @@ -131,7 +134,8 @@ public class OperationHistoryView extends TableSection { } });
- IMenuButton operationsButton = new LocatableIMenuButton(this.extendLocatorId("Run"), "Run Operation", + IMenuButton operationsButton = new LocatableIMenuButton(this.extendLocatorId("Run"), + MSG.view_operationHistoryList_button_runOperation(), operationMenu); operationsButton.setShowMenuBelow(false); operationsButton.setAutoFit(true); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationWizard.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationWizard.java index 26f7108..47d7dae 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationWizard.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationWizard.java @@ -28,6 +28,7 @@ import com.smartgwt.client.widgets.layout.VLayout; /** * @author Greg Hinkle */ +// TODO (ips, 11/17/10): Can this class be deleted? public class OperationWizard extends VLayout{
private Resource resource; @@ -38,15 +39,6 @@ public class OperationWizard extends VLayout{ this.operation = operation; }
- - @Override - protected void onDraw() { - super.onDraw(); - - } - - - public static void startPopupOperationWizard(Resource resource, String operation) { final Window dialog = new Window(); dialog.setTitle("Execute Operation"); @@ -64,6 +56,6 @@ public class OperationWizard extends VLayout{ }); dialog.addItem(new OperationWizard(resource, operation)); dialog.show(); - } + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/ExecutionSchedule.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/ExecutionSchedule.java index c471dc7..1f3f517 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/ExecutionSchedule.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/ExecutionSchedule.java @@ -29,11 +29,14 @@ import com.google.gwt.i18n.client.DateTimeFormat; */ public class ExecutionSchedule implements Serializable {
- public enum Start { Immediately, Future };
+ public enum End { + Never, EndOn + }; + public enum Recurr { Once, EveryNMinutes, Hourly, Daily, Weekly, Monthly }; @@ -274,7 +277,6 @@ public class ExecutionSchedule implements Serializable {
}
- public String suffix(int num) { int last = num % 10; switch (last) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationCreateWizard.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationCreateWizard.java index e76e2ca..654ed0a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationCreateWizard.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationCreateWizard.java @@ -23,6 +23,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List;
+import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.widgets.IButton; import com.smartgwt.client.widgets.events.ClickEvent; @@ -70,7 +71,7 @@ public class OperationCreateWizard extends AbstractWizard { steps.add(schedulingStep); setSteps(steps);
- executeNowButton = new IButton("Execute Immediately"); + executeNowButton = new IButton(MSG.view_operationCreateWizard_button_executeImmediately()); executeNowButton.setAutoFit(true); executeNowButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { @@ -78,7 +79,7 @@ public class OperationCreateWizard extends AbstractWizard { } });
- executeButton = new IButton("Execute"); + executeButton = new IButton(MSG.view_operationCreateWizard_button_execute()); executeButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { execute(); @@ -90,11 +91,11 @@ public class OperationCreateWizard extends AbstractWizard { }
public String getWindowTitle() { - return "Operation Wizard"; + return MSG.view_operationCreateWizard_title(); }
public String getTitle() { - return "Execute " + operationDefinition.getDisplayName() + " on " + resource.getName(); + return MSG.view_operationCreateWizard_header(operationDefinition.getDisplayName(), resource.getName()); }
public String getSubtitle() { @@ -113,7 +114,7 @@ public class OperationCreateWizard extends AbstractWizard { }
private void execute() { - com.allen_sauer.gwt.log.client.Log.info("TODO Executed operation!!"); + Log.info("TODO Executed operation!!");
OperationGWTServiceAsync operationService = GWTServiceLookup.getOperationService();
@@ -123,13 +124,13 @@ public class OperationCreateWizard extends AbstractWizard { GWTServiceLookup.getOperationService().scheduleResourceOperation(resource.getId(), operationDefinition.getName(), parameters, schedule, " testing ", 0, new AsyncCallback<Void>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to schedule operation execution", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_operationCreateWizard_error_scheduleOperationFailure(), + caught); }
public void onSuccess(Void result) { - - String message = "Schedule operation [" + operationDefinition.getName() + "] on resource [" - + resource.getId() + "] with cron string [" + schedule.getCronString() + "]"; + String message = MSG.view_operationCreateWizard_message_scheduleOperationSuccess( + operationDefinition.getName(), String.valueOf(resource.getId()), schedule.getCronString());
CoreGUI.getMessageCenter().notify(new Message(message, Message.Severity.Info)); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationParametersStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationParametersStep.java index e32b2fd..05489c8 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationParametersStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationParametersStep.java @@ -53,7 +53,7 @@ public class OperationParametersStep extends AbstractWizardStep { } return configurationEditor; } else { - return new HTMLFlow("This operation does not take any parameters."); + return new HTMLFlow(MSG.view_operationCreateWizard_parametersStep_noParameters()); } }
@@ -62,10 +62,11 @@ public class OperationParametersStep extends AbstractWizardStep { }
public String getName() { - return "Operation Parameters"; + return MSG.view_operationCreateWizard_parametersStep_name(); }
public Configuration getParameterConfiguration() { return configurationEditor != null ? configurationEditor.getConfiguration() : null; } + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationSchedulingStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationSchedulingStep.java index 674f366..f90fd69 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationSchedulingStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationSchedulingStep.java @@ -18,10 +18,12 @@ */ package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation.create;
+import java.util.ArrayList; import java.util.Date; import java.util.EnumSet; import java.util.HashSet; import java.util.LinkedHashMap; +import java.util.List;
import com.smartgwt.client.types.FormErrorOrientation; import com.smartgwt.client.types.TimeFormatter; @@ -70,51 +72,54 @@ public class OperationSchedulingStep extends AbstractWizardStep implements ItemC // form.setColWidths("15%", "35%", "15%", "*"); form.setValidateOnChange(true);
- final RadioGroupItem start = new RadioGroupItem("start", "Start"); + final RadioGroupItem start = new RadioGroupItem("start", + MSG.view_operationCreateWizard_schedulingStep_name()); start.setColSpan(3); start.setValueMap(enumValueMap(ExecutionSchedule.Start.class)); // "Immediately", "Future" start.setRedrawOnChange(true); start.setValue("Immediately");
HeaderItem scheduleHeader = new HeaderItem("scheduleHeader"); - scheduleHeader.setValue("Schedule"); + scheduleHeader.setValue(MSG.view_operationCreateWizard_schedulingStep_label_schedule()); scheduleHeader.setShowIfCondition(new FormItemIfFunction() { public boolean execute(FormItem formItem, Object o, DynamicForm dynamicForm) { return !"Immediately".equals(form.getValueAsString("start")); } });
- RadioGroupItem recurr = new RadioGroupItem("recurr", "Recurrence"); + RadioGroupItem recurr = new RadioGroupItem("recurr", + MSG.view_operationCreateWizard_schedulingStep_label_recurrence()); recurr.setValueMap(enumValueMap(ExecutionSchedule.Recurr.class)); // "Once", "EveryNMinutes", "Hourly", "Daily", "Weekly", "Monthly"); recurr.setRedrawOnChange(true); - recurr.setValue("Once"); + recurr.setValue(ExecutionSchedule.Recurr.Once.name()); recurr.setShowIfCondition(new FormItemIfFunction() { public boolean execute(FormItem formItem, Object o, DynamicForm dynamicForm) { - return !"Immediately".equals(form.getValueAsString("start")); + return !ExecutionSchedule.Start.Immediately.name().equals(form.getValueAsString("start")); } });
- CanvasItem onceForm = new CanvasItem("once", "Run At"); + CanvasItem onceForm = new CanvasItem("once", MSG.view_operationCreateWizard_schedulingStep_label_onceAt()); onceForm.setShowTitle(false); onceForm.setCanvas(getOnceForm()); onceForm.setShowIfCondition(new FormItemIfFunction() { public boolean execute(FormItem formItem, Object o, DynamicForm dynamicForm) { - return !"Immediately".equals(form.getValueAsString("start")) + return !ExecutionSchedule.Start.Immediately.name().equals(form.getValueAsString("start")) && ExecutionSchedule.Recurr.Once.name().equals(form.getValueAsString("recurr")); } });
- CanvasItem everyNMinuteForm = new CanvasItem("everyNMinutesForm", "NMinutes"); + CanvasItem everyNMinuteForm = new CanvasItem("everyNMinutesForm", + MSG.view_operationCreateWizard_schedulingStep_label_everyNMinutes()); everyNMinuteForm.setShowTitle(false); everyNMinuteForm.setCanvas(getEveryNMinutesForm()); everyNMinuteForm.setShowIfCondition(new FormItemIfFunction() { public boolean execute(FormItem formItem, Object o, DynamicForm dynamicForm) { - return !"Immediately".equals(form.getValueAsString("start")) + return !ExecutionSchedule.Start.Immediately.name().equals(form.getValueAsString("start")) && ExecutionSchedule.Recurr.EveryNMinutes.name().equals(form.getValueAsString("recurr")); } });
- CanvasItem hourlyForm = new CanvasItem("hourlyForm", "Hourly"); + CanvasItem hourlyForm = new CanvasItem("hourlyForm", MSG.view_operationCreateWizard_schedulingStep_label_hourly()); hourlyForm.setShowTitle(false); hourlyForm.setCanvas(getHourlyForm()); hourlyForm.setShowIfCondition(new FormItemIfFunction() { @@ -124,73 +129,74 @@ public class OperationSchedulingStep extends AbstractWizardStep implements ItemC } });
- CanvasItem dailyForm = new CanvasItem("daily", "Days"); + CanvasItem dailyForm = new CanvasItem("daily", MSG.view_operationCreateWizard_schedulingStep_label_daily()); dailyForm.setShowTitle(false); dailyForm.setCanvas(getDailyForm()); dailyForm.setShowIfCondition(new FormItemIfFunction() { public boolean execute(FormItem formItem, Object o, DynamicForm dynamicForm) { - return !"Immediately".equals(form.getValueAsString("start")) - && "Daily".equals(form.getValueAsString("recurr")); + return !ExecutionSchedule.Start.Immediately.name().equals(form.getValueAsString("start")) + && ExecutionSchedule.Recurr.Daily.name().equals(form.getValueAsString("recurr")); } });
- CanvasItem weeklyForm = new CanvasItem("weekly", "Weekly"); + CanvasItem weeklyForm = new CanvasItem("weekly", MSG.view_operationCreateWizard_schedulingStep_label_weekly()); weeklyForm.setShowTitle(false); weeklyForm.setCanvas(getWeeklyForm()); weeklyForm.setShowIfCondition(new FormItemIfFunction() { public boolean execute(FormItem formItem, Object o, DynamicForm dynamicForm) { - return !"Immediately".equals(form.getValueAsString("start")) - && "Weekly".equals(form.getValueAsString("recurr")); + return !ExecutionSchedule.Start.Immediately.name().equals(form.getValueAsString("start")) + && ExecutionSchedule.Recurr.Weekly.name().equals(form.getValueAsString("recurr")); } });
- CanvasItem monthlyForm = new CanvasItem("monthly", "Monthly"); + CanvasItem monthlyForm = new CanvasItem("monthly", MSG.view_operationCreateWizard_schedulingStep_label_monthly()); monthlyForm.setShowTitle(false); monthlyForm.setCanvas(getMonthlyForm()); monthlyForm.setShowIfCondition(new FormItemIfFunction() { public boolean execute(FormItem formItem, Object o, DynamicForm dynamicForm) { - return !"Immediately".equals(form.getValueAsString("start")) - && "Monthly".equals(form.getValueAsString("recurr")); + return !ExecutionSchedule.Start.Immediately.name().equals(form.getValueAsString("start")) + && ExecutionSchedule.Recurr.Monthly.name().equals(form.getValueAsString("recurr")); } });
HeaderItem rangeHeader = new HeaderItem("timePeriod"); - rangeHeader.setValue("Time Period"); + rangeHeader.setValue(MSG.view_operationCreateWizard_schedulingStep_label_timePeriod()); rangeHeader.setShowIfCondition(new FormItemIfFunction() { public boolean execute(FormItem formItem, Object o, DynamicForm dynamicForm) { - return !"Immediately".equals(form.getValueAsString("start")) - && !"Once".equals(form.getValueAsString("recurr")); + return !ExecutionSchedule.Start.Immediately.name().equals(form.getValueAsString("start")) + && !ExecutionSchedule.Recurr.Once.name().equals(form.getValueAsString("recurr")); } });
- DateItem startDate = new DateItem("startDate", "Start Date"); + DateItem startDate = new DateItem("startDate", MSG.view_operationCreateWizard_schedulingStep_label_startDate()); startDate.setStartRow(true); startDate.setStartDate(new Date()); startDate.setShowIfCondition(new FormItemIfFunction() { public boolean execute(FormItem formItem, Object o, DynamicForm dynamicForm) { - return !"Immediately".equals(form.getValueAsString("start")) + return !ExecutionSchedule.Start.Immediately.name().equals(form.getValueAsString("start")) && !"Once".equals(form.getValueAsString("recurr")); } });
- final RadioGroupItem end = new RadioGroupItem("endType", "Recurrence End"); + final RadioGroupItem end = new RadioGroupItem("endType", MSG.view_operationCreateWizard_schedulingStep_label_endDate()); end.setShowIfCondition(new FormItemIfFunction() { public boolean execute(FormItem formItem, Object o, DynamicForm dynamicForm) { - return !"Immediately".equals(form.getValueAsString("start")) + return !ExecutionSchedule.Start.Immediately.name().equals(form.getValueAsString("start")) && !"Once".equals(form.getValueAsString("recurr")); } }); end.setStartRow(true); + // TODO: i18n end.setValueMap("Never", "End On"); end.setRedrawOnChange(true); end.setValue("Never");
- DateItem endDate = new DateItem("endDate", "End Date"); + DateItem endDate = new DateItem("endDate", MSG.view_operationCreateWizard_schedulingStep_label_endDate()); endDate.setStartRow(true); endDate.setStartDate(new Date()); endDate.setShowIfCondition(new FormItemIfFunction() { public boolean execute(FormItem formItem, Object o, DynamicForm dynamicForm) { - return !"Immediately".equals(form.getValueAsString("start")) + return !ExecutionSchedule.Start.Immediately.name().equals(form.getValueAsString("start")) && !"Once".equals(form.getValueAsString("recurr")) && !"Never".equals(form.getValueAsString("endType")); } @@ -203,7 +209,7 @@ public class OperationSchedulingStep extends AbstractWizardStep implements ItemC });
StaticTextItem messageItem = new StaticTextItem("message"); - messageItem.setValue("Will execute immediately"); + messageItem.setValue(MSG.view_operationCreateWizard_schedulingStep_label_willExecuteImmediately()); messageItem.setStartRow(true); messageItem.setColSpan(3); messageItem.setShowTitle(false); @@ -223,16 +229,16 @@ public class OperationSchedulingStep extends AbstractWizardStep implements ItemC form.setValuesManager(valuesManager); form.setPadding(10); form.setIsGroup(true); - form.setGroupTitle("Once At"); + form.setGroupTitle(MSG.view_operationCreateWizard_schedulingStep_label_onceAt()); form.addItemChangedHandler(this);
form.setWrapItemTitles(false); form.setNumCols(2);
- DateItem startDate = new DateItem("onceStartDate", "Date"); + DateItem startDate = new DateItem("onceStartDate", MSG.view_operationCreateWizard_schedulingStep_label_startDate()); startDate.setValue(new Date());
- TimeItem startTime = new TimeItem("onceStartDate", "Time"); + TimeItem startTime = new TimeItem("onceStartDate", MSG.view_operationCreateWizard_schedulingStep_label_startDate()); startTime.setValue(new Date()); startTime.setDisplayFormat(TimeFormatter.TOSHORTPADDEDTIME); startTime.setUseMask(true); @@ -245,7 +251,7 @@ public class OperationSchedulingStep extends AbstractWizardStep implements ItemC form.setValuesManager(valuesManager); form.setPadding(10); form.setIsGroup(true); - form.setGroupTitle("Every N Minutes"); + form.setGroupTitle(MSG.view_operationCreateWizard_schedulingStep_label_everyNMinutes()); form.addItemChangedHandler(this);
form.setWrapItemTitles(false); @@ -253,7 +259,7 @@ public class OperationSchedulingStep extends AbstractWizardStep implements ItemC
IntegerItem everyNMinutes = new IntegerItem(); everyNMinutes.setName("minuteInterval"); - everyNMinutes.setTitle("Minute Interval"); + everyNMinutes.setTitle(MSG.view_operationCreateWizard_schedulingStep_label_minuteInterval()); everyNMinutes.setValue(60);
form.setItems(everyNMinutes); @@ -265,7 +271,7 @@ public class OperationSchedulingStep extends AbstractWizardStep implements ItemC form.setValuesManager(valuesManager); form.setPadding(10); form.setIsGroup(true); - form.setGroupTitle("Hourly At"); + form.setGroupTitle(MSG.view_operationCreateWizard_schedulingStep_label_hourly()); form.addItemChangedHandler(this);
form.setWrapItemTitles(false); @@ -273,7 +279,7 @@ public class OperationSchedulingStep extends AbstractWizardStep implements ItemC
IntegerItem minuteOfHour = new IntegerItem(); minuteOfHour.setName("minuteOfHour"); - minuteOfHour.setTitle("Minute of Hour"); + minuteOfHour.setTitle(MSG.view_operationCreateWizard_schedulingStep_label_minuteOfHour()); minuteOfHour.setValue(5);
form.setItems(minuteOfHour); @@ -286,10 +292,10 @@ public class OperationSchedulingStep extends AbstractWizardStep implements ItemC form.setPadding(10); form.setWrapItemTitles(false); form.setIsGroup(true); - form.setGroupTitle("Daily At"); + form.setGroupTitle(MSG.view_operationCreateWizard_schedulingStep_label_daily()); form.addItemChangedHandler(this);
- TimeItem timeOfDay = new TimeItem("timeOfDay", "Time Of Day"); + TimeItem timeOfDay = new TimeItem("timeOfDay", MSG.view_operationCreateWizard_schedulingStep_label_timeOfDay()); timeOfDay.setValue(new Date()); timeOfDay.setDisplayFormat(TimeFormatter.TOSHORTPADDEDTIME); timeOfDay.setUseMask(true); @@ -303,21 +309,25 @@ public class OperationSchedulingStep extends AbstractWizardStep implements ItemC form.setValuesManager(valuesManager); form.setPadding(10); form.setIsGroup(true); - form.setGroupTitle("Weekly On"); + form.setGroupTitle(MSG.view_operationCreateWizard_schedulingStep_label_weekly()); form.addItemChangedHandler(this);
form.setWrapItemTitles(false);
- TimeItem timeOfDay = new TimeItem("timeOfDay", "Time Of Day"); + TimeItem timeOfDay = new TimeItem("dayOfWeek", MSG.view_operationCreateWizard_schedulingStep_label_dayOfWeek()); timeOfDay.setValue(new Date()); timeOfDay.setDisplayFormat(TimeFormatter.TOSHORTPADDEDTIME); timeOfDay.setUseMask(true);
- String[] days = { "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" }; + ExecutionSchedule.DayOfWeek[] daysOfWeek = ExecutionSchedule.DayOfWeek.values(); + List<String> dayList = new ArrayList<String>(); + for (ExecutionSchedule.DayOfWeek dayOfWeek : daysOfWeek) { + dayList.add(dayOfWeek.name()); + } FormItem[] items = new FormItem[8]; items[0] = timeOfDay; int i = 1; - for (String day : days) { + for (String day : dayList) { CheckboxItem dayItem = new CheckboxItem(day); dayItem.setShowTitle(false); items[i++] = dayItem; @@ -332,15 +342,15 @@ public class OperationSchedulingStep extends AbstractWizardStep implements ItemC form.setPadding(10); form.setWrapItemTitles(false); form.setIsGroup(true); - form.setGroupTitle("Monthly On"); + form.setGroupTitle(MSG.view_operationCreateWizard_schedulingStep_label_monthly()); form.addItemChangedHandler(this);
IntegerItem dayItem = new IntegerItem(); dayItem.setName("dayOfMonth"); - dayItem.setTitle("Day of Month"); + dayItem.setTitle(MSG.view_operationCreateWizard_schedulingStep_label_dayOfMonth()); dayItem.setValue(1);
- TimeItem timeOfDay = new TimeItem("timeOfDay", "Time Of Day"); + TimeItem timeOfDay = new TimeItem("timeOfDay", MSG.view_operationCreateWizard_schedulingStep_label_timeOfDay()); timeOfDay.setValue(new Date()); timeOfDay.setDisplayFormat(TimeFormatter.TOSHORTPADDEDTIME); timeOfDay.setUseMask(true); @@ -354,7 +364,7 @@ public class OperationSchedulingStep extends AbstractWizardStep implements ItemC }
public String getName() { - return "Schedule"; + return MSG.view_operationCreateWizard_schedulingStep_name(); }
public void onItemChanged(ItemChangedEvent itemChangeEvent) { @@ -404,4 +414,5 @@ public class OperationSchedulingStep extends AbstractWizardStep implements ItemC public ExecutionSchedule getExecutionSchedule() { return executionSchedule; } + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/detail/OperationDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/detail/OperationDetailsView.java index cc3aa63..de6abed 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/detail/OperationDetailsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/detail/OperationDetailsView.java @@ -38,6 +38,7 @@ import org.rhq.enterprise.gui.coregui.client.ViewId; import org.rhq.enterprise.gui.coregui.client.ViewPath; import org.rhq.enterprise.gui.coregui.client.components.configuration.ConfigurationEditor; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation.OperationHistoryDataSource; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/** @@ -45,7 +46,6 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; */ public class OperationDetailsView extends LocatableVLayout implements BookmarkableView {
- private int historyId; private OperationDefinition definition; private ResourceOperationHistory operationHistory;
@@ -98,19 +98,19 @@ public class OperationDetailsView extends LocatableVLayout implements Bookmarkab form.setWidth100(); form.setWrapItemTitles(false);
- StaticTextItem operationItem = new StaticTextItem("operation", "Operation"); + StaticTextItem operationItem = new StaticTextItem(OperationHistoryDataSource.Field.OPERATION_NAME, "Operation"); operationItem.setValue(definition.getName());
- StaticTextItem submittedItem = new StaticTextItem("submitted", "Date Submitted"); + StaticTextItem submittedItem = new StaticTextItem(OperationHistoryDataSource.Field.STARTED_TIME, "Date Submitted"); submittedItem.setValue(new Date(operationHistory.getStartedTime()));
StaticTextItem completedItem = new StaticTextItem("completed", "Date Completed"); completedItem.setValue(new Date(operationHistory.getStartedTime() + operationHistory.getDuration()));
- StaticTextItem requesterItem = new StaticTextItem("requester", "Requester"); + StaticTextItem requesterItem = new StaticTextItem(OperationHistoryDataSource.Field.SUBJECT, "Requester"); requesterItem.setValue(operationHistory.getSubjectName());
- StaticTextItem statusItem = new StaticTextItem("status", "Status"); + StaticTextItem statusItem = new StaticTextItem(OperationHistoryDataSource.Field.STATUS, "Status"); statusItem.setValue(operationHistory.getStatus().name());
/* @@ -159,7 +159,8 @@ public class OperationDetailsView extends LocatableVLayout implements Bookmarkab GWTServiceLookup.getOperationService().findResourceOperationHistoriesByCriteria(criteria, new AsyncCallback<PageList<ResourceOperationHistory>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failure loading operation history", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_operationHistoryDetails_error_fetchFailure(), + caught); }
public void onSuccess(PageList<ResourceOperationHistory> result) { @@ -184,16 +185,13 @@ public class OperationDetailsView extends LocatableVLayout implements Bookmarkab window.centerInPage(); window.addItem(detailsView); window.show(); - }
@Override public void renderView(ViewPath viewPath) { - - historyId = viewPath.getCurrentAsInt(); - - viewId = viewPath.getCurrent(); - + this.viewId = viewPath.getCurrent(); + int historyId = viewPath.getCurrentAsInt(); lookupDetails(historyId); } + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java index 196d0b5..9f8b723 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java @@ -419,8 +419,8 @@ public abstract class RPCDataSource<T> extends DataSource { int[] intermediates = criteria.getAttributeAsIntArray(paramName); resultArray = (S[]) new Integer[intermediates.length]; int index = 0; - for (Integer next : intermediates) { - resultArray[index++] = (S) next; + for (int next : intermediates) { + resultArray[index++] = (S) Integer.valueOf(next); } } else if (type == String.class) { String[] intermediates = criteria.getAttributeAsStringArray(paramName); @@ -440,7 +440,7 @@ public abstract class RPCDataSource<T> extends DataSource { throw new IllegalArgumentException(MSG.dataSource_rpc_error_unsupportedArrayFilterType(type.getName())); }
- Log.debug("Result array = " + resultArray); + Log.debug("Result array = " + Arrays.toString(resultArray));
return resultArray; } diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index 367577e..d8c930b 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -108,7 +108,7 @@ common_title_recent_operations=Recent Operations~ common_title_remove_column=Remove Column~ common_title_resource = Resource~ common_title_resource_inventory=Resource Inventory~ -common_title_resource_id=Resource ID~ +ommon_title_resource_id=Resource ID~ common_title_resource_name=Resource Name~ common_title_scheduled_operations=Scheduled Operations~ common_title_selected_resources=Selected Resources~ @@ -162,7 +162,6 @@ common_calendar_october_short=oct common_calendar_november_short=nov common_calendar_december_short=dec
- #=================== Widgets =====================
# Record Editor @@ -311,6 +310,9 @@ dataSource_measurementOob_error_fetchFailure = Failed to load measurement OOB in dataSource_definitions_loadFailed=Failed to load metric definitions~ dataSource_schedules_loadFailed=Failed to load metric schedules~ dataSource_schedules_field_resourceGroupId=Group ID~ +dataSource_definitions_loadFailed=Failed to load metric definitions~ +dataSource_schedules_loadFailed=Failed to load metric schedules~ +dataSource_schedules_field_resourceGroupId=Group ID~
dataSource_schedules_enableFailure_resource=Failed to enable the collection of [{0}] metrics for resource with ID [{1}]. The metrics were: [{2}]~ dataSource_schedules_enableFailure_group=Failed to enable the collection of [{0}] metrics for group with ID [{1}]. The metrics were: [{2}]~ @@ -569,7 +571,7 @@ view_portlet_operations_config_scheduled_enable=Whether to enable scheduled oper view_portlet_operations_config_scheduled_maximum=Maximum number of Scheduled operations to display.~ view_portlet_operations_config_completed=completed operations~ view_portlet_operations_config_show_last=show Last~ -view_portlet_operations_config_show_next=show Next~ +view_portlet_operations_config_show_next=show Next~ view_portlet_operations_config_title=OperationsPortlet Configuration~ view_portlet_operations_config_title_desc=The configuration settings for the Operations portlet.~ view_portlet_operations_disabled=(Results currently disabled. Change settings to enable results.~ @@ -590,7 +592,7 @@ view_portlet_recentAlerts_config_members=Select Members~ view_portlet_recentAlerts_config_priority_label = priority Alerts,~ view_portlet_recentAlerts_config_when=within the past~ view_portlet_recentAlerts_help_msg = Displays recent alerts fired on resources visible to the current user login.~ -// dup in common +# dup in common view_portlet_recentAlerts_title = Recent Alerts~ view_portlet_recentlyAdded_approved_platforms=recently approved platforms on dashboard.~ view_portlet_recentlyAdded_error1=Failed to load recently added resources~ @@ -839,7 +841,50 @@ view_configurationHistoryDetails_error_loadFailure = Unable to load configuratio # Operation History List #--------------------------------- view_operationHistoryList_title = Operation History~ -view_operationHistoryList_button_runOperation = Run Operation +view_operationHistoryList_button_runOperation = Run Operation~ + +# Operation History Details +#-------------------------------------- +view_operationHistoryDetails_error_fetchFailure = Failure loading operation history.~ + +# Operation Create Wizard +#------------------------------------- +view_operationCreateWizard_title = Operation Wizard~ +view_operationCreateWizard_header = Execute {0} on {1}~ +view_operationCreateWizard_button_execute = Execute~ +view_operationCreateWizard_button_executeImmediately = Execute Immediately~ +view_operationCreateWizard_error_scheduleOperationFailure = Failed to schedule operation execution.~ +view_operationCreateWizard_message_scheduleOperationSuccess = Schedule operation [{0}] on Resource [{1}] with cron string [{2}].~ +view_operationCreateWizard_parametersStep_name = Operation Parameters~ +view_operationCreateWizard_parametersStep_noParameters = This operation does not take any parameters.~ +view_operationCreateWizard_schedulingStep_name = Schedule +view_operationCreateWizard_schedulingStep_label_start = Start +view_operationCreateWizard_schedulingStep_label_schedule = Schedule +view_operationCreateWizard_schedulingStep_label_recurrence = Recurrence +view_operationCreateWizard_schedulingStep_label_runAt = Run At +view_operationCreateWizard_schedulingStep_label_nMinutes = n Minutes +view_operationCreateWizard_schedulingStep_label_hourly = Hourly +view_operationCreateWizard_schedulingStep_label_daily = Daily +view_operationCreateWizard_schedulingStep_label_weekly = Weekly +view_operationCreateWizard_schedulingStep_label_monthly = Monthly +view_operationCreateWizard_schedulingStep_label_timePeriod = Time Period +view_operationCreateWizard_schedulingStep_label_startDate = Start Date +view_operationCreateWizard_schedulingStep_label_recurrenceEnd = Recurrence End +view_operationCreateWizard_schedulingStep_label_endDate = End Date +view_operationCreateWizard_schedulingStep_label_willExecuteImmediately = Will execute immediately +view_operationCreateWizard_schedulingStep_label_onceAt = Once At +view_operationCreateWizard_schedulingStep_label_date = Date +view_operationCreateWizard_schedulingStep_label_time = Time +view_operationCreateWizard_schedulingStep_label_everyNMinutes = Every n Minutes +view_operationCreateWizard_schedulingStep_label_minuteInterval = Minute Interval +view_operationCreateWizard_schedulingStep_label_hourlyAt = Hourly At +view_operationCreateWizard_schedulingStep_label_minuteOfHour = Minute of Hour +view_operationCreateWizard_schedulingStep_label_dailyAt = Daily At +view_operationCreateWizard_schedulingStep_label_timeOfDay = Time of Day +view_operationCreateWizard_schedulingStep_label_weeklyOn = Weekly On +view_operationCreateWizard_schedulingStep_label_dayOfWeek = Day of Week +view_operationCreateWizard_schedulingStep_label_monthlyOn = Monthly On +view_operationCreateWizard_schedulingStep_label_dayOfMonth = Day of Month
#==================== Reports ======================
rhq-commits@lists.fedorahosted.org