fixing line encoding

This commit is contained in:
David Nalley 2012-06-26 10:45:51 -04:00
parent fc3ac862dc
commit 5f0ece8014

View File

@ -1,296 +1,296 @@
package com.cloud.storage; package com.cloud.storage;
import java.util.Date; import java.util.Date;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.EnumType; import javax.persistence.EnumType;
import javax.persistence.Enumerated; import javax.persistence.Enumerated;
import javax.persistence.GeneratedValue; import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType; import javax.persistence.GenerationType;
import javax.persistence.Id; import javax.persistence.Id;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Temporal; import javax.persistence.Temporal;
import javax.persistence.TemporalType; import javax.persistence.TemporalType;
//import com.cloud.storage.VMVolumeStorageResourceAssoc.Status; //import com.cloud.storage.VMVolumeStorageResourceAssoc.Status;
import com.cloud.storage.Storage.ImageFormat; import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.VMTemplateStorageResourceAssoc.Status; import com.cloud.storage.VMTemplateStorageResourceAssoc.Status;
import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.GenericDaoBase;
/** /**
* Join table for storage hosts and volumes * Join table for storage hosts and volumes
* @author Nitin * @author Nitin
* *
*/ */
@Entity @Entity
@Table(name="volume_host_ref") @Table(name="volume_host_ref")
public class VolumeHostVO { public class VolumeHostVO {
@Id @Id
@GeneratedValue(strategy=GenerationType.IDENTITY) @GeneratedValue(strategy=GenerationType.IDENTITY)
Long id; Long id;
@Column(name="host_id") @Column(name="host_id")
private long hostId; private long hostId;
@Column(name="volume_id") @Column(name="volume_id")
private long volumeId; private long volumeId;
@Column(name="zone_id") @Column(name="zone_id")
private long zoneId; private long zoneId;
@Column(name=GenericDaoBase.CREATED_COLUMN) @Column(name=GenericDaoBase.CREATED_COLUMN)
private Date created = null; private Date created = null;
@Column(name="last_updated") @Column(name="last_updated")
@Temporal(value=TemporalType.TIMESTAMP) @Temporal(value=TemporalType.TIMESTAMP)
private Date lastUpdated = null; private Date lastUpdated = null;
@Column (name="download_pct") @Column (name="download_pct")
private int downloadPercent; private int downloadPercent;
@Column (name="size") @Column (name="size")
private long size; private long size;
@Column (name="physical_size") @Column (name="physical_size")
private long physicalSize; private long physicalSize;
@Column (name="download_state") @Column (name="download_state")
@Enumerated(EnumType.STRING) @Enumerated(EnumType.STRING)
private Status downloadState; private Status downloadState;
@Column(name="checksum") @Column(name="checksum")
private String checksum; private String checksum;
@Column (name="local_path") @Column (name="local_path")
private String localDownloadPath; private String localDownloadPath;
@Column (name="error_str") @Column (name="error_str")
private String errorString; private String errorString;
@Column (name="job_id") @Column (name="job_id")
private String jobId; private String jobId;
@Column (name="install_path") @Column (name="install_path")
private String installPath; private String installPath;
@Column (name="url") @Column (name="url")
private String downloadUrl; private String downloadUrl;
@Column(name="format") @Column(name="format")
private Storage.ImageFormat format; private Storage.ImageFormat format;
@Column(name="destroyed") @Column(name="destroyed")
boolean destroyed = false; boolean destroyed = false;
public String getInstallPath() { public String getInstallPath() {
return installPath; return installPath;
} }
public long getHostId() { public long getHostId() {
return hostId; return hostId;
} }
public void setHostId(long hostId) { public void setHostId(long hostId) {
this.hostId = hostId; this.hostId = hostId;
} }
public long getVolumeId() { public long getVolumeId() {
return volumeId; return volumeId;
} }
public void setVolumeId(long volumeId) { public void setVolumeId(long volumeId) {
this.volumeId = volumeId; this.volumeId = volumeId;
} }
public long getZoneId() { public long getZoneId() {
return zoneId; return zoneId;
} }
public void setZoneId(long zoneId) { public void setZoneId(long zoneId) {
this.zoneId = zoneId; this.zoneId = zoneId;
} }
public int getDownloadPercent() { public int getDownloadPercent() {
return downloadPercent; return downloadPercent;
} }
public void setDownloadPercent(int downloadPercent) { public void setDownloadPercent(int downloadPercent) {
this.downloadPercent = downloadPercent; this.downloadPercent = downloadPercent;
} }
public void setDownloadState(Status downloadState) { public void setDownloadState(Status downloadState) {
this.downloadState = downloadState; this.downloadState = downloadState;
} }
public long getId() { public long getId() {
return id; return id;
} }
public Date getCreated() { public Date getCreated() {
return created; return created;
} }
public Date getLastUpdated() { public Date getLastUpdated() {
return lastUpdated; return lastUpdated;
} }
public void setLastUpdated(Date date) { public void setLastUpdated(Date date) {
lastUpdated = date; lastUpdated = date;
} }
public void setInstallPath(String installPath) { public void setInstallPath(String installPath) {
this.installPath = installPath; this.installPath = installPath;
} }
public Status getDownloadState() { public Status getDownloadState() {
return downloadState; return downloadState;
} }
public String getChecksum() { public String getChecksum() {
return checksum; return checksum;
} }
public void setChecksum(String checksum) { public void setChecksum(String checksum) {
this.checksum = checksum; this.checksum = checksum;
} }
public VolumeHostVO(long hostId, long volumeId) { public VolumeHostVO(long hostId, long volumeId) {
super(); super();
this.hostId = hostId; this.hostId = hostId;
this.volumeId = volumeId; this.volumeId = volumeId;
} }
public VolumeHostVO(long hostId, long volumeId, long zoneId, Date lastUpdated, public VolumeHostVO(long hostId, long volumeId, long zoneId, Date lastUpdated,
int downloadPercent, Status downloadState, int downloadPercent, Status downloadState,
String localDownloadPath, String errorString, String jobId, String localDownloadPath, String errorString, String jobId,
String installPath, String downloadUrl, String checksum, ImageFormat format) { String installPath, String downloadUrl, String checksum, ImageFormat format) {
//super(); //super();
this.hostId = hostId; this.hostId = hostId;
this.volumeId = volumeId; this.volumeId = volumeId;
this.zoneId = zoneId; this.zoneId = zoneId;
this.lastUpdated = lastUpdated; this.lastUpdated = lastUpdated;
this.downloadPercent = downloadPercent; this.downloadPercent = downloadPercent;
this.downloadState = downloadState; this.downloadState = downloadState;
this.localDownloadPath = localDownloadPath; this.localDownloadPath = localDownloadPath;
this.errorString = errorString; this.errorString = errorString;
this.jobId = jobId; this.jobId = jobId;
this.installPath = installPath; this.installPath = installPath;
this.setDownloadUrl(downloadUrl); this.setDownloadUrl(downloadUrl);
this.checksum = checksum; this.checksum = checksum;
this.format = format; this.format = format;
} }
protected VolumeHostVO() { protected VolumeHostVO() {
} }
public void setLocalDownloadPath(String localPath) { public void setLocalDownloadPath(String localPath) {
this.localDownloadPath = localPath; this.localDownloadPath = localPath;
} }
public String getLocalDownloadPath() { public String getLocalDownloadPath() {
return localDownloadPath; return localDownloadPath;
} }
public void setErrorString(String errorString) { public void setErrorString(String errorString) {
this.errorString = errorString; this.errorString = errorString;
} }
public String getErrorString() { public String getErrorString() {
return errorString; return errorString;
} }
public void setJobId(String jobId) { public void setJobId(String jobId) {
this.jobId = jobId; this.jobId = jobId;
} }
public String getJobId() { public String getJobId() {
return jobId; return jobId;
} }
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (obj instanceof VolumeHostVO) { if (obj instanceof VolumeHostVO) {
VolumeHostVO other = (VolumeHostVO)obj; VolumeHostVO other = (VolumeHostVO)obj;
return (this.volumeId==other.getVolumeId() && this.hostId==other.getHostId()); return (this.volumeId==other.getVolumeId() && this.hostId==other.getHostId());
} }
return false; return false;
} }
public int hashCode() { public int hashCode() {
Long tid = new Long(volumeId); Long tid = new Long(volumeId);
Long hid = new Long(hostId); Long hid = new Long(hostId);
return tid.hashCode()+hid.hashCode(); return tid.hashCode()+hid.hashCode();
} }
public void setSize(long size) { public void setSize(long size) {
this.size = size; this.size = size;
} }
public long getSize() { public long getSize() {
return size; return size;
} }
public void setPhysicalSize(long physicalSize) { public void setPhysicalSize(long physicalSize) {
this.physicalSize = physicalSize; this.physicalSize = physicalSize;
} }
public long getPhysicalSize() { public long getPhysicalSize() {
return physicalSize; return physicalSize;
} }
public void setDestroyed(boolean destroyed) { public void setDestroyed(boolean destroyed) {
this.destroyed = destroyed; this.destroyed = destroyed;
} }
public boolean getDestroyed() { public boolean getDestroyed() {
return destroyed; return destroyed;
} }
public void setDownloadUrl(String downloadUrl) { public void setDownloadUrl(String downloadUrl) {
this.downloadUrl = downloadUrl; this.downloadUrl = downloadUrl;
} }
public String getDownloadUrl() { public String getDownloadUrl() {
return downloadUrl; return downloadUrl;
} }
public Storage.ImageFormat getFormat() { public Storage.ImageFormat getFormat() {
return format; return format;
} }
public void setFormat(Storage.ImageFormat format) { public void setFormat(Storage.ImageFormat format) {
this.format = format; this.format = format;
} }
public long getVolumeSize() { public long getVolumeSize() {
return -1; return -1;
} }
public String toString() { public String toString() {
return new StringBuilder("VolumeHost[").append(id).append("-").append(volumeId).append("-").append(hostId).append(installPath).append("]").toString(); return new StringBuilder("VolumeHost[").append(id).append("-").append(volumeId).append("-").append(hostId).append(installPath).append("]").toString();
} }
} }