dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17424
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-11-11 15:05:01 +0545
message:
  minor
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectUtils.java
  dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.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/common/IdentifiableObjectUtils.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectUtils.java	2014-11-11 09:12:38 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectUtils.java	2014-11-11 09:20:01 +0000
@@ -145,7 +145,7 @@
      */
     public static String getLocalPeriodIdentifier( Date date, PeriodType periodType, Calendar calendar )
     {
-        return getLocalPeriod( periodType.createPeriod( date, calendar ), calendar );
+        return getLocalPeriodIdentifier( periodType.createPeriod( date, calendar ), calendar );
     }
 
     /**
@@ -155,7 +155,7 @@
      * @param calendar the calendar to use for generation of iso periods.
      * @return Period identifier based on given calendar
      */
-    public static String getLocalPeriod( Period period, Calendar calendar )
+    public static String getLocalPeriodIdentifier( Period period, Calendar calendar )
     {
         if ( calendar.isIso8601() )
         {

=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java	2014-11-11 09:12:38 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java	2014-11-11 09:20:01 +0000
@@ -974,7 +974,7 @@
 
                 if ( !calendar.isIso8601() )
                 {
-                    period.setUid( IdentifiableObjectUtils.getLocalPeriod( period, calendar ) );
+                    period.setUid( IdentifiableObjectUtils.getLocalPeriodIdentifier( period, calendar ) );
                 }
             }