Author: ppoddar
Date: Fri May 21 00:30:21 2010
New Revision: 946836
URL: http://svn.apache.org/viewvc?rev=946836&view=rev
Log:
Resolve conflicted file
Modified:
openjpa/trunk/openjpa-examples/openbooks/src/main/java/openbook/domain/PurchaseOrder.java
Modified:
openjpa/trunk/openjpa-examples/openbooks/src/main/java/openbook/domain/PurchaseOrder.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/openbooks/src/main/java/openbook/domain/PurchaseOrder.java?rev=946836&r1=946835&r2=946836&view=diff
==============================================================================
---
openjpa/trunk/openjpa-examples/openbooks/src/main/java/openbook/domain/PurchaseOrder.java
(original)
+++
openjpa/trunk/openjpa-examples/openbooks/src/main/java/openbook/domain/PurchaseOrder.java
Fri May 21 00:30:21 2010
@@ -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 Se
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
}
/**
