Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resolve conflicted file 

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@946836 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Pinaki Poddar 2010-05-21 00:30:21 +00:00
parent 9301f42f4f
commit e8b0679ed1
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
openjpa-examples/openbooks/src/main/java/openbook/domain/PurchaseOrder.java
View File

@ -59,15 +59,11 @@ import javax.persistence.TemporalType;
@SuppressWarnings("serial") @SuppressWarnings("serial")
@Entity @Entity
public class PurchaseOrder implements Serializable { public class PurchaseOrder implements Serializable {
<<<<<<< .mine
/** /**
* Enumerates the status of a Purchase Order. * Enumerates the status of a Purchase Order.
* *
*/ */
public enum Status {PENDING, DELIVERED}; public enum Status {PENDING, DELIVERED};
=======
public enum Status {PENDING, DELIVERED};
>>>>>>> .r946807
@Id @Id
@GeneratedValue @GeneratedValue
@ -156,14 +152,9 @@ public class PurchaseOrder implements Serializable {
public void setDelivered() { public void setDelivered() {
if (this.status == Status.DELIVERED) if (this.status == Status.DELIVERED)
throw new IllegalStateException(this + " has been delivered"); throw new IllegalStateException(this + " has been delivered");
<<<<<<< .mine
this.status = Status.DELIVERED; this.status = Status.DELIVERED;
this.deliveredOn = new Timestamp(System.currentTimeMillis()); this.deliveredOn = new Timestamp(System.currentTimeMillis());
this.items = null; this.items = null;
=======
this.status = Status.DELIVERED;
this.deliveredOn = new Time(System.currentTimeMillis());
>>>>>>> .r946807
} }
/** /**