ordweb-pos407

[<whe...@us...>]

Update of /cvsroot/ordweb/uop/pos407/wayneh/week4
In directory sc8-pr-cvs1:/tmp/cvs-serv31936

Modified Files:
	ThrowEmployee.java Employee.java EmployeeException.java 
Log Message:
working application

Index: ThrowEmployee.java
===================================================================
RCS file: /cvsroot/ordweb/uop/pos407/wayneh/week4/ThrowEmployee.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ThrowEmployee.java	24 Jul 2003 18:11:47 -0000	1.2
--- ThrowEmployee.java	24 Jul 2003 18:31:19 -0000	1.3
***************
*** 18,29 ****
  public class ThrowEmployee {
  
! 	public static void main(String[] args) {
  		try
  		{
! 			Employee firstEmp = new Employee(1234,6.00);
  			Employee secondEmp = new Employee(2468,10.00);
! 			Employee thirdEmp = new Employee(3690,50.00);
  		}
! 		catch(EmployeeException error)
  		{
  			System.out.println("Employee error: "+ error.getMessage());
--- 18,31 ----
  public class ThrowEmployee {
  
! 	public static void main(String[] args) throws Exception {
! 		System.out.println("Creating employees");
! 		
  		try
  		{
! 			Employee firstEmp = new Employee(1234,4.00);
  			Employee secondEmp = new Employee(2468,10.00);
! 			Employee thirdEmp = new Employee(3690,60.00);
  		}
! 		catch (EmployeeException error)
  		{
  			System.out.println("Employee error: "+ error.getMessage());

Index: Employee.java
===================================================================
RCS file: /cvsroot/ordweb/uop/pos407/wayneh/week4/Employee.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Employee.java	24 Jul 2003 18:11:47 -0000	1.2
--- Employee.java	24 Jul 2003 18:31:19 -0000	1.3
***************
*** 20,26 ****
  		
  		if (inWage < 6.00) {
! 			String sTemp = "Error in employee" + inNum;	
  			 throw (new EmployeeException(sTemp)); 
  		}
  	}
  }
--- 20,32 ----
  		
  		if (inWage < 6.00) {
! 			 String sTemp = "Error in employee " + inNum;	
  			 throw (new EmployeeException(sTemp)); 
  		}
+ 		if (inWage > 50.00)
+ 		{
+ 			String sTemp = "Error in employee " + inNum;
+ 			throw (new EmployeeException(sTemp));
+ 		}
+ 		System.out.println("Employee " + idNum + " created. Salary: " + hourlyWage);
  	}
  }

Index: EmployeeException.java
===================================================================
RCS file: /cvsroot/ordweb/uop/pos407/wayneh/week4/EmployeeException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EmployeeException.java	24 Jul 2003 18:11:47 -0000	1.1
--- EmployeeException.java	24 Jul 2003 18:31:19 -0000	1.2
***************
*** 1,5 ****
!  public class EmployeeException extends Exception
  {
! 	public EmployeeException(String s)
  	{
  		super(s);
--- 1,5 ----
!  class EmployeeException extends Exception
  {
! 	EmployeeException(String s)
  	{
  		super(s);