Merge branch 'master' into Production

added annotations to generate layouts

src/main/java/cz/zcu/kiv/eegdatabase/data/pojo/Artifact.java

@@ -30,6 +30,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import cz.zcu.kiv.formgen.annotation.Form;
 import org.hibernate.annotations.GenericGenerator;
 
 import cz.zcu.kiv.formgen.annotation.FormId;

src/main/java/cz/zcu/kiv/eegdatabase/data/pojo/Digitization.java

@@ -28,6 +28,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import cz.zcu.kiv.formgen.annotation.Form;
 import org.hibernate.annotations.GenericGenerator;
 
 import cz.zcu.kiv.formgen.annotation.FormId;

src/main/java/cz/zcu/kiv/eegdatabase/data/pojo/ElectrodeConf.java

@@ -29,6 +29,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import cz.zcu.kiv.formgen.annotation.Form;
 import org.hibernate.annotations.GenericGenerator;
 
 import cz.zcu.kiv.formgen.annotation.FormId;

src/main/java/cz/zcu/kiv/eegdatabase/data/pojo/ElectrodeSystem.java

@@ -25,6 +25,7 @@
 import cz.zcu.kiv.eegdatabase.data.annotation.SolrField;
 import cz.zcu.kiv.eegdatabase.data.annotation.SolrId;
 import cz.zcu.kiv.eegdatabase.logic.indexing.IndexField;
+import cz.zcu.kiv.formgen.annotation.Form;
 import cz.zcu.kiv.formgen.annotation.FormId;
 import cz.zcu.kiv.formgen.annotation.FormItem;
 import cz.zcu.kiv.formgen.annotation.PreviewLevel;

src/main/java/cz/zcu/kiv/eegdatabase/data/pojo/Person.java

@@ -40,13 +40,10 @@
 import javax.persistence.Table;
 import javax.persistence.Transient;
 
+import cz.zcu.kiv.formgen.annotation.*;
 import org.hibernate.annotations.GenericGenerator;
 
 import cz.zcu.kiv.eegdatabase.wui.ui.experiments.converters.IAutoCompletable;
-import cz.zcu.kiv.formgen.annotation.FormId;
-import cz.zcu.kiv.formgen.annotation.FormItem;
-import cz.zcu.kiv.formgen.annotation.FormItemRestriction;
-import cz.zcu.kiv.formgen.annotation.PreviewLevel;
 
 // Generated 2.12.2013 0:56:28 by Hibernate Tools 3.4.0.CR1
 

src/main/java/cz/zcu/kiv/eegdatabase/data/pojo/ResearchGroup.java

@@ -38,6 +38,7 @@
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
+import cz.zcu.kiv.formgen.annotation.Form;
 import org.hibernate.annotations.GenericGenerator;
 
 import cz.zcu.kiv.formgen.annotation.FormId;

src/main/java/cz/zcu/kiv/eegdatabase/data/pojo/Scenario.java

@@ -44,6 +44,7 @@
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
+import cz.zcu.kiv.formgen.annotation.Form;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
 

src/main/java/cz/zcu/kiv/eegdatabase/data/pojo/SubjectGroup.java

@@ -35,6 +35,7 @@
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
+import cz.zcu.kiv.formgen.annotation.Form;
 import org.hibernate.annotations.GenericGenerator;
 
 import cz.zcu.kiv.formgen.annotation.FormId;

src/main/java/cz/zcu/kiv/eegdatabase/data/pojo/Weather.java

@@ -38,6 +38,7 @@
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
+import cz.zcu.kiv.formgen.annotation.Form;
 import org.hibernate.annotations.GenericGenerator;
 
 import cz.zcu.kiv.formgen.annotation.FormId;