dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4194
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-07-22 11:09:05 +0700
message:
  Reporting module - Fixed unit tests building failed.
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/Report.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.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/chart/Chart.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java	2011-07-21 03:29:35 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java	2011-07-22 04:09:05 +0000
@@ -105,7 +105,7 @@
 
     private String targetLineLabel;
 
-    private List<ChartGroup> groups = new ArrayList<ChartGroup>();
+    private Set<ChartGroup> groups = new HashSet<ChartGroup>();
 
     private List<Indicator> indicators = new ArrayList<Indicator>();
 
@@ -175,7 +175,7 @@
     }
 
     public void updateChartGroups( Set<ChartGroup> updates )
-    {
+    {  
         for ( ChartGroup group : new HashSet<ChartGroup>( groups ) )
         {
             if ( !updates.contains( group ) )
@@ -556,12 +556,12 @@
         this.allOrganisationUnits = allOrganisationUnits;
     }
 
-    public List<ChartGroup> getGroups()
+    public Set<ChartGroup> getGroups()
     {
         return groups;
     }
 
-    public void setGroups( List<ChartGroup> groups )
+    public void setGroups( Set<ChartGroup> groups )
     {
         this.groups = groups;
     }

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/Report.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/Report.java	2011-07-21 03:29:35 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/Report.java	2011-07-22 04:09:05 +0000
@@ -27,9 +27,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
 import org.hisp.dhis.common.AbstractIdentifiableObject;
@@ -53,7 +51,7 @@
 
     private ReportTable reportTable;
 
-    private List<ReportGroup> groups = new ArrayList<ReportGroup>();
+    private Set<ReportGroup> groups = new HashSet<ReportGroup>();
 
     // -------------------------------------------------------------------------
     // Constructors
@@ -170,12 +168,12 @@
         this.reportTable = reportTable;
     }
 
-    public List<ReportGroup> getGroups()
+    public Set<ReportGroup> getGroups()
     {
         return groups;
     }
 
-    public void setGroups( List<ReportGroup> groups )
+    public void setGroups( Set<ReportGroup> groups )
     {
         this.groups = groups;
     }

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java	2011-07-21 03:29:35 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java	2011-07-22 04:09:05 +0000
@@ -197,7 +197,7 @@
     /**
      * The list of OrganisationUnits the ReportTable contains.
      */
-    private List<ReportTableGroup> groups = new ArrayList<ReportTableGroup>();
+    private Set<ReportTableGroup> groups = new HashSet<ReportTableGroup>();
 
     /**
      * The DataElementCategoryCombo for the ReportTable.
@@ -899,12 +899,12 @@
         this.units = units;
     }
 
-    public List<ReportTableGroup> getGroups()
+    public Set<ReportTableGroup> getGroups()
     {
         return groups;
     }
 
-    public void setGroups( List<ReportTableGroup> groups )
+    public void setGroups( Set<ReportTableGroup> groups )
     {
         this.groups = groups;
     }