[jboss-cvs] JBossAS SVN: r66610 - in projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service: util and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: newtonm
Date: 2007-10-31 09:35:05 -0400 (Wed, 31 Oct 2007)
New Revision: 66610

Modified:
   projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/HRManager.java
   projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/util/AgeBasedSalaryStrategy.java
   projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/util/SalaryStrategy.java
Log:
Added Javadoc and constants.

Modified: projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/HRManager.java
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/HRManager.java	2007-10-31 13:27:34 UTC (rev 66609)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/HRManager.java	2007-10-31 13:35:05 UTC (rev 66610)
@@ -7,7 +7,8 @@
 import org.jboss.example.service.util.SalaryStrategy;
 
 /**
- * An Manager keeps track of a set of employees and their associated salaries.
+ * An HRManager (Human Resource Manager) keeps track
+ * of a set of employees and their associated salaries.
  */
 public class HRManager {
     
@@ -20,7 +21,6 @@
 	private SalaryStrategy salaryStrategy = null;
 	
 	public HRManager() {
-		System.out.println("Hello from the HR manager...");
 		employees =  new ConcurrentHashMap<Employee, Integer>();
  	}
 	

Modified: projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/util/AgeBasedSalaryStrategy.java
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/util/AgeBasedSalaryStrategy.java	2007-10-31 13:27:34 UTC (rev 66609)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/util/AgeBasedSalaryStrategy.java	2007-10-31 13:35:05 UTC (rev 66610)
@@ -12,6 +12,9 @@
 	private int minSalary = 5000;
 	private int maxSalary = 100000;
 	
+	private static final int JUNIOR_MIN_SALARY = 25000;
+	private static final int SENIOR_MIN_SALARY = 50000;
+
 	public Integer checkSalary(Employee employee, Integer salary) {
 		
 		Calendar dateOfBirth = Calendar.getInstance();
@@ -37,12 +40,12 @@
 		}
 
 		// Set minimum salaries depending on the age of the employee
-		if (age >= 21 && age < 30 && salary < 25000) {
-			salary = 25000; 
+		if (age >= 21 && age < 30 && salary < JUNIOR_MIN_SALARY) {
+			salary = JUNIOR_MIN_SALARY; 
 		}
 		
-		if (age >= 30 && age < 50 && salary < 50000) {
-			salary = 50000; 
+		if (age >= 30 && age < 50 && salary < SENIOR_MIN_SALARY) {
+			salary = SENIOR_MIN_SALARY; 
 		}
 		
 		// Apply company-wide ranges

Modified: projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/util/SalaryStrategy.java
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/util/SalaryStrategy.java	2007-10-31 13:27:34 UTC (rev 66609)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/util/SalaryStrategy.java	2007-10-31 13:35:05 UTC (rev 66610)
@@ -2,6 +2,9 @@
 
 import org.jboss.example.service.Employee;
 
+/**
+ * Apply some rules to calculate an employee's minimum and maximum salary. 
+ */
 public interface SalaryStrategy {
 
 	public int getMinSalary();