Refactoring Startpass

src/main/java/META-INF/persistence.xml

@@ -11,7 +11,7 @@
 		<class>de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Person</class>
 		<class>de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Persongroup</class>
 		<class>de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Relative</class>
-		<class>de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Startpaesse</class>
+		<class>de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Startpass</class>
 		<class>de.kreth.vaadin.clubhelper.vaadinclubhelper.data.StartpassStartrechte</class>
 		<class>de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Version</class>
 		<properties>

src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/data/Person.java

@@ -16,6 +16,7 @@ import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
 import javax.persistence.NamedQuery;
 import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
 import javax.persistence.Table;
 
 /**
@@ -46,6 +47,9 @@ public class Person extends BaseEntity implements Serializable {
 
 	private String username;
 
+	@OneToOne
+	private Startpass startpass;
+
 	// bi-directional many-to-one association to Adress
 	@OneToMany(mappedBy = "person")
 	private List<Adress> adresses;
@@ -72,10 +76,6 @@ public class Person extends BaseEntity implements Serializable {
 	@OneToMany(mappedBy = "person2Bean")
 	private List<Relative> relatives2;
 
-	// bi-directional many-to-one association to Startpaesse
-	@OneToMany(mappedBy = "person")
-	private List<Startpaesse> startpaesses;
-
 	@ManyToMany(fetch = FetchType.EAGER, mappedBy = "persons")
 	private Set<ClubEvent> events;
 
@@ -288,25 +288,12 @@ public class Person extends BaseEntity implements Serializable {
 		return relatives2;
 	}
 
-	public List<Startpaesse> getStartpaesses() {
+	public Startpass getStartpass() {
-		return this.startpaesses;
+		return startpass;
-	}
-
-	public void setStartpaesses(List<Startpaesse> startpaesses) {
-		this.startpaesses = startpaesses;
-	}
-
-	public Startpaesse addStartpaess(Startpaesse startpaess) {
-		getStartpaesses().add(startpaess);
-		startpaess.setPerson(this);
-
-		return startpaess;
 	}
 
-	public Startpaesse removeStartpaess(Startpaesse startpaess) {
+	public void setStartpass(Startpass startpass) {
-		getStartpaesses().remove(startpaess);
+		this.startpass = startpass;
-		startpaess.setPerson(null);
-		return startpaess;
 	}
 
 	@Override

src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/data/StartpassStartrechte.java

@@ -33,7 +33,7 @@ public class StartpassStartrechte extends BaseEntity implements Serializable {
 	//bi-directional many-to-one association to Startpaesse
 	@ManyToOne
 	@JoinColumn(name="startpass_id")
-	private Startpaesse startpaesse;
+	private Startpass startpaesse;
 
 	public String getFachgebiet() {
 		return this.fachgebiet;
@@ -67,11 +67,11 @@ public class StartpassStartrechte extends BaseEntity implements Serializable {
 		this.vereinName = vereinName;
 	}
 
-	public Startpaesse getStartpaesse() {
+	public Startpass getStartpaesse() {
 		return this.startpaesse;
 	}
 
-	public void setStartpaesse(Startpaesse startpaesse) {
+	public void setStartpaesse(Startpass startpaesse) {
 		this.startpaesse = startpaesse;
 	}
 

src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/jasper/CalendarCreator.java

@@ -30,7 +30,7 @@ import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.GroupDef;
 import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Person;
 import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Persongroup;
 import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Relative;
-import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Startpaesse;
+import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Startpass;
 import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.StartpassStartrechte;
 import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Version;
 import net.sf.jasperreports.engine.JRDataSource;
@@ -184,7 +184,7 @@ public abstract class CalendarCreator {
 		configuration.addAnnotatedClass(Person.class);
 		configuration.addAnnotatedClass(Persongroup.class);
 		configuration.addAnnotatedClass(Relative.class);
-		configuration.addAnnotatedClass(Startpaesse.class);
+		configuration.addAnnotatedClass(Startpass.class);
 		configuration.addAnnotatedClass(StartpassStartrechte.class);
 		configuration.addAnnotatedClass(Version.class);
 		configuration.addInputStream(CalendarCreator.class.getResourceAsStream("/schema/ClubEvent.hbm.xml"));

src/test/java/de/kreth/vaadin/clubhelper/HibernateHolder.java

@@ -13,7 +13,7 @@ import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.GroupDef;
 import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Person;
 import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Persongroup;
 import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Relative;
-import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Startpaesse;
+import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Startpass;
 import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.StartpassStartrechte;
 import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Version;
 
@@ -32,7 +32,7 @@ public enum HibernateHolder {
 		configuration.addAnnotatedClass(Person.class);
 		configuration.addAnnotatedClass(Persongroup.class);
 		configuration.addAnnotatedClass(Relative.class);
-		configuration.addAnnotatedClass(Startpaesse.class);
+		configuration.addAnnotatedClass(Startpass.class);
 		configuration.addAnnotatedClass(StartpassStartrechte.class);
 		configuration.addAnnotatedClass(Version.class);
 		configuration.addInputStream(getClass().getResourceAsStream("/schema/ClubEvent.hbm.xml"));