christiancorsano/yacos
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Corrected Conference : merge gone bad :P

Browse Source
This commit is contained in:
conceptoire.com
2007-12-16 21:30:06 +00:00
parent 51c1bd085f
commit 26de30d1d5
1 changed files with 43 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
YACOSCore/ejbModule/org/yacos/core/conferences/Conference.java
View File

@@ -1,6 +1,7 @@
package org.yacos.core.conferences; package org.yacos.core.conferences;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import javax.persistence.Entity; import javax.persistence.Entity;
@@ -17,37 +18,37 @@ import javax.persistence.TemporalType;
import org.yacos.core.article.Article; import org.yacos.core.article.Article;
import org.yacos.core.users.User; import org.yacos.core.users.User;
//@Entity @Entity
public class Conference { public class Conference {
//@Id @Id
//@GeneratedValue(strategy=GenerationType.AUTO) @GeneratedValue(strategy=GenerationType.AUTO)
private Integer id; private String id;
private String titre; private String titre;
private String description; private String description;
private String otherInformations; private String otherInformations;
//@Temporal(TemporalType.DATE) @Temporal(TemporalType.DATE)
private Date dateAbstract; private Date dateAbstract;
//@Temporal(TemporalType.DATE) @Temporal(TemporalType.DATE)
private Date dateArticle; private Date dateArticle;
//@Temporal(TemporalType.DATE) @Temporal(TemporalType.DATE)
private Date dateEvaluation; private Date dateEvaluation;
//@Temporal(TemporalType.DATE) @Temporal(TemporalType.DATE)
private Date dateStart; private Date dateStart;
//@Temporal(TemporalType.DATE) @Temporal(TemporalType.DATE)
private Date dateEnd; private Date dateEnd;
//@OneToOne(targetEntity=User.class,optional=false) @OneToOne(targetEntity=User.class,optional=false)
//@JoinColumn(name="chairman_id",nullable=false) @JoinColumn(name="chairman_id",nullable=false)
private User chairman; private User chairman;
//@OneToMany(targetEntity=Article.class,mappedBy="articles") @OneToMany(targetEntity=Article.class,mappedBy="conference")
private ArrayList<Article> articles; private Collection<Article> articles;
/** /**
* @return the chairman * @return the chairman
*/ */
//@OneToOne(targetEntity=User.class,optional=false) @OneToOne(targetEntity=User.class,optional=false)
//@JoinColumn(name="chairman_id",nullable=false) @JoinColumn(name="chairman_id",nullable=false)
public User getChairman() { public User getChairman() {
return chairman; return chairman;
} }
@@ -55,64 +56,64 @@ public class Conference {
/** /**
* @param chairman the chairman to set * @param chairman the chairman to set
*/ */
//@OneToOne(targetEntity=User.class,optional=false) @OneToOne(targetEntity=User.class,optional=false)
//@JoinColumn(name="chairman_id",nullable=false) @JoinColumn(name="chairman_id",nullable=false)
public void setChairman(User chairman) { public void setChairman(User chairman) {
this.chairman = chairman; this.chairman = chairman;
} }
//@Temporal(TemporalType.DATE) @Temporal(TemporalType.DATE)
public Date getDataAbstract() { public Date getDataAbstract() {
return dateAbstract; return dateAbstract;
} }
//@Temporal(TemporalType.DATE) @Temporal(TemporalType.DATE)
public void setDataAbstract(Date dataAbstract) { public void setDataAbstract(Date dataAbstract) {
this.dateAbstract = dataAbstract; this.dateAbstract = dataAbstract;
} }
//@Temporal(TemporalType.DATE) @Temporal(TemporalType.DATE)
public Date getDateArticle() { public Date getDateArticle() {
return dateArticle; return dateArticle;
} }
//@Temporal(TemporalType.DATE) @Temporal(TemporalType.DATE)
public void setDateArticle(Date dateArticle) { public void setDateArticle(Date dateArticle) {
this.dateArticle = dateArticle; this.dateArticle = dateArticle;
} }
//@Temporal(TemporalType.DATE) @Temporal(TemporalType.DATE)
public Date getDateEnd() { public Date getDateEnd() {
return dateEnd; return dateEnd;
} }
//@Temporal(TemporalType.DATE) @Temporal(TemporalType.DATE)
public void setDateEnd(Date dateEnd) { public void setDateEnd(Date dateEnd) {
this.dateEnd = dateEnd; this.dateEnd = dateEnd;
} }
//@Temporal(TemporalType.DATE) @Temporal(TemporalType.DATE)
public Date getDateEvaluation() { public Date getDateEvaluation() {
return dateEvaluation; return dateEvaluation;
} }
//@Temporal(TemporalType.DATE) @Temporal(TemporalType.DATE)
public void setDateEvaluation(Date dateEvaluation) { public void setDateEvaluation(Date dateEvaluation) {
this.dateEvaluation = dateEvaluation; this.dateEvaluation = dateEvaluation;
} }
//@Temporal(TemporalType.DATE) @Temporal(TemporalType.DATE)
public Date getDateStart() { public Date getDateStart() {
return dateStart; return dateStart;
} }
//@Temporal(TemporalType.DATE) @Temporal(TemporalType.DATE)
public void setDateStart(Date dateStart) { public void setDateStart(Date dateStart) {
this.dateStart = dateStart; this.dateStart = dateStart;
} }
public String getDescirption() { public String getDescription() {
return description; return description;
} }
public void setDescirption(String descirption) { public void setDescription(String descirption) {
this.description = descirption; this.description = descirption;
} }
public String getInfoComplementray() { public String getOtherInformations() {
return otherInformations; return otherInformations;
} }
public void setInfoComplementray(String infoComplementray) { public void setOtherInformations(String otherInformations) {
this.otherInformations = infoComplementray; this.otherInformations = otherInformations;
} }
public String getTitre() { public String getTitre() {
return titre; return titre;
@@ -120,17 +121,17 @@ public class Conference {
public void setTitre(String titre) { public void setTitre(String titre) {
this.titre = titre; this.titre = titre;
} }
public Integer getId() { public String getId() {
return id; return id;
} }
public void setId(Integer id) { public void setId(String id) {
this.id = id; this.id = id;
} }
public Conference() { public Conference() {
} }
public Conference(Integer id, String titre, String descirption, String infoComplementray, Date dataAbstract, Date dateArticle, Date dateEvaluation, Date dateStart, Date dateEnd) { public Conference(String id, String titre, String descirption, String infoComplementray, Date dataAbstract, Date dateArticle, Date dateEvaluation, Date dateStart, Date dateEnd) {
super(); super();
this.id = id; this.id = id;
this.titre = titre; this.titre = titre;
@@ -143,8 +144,13 @@ public class Conference {
this.dateEnd = dateEnd; this.dateEnd = dateEnd;
} }
//@OneToMany(targetEntity=Article.class,mappedBy="articles") @OneToMany(targetEntity=Article.class,mappedBy="articles")
public List<Article> getArticles() { public void setArticles(Collection<Article> articles) {
this.articles = articles;
}
@OneToMany(targetEntity=Article.class,mappedBy="articles")
public Collection<Article> getArticles() {
return articles; return articles;
} }
} }