=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ChartController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ChartController.java 2014-12-30 17:28:02 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ChartController.java 2015-01-02 11:37:51 +0000 @@ -28,6 +28,17 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import static org.hisp.dhis.common.DimensionalObjectUtils.getUniqueDimensions; +import static org.hisp.dhis.common.DimensionalObjectUtils.toDimension; +import static org.hisp.dhis.webapi.utils.ContextUtils.DATE_PATTERN; + +import java.io.IOException; +import java.util.Date; +import java.util.Set; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.hisp.dhis.chart.Chart; import org.hisp.dhis.chart.ChartService; import org.hisp.dhis.common.DimensionService; @@ -59,18 +70,6 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import java.io.IOException; -import java.io.InputStream; -import java.util.Date; -import java.util.Set; - -import static org.hisp.dhis.common.DimensionalObjectUtils.getUniqueDimensions; -import static org.hisp.dhis.common.DimensionalObjectUtils.toDimension; -import static org.hisp.dhis.webapi.utils.ContextUtils.DATE_PATTERN; - /** * @author Morten Olav Hansen * @author Lars Helge Overland === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DashboardController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DashboardController.java 2014-12-30 17:28:02 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DashboardController.java 2015-01-02 11:37:51 +0000 @@ -28,6 +28,15 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import static org.hisp.dhis.dashboard.Dashboard.MAX_ITEMS; + +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.hisp.dhis.common.IdentifiableObject; import org.hisp.dhis.dashboard.Dashboard; import org.hisp.dhis.dashboard.DashboardItem; @@ -47,15 +56,6 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.InputStream; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import static org.hisp.dhis.dashboard.Dashboard.MAX_ITEMS; - /** * @author Lars Helge Overland */ === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ReportTableController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ReportTableController.java 2014-12-30 17:28:02 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ReportTableController.java 2015-01-02 11:37:51 +0000 @@ -32,7 +32,6 @@ import static org.hisp.dhis.system.util.CodecUtils.filenameEncode; import static org.hisp.dhis.webapi.utils.ContextUtils.DATE_PATTERN; -import java.io.InputStream; import java.util.Date; import java.util.Set; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventChartController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventChartController.java 2014-12-30 17:28:02 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventChartController.java 2015-01-02 11:37:51 +0000 @@ -32,7 +32,6 @@ import static org.hisp.dhis.webapi.utils.ContextUtils.DATE_PATTERN; import java.io.IOException; -import java.io.InputStream; import java.util.Date; import java.util.Set; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventReportController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventReportController.java 2014-12-30 17:28:02 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventReportController.java 2015-01-02 11:37:51 +0000 @@ -30,7 +30,6 @@ import static org.hisp.dhis.common.DimensionalObjectUtils.getDimensions; -import java.io.InputStream; import java.util.Set; import javax.servlet.http.HttpServletRequest; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/mapping/MapController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/mapping/MapController.java 2014-12-30 17:28:02 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/mapping/MapController.java 2015-01-02 11:37:51 +0000 @@ -28,6 +28,17 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import static org.hisp.dhis.webapi.utils.ContextUtils.DATE_PATTERN; + +import java.awt.image.BufferedImage; +import java.util.Date; +import java.util.Iterator; +import java.util.Set; + +import javax.imageio.ImageIO; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.hisp.dhis.common.DimensionService; import org.hisp.dhis.dxf2.utils.JacksonUtils; import org.hisp.dhis.i18n.I18nFormat; @@ -54,18 +65,6 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; -import javax.imageio.ImageIO; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import java.awt.image.BufferedImage; -import java.io.InputStream; -import java.util.Date; -import java.util.Iterator; -import java.util.Set; - -import static org.hisp.dhis.webapi.utils.ContextUtils.DATE_PATTERN; - /** * @author Morten Olav Hansen * @author Lars Helge Overland