[jboss-svn-commits] JBL Code SVN: r29521 - in labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943: model and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Oct 1 12:56:46 EDT 2009
Author: whitingjr
Date: 2009-10-01 12:56:46 -0400 (Thu, 01 Oct 2009)
New Revision: 29521
Modified:
labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943/entitymanager/STMEntityManagerFactoryImpl.java
labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943/model/BankAccountEntity.java
labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943/model/BankEntity.java
labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943/model/Bike.java
labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943/model/Car.java
labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943/model/Flight.java
labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943/model/LeccyCar.java
Log:
Updated entities.
Changed datastructure.
Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943/entitymanager/STMEntityManagerFactoryImpl.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943/entitymanager/STMEntityManagerFactoryImpl.java 2009-10-01 16:56:05 UTC (rev 29520)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943/entitymanager/STMEntityManagerFactoryImpl.java 2009-10-01 16:56:46 UTC (rev 29521)
@@ -68,7 +68,7 @@
else
{
isOpen = false;
- persisteMemoryStoreToDisk();
+ //persisteMemoryStoreToDisk();
}
}
Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943/model/BankAccountEntity.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943/model/BankAccountEntity.java 2009-10-01 16:56:05 UTC (rev 29520)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943/model/BankAccountEntity.java 2009-10-01 16:56:46 UTC (rev 29521)
@@ -32,4 +32,28 @@
{
return id;
}
+ @Override
+ public boolean equals(Object obj)
+ {
+ boolean returnValue = false;
+ if (null != obj)
+ {
+ if (this == obj)
+ {
+ returnValue = true;
+ }
+ else
+ {
+ if (this.getClass().isInstance(obj))
+ {
+ BankAccountEntity that = BankAccountEntity.class.cast(obj);
+ if (this.getId().longValue() == that.getId().longValue())
+ {
+ returnValue = true;
+ }
+ }
+ }
+ }
+ return returnValue;
+ }
}
Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943/model/BankEntity.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943/model/BankEntity.java 2009-10-01 16:56:05 UTC (rev 29520)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943/model/BankEntity.java 2009-10-01 16:56:46 UTC (rev 29521)
@@ -46,5 +46,29 @@
{
return id;
}
-
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ boolean returnValue = false;
+ if (null != obj)
+ {
+ if (this == obj)
+ {
+ returnValue = true;
+ }
+ else
+ {
+ if (this.getClass().isInstance(obj))
+ {
+ BankEntity that = BankEntity.class.cast(obj);
+ if (this.getId().longValue() == that.getId().longValue())
+ {
+ returnValue = true;
+ }
+ }
+ }
+ }
+ return returnValue;
+ }
}
Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943/model/Bike.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943/model/Bike.java 2009-10-01 16:56:05 UTC (rev 29520)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943/model/Bike.java 2009-10-01 16:56:46 UTC (rev 29521)
@@ -40,6 +40,31 @@
return id;
}
+ @Override
+ public boolean equals(Object obj)
+ {
+ boolean returnValue = false;
+ if (null != obj)
+ {
+ if (this == obj)
+ {
+ returnValue = true;
+ }
+ else
+ {
+ if (this.getClass().isInstance(obj))
+ {
+ Bike that = Bike.class.cast(obj);
+ if (this.getId().longValue() == that.getId().longValue())
+ {
+ returnValue = true;
+ }
+ }
+ }
+ }
+ return returnValue;
+ }
+
}
Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943/model/Car.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943/model/Car.java 2009-10-01 16:56:05 UTC (rev 29520)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943/model/Car.java 2009-10-01 16:56:46 UTC (rev 29521)
@@ -36,4 +36,29 @@
this.id = identity;
}
+ @Override
+ public boolean equals(Object obj)
+ {
+ boolean returnValue = false;
+ if (null != obj)
+ {
+ if (this == obj)
+ {
+ returnValue = true;
+ }
+ else
+ {
+ if (this.getClass().isInstance(obj))
+ {
+ Car that = Car.class.cast(obj);
+ if (this.getId().longValue() == that.getId().longValue())
+ {
+ returnValue = true;
+ }
+ }
+ }
+ }
+ return returnValue;
+ }
+
}
Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943/model/Flight.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943/model/Flight.java 2009-10-01 16:56:05 UTC (rev 29520)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943/model/Flight.java 2009-10-01 16:56:46 UTC (rev 29521)
@@ -7,29 +7,62 @@
import uk.ac.ncl.sdia.a8905943.aspects.annotation.STMReadable;
import uk.ac.ncl.sdia.a8905943.aspects.annotation.STMWriteable;
import uk.ac.ncl.sdia.a8905943.stm.annotation.STMEntity;
-
- @STMEntity
- public class Flight implements Serializable {
- @Id
- private java.lang.Long id;
- private String airlineName;
- public Long getId() {
- return this.id;
+
+ at STMEntity
+public class Flight implements Serializable
+{
+ @Id
+ private java.lang.Long id;
+ private String airlineName;
+
+ public Long getId()
+ {
+ return this.id;
+ }
+
+ @STMReadable
+ public String getAirlineName()
+ {
+ return this.airlineName;
+ }
+
+ @STMWriteable
+ public void setAirline(String airline)
+ {
+ this.airlineName = airline;
+ }
+
+ public Flight()
+ {
+ super();
+ String query = "model/uk.ac.ncl.sdia.a8905943.model.Flight[airlineName='British Airways']";
+ }
+
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ boolean returnValue = false;
+ if (null != obj)
+ {
+ if (this == obj)
+ {
+ returnValue = true;
+ }
+ else
+ {
+ if (this.getClass().isInstance(obj))
+ {
+ Flight that = Flight.class.cast(obj);
+ if (this.getId().longValue() == that.getId().longValue())
+ {
+ returnValue = true;
+ }
+ }
+ }
}
- @STMReadable public String getAirlineName() {
- return this.airlineName;
- }
- @STMWriteable public void setAirline(String airline) {
- this.airlineName = airline;
- }
-
-
-
- public Flight() {
- super();
- String query = "model/uk.ac.ncl.sdia.a8905943.model.Flight[airlineName='British Airways']";
- }
- /** The serialVersionUID */
- private static final long serialVersionUID = 1L;
-
+ return returnValue;
+ }
}
Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943/model/LeccyCar.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943/model/LeccyCar.java 2009-10-01 16:56:05 UTC (rev 29520)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943/model/LeccyCar.java 2009-10-01 16:56:46 UTC (rev 29521)
@@ -45,6 +45,31 @@
{
this.name = name;
}
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ boolean returnValue = false;
+ if (null != obj)
+ {
+ if (this == obj)
+ {
+ returnValue = true;
+ }
+ else
+ {
+ if (this.getClass().isInstance(obj))
+ {
+ LeccyCar that = LeccyCar.class.cast(obj);
+ if (this.getId().longValue() == that.getId().longValue())
+ {
+ returnValue = true;
+ }
+ }
+ }
+ }
+ return returnValue;
+ }
}
More information about the jboss-svn-commits
mailing list