formatting

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

@@ -31,7 +31,7 @@ import javax.persistence.Version;
 public class AccessRight implements ModelInterface {
 public class AccessRight implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
-    @GeneratedValue(strategy=GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "access_rights_id", nullable = false)
     @Column(name = "access_rights_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

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

@@ -40,14 +40,14 @@ public class AccountEvent implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     @Id
     @Id
-    @GeneratedValue(strategy=GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "account_events_id", nullable = false)
     @Column(name = "account_events_id", nullable = false)
     private Integer id;
     private Integer id;
 
 
-    @Column(name = "unit_price", nullable = false, precision=24,scale=4)
+    @Column(name = "unit_price", nullable = false, precision = 24, scale = 4)
     private BigDecimal unitPrice;
     private BigDecimal unitPrice;
 
 
-    @Column(name = "unit_count", nullable = false, precision=24,scale=4)
+    @Column(name = "unit_count", nullable = false, precision = 24, scale = 4)
     private BigDecimal units;
     private BigDecimal units;
 
 
     @Column(name = "event_time", nullable = false)
     @Column(name = "event_time", nullable = false)

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

@@ -30,7 +30,7 @@ import javax.persistence.Version;
  */
  */
 @Entity
 @Entity
 @Table(name = "bills")
 @Table(name = "bills")
-@NamedQueries({
+@NamedQueries( {
         @NamedQuery(name = "Bill.findAll", query = "SELECT b FROM Bill b"),
         @NamedQuery(name = "Bill.findAll", query = "SELECT b FROM Bill b"),
         // @NamedQuery(name = "Bill.findById", query =
         // @NamedQuery(name = "Bill.findById", query =
 
 

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

@@ -32,23 +32,23 @@ import javax.persistence.Version;
         @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 ModelInterface {
 public class BillLine implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
-    private static final BigDecimal DEFAULT_VAT =BigDecimal.ZERO;
+    private static final BigDecimal DEFAULT_VAT = BigDecimal.ZERO;
     @Id
     @Id
-    @GeneratedValue(strategy=GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "bill_lines_id", nullable = false)
     @Column(name = "bill_lines_id", nullable = false)
     private Integer id;
     private Integer id;
 
 
     @Column(name = "name", nullable = false)
     @Column(name = "name", nullable = false)
     private String name;
     private String name;
 
 
-    @Column(name = "units", nullable = false, precision=24,scale=4)
+    @Column(name = "units", nullable = false, precision = 24, scale = 4)
     private BigDecimal units;
     private BigDecimal units;
 
 
-    @Column(name = "unit_price", nullable = false, precision=24,scale=4)
+    @Column(name = "unit_price", nullable = false, precision = 24, scale = 4)
     private BigDecimal unitPrice;
     private BigDecimal unitPrice;
 
 
-    @Column(name = "vat", nullable = false,precision=3,scale=2)
-    private BigDecimal vat=DEFAULT_VAT;
+    @Column(name = "vat", nullable = false, precision = 3, scale = 2)
+    private BigDecimal vat = DEFAULT_VAT;
 
 
     @JoinColumn(name = "bills_id", referencedColumnName = "bills_id")
     @JoinColumn(name = "bills_id", referencedColumnName = "bills_id")
     @ManyToOne
     @ManyToOne

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

@@ -33,7 +33,7 @@ import javax.persistence.Version;
 public class CardTemplate implements ModelInterface {
 public class CardTemplate implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
-    @GeneratedValue(strategy=GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "card_templates_id", nullable = false)
     @Column(name = "card_templates_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

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

@@ -44,7 +44,7 @@ import javax.persistence.Version;
 public class Compo implements ModelInterface {
 public class Compo implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
-    @GeneratedValue(strategy=GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "compos_id", nullable = false)
     @Column(name = "compos_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

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

@@ -42,7 +42,7 @@ import javax.persistence.Version;
 public class CompoEntry implements ModelInterface {
 public class CompoEntry implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
-    @GeneratedValue(strategy=GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "entries_id", nullable = false)
     @Column(name = "entries_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

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

@@ -38,7 +38,7 @@ import javax.persistence.Version;
 public class CompoEntryFile implements ModelInterface {
 public class CompoEntryFile implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
-    @GeneratedValue(strategy=GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "entry_files_id", nullable = false)
     @Column(name = "entry_files_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

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

@@ -30,7 +30,7 @@ public class CompoEntryParticipant implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     @Id
     @Id
-    @GeneratedValue(strategy=GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "entry_participations_id", nullable = false)
     @Column(name = "entry_participations_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

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

@@ -41,7 +41,7 @@ import javax.persistence.Version;
 public class Discount implements ModelInterface {
 public class Discount implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
-    @GeneratedValue(strategy=GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "discounts_id", nullable = false)
     @Column(name = "discounts_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

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

@@ -30,7 +30,7 @@ public class DiscountInstance implements ModelInterface {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
-    @GeneratedValue(strategy=GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "discounts_instances_id", nullable = false)
     @Column(name = "discounts_instances_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

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

@@ -40,7 +40,7 @@ public class Event implements ModelInterface {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
-    @GeneratedValue(strategy=GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "events_id", nullable = false)
     @Column(name = "events_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

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

@@ -34,7 +34,7 @@ public class EventMap implements ModelInterface {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
-    @GeneratedValue(strategy=GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "maps_id", nullable = false)
     @Column(name = "maps_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

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

@@ -32,7 +32,7 @@ public class EventSettings implements ModelInterface {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
-    @GeneratedValue(strategy=GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "event_settings_id", nullable = false)
     @Column(name = "event_settings_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

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

@@ -33,7 +33,7 @@ public class EventStatus implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     @Id
     @Id
-    @GeneratedValue(strategy=GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "event_status_id", nullable = false)
     @Column(name = "event_status_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

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

@@ -37,7 +37,7 @@ public class FoodWave implements ModelInterface {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
-    @GeneratedValue(strategy=GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "food_waves_id", nullable = false)
     @Column(name = "food_waves_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

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

@@ -32,7 +32,7 @@ public class FoodWaveTemplate implements ModelInterface {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
-    @GeneratedValue(strategy=GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "food_wave_templates_id", nullable = false)
     @Column(name = "food_wave_templates_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

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

@@ -38,7 +38,7 @@ public class GroupMembership implements ModelInterface {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
-    @GeneratedValue(strategy=GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "group_memberships_id", nullable = false)
     @Column(name = "group_memberships_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

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

@@ -22,7 +22,7 @@ import javax.persistence.Version;
  */
  */
 @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.findByLocationName", query = "SELECT l FROM Location l WHERE l.name = :name") })
         @NamedQuery(name = "Location.findByLocationName", query = "SELECT l FROM Location l WHERE l.name = :name") })
@@ -30,7 +30,7 @@ public class Location implements ModelInterface {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
-    @GeneratedValue(strategy=GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "locations_id", nullable = false)
     @Column(name = "locations_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

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

@@ -36,7 +36,7 @@ public class LogEntry implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     @Id
     @Id
-    @GeneratedValue(strategy=GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "event_log_id", nullable = false)
     @Column(name = "event_log_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

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

@@ -24,7 +24,7 @@ import javax.persistence.Version;
  */
  */
 @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.findByDescription", query = "SELECT l FROM LogEntryType l WHERE l.description = :description") })
         @NamedQuery(name = "LogEntryType.findByDescription", query = "SELECT l FROM LogEntryType l WHERE l.description = :description") })

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

@@ -27,7 +27,7 @@ import javax.persistence.Version;
  */
  */
 @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.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"),

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

@@ -37,13 +37,13 @@ public class NewsGroup implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     @Id
     @Id
-    @GeneratedValue(strategy=GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "news_groups_id", nullable = false)
     @Column(name = "news_groups_id", nullable = false)
     private Integer id;
     private Integer id;
 
 
     @Column(name = "group_name", nullable = false)
     @Column(name = "group_name", nullable = false)
     private String name;
     private String name;
-    
+
     @Lob
     @Lob
     @Column(name = "group_description")
     @Column(name = "group_description")
     private String description;
     private String description;

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

@@ -36,7 +36,7 @@ public class Place implements ModelInterface {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
-    @GeneratedValue(strategy=GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "places_id", nullable = false)
     @Column(name = "places_id", nullable = false)
     private Integer id;
     private Integer id;
     @Lob
     @Lob

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

@@ -42,7 +42,7 @@ public class PlaceGroup implements ModelInterface {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
-    @GeneratedValue(strategy=GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "groups_id", nullable = false)
     @Column(name = "groups_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

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

@@ -39,7 +39,7 @@ import javax.persistence.Version;
 public class PrintedCard implements ModelInterface {
 public class PrintedCard implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
-    @GeneratedValue(strategy=GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "printed_cards_id", nullable = false)
     @Column(name = "printed_cards_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

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

@@ -39,7 +39,7 @@ public class Product implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     @Id
     @Id
-    @GeneratedValue(strategy=GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "products_id", nullable = false)
     @Column(name = "products_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

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

@@ -36,7 +36,7 @@ public class Reader implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     @Id
     @Id
-    @GeneratedValue(strategy=GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "readers_id", nullable = false)
     @Column(name = "readers_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

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

@@ -35,7 +35,7 @@ public class ReaderEvent implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     @Id
     @Id
-    @GeneratedValue(strategy=GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "reader_events_id", nullable = false)
     @Column(name = "reader_events_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

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

@@ -36,7 +36,7 @@ public class Role implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     @Id
     @Id
-    @GeneratedValue(strategy=GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "roles_id", nullable = false)
     @Column(name = "roles_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

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

@@ -39,7 +39,7 @@ public class RoleRight implements ModelInterface {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
-    @GeneratedValue(strategy=GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "role_rights_id", nullable = false)
     @Column(name = "role_rights_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

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

@@ -50,7 +50,6 @@ public class User implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     @Id
     @Id
-    @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name = "users_id", nullable = false)
     @Column(name = "users_id", nullable = false)
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Integer id;
     private Integer id;

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

@@ -33,7 +33,7 @@ public class UserImage implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     @Id
     @Id
-    @GeneratedValue(strategy=GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "user_images_id", nullable = false)
     @Column(name = "user_images_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

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

@@ -36,7 +36,7 @@ public class Vote implements ModelInterface {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
-    @GeneratedValue(strategy=GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "votes_id", nullable = false)
     @Column(name = "votes_id", nullable = false)
     private Integer id;
     private Integer id;
     @Column(name = "score")
     @Column(name = "score")
@@ -70,6 +70,7 @@ public class Vote implements ModelInterface {
     public Integer getId() {
     public Integer getId() {
         return id;
         return id;
     }
     }
+
     @Override
     @Override
     public void setId(Integer votesId) {
     public void setId(Integer votesId) {
         this.id = votesId;
         this.id = votesId;