[Hyperic-hq-discuss] hq r14469 - in trunk/src/org/hyperic/hq/measurement: galerts server/session

[<rm...@hy...>]

Author: rmorgan
Date: 2010-04-02 15:24:26 -0700 (Fri, 02 Apr 2010)
New Revision: 14469
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14469

Modified:
   trunk/src/org/hyperic/hq/measurement/galerts/MeasurementGtrigger.java
   trunk/src/org/hyperic/hq/measurement/server/session/MeasurementTemplate.java
Log:
[HQ-2098] Use MeasurementTemplate to format values rather than print the raw value.



Modified: trunk/src/org/hyperic/hq/measurement/galerts/MeasurementGtrigger.java
===================================================================
--- trunk/src/org/hyperic/hq/measurement/galerts/MeasurementGtrigger.java	2010-04-02 14:39:19 UTC (rev 14468)
+++ trunk/src/org/hyperic/hq/measurement/galerts/MeasurementGtrigger.java	2010-04-02 22:24:26 UTC (rev 14469)
@@ -55,6 +55,7 @@
 import org.hyperic.hq.measurement.server.session.Measurement;
 import org.hyperic.hq.measurement.server.session.MeasurementManagerEJBImpl;
 import org.hyperic.hq.measurement.server.session.MeasurementScheduleZevent;
+import org.hyperic.hq.measurement.server.session.MeasurementTemplate;
 import org.hyperic.hq.measurement.server.session.MeasurementZevent;
 import org.hyperic.hq.measurement.server.session.TemplateManagerEJBImpl;
 import org.hyperic.hq.measurement.server.session.MeasurementScheduleZevent.MeasurementScheduleZeventSource;
@@ -636,7 +637,10 @@
             setNotFired();
             return;
         }
-        
+
+        TemplateManagerLocal tMan = TemplateManagerEJBImpl.getOne();
+        MeasurementTemplate template = tMan.getTemplate(_templateId);
+
         StringBuffer sr = new StringBuffer();
         StringBuffer lr = new StringBuffer();
             
@@ -648,7 +652,7 @@
             .append(" ")
             .append(_comparator)
             .append(" ")
-            .append(_metricVal);
+            .append(template.formatValue(_metricVal.doubleValue()));
             
         lr.append(_sizeCompare)
             .append(" ")
@@ -660,7 +664,7 @@
             .append(" ")
             .append(_comparator)
             .append(" ")
-            .append(_metricVal);
+            .append(template.formatValue(_metricVal.doubleValue()));
         
         long nonReportingResourceFiredTime = getAlertFiredTime(startTime, endTime);
 
@@ -722,7 +726,8 @@
                 descr = descrNoVal+"Unknown";
                 timestamp = nonReportingResourceFiredTime;
             } else {
-                descr = descrNoVal+val.getValue();
+                String formattedValue = metric.getTemplate().formatValue(val);
+                descr = descrNoVal + formattedValue;
                 timestamp = val.getTimestamp();
             }
             

Modified: trunk/src/org/hyperic/hq/measurement/server/session/MeasurementTemplate.java
===================================================================
--- trunk/src/org/hyperic/hq/measurement/server/session/MeasurementTemplate.java	2010-04-02 14:39:19 UTC (rev 14468)
+++ trunk/src/org/hyperic/hq/measurement/server/session/MeasurementTemplate.java	2010-04-02 22:24:26 UTC (rev 14469)
@@ -207,7 +207,14 @@
         if (val == null)
             return "";
         
-        FormattedNumber th = UnitsConvert.convert(val.getValue(), getUnits());
+        return formatValue(val.getValue());
+    }
+
+    /**
+     * Format a metric values, based on the unites specified by this template.
+     */
+    public String formatValue(double val) {
+        FormattedNumber th = UnitsConvert.convert(val, getUnits());
         return th.toString();
     }
 }