From e8b0679ed1b471e3165689a8270559fc03ceb2ee Mon Sep 17 00:00:00 2001 From: Pinaki Poddar Date: Fri, 21 May 2010 00:30:21 +0000 Subject: [PATCH] Resolve conflicted file git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@946836 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/openbook/domain/PurchaseOrder.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/openjpa-examples/openbooks/src/main/java/openbook/domain/PurchaseOrder.java b/openjpa-examples/openbooks/src/main/java/openbook/domain/PurchaseOrder.java index 5e39d0b23..7939f904d 100644 --- a/openjpa-examples/openbooks/src/main/java/openbook/domain/PurchaseOrder.java +++ b/openjpa-examples/openbooks/src/main/java/openbook/domain/PurchaseOrder.java @@ -59,15 +59,11 @@ import javax.persistence.TemporalType; @SuppressWarnings("serial") @Entity public class PurchaseOrder implements Serializable { -<<<<<<< .mine /** * Enumerates the status of a Purchase Order. * */ public enum Status {PENDING, DELIVERED}; -======= - public enum Status {PENDING, DELIVERED}; ->>>>>>> .r946807 @Id @GeneratedValue @@ -156,14 +152,9 @@ public class PurchaseOrder implements Serializable { public void setDelivered() { if (this.status == Status.DELIVERED) throw new IllegalStateException(this + " has been delivered"); -<<<<<<< .mine this.status = Status.DELIVERED; this.deliveredOn = new Timestamp(System.currentTimeMillis()); this.items = null; -======= - this.status = Status.DELIVERED; - this.deliveredOn = new Time(System.currentTimeMillis()); ->>>>>>> .r946807 } /**