dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #33835
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 17332: Codestyle
------------------------------------------------------------
revno: 17332
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2014-11-01 17:22:26 -0400
message:
Codestyle
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DefaultDataApprovalService.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-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DefaultDataApprovalService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DefaultDataApprovalService.java 2014-10-31 21:17:14 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DefaultDataApprovalService.java 2014-11-01 21:22:26 +0000
@@ -114,7 +114,7 @@
@Override
public void approveData( List<DataApproval> dataApprovalList )
{
- log.info( "------------ approveData ( " + dataApprovalList.size() + " items )" );
+ log.info( "- approveData ( " + dataApprovalList.size() + " items )" );
Map<DataApproval, DataApprovalStatus> statusMap = getStatusMap( dataApprovalList );
@@ -137,7 +137,7 @@
for ( DataApproval da : dataApprovalList )
{
- log.info("--> approving " + da );
+ log.info("-> approving " + da );
dataApprovalStore.addDataApproval( da );
}
@@ -148,7 +148,7 @@
@Override
public void unapproveData( List<DataApproval> dataApprovalList )
{
- log.debug( "------------ unapproveData ( " + dataApprovalList.size() + " items )" );
+ log.debug( "- unapproveData ( " + dataApprovalList.size() + " items )" );
Map<DataApproval, DataApprovalStatus> statusMap = getStatusMap( dataApprovalList );
@@ -173,7 +173,7 @@
for ( DataApproval da : dataApprovalList )
{
- log.debug( "--> unapproving " + da );
+ log.debug( "- unapproving " + da );
DataApproval d = dataApprovalStore.getDataApproval( da.getDataApprovalLevel(), da.getDataSet(), da.getPeriod(), da.getOrganisationUnit(), da.getAttributeOptionCombo() );
@@ -186,7 +186,7 @@
@Override
public void acceptData( List<DataApproval> dataApprovalList )
{
- log.debug( "------------ acceptData ( " + dataApprovalList.size() + " items )" );
+ log.debug( "- acceptData ( " + dataApprovalList.size() + " items )" );
Map<DataApproval, DataApprovalStatus> statusMap = getStatusMap( dataApprovalList );
@@ -213,7 +213,7 @@
{
da.setAccepted( true );
- log.debug( "--> accepting " + da );
+ log.debug( "- accepting " + da );
DataApproval d = dataApprovalStore.getDataApproval( da.getDataApprovalLevel(), da.getDataSet(), da.getPeriod(), da.getOrganisationUnit(), da.getAttributeOptionCombo() );
@@ -228,7 +228,7 @@
@Override
public void unacceptData( List<DataApproval> dataApprovalList )
{
- log.debug( "------------ unacceptData ( " + dataApprovalList.size() + " items )" );
+ log.debug( "- unacceptData ( " + dataApprovalList.size() + " items )" );
Map<DataApproval, DataApprovalStatus> statusMap = getStatusMap( dataApprovalList );
@@ -253,7 +253,7 @@
for ( DataApproval da : dataApprovalList )
{
- log.debug( "--> unaccepting " + da );
+ log.debug( "- unaccepting " + da );
DataApproval d = dataApprovalStore.getDataApproval( da.getDataApprovalLevel(), da.getDataSet(), da.getPeriod(), da.getOrganisationUnit(), da.getAttributeOptionCombo() );
@@ -268,7 +268,7 @@
@Override
public DataApprovalStatus getDataApprovalStatus( DataSet dataSet, Period period, OrganisationUnit organisationUnit, DataElementCategoryOptionCombo attributeOptionCombo )
{
- log.debug( "------------ getDataApprovalStatus( " + dataSet.getName() + ", "
+ log.debug( "- getDataApprovalStatus( " + dataSet.getName() + ", "
+ period.getPeriodType().getName() + " " + period.getName() + " " + period + ", "
+ organisationUnit.getName() + ", "
+ ( attributeOptionCombo == null ? "(null)" : attributeOptionCombo.getName() ) + " )" );