dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #12946
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4057: Cleanup
------------------------------------------------------------
revno: 4057
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-07-01 13:27:12 +0200
message:
Cleanup
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/Period.java
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/engine/DefaultDataMartEngine.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/Period.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/Period.java 2011-07-01 11:20:25 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/Period.java 2011-07-01 11:27:12 +0000
@@ -231,7 +231,7 @@
@Override
public String toString()
{
- return "[" + id + " " + periodType.getName() + ": " + startDate + " - " + endDate + "]";
+ return "[" + periodType.getName() + ": " + startDate + " - " + endDate + "]";
}
// -------------------------------------------------------------------------
@@ -266,6 +266,5 @@
public void setStartDate( Date startDate )
{
this.startDate = startDate;
- }
-
+ }
}
=== modified file 'dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/engine/DefaultDataMartEngine.java'
--- dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/engine/DefaultDataMartEngine.java 2011-07-01 11:20:25 +0000
+++ dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/engine/DefaultDataMartEngine.java 2011-07-01 11:27:12 +0000
@@ -155,7 +155,7 @@
public void export( Collection<Integer> dataElementIds, Collection<Integer> indicatorIds,
Collection<Integer> periodIds, Collection<Integer> organisationUnitIds, boolean useIndexes, ProcessState state )
{
- Clock clock = new Clock().startClock().logTime( "Data mart export process started" + " 2" );
+ Clock clock = new Clock().startClock().logTime( "Data mart export process started" );
// ---------------------------------------------------------------------
// Get objects