------------------------------------------------------------ revno: 15026 committer: Morten Olav Hansen <[email protected]> branch nick: dhis2 timestamp: Sun 2014-04-27 20:51:06 +0545 message: remove GregorianJulian calendar type removed: dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/GregorianJulianCalendar.java modified: dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global.properties
-- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/GregorianJulianCalendar.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/GregorianJulianCalendar.java 2014-04-26 09:34:05 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/GregorianJulianCalendar.java 1970-01-01 00:00:00 +0000 @@ -1,59 +0,0 @@ -package org.hisp.dhis.calendar.impl; - -/* - * 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.calendar.Calendar; -import org.hisp.dhis.calendar.ChronologyBasedCalendar; -import org.joda.time.chrono.GJChronology; -import org.springframework.stereotype.Component; - -/** - * @author Morten Olav Hansen <[email protected]> - */ -@Component -public class GregorianJulianCalendar extends ChronologyBasedCalendar -{ - private static final Calendar self = new GregorianJulianCalendar(); - - public static Calendar getInstance() - { - return self; - } - - protected GregorianJulianCalendar() - { - super( GJChronology.getInstance() ); - } - - @Override - public String name() - { - return "gregorian_julian"; - } -} === modified file 'dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global.properties' --- dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global.properties 2014-04-27 07:24:25 +0000 +++ dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global.properties 2014-04-27 15:06:06 +0000 @@ -835,7 +835,6 @@ nepali=Nepali julian=Julian gregorian=Gregorian -gregorian_julian=Gregorian/Julian ethiopian=Ethiopian buddhist=Buddhist (Thai) iso8601=ISO 8601
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
