=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dimension/BasicDimensionSet.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dimension/BasicDimensionSet.java 2009-11-23 11:40:23 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dimension/BasicDimensionSet.java 2009-11-23 17:13:43 +0000 @@ -1,11 +1,41 @@ package org.hisp.dhis.dimension; +/* + * Copyright (c) 2004-2007, 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.ArrayList; import java.util.Arrays; import java.util.HashSet; import java.util.Iterator; import java.util.List; +/** + * @author Lars Helge Overland + */ public class BasicDimensionSet implements DimensionSet { === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dimension/DimensionService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dimension/DimensionService.java 2009-11-16 10:32:46 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dimension/DimensionService.java 2009-11-23 17:13:43 +0000 @@ -38,9 +38,26 @@ { final String ID = DimensionService.class.getName(); + /** + * Returns the DimensionSet with the argument DimensionSet identifier. + * + * @param dimensionSetId the DimensionSet identifier. + * @return the DimensionSet with the argument DimensionSet identifier. + */ DimensionSet getDimensionSet( String dimensionSetId ); + /** + * Returns all DataElement DimensionSets. + * + * @return a Collection of DataElement DimensionSets. + */ Collection getDataElementDimensionSets(); + /** + * Returns all DataElemens associated with the argument DimensionSet. + * + * @param dimensionSet the DimensionSet. + * @return a Collection of DataElements associated with the argument DimensionSet. + */ Collection getDataElements( DimensionSet dimensionSet ); }