Policy failures:

Code warning
- failed on resource article. Reason: The import javax.persistence.GeneratedValue is never used, line 9
- failed on resource Preference.java. Reason: The import javax.persistence.GeneratedValue is never used, line 9
- failed on resource Preference.java. Reason: The import javax.persistence.GenerationType is never used, line 10
- failed on resource article. Reason: The import javax.persistence.GenerationType is never used, line 1
Override reason:   
commit de bourrin suite a la fausse manoeuvre de fr....ric ;)
This commit is contained in:
Maxime Dagnicourt
2008-01-08 09:32:53 +00:00
parent 8677103013
commit 33401d54e7
5 changed files with 44 additions and 26 deletions

View File

@@ -78,7 +78,7 @@ public class Article implements Serializable {
public Article(int reference, String title, String topic,
String url_article, String mainAuthor,
ArrayList<String> secondaryAuthor, int state) {
this.id = reference;
//this.id = reference;
this.title = title;
this.topic = topic;
this.URL_article = url_article;

View File

@@ -35,11 +35,13 @@ public class ArticleManagerBean implements IArticleManager, Serializable {
return em.createQuery("from Article a ORDER BY a.title").getResultList();
}
public void updateArticle(Integer id, Article newArticle) {
removeArticle(getArticle(id));
public void updateArticle(Article article) {
/*removeArticle(getArticle(id));
newArticle.setId(id);
addArticle(newArticle);
em.flush();
em.flush();*/
em.merge(article);
}
public void removeArticle(Article a) {
@@ -68,6 +70,7 @@ public class ArticleManagerBean implements IArticleManager, Serializable {
return (List<User>) article.getReferees();
}
public Preference getArticlePreferenceForUser(Article article,
String pcMemberLogin) {
Query query = em.createQuery("SELECT p FROM Preference p WHERE p.article.id = :articleid AND p.pcMember.id = :pcmemberlogin");
@@ -98,6 +101,8 @@ public class ArticleManagerBean implements IArticleManager, Serializable {
User pcMember = em.find(User.class, userLogin);
preference.setPcMember(pcMember);
preference.setPreference(preferenceValue);
//c'est mal !!!
// FIXME
em.persist(preference);
}
}

View File

@@ -8,7 +8,7 @@ public interface IArticleManager {
public Article getArticle(Integer id);
public void addArticle(Article a);
public void removeArticle(Article a);
public void updateArticle(Integer id, Article newArticle);
public void updateArticle(Article article);
public List<?> getArticlePCMembers(Article article);
public List<?> getArticleReferees(Article article);

View File

@@ -9,6 +9,7 @@ import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.IdClass;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
@@ -19,6 +20,7 @@ import org.yacos.core.users.User;
*
*/
@Entity
@IdClass(PreferencePK.class)
public class Preference implements Serializable {
/**
*
@@ -28,35 +30,17 @@ public class Preference implements Serializable {
* Id mandatory in every entity.
*/
@Id
@GeneratedValue(strategy=GenerationType.AUTO)
private Integer id;
@ManyToOne(targetEntity=User.class)
@JoinColumn(name="pcmember_id",nullable=false)
private User pcMember;
@Id
@ManyToOne(targetEntity=Article.class)
@JoinColumn(name="article_id",nullable=false)
private Article article;
private String preference;
/**
* @return the id
*/
@Id
@GeneratedValue(strategy=GenerationType.AUTO)
public Integer getId() {
return id;
}
/**
* @param id the id to set
*/
@Id
@GeneratedValue(strategy=GenerationType.AUTO)
public void setId(Integer id) {
this.id = id;
}
/**
* @return the pcMember
*/
@@ -96,3 +80,5 @@ public class Preference implements Serializable {
this.preference = preference;
}
}

View File

@@ -0,0 +1,27 @@
package org.yacos.core.article;
import org.yacos.core.users.User;
public class PreferencePK {
private User pcMember;
private Article article;
public User getPcMember() {
return pcMember;
}
public void setPcMember(User pcMember) {
this.pcMember = pcMember;
}
public Article getArticle() {
return article;
}
public void setArticle(Article article) {
this.article = article;
}
}