fix clone method and xmlElement name

This commit is contained in:
danikov 2012-03-02 12:45:58 +00:00
parent 9d2923e96c
commit 24725cf88c
2 changed files with 3 additions and 5 deletions

View File

@ -137,7 +137,7 @@ public abstract class EntityType<T extends EntityType<T>> extends ResourceType<T
@XmlElement(name = "Description") @XmlElement(name = "Description")
private String description; private String description;
@XmlElement(name = "TasksInProgress") @XmlElement(namespace = VCLOUD_1_5_NS, name = "Tasks")
private TasksInProgress tasksInProgress; private TasksInProgress tasksInProgress;
@XmlAttribute @XmlAttribute
private String id; private String id;
@ -206,9 +206,7 @@ public abstract class EntityType<T extends EntityType<T>> extends ResourceType<T
if (o == null || getClass() != o.getClass()) if (o == null || getClass() != o.getClass())
return false; return false;
EntityType<?> that = EntityType.class.cast(o); EntityType<?> that = EntityType.class.cast(o);
return super.equals(that) && return super.clone(that);
equal(this.description, that.description) &&
equal(this.name, that.name);
} }
@Override @Override

View File

@ -253,7 +253,7 @@ public class Media extends ResourceEntityType<Media> {
return false; return false;
Media that = Media.class.cast(o); Media that = Media.class.cast(o);
return super.clone(that) && return super.clone(that) &&
equal(this.owner, that.owner) && equal(this.imageType, that.imageType) && equal(this.size, that.size); equal(this.imageType, that.imageType) && equal(this.size, that.size);
} }
@Override @Override