Changeset 4432

Timestamp:

Mar 7, 2013, 3:35:16 PM (10 years ago)

Author:

Fredrik Levander

Message:

Refs #800. Added core function for removing biomaterial from file.

File:

• trunk/api/core/src/org/proteios/core/File.java (modified) (1 diff)

trunk/api/core/src/org/proteios/core/File.java

@@ -446 +446 @@
 
 
-  /**
-   * Add a BioMaterial
-   * 
-   * @param bioMaterial The BioMaterial to add to the Set
-   */
-  @SuppressWarnings("unchecked")
-  public void addBioMaterial(BioMaterial bioMaterial)
-  {
-    ((BioMaterialData) bioMaterial.getData()).getFiles()
-      .add(this.getData());
-    getData().getBioMaterials()
-      .add((BioMaterialData) bioMaterial.getData());
-  }
-
-
-  /**
-   * @return Returns the bioMaterials.
-   */
-  @SuppressWarnings("unchecked")
-  public Set<BioMaterial> getBioMaterials()
-      throws ItemNotFoundException, BaseException
-  {
-    Set<BioMaterial> bioMaterials = new HashSet<BioMaterial>();
-    try
-    {
-      Iterator<BioMaterialData> it = getData().getBioMaterials()
-        .iterator();
-      while (it.hasNext())
-      {
-        bioMaterials.add(getDbControl().getItem(BioMaterial.class,
-          it.next()));
-      }
-    }
-    catch (org.hibernate.ObjectNotFoundException e)
-    {
-      throw new ItemNotFoundException(HibernateUtil.getShortEntityName(e
-        .getEntityName()) + "[id=" + e.getIdentifier() + "]");
-    }
-    return bioMaterials;
-  }
-
-
-  /**
-   * Set the {@link BioMaterial} bioMaterials set.
-   * 
-   * @param bioMaterials The new <code>Set<BioMaterial></code> item.
-   */
-  @SuppressWarnings("unchecked")
-  public void setBioMaterials(Set<BioMaterial> bioMaterials)
-  {
-    Set<BioMaterialData> bmData = new HashSet<BioMaterialData>();
-    Iterator<BioMaterial> it = bioMaterials.iterator();
-    while (it.hasNext())
-    {
-      bmData.add((BioMaterialData) it.next().getData());
-    }
-    getData().setBioMaterials(bmData);
-  }
-
+   /**
+     * Add a BioMaterial
+     *
+     * @param bioMaterial The BioMaterial to add to the Set
+     */
+    public void addBioMaterial(BioMaterial<?> bioMaterial)
+    {
+        ((BioMaterialData) bioMaterial.getData()).getFiles()
+            .add(this.getData());
+        getData().getBioMaterials()
+            .add((BioMaterialData) bioMaterial.getData());
+    }
+
+
+    /**
+     * Remove a BioMaterial
+     *
+     * @param bioMaterial The BioMaterial to remove from the Set
+     */
+    public void removeBioMaterial(BioMaterial<?> bioMaterial)
+    {
+        if (bioMaterial != null)
+        {
+            ((BioMaterialData) bioMaterial.getData()).getFiles().remove(
+                this.getData());
+            getData().getBioMaterials().remove(
+                (BioMaterialData) bioMaterial.getData());
+        }
+    }
+
+
+    /**
+     * @return Returns the bioMaterials.
+     */
+    public Set<BioMaterial> getBioMaterials()
+            throws ItemNotFoundException, BaseException
+    {
+        Set<BioMaterial> bioMaterials = new HashSet<BioMaterial>();
+        try
+        {
+            Iterator<BioMaterialData> it = getData().getBioMaterials()
+                .iterator();
+            while (it.hasNext())
+            {
+ bioMaterials.add(getDbControl().getItem(BioMaterial.class,
+                    it.next()));
+            }
+        }
+        catch (org.hibernate.ObjectNotFoundException e)
+        {
+            throw new ItemNotFoundException(HibernateUtil.getShortEntityName(e
+                .getEntityName()) + "[id=" + e.getIdentifier() + "]");
+        }
+        return bioMaterials;
+    }
+
+
+    /**
+     * Set the {@link BioMaterial} bioMaterials set.
+     *
+     * @param bioMaterials The new <code>Set<BioMaterial></code> item.
+     */
+    public void setBioMaterials(Set<BioMaterial> bioMaterials)
+    {
+        Set<BioMaterialData> bmData = new HashSet<BioMaterialData>();
+        Iterator<BioMaterial> it = bioMaterials.iterator();
+        while (it.hasNext())
+        {
+            bmData.add((BioMaterialData) it.next().getData());
+        }
+        getData().setBioMaterials(bmData);
+    } 
 
   // -------------------------------------------