hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-19 07:53:08 +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

11
dspace-api/src/main/java/org/dspace/versioning/Version.java
View File

@@ -9,6 +9,7 @@ package org.dspace.versioning;
import org.dspace.content.Item;
import org.dspace.core.Context;
import org.dspace.core.ReloadableEntity;
import org.dspace.eperson.EPerson;
import org.hibernate.proxy.HibernateProxyHelper;
@@ -24,13 +25,13 @@ import java.util.Date;
*/
@Entity
@Table(name="versionitem")
public class Version {
public class Version implements ReloadableEntity<Integer> {
@Id
@Column(name="versionitem_id")
@GeneratedValue(strategy = GenerationType.SEQUENCE ,generator="versionitem_seq")
@SequenceGenerator(name="versionitem_seq", sequenceName="versionitem_seq", allocationSize = 1)
private int id;
private Integer id;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "item_id")
@@ -68,7 +69,7 @@ public class Version {
}
public int getId() {
public Integer getID() {
return id;
}
@@ -133,7 +134,7 @@ public class Version {
}
final Version that = (Version)o;
if (this.getId() != that.getId())
if (this.getID() != that.getID())
{
return false;
}
@@ -144,7 +145,7 @@ public class Version {
@Override
public int hashCode() {
int hash=7;
hash=79*hash+ this.getId();
hash=79*hash+ this.getID();
return hash;
}
}