=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/ChartStore.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/ChartStore.java 2014-03-18 08:10:10 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/ChartStore.java 1970-01-01 00:00:00 +0000 @@ -1,43 +0,0 @@ -package org.hisp.dhis.chart; - -/* - * Copyright (c) 2004-2014, 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 org.hisp.dhis.common.AnalyticalObjectStore; -import org.hisp.dhis.user.User; - -import java.util.Collection; - -/** - * @author Lars Helge Overland - */ -public interface ChartStore - extends AnalyticalObjectStore -{ - Collection getSystemAndUserCharts( User user ); -} === removed directory 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/hibernate' === removed file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/hibernate/HibernateChartStore.java' --- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/hibernate/HibernateChartStore.java 2014-03-18 08:10:10 +0000 +++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/hibernate/HibernateChartStore.java 1970-01-01 00:00:00 +0000 @@ -1,52 +0,0 @@ -package org.hisp.dhis.chart.hibernate; - -/* - * Copyright (c) 2004-2014, 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 org.hibernate.criterion.Restrictions; -import org.hisp.dhis.chart.Chart; -import org.hisp.dhis.chart.ChartStore; -import org.hisp.dhis.common.hibernate.HibernateAnalyticalObjectStore; -import org.hisp.dhis.user.User; - -import java.util.Collection; - -/** - * @author Lars Helge Overland - */ -public class HibernateChartStore - extends HibernateAnalyticalObjectStore implements ChartStore -{ - @SuppressWarnings( "unchecked" ) - public Collection getSystemAndUserCharts( User user ) - { - return getCriteria( - Restrictions.or( Restrictions.isNull( "user" ), - Restrictions.eq( "user", user ) ) ).list(); - } -} === modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java' --- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java 2014-03-18 08:10:10 +0000 +++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java 2014-04-02 12:07:12 +0000 @@ -28,6 +28,27 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import static org.hisp.dhis.chart.Chart.TYPE_AREA; +import static org.hisp.dhis.chart.Chart.TYPE_BAR; +import static org.hisp.dhis.chart.Chart.TYPE_COLUMN; +import static org.hisp.dhis.chart.Chart.TYPE_LINE; +import static org.hisp.dhis.chart.Chart.TYPE_PIE; +import static org.hisp.dhis.chart.Chart.TYPE_RADAR; +import static org.hisp.dhis.chart.Chart.TYPE_STACKED_BAR; +import static org.hisp.dhis.chart.Chart.TYPE_STACKED_COLUMN; +import static org.hisp.dhis.common.DimensionalObject.DIMENSION_SEP; +import static org.hisp.dhis.system.util.ConversionUtils.getArray; + +import java.awt.BasicStroke; +import java.awt.Color; +import java.awt.Font; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + import org.apache.commons.math.MathException; import org.apache.commons.math.analysis.SplineInterpolator; import org.apache.commons.math.analysis.UnivariateRealFunction; @@ -36,7 +57,7 @@ import org.hisp.dhis.analytics.AnalyticsService; import org.hisp.dhis.chart.Chart; import org.hisp.dhis.chart.ChartService; -import org.hisp.dhis.chart.ChartStore; +import org.hisp.dhis.common.AnalyticalObjectStore; import org.hisp.dhis.common.DimensionalObject; import org.hisp.dhis.common.NameableObject; import org.hisp.dhis.dataelement.DataElement; @@ -86,18 +107,6 @@ import org.jfree.util.TableOrder; import org.springframework.transaction.annotation.Transactional; -import java.awt.*; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import static org.hisp.dhis.chart.Chart.*; -import static org.hisp.dhis.common.DimensionalObject.DIMENSION_SEP; -import static org.hisp.dhis.system.util.ConversionUtils.getArray; - /** * @author Lars Helge Overland */ @@ -124,9 +133,9 @@ // Dependencies // ------------------------------------------------------------------------- - private ChartStore chartStore; + private AnalyticalObjectStore chartStore; - public void setChartStore( ChartStore chartStore ) + public void setChartStore( AnalyticalObjectStore chartStore ) { this.chartStore = chartStore; } === modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml 2014-02-10 08:26:08 +0000 +++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml 2014-04-02 12:07:12 +0000 @@ -39,7 +39,7 @@ - +