format

git-svn-id: https://dev.intra.insomnia.fi/svn/trunk@39 8cf89bec-f6a3-4178-919f-364fb3449fe5

code/LanBortalDatabase/src/fi/insomnia/bortal/model/AccountEvent.java

@@ -9,6 +9,7 @@ import java.io.Serializable;
 import java.math.BigInteger;
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Bill.java

@@ -8,6 +8,7 @@ package fi.insomnia.bortal.model;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/BillLine.java

@@ -6,6 +6,7 @@
 package fi.insomnia.bortal.model;
 
 import java.io.Serializable;
+
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/CardTemplate.java

@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model;
 
 import java.io.Serializable;
 import java.util.List;
+
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Compo.java

@@ -8,6 +8,7 @@ package fi.insomnia.bortal.model;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntry.java

@@ -8,6 +8,7 @@ package fi.insomnia.bortal.model;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntryFile.java

@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model;
 
 import java.io.Serializable;
 import java.util.Date;
+
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntryParticipant.java

@@ -6,6 +6,7 @@
 package fi.insomnia.bortal.model;
 
 import java.io.Serializable;
+
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Discount.java

@@ -8,6 +8,7 @@ package fi.insomnia.bortal.model;
 import java.io.Serializable;
 import java.math.BigInteger;
 import java.util.List;
+
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/DiscountInstance.java

@@ -6,6 +6,7 @@
 package fi.insomnia.bortal.model;
 
 import java.io.Serializable;
+
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Event.java

@@ -8,6 +8,7 @@ package fi.insomnia.bortal.model;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventMap.java

@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model;
 
 import java.io.Serializable;
 import java.util.List;
+
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventSettings.java

@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model;
 
 import java.io.Serializable;
 import java.util.List;
+
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventStatus.java

@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model;
 
 import java.io.Serializable;
 import java.util.List;
+
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWave.java

@@ -8,6 +8,7 @@ package fi.insomnia.bortal.model;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWaveTemplate.java

@@ -7,15 +7,14 @@ package fi.insomnia.bortal.model;
 
 import java.io.Serializable;
 import java.util.List;
+
 import javax.persistence.Basic;
-import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.ManyToMany;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
-import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
 /**

code/LanBortalDatabase/src/fi/insomnia/bortal/model/GroupMembership.java

@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model;
 
 import java.io.Serializable;
 import java.util.Date;
+
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Location.java

@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model;
 
 import java.io.Serializable;
 import java.util.List;
+
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/LogEntry.java

@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model;
 
 import java.io.Serializable;
 import java.util.Date;
+
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/LogEntryType.java

@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model;
 
 import java.io.Serializable;
 import java.util.List;
+
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/News.java

@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model;
 
 import java.io.Serializable;
 import java.util.Date;
+
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/NewsGroup.java

@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model;
 
 import java.io.Serializable;
 import java.util.List;
+
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Place.java

@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model;
 
 import java.io.Serializable;
 import java.util.List;
+
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/PlaceGroup.java

@@ -8,6 +8,7 @@ package fi.insomnia.bortal.model;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/PrintedCard.java

@@ -8,6 +8,7 @@ package fi.insomnia.bortal.model;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Product.java

@@ -8,6 +8,7 @@ package fi.insomnia.bortal.model;
 import java.io.Serializable;
 import java.math.BigInteger;
 import java.util.List;
+
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -22,155 +23,154 @@ import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
 /**
- *
+ * 
  * @author jkj
  */
 @Entity
 @Table(name = "products")
-@NamedQueries({
-    @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.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.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")})
+@NamedQueries( {
+		@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.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.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") })
 public class Product implements Serializable {
-    private static final long serialVersionUID = 1L;
-    @Id
-    @Basic(optional = false)
-    @Column(name = "products_id", nullable = false)
-    private Integer productsId;
-    @Column(name = "product_name", length = 2147483647)
-    private String productName;
-    @Basic(optional = false)
-    @Column(name = "price", nullable = false)
-    private BigInteger price;
-    @Basic(optional = false)
-    @Column(name = "sort", nullable = false)
-    private int sort;
-    @Column(name = "barcode", length = 2147483647)
-    private String barcode;
-    @OneToMany(cascade = CascadeType.ALL, mappedBy = "productsId")
-    private List<Place> placeList;
-    @OneToMany(cascade = CascadeType.ALL, mappedBy = "productsId")
-    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
-    private List<FoodWaveTemplate> foodWaveTemplate;
-    
-
-
-    public Product() {
-    }
-
-    public Product(Integer productsId) {
-        this.productsId = productsId;
-    }
-
-    public Product(Integer productsId, BigInteger price, int sort) {
-        this.productsId = productsId;
-        this.price = price;
-        this.sort = sort;
-    }
-
-    public Integer getProductsId() {
-        return productsId;
-    }
-
-    public void setProductsId(Integer productsId) {
-        this.productsId = productsId;
-    }
-
-    public String getProductName() {
-        return productName;
-    }
-
-    public void setProductName(String productName) {
-        this.productName = productName;
-    }
-
-    public BigInteger getPrice() {
-        return price;
-    }
-
-    public void setPrice(BigInteger price) {
-        this.price = price;
-    }
-
-    public int getSort() {
-        return sort;
-    }
-
-    public void setSort(int sort) {
-        this.sort = sort;
-    }
-
-    public String getBarcode() {
-        return barcode;
-    }
-
-    public void setBarcode(String barcode) {
-        this.barcode = barcode;
-    }
-
-    public List<Place> getPlaceList() {
-        return placeList;
-    }
-
-    public void setPlaceList(List<Place> placeList) {
-        this.placeList = placeList;
-    }
-
-    public List<AccountEvent> getAccountEventList() {
-        return accountEventList;
-    }
-
-    public void setAccountEventList(List<AccountEvent> accountEventList) {
-        this.accountEventList = accountEventList;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 0;
-        hash += (productsId != null ? productsId.hashCode() : 0);
-        return hash;
-    }
-
-    @Override
-    public boolean equals(Object object) {
-        // TODO: Warning - this method won't work in the case the id fields are not set
-        if (!(object instanceof Product)) {
-            return false;
-        }
-        Product other = (Product) object;
-        if ((this.productsId == null && other.productsId != null) || (this.productsId != null && !this.productsId.equals(other.productsId))) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public String toString() {
-        return "fi.insomnia.bortal.model.Product[productsId=" + productsId + "]";
-    }
-
-    /**
-     * @return the foodWaveTemplate
-     */
-    public List<FoodWaveTemplate> getFoodWaveTemplate() {
-        return foodWaveTemplate;
-    }
-
-    /**
-     * @param foodWaveTemplate the foodWaveTemplate to set
-     */
-    public void setFoodWaveTemplate(List<FoodWaveTemplate> foodWaveTemplate) {
-        this.foodWaveTemplate = foodWaveTemplate;
-    }
+	private static final long serialVersionUID = 1L;
+	@Id
+	@Basic(optional = false)
+	@Column(name = "products_id", nullable = false)
+	private Integer productsId;
+	@Column(name = "product_name", length = 2147483647)
+	private String productName;
+	@Basic(optional = false)
+	@Column(name = "price", nullable = false)
+	private BigInteger price;
+	@Basic(optional = false)
+	@Column(name = "sort", nullable = false)
+	private int sort;
+	@Column(name = "barcode", length = 2147483647)
+	private String barcode;
+	@OneToMany(cascade = CascadeType.ALL, mappedBy = "productsId")
+	private List<Place> placeList;
+	@OneToMany(cascade = CascadeType.ALL, mappedBy = "productsId")
+	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
+	private List<FoodWaveTemplate> foodWaveTemplate;
+
+	public Product() {
+	}
+
+	public Product(Integer productsId) {
+		this.productsId = productsId;
+	}
+
+	public Product(Integer productsId, BigInteger price, int sort) {
+		this.productsId = productsId;
+		this.price = price;
+		this.sort = sort;
+	}
+
+	public Integer getProductsId() {
+		return productsId;
+	}
+
+	public void setProductsId(Integer productsId) {
+		this.productsId = productsId;
+	}
+
+	public String getProductName() {
+		return productName;
+	}
+
+	public void setProductName(String productName) {
+		this.productName = productName;
+	}
+
+	public BigInteger getPrice() {
+		return price;
+	}
+
+	public void setPrice(BigInteger price) {
+		this.price = price;
+	}
+
+	public int getSort() {
+		return sort;
+	}
+
+	public void setSort(int sort) {
+		this.sort = sort;
+	}
+
+	public String getBarcode() {
+		return barcode;
+	}
+
+	public void setBarcode(String barcode) {
+		this.barcode = barcode;
+	}
+
+	public List<Place> getPlaceList() {
+		return placeList;
+	}
+
+	public void setPlaceList(List<Place> placeList) {
+		this.placeList = placeList;
+	}
+
+	public List<AccountEvent> getAccountEventList() {
+		return accountEventList;
+	}
+
+	public void setAccountEventList(List<AccountEvent> accountEventList) {
+		this.accountEventList = accountEventList;
+	}
+
+	@Override
+	public int hashCode() {
+		int hash = 0;
+		hash += (productsId != null ? productsId.hashCode() : 0);
+		return hash;
+	}
+
+	@Override
+	public boolean equals(Object object) {
+		// TODO: Warning - this method won't work in the case the id fields are
+		// not set
+		if (!(object instanceof Product)) {
+			return false;
+		}
+		Product other = (Product) object;
+		if ((this.productsId == null && other.productsId != null)
+				|| (this.productsId != null && !this.productsId
+						.equals(other.productsId))) {
+			return false;
+		}
+		return true;
+	}
+
+	@Override
+	public String toString() {
+		return "fi.insomnia.bortal.model.Product[productsId=" + productsId
+				+ "]";
+	}
+
+	/**
+	 * @return the foodWaveTemplate
+	 */
+	public List<FoodWaveTemplate> getFoodWaveTemplate() {
+		return foodWaveTemplate;
+	}
+
+	/**
+	 * @param foodWaveTemplate
+	 *            the foodWaveTemplate to set
+	 */
+	public void setFoodWaveTemplate(List<FoodWaveTemplate> foodWaveTemplate) {
+		this.foodWaveTemplate = foodWaveTemplate;
+	}
 
 }

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Reader.java

@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model;
 
 import java.io.Serializable;
 import java.util.List;
+
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/ReaderEvent.java

@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model;
 
 import java.io.Serializable;
 import java.util.Date;
+
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Role.java

@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model;
 
 import java.io.Serializable;
 import java.util.List;
+
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/RoleInheritance.java

@@ -6,6 +6,7 @@
 package fi.insomnia.bortal.model;
 
 import java.io.Serializable;
+
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/RoleMembership.java

@@ -6,6 +6,7 @@
 package fi.insomnia.bortal.model;
 
 import java.io.Serializable;
+
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/RoleRight.java

@@ -6,6 +6,7 @@
 package fi.insomnia.bortal.model;
 
 import java.io.Serializable;
+
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/User.java

@@ -8,6 +8,7 @@ package fi.insomnia.bortal.model;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/UserImage.java

@@ -6,6 +6,7 @@
 package fi.insomnia.bortal.model;
 
 import java.io.Serializable;
+
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;