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

[<yo...@us...>]

Revision: 680
          http://treebase.svn.sourceforge.net/treebase/?rev=680&view=rev
Author:   youjun
Date:     2010-04-08 19:37:09 +0000 (Thu, 08 Apr 2010)

Log Message:
-----------
avoid using sub_taxonlabel table

Modified Paths:
--------------
    trunk/treebase-core/src/main/java/org/cipres/treebase/domain/taxon/TaxonLabel.java

Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/domain/taxon/TaxonLabel.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/domain/taxon/TaxonLabel.java	2010-04-07 20:33:07 UTC (rev 679)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/domain/taxon/TaxonLabel.java	2010-04-08 19:37:09 UTC (rev 680)
@@ -58,7 +58,7 @@
 
 	private TaxonVariant mTaxonVariant;
 	private Study mStudy;
-	private Submission mSubmission;
+	//private Submission mSubmission;
     private Set<TaxonLabelSet> mTaxonLabelSet;  
 	/**
 	 * Constructor.
@@ -174,29 +174,34 @@
 	}
 	
 	/**
-	 * Return the submission this taxonLabel inhabits
-	 * 
-	 * @return the submission
-	 * @author mjd 20080929
-	 * modified by Youjun
-	 */
-	@ManyToOne(cascade = {CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH})
-	@JoinTable(name = "sub_taxonlabel", 
-			joinColumns = @JoinColumn(name = "taxonlabel_id"),
-	        inverseJoinColumns = @JoinColumn(name="submission_id")
+	  * Return the submission this taxonLabel inhabits
+	  *
+	  * @return the submission
+	  * @author mjd 20080929
+	  */
+	  @Transient
+	  public Submission getSubmission() {
+	  	Study s = getStudy();
+	  	return s == null ? null : s.getSubmission();
+	  }
+	  
+	//@ManyToOne(cascade = {CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH})
+	//@JoinTable(name = "sub_taxonlabel", 
+	//		joinColumns = @JoinColumn(name = "taxonlabel_id"),
+	//        inverseJoinColumns = @JoinColumn(name="submission_id")
 
-	)
-	public Submission getSubmission() {
+	//)
+	//public Submission getSubmission() {
 		
-		return mSubmission;		
-	}
+	//	return mSubmission;		
+	//}
 
 	/**
 	 * Set the Submission field.
 	 */
-	public void setSubmission(Submission pNewSubmission) {
-		mSubmission = pNewSubmission;
-	}
+	//public void setSubmission(Submission pNewSubmission) {
+	//	mSubmission = pNewSubmission;
+	//}
 	
 	
 	/**


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