Index: src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyFactoryAbstractImpl.java =================================================================== --- src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyFactoryAbstractImpl.java (Revision 466638) +++ src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyFactoryAbstractImpl.java (Arbeitskopie) @@ -87,6 +87,7 @@ result.setMiddlename(middle); result.setBirthdate(born); result.setHiredate(hired); + result.setRole(role); result.setSalary(sal); return result; } @@ -102,6 +103,7 @@ result.setMiddlename(middle); result.setBirthdate(born); result.setHiredate(hired); + result.setRole(role); result.setWage(wage); return result; } Index: src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Employee.java =================================================================== --- src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Employee.java (Revision 466638) +++ src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Employee.java (Arbeitskopie) @@ -56,6 +56,7 @@ * @param middlename The middle name of the employee. * @param birthdate The birth date of the employee. * @param hiredate The date that the employee was hired. + * @param role The role of the employee. */ public Employee(long personid, String firstname, String lastname, String middlename, Date birthdate, @@ -98,7 +99,23 @@ this.weeklyhours = weeklyhours; } + /** + * Get the role of the employee. + * @return The role of th employee. + */ + public String getRole() { + return role; + } + /** + * Set the role of the employee. + * @param role The role of the employee. + */ + public void setRole(String role) { + this.role=role; + } + + /** * Get the employee's department. * @return The department associated with the employee. */ @@ -303,6 +320,7 @@ rc.append(super.getFieldRepr()); rc.append(", hired ").append(formatter.format(hiredate)); rc.append(", weeklyhours ").append(weeklyhours); + rc.append(", role ").append(role); return rc.toString(); } @@ -324,6 +342,7 @@ return super.deepCompareFields(otherEmp, helper) & helper.equals(hiredate, otherEmp.getHiredate(), where + ".hiredate") & helper.closeEnough(weeklyhours, otherEmp.getWeeklyhours(), where + ".weeklyhours") & + helper.equals(role, otherEmp.getRole(), where + ".role") & helper.deepEquals(department, otherEmp.getDepartment(), where + ".department") & helper.deepEquals(fundingDept, otherEmp.getFundingDept(), where + ".fundingDept") & helper.deepEquals(manager, otherEmp.getManager(), where + ".manager") & Index: src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/IEmployee.java =================================================================== --- src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/IEmployee.java (Revision 466638) +++ src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/IEmployee.java (Arbeitskopie) @@ -28,6 +28,7 @@ Date getHiredate(); double getWeeklyhours(); + String getRole(); IDepartment getDepartment(); IDepartment getFundingDept(); IEmployee getManager(); @@ -39,6 +40,7 @@ void setHiredate(Date hiredate); void setWeeklyhours(double weeklyhours); + void setRole(String role); void setDepartment(IDepartment department); void setFundingDept(IDepartment department); void setManager(IEmployee manager);