diff options
Diffstat (limited to 'EjercitarJPA/src/model/Asignatura.java')
-rw-r--r-- | EjercitarJPA/src/model/Asignatura.java | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/EjercitarJPA/src/model/Asignatura.java b/EjercitarJPA/src/model/Asignatura.java index de5fc9d..508c9e1 100644 --- a/EjercitarJPA/src/model/Asignatura.java +++ b/EjercitarJPA/src/model/Asignatura.java @@ -13,10 +13,10 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
+import javax.persistence.ManyToOne;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
+import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
@@ -28,7 +28,7 @@ import javax.xml.bind.annotation.XmlTransient; * @author Ceci
*/
@Entity
-@Table(name = "ASIGNATURA")
+@Table(name = "asignatura")
@XmlRootElement
@NamedQueries({
@NamedQuery(name = "Asignatura.findAll", query = "SELECT a FROM Asignatura a"),
@@ -50,11 +50,11 @@ public class Asignatura implements Serializable { @Size(max = 2147483647)
@Column(name = "descripcion")
private String descripcion;
- @JoinTable(name = "PROFESOR_ASIGNATURA", joinColumns = {
- @JoinColumn(name = "id_asignatura", referencedColumnName = "id_asignatura")}, inverseJoinColumns = {
- @JoinColumn(name = "id_profesor", referencedColumnName = "id_profesor")})
- @ManyToMany
- private List<Profesor> profesorList;
+ @JoinColumn(name = "profesor", referencedColumnName = "id_profesor")
+ @ManyToOne
+ private Profesor profesor;
+ @OneToMany(mappedBy = "asignatura")
+ private List<Tema> temaList;
public Asignatura() {
}
@@ -92,13 +92,21 @@ public class Asignatura implements Serializable { this.descripcion = descripcion;
}
+ public Profesor getProfesor() {
+ return profesor;
+ }
+
+ public void setProfesor(Profesor profesor) {
+ this.profesor = profesor;
+ }
+
@XmlTransient
- public List<Profesor> getProfesorList() {
- return profesorList;
+ public List<Tema> getTemaList() {
+ return temaList;
}
- public void setProfesorList(List<Profesor> profesorList) {
- this.profesorList = profesorList;
+ public void setTemaList(List<Tema> temaList) {
+ this.temaList = temaList;
}
@Override
|