etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge changes

This commit is contained in:
Alex Huang 2011-01-20 09:59:08 -08:00
parent 57def20cf6
commit 5d3bcdeb28
1 changed files with 54 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
core/src/com/cloud/storage/VMTemplateHostVO.java
View File

@ -18,19 +18,19 @@
package com.cloud.storage;
import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import com.cloud.utils.db.GenericDaoBase;
/**
@ -95,7 +95,8 @@ public class VMTemplateHostVO implements VMTemplateStorageResourceAssoc {
@Column(name="destroyed")
boolean destroyed = false;
public String getInstallPath() {
@Override
public String getInstallPath() {
return installPath;
}
@ -107,47 +108,58 @@ public class VMTemplateHostVO implements VMTemplateStorageResourceAssoc {
this.hostId = hostId;
}
public long getTemplateId() {
@Override
public long getTemplateId() {
return templateId;
}
public void setTemplateId(long templateId) {
@Override
public void setTemplateId(long templateId) {
this.templateId = templateId;
}
public int getDownloadPercent() {
@Override
public int getDownloadPercent() {
return downloadPercent;
}
public void setDownloadPercent(int downloadPercent) {
@Override
public void setDownloadPercent(int downloadPercent) {
this.downloadPercent = downloadPercent;
}
public void setDownloadState(Status downloadState) {
@Override
public void setDownloadState(Status downloadState) {
this.downloadState = downloadState;
}
public Long getId() {
@Override
public long getId() {
return id;
}
public Date getCreated() {
@Override
public Date getCreated() {
return created;
}
public Date getLastUpdated() {
@Override
public Date getLastUpdated() {
return lastUpdated;
}
public void setLastUpdated(Date date) {
@Override
public void setLastUpdated(Date date) {
lastUpdated = date;
}
public void setInstallPath(String installPath) {
@Override
public void setInstallPath(String installPath) {
this.installPath = installPath;
}
public Status getDownloadState() {
@Override
public Status getDownloadState() {
return downloadState;
}
@ -178,27 +190,33 @@ public class VMTemplateHostVO implements VMTemplateStorageResourceAssoc {
}
public void setLocalDownloadPath(String localPath) {
@Override
public void setLocalDownloadPath(String localPath) {
this.localDownloadPath = localPath;
}
public String getLocalDownloadPath() {
@Override
public String getLocalDownloadPath() {
return localDownloadPath;
}
public void setErrorString(String errorString) {
@Override
public void setErrorString(String errorString) {
this.errorString = errorString;
}
public String getErrorString() {
@Override
public String getErrorString() {
return errorString;
}
public void setJobId(String jobId) {
@Override
public void setJobId(String jobId) {
this.jobId = jobId;
}
public String getJobId() {
@Override
public String getJobId() {
return jobId;
}
@ -274,5 +292,10 @@ public class VMTemplateHostVO implements VMTemplateStorageResourceAssoc {
public boolean isCopy() {
return isCopy;
}
@Override
public long getTemplateSize() {
return -1;
}
}