dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2154
committer: Bharath <chbharathk@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2010-11-23 19:37:49 +0530
message:
  Cleaning Manpower module, work in progress
modified:
  local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/employee/GetEmployeeAction.java
  local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/employee/GetEmployeeListAction.java
  local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/employee/ValidateEmployeeAction.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 'local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/employee/GetEmployeeAction.java'
--- local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/employee/GetEmployeeAction.java	2010-11-12 14:18:09 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/employee/GetEmployeeAction.java	2010-11-23 14:07:49 +0000
@@ -52,7 +52,7 @@
     {
         employee = employeeService.getEmployeeByPDSCode( pdsCode );
 
-        if ( employee == null )
+        if( employee == null )
         {
             message = "The Employee with this PDSCode does not exist. Do you want to add new Employee?";
             return INPUT;

=== modified file 'local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/employee/GetEmployeeListAction.java'
--- local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/employee/GetEmployeeListAction.java	2010-11-17 10:49:09 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/employee/GetEmployeeListAction.java	2010-11-23 14:07:49 +0000
@@ -37,9 +37,8 @@
     // Action implementation
     // -------------------------------------------------------------------------
 
-	public String execute()
+    public String execute()
     {
-    	
     	employeeList = new ArrayList<Employee>( employeeService.getAllEmployee() );
     	
         return SUCCESS;

=== modified file 'local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/employee/ValidateEmployeeAction.java'
--- local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/employee/ValidateEmployeeAction.java	2010-10-28 11:40:15 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/employee/ValidateEmployeeAction.java	2010-11-23 14:07:49 +0000
@@ -7,54 +7,53 @@
 import com.opensymphony.xwork2.Action;
 
 public class ValidateEmployeeAction
-implements Action
+    implements Action
 {
-	
-	// -------------------------------------------------------------------------
+
+    // -------------------------------------------------------------------------
     // Dependencies
     // -------------------------------------------------------------------------
 
-	private EmployeeService employeeService;
-	
-	public void setEmployeeService (EmployeeService employeeService)
-	{
-		this.employeeService = employeeService;
-	}
-	
-	// -------------------------------------------------------------------------
+    private EmployeeService employeeService;
+
+    public void setEmployeeService( EmployeeService employeeService )
+    {
+        this.employeeService = employeeService;
+    }
+
+    // -------------------------------------------------------------------------
     // Input/Output
     // -------------------------------------------------------------------------
 
-	private String pdscode;
-	
-	public void setPdscode(String pdscode)
-	{
-		this.pdscode = pdscode;
-	}
-	
-	private I18n i18n;
+    private String pdscode;
+
+    public void setPdscode( String pdscode )
+    {
+        this.pdscode = pdscode;
+    }
+
+    private I18n i18n;
 
     public void setI18n( I18n i18n )
     {
         this.i18n = i18n;
     }
-	
-	private String message;
+
+    private String message;
 
     public String getMessage()
     {
         return message;
     }
-	
-	
-	// -------------------------------------------------------------------------
+
+    // -------------------------------------------------------------------------
     // Action Implementation
     // -------------------------------------------------------------------------
 
-	public String execute()
-	{
-		
-		if ( pdscode != null )
+    public String execute()
+    {
+
+        if ( pdscode != null )
         {
 
             Employee match = employeeService.getEmployeeByPDSCode( pdscode );
@@ -65,11 +64,11 @@
 
                 return ERROR;
             }
-        }  
-		
-		message = "OK";
-		
-		return SUCCESS;
-	}
+        }
+
+        message = "OK";
+
+        return SUCCESS;
+    }
 
 }