dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 12038
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-09-11 15:46:35 +0200
message:
  Code style
modified:
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DashboardController.java
  dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/action/MenuAction.java
  dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/input/SMSInput.java
  dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/outcoming/ProcessingSendSMSAction.java
  dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/outcoming/SearchPatientAction.java
  dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/outcoming/ShowSendSMSFormAction.java
  dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/ShowRunValidationFormAction.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/api/controller/DashboardController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DashboardController.java	2013-09-11 12:52:51 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DashboardController.java	2013-09-11 13:46:35 +0000
@@ -227,8 +227,7 @@
                 dashboard.removeItem( item.getUid() ); // Remove if empty
             }
             
-            dashboardService.updateDashboard( dashboard );
-            
+            dashboardService.updateDashboard( dashboard );            
             
             ContextUtils.okResponse( response, "Dashboard item content removed" );
         }        

=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/action/MenuAction.java'
--- dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/action/MenuAction.java	2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/action/MenuAction.java	2013-09-11 13:46:35 +0000
@@ -155,7 +155,6 @@
             dataSet = dataSetService.getDataSet( dataSetId );
         }
 
-
         return SUCCESS;
     }
 }

=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/input/SMSInput.java'
--- dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/input/SMSInput.java	2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/input/SMSInput.java	2013-09-11 13:46:35 +0000
@@ -52,7 +52,7 @@
     {
         IncomingSms sms = new IncomingSms();
 
-        // setter for sms's originator
+        // setter for sms originator
         if ( sender != null )
         {
             sms.setOriginator( sender );
@@ -70,7 +70,7 @@
             sms.setOriginator( msisdn );
         }
 
-        // setter for sms's text
+        // setter for sms text
         if ( message != null )
         {
             sms.setText( message );
@@ -84,7 +84,7 @@
             sms.setText( content );
         }
 
-        // check whether 2 necessary attributes are null 
+        // check whether two necessary attributes are null 
         if ( sms.getOriginator() == null || sms.getText() == null )
         {
             setNullToAll();

=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/outcoming/ProcessingSendSMSAction.java'
--- dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/outcoming/ProcessingSendSMSAction.java	2013-09-05 06:05:43 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/outcoming/ProcessingSendSMSAction.java	2013-09-11 13:46:35 +0000
@@ -53,7 +53,6 @@
 
 /**
  * @author Dang Duy Hieu
- * @version $Id$
  */
 public class ProcessingSendSMSAction
     implements Action
@@ -218,6 +217,7 @@
             
             // message = messageSender.sendMessage( smsSubject, smsMessage,
             // currentUser, false, group.getMembers(), gatewayId );
+            
             message = smsSender.sendMessage( smsSubject, text, currentUser, new ArrayList<User>( group.getMembers() ),
                 false );
         }
@@ -241,6 +241,7 @@
 
                 // message = messageSender.sendMessage( smsSubject, smsMessage,
                 // currentUser, false, users, gatewayId );
+                
                 message = smsSender.sendMessage( smsSubject, text, currentUser, recipientsList, false );
             }
         }
@@ -264,7 +265,6 @@
             }
 
             message = smsSender.sendMessage( smsSubject, text, currentUser, recipientsList, false );
-
         }
 
         if ( message != null && !message.equals( "success" ) )

=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/outcoming/SearchPatientAction.java'
--- dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/outcoming/SearchPatientAction.java	2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/outcoming/SearchPatientAction.java	2013-09-11 13:46:35 +0000
@@ -180,6 +180,10 @@
         return SUCCESS;
     }
 
+    // -------------------------------------------------------------------------
+    // Supportive methods
+    // -------------------------------------------------------------------------
+
     private String getHierarchyOrgunit( OrganisationUnit orgunit )
     {
         String hierarchyOrgunit = orgunit.getName();

=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/outcoming/ShowSendSMSFormAction.java'
--- dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/outcoming/ShowSendSMSFormAction.java	2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/outcoming/ShowSendSMSFormAction.java	2013-09-11 13:46:35 +0000
@@ -43,9 +43,7 @@
 
 /**
  * @author Dang Duy Hieu
- * @version $Id$
  */
-
 public class ShowSendSMSFormAction
     implements Action
 {

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/ShowRunValidationFormAction.java'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/ShowRunValidationFormAction.java	2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/ShowRunValidationFormAction.java	2013-09-11 13:46:35 +0000
@@ -43,8 +43,6 @@
 
 /**
  * @author Chau Thu Tran
- * @version $ ShowRunValidationFormAction.java May 31, 2011 11:30:17 AM $
- * 
  */
 public class ShowRunValidationFormAction
     implements Action
@@ -79,7 +77,9 @@
     public void setValidationRuleService( ValidationRuleService validationRuleService )
     {
         this.validationRuleService = validationRuleService;
-    } private List<ValidationRuleGroup> validationRuleGroups;
+    }
+    
+    private List<ValidationRuleGroup> validationRuleGroups;
 
     public List<ValidationRuleGroup> getValidationRuleGroups()
     {