[Hibernate-commits] HibernateExt/metadata/src/test/org/hibernate/test/annotations/embedded NotonialDeal.java,NONE,1.1 Deal.java,1.4,1.5 SpreadDeal.java,1.1,1.2

[<epb...@us...>]

Update of /cvsroot/hibernate/HibernateExt/metadata/src/test/org/hibernate/test/annotations/embedded
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7473/metadata/src/test/org/hibernate/test/annotations/embedded

Modified Files:
	Deal.java SpreadDeal.java 
Added Files:
	NotonialDeal.java 
Log Message:
ANN-240 complete rework to embed overriding mechanism inside property holder

--- NEW FILE: NotonialDeal.java ---
//$Id: NotonialDeal.java,v 1.1 2006/02/14 18:40:31 epbernard Exp $
package org.hibernate.test.annotations.embedded;

import javax.persistence.AttributeOverrides;
import javax.persistence.AttributeOverride;
import javax.persistence.Column;
import javax.persistence.MappedSuperclass;

/**
 * @author Emmanuel Bernard
 */
@AttributeOverrides(value={
		@AttributeOverride(name="swap.tenor", column=@Column(name="TENOR")), //should be ovvriden by deal
		@AttributeOverride(name="id", column=@Column(name="NOTONIALDEAL_ID"))
})
@MappedSuperclass
public class NotonialDeal  extends Deal {
	/**
	 * Notional amount of both IRSs.
	 */
	private double notional;

	public double getNotional() {
		return notional;
	}

	public void setNotional(double notional) {
		this.notional = notional;
	}
}

Index: Deal.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/metadata/src/test/org/hibernate/test/annotations/embedded/Deal.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Deal.java	5 Jan 2006 13:49:51 -0000	1.4
+++ Deal.java	14 Feb 2006 18:40:31 -0000	1.5
@@ -15,19 +15,6 @@
 	 */
 	private String id;
 
-	/**
-	 * Notional amount of both IRSs.
-	 */
-	private double notional;
-
-	public double getNotional() {
-		return notional;
-	}
-
-	public void setNotional(double notional) {
-		this.notional = notional;
-	}
-
 	@Id
 	public String getId() {
 		return id;

Index: SpreadDeal.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/metadata/src/test/org/hibernate/test/annotations/embedded/SpreadDeal.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SpreadDeal.java	2 Sep 2005 17:23:15 -0000	1.1
+++ SpreadDeal.java	14 Feb 2006 18:40:31 -0000	1.2
@@ -20,7 +20,7 @@
 		@AttributeOverride(name="swap.floatLeg.rateIndex", column=@Column(name="MEDIUM_FLOAT_RATEINDEX")),
 		@AttributeOverride(name="swap.floatLeg.rateSpread", column=@Column(name="MEDIUM_FLOAT_RATESPREAD"))
 })
-public class SpreadDeal extends Deal {
+public class SpreadDeal extends NotonialDeal {
 
 	/**
 	 * Swap with the tenor.