treebase-guts

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

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

Revision: 580
          http://treebase.svn.sourceforge.net/treebase/?rev=580&view=rev
Author:   rvos
Date:     2010-03-15 01:15:19 +0000 (Mon, 15 Mar 2010)

Log Message:
-----------
Added getLabel() for nexml and rdf serialization.

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

Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/domain/taxon/TaxonVariant.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/domain/taxon/TaxonVariant.java	2010-03-15 01:14:39 UTC (rev 579)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/domain/taxon/TaxonVariant.java	2010-03-15 01:15:19 UTC (rev 580)
@@ -9,6 +9,7 @@
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 import org.hibernate.annotations.BatchSize;
 import org.hibernate.annotations.Cache;
@@ -169,4 +170,9 @@
 	public void setTB1LegacyId(Integer legacyId) {
 		mTB1LegacyId = legacyId;
 	}
+	
+	@Transient
+	public String getLabel() {
+		return getFullName();
+	}
 }


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

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

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

Revision: 601
          http://treebase.svn.sourceforge.net/treebase/?rev=601&view=rev
Author:   rvos
Date:     2010-03-16 16:50:12 +0000 (Tue, 16 Mar 2010)

Log Message:
-----------
Set FetchMode to JOIN to prevent lazy initialization exceptions.

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

Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/domain/taxon/TaxonVariant.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/domain/taxon/TaxonVariant.java	2010-03-16 16:49:19 UTC (rev 600)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/domain/taxon/TaxonVariant.java	2010-03-16 16:50:12 UTC (rev 601)
@@ -14,6 +14,8 @@
 import org.hibernate.annotations.BatchSize;
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
+import org.hibernate.annotations.Fetch;
+import org.hibernate.annotations.FetchMode;
 import org.hibernate.annotations.Index;
 
 import org.cipres.treebase.domain.AbstractPersistedObject;
@@ -151,6 +153,7 @@
 	@ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.MERGE, CascadeType.PERSIST})
 	@JoinColumn(name = "TAXON_ID", nullable = false)
 	@Index(name = "TVARI_TAXON_IDX")
+	@Fetch(FetchMode.JOIN)
 	public Taxon getTaxon() {
 		return mTaxon;
 	}


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

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

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

Revision: 713
          http://treebase.svn.sourceforge.net/treebase/?rev=713&view=rev
Author:   rvos
Date:     2010-06-04 11:25:52 +0000 (Fri, 04 Jun 2010)

Log Message:
-----------
Adding annotation of tb:identifier.taxonVariant.tb1

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

Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/domain/taxon/TaxonVariant.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/domain/taxon/TaxonVariant.java	2010-06-04 11:25:16 UTC (rev 712)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/domain/taxon/TaxonVariant.java	2010-06-04 11:25:52 UTC (rev 713)
@@ -1,6 +1,8 @@
 
 package org.cipres.treebase.domain.taxon;
 
+import java.util.List;
+
 import javax.persistence.AttributeOverride;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -18,7 +20,9 @@
 import org.hibernate.annotations.FetchMode;
 import org.hibernate.annotations.Index;
 
+import org.cipres.treebase.Constants;
 import org.cipres.treebase.domain.AbstractPersistedObject;
+import org.cipres.treebase.domain.Annotation;
 import org.cipres.treebase.domain.TBPersistable;
 
 /**
@@ -178,4 +182,17 @@
 	public String getLabel() {
 		return getFullName();
 	}
+	
+	@Transient
+	public List<Annotation> getAnnotations() {
+		List<Annotation> annotations = super.getAnnotations();
+		try {
+			if ( null != getTB1LegacyId() ) {
+				annotations.add(new Annotation(Constants.TBTermsURI, "tb:identifier.taxonVariant.tb1", getTB1LegacyId()));
+			}
+		} catch ( Exception e ) {
+			e.printStackTrace();
+		}
+		return annotations;
+	}	
 }


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