[Hyperic-hq-discuss] hq r8265 - in branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys: helpers metaclass

[<jt...@hy...>]

Author: jtravis
Date: 2008-03-14 16:26:12 -0700 (Fri, 14 Mar 2008)
New Revision: 8265
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=8265

Modified:
   branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/AlertHelper.groovy
   branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/MetricHelper.groovy
   branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/metaclass/MetricCategory.groovy
Log:
Add helpers for Metrics to get defs with fewer arguments, and to easily get units for templates

Modified: branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/AlertHelper.groovy
===================================================================
--- branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/AlertHelper.groovy	2008-03-14 22:52:31 UTC (rev 8264)
+++ branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/AlertHelper.groovy	2008-03-14 23:26:12 UTC (rev 8265)
@@ -1,6 +1,7 @@
 package org.hyperic.hq.hqu.rendit.helpers
 
 import org.hyperic.hibernate.PageInfo
+import org.hyperic.hq.events.server.session.AlertDefSortField
 import org.hyperic.hq.authz.server.session.AuthzSubject
 import org.hyperic.hq.events.server.session.AlertDefinitionManagerEJBImpl
 import org.hyperic.hq.events.server.session.AlertManagerEJBImpl
@@ -90,6 +91,13 @@
         defMan.findAlertDefinitions(userValue, severity, enabled, 
                                     excludeTypeBased, pInfo)
     }
+     
+    def findDefinitions(AlertSeverity severity, Boolean enabled,
+                        boolean excludeTypeBased) 
+    {
+        findDefinitions(severity, enabled, excludeTypeBased, 
+                        PageInfo.getAll(AlertDefSortField.NAME, true))
+    }
 
     /**
      * Find type-based alert definitions.  These are the templates for
@@ -103,6 +111,12 @@
     def findTypeBasedDefinitions(Boolean enabled, PageInfo pInfo) { 
         defMan.findTypeBasedDefinitions(userValue, enabled, pInfo) 
     }
+     
+    def findTypeBasedDefinitions() {
+        defMan.findTypeBasedDefinitions(userValue, null, 
+                                        PageInfo.getAll(AlertDefSortField.NAME,
+                                                        true))
+    }
     
     /**
      * Find group alert definitions.

Modified: branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/MetricHelper.groovy
===================================================================
--- branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/MetricHelper.groovy	2008-03-14 22:52:31 UTC (rev 8264)
+++ branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/MetricHelper.groovy	2008-03-14 23:26:12 UTC (rev 8265)
@@ -72,4 +72,8 @@
          
          throw new IllegalArgumentException("Unsupported find args")
      }
+     
+     MeasurementTemplate findTemplateById(int id) {
+         tmplMan.getTemplate(id)
+     }
 }

Modified: branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/metaclass/MetricCategory.groovy
===================================================================
--- branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/metaclass/MetricCategory.groovy	2008-03-14 22:52:31 UTC (rev 8264)
+++ branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/metaclass/MetricCategory.groovy	2008-03-14 23:26:12 UTC (rev 8265)
@@ -7,7 +7,10 @@
 import org.hyperic.hq.measurement.UnitsConvert
 import org.hyperic.hq.measurement.server.session.DataManagerEJBImpl
 import org.hyperic.hq.measurement.server.session.DerivedMeasurement
+import org.hyperic.hq.measurement.server.session.MeasurementTemplate
 import org.hyperic.util.pager.PageControl
+import org.hyperic.util.units.UnitNumber
+import org.hyperic.util.units.UnitsFormat
 
 
 class MetricCategory {
@@ -49,7 +52,20 @@
         
         "/resource/common/monitor/Visibility.do?m=${template.id}&eid=${d.entityId}&mode=chartSingleMetricSingleResource"
     }
+
+    /**
+     * Use the 'units' specified by the measurement template to get a 
+     * UnitNumber with the passed value.
+     */
+    static UnitNumber getUnitOf(MeasurementTemplate t, double value) {
+        def units = UnitsConvert.getUnitForUnit(t.units)
+        def scale = UnitsConvert.getScaleForUnit(t.units)
+        new UnitNumber(value, units, scale)
+    }
     
+    static String renderWithUnits(MeasurementTemplate t, double value) {
+        UnitsFormat.format(getUnitOf(t, value)).toString()
+    }
     
     /**
      * Get the last data point for a collection of DerivedMeasurements