Subversion Repositories general

Compare Revisions

Ignore whitespace Rev 945 → Rev 926

/sun/hostadmiral/trunk/src/ak/hostadmiral/core/model/MailAlias.java
11,6 → 11,7
public class MailAlias
extends GeneralModelObject
{
private Long id;
private String address;
private InetDomain domain;
private User owner;
22,6 → 23,20
 
/**
*
* @hibernate.id generator-class="native"
*/
public Long getId()
{
return id;
}
 
protected void setId(Long id)
{
this.id = id;
}
 
/**
*
* @hibernate.property
*/
public String getAddress()
/sun/hostadmiral/trunk/src/ak/hostadmiral/core/model/MailAliasDestination.java
10,6 → 10,7
public class MailAliasDestination
extends GeneralModelObject
{
private Long id;
private MailAlias alias;
private Mailbox mailbox;
private String email;
20,6 → 21,20
 
/**
*
* @hibernate.id generator-class="native"
*/
public Long getId()
{
return id;
}
 
protected void setId(Long id)
{
this.id = id;
}
 
/**
*
* @hibernate.many-to-one
*/
public MailAlias getAlias()
/sun/hostadmiral/trunk/src/ak/hostadmiral/core/model/User.java
11,6 → 11,7
public class User
extends GeneralModelObject
{
private Long id;
private String login;
private String password;
private User boss;
22,6 → 23,20
 
/**
*
* @hibernate.id generator-class="native"
*/
public Long getId()
{
return id;
}
 
protected void setId(Long id)
{
this.id = id;
}
 
/**
*
* @hibernate.property
*/
public String getLogin()
138,15 → 153,15
if(o == null || !(o instanceof User)) return false;
 
User u = (User)o;
return (getId() != null) && (u.getId() != null) && (getId().equals(u.getId()));
return (id != null) && (u.getId() != null) && (id.equals(u.getId()));
}
 
public int hashCode()
{
if(getId() == null)
if(id == null)
return 0;
else
return getId().hashCode();
return id.hashCode();
}
 
public String getTypeKey()
/sun/hostadmiral/trunk/src/ak/hostadmiral/core/model/SystemUser.java
10,6 → 10,8
public class SystemUser
extends GeneralModelObject
{
private Long id;
 
/** user id in the OS */
private Integer uid;
private String name;
21,6 → 23,20
 
/**
*
* @hibernate.id generator-class="native"
*/
public Long getId()
{
return id;
}
 
protected void setId(Long id)
{
this.id = id;
}
 
/**
*
* @hibernate.property
*/
public Integer getUid()
/sun/hostadmiral/trunk/src/ak/hostadmiral/core/model/GeneralModelObject.java
7,7 → 7,6
public abstract class GeneralModelObject
implements ModelObject
{
private Long id;
private Boolean enabled;
private String comment;
private Date modStamp;
15,20 → 14,6
 
/**
*
* @hibernate.id generator-class="native"
*/
public Long getId()
{
return id;
}
 
protected void setId(Long id)
{
this.id = id;
}
 
/**
*
* @hibernate.property
*/
public Boolean getEnabled()
/sun/hostadmiral/trunk/src/ak/hostadmiral/core/model/InetDomain.java
10,6 → 10,7
public class InetDomain
extends GeneralModelObject
{
private Long id;
private String name;
private User owner;
 
19,6 → 20,20
 
/**
*
* @hibernate.id generator-class="native"
*/
public Long getId()
{
return id;
}
 
protected void setId(Long id)
{
this.id = id;
}
 
/**
*
* @hibernate.property
*/
public String getName()
/sun/hostadmiral/trunk/src/ak/hostadmiral/core/model/Mailbox.java
11,6 → 11,7
public class Mailbox
extends GeneralModelObject
{
private Long id;
private String login;
private String password;
private InetDomain domain;
25,6 → 26,20
 
/**
*
* @hibernate.id generator-class="native"
*/
public Long getId()
{
return id;
}
 
protected void setId(Long id)
{
this.id = id;
}
 
/**
*
* @hibernate.property
*/
public String getLogin()