=== removed directory 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/comparator' === removed file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/comparator/DataElementIdComparator.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/comparator/DataElementIdComparator.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/comparator/DataElementIdComparator.java 1970-01-01 00:00:00 +0000 @@ -1,47 +0,0 @@ -package org.hisp.dhis.util.comparator; - -/* - * 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. - */ - -import java.util.Comparator; - -import org.hisp.dhis.dataelement.DataElement; - -/** - * @author Torgeir Lorange Ostby - * @version $Id: DataElementIdComparator.java 2869 2007-02-20 14:26:09Z andegje $ - */ -public class DataElementIdComparator - implements Comparator -{ - @Override - public int compare( DataElement dataElement0, DataElement dataElement1 ) - { - return dataElement0.getId() - dataElement1.getId(); - } -} === removed file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/comparator/PeriodStartDateComparator.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/comparator/PeriodStartDateComparator.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/comparator/PeriodStartDateComparator.java 1970-01-01 00:00:00 +0000 @@ -1,47 +0,0 @@ -package org.hisp.dhis.util.comparator; - -/* - * 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. - */ - -import java.util.Comparator; - -import org.hisp.dhis.period.Period; - -/** - * @author Torgeir Lorange Ostby - * @version $Id: PeriodStartDateComparator.java 2869 2007-02-20 14:26:09Z andegje $ - */ -public class PeriodStartDateComparator - implements Comparator -{ - @Override - public int compare( Period period0, Period period1 ) - { - return period0.getStartDate().compareTo( period1.getStartDate() ); - } -} === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalMenuInterceptor.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalMenuInterceptor.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalMenuInterceptor.java 2015-09-14 07:41:52 +0000 @@ -28,18 +28,16 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.interceptor.Interceptor; +import org.hisp.dhis.webportal.menu.MenuState; +import org.hisp.dhis.webportal.menu.MenuStateManager; + import java.util.HashMap; import java.util.Map; -import org.hisp.dhis.webportal.menu.MenuState; -import org.hisp.dhis.webportal.menu.MenuStateManager; - -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.interceptor.Interceptor; - /** * @author Torgeir Lorange Ostby - * @version $Id: WebWorkPortalMenuInterceptor.java 2869 2007-02-20 14:26:09Z andegje $ */ public class XWorkPortalMenuInterceptor implements Interceptor @@ -69,15 +67,11 @@ @Override public void destroy() { - // TODO Auto-generated method stub - } @Override public void init() { - // TODO Auto-generated method stub - } @Override @@ -96,7 +90,7 @@ menuStateMap.put( KEY_MENU_STATE, menuState ); invocation.getStack().push( menuStateMap ); - + return invocation.invoke(); } } === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalModuleInterceptor.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalModuleInterceptor.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalModuleInterceptor.java 2015-09-14 07:41:52 +0000 @@ -28,17 +28,15 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.interceptor.Interceptor; +import org.hisp.dhis.webportal.module.ModuleManager; + import java.util.HashMap; import java.util.Map; -import org.hisp.dhis.webportal.module.ModuleManager; - -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.interceptor.Interceptor; - /** * @author Torgeir Lorange Ostby - * @version $Id: WebWorkPortalModuleInterceptor.java 2869 2007-02-20 14:26:09Z andegje $ */ public class XWorkPortalModuleInterceptor implements Interceptor @@ -68,15 +66,11 @@ @Override public void destroy() { - // TODO Auto-generated method stub - } @Override public void init() { - // TODO Auto-generated method stub - } @Override @@ -88,7 +82,7 @@ handle.put( KEY_MENU_MODULES, moduleManager.getAccessibleMenuModulesAndApps() ); actionInvocation.getStack().push( handle ); - + return actionInvocation.invoke(); } } === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalParamsInterceptor.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalParamsInterceptor.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalParamsInterceptor.java 2015-09-14 07:41:52 +0000 @@ -42,7 +42,6 @@ /** * @author Torgeir Lorange Ostby - * @version $Id: WebWorkPortalParamsInterceptor.java 4559 2008-02-09 18:47:24Z torgeilo $ */ public class XWorkPortalParamsInterceptor implements Interceptor === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalUserInterceptor.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalUserInterceptor.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalUserInterceptor.java 2015-09-14 07:41:52 +0000 @@ -28,17 +28,15 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.interceptor.Interceptor; +import org.hisp.dhis.user.CurrentUserService; + import java.util.HashMap; import java.util.Map; -import org.hisp.dhis.user.CurrentUserService; - -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.interceptor.Interceptor; - /** * @author Torgeir Lorange Ostby - * @version $Id: WebWorkPortalUserInterceptor.java 2869 2007-02-20 14:26:09Z andegje $ */ public class XWorkPortalUserInterceptor implements Interceptor @@ -66,15 +64,11 @@ @Override public void destroy() { - // TODO Auto-generated method stub - } @Override public void init() { - // TODO Auto-generated method stub - } @Override @@ -87,7 +81,7 @@ map.put( "currentUser", currentUserService.getCurrentUser() ); invocation.getStack().push( map ); - + return invocation.invoke(); } }