Skip to content
Snippets Groups Projects
Commit 155f4dea authored by ribeaudc's avatar ribeaudc
Browse files

remove: - 'getParent' method. Use 'getParentInternal' instead.

SVN: 9427
parent dbbdb2e6
No related branches found
No related tags found
No related merge requests found
...@@ -30,7 +30,6 @@ import javax.persistence.ManyToOne; ...@@ -30,7 +30,6 @@ import javax.persistence.ManyToOne;
import javax.persistence.OneToOne; import javax.persistence.OneToOne;
import javax.persistence.SequenceGenerator; import javax.persistence.SequenceGenerator;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.UniqueConstraint; import javax.persistence.UniqueConstraint;
import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.EqualsBuilder;
...@@ -176,17 +175,6 @@ public class AttachmentPE extends HibernateAbstractRegistrationHolder implements ...@@ -176,17 +175,6 @@ public class AttachmentPE extends HibernateAbstractRegistrationHolder implements
this.parent = parent; this.parent = parent;
} }
@Transient
/**
* Returns connected experiment.<br>
*
* @see ExperimentPE#addAttachment(AttachmentPE) to set the connected experiment.
*/
public ExperimentPE getParent()
{
return getParentInternal();
}
@OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL) @OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
@NotNull(message = ValidationMessages.ATTACHMENT_CONTENT_NOT_NULL_MESSAGE) @NotNull(message = ValidationMessages.ATTACHMENT_CONTENT_NOT_NULL_MESSAGE)
@JoinColumn(name = ColumnNames.EXPERIMENT_ATTACHMENT_CONTENT_COLUMN, updatable = false) @JoinColumn(name = ColumnNames.EXPERIMENT_ATTACHMENT_CONTENT_COLUMN, updatable = false)
...@@ -217,7 +205,7 @@ public class AttachmentPE extends HibernateAbstractRegistrationHolder implements ...@@ -217,7 +205,7 @@ public class AttachmentPE extends HibernateAbstractRegistrationHolder implements
final EqualsBuilder builder = new EqualsBuilder(); final EqualsBuilder builder = new EqualsBuilder();
builder.append(getFileName(), that.getFileName()); builder.append(getFileName(), that.getFileName());
builder.append(getVersion(), that.getVersion()); builder.append(getVersion(), that.getVersion());
builder.append(getParent(), that.getParent()); builder.append(getParentInternal(), that.getParentInternal());
return builder.isEquals(); return builder.isEquals();
} }
...@@ -227,7 +215,7 @@ public class AttachmentPE extends HibernateAbstractRegistrationHolder implements ...@@ -227,7 +215,7 @@ public class AttachmentPE extends HibernateAbstractRegistrationHolder implements
final HashCodeBuilder builder = new HashCodeBuilder(); final HashCodeBuilder builder = new HashCodeBuilder();
builder.append(getFileName()); builder.append(getFileName());
builder.append(getVersion()); builder.append(getVersion());
builder.append(getParent()); builder.append(getParentInternal());
return builder.toHashCode(); return builder.toHashCode();
} }
...@@ -239,7 +227,7 @@ public class AttachmentPE extends HibernateAbstractRegistrationHolder implements ...@@ -239,7 +227,7 @@ public class AttachmentPE extends HibernateAbstractRegistrationHolder implements
ModifiedShortPrefixToStringStyle.MODIFIED_SHORT_PREFIX_STYLE); ModifiedShortPrefixToStringStyle.MODIFIED_SHORT_PREFIX_STYLE);
builder.append("fileName", getFileName()); builder.append("fileName", getFileName());
builder.append("version", getVersion()); builder.append("version", getVersion());
builder.append("parent", getParent()); builder.append("parent", getParentInternal());
return builder.toString(); return builder.toString();
} }
......
...@@ -336,7 +336,7 @@ public class ExperimentPE implements IEntityPropertiesHolder<ExperimentPropertyP ...@@ -336,7 +336,7 @@ public class ExperimentPE implements IEntityPropertiesHolder<ExperimentPropertyP
public void addAttachment(final AttachmentPE child) public void addAttachment(final AttachmentPE child)
{ {
final ExperimentPE parent = child.getParent(); final ExperimentPE parent = child.getParentInternal();
if (parent != null) if (parent != null)
{ {
parent.getInternalAttachments().remove(child); parent.getInternalAttachments().remove(child);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment