Commit 37118c95 by jkj

format

git-svn-id: https://dev.intra.insomnia.fi/svn/trunk@39 8cf89bec-f6a3-4178-919f-364fb3449fe5
1 parent 0cf0778d
Showing with 178 additions and 147 deletions
...@@ -9,6 +9,7 @@ import java.io.Serializable; ...@@ -9,6 +9,7 @@ import java.io.Serializable;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
......
...@@ -8,6 +8,7 @@ package fi.insomnia.bortal.model; ...@@ -8,6 +8,7 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
package fi.insomnia.bortal.model; package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
......
...@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model; ...@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
......
...@@ -8,6 +8,7 @@ package fi.insomnia.bortal.model; ...@@ -8,6 +8,7 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
......
...@@ -8,6 +8,7 @@ package fi.insomnia.bortal.model; ...@@ -8,6 +8,7 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
......
...@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model; ...@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
package fi.insomnia.bortal.model; package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
......
...@@ -8,6 +8,7 @@ package fi.insomnia.bortal.model; ...@@ -8,6 +8,7 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.List; import java.util.List;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
package fi.insomnia.bortal.model; package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
......
...@@ -8,6 +8,7 @@ package fi.insomnia.bortal.model; ...@@ -8,6 +8,7 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
......
...@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model; ...@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
......
...@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model; ...@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
......
...@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model; ...@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
......
...@@ -8,6 +8,7 @@ package fi.insomnia.bortal.model; ...@@ -8,6 +8,7 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
......
...@@ -7,15 +7,14 @@ package fi.insomnia.bortal.model; ...@@ -7,15 +7,14 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Id; import javax.persistence.Id;
import javax.persistence.ManyToMany; import javax.persistence.ManyToMany;
import javax.persistence.NamedQueries; import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery; import javax.persistence.NamedQuery;
import javax.persistence.OneToMany;
import javax.persistence.Table; import javax.persistence.Table;
/** /**
......
...@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model; ...@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
......
...@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model; ...@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
......
...@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model; ...@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
......
...@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model; ...@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
......
...@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model; ...@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
......
...@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model; ...@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
......
...@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model; ...@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
......
...@@ -8,6 +8,7 @@ package fi.insomnia.bortal.model; ...@@ -8,6 +8,7 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
......
...@@ -8,6 +8,7 @@ package fi.insomnia.bortal.model; ...@@ -8,6 +8,7 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
......
...@@ -8,6 +8,7 @@ package fi.insomnia.bortal.model; ...@@ -8,6 +8,7 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.List; import java.util.List;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
...@@ -22,155 +23,154 @@ import javax.persistence.OneToMany; ...@@ -22,155 +23,154 @@ import javax.persistence.OneToMany;
import javax.persistence.Table; import javax.persistence.Table;
/** /**
* *
* @author jkj * @author jkj
*/ */
@Entity @Entity
@Table(name = "products") @Table(name = "products")
@NamedQueries({ @NamedQueries( {
@NamedQuery(name = "Product.findAll", query = "SELECT p FROM Product p"), @NamedQuery(name = "Product.findAll", query = "SELECT p FROM Product p"),
@NamedQuery(name = "Product.findByProductsId", query = "SELECT p FROM Product p WHERE p.productsId = :productsId"), @NamedQuery(name = "Product.findByProductsId", query = "SELECT p FROM Product p WHERE p.productsId = :productsId"),
@NamedQuery(name = "Product.findByProductName", query = "SELECT p FROM Product p WHERE p.productName = :productName"), @NamedQuery(name = "Product.findByProductName", query = "SELECT p FROM Product p WHERE p.productName = :productName"),
@NamedQuery(name = "Product.findByPrice", query = "SELECT p FROM Product p WHERE p.price = :price"), @NamedQuery(name = "Product.findByPrice", query = "SELECT p FROM Product p WHERE p.price = :price"),
@NamedQuery(name = "Product.findBySort", query = "SELECT p FROM Product p WHERE p.sort = :sort"), @NamedQuery(name = "Product.findBySort", query = "SELECT p FROM Product p WHERE p.sort = :sort"),
@NamedQuery(name = "Product.findByBarcode", query = "SELECT p FROM Product p WHERE p.barcode = :barcode")}) @NamedQuery(name = "Product.findByBarcode", query = "SELECT p FROM Product p WHERE p.barcode = :barcode") })
public class Product implements Serializable { public class Product implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false) @Basic(optional = false)
@Column(name = "products_id", nullable = false) @Column(name = "products_id", nullable = false)
private Integer productsId; private Integer productsId;
@Column(name = "product_name", length = 2147483647) @Column(name = "product_name", length = 2147483647)
private String productName; private String productName;
@Basic(optional = false) @Basic(optional = false)
@Column(name = "price", nullable = false) @Column(name = "price", nullable = false)
private BigInteger price; private BigInteger price;
@Basic(optional = false) @Basic(optional = false)
@Column(name = "sort", nullable = false) @Column(name = "sort", nullable = false)
private int sort; private int sort;
@Column(name = "barcode", length = 2147483647) @Column(name = "barcode", length = 2147483647)
private String barcode; private String barcode;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "productsId") @OneToMany(cascade = CascadeType.ALL, mappedBy = "productsId")
private List<Place> placeList; private List<Place> placeList;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "productsId") @OneToMany(cascade = CascadeType.ALL, mappedBy = "productsId")
private List<AccountEvent> accountEventList; private List<AccountEvent> accountEventList;
@JoinTable(name = "food_wave_templates_products", joinColumns = { @JoinColumn(name = "products_id", referencedColumnName = "products_id") }, inverseJoinColumns = { @JoinColumn(name = "food_wave_templates_id", referencedColumnName = "food_wave_templates_id") })
@ManyToMany
@JoinTable(name = "food_wave_templates_products", joinColumns = { private List<FoodWaveTemplate> foodWaveTemplate;
@JoinColumn(name = "products_id", referencedColumnName = "products_id")}, inverseJoinColumns = {
@JoinColumn(name = "food_wave_templates_id", referencedColumnName = "food_wave_templates_id")}) public Product() {
@ManyToMany }
private List<FoodWaveTemplate> foodWaveTemplate;
public Product(Integer productsId) {
this.productsId = productsId;
}
public Product() {
} public Product(Integer productsId, BigInteger price, int sort) {
this.productsId = productsId;
public Product(Integer productsId) { this.price = price;
this.productsId = productsId; this.sort = sort;
} }
public Product(Integer productsId, BigInteger price, int sort) { public Integer getProductsId() {
this.productsId = productsId; return productsId;
this.price = price; }
this.sort = sort;
} public void setProductsId(Integer productsId) {
this.productsId = productsId;
public Integer getProductsId() { }
return productsId;
} public String getProductName() {
return productName;
public void setProductsId(Integer productsId) { }
this.productsId = productsId;
} public void setProductName(String productName) {
this.productName = productName;
public String getProductName() { }
return productName;
} public BigInteger getPrice() {
return price;
public void setProductName(String productName) { }
this.productName = productName;
} public void setPrice(BigInteger price) {
this.price = price;
public BigInteger getPrice() { }
return price;
} public int getSort() {
return sort;
public void setPrice(BigInteger price) { }
this.price = price;
} public void setSort(int sort) {
this.sort = sort;
public int getSort() { }
return sort;
} public String getBarcode() {
return barcode;
public void setSort(int sort) { }
this.sort = sort;
} public void setBarcode(String barcode) {
this.barcode = barcode;
public String getBarcode() { }
return barcode;
} public List<Place> getPlaceList() {
return placeList;
public void setBarcode(String barcode) { }
this.barcode = barcode;
} public void setPlaceList(List<Place> placeList) {
this.placeList = placeList;
public List<Place> getPlaceList() { }
return placeList;
} public List<AccountEvent> getAccountEventList() {
return accountEventList;
public void setPlaceList(List<Place> placeList) { }
this.placeList = placeList;
} public void setAccountEventList(List<AccountEvent> accountEventList) {
this.accountEventList = accountEventList;
public List<AccountEvent> getAccountEventList() { }
return accountEventList;
} @Override
public int hashCode() {
public void setAccountEventList(List<AccountEvent> accountEventList) { int hash = 0;
this.accountEventList = accountEventList; hash += (productsId != null ? productsId.hashCode() : 0);
} return hash;
}
@Override
public int hashCode() { @Override
int hash = 0; public boolean equals(Object object) {
hash += (productsId != null ? productsId.hashCode() : 0); // TODO: Warning - this method won't work in the case the id fields are
return hash; // not set
} if (!(object instanceof Product)) {
return false;
@Override }
public boolean equals(Object object) { Product other = (Product) object;
// TODO: Warning - this method won't work in the case the id fields are not set if ((this.productsId == null && other.productsId != null)
if (!(object instanceof Product)) { || (this.productsId != null && !this.productsId
return false; .equals(other.productsId))) {
} return false;
Product other = (Product) object; }
if ((this.productsId == null && other.productsId != null) || (this.productsId != null && !this.productsId.equals(other.productsId))) { return true;
return false; }
}
return true; @Override
} public String toString() {
return "fi.insomnia.bortal.model.Product[productsId=" + productsId
@Override + "]";
public String toString() { }
return "fi.insomnia.bortal.model.Product[productsId=" + productsId + "]";
} /**
* @return the foodWaveTemplate
/** */
* @return the foodWaveTemplate public List<FoodWaveTemplate> getFoodWaveTemplate() {
*/ return foodWaveTemplate;
public List<FoodWaveTemplate> getFoodWaveTemplate() { }
return foodWaveTemplate;
} /**
* @param foodWaveTemplate
/** * the foodWaveTemplate to set
* @param foodWaveTemplate the foodWaveTemplate to set */
*/ public void setFoodWaveTemplate(List<FoodWaveTemplate> foodWaveTemplate) {
public void setFoodWaveTemplate(List<FoodWaveTemplate> foodWaveTemplate) { this.foodWaveTemplate = foodWaveTemplate;
this.foodWaveTemplate = foodWaveTemplate; }
}
} }
...@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model; ...@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
......
...@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model; ...@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
......
...@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model; ...@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
package fi.insomnia.bortal.model; package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
package fi.insomnia.bortal.model; package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
package fi.insomnia.bortal.model; package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
......
...@@ -8,6 +8,7 @@ package fi.insomnia.bortal.model; ...@@ -8,6 +8,7 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
package fi.insomnia.bortal.model; package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!