diff --git a/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java index 4b917d6..ee1ec15 100644 --- a/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java +++ b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java @@ -3,9 +3,12 @@ package org.yacos.web.chairman.controller; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Set; +import java.util.Map.Entry; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; @@ -151,6 +154,16 @@ public class AddConferenceController extends AbstractWizardFormController { conferenceSession.setCriteria(new HashSet()); conferenceSession.setCriteriaAll(new HashSet()); List listCriterion = evaluationManager.getCriterions(); + + HashMap mapTmp = new HashMap(); + for (Criterion crit : listCriterion) { + mapTmp.put(crit.getName(), crit); + } + + listCriterion = new ArrayList(); + for(Entry entry : mapTmp.entrySet()) { + listCriterion.add(entry.getValue()); + } int maxNext = 0; @@ -208,6 +221,16 @@ public class AddConferenceController extends AbstractWizardFormController { List listCriterionForConf = evaluationManager.getCriterions(conf.getId()); List listCriterion = evaluationManager.getCriterions(); + HashMap mapTmp = new HashMap(); + for (Criterion crit : listCriterion) { + mapTmp.put(crit.getName(), crit); + } + + listCriterion = new ArrayList(); + for(Entry entry : mapTmp.entrySet()) { + listCriterion.add(entry.getValue()); + } + int nextId; int maxNext = 0;