modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/DurationItem.java | 12 ++- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/TimeUnit.java | 35 ++++++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java | 3 3 files changed, 43 insertions(+), 7 deletions(-)
New commits: commit fd0426f868b297f325d48af5898edaf9c88509e3 Author: Ian Springer ian.springer@redhat.com Date: Thu Feb 3 12:02:36 2011 -0500
add TimeUnit class I forgot to check in last night; add isReadOnly param to DurationItem's constructor
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/DurationItem.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/DurationItem.java index d83841f..5a06a57 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/DurationItem.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/DurationItem.java @@ -50,14 +50,16 @@ public class DurationItem extends CanvasItem { private final DynamicForm form; private TimeUnit defaultUnit; private String contextualHelp; - private boolean iterationsSupported; + private boolean supportsIterations; private TimeUnit valueUnit; + private boolean isReadOnly;
- public DurationItem(String name, String title, Set<TimeUnit> supportedUnits, boolean iterationsSupported, - Locatable parentWidget) { + public DurationItem(String name, String title, Set<TimeUnit> supportedUnits, boolean supportsIterations, + boolean isReadOnly, Locatable parentWidget) { super(name, title);
- this.iterationsSupported = iterationsSupported; + this.supportsIterations = supportsIterations; + this.isReadOnly = isReadOnly;
this.form = new EnhancedDynamicForm(parentWidget.extendLocatorId(name), false, false); this.form.setNumCols(4); @@ -83,7 +85,7 @@ public class DurationItem extends CanvasItem {
// TODO: i18n valueMap values LinkedHashMap<String, String> valueMap = new LinkedHashMap<String, String>(); - if (iterationsSupported) { + if (supportsIterations) { valueMap.put("times", "times"); } if (supportedUnits != null && !supportedUnits.isEmpty()) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/TimeUnit.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/TimeUnit.java new file mode 100644 index 0000000..0733712 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/TimeUnit.java @@ -0,0 +1,35 @@ +/* + * RHQ Management Platform + * Copyright (C) 2011 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * 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.components.form; + +/** + * A unit of time. + * + * @author Ian Springer + */ +public enum TimeUnit { + MILLISECONDS, + SECONDS, + MINUTES, + HOURS, + DAYS, + WEEKS, + MONTHS, + YEARS +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java index 7d01228..6f0162e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java @@ -75,7 +75,6 @@ public abstract class AbstractOperationScheduleDetailsView extends AbstractRecor private JobTriggerEditor triggerEditor; private Configuration parameters; private EnhancedDynamicForm notesForm; - private EnhancedDynamicForm timeoutForm;
public AbstractOperationScheduleDetailsView(String locatorId, AbstractOperationScheduleDataSource dataSource, ResourceType resourceType, int scheduleId) { @@ -189,7 +188,7 @@ public abstract class AbstractOperationScheduleDetailsView extends AbstractRecor supportedUnits.add(TimeUnit.MINUTES); supportedUnits.add(TimeUnit.HOURS); DurationItem timeoutItem = new DurationItem(AbstractOperationScheduleDataSource.Field.TIMEOUT, "Timeout", - supportedUnits, false, this.notesForm); + supportedUnits, false, isReadOnly(), this.notesForm); notesFields.add(timeoutItem);
if (!isNewRecord()) {
rhq-commits@lists.fedorahosted.org