dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17270
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2014-10-25 10:07:52 +0200
message:
  Code style
modified:
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataApprovalController.java
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/webdomain/FormDataSet.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-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataApprovalController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataApprovalController.java	2014-10-24 10:26:58 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataApprovalController.java	2014-10-25 08:07:52 +0000
@@ -238,8 +238,8 @@
             organisationUnit, null );
 
         DataApproval dataApproval = status.getDataApproval();
-        Date createdDate = (dataApproval == null) ? null : dataApproval.getCreated();
-        String createdByUsername = (dataApproval == null) ? null : dataApproval.getCreator().getUsername();
+        Date createdDate = dataApproval == null ? null : dataApproval.getCreated();
+        String createdByUsername = dataApproval == null ? null : dataApproval.getCreator().getUsername();
 
         String state = status.getState().toString();
 
@@ -394,7 +394,7 @@
                 currentUserService.getCurrentUser() :
                 userService.getUserCredentialsByUsername( dataApprovalStateRequest.getAb() ).getUser();
 
-            Date approvalDate = (dataApprovalStateRequest.getAd() == null) ? new Date() : dataApprovalStateRequest.getAd();
+            Date approvalDate = dataApprovalStateRequest.getAd() == null ? new Date() : dataApprovalStateRequest.getAd();
 
             dataApprovalList.addAll( makeDataApprovalList( dataApprovalLevel, dataSet,
                 period, organisationUnit, false, approvalDate, user ) );

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/webdomain/FormDataSet.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/webdomain/FormDataSet.java	2014-05-22 12:40:24 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/webdomain/FormDataSet.java	2014-10-25 08:07:52 +0000
@@ -31,9 +31,6 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
- * We could have gotten this information from the form instance, but
- * in the interest of performance, we duplicate some information here.
- *
  * @author Morten Olav Hansen <mortenoh@xxxxxxxxx>
  */
 public class FormDataSet