Skip to content

Codecrew / Moya

Go to a project
Commit cf043a32 by jkj
Options

formatting 

git-svn-id: https://dev.intra.insomnia.fi/svn/trunk@42 8cf89bec-f6a3-4178-919f-364fb3449fe5
1 parent ee008832
Inline Side-by-side
Showing with 342 additions and 200 deletions
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/HelloBean.java
...@@ -19,7 +19,8 @@ import fi.insomnia.bortal.db.HelloTo; ...@@ -19,7 +19,8 @@ import fi.insomnia.bortal.db.HelloTo;
@Stateless @Stateless
public class HelloBean implements HelloBeanLocal { public class HelloBean implements HelloBeanLocal {
private static final Logger logger = LoggerFactory.getLogger(HelloBean.class); private static final Logger logger = LoggerFactory
.getLogger(HelloBean.class);
@PersistenceContext @PersistenceContext
private EntityManager em; private EntityManager em;
...@@ -38,7 +39,8 @@ public class HelloBean implements HelloBeanLocal { ...@@ -38,7 +39,8 @@ public class HelloBean implements HelloBeanLocal {
} }
public List<HelloTo> getHelloHistory() { public List<HelloTo> getHelloHistory() {
List<HelloTo> ret = em.createQuery("select t from HelloTo t", HelloTo.class).getResultList(); List<HelloTo> ret = em.createQuery("select t from HelloTo t",
HelloTo.class).getResultList();
logger.info("Size: " + ret.size()); logger.info("Size: " + ret.size());
return ret; return ret;
} }
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/UserBean.java
...@@ -20,10 +20,11 @@ import fi.insomnia.bortal.db.User; ...@@ -20,10 +20,11 @@ import fi.insomnia.bortal.db.User;
@Stateless @Stateless
public class UserBean implements UserBeanLocal { public class UserBean implements UserBeanLocal {
private static final Logger logger = LoggerFactory.getLogger(UserBean.class); private static final Logger logger = LoggerFactory
.getLogger(UserBean.class);
/** /**
* Java EE container injektoi tmn luokkamuuttujan luokan luonnin * Java EE container injektoi t�m�n luokkamuuttujan luokan luonnin
* yhteydess. * yhteydess�.
*/ */
@PersistenceContext @PersistenceContext
private EntityManager em; private EntityManager em;
...@@ -49,7 +50,8 @@ public class UserBean implements UserBeanLocal { ...@@ -49,7 +50,8 @@ public class UserBean implements UserBeanLocal {
} }
public List<User> getUsers() { public List<User> getUsers() {
List<User> ret = em.createQuery("select u from User u", User.class).getResultList(); List<User> ret = em.createQuery("select u from User u", User.class)
.getResultList();
logger.info("Found {} users from database ", ret.size()); logger.info("Found {} users from database ", ret.size());
return ret; return ret;
} }
...@@ -60,7 +62,8 @@ public class UserBean implements UserBeanLocal { ...@@ -60,7 +62,8 @@ public class UserBean implements UserBeanLocal {
} }
public User getUser(String nick) { public User getUser(String nick) {
User ret = em.createQuery("select u from User u where u.nick = :name", User.class).setParameter("name", nick).getSingleResult(); User ret = em.createQuery("select u from User u where u.nick = :name",
User.class).setParameter("name", nick).getSingleResult();
return ret; return ret;
} }
......
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/HelloBeanLocal.java
package fi.insomnia.bortal; package fi.insomnia.bortal;
import java.util.List; import java.util.List;
import javax.ejb.Local; import javax.ejb.Local;
import fi.insomnia.bortal.db.HelloTo; import fi.insomnia.bortal.db.HelloTo;
@Local @Local
public interface HelloBeanLocal { public interface HelloBeanLocal {
......
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/UserBeanLocal.java
package fi.insomnia.bortal; package fi.insomnia.bortal;
import javax.ejb.Local;
import java.util.List; import java.util.List;
import javax.ejb.Local;
import fi.insomnia.bortal.db.User; import fi.insomnia.bortal.db.User;
@Local @Local
...@@ -13,7 +15,6 @@ public interface UserBeanLocal { ...@@ -13,7 +15,6 @@ public interface UserBeanLocal {
User getUser(String nick); User getUser(String nick);
void mergeChanges(User currentUser); void mergeChanges(User currentUser);
} }
code/LanBortalDatabase/.settings/org.eclipse.jdt.ui.prefs 0 → 100644
#Sun Mar 07 02:14:35 EET 2010
cleanup_settings_version=2
eclipse.preferences.version=1
formatter_profile=org.eclipse.jdt.ui.default.sun_profile
formatter_settings_version=11
code/LanBortalDatabase/src/fi/insomnia/bortal/model/AccountEvent.java
...@@ -29,13 +29,13 @@ import javax.persistence.TemporalType; ...@@ -29,13 +29,13 @@ import javax.persistence.TemporalType;
*/ */
@Entity @Entity
@Table(name = "account_events") @Table(name = "account_events")
@NamedQueries({ @NamedQueries( {
@NamedQuery(name = "AccountEvent.findAll", query = "SELECT a FROM AccountEvent a"), @NamedQuery(name = "AccountEvent.findAll", query = "SELECT a FROM AccountEvent a"),
@NamedQuery(name = "AccountEvent.findByAccountEventsId", query = "SELECT a FROM AccountEvent a WHERE a.accountEventsId = :accountEventsId"), @NamedQuery(name = "AccountEvent.findByAccountEventsId", query = "SELECT a FROM AccountEvent a WHERE a.accountEventsId = :accountEventsId"),
@NamedQuery(name = "AccountEvent.findByUnitPrice", query = "SELECT a FROM AccountEvent a WHERE a.unitPrice = :unitPrice"), @NamedQuery(name = "AccountEvent.findByUnitPrice", query = "SELECT a FROM AccountEvent a WHERE a.unitPrice = :unitPrice"),
@NamedQuery(name = "AccountEvent.findByUnitCount", query = "SELECT a FROM AccountEvent a WHERE a.unitCount = :unitCount"), @NamedQuery(name = "AccountEvent.findByUnitCount", query = "SELECT a FROM AccountEvent a WHERE a.unitCount = :unitCount"),
@NamedQuery(name = "AccountEvent.findByEventTime", query = "SELECT a FROM AccountEvent a WHERE a.eventTime = :eventTime"), @NamedQuery(name = "AccountEvent.findByEventTime", query = "SELECT a FROM AccountEvent a WHERE a.eventTime = :eventTime"),
@NamedQuery(name = "AccountEvent.findByDelivered", query = "SELECT a FROM AccountEvent a WHERE a.delivered = :delivered")}) @NamedQuery(name = "AccountEvent.findByDelivered", query = "SELECT a FROM AccountEvent a WHERE a.delivered = :delivered") })
public class AccountEvent implements Serializable { public class AccountEvent implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
...@@ -76,7 +76,8 @@ public class AccountEvent implements Serializable { ...@@ -76,7 +76,8 @@ public class AccountEvent implements Serializable {
this.accountEventsId = accountEventsId; this.accountEventsId = accountEventsId;
} }
public AccountEvent(Integer accountEventsId, BigInteger unitPrice, int unitCount, Date eventTime) { public AccountEvent(Integer accountEventsId, BigInteger unitPrice,
int unitCount, Date eventTime) {
this.accountEventsId = accountEventsId; this.accountEventsId = accountEventsId;
this.unitPrice = unitPrice; this.unitPrice = unitPrice;
this.unitCount = unitCount; this.unitCount = unitCount;
...@@ -151,7 +152,8 @@ public class AccountEvent implements Serializable { ...@@ -151,7 +152,8 @@ public class AccountEvent implements Serializable {
return discountInstanceList; return discountInstanceList;
} }
public void setDiscountInstanceList(List<DiscountInstance> discountInstanceList) { public void setDiscountInstanceList(
List<DiscountInstance> discountInstanceList) {
this.discountInstanceList = discountInstanceList; this.discountInstanceList = discountInstanceList;
} }
...@@ -172,12 +174,15 @@ public class AccountEvent implements Serializable { ...@@ -172,12 +174,15 @@ public class AccountEvent implements Serializable {
@Override @Override
public boolean equals(Object object) { public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are not set // TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof AccountEvent)) { if (!(object instanceof AccountEvent)) {
return false; return false;
} }
AccountEvent other = (AccountEvent) object; AccountEvent other = (AccountEvent) object;
if ((this.accountEventsId == null && other.accountEventsId != null) || (this.accountEventsId != null && !this.accountEventsId.equals(other.accountEventsId))) { if ((this.accountEventsId == null && other.accountEventsId != null)
|| (this.accountEventsId != null && !this.accountEventsId
.equals(other.accountEventsId))) {
return false; return false;
} }
return true; return true;
...@@ -185,7 +190,8 @@ public class AccountEvent implements Serializable { ...@@ -185,7 +190,8 @@ public class AccountEvent implements Serializable {
@Override @Override
public String toString() { public String toString() {
return "fi.insomnia.bortal.model.AccountEvent[accountEventsId=" + accountEventsId + "]"; return "fi.insomnia.bortal.model.AccountEvent[accountEventsId="
+ accountEventsId + "]";
} }
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/BillLine.java
...@@ -23,13 +23,13 @@ import javax.persistence.Table; ...@@ -23,13 +23,13 @@ import javax.persistence.Table;
*/ */
@Entity @Entity
@Table(name = "bill_lines") @Table(name = "bill_lines")
@NamedQueries({ @NamedQueries( {
@NamedQuery(name = "BillLine.findAll", query = "SELECT b FROM BillLine b"), @NamedQuery(name = "BillLine.findAll", query = "SELECT b FROM BillLine b"),
@NamedQuery(name = "BillLine.findByBillLinesId", query = "SELECT b FROM BillLine b WHERE b.billLinesId = :billLinesId"), @NamedQuery(name = "BillLine.findByBillLinesId", query = "SELECT b FROM BillLine b WHERE b.billLinesId = :billLinesId"),
@NamedQuery(name = "BillLine.findByProduct", query = "SELECT b FROM BillLine b WHERE b.product = :product"), @NamedQuery(name = "BillLine.findByProduct", query = "SELECT b FROM BillLine b WHERE b.product = :product"),
@NamedQuery(name = "BillLine.findByUnits", query = "SELECT b FROM BillLine b WHERE b.units = :units"), @NamedQuery(name = "BillLine.findByUnits", query = "SELECT b FROM BillLine b WHERE b.units = :units"),
@NamedQuery(name = "BillLine.findByUnitPrice", query = "SELECT b FROM BillLine b WHERE b.unitPrice = :unitPrice"), @NamedQuery(name = "BillLine.findByUnitPrice", query = "SELECT b FROM BillLine b WHERE b.unitPrice = :unitPrice"),
@NamedQuery(name = "BillLine.findByVat", query = "SELECT b FROM BillLine b WHERE b.vat = :vat")}) @NamedQuery(name = "BillLine.findByVat", query = "SELECT b FROM BillLine b WHERE b.vat = :vat") })
public class BillLine implements Serializable { public class BillLine implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
...@@ -59,7 +59,8 @@ public class BillLine implements Serializable { ...@@ -59,7 +59,8 @@ public class BillLine implements Serializable {
this.billLinesId = billLinesId; this.billLinesId = billLinesId;
} }
public BillLine(Integer billLinesId, String product, int units, float unitPrice, float vat) { public BillLine(Integer billLinesId, String product, int units,
float unitPrice, float vat) {
this.billLinesId = billLinesId; this.billLinesId = billLinesId;
this.product = product; this.product = product;
this.units = units; this.units = units;
...@@ -124,12 +125,15 @@ public class BillLine implements Serializable { ...@@ -124,12 +125,15 @@ public class BillLine implements Serializable {
@Override @Override
public boolean equals(Object object) { public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are not set // TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof BillLine)) { if (!(object instanceof BillLine)) {
return false; return false;
} }
BillLine other = (BillLine) object; BillLine other = (BillLine) object;
if ((this.billLinesId == null && other.billLinesId != null) || (this.billLinesId != null && !this.billLinesId.equals(other.billLinesId))) { if ((this.billLinesId == null && other.billLinesId != null)
|| (this.billLinesId != null && !this.billLinesId
.equals(other.billLinesId))) {
return false; return false;
} }
return true; return true;
...@@ -137,7 +141,8 @@ public class BillLine implements Serializable { ...@@ -137,7 +141,8 @@ public class BillLine implements Serializable {
@Override @Override
public String toString() { public String toString() {
return "fi.insomnia.bortal.model.BillLine[billLinesId=" + billLinesId + "]"; return "fi.insomnia.bortal.model.BillLine[billLinesId=" + billLinesId
+ "]";
} }
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/CardTemplate.java
...@@ -26,10 +26,10 @@ import javax.persistence.Table; ...@@ -26,10 +26,10 @@ import javax.persistence.Table;
*/ */
@Entity @Entity
@Table(name = "card_templates") @Table(name = "card_templates")
@NamedQueries({ @NamedQueries( {
@NamedQuery(name = "CardTemplate.findAll", query = "SELECT c FROM CardTemplate c"), @NamedQuery(name = "CardTemplate.findAll", query = "SELECT c FROM CardTemplate c"),
@NamedQuery(name = "CardTemplate.findByCardTemplatesId", query = "SELECT c FROM CardTemplate c WHERE c.cardTemplatesId = :cardTemplatesId"), @NamedQuery(name = "CardTemplate.findByCardTemplatesId", query = "SELECT c FROM CardTemplate c WHERE c.cardTemplatesId = :cardTemplatesId"),
@NamedQuery(name = "CardTemplate.findByTemplateName", query = "SELECT c FROM CardTemplate c WHERE c.templateName = :templateName")}) @NamedQuery(name = "CardTemplate.findByTemplateName", query = "SELECT c FROM CardTemplate c WHERE c.templateName = :templateName") })
public class CardTemplate implements Serializable { public class CardTemplate implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
...@@ -109,12 +109,15 @@ public class CardTemplate implements Serializable { ...@@ -109,12 +109,15 @@ public class CardTemplate implements Serializable {
@Override @Override
public boolean equals(Object object) { public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are not set // TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof CardTemplate)) { if (!(object instanceof CardTemplate)) {
return false; return false;
} }
CardTemplate other = (CardTemplate) object; CardTemplate other = (CardTemplate) object;
if ((this.cardTemplatesId == null && other.cardTemplatesId != null) || (this.cardTemplatesId != null && !this.cardTemplatesId.equals(other.cardTemplatesId))) { if ((this.cardTemplatesId == null && other.cardTemplatesId != null)
|| (this.cardTemplatesId != null && !this.cardTemplatesId
.equals(other.cardTemplatesId))) {
return false; return false;
} }
return true; return true;
...@@ -122,7 +125,8 @@ public class CardTemplate implements Serializable { ...@@ -122,7 +125,8 @@ public class CardTemplate implements Serializable {
@Override @Override
public String toString() { public String toString() {
return "fi.insomnia.bortal.model.CardTemplate[cardTemplatesId=" + cardTemplatesId + "]"; return "fi.insomnia.bortal.model.CardTemplate[cardTemplatesId="
+ cardTemplatesId + "]";
} }
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Compo.java
...@@ -29,7 +29,7 @@ import javax.persistence.TemporalType; ...@@ -29,7 +29,7 @@ import javax.persistence.TemporalType;
*/ */
@Entity @Entity
@Table(name = "compos") @Table(name = "compos")
@NamedQueries({ @NamedQueries( {
@NamedQuery(name = "Compo.findAll", query = "SELECT c FROM Compo c"), @NamedQuery(name = "Compo.findAll", query = "SELECT c FROM Compo c"),
@NamedQuery(name = "Compo.findByComposId", query = "SELECT c FROM Compo c WHERE c.composId = :composId"), @NamedQuery(name = "Compo.findByComposId", query = "SELECT c FROM Compo c WHERE c.composId = :composId"),
@NamedQuery(name = "Compo.findByCompoName", query = "SELECT c FROM Compo c WHERE c.compoName = :compoName"), @NamedQuery(name = "Compo.findByCompoName", query = "SELECT c FROM Compo c WHERE c.compoName = :compoName"),
...@@ -38,7 +38,7 @@ import javax.persistence.TemporalType; ...@@ -38,7 +38,7 @@ import javax.persistence.TemporalType;
@NamedQuery(name = "Compo.findByVoteEnd", query = "SELECT c FROM Compo c WHERE c.voteEnd = :voteEnd"), @NamedQuery(name = "Compo.findByVoteEnd", query = "SELECT c FROM Compo c WHERE c.voteEnd = :voteEnd"),
@NamedQuery(name = "Compo.findBySubmitStart", query = "SELECT c FROM Compo c WHERE c.submitStart = :submitStart"), @NamedQuery(name = "Compo.findBySubmitStart", query = "SELECT c FROM Compo c WHERE c.submitStart = :submitStart"),
@NamedQuery(name = "Compo.findBySubmitEnd", query = "SELECT c FROM Compo c WHERE c.submitEnd = :submitEnd"), @NamedQuery(name = "Compo.findBySubmitEnd", query = "SELECT c FROM Compo c WHERE c.submitEnd = :submitEnd"),
@NamedQuery(name = "Compo.findByHoldVoting", query = "SELECT c FROM Compo c WHERE c.holdVoting = :holdVoting")}) @NamedQuery(name = "Compo.findByHoldVoting", query = "SELECT c FROM Compo c WHERE c.holdVoting = :holdVoting") })
public class Compo implements Serializable { public class Compo implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
...@@ -174,12 +174,15 @@ public class Compo implements Serializable { ...@@ -174,12 +174,15 @@ public class Compo implements Serializable {
@Override @Override
public boolean equals(Object object) { public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are not set // TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof Compo)) { if (!(object instanceof Compo)) {
return false; return false;
} }
Compo other = (Compo) object; Compo other = (Compo) object;
if ((this.composId == null && other.composId != null) || (this.composId != null && !this.composId.equals(other.composId))) { if ((this.composId == null && other.composId != null)
|| (this.composId != null && !this.composId
.equals(other.composId))) {
return false; return false;
} }
return true; return true;
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntry.java
...@@ -29,14 +29,14 @@ import javax.persistence.TemporalType; ...@@ -29,14 +29,14 @@ import javax.persistence.TemporalType;
*/ */
@Entity @Entity
@Table(name = "entries") @Table(name = "entries")
@NamedQueries({ @NamedQueries( {
@NamedQuery(name = "CompoEntry.findAll", query = "SELECT c FROM CompoEntry c"), @NamedQuery(name = "CompoEntry.findAll", query = "SELECT c FROM CompoEntry c"),
@NamedQuery(name = "CompoEntry.findByEntriesId", query = "SELECT c FROM CompoEntry c WHERE c.entriesId = :entriesId"), @NamedQuery(name = "CompoEntry.findByEntriesId", query = "SELECT c FROM CompoEntry c WHERE c.entriesId = :entriesId"),
@NamedQuery(name = "CompoEntry.findByEntryCreated", query = "SELECT c FROM CompoEntry c WHERE c.entryCreated = :entryCreated"), @NamedQuery(name = "CompoEntry.findByEntryCreated", query = "SELECT c FROM CompoEntry c WHERE c.entryCreated = :entryCreated"),
@NamedQuery(name = "CompoEntry.findByEntryName", query = "SELECT c FROM CompoEntry c WHERE c.entryName = :entryName"), @NamedQuery(name = "CompoEntry.findByEntryName", query = "SELECT c FROM CompoEntry c WHERE c.entryName = :entryName"),
@NamedQuery(name = "CompoEntry.findByNotes", query = "SELECT c FROM CompoEntry c WHERE c.notes = :notes"), @NamedQuery(name = "CompoEntry.findByNotes", query = "SELECT c FROM CompoEntry c WHERE c.notes = :notes"),
@NamedQuery(name = "CompoEntry.findByScreenMessage", query = "SELECT c FROM CompoEntry c WHERE c.screenMessage = :screenMessage"), @NamedQuery(name = "CompoEntry.findByScreenMessage", query = "SELECT c FROM CompoEntry c WHERE c.screenMessage = :screenMessage"),
@NamedQuery(name = "CompoEntry.findBySort", query = "SELECT c FROM CompoEntry c WHERE c.sort = :sort")}) @NamedQuery(name = "CompoEntry.findBySort", query = "SELECT c FROM CompoEntry c WHERE c.sort = :sort") })
public class CompoEntry implements Serializable { public class CompoEntry implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
...@@ -150,7 +150,8 @@ public class CompoEntry implements Serializable { ...@@ -150,7 +150,8 @@ public class CompoEntry implements Serializable {
return compoEntryParticipantList; return compoEntryParticipantList;
} }
public void setCompoEntryParticipantList(List<CompoEntryParticipant> compoEntryParticipantList) { public void setCompoEntryParticipantList(
List<CompoEntryParticipant> compoEntryParticipantList) {
this.compoEntryParticipantList = compoEntryParticipantList; this.compoEntryParticipantList = compoEntryParticipantList;
} }
...@@ -179,12 +180,15 @@ public class CompoEntry implements Serializable { ...@@ -179,12 +180,15 @@ public class CompoEntry implements Serializable {
@Override @Override
public boolean equals(Object object) { public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are not set // TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof CompoEntry)) { if (!(object instanceof CompoEntry)) {
return false; return false;
} }
CompoEntry other = (CompoEntry) object; CompoEntry other = (CompoEntry) object;
if ((this.entriesId == null && other.entriesId != null) || (this.entriesId != null && !this.entriesId.equals(other.entriesId))) { if ((this.entriesId == null && other.entriesId != null)
|| (this.entriesId != null && !this.entriesId
.equals(other.entriesId))) {
return false; return false;
} }
return true; return true;
...@@ -192,7 +196,8 @@ public class CompoEntry implements Serializable { ...@@ -192,7 +196,8 @@ public class CompoEntry implements Serializable {
@Override @Override
public String toString() { public String toString() {
return "fi.insomnia.bortal.model.CompoEntry[entriesId=" + entriesId + "]"; return "fi.insomnia.bortal.model.CompoEntry[entriesId=" + entriesId
+ "]";
} }
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntryFile.java
...@@ -27,7 +27,7 @@ import javax.persistence.TemporalType; ...@@ -27,7 +27,7 @@ import javax.persistence.TemporalType;
*/ */
@Entity @Entity
@Table(name = "entry_files") @Table(name = "entry_files")
@NamedQueries({ @NamedQueries( {
@NamedQuery(name = "CompoEntryFile.findAll", query = "SELECT c FROM CompoEntryFile c"), @NamedQuery(name = "CompoEntryFile.findAll", query = "SELECT c FROM CompoEntryFile c"),
@NamedQuery(name = "CompoEntryFile.findByEntryFilesId", query = "SELECT c FROM CompoEntryFile c WHERE c.entryFilesId = :entryFilesId"), @NamedQuery(name = "CompoEntryFile.findByEntryFilesId", query = "SELECT c FROM CompoEntryFile c WHERE c.entryFilesId = :entryFilesId"),
@NamedQuery(name = "CompoEntryFile.findByMimeType", query = "SELECT c FROM CompoEntryFile c WHERE c.mimeType = :mimeType"), @NamedQuery(name = "CompoEntryFile.findByMimeType", query = "SELECT c FROM CompoEntryFile c WHERE c.mimeType = :mimeType"),
...@@ -35,7 +35,7 @@ import javax.persistence.TemporalType; ...@@ -35,7 +35,7 @@ import javax.persistence.TemporalType;
@NamedQuery(name = "CompoEntryFile.findByDescription", query = "SELECT c FROM CompoEntryFile c WHERE c.description = :description"), @NamedQuery(name = "CompoEntryFile.findByDescription", query = "SELECT c FROM CompoEntryFile c WHERE c.description = :description"),
@NamedQuery(name = "CompoEntryFile.findByHash", query = "SELECT c FROM CompoEntryFile c WHERE c.hash = :hash"), @NamedQuery(name = "CompoEntryFile.findByHash", query = "SELECT c FROM CompoEntryFile c WHERE c.hash = :hash"),
@NamedQuery(name = "CompoEntryFile.findByComment", query = "SELECT c FROM CompoEntryFile c WHERE c.comment = :comment"), @NamedQuery(name = "CompoEntryFile.findByComment", query = "SELECT c FROM CompoEntryFile c WHERE c.comment = :comment"),
@NamedQuery(name = "CompoEntryFile.findByUploaded", query = "SELECT c FROM CompoEntryFile c WHERE c.uploaded = :uploaded")}) @NamedQuery(name = "CompoEntryFile.findByUploaded", query = "SELECT c FROM CompoEntryFile c WHERE c.uploaded = :uploaded") })
public class CompoEntryFile implements Serializable { public class CompoEntryFile implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
...@@ -156,12 +156,15 @@ public class CompoEntryFile implements Serializable { ...@@ -156,12 +156,15 @@ public class CompoEntryFile implements Serializable {
@Override @Override
public boolean equals(Object object) { public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are not set // TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof CompoEntryFile)) { if (!(object instanceof CompoEntryFile)) {
return false; return false;
} }
CompoEntryFile other = (CompoEntryFile) object; CompoEntryFile other = (CompoEntryFile) object;
if ((this.entryFilesId == null && other.entryFilesId != null) || (this.entryFilesId != null && !this.entryFilesId.equals(other.entryFilesId))) { if ((this.entryFilesId == null && other.entryFilesId != null)
|| (this.entryFilesId != null && !this.entryFilesId
.equals(other.entryFilesId))) {
return false; return false;
} }
return true; return true;
...@@ -169,7 +172,8 @@ public class CompoEntryFile implements Serializable { ...@@ -169,7 +172,8 @@ public class CompoEntryFile implements Serializable {
@Override @Override
public String toString() { public String toString() {
return "fi.insomnia.bortal.model.CompoEntryFile[entryFilesId=" + entryFilesId + "]"; return "fi.insomnia.bortal.model.CompoEntryFile[entryFilesId="
+ entryFilesId + "]";
} }
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntryParticipant.java
...@@ -23,10 +23,10 @@ import javax.persistence.Table; ...@@ -23,10 +23,10 @@ import javax.persistence.Table;
*/ */
@Entity @Entity
@Table(name = "entry_participations") @Table(name = "entry_participations")
@NamedQueries({ @NamedQueries( {
@NamedQuery(name = "CompoEntryParticipant.findAll", query = "SELECT c FROM CompoEntryParticipant c"), @NamedQuery(name = "CompoEntryParticipant.findAll", query = "SELECT c FROM CompoEntryParticipant c"),
@NamedQuery(name = "CompoEntryParticipant.findByEntryParticipationsId", query = "SELECT c FROM CompoEntryParticipant c WHERE c.entryParticipationsId = :entryParticipationsId"), @NamedQuery(name = "CompoEntryParticipant.findByEntryParticipationsId", query = "SELECT c FROM CompoEntryParticipant c WHERE c.entryParticipationsId = :entryParticipationsId"),
@NamedQuery(name = "CompoEntryParticipant.findByRole", query = "SELECT c FROM CompoEntryParticipant c WHERE c.role = :role")}) @NamedQuery(name = "CompoEntryParticipant.findByRole", query = "SELECT c FROM CompoEntryParticipant c WHERE c.role = :role") })
public class CompoEntryParticipant implements Serializable { public class CompoEntryParticipant implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
...@@ -84,18 +84,22 @@ public class CompoEntryParticipant implements Serializable { ...@@ -84,18 +84,22 @@ public class CompoEntryParticipant implements Serializable {
@Override @Override
public int hashCode() { public int hashCode() {
int hash = 0; int hash = 0;
hash += (entryParticipationsId != null ? entryParticipationsId.hashCode() : 0); hash += (entryParticipationsId != null ? entryParticipationsId
.hashCode() : 0);
return hash; return hash;
} }
@Override @Override
public boolean equals(Object object) { public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are not set // TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof CompoEntryParticipant)) { if (!(object instanceof CompoEntryParticipant)) {
return false; return false;
} }
CompoEntryParticipant other = (CompoEntryParticipant) object; CompoEntryParticipant other = (CompoEntryParticipant) object;
if ((this.entryParticipationsId == null && other.entryParticipationsId != null) || (this.entryParticipationsId != null && !this.entryParticipationsId.equals(other.entryParticipationsId))) { if ((this.entryParticipationsId == null && other.entryParticipationsId != null)
|| (this.entryParticipationsId != null && !this.entryParticipationsId
.equals(other.entryParticipationsId))) {
return false; return false;
} }
return true; return true;
...@@ -103,7 +107,8 @@ public class CompoEntryParticipant implements Serializable { ...@@ -103,7 +107,8 @@ public class CompoEntryParticipant implements Serializable {
@Override @Override
public String toString() { public String toString() {
return "fi.insomnia.bortal.model.CompoEntryParticipant[entryParticipationsId=" + entryParticipationsId + "]"; return "fi.insomnia.bortal.model.CompoEntryParticipant[entryParticipationsId="
+ entryParticipationsId + "]";
} }
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Discount.java
...@@ -25,7 +25,7 @@ import javax.persistence.Table; ...@@ -25,7 +25,7 @@ import javax.persistence.Table;
*/ */
@Entity @Entity
@Table(name = "discounts") @Table(name = "discounts")
@NamedQueries({ @NamedQueries( {
@NamedQuery(name = "Discount.findAll", query = "SELECT d FROM Discount d"), @NamedQuery(name = "Discount.findAll", query = "SELECT d FROM Discount d"),
@NamedQuery(name = "Discount.findByDiscountsId", query = "SELECT d FROM Discount d WHERE d.discountsId = :discountsId"), @NamedQuery(name = "Discount.findByDiscountsId", query = "SELECT d FROM Discount d WHERE d.discountsId = :discountsId"),
@NamedQuery(name = "Discount.findByPercentage", query = "SELECT d FROM Discount d WHERE d.percentage = :percentage"), @NamedQuery(name = "Discount.findByPercentage", query = "SELECT d FROM Discount d WHERE d.percentage = :percentage"),
...@@ -35,7 +35,7 @@ import javax.persistence.Table; ...@@ -35,7 +35,7 @@ import javax.persistence.Table;
@NamedQuery(name = "Discount.findByAmountMax", query = "SELECT d FROM Discount d WHERE d.amountMax = :amountMax"), @NamedQuery(name = "Discount.findByAmountMax", query = "SELECT d FROM Discount d WHERE d.amountMax = :amountMax"),
@NamedQuery(name = "Discount.findByActive", query = "SELECT d FROM Discount d WHERE d.active = :active"), @NamedQuery(name = "Discount.findByActive", query = "SELECT d FROM Discount d WHERE d.active = :active"),
@NamedQuery(name = "Discount.findByMaxNum", query = "SELECT d FROM Discount d WHERE d.maxNum = :maxNum"), @NamedQuery(name = "Discount.findByMaxNum", query = "SELECT d FROM Discount d WHERE d.maxNum = :maxNum"),
@NamedQuery(name = "Discount.findByPerUser", query = "SELECT d FROM Discount d WHERE d.perUser = :perUser")}) @NamedQuery(name = "Discount.findByPerUser", query = "SELECT d FROM Discount d WHERE d.perUser = :perUser") })
public class Discount implements Serializable { public class Discount implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
...@@ -74,7 +74,8 @@ public class Discount implements Serializable { ...@@ -74,7 +74,8 @@ public class Discount implements Serializable {
this.discountsId = discountsId; this.discountsId = discountsId;
} }
public Discount(Integer discountsId, BigInteger percentage, int amountMin, int amountMax, boolean active, int maxNum, int perUser) { public Discount(Integer discountsId, BigInteger percentage, int amountMin,
int amountMax, boolean active, int maxNum, int perUser) {
this.discountsId = discountsId; this.discountsId = discountsId;
this.percentage = percentage; this.percentage = percentage;
this.amountMin = amountMin; this.amountMin = amountMin;
...@@ -160,7 +161,8 @@ public class Discount implements Serializable { ...@@ -160,7 +161,8 @@ public class Discount implements Serializable {
return discountInstanceList; return discountInstanceList;
} }
public void setDiscountInstanceList(List<DiscountInstance> discountInstanceList) { public void setDiscountInstanceList(
List<DiscountInstance> discountInstanceList) {
this.discountInstanceList = discountInstanceList; this.discountInstanceList = discountInstanceList;
} }
...@@ -173,12 +175,15 @@ public class Discount implements Serializable { ...@@ -173,12 +175,15 @@ public class Discount implements Serializable {
@Override @Override
public boolean equals(Object object) { public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are not set // TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof Discount)) { if (!(object instanceof Discount)) {
return false; return false;
} }
Discount other = (Discount) object; Discount other = (Discount) object;
if ((this.discountsId == null && other.discountsId != null) || (this.discountsId != null && !this.discountsId.equals(other.discountsId))) { if ((this.discountsId == null && other.discountsId != null)
|| (this.discountsId != null && !this.discountsId
.equals(other.discountsId))) {
return false; return false;
} }
return true; return true;
...@@ -186,7 +191,8 @@ public class Discount implements Serializable { ...@@ -186,7 +191,8 @@ public class Discount implements Serializable {
@Override @Override
public String toString() { public String toString() {
return "fi.insomnia.bortal.model.Discount[discountsId=" + discountsId + "]"; return "fi.insomnia.bortal.model.Discount[discountsId=" + discountsId
+ "]";
} }
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/DiscountInstance.java
...@@ -23,9 +23,9 @@ import javax.persistence.Table; ...@@ -23,9 +23,9 @@ import javax.persistence.Table;
*/ */
@Entity @Entity
@Table(name = "discount_instances") @Table(name = "discount_instances")
@NamedQueries({ @NamedQueries( {
@NamedQuery(name = "DiscountInstance.findAll", query = "SELECT d FROM DiscountInstance d"), @NamedQuery(name = "DiscountInstance.findAll", query = "SELECT d FROM DiscountInstance d"),
@NamedQuery(name = "DiscountInstance.findByDiscountsInstancesId", query = "SELECT d FROM DiscountInstance d WHERE d.discountsInstancesId = :discountsInstancesId")}) @NamedQuery(name = "DiscountInstance.findByDiscountsInstancesId", query = "SELECT d FROM DiscountInstance d WHERE d.discountsInstancesId = :discountsInstancesId") })
public class DiscountInstance implements Serializable { public class DiscountInstance implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
...@@ -84,18 +84,22 @@ public class DiscountInstance implements Serializable { ...@@ -84,18 +84,22 @@ public class DiscountInstance implements Serializable {
@Override @Override
public int hashCode() { public int hashCode() {
int hash = 0; int hash = 0;
hash += (discountsInstancesId != null ? discountsInstancesId.hashCode() : 0); hash += (discountsInstancesId != null ? discountsInstancesId.hashCode()
: 0);
return hash; return hash;
} }
@Override @Override
public boolean equals(Object object) { public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are not set // TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof DiscountInstance)) { if (!(object instanceof DiscountInstance)) {
return false; return false;
} }
DiscountInstance other = (DiscountInstance) object; DiscountInstance other = (DiscountInstance) object;
if ((this.discountsInstancesId == null && other.discountsInstancesId != null) || (this.discountsInstancesId != null && !this.discountsInstancesId.equals(other.discountsInstancesId))) { if ((this.discountsInstancesId == null && other.discountsInstancesId != null)
|| (this.discountsInstancesId != null && !this.discountsInstancesId
.equals(other.discountsInstancesId))) {
return false; return false;
} }
return true; return true;
...@@ -103,7 +107,8 @@ public class DiscountInstance implements Serializable { ...@@ -103,7 +107,8 @@ public class DiscountInstance implements Serializable {
@Override @Override
public String toString() { public String toString() {
return "fi.insomnia.bortal.model.DiscountInstance[discountsInstancesId=" + discountsInstancesId + "]"; return "fi.insomnia.bortal.model.DiscountInstance[discountsInstancesId="
+ discountsInstancesId + "]";
} }
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Event.java
...@@ -29,13 +29,13 @@ import javax.persistence.TemporalType; ...@@ -29,13 +29,13 @@ import javax.persistence.TemporalType;
*/ */
@Entity @Entity
@Table(name = "events") @Table(name = "events")
@NamedQueries({ @NamedQueries( {
@NamedQuery(name = "Event.findAll", query = "SELECT e FROM Event e"), @NamedQuery(name = "Event.findAll", query = "SELECT e FROM Event e"),
@NamedQuery(name = "Event.findByEventsId", query = "SELECT e FROM Event e WHERE e.eventsId = :eventsId"), @NamedQuery(name = "Event.findByEventsId", query = "SELECT e FROM Event e WHERE e.eventsId = :eventsId"),
@NamedQuery(name = "Event.findByStartTime", query = "SELECT e FROM Event e WHERE e.startTime = :startTime"), @NamedQuery(name = "Event.findByStartTime", query = "SELECT e FROM Event e WHERE e.startTime = :startTime"),
@NamedQuery(name = "Event.findByEndTime", query = "SELECT e FROM Event e WHERE e.endTime = :endTime"), @NamedQuery(name = "Event.findByEndTime", query = "SELECT e FROM Event e WHERE e.endTime = :endTime"),
@NamedQuery(name = "Event.findByName", query = "SELECT e FROM Event e WHERE e.name = :name"), @NamedQuery(name = "Event.findByName", query = "SELECT e FROM Event e WHERE e.name = :name"),
@NamedQuery(name = "Event.findByReferer", query = "SELECT e FROM Event e WHERE e.referer = :referer")}) @NamedQuery(name = "Event.findByReferer", query = "SELECT e FROM Event e WHERE e.referer = :referer") })
public class Event implements Serializable { public class Event implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
...@@ -188,12 +188,15 @@ public class Event implements Serializable { ...@@ -188,12 +188,15 @@ public class Event implements Serializable {
@Override @Override
public boolean equals(Object object) { public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are not set // TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof Event)) { if (!(object instanceof Event)) {
return false; return false;
} }
Event other = (Event) object; Event other = (Event) object;
if ((this.eventsId == null && other.eventsId != null) || (this.eventsId != null && !this.eventsId.equals(other.eventsId))) { if ((this.eventsId == null && other.eventsId != null)
|| (this.eventsId != null && !this.eventsId
.equals(other.eventsId))) {
return false; return false;
} }
return true; return true;
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventMap.java
...@@ -27,10 +27,10 @@ import javax.persistence.Table; ...@@ -27,10 +27,10 @@ import javax.persistence.Table;
*/ */
@Entity @Entity
@Table(name = "maps") @Table(name = "maps")
@NamedQueries({ @NamedQueries( {
@NamedQuery(name = "EventMap.findAll", query = "SELECT e FROM EventMap e"), @NamedQuery(name = "EventMap.findAll", query = "SELECT e FROM EventMap e"),
@NamedQuery(name = "EventMap.findByMapsId", query = "SELECT e FROM EventMap e WHERE e.mapsId = :mapsId"), @NamedQuery(name = "EventMap.findByMapsId", query = "SELECT e FROM EventMap e WHERE e.mapsId = :mapsId"),
@NamedQuery(name = "EventMap.findByMapName", query = "SELECT e FROM EventMap e WHERE e.mapName = :mapName")}) @NamedQuery(name = "EventMap.findByMapName", query = "SELECT e FROM EventMap e WHERE e.mapName = :mapName") })
public class EventMap implements Serializable { public class EventMap implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
...@@ -104,12 +104,14 @@ public class EventMap implements Serializable { ...@@ -104,12 +104,14 @@ public class EventMap implements Serializable {
@Override @Override
public boolean equals(Object object) { public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are not set // TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof EventMap)) { if (!(object instanceof EventMap)) {
return false; return false;
} }
EventMap other = (EventMap) object; EventMap other = (EventMap) object;
if ((this.mapsId == null && other.mapsId != null) || (this.mapsId != null && !this.mapsId.equals(other.mapsId))) { if ((this.mapsId == null && other.mapsId != null)
|| (this.mapsId != null && !this.mapsId.equals(other.mapsId))) {
return false; return false;
} }
return true; return true;
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventSettings.java
...@@ -24,13 +24,13 @@ import javax.persistence.Table; ...@@ -24,13 +24,13 @@ import javax.persistence.Table;
*/ */
@Entity @Entity
@Table(name = "event_settings") @Table(name = "event_settings")
@NamedQueries({ @NamedQueries( {
@NamedQuery(name = "EventSettings.findAll", query = "SELECT e FROM EventSettings e"), @NamedQuery(name = "EventSettings.findAll", query = "SELECT e FROM EventSettings e"),
@NamedQuery(name = "EventSettings.findByEventSettingsId", query = "SELECT e FROM EventSettings e WHERE e.eventSettingsId = :eventSettingsId"), @NamedQuery(name = "EventSettings.findByEventSettingsId", query = "SELECT e FROM EventSettings e WHERE e.eventSettingsId = :eventSettingsId"),
@NamedQuery(name = "EventSettings.findByResourceBundle", query = "SELECT e FROM EventSettings e WHERE e.resourceBundle = :resourceBundle"), @NamedQuery(name = "EventSettings.findByResourceBundle", query = "SELECT e FROM EventSettings e WHERE e.resourceBundle = :resourceBundle"),
@NamedQuery(name = "EventSettings.findByStyleSheet", query = "SELECT e FROM EventSettings e WHERE e.styleSheet = :styleSheet"), @NamedQuery(name = "EventSettings.findByStyleSheet", query = "SELECT e FROM EventSettings e WHERE e.styleSheet = :styleSheet"),
@NamedQuery(name = "EventSettings.findByNameGeneralForm", query = "SELECT e FROM EventSettings e WHERE e.nameGeneralForm = :nameGeneralForm"), @NamedQuery(name = "EventSettings.findByNameGeneralForm", query = "SELECT e FROM EventSettings e WHERE e.nameGeneralForm = :nameGeneralForm"),
@NamedQuery(name = "EventSettings.findByNamePossissiveForm", query = "SELECT e FROM EventSettings e WHERE e.namePossissiveForm = :namePossissiveForm")}) @NamedQuery(name = "EventSettings.findByNamePossissiveForm", query = "SELECT e FROM EventSettings e WHERE e.namePossissiveForm = :namePossissiveForm") })
public class EventSettings implements Serializable { public class EventSettings implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
...@@ -112,12 +112,15 @@ public class EventSettings implements Serializable { ...@@ -112,12 +112,15 @@ public class EventSettings implements Serializable {
@Override @Override
public boolean equals(Object object) { public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are not set // TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof EventSettings)) { if (!(object instanceof EventSettings)) {
return false; return false;
} }
EventSettings other = (EventSettings) object; EventSettings other = (EventSettings) object;
if ((this.eventSettingsId == null && other.eventSettingsId != null) || (this.eventSettingsId != null && !this.eventSettingsId.equals(other.eventSettingsId))) { if ((this.eventSettingsId == null && other.eventSettingsId != null)
|| (this.eventSettingsId != null && !this.eventSettingsId
.equals(other.eventSettingsId))) {
return false; return false;
} }
return true; return true;
...@@ -125,7 +128,8 @@ public class EventSettings implements Serializable { ...@@ -125,7 +128,8 @@ public class EventSettings implements Serializable {
@Override @Override
public String toString() { public String toString() {
return "fi.insomnia.bortal.model.EventSettings[eventSettingsId=" + eventSettingsId + "]"; return "fi.insomnia.bortal.model.EventSettings[eventSettingsId="
+ eventSettingsId + "]";
} }
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventStatus.java
...@@ -24,12 +24,11 @@ import javax.persistence.UniqueConstraint; ...@@ -24,12 +24,11 @@ import javax.persistence.UniqueConstraint;
* @author jkj * @author jkj
*/ */
@Entity @Entity
@Table(name = "event_status", uniqueConstraints = { @Table(name = "event_status", uniqueConstraints = { @UniqueConstraint(columnNames = { "status_name" }) })
@UniqueConstraint(columnNames = {"status_name"})}) @NamedQueries( {
@NamedQueries({
@NamedQuery(name = "EventStatus.findAll", query = "SELECT e FROM EventStatus e"), @NamedQuery(name = "EventStatus.findAll", query = "SELECT e FROM EventStatus e"),
@NamedQuery(name = "EventStatus.findByEventStatusId", query = "SELECT e FROM EventStatus e WHERE e.eventStatusId = :eventStatusId"), @NamedQuery(name = "EventStatus.findByEventStatusId", query = "SELECT e FROM EventStatus e WHERE e.eventStatusId = :eventStatusId"),
@NamedQuery(name = "EventStatus.findByStatusName", query = "SELECT e FROM EventStatus e WHERE e.statusName = :statusName")}) @NamedQuery(name = "EventStatus.findByStatusName", query = "SELECT e FROM EventStatus e WHERE e.statusName = :statusName") })
public class EventStatus implements Serializable { public class EventStatus implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
...@@ -87,12 +86,15 @@ public class EventStatus implements Serializable { ...@@ -87,12 +86,15 @@ public class EventStatus implements Serializable {
@Override @Override
public boolean equals(Object object) { public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are not set // TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof EventStatus)) { if (!(object instanceof EventStatus)) {
return false; return false;
} }
EventStatus other = (EventStatus) object; EventStatus other = (EventStatus) object;
if ((this.eventStatusId == null && other.eventStatusId != null) || (this.eventStatusId != null && !this.eventStatusId.equals(other.eventStatusId))) { if ((this.eventStatusId == null && other.eventStatusId != null)
|| (this.eventStatusId != null && !this.eventStatusId
.equals(other.eventStatusId))) {
return false; return false;
} }
return true; return true;
...@@ -100,7 +102,8 @@ public class EventStatus implements Serializable { ...@@ -100,7 +102,8 @@ public class EventStatus implements Serializable {
@Override @Override
public String toString() { public String toString() {
return "fi.insomnia.bortal.model.EventStatus[eventStatusId=" + eventStatusId + "]"; return "fi.insomnia.bortal.model.EventStatus[eventStatusId="
+ eventStatusId + "]";
} }
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWave.java
...@@ -26,13 +26,13 @@ import javax.persistence.TemporalType; ...@@ -26,13 +26,13 @@ import javax.persistence.TemporalType;
*/ */
@Entity @Entity
@Table(name = "food_waves") @Table(name = "food_waves")
@NamedQueries({ @NamedQueries( {
@NamedQuery(name = "FoodWave.findAll", query = "SELECT f FROM FoodWave f"), @NamedQuery(name = "FoodWave.findAll", query = "SELECT f FROM FoodWave f"),
@NamedQuery(name = "FoodWave.findByFoodWavesId", query = "SELECT f FROM FoodWave f WHERE f.foodWavesId = :foodWavesId"), @NamedQuery(name = "FoodWave.findByFoodWavesId", query = "SELECT f FROM FoodWave f WHERE f.foodWavesId = :foodWavesId"),
@NamedQuery(name = "FoodWave.findByWaveName", query = "SELECT f FROM FoodWave f WHERE f.waveName = :waveName"), @NamedQuery(name = "FoodWave.findByWaveName", query = "SELECT f FROM FoodWave f WHERE f.waveName = :waveName"),
@NamedQuery(name = "FoodWave.findByWaveDescription", query = "SELECT f FROM FoodWave f WHERE f.waveDescription = :waveDescription"), @NamedQuery(name = "FoodWave.findByWaveDescription", query = "SELECT f FROM FoodWave f WHERE f.waveDescription = :waveDescription"),
@NamedQuery(name = "FoodWave.findByWaveTime", query = "SELECT f FROM FoodWave f WHERE f.waveTime = :waveTime"), @NamedQuery(name = "FoodWave.findByWaveTime", query = "SELECT f FROM FoodWave f WHERE f.waveTime = :waveTime"),
@NamedQuery(name = "FoodWave.findByWaveClosed", query = "SELECT f FROM FoodWave f WHERE f.waveClosed = :waveClosed")}) @NamedQuery(name = "FoodWave.findByWaveClosed", query = "SELECT f FROM FoodWave f WHERE f.waveClosed = :waveClosed") })
public class FoodWave implements Serializable { public class FoodWave implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
...@@ -123,12 +123,15 @@ public class FoodWave implements Serializable { ...@@ -123,12 +123,15 @@ public class FoodWave implements Serializable {
@Override @Override
public boolean equals(Object object) { public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are not set // TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof FoodWave)) { if (!(object instanceof FoodWave)) {
return false; return false;
} }
FoodWave other = (FoodWave) object; FoodWave other = (FoodWave) object;
if ((this.foodWavesId == null && other.foodWavesId != null) || (this.foodWavesId != null && !this.foodWavesId.equals(other.foodWavesId))) { if ((this.foodWavesId == null && other.foodWavesId != null)
|| (this.foodWavesId != null && !this.foodWavesId
.equals(other.foodWavesId))) {
return false; return false;
} }
return true; return true;
...@@ -136,7 +139,8 @@ public class FoodWave implements Serializable { ...@@ -136,7 +139,8 @@ public class FoodWave implements Serializable {
@Override @Override
public String toString() { public String toString() {
return "fi.insomnia.bortal.model.FoodWave[foodWavesId=" + foodWavesId + "]"; return "fi.insomnia.bortal.model.FoodWave[foodWavesId=" + foodWavesId
+ "]";
} }
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWaveTemplate.java
...@@ -23,11 +23,11 @@ import javax.persistence.Table; ...@@ -23,11 +23,11 @@ import javax.persistence.Table;
*/ */
@Entity @Entity
@Table(name = "food_wave_templates") @Table(name = "food_wave_templates")
@NamedQueries({ @NamedQueries( {
@NamedQuery(name = "FoodWaveTemplate.findAll", query = "SELECT f FROM FoodWaveTemplate f"), @NamedQuery(name = "FoodWaveTemplate.findAll", query = "SELECT f FROM FoodWaveTemplate f"),
@NamedQuery(name = "FoodWaveTemplate.findByFoodWaveTemplatesId", query = "SELECT f FROM FoodWaveTemplate f WHERE f.foodWaveTemplatesId = :foodWaveTemplatesId"), @NamedQuery(name = "FoodWaveTemplate.findByFoodWaveTemplatesId", query = "SELECT f FROM FoodWaveTemplate f WHERE f.foodWaveTemplatesId = :foodWaveTemplatesId"),
@NamedQuery(name = "FoodWaveTemplate.findByTemplateName", query = "SELECT f FROM FoodWaveTemplate f WHERE f.templateName = :templateName"), @NamedQuery(name = "FoodWaveTemplate.findByTemplateName", query = "SELECT f FROM FoodWaveTemplate f WHERE f.templateName = :templateName"),
@NamedQuery(name = "FoodWaveTemplate.findByTemplateDescription", query = "SELECT f FROM FoodWaveTemplate f WHERE f.templateDescription = :templateDescription")}) @NamedQuery(name = "FoodWaveTemplate.findByTemplateDescription", query = "SELECT f FROM FoodWaveTemplate f WHERE f.templateDescription = :templateDescription") })
public class FoodWaveTemplate implements Serializable { public class FoodWaveTemplate implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
...@@ -82,18 +82,22 @@ public class FoodWaveTemplate implements Serializable { ...@@ -82,18 +82,22 @@ public class FoodWaveTemplate implements Serializable {
@Override @Override
public int hashCode() { public int hashCode() {
int hash = 0; int hash = 0;
hash += (foodWaveTemplatesId != null ? foodWaveTemplatesId.hashCode() : 0); hash += (foodWaveTemplatesId != null ? foodWaveTemplatesId.hashCode()
: 0);
return hash; return hash;
} }
@Override @Override
public boolean equals(Object object) { public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are not set // TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof FoodWaveTemplate)) { if (!(object instanceof FoodWaveTemplate)) {
return false; return false;
} }
FoodWaveTemplate other = (FoodWaveTemplate) object; FoodWaveTemplate other = (FoodWaveTemplate) object;
if ((this.foodWaveTemplatesId == null && other.foodWaveTemplatesId != null) || (this.foodWaveTemplatesId != null && !this.foodWaveTemplatesId.equals(other.foodWaveTemplatesId))) { if ((this.foodWaveTemplatesId == null && other.foodWaveTemplatesId != null)
|| (this.foodWaveTemplatesId != null && !this.foodWaveTemplatesId
.equals(other.foodWaveTemplatesId))) {
return false; return false;
} }
return true; return true;
...@@ -101,7 +105,8 @@ public class FoodWaveTemplate implements Serializable { ...@@ -101,7 +105,8 @@ public class FoodWaveTemplate implements Serializable {
@Override @Override
public String toString() { public String toString() {
return "fi.insomnia.bortal.model.FoodWaveTemplate[foodWaveTemplatesId=" + foodWaveTemplatesId + "]"; return "fi.insomnia.bortal.model.FoodWaveTemplate[foodWaveTemplatesId="
+ foodWaveTemplatesId + "]";
} }
/** /**
...@@ -112,7 +117,8 @@ public class FoodWaveTemplate implements Serializable { ...@@ -112,7 +117,8 @@ public class FoodWaveTemplate implements Serializable {
} }
/** /**
* @param products the products to set * @param products
* the products to set
*/ */
public void setProducts(List<Product> products) { public void setProducts(List<Product> products) {
this.products = products; this.products = products;
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/GroupMembership.java
...@@ -26,14 +26,14 @@ import javax.persistence.UniqueConstraint; ...@@ -26,14 +26,14 @@ import javax.persistence.UniqueConstraint;
* @author jkj * @author jkj
*/ */
@Entity @Entity
@Table(name = "group_memberships", uniqueConstraints = { @Table(name = "group_memberships", uniqueConstraints = { @UniqueConstraint(columnNames = {
@UniqueConstraint(columnNames = {"users_id", "groups_id"})}) "users_id", "groups_id" }) })
@NamedQueries({ @NamedQueries( {
@NamedQuery(name = "GroupMembership.findAll", query = "SELECT g FROM GroupMembership g"), @NamedQuery(name = "GroupMembership.findAll", query = "SELECT g FROM GroupMembership g"),
@NamedQuery(name = "GroupMembership.findByGroupMembershipsId", query = "SELECT g FROM GroupMembership g WHERE g.groupMembershipsId = :groupMembershipsId"), @NamedQuery(name = "GroupMembership.findByGroupMembershipsId", query = "SELECT g FROM GroupMembership g WHERE g.groupMembershipsId = :groupMembershipsId"),
@NamedQuery(name = "GroupMembership.findByInviteAccepted", query = "SELECT g FROM GroupMembership g WHERE g.inviteAccepted = :inviteAccepted"), @NamedQuery(name = "GroupMembership.findByInviteAccepted", query = "SELECT g FROM GroupMembership g WHERE g.inviteAccepted = :inviteAccepted"),
@NamedQuery(name = "GroupMembership.findByInviteEmail", query = "SELECT g FROM GroupMembership g WHERE g.inviteEmail = :inviteEmail"), @NamedQuery(name = "GroupMembership.findByInviteEmail", query = "SELECT g FROM GroupMembership g WHERE g.inviteEmail = :inviteEmail"),
@NamedQuery(name = "GroupMembership.findByInviteName", query = "SELECT g FROM GroupMembership g WHERE g.inviteName = :inviteName")}) @NamedQuery(name = "GroupMembership.findByInviteName", query = "SELECT g FROM GroupMembership g WHERE g.inviteName = :inviteName") })
public class GroupMembership implements Serializable { public class GroupMembership implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
...@@ -129,12 +129,15 @@ public class GroupMembership implements Serializable { ...@@ -129,12 +129,15 @@ public class GroupMembership implements Serializable {
@Override @Override
public boolean equals(Object object) { public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are not set // TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof GroupMembership)) { if (!(object instanceof GroupMembership)) {
return false; return false;
} }
GroupMembership other = (GroupMembership) object; GroupMembership other = (GroupMembership) object;
if ((this.groupMembershipsId == null && other.groupMembershipsId != null) || (this.groupMembershipsId != null && !this.groupMembershipsId.equals(other.groupMembershipsId))) { if ((this.groupMembershipsId == null && other.groupMembershipsId != null)
|| (this.groupMembershipsId != null && !this.groupMembershipsId
.equals(other.groupMembershipsId))) {
return false; return false;
} }
return true; return true;
...@@ -142,7 +145,8 @@ public class GroupMembership implements Serializable { ...@@ -142,7 +145,8 @@ public class GroupMembership implements Serializable {
@Override @Override
public String toString() { public String toString() {
return "fi.insomnia.bortal.model.GroupMembership[groupMembershipsId=" + groupMembershipsId + "]"; return "fi.insomnia.bortal.model.GroupMembership[groupMembershipsId="
+ groupMembershipsId + "]";
} }
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Location.java
...@@ -23,10 +23,10 @@ import javax.persistence.Table; ...@@ -23,10 +23,10 @@ import javax.persistence.Table;
*/ */
@Entity @Entity
@Table(name = "locations") @Table(name = "locations")
@NamedQueries({ @NamedQueries( {
@NamedQuery(name = "Location.findAll", query = "SELECT l FROM Location l"), @NamedQuery(name = "Location.findAll", query = "SELECT l FROM Location l"),
@NamedQuery(name = "Location.findByLocationsId", query = "SELECT l FROM Location l WHERE l.locationsId = :locationsId"), @NamedQuery(name = "Location.findByLocationsId", query = "SELECT l FROM Location l WHERE l.locationsId = :locationsId"),
@NamedQuery(name = "Location.findByLocationName", query = "SELECT l FROM Location l WHERE l.locationName = :locationName")}) @NamedQuery(name = "Location.findByLocationName", query = "SELECT l FROM Location l WHERE l.locationName = :locationName") })
public class Location implements Serializable { public class Location implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
...@@ -94,12 +94,15 @@ public class Location implements Serializable { ...@@ -94,12 +94,15 @@ public class Location implements Serializable {
@Override @Override
public boolean equals(Object object) { public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are not set // TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof Location)) { if (!(object instanceof Location)) {
return false; return false;
} }
Location other = (Location) object; Location other = (Location) object;
if ((this.locationsId == null && other.locationsId != null) || (this.locationsId != null && !this.locationsId.equals(other.locationsId))) { if ((this.locationsId == null && other.locationsId != null)
|| (this.locationsId != null && !this.locationsId
.equals(other.locationsId))) {
return false; return false;
} }
return true; return true;
...@@ -107,7 +110,8 @@ public class Location implements Serializable { ...@@ -107,7 +110,8 @@ public class Location implements Serializable {
@Override @Override
public String toString() { public String toString() {
return "fi.insomnia.bortal.model.Location[locationsId=" + locationsId + "]"; return "fi.insomnia.bortal.model.Location[locationsId=" + locationsId
+ "]";
} }
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/LogEntry.java
...@@ -26,11 +26,11 @@ import javax.persistence.TemporalType; ...@@ -26,11 +26,11 @@ import javax.persistence.TemporalType;
*/ */
@Entity @Entity
@Table(name = "event_log") @Table(name = "event_log")
@NamedQueries({ @NamedQueries( {
@NamedQuery(name = "LogEntry.findAll", query = "SELECT l FROM LogEntry l"), @NamedQuery(name = "LogEntry.findAll", query = "SELECT l FROM LogEntry l"),
@NamedQuery(name = "LogEntry.findByEventLogId", query = "SELECT l FROM LogEntry l WHERE l.eventLogId = :eventLogId"), @NamedQuery(name = "LogEntry.findByEventLogId", query = "SELECT l FROM LogEntry l WHERE l.eventLogId = :eventLogId"),
@NamedQuery(name = "LogEntry.findByEventTime", query = "SELECT l FROM LogEntry l WHERE l.eventTime = :eventTime"), @NamedQuery(name = "LogEntry.findByEventTime", query = "SELECT l FROM LogEntry l WHERE l.eventTime = :eventTime"),
@NamedQuery(name = "LogEntry.findByEventDescription", query = "SELECT l FROM LogEntry l WHERE l.eventDescription = :eventDescription")}) @NamedQuery(name = "LogEntry.findByEventDescription", query = "SELECT l FROM LogEntry l WHERE l.eventDescription = :eventDescription") })
public class LogEntry implements Serializable { public class LogEntry implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
...@@ -111,12 +111,15 @@ public class LogEntry implements Serializable { ...@@ -111,12 +111,15 @@ public class LogEntry implements Serializable {
@Override @Override
public boolean equals(Object object) { public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are not set // TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof LogEntry)) { if (!(object instanceof LogEntry)) {
return false; return false;
} }
LogEntry other = (LogEntry) object; LogEntry other = (LogEntry) object;
if ((this.eventLogId == null && other.eventLogId != null) || (this.eventLogId != null && !this.eventLogId.equals(other.eventLogId))) { if ((this.eventLogId == null && other.eventLogId != null)
|| (this.eventLogId != null && !this.eventLogId
.equals(other.eventLogId))) {
return false; return false;
} }
return true; return true;
...@@ -124,7 +127,8 @@ public class LogEntry implements Serializable { ...@@ -124,7 +127,8 @@ public class LogEntry implements Serializable {
@Override @Override
public String toString() { public String toString() {
return "fi.insomnia.bortal.model.LogEntry[eventLogId=" + eventLogId + "]"; return "fi.insomnia.bortal.model.LogEntry[eventLogId=" + eventLogId
+ "]";
} }
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/LogEntryType.java
...@@ -24,10 +24,10 @@ import javax.persistence.Table; ...@@ -24,10 +24,10 @@ import javax.persistence.Table;
*/ */
@Entity @Entity
@Table(name = "event_log_types") @Table(name = "event_log_types")
@NamedQueries({ @NamedQueries( {
@NamedQuery(name = "LogEntryType.findAll", query = "SELECT l FROM LogEntryType l"), @NamedQuery(name = "LogEntryType.findAll", query = "SELECT l FROM LogEntryType l"),
@NamedQuery(name = "LogEntryType.findByEventLogTypesId", query = "SELECT l FROM LogEntryType l WHERE l.eventLogTypesId = :eventLogTypesId"), @NamedQuery(name = "LogEntryType.findByEventLogTypesId", query = "SELECT l FROM LogEntryType l WHERE l.eventLogTypesId = :eventLogTypesId"),
@NamedQuery(name = "LogEntryType.findByEventTypeDescription", query = "SELECT l FROM LogEntryType l WHERE l.eventTypeDescription = :eventTypeDescription")}) @NamedQuery(name = "LogEntryType.findByEventTypeDescription", query = "SELECT l FROM LogEntryType l WHERE l.eventTypeDescription = :eventTypeDescription") })
public class LogEntryType implements Serializable { public class LogEntryType implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
...@@ -85,12 +85,15 @@ public class LogEntryType implements Serializable { ...@@ -85,12 +85,15 @@ public class LogEntryType implements Serializable {
@Override @Override
public boolean equals(Object object) { public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are not set // TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof LogEntryType)) { if (!(object instanceof LogEntryType)) {
return false; return false;
} }
LogEntryType other = (LogEntryType) object; LogEntryType other = (LogEntryType) object;
if ((this.eventLogTypesId == null && other.eventLogTypesId != null) || (this.eventLogTypesId != null && !this.eventLogTypesId.equals(other.eventLogTypesId))) { if ((this.eventLogTypesId == null && other.eventLogTypesId != null)
|| (this.eventLogTypesId != null && !this.eventLogTypesId
.equals(other.eventLogTypesId))) {
return false; return false;
} }
return true; return true;
...@@ -98,7 +101,8 @@ public class LogEntryType implements Serializable { ...@@ -98,7 +101,8 @@ public class LogEntryType implements Serializable {
@Override @Override
public String toString() { public String toString() {
return "fi.insomnia.bortal.model.LogEntryType[eventLogTypesId=" + eventLogTypesId + "]"; return "fi.insomnia.bortal.model.LogEntryType[eventLogTypesId="
+ eventLogTypesId + "]";
} }
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/News.java
...@@ -26,7 +26,7 @@ import javax.persistence.TemporalType; ...@@ -26,7 +26,7 @@ import javax.persistence.TemporalType;
*/ */
@Entity @Entity
@Table(name = "news") @Table(name = "news")
@NamedQueries({ @NamedQueries( {
@NamedQuery(name = "News.findAll", query = "SELECT n FROM News n"), @NamedQuery(name = "News.findAll", query = "SELECT n FROM News n"),
@NamedQuery(name = "News.findByNewsId", query = "SELECT n FROM News n WHERE n.newsId = :newsId"), @NamedQuery(name = "News.findByNewsId", query = "SELECT n FROM News n WHERE n.newsId = :newsId"),
@NamedQuery(name = "News.findByTitle", query = "SELECT n FROM News n WHERE n.title = :title"), @NamedQuery(name = "News.findByTitle", query = "SELECT n FROM News n WHERE n.title = :title"),
...@@ -34,7 +34,7 @@ import javax.persistence.TemporalType; ...@@ -34,7 +34,7 @@ import javax.persistence.TemporalType;
@NamedQuery(name = "News.findByAbstract1", query = "SELECT n FROM News n WHERE n.abstract1 = :abstract1"), @NamedQuery(name = "News.findByAbstract1", query = "SELECT n FROM News n WHERE n.abstract1 = :abstract1"),
@NamedQuery(name = "News.findByPublish", query = "SELECT n FROM News n WHERE n.publish = :publish"), @NamedQuery(name = "News.findByPublish", query = "SELECT n FROM News n WHERE n.publish = :publish"),
@NamedQuery(name = "News.findByExpire", query = "SELECT n FROM News n WHERE n.expire = :expire"), @NamedQuery(name = "News.findByExpire", query = "SELECT n FROM News n WHERE n.expire = :expire"),
@NamedQuery(name = "News.findByPriority", query = "SELECT n FROM News n WHERE n.priority = :priority")}) @NamedQuery(name = "News.findByPriority", query = "SELECT n FROM News n WHERE n.priority = :priority") })
public class News implements Serializable { public class News implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
...@@ -147,12 +147,14 @@ public class News implements Serializable { ...@@ -147,12 +147,14 @@ public class News implements Serializable {
@Override @Override
public boolean equals(Object object) { public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are not set // TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof News)) { if (!(object instanceof News)) {
return false; return false;
} }
News other = (News) object; News other = (News) object;
if ((this.newsId == null && other.newsId != null) || (this.newsId != null && !this.newsId.equals(other.newsId))) { if ((this.newsId == null && other.newsId != null)
|| (this.newsId != null && !this.newsId.equals(other.newsId))) {
return false; return false;
} }
return true; return true;
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/NewsGroup.java
...@@ -26,12 +26,12 @@ import javax.persistence.Table; ...@@ -26,12 +26,12 @@ import javax.persistence.Table;
*/ */
@Entity @Entity
@Table(name = "news_groups") @Table(name = "news_groups")
@NamedQueries({ @NamedQueries( {
@NamedQuery(name = "NewsGroup.findAll", query = "SELECT n FROM NewsGroup n"), @NamedQuery(name = "NewsGroup.findAll", query = "SELECT n FROM NewsGroup n"),
@NamedQuery(name = "NewsGroup.findByNewsGroupsId", query = "SELECT n FROM NewsGroup n WHERE n.newsGroupsId = :newsGroupsId"), @NamedQuery(name = "NewsGroup.findByNewsGroupsId", query = "SELECT n FROM NewsGroup n WHERE n.newsGroupsId = :newsGroupsId"),
@NamedQuery(name = "NewsGroup.findByGroupName", query = "SELECT n FROM NewsGroup n WHERE n.groupName = :groupName"), @NamedQuery(name = "NewsGroup.findByGroupName", query = "SELECT n FROM NewsGroup n WHERE n.groupName = :groupName"),
@NamedQuery(name = "NewsGroup.findByGroupDescription", query = "SELECT n FROM NewsGroup n WHERE n.groupDescription = :groupDescription"), @NamedQuery(name = "NewsGroup.findByGroupDescription", query = "SELECT n FROM NewsGroup n WHERE n.groupDescription = :groupDescription"),
@NamedQuery(name = "NewsGroup.findByPriority", query = "SELECT n FROM NewsGroup n WHERE n.priority = :priority")}) @NamedQuery(name = "NewsGroup.findByPriority", query = "SELECT n FROM NewsGroup n WHERE n.priority = :priority") })
public class NewsGroup implements Serializable { public class NewsGroup implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
...@@ -122,12 +122,15 @@ public class NewsGroup implements Serializable { ...@@ -122,12 +122,15 @@ public class NewsGroup implements Serializable {
@Override @Override
public boolean equals(Object object) { public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are not set // TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof NewsGroup)) { if (!(object instanceof NewsGroup)) {
return false; return false;
} }
NewsGroup other = (NewsGroup) object; NewsGroup other = (NewsGroup) object;
if ((this.newsGroupsId == null && other.newsGroupsId != null) || (this.newsGroupsId != null && !this.newsGroupsId.equals(other.newsGroupsId))) { if ((this.newsGroupsId == null && other.newsGroupsId != null)
|| (this.newsGroupsId != null && !this.newsGroupsId
.equals(other.newsGroupsId))) {
return false; return false;
} }
return true; return true;
...@@ -135,7 +138,8 @@ public class NewsGroup implements Serializable { ...@@ -135,7 +138,8 @@ public class NewsGroup implements Serializable {
@Override @Override
public String toString() { public String toString() {
return "fi.insomnia.bortal.model.NewsGroup[newsGroupsId=" + newsGroupsId + "]"; return "fi.insomnia.bortal.model.NewsGroup[newsGroupsId="
+ newsGroupsId + "]";
} }
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Place.java
...@@ -26,7 +26,7 @@ import javax.persistence.Table; ...@@ -26,7 +26,7 @@ import javax.persistence.Table;
*/ */
@Entity @Entity
@Table(name = "places") @Table(name = "places")
@NamedQueries({ @NamedQueries( {
@NamedQuery(name = "Place.findAll", query = "SELECT p FROM Place p"), @NamedQuery(name = "Place.findAll", query = "SELECT p FROM Place p"),
@NamedQuery(name = "Place.findByPlacesId", query = "SELECT p FROM Place p WHERE p.placesId = :placesId"), @NamedQuery(name = "Place.findByPlacesId", query = "SELECT p FROM Place p WHERE p.placesId = :placesId"),
@NamedQuery(name = "Place.findByPlaceDescription", query = "SELECT p FROM Place p WHERE p.placeDescription = :placeDescription"), @NamedQuery(name = "Place.findByPlaceDescription", query = "SELECT p FROM Place p WHERE p.placeDescription = :placeDescription"),
...@@ -34,7 +34,7 @@ import javax.persistence.Table; ...@@ -34,7 +34,7 @@ import javax.persistence.Table;
@NamedQuery(name = "Place.findByMapX", query = "SELECT p FROM Place p WHERE p.mapX = :mapX"), @NamedQuery(name = "Place.findByMapX", query = "SELECT p FROM Place p WHERE p.mapX = :mapX"),
@NamedQuery(name = "Place.findByMapY", query = "SELECT p FROM Place p WHERE p.mapY = :mapY"), @NamedQuery(name = "Place.findByMapY", query = "SELECT p FROM Place p WHERE p.mapY = :mapY"),
@NamedQuery(name = "Place.findByPlaceDetails", query = "SELECT p FROM Place p WHERE p.placeDetails = :placeDetails"), @NamedQuery(name = "Place.findByPlaceDetails", query = "SELECT p FROM Place p WHERE p.placeDetails = :placeDetails"),
@NamedQuery(name = "Place.findByPlaceCode", query = "SELECT p FROM Place p WHERE p.placeCode = :placeCode")}) @NamedQuery(name = "Place.findByPlaceCode", query = "SELECT p FROM Place p WHERE p.placeCode = :placeCode") })
public class Place implements Serializable { public class Place implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
...@@ -180,12 +180,15 @@ public class Place implements Serializable { ...@@ -180,12 +180,15 @@ public class Place implements Serializable {
@Override @Override
public boolean equals(Object object) { public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are not set // TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof Place)) { if (!(object instanceof Place)) {
return false; return false;
} }
Place other = (Place) object; Place other = (Place) object;
if ((this.placesId == null && other.placesId != null) || (this.placesId != null && !this.placesId.equals(other.placesId))) { if ((this.placesId == null && other.placesId != null)
|| (this.placesId != null && !this.placesId
.equals(other.placesId))) {
return false; return false;
} }
return true; return true;
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/PlaceGroup.java
...@@ -29,7 +29,7 @@ import javax.persistence.TemporalType; ...@@ -29,7 +29,7 @@ import javax.persistence.TemporalType;
*/ */
@Entity @Entity
@Table(name = "groups") @Table(name = "groups")
@NamedQueries({ @NamedQueries( {
@NamedQuery(name = "PlaceGroup.findAll", query = "SELECT p FROM PlaceGroup p"), @NamedQuery(name = "PlaceGroup.findAll", query = "SELECT p FROM PlaceGroup p"),
@NamedQuery(name = "PlaceGroup.findByGroupsId", query = "SELECT p FROM PlaceGroup p WHERE p.groupsId = :groupsId"), @NamedQuery(name = "PlaceGroup.findByGroupsId", query = "SELECT p FROM PlaceGroup p WHERE p.groupsId = :groupsId"),
@NamedQuery(name = "PlaceGroup.findByGroupCreated", query = "SELECT p FROM PlaceGroup p WHERE p.groupCreated = :groupCreated"), @NamedQuery(name = "PlaceGroup.findByGroupCreated", query = "SELECT p FROM PlaceGroup p WHERE p.groupCreated = :groupCreated"),
...@@ -37,7 +37,7 @@ import javax.persistence.TemporalType; ...@@ -37,7 +37,7 @@ import javax.persistence.TemporalType;
@NamedQuery(name = "PlaceGroup.findByGroupCode", query = "SELECT p FROM PlaceGroup p WHERE p.groupCode = :groupCode"), @NamedQuery(name = "PlaceGroup.findByGroupCode", query = "SELECT p FROM PlaceGroup p WHERE p.groupCode = :groupCode"),
@NamedQuery(name = "PlaceGroup.findByGroupName", query = "SELECT p FROM PlaceGroup p WHERE p.groupName = :groupName"), @NamedQuery(name = "PlaceGroup.findByGroupName", query = "SELECT p FROM PlaceGroup p WHERE p.groupName = :groupName"),
@NamedQuery(name = "PlaceGroup.findByGroupActive", query = "SELECT p FROM PlaceGroup p WHERE p.groupActive = :groupActive"), @NamedQuery(name = "PlaceGroup.findByGroupActive", query = "SELECT p FROM PlaceGroup p WHERE p.groupActive = :groupActive"),
@NamedQuery(name = "PlaceGroup.findByGroupDetails", query = "SELECT p FROM PlaceGroup p WHERE p.groupDetails = :groupDetails")}) @NamedQuery(name = "PlaceGroup.findByGroupDetails", query = "SELECT p FROM PlaceGroup p WHERE p.groupDetails = :groupDetails") })
public class PlaceGroup implements Serializable { public class PlaceGroup implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
...@@ -76,7 +76,8 @@ public class PlaceGroup implements Serializable { ...@@ -76,7 +76,8 @@ public class PlaceGroup implements Serializable {
this.groupsId = groupsId; this.groupsId = groupsId;
} }
public PlaceGroup(Integer groupsId, Date groupCreated, Date groupEdited, boolean groupActive) { public PlaceGroup(Integer groupsId, Date groupCreated, Date groupEdited,
boolean groupActive) {
this.groupsId = groupsId; this.groupsId = groupsId;
this.groupCreated = groupCreated; this.groupCreated = groupCreated;
this.groupEdited = groupEdited; this.groupEdited = groupEdited;
...@@ -172,12 +173,15 @@ public class PlaceGroup implements Serializable { ...@@ -172,12 +173,15 @@ public class PlaceGroup implements Serializable {
@Override @Override
public boolean equals(Object object) { public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are not set // TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof PlaceGroup)) { if (!(object instanceof PlaceGroup)) {
return false; return false;
} }
PlaceGroup other = (PlaceGroup) object; PlaceGroup other = (PlaceGroup) object;
if ((this.groupsId == null && other.groupsId != null) || (this.groupsId != null && !this.groupsId.equals(other.groupsId))) { if ((this.groupsId == null && other.groupsId != null)
|| (this.groupsId != null && !this.groupsId
.equals(other.groupsId))) {
return false; return false;
} }
return true; return true;
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/PrintedCard.java
...@@ -29,14 +29,14 @@ import javax.persistence.TemporalType; ...@@ -29,14 +29,14 @@ import javax.persistence.TemporalType;
*/ */
@Entity @Entity
@Table(name = "printed_cards") @Table(name = "printed_cards")
@NamedQueries({ @NamedQueries( {
@NamedQuery(name = "PrintedCard.findAll", query = "SELECT p FROM PrintedCard p"), @NamedQuery(name = "PrintedCard.findAll", query = "SELECT p FROM PrintedCard p"),
@NamedQuery(name = "PrintedCard.findByPrintedCardsId", query = "SELECT p FROM PrintedCard p WHERE p.printedCardsId = :printedCardsId"), @NamedQuery(name = "PrintedCard.findByPrintedCardsId", query = "SELECT p FROM PrintedCard p WHERE p.printedCardsId = :printedCardsId"),
@NamedQuery(name = "PrintedCard.findByEventRolesTypesId", query = "SELECT p FROM PrintedCard p WHERE p.eventRolesTypesId = :eventRolesTypesId"), @NamedQuery(name = "PrintedCard.findByEventRolesTypesId", query = "SELECT p FROM PrintedCard p WHERE p.eventRolesTypesId = :eventRolesTypesId"),
@NamedQuery(name = "PrintedCard.findByPrintTime", query = "SELECT p FROM PrintedCard p WHERE p.printTime = :printTime"), @NamedQuery(name = "PrintedCard.findByPrintTime", query = "SELECT p FROM PrintedCard p WHERE p.printTime = :printTime"),
@NamedQuery(name = "PrintedCard.findByBarcode", query = "SELECT p FROM PrintedCard p WHERE p.barcode = :barcode"), @NamedQuery(name = "PrintedCard.findByBarcode", query = "SELECT p FROM PrintedCard p WHERE p.barcode = :barcode"),
@NamedQuery(name = "PrintedCard.findByCardEnabled", query = "SELECT p FROM PrintedCard p WHERE p.cardEnabled = :cardEnabled"), @NamedQuery(name = "PrintedCard.findByCardEnabled", query = "SELECT p FROM PrintedCard p WHERE p.cardEnabled = :cardEnabled"),
@NamedQuery(name = "PrintedCard.findByRfidUid", query = "SELECT p FROM PrintedCard p WHERE p.rfidUid = :rfidUid")}) @NamedQuery(name = "PrintedCard.findByRfidUid", query = "SELECT p FROM PrintedCard p WHERE p.rfidUid = :rfidUid") })
public class PrintedCard implements Serializable { public class PrintedCard implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
...@@ -73,7 +73,8 @@ public class PrintedCard implements Serializable { ...@@ -73,7 +73,8 @@ public class PrintedCard implements Serializable {
this.printedCardsId = printedCardsId; this.printedCardsId = printedCardsId;
} }
public PrintedCard(Integer printedCardsId, int eventRolesTypesId, Date printTime, boolean cardEnabled) { public PrintedCard(Integer printedCardsId, int eventRolesTypesId,
Date printTime, boolean cardEnabled) {
this.printedCardsId = printedCardsId; this.printedCardsId = printedCardsId;
this.eventRolesTypesId = eventRolesTypesId; this.eventRolesTypesId = eventRolesTypesId;
this.printTime = printTime; this.printTime = printTime;
...@@ -161,12 +162,15 @@ public class PrintedCard implements Serializable { ...@@ -161,12 +162,15 @@ public class PrintedCard implements Serializable {
@Override @Override
public boolean equals(Object object) { public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are not set // TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof PrintedCard)) { if (!(object instanceof PrintedCard)) {
return false; return false;
} }
PrintedCard other = (PrintedCard) object; PrintedCard other = (PrintedCard) object;
if ((this.printedCardsId == null && other.printedCardsId != null) || (this.printedCardsId != null && !this.printedCardsId.equals(other.printedCardsId))) { if ((this.printedCardsId == null && other.printedCardsId != null)
|| (this.printedCardsId != null && !this.printedCardsId
.equals(other.printedCardsId))) {
return false; return false;
} }
return true; return true;
...@@ -174,7 +178,8 @@ public class PrintedCard implements Serializable { ...@@ -174,7 +178,8 @@ public class PrintedCard implements Serializable {
@Override @Override
public String toString() { public String toString() {
return "fi.insomnia.bortal.model.PrintedCard[printedCardsId=" + printedCardsId + "]"; return "fi.insomnia.bortal.model.PrintedCard[printedCardsId="
+ printedCardsId + "]";
} }
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Reader.java
...@@ -26,11 +26,11 @@ import javax.persistence.Table; ...@@ -26,11 +26,11 @@ import javax.persistence.Table;
*/ */
@Entity @Entity
@Table(name = "readers") @Table(name = "readers")
@NamedQueries({ @NamedQueries( {
@NamedQuery(name = "Reader.findAll", query = "SELECT r FROM Reader r"), @NamedQuery(name = "Reader.findAll", query = "SELECT r FROM Reader r"),
@NamedQuery(name = "Reader.findByReadersId", query = "SELECT r FROM Reader r WHERE r.readersId = :readersId"), @NamedQuery(name = "Reader.findByReadersId", query = "SELECT r FROM Reader r WHERE r.readersId = :readersId"),
@NamedQuery(name = "Reader.findByReaderId", query = "SELECT r FROM Reader r WHERE r.readerId = :readerId"), @NamedQuery(name = "Reader.findByReaderId", query = "SELECT r FROM Reader r WHERE r.readerId = :readerId"),
@NamedQuery(name = "Reader.findByReaderDescription", query = "SELECT r FROM Reader r WHERE r.readerDescription = :readerDescription")}) @NamedQuery(name = "Reader.findByReaderDescription", query = "SELECT r FROM Reader r WHERE r.readerDescription = :readerDescription") })
public class Reader implements Serializable { public class Reader implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
...@@ -103,12 +103,15 @@ public class Reader implements Serializable { ...@@ -103,12 +103,15 @@ public class Reader implements Serializable {
@Override @Override
public boolean equals(Object object) { public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are not set // TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof Reader)) { if (!(object instanceof Reader)) {
return false; return false;
} }
Reader other = (Reader) object; Reader other = (Reader) object;
if ((this.readersId == null && other.readersId != null) || (this.readersId != null && !this.readersId.equals(other.readersId))) { if ((this.readersId == null && other.readersId != null)
|| (this.readersId != null && !this.readersId
.equals(other.readersId))) {
return false; return false;
} }
return true; return true;
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/ReaderEvent.java
...@@ -26,11 +26,11 @@ import javax.persistence.TemporalType; ...@@ -26,11 +26,11 @@ import javax.persistence.TemporalType;
*/ */
@Entity @Entity
@Table(name = "reader_events") @Table(name = "reader_events")
@NamedQueries({ @NamedQueries( {
@NamedQuery(name = "ReaderEvent.findAll", query = "SELECT r FROM ReaderEvent r"), @NamedQuery(name = "ReaderEvent.findAll", query = "SELECT r FROM ReaderEvent r"),
@NamedQuery(name = "ReaderEvent.findByReaderEventsId", query = "SELECT r FROM ReaderEvent r WHERE r.readerEventsId = :readerEventsId"), @NamedQuery(name = "ReaderEvent.findByReaderEventsId", query = "SELECT r FROM ReaderEvent r WHERE r.readerEventsId = :readerEventsId"),
@NamedQuery(name = "ReaderEvent.findByEventTime", query = "SELECT r FROM ReaderEvent r WHERE r.eventTime = :eventTime"), @NamedQuery(name = "ReaderEvent.findByEventTime", query = "SELECT r FROM ReaderEvent r WHERE r.eventTime = :eventTime"),
@NamedQuery(name = "ReaderEvent.findByValue", query = "SELECT r FROM ReaderEvent r WHERE r.value = :value")}) @NamedQuery(name = "ReaderEvent.findByValue", query = "SELECT r FROM ReaderEvent r WHERE r.value = :value") })
public class ReaderEvent implements Serializable { public class ReaderEvent implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
...@@ -111,12 +111,15 @@ public class ReaderEvent implements Serializable { ...@@ -111,12 +111,15 @@ public class ReaderEvent implements Serializable {
@Override @Override
public boolean equals(Object object) { public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are not set // TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof ReaderEvent)) { if (!(object instanceof ReaderEvent)) {
return false; return false;
} }
ReaderEvent other = (ReaderEvent) object; ReaderEvent other = (ReaderEvent) object;
if ((this.readerEventsId == null && other.readerEventsId != null) || (this.readerEventsId != null && !this.readerEventsId.equals(other.readerEventsId))) { if ((this.readerEventsId == null && other.readerEventsId != null)
|| (this.readerEventsId != null && !this.readerEventsId
.equals(other.readerEventsId))) {
return false; return false;
} }
return true; return true;
...@@ -124,7 +127,8 @@ public class ReaderEvent implements Serializable { ...@@ -124,7 +127,8 @@ public class ReaderEvent implements Serializable {
@Override @Override
public String toString() { public String toString() {
return "fi.insomnia.bortal.model.ReaderEvent[readerEventsId=" + readerEventsId + "]"; return "fi.insomnia.bortal.model.ReaderEvent[readerEventsId="
+ readerEventsId + "]";
} }
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Role.java
...@@ -26,10 +26,10 @@ import javax.persistence.Table; ...@@ -26,10 +26,10 @@ import javax.persistence.Table;
*/ */
@Entity @Entity
@Table(name = "roles") @Table(name = "roles")
@NamedQueries({ @NamedQueries( {
@NamedQuery(name = "Role.findAll", query = "SELECT r FROM Role r"), @NamedQuery(name = "Role.findAll", query = "SELECT r FROM Role r"),
@NamedQuery(name = "Role.findByRolesId", query = "SELECT r FROM Role r WHERE r.rolesId = :rolesId"), @NamedQuery(name = "Role.findByRolesId", query = "SELECT r FROM Role r WHERE r.rolesId = :rolesId"),
@NamedQuery(name = "Role.findByRoleName", query = "SELECT r FROM Role r WHERE r.roleName = :roleName")}) @NamedQuery(name = "Role.findByRoleName", query = "SELECT r FROM Role r WHERE r.roleName = :roleName") })
public class Role implements Serializable { public class Role implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
...@@ -112,7 +112,8 @@ public class Role implements Serializable { ...@@ -112,7 +112,8 @@ public class Role implements Serializable {
return roleInheritanceList1; return roleInheritanceList1;
} }
public void setRoleInheritanceList1(List<RoleInheritance> roleInheritanceList1) { public void setRoleInheritanceList1(
List<RoleInheritance> roleInheritanceList1) {
this.roleInheritanceList1 = roleInheritanceList1; this.roleInheritanceList1 = roleInheritanceList1;
} }
...@@ -149,12 +150,14 @@ public class Role implements Serializable { ...@@ -149,12 +150,14 @@ public class Role implements Serializable {
@Override @Override
public boolean equals(Object object) { public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are not set // TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof Role)) { if (!(object instanceof Role)) {
return false; return false;
} }
Role other = (Role) object; Role other = (Role) object;
if ((this.rolesId == null && other.rolesId != null) || (this.rolesId != null && !this.rolesId.equals(other.rolesId))) { if ((this.rolesId == null && other.rolesId != null)
|| (this.rolesId != null && !this.rolesId.equals(other.rolesId))) {
return false; return false;
} }
return true; return true;
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/RoleInheritance.java
...@@ -23,11 +23,11 @@ import javax.persistence.UniqueConstraint; ...@@ -23,11 +23,11 @@ import javax.persistence.UniqueConstraint;
* @author jkj * @author jkj
*/ */
@Entity @Entity
@Table(name = "role_inheritance", uniqueConstraints = { @Table(name = "role_inheritance", uniqueConstraints = { @UniqueConstraint(columnNames = {
@UniqueConstraint(columnNames = {"roles_id", "inherits"})}) "roles_id", "inherits" }) })
@NamedQueries({ @NamedQueries( {
@NamedQuery(name = "RoleInheritance.findAll", query = "SELECT r FROM RoleInheritance r"), @NamedQuery(name = "RoleInheritance.findAll", query = "SELECT r FROM RoleInheritance r"),
@NamedQuery(name = "RoleInheritance.findByRoleInheritanceId", query = "SELECT r FROM RoleInheritance r WHERE r.roleInheritanceId = :roleInheritanceId")}) @NamedQuery(name = "RoleInheritance.findByRoleInheritanceId", query = "SELECT r FROM RoleInheritance r WHERE r.roleInheritanceId = :roleInheritanceId") })
public class RoleInheritance implements Serializable { public class RoleInheritance implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
...@@ -81,12 +81,15 @@ public class RoleInheritance implements Serializable { ...@@ -81,12 +81,15 @@ public class RoleInheritance implements Serializable {
@Override @Override
public boolean equals(Object object) { public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are not set // TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof RoleInheritance)) { if (!(object instanceof RoleInheritance)) {
return false; return false;
} }
RoleInheritance other = (RoleInheritance) object; RoleInheritance other = (RoleInheritance) object;
if ((this.roleInheritanceId == null && other.roleInheritanceId != null) || (this.roleInheritanceId != null && !this.roleInheritanceId.equals(other.roleInheritanceId))) { if ((this.roleInheritanceId == null && other.roleInheritanceId != null)
|| (this.roleInheritanceId != null && !this.roleInheritanceId
.equals(other.roleInheritanceId))) {
return false; return false;
} }
return true; return true;
...@@ -94,7 +97,8 @@ public class RoleInheritance implements Serializable { ...@@ -94,7 +97,8 @@ public class RoleInheritance implements Serializable {
@Override @Override
public String toString() { public String toString() {
return "fi.insomnia.bortal.model.RoleInheritance[roleInheritanceId=" + roleInheritanceId + "]"; return "fi.insomnia.bortal.model.RoleInheritance[roleInheritanceId="
+ roleInheritanceId + "]";
} }
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/RoleMembership.java
...@@ -23,11 +23,11 @@ import javax.persistence.UniqueConstraint; ...@@ -23,11 +23,11 @@ import javax.persistence.UniqueConstraint;
* @author jkj * @author jkj
*/ */
@Entity @Entity
@Table(name = "role_memberships", uniqueConstraints = { @Table(name = "role_memberships", uniqueConstraints = { @UniqueConstraint(columnNames = {
@UniqueConstraint(columnNames = {"roles_id", "users_id"})}) "roles_id", "users_id" }) })
@NamedQueries({ @NamedQueries( {
@NamedQuery(name = "RoleMembership.findAll", query = "SELECT r FROM RoleMembership r"), @NamedQuery(name = "RoleMembership.findAll", query = "SELECT r FROM RoleMembership r"),
@NamedQuery(name = "RoleMembership.findByRoleMembershipsId", query = "SELECT r FROM RoleMembership r WHERE r.roleMembershipsId = :roleMembershipsId")}) @NamedQuery(name = "RoleMembership.findByRoleMembershipsId", query = "SELECT r FROM RoleMembership r WHERE r.roleMembershipsId = :roleMembershipsId") })
public class RoleMembership implements Serializable { public class RoleMembership implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
...@@ -81,12 +81,15 @@ public class RoleMembership implements Serializable { ...@@ -81,12 +81,15 @@ public class RoleMembership implements Serializable {
@Override @Override
public boolean equals(Object object) { public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are not set // TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof RoleMembership)) { if (!(object instanceof RoleMembership)) {
return false; return false;
} }
RoleMembership other = (RoleMembership) object; RoleMembership other = (RoleMembership) object;
if ((this.roleMembershipsId == null && other.roleMembershipsId != null) || (this.roleMembershipsId != null && !this.roleMembershipsId.equals(other.roleMembershipsId))) { if ((this.roleMembershipsId == null && other.roleMembershipsId != null)
|| (this.roleMembershipsId != null && !this.roleMembershipsId
.equals(other.roleMembershipsId))) {
return false; return false;
} }
return true; return true;
...@@ -94,7 +97,8 @@ public class RoleMembership implements Serializable { ...@@ -94,7 +97,8 @@ public class RoleMembership implements Serializable {
@Override @Override
public String toString() { public String toString() {
return "fi.insomnia.bortal.model.RoleMembership[roleMembershipsId=" + roleMembershipsId + "]"; return "fi.insomnia.bortal.model.RoleMembership[roleMembershipsId="
+ roleMembershipsId + "]";
} }
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/RoleRight.java
...@@ -23,11 +23,11 @@ import javax.persistence.Table; ...@@ -23,11 +23,11 @@ import javax.persistence.Table;
*/ */
@Entity @Entity
@Table(name = "role_rights") @Table(name = "role_rights")
@NamedQueries({ @NamedQueries( {
@NamedQuery(name = "RoleRight.findAll", query = "SELECT r FROM RoleRight r"), @NamedQuery(name = "RoleRight.findAll", query = "SELECT r FROM RoleRight r"),
@NamedQuery(name = "RoleRight.findByRoleRights", query = "SELECT r FROM RoleRight r WHERE r.roleRights = :roleRights"), @NamedQuery(name = "RoleRight.findByRoleRights", query = "SELECT r FROM RoleRight r WHERE r.roleRights = :roleRights"),
@NamedQuery(name = "RoleRight.findByRead", query = "SELECT r FROM RoleRight r WHERE r.read = :read"), @NamedQuery(name = "RoleRight.findByRead", query = "SELECT r FROM RoleRight r WHERE r.read = :read"),
@NamedQuery(name = "RoleRight.findByWrite", query = "SELECT r FROM RoleRight r WHERE r.write = :write")}) @NamedQuery(name = "RoleRight.findByWrite", query = "SELECT r FROM RoleRight r WHERE r.write = :write") })
public class RoleRight implements Serializable { public class RoleRight implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
...@@ -109,12 +109,15 @@ public class RoleRight implements Serializable { ...@@ -109,12 +109,15 @@ public class RoleRight implements Serializable {
@Override @Override
public boolean equals(Object object) { public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are not set // TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof RoleRight)) { if (!(object instanceof RoleRight)) {
return false; return false;
} }
RoleRight other = (RoleRight) object; RoleRight other = (RoleRight) object;
if ((this.roleRights == null && other.roleRights != null) || (this.roleRights != null && !this.roleRights.equals(other.roleRights))) { if ((this.roleRights == null && other.roleRights != null)
|| (this.roleRights != null && !this.roleRights
.equals(other.roleRights))) {
return false; return false;
} }
return true; return true;
...@@ -122,7 +125,8 @@ public class RoleRight implements Serializable { ...@@ -122,7 +125,8 @@ public class RoleRight implements Serializable {
@Override @Override
public String toString() { public String toString() {
return "fi.insomnia.bortal.model.RoleRight[roleRights=" + roleRights + "]"; return "fi.insomnia.bortal.model.RoleRight[roleRights=" + roleRights
+ "]";
} }
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/User.java
...@@ -28,7 +28,7 @@ import javax.persistence.TemporalType; ...@@ -28,7 +28,7 @@ import javax.persistence.TemporalType;
*/ */
@Entity @Entity
@Table(name = "users") @Table(name = "users")
@NamedQueries({ @NamedQueries( {
@NamedQuery(name = "User.findAll", query = "SELECT u FROM User u"), @NamedQuery(name = "User.findAll", query = "SELECT u FROM User u"),
@NamedQuery(name = "User.findByUsersId", query = "SELECT u FROM User u WHERE u.usersId = :usersId"), @NamedQuery(name = "User.findByUsersId", query = "SELECT u FROM User u WHERE u.usersId = :usersId"),
@NamedQuery(name = "User.findByCreated", query = "SELECT u FROM User u WHERE u.created = :created"), @NamedQuery(name = "User.findByCreated", query = "SELECT u FROM User u WHERE u.created = :created"),
...@@ -45,7 +45,7 @@ import javax.persistence.TemporalType; ...@@ -45,7 +45,7 @@ import javax.persistence.TemporalType;
@NamedQuery(name = "User.findByTown", query = "SELECT u FROM User u WHERE u.town = :town"), @NamedQuery(name = "User.findByTown", query = "SELECT u FROM User u WHERE u.town = :town"),
@NamedQuery(name = "User.findByPhone", query = "SELECT u FROM User u WHERE u.phone = :phone"), @NamedQuery(name = "User.findByPhone", query = "SELECT u FROM User u WHERE u.phone = :phone"),
@NamedQuery(name = "User.findByFemale", query = "SELECT u FROM User u WHERE u.female = :female"), @NamedQuery(name = "User.findByFemale", query = "SELECT u FROM User u WHERE u.female = :female"),
@NamedQuery(name = "User.findByLogin", query = "SELECT u FROM User u WHERE u.login = :login")}) @NamedQuery(name = "User.findByLogin", query = "SELECT u FROM User u WHERE u.login = :login") })
public class User implements Serializable { public class User implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
...@@ -125,7 +125,8 @@ public class User implements Serializable { ...@@ -125,7 +125,8 @@ public class User implements Serializable {
this.usersId = usersId; this.usersId = usersId;
} }
public User(Integer usersId, Date created, boolean active, String lastname, String firstnames) { public User(Integer usersId, Date created, boolean active, String lastname,
String firstnames) {
this.usersId = usersId; this.usersId = usersId;
this.created = created; this.created = created;
this.active = active; this.active = active;
...@@ -305,7 +306,8 @@ public class User implements Serializable { ...@@ -305,7 +306,8 @@ public class User implements Serializable {
return compoEntryParticipantList; return compoEntryParticipantList;
} }
public void setCompoEntryParticipantList(List<CompoEntryParticipant> compoEntryParticipantList) { public void setCompoEntryParticipantList(
List<CompoEntryParticipant> compoEntryParticipantList) {
this.compoEntryParticipantList = compoEntryParticipantList; this.compoEntryParticipantList = compoEntryParticipantList;
} }
...@@ -361,7 +363,8 @@ public class User implements Serializable { ...@@ -361,7 +363,8 @@ public class User implements Serializable {
return discountInstanceList; return discountInstanceList;
} }
public void setDiscountInstanceList(List<DiscountInstance> discountInstanceList) { public void setDiscountInstanceList(
List<DiscountInstance> discountInstanceList) {
this.discountInstanceList = discountInstanceList; this.discountInstanceList = discountInstanceList;
} }
...@@ -382,12 +385,14 @@ public class User implements Serializable { ...@@ -382,12 +385,14 @@ public class User implements Serializable {
@Override @Override
public boolean equals(Object object) { public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are not set // TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof User)) { if (!(object instanceof User)) {
return false; return false;
} }
User other = (User) object; User other = (User) object;
if ((this.usersId == null && other.usersId != null) || (this.usersId != null && !this.usersId.equals(other.usersId))) { if ((this.usersId == null && other.usersId != null)
|| (this.usersId != null && !this.usersId.equals(other.usersId))) {
return false; return false;
} }
return true; return true;
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/UserImage.java
...@@ -24,12 +24,12 @@ import javax.persistence.Table; ...@@ -24,12 +24,12 @@ import javax.persistence.Table;
*/ */
@Entity @Entity
@Table(name = "user_images") @Table(name = "user_images")
@NamedQueries({ @NamedQueries( {
@NamedQuery(name = "UserImage.findAll", query = "SELECT u FROM UserImage u"), @NamedQuery(name = "UserImage.findAll", query = "SELECT u FROM UserImage u"),
@NamedQuery(name = "UserImage.findByUserImagesId", query = "SELECT u FROM UserImage u WHERE u.userImagesId = :userImagesId"), @NamedQuery(name = "UserImage.findByUserImagesId", query = "SELECT u FROM UserImage u WHERE u.userImagesId = :userImagesId"),
@NamedQuery(name = "UserImage.findByName", query = "SELECT u FROM UserImage u WHERE u.name = :name"), @NamedQuery(name = "UserImage.findByName", query = "SELECT u FROM UserImage u WHERE u.name = :name"),
@NamedQuery(name = "UserImage.findByDescription", query = "SELECT u FROM UserImage u WHERE u.description = :description"), @NamedQuery(name = "UserImage.findByDescription", query = "SELECT u FROM UserImage u WHERE u.description = :description"),
@NamedQuery(name = "UserImage.findByMimeType", query = "SELECT u FROM UserImage u WHERE u.mimeType = :mimeType")}) @NamedQuery(name = "UserImage.findByMimeType", query = "SELECT u FROM UserImage u WHERE u.mimeType = :mimeType") })
public class UserImage implements Serializable { public class UserImage implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
...@@ -113,12 +113,15 @@ public class UserImage implements Serializable { ...@@ -113,12 +113,15 @@ public class UserImage implements Serializable {
@Override @Override
public boolean equals(Object object) { public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are not set // TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof UserImage)) { if (!(object instanceof UserImage)) {
return false; return false;
} }
UserImage other = (UserImage) object; UserImage other = (UserImage) object;
if ((this.userImagesId == null && other.userImagesId != null) || (this.userImagesId != null && !this.userImagesId.equals(other.userImagesId))) { if ((this.userImagesId == null && other.userImagesId != null)
|| (this.userImagesId != null && !this.userImagesId
.equals(other.userImagesId))) {
return false; return false;
} }
return true; return true;
...@@ -126,7 +129,8 @@ public class UserImage implements Serializable { ...@@ -126,7 +129,8 @@ public class UserImage implements Serializable {
@Override @Override
public String toString() { public String toString() {
return "fi.insomnia.bortal.model.UserImage[userImagesId=" + userImagesId + "]"; return "fi.insomnia.bortal.model.UserImage[userImagesId="
+ userImagesId + "]";
} }
} }
code/LanBortalWeb/src/fi/insomnia/bortal/HelloWorld.java
...@@ -9,13 +9,12 @@ import javax.faces.model.ListDataModel; ...@@ -9,13 +9,12 @@ import javax.faces.model.ListDataModel;
import fi.insomnia.bortal.db.HelloTo; import fi.insomnia.bortal.db.HelloTo;
@ManagedBean(name="helloWorld") @ManagedBean(name = "helloWorld")
@SessionScoped @SessionScoped
public class HelloWorld { public class HelloWorld {
/*
/* Let's inject Hello bean instance to the variable * Let's inject Hello bean instance to the variable with the @EJB annotation
* with the @EJB annotation
*/ */
@EJB @EJB
private HelloBeanLocal helloBean; private HelloBeanLocal helloBean;
...@@ -28,46 +27,50 @@ public class HelloWorld { ...@@ -28,46 +27,50 @@ public class HelloWorld {
private HelloTo detailItem; private HelloTo detailItem;
public String sayHello() public String sayHello() {
{
return helloBean.getHello(name); return helloBean.getHello(name);
} }
public String getHello()
{ public String getHello() {
return "Managed Bean says: Hello World!"; return "Managed Bean says: Hello World!";
} }
public ListDataModel<HelloTo> getHelloedPeople() public ListDataModel<HelloTo> getHelloedPeople() {
{
List<HelloTo> peopleList = helloBean.getHelloHistory(); List<HelloTo> peopleList = helloBean.getHelloHistory();
items = new ListDataModel<HelloTo>(peopleList); items = new ListDataModel<HelloTo>(peopleList);
setSize(peopleList.size()); setSize(peopleList.size());
return items; return items;
} }
public String getDetail(){ public String getDetail() {
setDetailItem(items.getRowData()); setDetailItem(items.getRowData());
return "detail"; return "detail";
} }
/* /*
* Getter and setter for "name" * Getter and setter for "name"
*/ */
public void setName(String name) { public void setName(String name) {
this.name = name; this.name = name;
} }
public String getName() { public String getName() {
return name; return name;
} }
public void setSize(int size) { public void setSize(int size) {
this.size = size; this.size = size;
} }
public int getSize() { public int getSize() {
return size; return size;
} }
public void setDetailItem(HelloTo detailItem) { public void setDetailItem(HelloTo detailItem) {
this.detailItem = detailItem; this.detailItem = detailItem;
} }
public HelloTo getDetailItem() { public HelloTo getDetailItem() {
return detailItem; return detailItem;
} }
......
code/LanBortalWeb/src/fi/insomnia/bortal/view/UserView.java
...@@ -38,9 +38,9 @@ public class UserView { ...@@ -38,9 +38,9 @@ public class UserView {
public String createUser() { public String createUser() {
logger.info("Saving user"); logger.info("Saving user");
// Luodaan uusi kyttj UserBeanin funktiolla createNewUser jolle // Luodaan uusi k�ytt�j� UserBeanin funktiolla createNewUser jolle
// annetaan parametrina pakolliset tiedot ( nick ja salasana ) // annetaan parametrina pakolliset tiedot ( nick ja salasana )
// Paluuarvona saadaan uusi uljas kyttj-olio. // Paluuarvona saadaan uusi uljas k�ytt�j�-olio.
setUser(userBean.createNewUser(nick, password)); setUser(userBean.createNewUser(nick, password));
nick = ""; nick = "";
password = ""; password = "";
...@@ -66,8 +66,6 @@ public class UserView { ...@@ -66,8 +66,6 @@ public class UserView {
// Getters and setters... // Getters and setters...
public String getNick() { public String getNick() {
return nick; return nick;
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!