dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7770
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-07-30 18:38:32 +0200
message:
  Minor
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/comparator/AscendingPeriodEndDateComparator.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/incoming/IncomingSmsService.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/comparator/AscendingPeriodEndDateComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/comparator/AscendingPeriodEndDateComparator.java	2012-07-30 16:01:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/comparator/AscendingPeriodEndDateComparator.java	2012-07-30 16:38:32 +0000
@@ -67,6 +67,6 @@
             return 1;
         }
         
-        return period1.getPeriodType().getFrequencyOrder() < period2.getPeriodType().getFrequencyOrder() ? -1 : 1;
+        return new Integer( period1.getPeriodType().getFrequencyOrder() ).compareTo( new Integer( period2.getPeriodType().getFrequencyOrder() ) );
     }
 }

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/incoming/IncomingSmsService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/incoming/IncomingSmsService.java	2012-06-06 07:48:54 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/incoming/IncomingSmsService.java	2012-07-30 16:38:32 +0000
@@ -2,7 +2,6 @@
 
 import java.util.List;
 
-import org.hisp.dhis.sms.config.ModemGatewayConfig;
 import org.smslib.InboundMessage;
 
 /*