modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionDataSource.java | 11 +++++++--- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java | 7 ++---- modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 2 - 3 files changed, 12 insertions(+), 8 deletions(-)
New commits: commit 5754205a951d422363999a5853bf41a507e9fb0e Author: Mike Thompson mithomps@redhat.com Date: Sun Jan 29 20:56:03 2012 -0800
BZ691505 Changing units of measure using minutes instead of millis for recalculation interval of DynaGroup.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionDataSource.java index 04883bf..57c9947 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionDataSource.java @@ -176,8 +176,10 @@ public class GroupDefinitionDataSource extends RPCDataSource<GroupDefinition, Re groupDefinition.setExpression(from.getAttributeAsString("expression")); groupDefinition.setRecursive(from.getAttributeAsBoolean("recursive")); String recalcInt = from.getAttributeAsString("recalculationInterval"); - groupDefinition.setRecalculationInterval((recalcInt != null) ? Long.parseLong(recalcInt) : 0L); - // modifiedTime, createdTime, and lastCalculationTime are updated by GroupDefinitionManagerBean only + //groupDefinition.setRecalculationInterval((recalcInt != null) ? Long.parseLong(recalcInt) : 0L); + // convert the recalculation interval from minutes to millis for db storage + groupDefinition.setRecalculationInterval((recalcInt != null) ? Long.parseLong(recalcInt) * 60 * 1000 : 0L); + // modifiedTime, createdTime, and lastCalculationTime are updated by GroupDefinitionManagerBean only // nextCalculationTime is a non-persistent, derived field
return groupDefinition; @@ -191,7 +193,10 @@ public class GroupDefinitionDataSource extends RPCDataSource<GroupDefinition, Re record.setAttribute("description", from.getDescription()); record.setAttribute("expression", from.getExpression()); record.setAttribute("recursive", from.isRecursive()); - record.setAttribute("recalculationInterval", convertLongToString(from.getRecalculationInterval())); + + // convert millis to minutes for display + long recalcIntervalLong = from.getRecalculationInterval()/(60 * 1000); + record.setAttribute("recalculationInterval", convertLongToString(recalcIntervalLong)); record.setAttribute("modifiedTime", from.getModifiedTime()); record.setAttribute("createdTime", from.getCreatedTime()); record.setAttribute("lastCalculationTime", convertLongToString(from.getLastCalculationTime())); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java index e01d25a..96d3702 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java @@ -132,7 +132,7 @@ public class SingleGroupDefinitionView extends LocatableVLayout implements Bookm name.setValue(groupDefinition.getName()); recursive.setValue(groupDefinition.isRecursive()); description.setValue(groupDefinition.getDescription()); - recalculationInterval.setValue(groupDefinition.getRecalculationInterval()); + recalculationInterval.setValue(groupDefinition.getRecalculationInterval() /(60 * 1000)); expression.setValue(groupDefinition.getExpression());
final LocatableDynamicForm form = new LocatableDynamicForm(extendLocatorId("GroupDefinitionForm")); @@ -150,7 +150,6 @@ public class SingleGroupDefinitionView extends LocatableVLayout implements Bookm
// button setup IButton saveButton = new LocatableIButton(this.extendLocatorId("save"), MSG.common_button_save()); - //saveButton.addClickHandler(new SaveOrUpdateClickHandler(form, operationType, dynaGroupChildrenView)); saveButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { saveForm(form, dynaGroupChildrenView, false); @@ -394,10 +393,10 @@ public class SingleGroupDefinitionView extends LocatableVLayout implements Bookm });
recalculationInterval = new SpinnerItem("recalculationInterval", MSG.view_dynagroup_recalculationInterval()); - //recalculationInterval.setWrapTitle(false); // do not set this - it causes the form to grow abnormally width-wise for some reason recalculationInterval.setMin(0); + recalculationInterval.setMax(60 * 24 * 7 ); // max set to 1 week recalculationInterval.setDefaultValue(0); - recalculationInterval.setStep(60000); // the recalc interval is in milliseconds, step up one minute at a time + recalculationInterval.setStep(1); // the recalc interval is in milliseconds, step up one minute at a time }
public static LinkedHashMap<String, String> getTemplates() { 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 e96c012..b019731 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 @@ -1329,7 +1329,7 @@ view_dynagroup_recalcFailureSelection = Failed to recalculate the selected group view_dynagroup_recalcSuccessful = You have successfully recalculated this group definition view_dynagroup_recalcSuccessfulSelection = You have successfully recalculated [{0}] group definitions view_dynagroup_recalculate = Recalculate -view_dynagroup_recalculationInterval = Recalculation Interval (ms) +view_dynagroup_recalculationInterval = Recalculation Interval (min) view_dynagroup_recursive = Recursive view_dynagroup_saveAndRecalculate = Save & Recalculate view_dynagroup_saveFailure = Failed to save the group definition named [{0}]
rhq-commits@lists.fedorahosted.org