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.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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;
 
 
 /**
 /**

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;
@@ -27,13 +28,13 @@ import javax.persistence.Table;
  */
  */
 @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
@@ -55,16 +56,10 @@ public class Product implements Serializable {
 	@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")})
+	@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
 	@ManyToMany
 	private List<FoodWaveTemplate> foodWaveTemplate;
 	private List<FoodWaveTemplate> foodWaveTemplate;
 
 
-
-
 	public Product() {
 	public Product() {
 	}
 	}
 
 
@@ -143,12 +138,15 @@ public class Product 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 Product)) {
 		if (!(object instanceof Product)) {
 			return false;
 			return false;
 		}
 		}
 		Product other = (Product) object;
 		Product other = (Product) object;
-        if ((this.productsId == null && other.productsId != null) || (this.productsId != null && !this.productsId.equals(other.productsId))) {
+		if ((this.productsId == null && other.productsId != null)
+				|| (this.productsId != null && !this.productsId
+						.equals(other.productsId))) {
 			return false;
 			return false;
 		}
 		}
 		return true;
 		return true;
@@ -156,7 +154,8 @@ public class Product implements Serializable {
 
 
 	@Override
 	@Override
 	public String toString() {
 	public String toString() {
-        return "fi.insomnia.bortal.model.Product[productsId=" + productsId + "]";
+		return "fi.insomnia.bortal.model.Product[productsId=" + productsId
+				+ "]";
 	}
 	}
 
 
 	/**
 	/**
@@ -167,7 +166,8 @@ public class Product implements Serializable {
 	}
 	}
 
 
 	/**
 	/**
-     * @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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;