Changeset 2604

Timestamp:

Aug 29, 2006, 3:59:37 PM (17 years ago)

Author:

dominic

Message:

Removed category duplication

Location:

branches/dominic_annotations/src/core/net/sf/basedb/core/data

Files:

• AnnotationTypeCategoryData.java (modified) (1 diff)
• AnnotationTypeData.java (modified) (2 diffs)

branches/dominic_annotations/src/core/net/sf/basedb/core/data/AnnotationTypeCategoryData.java

@@ -47 +47 @@
     This is the inverse end.
     @see AnnotationTypeData#getCategories()
-    @hibernate.set table="`CategorisedAnnotationTypes`" lazy="true" 
+    @hibernate.set table="`CategorisedAnnotationTypes`" lazy="true" inverse="true" 
     @hibernate.collection-key column="`category_id`"
     @hibernate.collection-many-to-many column="`annotationtype_id`" class="net.sf.basedb.core.data.AnnotationTypeData"
   */
-  public Set<AnnotationTypeData> getAnnotationTypes() 
+  Set<AnnotationTypeData> getAnnotationTypes() 
   {
     return annotationTypes;

branches/dominic_annotations/src/core/net/sf/basedb/core/data/AnnotationTypeData.java

@@ -206 +206 @@
   
   
-  private Set<AnnotationTypeCategoryData> category;
+  private Set<AnnotationTypeCategoryData> categories;
   /**
     Many to many from  AnnotationTypes to AnnotationTypeCategory. 
-    This is the inverse end
     @hibernate.set table="`CategorisedAnnotationTypes`" lazy="true"
     @hibernate.collection-key column="`annotationtype_id`"
@@ -215 +214 @@
    */
   
-  public Set<AnnotationTypeCategoryData> getCategory() {
-    if ( category==null)
+  public Set<AnnotationTypeCategoryData> getCategories() {
+    if ( categories==null)
     {
-      category= new HashSet<AnnotationTypeCategoryData>();
+      categories= new HashSet<AnnotationTypeCategoryData>();
     }
-    return category;
-  }
-  
-  void setCategory(Set<AnnotationTypeCategoryData> category) {
-    this.category = category;
+    return categories;
+  }
+  
+  void setCategory(Set<AnnotationTypeCategoryData> categories) {
+    this.categories = categories;
   }