db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c..@apache.org
Subject svn commit: r191206 - in /incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company: Company.java Employee.java FullTimeEmployee.java PartTimeEmployee.java Person.java
Date Fri, 17 Jun 2005 21:14:32 GMT
Author: clr
Date: Fri Jun 17 14:14:31 2005
New Revision: 191206

URL: http://svn.apache.org/viewcvs?rev=191206&view=rev
Log:
JDO-73 added constructors that don't require Address

Modified:
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Company.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Employee.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/FullTimeEmployee.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/PartTimeEmployee.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Person.java

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Company.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Company.java?rev=191206&r1=191205&r2=191206&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Company.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Company.java Fri Jun
17 14:14:31 2005
@@ -48,12 +48,22 @@
      * @param companyid The company id.
      * @param name The company name.
      * @param founded The date the company was founded.
-     * @param addr The company's address.
      */
-    public Company(long companyid, String name, Date founded, Address addr) {
+    public Company(long companyid, String name, Date founded) {
         this.companyid = companyid;
         this.name = name;
         this.founded = founded;
+    }
+
+    /** 
+     * Initialize the <code>Company</code> instance.
+     * @param companyid The company id.
+     * @param name The company name.
+     * @param founded The date the company was founded.
+     * @param addr The company's address.
+     */
+    public Company(long companyid, String name, Date founded, Address addr) {
+        this(companyid, name, founded);
         this.address = addr;
     }
 

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Employee.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Employee.java?rev=191206&r1=191205&r2=191206&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Employee.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Employee.java Fri Jun
17 14:14:31 2005
@@ -57,6 +57,22 @@
      * @param lastname The last name of the employee.
      * @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.
+     */
+    public Employee(long personid, String firstname, String lastname, 
+                    String middlename, Date birthdate,
+                    Date hiredate) {
+        super(personid, firstname, lastname, middlename, birthdate);
+        this.hiredate = hiredate;
+    }
+
+    /**
+     * Initialize an <code>Employee</code> instance.
+     * @param personid The identifier for the person.
+     * @param firstname The first name of the employee.
+     * @param lastname The last name of the employee.
+     * @param middlename The middle name of the employee.
+     * @param birthdate The birth date of the employee.
      * @param address The address of the employee.
      * @param hiredate The date that the employee was hired.
      */

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/FullTimeEmployee.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/FullTimeEmployee.java?rev=191206&r1=191205&r2=191206&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/FullTimeEmployee.java
(original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/FullTimeEmployee.java
Fri Jun 17 14:14:31 2005
@@ -38,6 +38,23 @@
      * @param last The person's last name.
      * @param middle The person's middle name.
      * @param born The person's birthdate.
+     * @param hired The date that the person was hired.
+     * @param sal The salary of the full-time employee.
+     */
+    public FullTimeEmployee(long personid, String first, String last,
+                            String middle, Date born,
+                            Date hired, double sal) {
+        super(personid, first, last, middle, born, hired);
+        salary = sal;
+    }
+
+    /**
+     * Initialize a full-time employee.
+     * @param personid The person identifier.
+     * @param first The person's first name.
+     * @param last The person's last name.
+     * @param middle The person's middle name.
+     * @param born The person's birthdate.
      * @param addr The person's address.
      * @param hired The date that the person was hired.
      * @param sal The salary of the full-time employee.

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/PartTimeEmployee.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/PartTimeEmployee.java?rev=191206&r1=191205&r2=191206&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/PartTimeEmployee.java
(original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/PartTimeEmployee.java
Fri Jun 17 14:14:31 2005
@@ -37,6 +37,23 @@
      * @param last The person's last name.
      * @param middle The person's middle name.
      * @param born The person's birthdate.
+     * @param hired The date the person was hired.
+     * @param wage The person's wage.
+     */
+    public PartTimeEmployee(long personid, String first, String last,
+                            String middle, Date born,
+                            Date hired, double wage ) {
+        super(personid, first, last, middle, born, hired);
+        this.wage = wage;
+    }
+
+    /**
+     * Initialize a part-time employee.
+     * @param personid The identifier for the person.
+     * @param first The person's first name.
+     * @param last The person's last name.
+     * @param middle The person's middle name.
+     * @param born The person's birthdate.
      * @param addr The person's address.
      * @param hired The date the person was hired.
      * @param wage The person's wage.

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Person.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Person.java?rev=191206&r1=191205&r2=191206&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Person.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Person.java Fri Jun
17 14:14:31 2005
@@ -59,16 +59,29 @@
      * @param lastname The person's last name.
      * @param middlename The person's middle name.
      * @param birthdate The person's birthdate.
-     * @param address The person's address.
      */
     public Person(long personid, String firstname, String lastname, 
-                  String middlename, Date birthdate, Address address) {
+                  String middlename, Date birthdate) {
         this.personid = personid;
         this.firstname = firstname;
         this.lastname = lastname;
         this.middlename = middlename;
-        this.address = address;
         this.birthdate = birthdate;
+    }
+
+    /**
+     * Initialize a <code>Person</code> instance.
+     * @param personid The person identifier.
+     * @param firstname The person's first name.
+     * @param lastname The person's last name.
+     * @param middlename The person's middle name.
+     * @param birthdate The person's birthdate.
+     * @param address The person's address.
+     */
+    public Person(long personid, String firstname, String lastname, 
+                  String middlename, Date birthdate, Address address) {
+        this(personid, firstname, lastname, middlename, birthdate);
+        this.address = address;
     }
 
     /**



Mime
View raw message