From 69a9838ee7d8699162311e92f93254671c8a7db4 Mon Sep 17 00:00:00 2001
From: Jialin Wang <kooksnake@hotmail.com>
Date: Mon, 28 Jan 2008 14:48:29 +0000
Subject: [PATCH] mnt listeArticle et ChoosePreference Policy failures: Code
 warning - failed on resource SArticleController.java. Reason: The local
 variable user is never read, line 41 - failed on resource
 SArticleController.java. Reason: The method toURL() from the type File is
 deprecated, line 6 Override reason:

---
 YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml        |  1 +
 .../web/author/controller/SArticleController.java    | 12 ++++++++++--
 .../org/yacos/web/author/form/FormSubmission.java    | 11 +++++++++--
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml
index a6b8c37..29bd029 100644
--- a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml
+++ b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml
@@ -108,6 +108,7 @@
 		<property name="formView" value="submissionArticle" />
 		<property name="successView" value="listArticle.htm" />
 		<property name="articleManager" ref="articleManager" />
+		<property name="sessionService" ref="sessionService"/>
 	</bean>
 
 	<bean id="ChoosePreferenceController"
diff --git a/YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java b/YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java
index 67e5fc8..b2a2e00 100644
--- a/YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java
+++ b/YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java
@@ -45,7 +45,7 @@ public class SArticleController extends SimpleFormController {
 		String mainauthor = ((FormSubmission) command).getMainauthor();
 		//String secondaryauthor = ((FormSubmission) command).getSecondaryauthor();
 		List<String> liste = ((FormSubmission) command).getListe();
-
+		
 		String nomFile="";
 
 		try {
@@ -74,7 +74,7 @@ public class SArticleController extends SimpleFormController {
 			System.out.println(e);
 		}
 
-		articleManager.addArticle(title, theme, nomFile, user.getLogin(), liste, Article.State.SUMMARY, conf.getId());
+		articleManager.addArticle(title, theme, nomFile, mainauthor, liste, Article.State.SUMMARY, conf.getId());
 
 		return new ModelAndView(new RedirectView(getSuccessView()));
 	}
@@ -95,4 +95,12 @@ public class SArticleController extends SimpleFormController {
 	public void setArticleManager(IArticleManager articleManager) {
 		this.articleManager = articleManager;
 	}
+
+	public SessionService getSessionService() {
+		return sessionService;
+	}
+
+	public void setSessionService(SessionService sessionService) {
+		this.sessionService = sessionService;
+	}
 }
\ No newline at end of file
diff --git a/YACOSWeb/src/org/yacos/web/author/form/FormSubmission.java b/YACOSWeb/src/org/yacos/web/author/form/FormSubmission.java
index 7f0edfb..138f540 100644
--- a/YACOSWeb/src/org/yacos/web/author/form/FormSubmission.java
+++ b/YACOSWeb/src/org/yacos/web/author/form/FormSubmission.java
@@ -12,7 +12,7 @@ public class FormSubmission {
 	private String theme;
 	private String mainauthor;
 	private String secondaryauthor;
-	private ArrayList<String> liste;
+	private ArrayList<String> liste = new ArrayList<String>();
 	private String abstractText;
 	
 	public FormSubmission() {
@@ -57,7 +57,14 @@ public class FormSubmission {
 	}
 
 	public void setListe(ArrayList<String> liste) {
-		this.liste = liste;
+		if(liste!=null)
+		{
+			this.liste=new ArrayList<String>(liste);
+		}
+		else
+		{
+		this.liste = new ArrayList<String>();
+		}
 	}
 
 	public String getAbstractText() {