------------------------------------------------------------ revno: 11417 committer: Lars Helge Ă˜verland <larshe...@gmail.com> branch nick: dhis2 timestamp: Wed 2013-07-17 14:38:00 +0200 message: Fixed bug related to fixed period ordering in charts added: dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/UniqueArrayList.java modified: dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultDimensionService.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-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultDimensionService.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultDimensionService.java 2013-07-04 15:41:57 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultDimensionService.java 2013-07-17 12:38:00 +0000 @@ -44,10 +44,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Set; import org.hisp.dhis.dataelement.DataElement; import org.hisp.dhis.dataelement.DataElementCategory; @@ -66,6 +64,7 @@ import org.hisp.dhis.period.PeriodType; import org.hisp.dhis.period.RelativePeriodEnum; import org.hisp.dhis.period.RelativePeriods; +import org.hisp.dhis.system.util.UniqueArrayList; import org.hisp.dhis.user.User; import org.springframework.beans.factory.annotation.Autowired; @@ -251,7 +250,7 @@ else if ( PERIOD.equals( type ) ) { List<RelativePeriodEnum> enums = new ArrayList<RelativePeriodEnum>(); - Set<Period> periods = new HashSet<Period>(); + List<Period> periods = new UniqueArrayList<Period>(); for ( String isoPeriod : uids ) { === added file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/UniqueArrayList.java' --- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/UniqueArrayList.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/UniqueArrayList.java 2013-07-17 12:38:00 +0000 @@ -0,0 +1,93 @@ +package org.hisp.dhis.system.util; + +/* + * Copyright (c) 2004-2005, 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 <ORGANIZATION> 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.ArrayList; +import java.util.Collection; + +/** + * @author Lars Helge Overland + */ +public class UniqueArrayList<E> + extends ArrayList<E> +{ + @Override + public boolean add( E e ) + { + return super.contains( e ) ? false : super.add( e ); + } + + @Override + public void add( int index, E e ) + { + if ( !super.contains( e ) ) + { + super.add( index, e ); + } + } + + @Override + public boolean addAll( Collection<? extends E> c ) + { + boolean modified = false; + + if ( c != null ) + { + for ( E e : c ) + { + if ( !super.contains( e ) ) + { + super.add( e ); + modified = true; + } + } + } + + return modified; + } + + @Override + public boolean addAll( int index, Collection<? extends E> c ) + { + boolean modified = false; + + if ( c != null ) + { + for ( E e : c ) + { + if ( !super.contains( e ) ) + { + super.add( index++, e ); + modified = true; + } + } + } + + return modified; + } +}
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp