hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-17 15:03:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
Tom Desair
2016-04-07 16:31:10 +02:00
committed by dylan
parent b19189634d
commit 8db0faed33
102 changed files with 665 additions and 535 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dspace-api/src/main/java/org/dspace/content/MetadataField.java
View File

@@ -8,6 +8,7 @@
package org.dspace.content;
import org.dspace.core.Context;
import org.dspace.core.ReloadableEntity;
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;
import org.hibernate.proxy.HibernateProxyHelper;
@@ -29,13 +30,13 @@ import javax.persistence.*;
@Cacheable
@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
@Table(name="metadatafieldregistry")
public class MetadataField {
public class MetadataField implements ReloadableEntity<Integer> {
@Id
@Column(name="metadata_field_id", nullable = false, unique = true)
@GeneratedValue(strategy = GenerationType.SEQUENCE ,generator="metadatafieldregistry_seq")
@SequenceGenerator(name="metadatafieldregistry_seq", sequenceName="metadatafieldregistry_seq", allocationSize = 1, initialValue = 1)
private int id;
private Integer id;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "metadata_schema_id",nullable = false)
@@ -67,7 +68,7 @@ public class MetadataField {
*
* @return metadata field id
*/
public int getFieldID()
public Integer getID()
{
return id;
}
@@ -175,7 +176,7 @@ public class MetadataField {
return false;
}
final MetadataField other = (MetadataField) obj;
if (this.getFieldID() != other.getFieldID())
if (this.getID() != other.getID())
{
return false;
}
@@ -190,8 +191,8 @@ public class MetadataField {
public int hashCode()
{
int hash = 7;
hash = 47 * hash + getFieldID();
hash = 47 * hash + getMetadataSchema().getSchemaID();
hash = 47 * hash + getID();
hash = 47 * hash + getMetadataSchema().getID();
return hash;
}