diff --git a/pom.xml b/pom.xml
index fdf9d5d7d..627d58494 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
br.com.rjconsultores
ModelWeb
- 1.79.0
+ 1.80.0
diff --git a/src/com/rjconsultores/ventaboletos/entidad/Parada.java b/src/com/rjconsultores/ventaboletos/entidad/Parada.java
index 1d012f71e..204e985f9 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/Parada.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/Parada.java
@@ -1,411 +1,422 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package com.rjconsultores.ventaboletos.entidad;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.persistence.Transient;
-
-import org.hibernate.annotations.Fetch;
-import org.hibernate.annotations.FetchMode;
-
-import br.com.rjconsultores.auditador.annotations.NaoAuditar;
-import br.com.rjconsultores.auditador.interfaces.Auditavel;
-
-/**
- *
- * @author Administrador
- */
-@Entity
-@SequenceGenerator(name = "PARADA_SEQ", sequenceName = "PARADA_SEQ", allocationSize = 1)
-@Table(name = "PARADA")
-public class Parada implements Serializable, Auditavel {
- public static Integer ID_PARADA_TODOS = -1;
-
- private static final long serialVersionUID = 1L;
- @Id
- @Basic(optional = false)
- @GeneratedValue(strategy = GenerationType.AUTO, generator = "PARADA_SEQ")
- @Column(name = "PARADA_ID")
- private Integer paradaId;
- @Basic(optional = false)
- @Column(name = "DESCPARADA")
- private String descparada;
- @Column(name = "CVEPARADA")
- private String cveparada;
- @Column(name = "ACTIVO")
- private Boolean activo;
- @Column(name = "FECMODIF")
- @Temporal(TemporalType.TIMESTAMP)
- private Date fecmodif;
- @Column(name = "USUARIO_ID")
- private Integer usuarioId;
- @OneToOne
- @JoinColumn(name = "CIUDAD_ID")
- private Ciudad ciudad;
- @OneToOne
- @JoinColumn(name = "TIPOPARADA_ID")
- private TipoParada tipoParada;
- @OneToMany(mappedBy = "origem")
- private List corridaList;
- @OneToMany(mappedBy = "destino")
- private List corridaList1;
- @OneToMany(mappedBy = "paradaOrigem")
- private List reservacionMercadoList;
- @OneToMany(mappedBy = "paradaDestino")
- private List reservacionMercadoList1;
- @OneToMany(mappedBy = "destino")
- private List categoriaMercadoDestinoList;
- @OneToMany(mappedBy = "origem")
- private List categoriaMercadoOrigemList;
- @OneToOne
- @JoinColumn(name = "NODO_ID")
- private Nodo nodo;
- @OneToMany(mappedBy = "origem")
- private List tramoOrigemList;
- @OneToMany(mappedBy = "destino")
- private List tramoDestinoList;
- @Column(name = "CODANTT")
- private Integer codantt;
- @Column(name = "CODANTTAUX")
- private Integer codanttaux;
- @Column(name = "DESCPROCON")
- private String descProcon;
- @Column(name="INDVENDETOTEM")
- private Boolean indVendeTotem;
- @Column(name="INDVISIBLEINTERNET")
- private Boolean indVisibleInternet;
- @OneToOne
- @JoinColumn(name = "AGRUPAMENTOPARADA_ID")
- private AgrupamentoParada agrupamentoParada;
-
- @ManyToOne
- @JoinColumn(name = "REGIONMETROPOLITANA_ID", referencedColumnName = "REGIONMETROPOLITANA_ID")
- private RegionMetropolitana regionMetropolitana;
-
- @OneToMany(mappedBy = "parada", fetch = FetchType.EAGER, cascade = javax.persistence.CascadeType.ALL)
- @Fetch(value = FetchMode.SUBSELECT)
- private List codigosOrgaosConcedentes = new ArrayList();
-
- @Column(name="INDINTEGRACAOW2I")
- private Boolean indIntegracaoW2i;
-
- @Transient
- @NaoAuditar
- private Parada paradaClone;
-
- @Transient
- @NaoAuditar
- Boolean isParadaConexaoRutaExcluida;
-
-
- public Boolean getIsParadaConexaoRutaExcluida() {
- return isParadaConexaoRutaExcluida ==null?false:isParadaConexaoRutaExcluida;
- }
-
- public void setIsParadaConexaoRutaExcluida(Boolean isParadaConexaoRutaExcluida) {
- this.isParadaConexaoRutaExcluida = isParadaConexaoRutaExcluida;
- }
-
- public Parada() {
- super();
- }
-
- public Parada(Integer paradaId) {
- this();
-
- this.paradaId = paradaId;
- }
-
- public Parada(Integer paradaId, String cveparada, String descparada) {
- this(paradaId);
- this.cveparada = cveparada;
- this.descparada = descparada;
- }
-
- public List getCategoriaMercadoDestinoList() {
- return categoriaMercadoDestinoList;
- }
-
- public void setCategoriaMercadoDestinoList(List categoriaMercadoDestinoList) {
- this.categoriaMercadoDestinoList = categoriaMercadoDestinoList;
- }
-
- public List getCategoriaMercadoOrigemList() {
- return categoriaMercadoOrigemList;
- }
-
- public void setCategoriaMercadoOrigemList(List categoriaMercadoOrigemList) {
- this.categoriaMercadoOrigemList = categoriaMercadoOrigemList;
- }
-
- public String getDescparada() {
- return descparada;
- }
-
- public void setDescparada(String descparada) {
- this.descparada = descparada;
- }
-
- public Integer getParadaId() {
- return paradaId;
- }
-
- public void setParadaId(Integer paradaId) {
- this.paradaId = paradaId;
- }
-
- public List getReservacionMercadoList() {
- return reservacionMercadoList;
- }
-
- public void setReservacionMercadoList(List reservacionMercadoList) {
- this.reservacionMercadoList = reservacionMercadoList;
- }
-
- public List getReservacionMercadoList1() {
- return reservacionMercadoList1;
- }
-
- public void setReservacionMercadoList1(List reservacionMercadoList1) {
- this.reservacionMercadoList1 = reservacionMercadoList1;
- }
-
- public String getCveparada() {
- return cveparada;
- }
-
- public void setCveparada(String cveparada) {
- this.cveparada = cveparada;
- }
-
- public Boolean getActivo() {
- return activo;
- }
-
- public void setActivo(Boolean activo) {
- this.activo = activo;
- }
-
- public Date getFecmodif() {
- return fecmodif;
- }
-
- public void setFecmodif(Date fecmodif) {
- this.fecmodif = fecmodif;
- }
-
- public Integer getUsuarioId() {
- return usuarioId;
- }
-
- public void setUsuarioId(Integer usuarioId) {
- this.usuarioId = usuarioId;
- }
-
- public List getCorridaList() {
- return corridaList;
- }
-
- public void setCorridaList(List corridaList) {
- this.corridaList = corridaList;
- }
-
- public List getCorridaList1() {
- return corridaList1;
- }
-
- public void setCorridaList1(List corridaList1) {
- this.corridaList1 = corridaList1;
- }
-
- public List getTramoDestinoList() {
- return tramoDestinoList;
- }
-
- public void setTramoDestinoList(List tramoDestinoList) {
- this.tramoDestinoList = tramoDestinoList;
- }
-
- public List getTramoOrigemList() {
- return tramoOrigemList;
- }
-
- public void setTramoOrigemList(List tramoOrigemList) {
- this.tramoOrigemList = tramoOrigemList;
- }
-
- public Ciudad getCiudad() {
- return ciudad;
- }
-
- public void setCiudad(Ciudad ciudad) {
- this.ciudad = ciudad;
- }
-
- public TipoParada getTipoParada() {
- return tipoParada;
- }
-
- public void setTipoParada(TipoParada tipoParada) {
- this.tipoParada = tipoParada;
- }
-
- public Nodo getNodo() {
- return nodo;
- }
-
- public void setNodo(Nodo nodo) {
- this.nodo = nodo;
- }
-
- public Integer getCodantt() {
- return codantt;
- }
-
- public void setCodantt(Integer codantt) {
- this.codantt = codantt;
- }
-
- @Override
- public int hashCode() {
- int hash = 0;
- hash += (getParadaId() != null ? getParadaId().hashCode() : 0);
- return hash;
- }
-
- @Override
- public boolean equals(Object object) {
- if (!(object instanceof Parada)) {
- return false;
- }
- Parada other = (Parada) object;
- if ((this.getParadaId() == null && other.getParadaId() != null) || (this.getParadaId() != null && this.getParadaId().intValue() != other.getParadaId().intValue())) {
- return false;
- }
- return true;
- }
-
- @Override
- public String toString() {
- return getDescparada();
- }
-
- public String toStringCve() {
- return getCveparada();
- }
-
- public RegionMetropolitana getRegionMetropolitana() {
- return regionMetropolitana;
- }
-
- public void setRegionMetropolitana(RegionMetropolitana regionMetropolitana) {
- this.regionMetropolitana = regionMetropolitana;
- }
-
- public List getCodigosOrgaosConcedentes() {
- return codigosOrgaosConcedentes;
- }
-
- public void setCodigosOrgaosConcedentes(List codigosOrgaosConcedentes) {
- this.codigosOrgaosConcedentes = codigosOrgaosConcedentes;
- }
-
- public void addCodOrgaoConcedente(ParadaCodOrgaoConcedente codigo) {
- this.codigosOrgaosConcedentes.add(codigo);
- }
-
- public void removeCodOrgaoConcedente(ParadaCodOrgaoConcedente codigo) {
- this.codigosOrgaosConcedentes.remove(codigo);
- }
-
- public String getDescProcon() {
- return descProcon;
- }
-
- public void setDescProcon(String descProcon) {
- this.descProcon = descProcon;
- }
-
- public Boolean getIndVendeTotem() {
- return indVendeTotem;
- }
-
- public void setIndVendeTotem(Boolean indVendeTotem) {
- this.indVendeTotem = indVendeTotem;
- }
-
- public Integer getCodanttaux() {
- return codanttaux;
- }
-
- public void setCodanttaux(Integer codanttaux) {
- this.codanttaux = codanttaux;
- }
-
- public Boolean getIndVisibleInternet() {
- return indVisibleInternet;
- }
-
- public void setIndVisibleInternet(Boolean indVisibleInternet) {
- this.indVisibleInternet = indVisibleInternet;
- }
-
- public Boolean getIndIntegracaoW2i() {
- return indIntegracaoW2i == null ? false : indIntegracaoW2i;
- }
-
- public void setIndIntegracaoW2i(Boolean indIntegracaoW2i) {
- this.indIntegracaoW2i = indIntegracaoW2i;
- }
-
- public AgrupamentoParada getAgrupamentoParada() {
- return agrupamentoParada;
- }
-
- public void setAgrupamentoParada(AgrupamentoParada agrupamentoParada) {
- this.agrupamentoParada = agrupamentoParada;
- }
-
- @Override
- public void clonar() throws CloneNotSupportedException {
- paradaClone = new Parada();
- paradaClone = (Parada) this.clone();
- }
-
- @Override
- public Parada getCloneObject() throws CloneNotSupportedException {
- return paradaClone;
- }
-
- @Override
- public String getTextoInclusaoExclusao() {
- return String.format("EsquemaAsientoID [%s]", getParadaId());
- }
-
- @Override
- public Object clone() throws CloneNotSupportedException {
- return super.clone();
- }
-
-}
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.rjconsultores.ventaboletos.entidad;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import javax.persistence.Transient;
+
+import org.hibernate.annotations.Fetch;
+import org.hibernate.annotations.FetchMode;
+
+import br.com.rjconsultores.auditador.annotations.NaoAuditar;
+import br.com.rjconsultores.auditador.interfaces.Auditavel;
+
+/**
+ *
+ * @author Administrador
+ */
+@Entity
+@SequenceGenerator(name = "PARADA_SEQ", sequenceName = "PARADA_SEQ", allocationSize = 1)
+@Table(name = "PARADA")
+public class Parada implements Serializable, Auditavel {
+ public static Integer ID_PARADA_TODOS = -1;
+
+ private static final long serialVersionUID = 1L;
+ @Id
+ @Basic(optional = false)
+ @GeneratedValue(strategy = GenerationType.AUTO, generator = "PARADA_SEQ")
+ @Column(name = "PARADA_ID")
+ private Integer paradaId;
+ @Basic(optional = false)
+ @Column(name = "DESCPARADA")
+ private String descparada;
+ @Column(name = "CVEPARADA")
+ private String cveparada;
+ @Column(name = "ACTIVO")
+ private Boolean activo;
+ @Column(name = "FECMODIF")
+ @Temporal(TemporalType.TIMESTAMP)
+ private Date fecmodif;
+ @Column(name = "USUARIO_ID")
+ private Integer usuarioId;
+ @OneToOne
+ @JoinColumn(name = "CIUDAD_ID")
+ private Ciudad ciudad;
+ @OneToOne
+ @JoinColumn(name = "TIPOPARADA_ID")
+ private TipoParada tipoParada;
+ @OneToMany(mappedBy = "origem")
+ private List corridaList;
+ @OneToMany(mappedBy = "destino")
+ private List corridaList1;
+ @OneToMany(mappedBy = "paradaOrigem")
+ private List reservacionMercadoList;
+ @OneToMany(mappedBy = "paradaDestino")
+ private List reservacionMercadoList1;
+ @OneToMany(mappedBy = "destino")
+ private List categoriaMercadoDestinoList;
+ @OneToMany(mappedBy = "origem")
+ private List categoriaMercadoOrigemList;
+ @OneToOne
+ @JoinColumn(name = "NODO_ID")
+ private Nodo nodo;
+ @OneToMany(mappedBy = "origem")
+ private List tramoOrigemList;
+ @OneToMany(mappedBy = "destino")
+ private List tramoDestinoList;
+ @Column(name = "CODANTT")
+ private Integer codantt;
+ @Column(name = "CODANTTAUX")
+ private Integer codanttaux;
+ @Column(name = "DESCPROCON")
+ private String descProcon;
+ @Column(name="INDVENDETOTEM")
+ private Boolean indVendeTotem;
+ @Column(name="INDVISIBLEINTERNET")
+ private Boolean indVisibleInternet;
+ @OneToOne
+ @JoinColumn(name = "AGRUPAMENTOPARADA_ID")
+ private AgrupamentoParada agrupamentoParada;
+
+ @ManyToOne
+ @JoinColumn(name = "REGIONMETROPOLITANA_ID", referencedColumnName = "REGIONMETROPOLITANA_ID")
+ private RegionMetropolitana regionMetropolitana;
+
+ @OneToMany(mappedBy = "parada", fetch = FetchType.EAGER, cascade = javax.persistence.CascadeType.ALL)
+ @Fetch(value = FetchMode.SUBSELECT)
+ private List codigosOrgaosConcedentes = new ArrayList();
+
+ @Column(name="INDINTEGRACAOW2I")
+ private Boolean indIntegracaoW2i;
+
+ @Column(name="CODSIGMA")
+ private String codSigma;
+
+ @Transient
+ @NaoAuditar
+ private Parada paradaClone;
+
+ @Transient
+ @NaoAuditar
+ Boolean isParadaConexaoRutaExcluida;
+
+
+ public Boolean getIsParadaConexaoRutaExcluida() {
+ return isParadaConexaoRutaExcluida ==null?false:isParadaConexaoRutaExcluida;
+ }
+
+ public void setIsParadaConexaoRutaExcluida(Boolean isParadaConexaoRutaExcluida) {
+ this.isParadaConexaoRutaExcluida = isParadaConexaoRutaExcluida;
+ }
+
+ public Parada() {
+ super();
+ }
+
+ public Parada(Integer paradaId) {
+ this();
+
+ this.paradaId = paradaId;
+ }
+
+ public Parada(Integer paradaId, String cveparada, String descparada) {
+ this(paradaId);
+ this.cveparada = cveparada;
+ this.descparada = descparada;
+ }
+
+ public List getCategoriaMercadoDestinoList() {
+ return categoriaMercadoDestinoList;
+ }
+
+ public void setCategoriaMercadoDestinoList(List categoriaMercadoDestinoList) {
+ this.categoriaMercadoDestinoList = categoriaMercadoDestinoList;
+ }
+
+ public List getCategoriaMercadoOrigemList() {
+ return categoriaMercadoOrigemList;
+ }
+
+ public void setCategoriaMercadoOrigemList(List categoriaMercadoOrigemList) {
+ this.categoriaMercadoOrigemList = categoriaMercadoOrigemList;
+ }
+
+ public String getDescparada() {
+ return descparada;
+ }
+
+ public void setDescparada(String descparada) {
+ this.descparada = descparada;
+ }
+
+ public Integer getParadaId() {
+ return paradaId;
+ }
+
+ public void setParadaId(Integer paradaId) {
+ this.paradaId = paradaId;
+ }
+
+ public List getReservacionMercadoList() {
+ return reservacionMercadoList;
+ }
+
+ public void setReservacionMercadoList(List reservacionMercadoList) {
+ this.reservacionMercadoList = reservacionMercadoList;
+ }
+
+ public List getReservacionMercadoList1() {
+ return reservacionMercadoList1;
+ }
+
+ public void setReservacionMercadoList1(List reservacionMercadoList1) {
+ this.reservacionMercadoList1 = reservacionMercadoList1;
+ }
+
+ public String getCveparada() {
+ return cveparada;
+ }
+
+ public void setCveparada(String cveparada) {
+ this.cveparada = cveparada;
+ }
+
+ public Boolean getActivo() {
+ return activo;
+ }
+
+ public void setActivo(Boolean activo) {
+ this.activo = activo;
+ }
+
+ public Date getFecmodif() {
+ return fecmodif;
+ }
+
+ public void setFecmodif(Date fecmodif) {
+ this.fecmodif = fecmodif;
+ }
+
+ public Integer getUsuarioId() {
+ return usuarioId;
+ }
+
+ public void setUsuarioId(Integer usuarioId) {
+ this.usuarioId = usuarioId;
+ }
+
+ public List getCorridaList() {
+ return corridaList;
+ }
+
+ public void setCorridaList(List corridaList) {
+ this.corridaList = corridaList;
+ }
+
+ public List getCorridaList1() {
+ return corridaList1;
+ }
+
+ public void setCorridaList1(List corridaList1) {
+ this.corridaList1 = corridaList1;
+ }
+
+ public List getTramoDestinoList() {
+ return tramoDestinoList;
+ }
+
+ public void setTramoDestinoList(List tramoDestinoList) {
+ this.tramoDestinoList = tramoDestinoList;
+ }
+
+ public List getTramoOrigemList() {
+ return tramoOrigemList;
+ }
+
+ public void setTramoOrigemList(List tramoOrigemList) {
+ this.tramoOrigemList = tramoOrigemList;
+ }
+
+ public Ciudad getCiudad() {
+ return ciudad;
+ }
+
+ public void setCiudad(Ciudad ciudad) {
+ this.ciudad = ciudad;
+ }
+
+ public TipoParada getTipoParada() {
+ return tipoParada;
+ }
+
+ public void setTipoParada(TipoParada tipoParada) {
+ this.tipoParada = tipoParada;
+ }
+
+ public Nodo getNodo() {
+ return nodo;
+ }
+
+ public void setNodo(Nodo nodo) {
+ this.nodo = nodo;
+ }
+
+ public Integer getCodantt() {
+ return codantt;
+ }
+
+ public void setCodantt(Integer codantt) {
+ this.codantt = codantt;
+ }
+
+ @Override
+ public int hashCode() {
+ int hash = 0;
+ hash += (getParadaId() != null ? getParadaId().hashCode() : 0);
+ return hash;
+ }
+
+ @Override
+ public boolean equals(Object object) {
+ if (!(object instanceof Parada)) {
+ return false;
+ }
+ Parada other = (Parada) object;
+ if ((this.getParadaId() == null && other.getParadaId() != null) || (this.getParadaId() != null && this.getParadaId().intValue() != other.getParadaId().intValue())) {
+ return false;
+ }
+ return true;
+ }
+
+ @Override
+ public String toString() {
+ return getDescparada();
+ }
+
+ public String toStringCve() {
+ return getCveparada();
+ }
+
+ public RegionMetropolitana getRegionMetropolitana() {
+ return regionMetropolitana;
+ }
+
+ public void setRegionMetropolitana(RegionMetropolitana regionMetropolitana) {
+ this.regionMetropolitana = regionMetropolitana;
+ }
+
+ public List getCodigosOrgaosConcedentes() {
+ return codigosOrgaosConcedentes;
+ }
+
+ public void setCodigosOrgaosConcedentes(List codigosOrgaosConcedentes) {
+ this.codigosOrgaosConcedentes = codigosOrgaosConcedentes;
+ }
+
+ public void addCodOrgaoConcedente(ParadaCodOrgaoConcedente codigo) {
+ this.codigosOrgaosConcedentes.add(codigo);
+ }
+
+ public void removeCodOrgaoConcedente(ParadaCodOrgaoConcedente codigo) {
+ this.codigosOrgaosConcedentes.remove(codigo);
+ }
+
+ public String getDescProcon() {
+ return descProcon;
+ }
+
+ public void setDescProcon(String descProcon) {
+ this.descProcon = descProcon;
+ }
+
+ public Boolean getIndVendeTotem() {
+ return indVendeTotem;
+ }
+
+ public void setIndVendeTotem(Boolean indVendeTotem) {
+ this.indVendeTotem = indVendeTotem;
+ }
+
+ public Integer getCodanttaux() {
+ return codanttaux;
+ }
+
+ public void setCodanttaux(Integer codanttaux) {
+ this.codanttaux = codanttaux;
+ }
+
+ public Boolean getIndVisibleInternet() {
+ return indVisibleInternet;
+ }
+
+ public void setIndVisibleInternet(Boolean indVisibleInternet) {
+ this.indVisibleInternet = indVisibleInternet;
+ }
+
+ public Boolean getIndIntegracaoW2i() {
+ return indIntegracaoW2i == null ? false : indIntegracaoW2i;
+ }
+
+ public void setIndIntegracaoW2i(Boolean indIntegracaoW2i) {
+ this.indIntegracaoW2i = indIntegracaoW2i;
+ }
+
+ public AgrupamentoParada getAgrupamentoParada() {
+ return agrupamentoParada;
+ }
+
+ public void setAgrupamentoParada(AgrupamentoParada agrupamentoParada) {
+ this.agrupamentoParada = agrupamentoParada;
+ }
+
+ public String getCodSigma() {
+ return codSigma;
+ }
+
+ public void setCodSigma(String codSigma) {
+ this.codSigma = codSigma;
+ }
+
+ @Override
+ public void clonar() throws CloneNotSupportedException {
+ paradaClone = new Parada();
+ paradaClone = (Parada) this.clone();
+ }
+
+ @Override
+ public Parada getCloneObject() throws CloneNotSupportedException {
+ return paradaClone;
+ }
+
+ @Override
+ public String getTextoInclusaoExclusao() {
+ return String.format("EsquemaAsientoID [%s]", getParadaId());
+ }
+
+ @Override
+ public Object clone() throws CloneNotSupportedException {
+ return super.clone();
+ }
+
+}