dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8391
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-10-05 12:07:37 +0200
message:
  Made PeriodHierarchy return immutable sets
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodHierarchy.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/period/PeriodHierarchy.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodHierarchy.java	2012-08-29 14:39:44 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodHierarchy.java	2012-10-05 10:07:37 +0000
@@ -1,11 +1,41 @@
 package org.hisp.dhis.period;
 
+/*
+ * Copyright (c) 2004-2012, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the HISP project nor the names of its contributors may
+ *   be used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
+/**
+ * @author Lars Helge Overland
+ */
 public class PeriodHierarchy
 {
     private Map<Integer, Set<Integer>> intersectingPeriods = new HashMap<Integer, Set<Integer>>();
@@ -19,7 +49,7 @@
 
     public Set<Integer> getIntersectingPeriods( Period period )
     {
-        return intersectingPeriods.get( period.getId() );
+        return new HashSet<Integer>( intersectingPeriods.get( period.getId() ) );
     }
     
     public Set<Integer> getIntersectingPeriods( Collection<Period> periods )
@@ -46,7 +76,7 @@
 
     public Set<Integer> getPeriodsBetween( Period period )
     {
-        return periodsBetween.get( period.getId() );
+        return new HashSet<Integer>( periodsBetween.get( period.getId() ) );
     }
     
     public Set<Integer> getPeriodsBetween( Collection<Period> periods )