You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by mb...@apache.org on 2011/05/10 23:20:12 UTC
svn commit: r1101647 -
/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/
Author: mbo
Date: Tue May 10 21:20:11 2011
New Revision: 1101647
URL: http://svn.apache.org/viewvc?rev=1101647&view=rev
Log:
Factory class enhancement for MeetingRoom class in package companyAnnotatedFC
Modified:
db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCAppConcrete.java
db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCAppPM.java
db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCDSConcrete.java
db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCDSPM.java
db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedPMFieldClass.java
db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppMeetingRoom.java
db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSMeetingRoom.java
Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCAppConcrete.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCAppConcrete.java?rev=1101647&r1=1101646&r2=1101647&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCAppConcrete.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCAppConcrete.java Tue May 10 21:20:11 2011
@@ -46,6 +46,7 @@ public class CompanyFactoryAnnotatedFCAp
FCAppFullTimeEmployee.class,
FCAppProject.class,
FCAppDepartment.class,
+ FCAppMeetingRoom.class,
FCAppCompany.class,
FCAppAddress.class
};
@@ -56,7 +57,7 @@ public class CompanyFactoryAnnotatedFCAp
}
public IMeetingRoom newMeetingRoom() {
- return (IMeetingRoom) null;
+ return (IMeetingRoom) new FCAppMeetingRoom();
}
public ICompany newCompany() {
Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCAppPM.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCAppPM.java?rev=1101647&r1=1101646&r2=1101647&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCAppPM.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCAppPM.java Tue May 10 21:20:11 2011
@@ -46,6 +46,7 @@ public class CompanyFactoryAnnotatedFCAp
FCAppFullTimeEmployee.class,
FCAppProject.class,
FCAppDepartment.class,
+ FCAppMeetingRoom.class,
FCAppCompany.class,
FCAppAddress.class
};
@@ -56,7 +57,7 @@ public class CompanyFactoryAnnotatedFCAp
}
public IMeetingRoom newMeetingRoom() {
- return (IMeetingRoom)null;
+ return (IMeetingRoom)pm.newInstance(FCAppMeetingRoom.class);
}
public ICompany newCompany() {
Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCDSConcrete.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCDSConcrete.java?rev=1101647&r1=1101646&r2=1101647&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCDSConcrete.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCDSConcrete.java Tue May 10 21:20:11 2011
@@ -46,6 +46,7 @@ public class CompanyFactoryAnnotatedFCDS
FCDSFullTimeEmployee.class,
FCDSProject.class,
FCDSDepartment.class,
+ FCDSMeetingRoom.class,
FCDSCompany.class,
FCDSAddress.class
};
@@ -56,7 +57,7 @@ public class CompanyFactoryAnnotatedFCDS
}
public IMeetingRoom newMeetingRoom() {
- return (IMeetingRoom)null;
+ return (IMeetingRoom) new FCDSMeetingRoom();
}
public ICompany newCompany() {
Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCDSPM.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCDSPM.java?rev=1101647&r1=1101646&r2=1101647&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCDSPM.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCDSPM.java Tue May 10 21:20:11 2011
@@ -46,6 +46,7 @@ public class CompanyFactoryAnnotatedFCDS
FCDSFullTimeEmployee.class,
FCDSProject.class,
FCDSDepartment.class,
+ FCDSMeetingRoom.class,
FCDSCompany.class,
FCDSAddress.class
};
@@ -56,7 +57,7 @@ public class CompanyFactoryAnnotatedFCDS
}
public IMeetingRoom newMeetingRoom() {
- return (IMeetingRoom)null;
+ return (IMeetingRoom)pm.newInstance(FCDSMeetingRoom.class);
}
public ICompany newCompany() {
Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedPMFieldClass.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedPMFieldClass.java?rev=1101647&r1=1101646&r2=1101647&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedPMFieldClass.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedPMFieldClass.java Tue May 10 21:20:11 2011
@@ -36,6 +36,7 @@ public class CompanyFactoryAnnotatedPMFi
Class fullTimeEmployeeClass = null;
Class projectClass = null;
Class departmentClass = null;
+ Class meetingRoomClass = null;
Class companyClass = null;
/**
@@ -58,6 +59,8 @@ public class CompanyFactoryAnnotatedPMFi
org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppProject.class;
departmentClass =
org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppDepartment.class;
+ meetingRoomClass =
+ org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppMeetingRoom.class;
companyClass =
org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppCompany.class;
} else { //datastoreidentity
@@ -75,6 +78,8 @@ public class CompanyFactoryAnnotatedPMFi
org.apache.jdo.tck.pc.companyAnnotatedFC.FCDSProject.class;
departmentClass =
org.apache.jdo.tck.pc.companyAnnotatedFC.FCDSDepartment.class;
+ meetingRoomClass =
+ org.apache.jdo.tck.pc.companyAnnotatedFC.FCDSMeetingRoom.class;
companyClass =
org.apache.jdo.tck.pc.companyAnnotatedFC.FCDSCompany.class;
}
@@ -89,6 +94,7 @@ public class CompanyFactoryAnnotatedPMFi
fullTimeEmployeeClass,
projectClass,
departmentClass,
+ meetingRoomClass,
companyClass
};
}
@@ -98,7 +104,7 @@ public class CompanyFactoryAnnotatedPMFi
}
public IMeetingRoom newMeetingRoom() {
- return (IMeetingRoom)null;
+ return (IMeetingRoom)pm.newInstance(meetingRoomClass);
}
public ICompany newCompany() {
Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppMeetingRoom.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppMeetingRoom.java?rev=1101647&r1=1101646&r2=1101647&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppMeetingRoom.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppMeetingRoom.java Tue May 10 21:20:11 2011
@@ -15,13 +15,14 @@
* limitations under the License.
*/
-package org.apache.jdo.tck.pc.company;
+package org.apache.jdo.tck.pc.companyAnnotatedFC;
import javax.jdo.annotations.*;
import java.io.Serializable;
import java.util.Comparator;
+import org.apache.jdo.tck.pc.company.IMeetingRoom;
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSMeetingRoom.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSMeetingRoom.java?rev=1101647&r1=1101646&r2=1101647&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSMeetingRoom.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSMeetingRoom.java Tue May 10 21:20:11 2011
@@ -15,13 +15,14 @@
* limitations under the License.
*/
-package org.apache.jdo.tck.pc.company;
+package org.apache.jdo.tck.pc.companyAnnotatedFC;
import javax.jdo.annotations.*;
import java.io.Serializable;
import java.util.Comparator;
+import org.apache.jdo.tck.pc.company.IMeetingRoom;
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;