Subversion Repositories general

Compare Revisions

Ignore whitespace Rev 912 → Rev 913

/sun/hostcaptain/trunk/src/ak/hostcaptain/core/model/SystemUser.java
7,7 → 7,7
* @hibernate.class table="systemusers"
*/
public class SystemUser
implements ModelObject
extends GeneralModelObject
{
private Long id;
 
96,8 → 96,13
return ak.hostcaptain.core.CoreResources.TYPE_SYSTEM_USER;
}
 
public String getIdentificationString()
public String getIdentKey()
{
return getName() + " (" + getUid() + ")"; // FIXME: is it really so good style?
return ak.hostcaptain.core.CoreResources.IDENT_SYSTEM_USER;
}
 
public Object[] getIdentParams()
{
return new Object[] { getName(), getUid() };
}
}
/sun/hostcaptain/trunk/src/ak/hostcaptain/core/model/GeneralModelObject.java
0,0 → 1,36
package ak.hostcaptain.core.model;
 
public abstract class GeneralModelObject
implements ModelObject
{
private Boolean enabled;
private String comment;
 
/**
*
* @hibernate.property
*/
public Boolean getEnabled()
{
return enabled;
}
 
public void setEnabled(Boolean enabled)
{
this.enabled = enabled;
}
 
/**
*
* @hibernate.property
*/
public String getComment()
{
return comment;
}
 
public void setComment(String comment)
{
this.comment = comment;
}
}
/sun/hostcaptain/trunk/src/ak/hostcaptain/core/model/InetDomain.java
7,7 → 7,7
* @hibernate.class table="domains"
*/
public class InetDomain
implements ModelObject
extends GeneralModelObject
{
private Long id;
private String name;
79,8 → 79,13
return ak.hostcaptain.core.CoreResources.TYPE_DOMAIN;
}
 
public String getIdentificationString()
public String getIdentKey()
{
return getName();
return ak.hostcaptain.core.CoreResources.IDENT_DOMAIN;
}
 
public Object[] getIdentParams()
{
return new Object[] { getName() };
}
}
/sun/hostcaptain/trunk/src/ak/hostcaptain/core/model/ModelObject.java
4,5 → 4,7
{
public String getTypeKey();
 
public String getIdentificationString();
public String getIdentKey();
 
public Object[] getIdentParams();
}
/sun/hostcaptain/trunk/src/ak/hostcaptain/core/model/UserManager.java
55,7 → 55,7
{
try {
List list = HibernateUtil.currentSession().find(
"from User where login=?", login, Hibernate.STRING);
"from User where login=? and enabled='1'", login, Hibernate.STRING);
 
if(list.size() == 0)
return null;
/sun/hostcaptain/trunk/src/ak/hostcaptain/core/model/Mailbox.java
8,7 → 8,7
* @hibernate.class table="mailboxes"
*/
public class Mailbox
implements ModelObject
extends GeneralModelObject
{
private Long id;
private String login;
163,8 → 163,13
return ak.hostcaptain.core.CoreResources.TYPE_MAILBOX;
}
 
public String getIdentificationString()
public String getIdentKey()
{
return getLogin() + "@" + getDomain().getName();
return ak.hostcaptain.core.CoreResources.IDENT_MAILBOX;
}
 
public Object[] getIdentParams()
{
return new Object[] { getLogin(), getDomain().getName() };
}
}
/sun/hostcaptain/trunk/src/ak/hostcaptain/core/model/MailAlias.java
8,7 → 8,7
* @hibernate.class table="mailaliases"
*/
public class MailAlias
implements ModelObject
extends GeneralModelObject
{
private Long id;
private String address;
116,8 → 116,13
return ak.hostcaptain.core.CoreResources.TYPE_MAIL_ALIAS;
}
 
public String getIdentificationString()
public String getIdentKey()
{
return getAddress() + "@" + getDomain().getName();
return ak.hostcaptain.core.CoreResources.IDENT_MAIL_ALIAS;
}
 
public Object[] getIdentParams()
{
return new Object[] { getAddress(), getDomain().getName() };
}
}
/sun/hostcaptain/trunk/src/ak/hostcaptain/core/model/MailAliasDestination.java
7,7 → 7,7
* @hibernate.class table="mailaliasdests"
*/
public class MailAliasDestination
implements ModelObject
extends GeneralModelObject
{
private Long id;
private MailAlias alias;
94,8 → 94,19
return ak.hostcaptain.core.CoreResources.TYPE_MAIL_ALIAS_DESTINATION;
}
 
public String getIdentificationString()
public String getIdentKey()
{
return (getMailbox() == null) ? getEmail() : getMailbox().getIdentificationString();
if(getMailbox() == null)
return ak.hostcaptain.core.CoreResources.IDENT_MAIL_ALIAS_DESTINATION_EXTERNAL;
else
return ak.hostcaptain.core.CoreResources.IDENT_MAIL_ALIAS_DESTINATION_INTERNAL;
}
 
public Object[] getIdentParams()
{
if(getMailbox() == null)
return new Object[] { getEmail() };
else
return new Object[] { getMailbox().getLogin(), getMailbox().getDomain().getName() };
}
}
/sun/hostcaptain/trunk/src/ak/hostcaptain/core/model/User.java
8,7 → 8,7
* @hibernate.class table="users"
*/
public class User
implements ModelObject
extends GeneralModelObject
{
private Long id;
private String login;
147,8 → 147,13
return ak.hostcaptain.core.CoreResources.TYPE_USER;
}
 
public String getIdentificationString()
public String getIdentKey()
{
return getLogin();
return ak.hostcaptain.core.CoreResources.IDENT_USER;
}
 
public Object[] getIdentParams()
{
return new Object[] { getLogin() };
}
}