BlueGreycalmElegant

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → / @ 944

  → / @ 945

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 944 → Rev 945

/sun/hostadmiral/trunk/src/ak/hostadmiral/core/model/MailAliasDestination.java
10,7 → 10,6
public class MailAliasDestination
extends GeneralModelObject
{
private Long id;
private MailAlias alias;
private Mailbox mailbox;
private String email;
21,20 → 20,6
/**
*
* @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,7 → 11,6
public class User
extends GeneralModelObject
{
private Long id;
private String login;
private String password;
private User boss;
23,20 → 22,6
/**
*
* @hibernate.id generator-class="native"
*/
public Long getId()
{
return id;
}
protected void setId(Long id)
{
this.id = id;
}
/**
*
* @hibernate.property
*/
public String getLogin()
153,15 → 138,15
if(o == null || !(o instanceof User)) return false;
User u = (User)o;
return (id != null) && (u.getId() != null) && (id.equals(u.getId()));
return (getId() != null) && (u.getId() != null) && (getId().equals(u.getId()));
}
public int hashCode()
{
if(id == null)
if(getId() == null)
return 0;
else
return id.hashCode();
return getId().hashCode();
}
public String getTypeKey()

/sun/hostadmiral/trunk/src/ak/hostadmiral/core/model/SystemUser.java
10,8 → 10,6
public class SystemUser
extends GeneralModelObject
{
private Long id;
/** user id in the OS */
private Integer uid;
private String name;
23,20 → 21,6
/**
*
* @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,6 → 7,7
public abstract class GeneralModelObject
implements ModelObject
{
private Long id;
private Boolean enabled;
private String comment;
private Date modStamp;
14,6 → 15,20
/**
*
* @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,7 → 10,6
public class InetDomain
extends GeneralModelObject
{
private Long id;
private String name;
private User owner;
20,20 → 19,6
/**
*
* @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,7 → 11,6
public class Mailbox
extends GeneralModelObject
{
private Long id;
private String login;
private String password;
private InetDomain domain;
26,20 → 25,6
/**
*
* @hibernate.id generator-class="native"
*/
public Long getId()
{
return id;
}
protected void setId(Long id)
{
this.id = id;
}
/**
*
* @hibernate.property
*/
public String getLogin()

/sun/hostadmiral/trunk/src/ak/hostadmiral/core/model/MailAlias.java
11,7 → 11,6
public class MailAlias
extends GeneralModelObject
{
private Long id;
private String address;
private InetDomain domain;
private User owner;
23,20 → 22,6
/**
*
* @hibernate.id generator-class="native"
*/
public Long getId()
{
return id;
}
protected void setId(Long id)
{
this.id = id;
}
/**
*
* @hibernate.property
*/
public String getAddress()