dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3044
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2011-03-15 22:24:19 +0100
message:
  Added AggregatedValue interface so that the various classes can be used uniformly
added:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/AggregatedValue.java
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValue.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedIndicatorValue.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/completeness/DataSetCompletenessResult.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValue.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValue.java	2011-01-25 20:50:16 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValue.java	2011-03-15 21:24:19 +0000
@@ -30,11 +30,13 @@
 import java.io.Serializable;
 import java.util.Date;
 
+import org.hisp.dhis.common.AggregatedValue;
+
 /**
  * @author Lars Helge Overland
  */
 public class AggregatedDataValue
-    implements Serializable
+    implements AggregatedValue, Serializable
 {
     private int dataElementId;
     
@@ -117,6 +119,12 @@
         this.level = 0;
         this.value = 0.0;
     }
+
+    @Override
+    public int getElementId()
+    {
+        return dataElementId;
+    }
     
     // ----------------------------------------------------------------------
     // Getters and setters

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedIndicatorValue.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedIndicatorValue.java	2011-01-25 20:50:16 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedIndicatorValue.java	2011-03-15 21:24:19 +0000
@@ -30,11 +30,13 @@
 import java.io.Serializable;
 import java.util.Date;
 
+import org.hisp.dhis.common.AggregatedValue;
+
 /**
  * @author Lars Helge Overland
  */
 public class AggregatedIndicatorValue
-    implements Serializable
+    implements AggregatedValue, Serializable
 {
     private int indicatorId;
     
@@ -152,6 +154,12 @@
         this.numeratorValue = 0.0;
         this.denominatorValue = 0.0;
     }
+
+    @Override
+    public int getElementId()
+    {
+        return indicatorId;
+    }
     
     // ----------------------------------------------------------------------
     // Getters and setters

=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/AggregatedValue.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/AggregatedValue.java	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/AggregatedValue.java	2011-03-15 21:24:19 +0000
@@ -0,0 +1,12 @@
+package org.hisp.dhis.common;
+
+public interface AggregatedValue
+{
+    int getElementId();
+    
+    int getPeriodId();
+    
+    int getOrganisationUnitId();
+    
+    double getValue();
+}

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/completeness/DataSetCompletenessResult.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/completeness/DataSetCompletenessResult.java	2011-03-01 21:07:47 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/completeness/DataSetCompletenessResult.java	2011-03-15 21:24:19 +0000
@@ -29,12 +29,14 @@
 
 import java.io.Serializable;
 
+import org.hisp.dhis.common.AggregatedValue;
+
 /**
  * @author Lars Helge Overland
  * @version $Id$
  */
 public class DataSetCompletenessResult
-    implements Serializable
+    implements AggregatedValue, Serializable
 {
     // -------------------------------------------------------------------------
     // Properties 1
@@ -133,6 +135,18 @@
         
         return 0.0;
     }
+
+    @Override
+    public int getElementId()
+    {
+        return dataSetId;
+    }
+
+    @Override
+    public double getValue()
+    {
+        return registrations;
+    }
     
     // -------------------------------------------------------------------------
     // HashCode, equals, and toString