=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/analytics/AnalyticsFavoriteType.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/analytics/AnalyticsFavoriteType.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/analytics/AnalyticsFavoriteType.java 2015-10-13 10:18:02 +0000 @@ -0,0 +1,37 @@ +package org.hisp.dhis.analytics; + +/* + * Copyright (c) 2004-2015, 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. + */ + +/** + * @author Lars Helge Overland + */ +public enum AnalyticsFavoriteType +{ + CHART, EVENT_CHART, REPORT_TABLE, EVENT_REPORT, MAP, DATASET_REPORT; +} === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/interpretation/Interpretation.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/interpretation/Interpretation.java 2015-07-14 07:21:33 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/interpretation/Interpretation.java 2015-10-13 10:18:02 +0000 @@ -35,6 +35,7 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import org.hisp.dhis.security.acl.AccessStringHelper; +import org.hisp.dhis.analytics.AnalyticsFavoriteType; import org.hisp.dhis.chart.Chart; import org.hisp.dhis.common.BaseIdentifiableObject; import org.hisp.dhis.common.DxfNamespaces; @@ -146,23 +147,23 @@ @JsonProperty @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 ) - public String getType() + public AnalyticsFavoriteType getType() { if ( chart != null ) { - return TYPE_CHART; + return AnalyticsFavoriteType.CHART; } else if ( map != null ) { - return TYPE_MAP; + return AnalyticsFavoriteType.MAP; } else if ( reportTable != null ) { - return TYPE_REPORT_TABLE; + return AnalyticsFavoriteType.REPORT_TABLE; } else if ( dataSet != null ) { - return TYPE_DATASET_REPORT; + return AnalyticsFavoriteType.DATASET_REPORT; } return null;