=== renamed file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/QueryItem.java' => 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/QueryItem.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/QueryItem.java 2013-09-10 14:22:41 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/QueryItem.java 2013-10-14 20:58:12 +0000 @@ -1,4 +1,4 @@ -package org.hisp.dhis.analytics.event; +package org.hisp.dhis.common; /* * Copyright (c) 2004-2013, University of Oslo === modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/EventQueryParams.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/EventQueryParams.java 2013-10-02 14:40:51 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/EventQueryParams.java 2013-10-14 20:58:12 +0000 @@ -38,6 +38,7 @@ import org.hisp.dhis.analytics.SortOrder; import org.hisp.dhis.common.DimensionalObject; import org.hisp.dhis.common.NameableObject; +import org.hisp.dhis.common.QueryItem; import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.program.Program; import org.hisp.dhis.program.ProgramStage; === modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java 2013-10-11 09:19:08 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java 2013-10-14 20:58:12 +0000 @@ -52,7 +52,7 @@ import org.hisp.dhis.analytics.event.EventAnalyticsService; import org.hisp.dhis.analytics.event.EventQueryParams; import org.hisp.dhis.analytics.event.EventQueryPlanner; -import org.hisp.dhis.analytics.event.QueryItem; +import org.hisp.dhis.common.QueryItem; import org.hisp.dhis.common.BaseIdentifiableObject; import org.hisp.dhis.common.DimensionType; import org.hisp.dhis.common.DimensionalObject; === modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.java 2013-10-08 19:10:40 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.java 2013-10-14 20:58:12 +0000 @@ -41,7 +41,7 @@ import org.hisp.dhis.analytics.DataQueryParams; import org.hisp.dhis.analytics.event.EventAnalyticsManager; import org.hisp.dhis.analytics.event.EventQueryParams; -import org.hisp.dhis.analytics.event.QueryItem; +import org.hisp.dhis.common.QueryItem; import org.hisp.dhis.common.DimensionalObject; import org.hisp.dhis.common.Grid; import org.hisp.dhis.common.IdentifiableObject;