dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #15980
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 5921: Exposing method createPeriod( Calendar ) on period type classes
Merge authors:
Lars Helge Øverland (larshelge)
------------------------------------------------------------
revno: 5921 [merge]
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2012-02-12 18:37:59 +0100
message:
Exposing method createPeriod( Calendar ) on period type classes
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/BiMonthlyPeriodType.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/DailyPeriodType.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/FinancialPeriodType.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/MonthlyPeriodType.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodType.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/QuarterlyPeriodType.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/SixMonthlyPeriodType.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/TwoYearlyPeriodType.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/WeeklyPeriodType.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/YearlyPeriodType.java
--
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
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/BiMonthlyPeriodType.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/BiMonthlyPeriodType.java 2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/BiMonthlyPeriodType.java 2012-02-12 17:33:07 +0000
@@ -69,7 +69,8 @@
return createPeriod( createCalendarInstance( date ) );
}
- private Period createPeriod( Calendar cal )
+ @Override
+ public Period createPeriod( Calendar cal )
{
cal.set( Calendar.MONTH, cal.get( Calendar.MONTH ) - cal.get( Calendar.MONTH ) % 2 );
cal.set( Calendar.DAY_OF_MONTH, 1 );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/DailyPeriodType.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/DailyPeriodType.java 2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/DailyPeriodType.java 2012-02-12 17:33:07 +0000
@@ -71,17 +71,21 @@
@Override
public Period createPeriod()
{
- Date date = createCalendarInstance().getTime();
-
- return new Period( this, date, date );
+ return createPeriod( createCalendarInstance() );
}
@Override
public Period createPeriod( Date date )
{
- Date fixedDate = createCalendarInstance( date ).getTime();
+ return createPeriod( createCalendarInstance( date ) );
+ }
+
+ @Override
+ public Period createPeriod( Calendar cal )
+ {
+ Date date = cal.getTime();
- return new Period( this, fixedDate, fixedDate );
+ return new Period( this, date, date );
}
@Override
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/FinancialPeriodType.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/FinancialPeriodType.java 2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/FinancialPeriodType.java 2012-02-12 17:33:07 +0000
@@ -67,7 +67,8 @@
return createPeriod( createCalendarInstance( date ) );
}
- private Period createPeriod( Calendar cal )
+ @Override
+ public Period createPeriod( Calendar cal )
{
boolean past = cal.get( Calendar.MONTH ) >= getBaseMonth();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/MonthlyPeriodType.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/MonthlyPeriodType.java 2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/MonthlyPeriodType.java 2012-02-12 17:33:07 +0000
@@ -80,7 +80,8 @@
return createPeriod( createCalendarInstance( date ) );
}
- private Period createPeriod( Calendar cal )
+ @Override
+ public Period createPeriod( Calendar cal )
{
cal.set( Calendar.DAY_OF_MONTH, 1 );
Date startDate = cal.getTime();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodType.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodType.java 2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodType.java 2012-02-12 17:33:07 +0000
@@ -181,6 +181,8 @@
* @return the valid Period based on the given date
*/
public abstract Period createPeriod( Date date );
+
+ public abstract Period createPeriod( Calendar cal );
/**
* Returns a comparable value for the frequency length of this PeriodType.
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/QuarterlyPeriodType.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/QuarterlyPeriodType.java 2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/QuarterlyPeriodType.java 2012-02-12 17:33:07 +0000
@@ -77,7 +77,8 @@
return createPeriod( createCalendarInstance( date ) );
}
- private Period createPeriod( Calendar cal )
+ @Override
+ public Period createPeriod( Calendar cal )
{
cal.set( Calendar.MONTH, cal.get( Calendar.MONTH ) - cal.get( Calendar.MONTH ) % 3 );
cal.set( Calendar.DAY_OF_MONTH, 1 );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/SixMonthlyPeriodType.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/SixMonthlyPeriodType.java 2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/SixMonthlyPeriodType.java 2012-02-12 17:33:07 +0000
@@ -77,7 +77,8 @@
return createPeriod( createCalendarInstance( date ) );
}
- private Period createPeriod( Calendar cal )
+ @Override
+ public Period createPeriod( Calendar cal )
{
cal.set( Calendar.MONTH, cal.get( Calendar.MONTH ) - cal.get( Calendar.MONTH ) % 6 );
cal.set( Calendar.DAY_OF_MONTH, 1 );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/TwoYearlyPeriodType.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/TwoYearlyPeriodType.java 2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/TwoYearlyPeriodType.java 2012-02-12 17:33:07 +0000
@@ -77,7 +77,8 @@
return createPeriod( createCalendarInstance( date ) );
}
- private Period createPeriod( Calendar cal )
+ @Override
+ public Period createPeriod( Calendar cal )
{
cal.set( Calendar.YEAR, cal.get( Calendar.YEAR ) - cal.get( Calendar.YEAR ) % 2 );
cal.set( Calendar.DAY_OF_YEAR, 1 );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/WeeklyPeriodType.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/WeeklyPeriodType.java 2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/WeeklyPeriodType.java 2012-02-12 17:33:07 +0000
@@ -77,7 +77,8 @@
return createPeriod( createCalendarInstance( date ) );
}
- private Period createPeriod( Calendar cal )
+ @Override
+ public Period createPeriod( Calendar cal )
{
cal.set( Calendar.DAY_OF_WEEK, Calendar.MONDAY );
Date startDate = cal.getTime();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/YearlyPeriodType.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/YearlyPeriodType.java 2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/YearlyPeriodType.java 2012-02-12 17:33:07 +0000
@@ -76,7 +76,8 @@
return createPeriod( createCalendarInstance( date ) );
}
- private Period createPeriod( Calendar cal )
+ @Override
+ public Period createPeriod( Calendar cal )
{
cal.set( Calendar.DAY_OF_YEAR, 1 );
Date startDate = cal.getTime();
