[Treebase-guts] SF.net SVN: treebase:[1017] trunk/treebase-core/src/main/java/org/cipres/ treebase/domain

[<rv...@us...>]

Revision: 1017
          http://treebase.svn.sourceforge.net/treebase/?rev=1017&view=rev
Author:   rvos
Date:     2012-01-20 14:04:31 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
Forgot to set the @Transient annotation on the getStudy() method in these. Hopefully this addresses the build issues.

Modified Paths:
--------------
    trunk/treebase-core/src/main/java/org/cipres/treebase/domain/AbstractPersistedObject.java
    trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/DistanceMatrixElement.java

Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/domain/AbstractPersistedObject.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/domain/AbstractPersistedObject.java	2012-01-20 01:47:48 UTC (rev 1016)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/domain/AbstractPersistedObject.java	2012-01-20 14:04:31 UTC (rev 1017)
@@ -170,6 +170,7 @@
 	 * (non-Javadoc)
 	 * @see org.cipres.treebase.domain.TBPersistable#getStudy()
 	 */
+	@Transient
 	public Study getStudy() {
 		return null;
 	}

Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/DistanceMatrixElement.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/DistanceMatrixElement.java	2012-01-20 01:47:48 UTC (rev 1016)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/DistanceMatrixElement.java	2012-01-20 14:04:31 UTC (rev 1017)
@@ -7,6 +7,7 @@
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
@@ -115,6 +116,7 @@
 		mMatrix = pNewMatrix;
 	}
 	
+	@Transient
 	public Study getStudy() {
 		return getMatrix().getStudy();
 	}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.