1 files changed, 200 insertions, 200 deletions
diff --git a/EjercitarJPA/src/model/Concepto.java b/EjercitarJPA/src/model/Concepto.java
index d6d160a..12c2083 100644
--- a/EjercitarJPA/src/model/Concepto.java
+++ b/EjercitarJPA/src/model/Concepto.java
@@ -1,200 +1,200 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package model;
-
-import java.io.Serializable;
-import java.util.List;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-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.Table;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-
-/**
- *
- * @author Ceci
- */
-@Entity
-@Table(name = "concepto")
-@XmlRootElement
-@NamedQueries({
-    @NamedQuery(name = "Concepto.findAll", query = "SELECT c FROM Concepto c"),
-    @NamedQuery(name = "Concepto.findByIdConcepto", query = "SELECT c FROM Concepto c WHERE c.idConcepto = :idConcepto"),
-    @NamedQuery(name = "Concepto.findByNombre", query = "SELECT c FROM Concepto c WHERE c.nombre = :nombre"),
-    @NamedQuery(name = "Concepto.findByDescripcion", query = "SELECT c FROM Concepto c WHERE c.descripcion = :descripcion"),
-    @NamedQuery(name = "Concepto.findByPeso", query = "SELECT c FROM Concepto c WHERE c.peso = :peso"),
-    @NamedQuery(name = "Concepto.findByAdivinanza", query = "SELECT c FROM Concepto c WHERE c.adivinanza = :adivinanza"),
-    @NamedQuery(name = "Concepto.findByDescuido", query = "SELECT c FROM Concepto c WHERE c.descuido = :descuido"),
-    @NamedQuery(name = "Concepto.findByApriori", query = "SELECT c FROM Concepto c WHERE c.apriori = :apriori")})
-public class Concepto implements Serializable {
-    private static final long serialVersionUID = 1L;
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Basic(optional = false)
-    @Column(name = "id_concepto")
-    private Integer idConcepto;
-    @Basic(optional = false)
-    @NotNull
-    @Size(min = 1, max = 2147483647)
-    @Column(name = "nombre")
-    private String nombre;
-    @Basic(optional = false)
-    @NotNull
-    @Size(min = 1, max = 2147483647)
-    @Column(name = "descripcion")
-    private String descripcion;
-    @Column(name = "peso")
-    private Integer peso;
-    // @Max(value=?)  @Min(value=?)//if you know range of your decimal fields consider using these annotations to enforce field validation
-    @Column(name = "adivinanza")
-    private Double adivinanza;
-    @Column(name = "descuido")
-    private Double descuido;
-    @Column(name = "apriori")
-    private Double apriori;
-    @JoinTable(name = "ejercicio_concepto", joinColumns = {
-        @JoinColumn(name = "id_concepto", referencedColumnName = "id_concepto")}, inverseJoinColumns = {
-        @JoinColumn(name = "id_ejercicio", referencedColumnName = "id_ejercicio")})
-    @ManyToMany
-    private List<Ejercicio> ejercicioList;
-    @JoinColumn(name = "tema", referencedColumnName = "id_tema")
-    @ManyToOne
-    private Tema tema;
-    @JoinColumn(name = "profesor", referencedColumnName = "id_profesor")
-    @ManyToOne
-    private Profesor profesor;
-
-    public Concepto() {
-    }
-
-    public Concepto(Integer idConcepto) {
-        this.idConcepto = idConcepto;
-    }
-
-    public Concepto(Integer idConcepto, String nombre, String descripcion) {
-        this.idConcepto = idConcepto;
-        this.nombre = nombre;
-        this.descripcion = descripcion;
-    }
-
-    public Integer getIdConcepto() {
-        return idConcepto;
-    }
-
-    public void setIdConcepto(Integer idConcepto) {
-        this.idConcepto = idConcepto;
-    }
-
-    public String getNombre() {
-        return nombre;
-    }
-
-    public void setNombre(String nombre) {
-        this.nombre = nombre;
-    }
-
-    public String getDescripcion() {
-        return descripcion;
-    }
-
-    public void setDescripcion(String descripcion) {
-        this.descripcion = descripcion;
-    }
-
-    public Integer getPeso() {
-        return peso;
-    }
-
-    public void setPeso(Integer peso) {
-        this.peso = peso;
-    }
-
-    public Double getAdivinanza() {
-        return adivinanza;
-    }
-
-    public void setAdivinanza(Double adivinanza) {
-        this.adivinanza = adivinanza;
-    }
-
-    public Double getDescuido() {
-        return descuido;
-    }
-
-    public void setDescuido(Double descuido) {
-        this.descuido = descuido;
-    }
-
-    public Double getApriori() {
-        return apriori;
-    }
-
-    public void setApriori(Double apriori) {
-        this.apriori = apriori;
-    }
-
-    @XmlTransient
-    public List<Ejercicio> getEjercicioList() {
-        return ejercicioList;
-    }
-
-    public void setEjercicioList(List<Ejercicio> ejercicioList) {
-        this.ejercicioList = ejercicioList;
-    }
-
-    public Tema getTema() {
-        return tema;
-    }
-
-    public void setTema(Tema tema) {
-        this.tema = tema;
-    }
-
-    public Profesor getProfesor() {
-        return profesor;
-    }
-
-    public void setProfesor(Profesor profesor) {
-        this.profesor = profesor;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 0;
-        hash += (idConcepto != null ? idConcepto.hashCode() : 0);
-        return hash;
-    }
-
-    @Override
-    public boolean equals(Object object) {
-        // TODO: Warning - this method won't work in the case the id fields are not set
-        if (!(object instanceof Concepto)) {
-            return false;
-        }
-        Concepto other = (Concepto) object;
-        if ((this.idConcepto == null && other.idConcepto != null) || (this.idConcepto != null && !this.idConcepto.equals(other.idConcepto))) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public String toString() {
-        return "model.Concepto[ idConcepto=" + idConcepto + " ]";
-    }
-    
-}
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package model;
+
+import java.io.Serializable;
+import java.util.List;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+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.Table;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
+
+/**
+ *
+ * @author Ceci
+ */
+@Entity
+@Table(name = "concepto")
+@XmlRootElement
+@NamedQueries({
+    @NamedQuery(name = "Concepto.findAll", query = "SELECT c FROM Concepto c"),
+    @NamedQuery(name = "Concepto.findByIdConcepto", query = "SELECT c FROM Concepto c WHERE c.idConcepto = :idConcepto"),
+    @NamedQuery(name = "Concepto.findByNombre", query = "SELECT c FROM Concepto c WHERE c.nombre = :nombre"),
+    @NamedQuery(name = "Concepto.findByDescripcion", query = "SELECT c FROM Concepto c WHERE c.descripcion = :descripcion"),
+    @NamedQuery(name = "Concepto.findByPeso", query = "SELECT c FROM Concepto c WHERE c.peso = :peso"),
+    @NamedQuery(name = "Concepto.findByAdivinanza", query = "SELECT c FROM Concepto c WHERE c.adivinanza = :adivinanza"),
+    @NamedQuery(name = "Concepto.findByDescuido", query = "SELECT c FROM Concepto c WHERE c.descuido = :descuido"),
+    @NamedQuery(name = "Concepto.findByApriori", query = "SELECT c FROM Concepto c WHERE c.apriori = :apriori")})
+public class Concepto implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Basic(optional = false)
+    @Column(name = "id_concepto")
+    private Integer idConcepto;
+    @Basic(optional = false)
+    @NotNull
+    @Size(min = 1, max = 2147483647)
+    @Column(name = "nombre")
+    private String nombre;
+    @Basic(optional = false)
+    @NotNull
+    @Size(min = 1, max = 2147483647)
+    @Column(name = "descripcion")
+    private String descripcion;
+    @Column(name = "peso")
+    private Integer peso;
+    // @Max(value=?)  @Min(value=?)//if you know range of your decimal fields consider using these annotations to enforce field validation
+    @Column(name = "adivinanza")
+    private Double adivinanza;
+    @Column(name = "descuido")
+    private Double descuido;
+    @Column(name = "apriori")
+    private Double apriori;
+    @JoinTable(name = "ejercicio_concepto", joinColumns = {
+        @JoinColumn(name = "id_concepto", referencedColumnName = "id_concepto")}, inverseJoinColumns = {
+        @JoinColumn(name = "id_ejercicio", referencedColumnName = "id_ejercicio")})
+    @ManyToMany
+    private List<Ejercicio> ejercicioList;
+    @JoinColumn(name = "tema", referencedColumnName = "id_tema")
+    @ManyToOne
+    private Tema tema;
+    @JoinColumn(name = "profesor", referencedColumnName = "id_profesor")
+    @ManyToOne
+    private Profesor profesor;
+
+    public Concepto() {
+    }
+
+    public Concepto(Integer idConcepto) {
+        this.idConcepto = idConcepto;
+    }
+
+    public Concepto(Integer idConcepto, String nombre, String descripcion) {
+        this.idConcepto = idConcepto;
+        this.nombre = nombre;
+        this.descripcion = descripcion;
+    }
+
+    public Integer getIdConcepto() {
+        return idConcepto;
+    }
+
+    public void setIdConcepto(Integer idConcepto) {
+        this.idConcepto = idConcepto;
+    }
+
+    public String getNombre() {
+        return nombre;
+    }
+
+    public void setNombre(String nombre) {
+        this.nombre = nombre;
+    }
+
+    public String getDescripcion() {
+        return descripcion;
+    }
+
+    public void setDescripcion(String descripcion) {
+        this.descripcion = descripcion;
+    }
+
+    public Integer getPeso() {
+        return peso;
+    }
+
+    public void setPeso(Integer peso) {
+        this.peso = peso;
+    }
+
+    public Double getAdivinanza() {
+        return adivinanza;
+    }
+
+    public void setAdivinanza(Double adivinanza) {
+        this.adivinanza = adivinanza;
+    }
+
+    public Double getDescuido() {
+        return descuido;
+    }
+
+    public void setDescuido(Double descuido) {
+        this.descuido = descuido;
+    }
+
+    public Double getApriori() {
+        return apriori;
+    }
+
+    public void setApriori(Double apriori) {
+        this.apriori = apriori;
+    }
+
+    @XmlTransient
+    public List<Ejercicio> getEjercicioList() {
+        return ejercicioList;
+    }
+
+    public void setEjercicioList(List<Ejercicio> ejercicioList) {
+        this.ejercicioList = ejercicioList;
+    }
+
+    public Tema getTema() {
+        return tema;
+    }
+
+    public void setTema(Tema tema) {
+        this.tema = tema;
+    }
+
+    public Profesor getProfesor() {
+        return profesor;
+    }
+
+    public void setProfesor(Profesor profesor) {
+        this.profesor = profesor;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 0;
+        hash += (idConcepto != null ? idConcepto.hashCode() : 0);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object object) {
+        // TODO: Warning - this method won't work in the case the id fields are not set
+        if (!(object instanceof Concepto)) {
+            return false;
+        }
+        Concepto other = (Concepto) object;
+        if ((this.idConcepto == null && other.idConcepto != null) || (this.idConcepto != null && !this.idConcepto.equals(other.idConcepto))) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        return "model.Concepto[ idConcepto=" + idConcepto + " ]";
+    }
+    
+}