From f9e2901fa7b8101c4db1bc9650bdc40247ed0646 Mon Sep 17 00:00:00 2001
From: Alba Carro <alba.carro@gmail.com>
Date: Mon, 22 Oct 2012 19:19:01 +0200
Subject: [PATCH] Adds warning for repeated calendar names

FEA: ItEr77S05BasicProjectImport
---
 .../importers/CalendarImporterMPXJ.java       | 21 ++++++++++++-------
 .../importers/ProjectImportController.java    |  5 ++++-
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/importers/CalendarImporterMPXJ.java b/libreplan-webapp/src/main/java/org/libreplan/importers/CalendarImporterMPXJ.java
index 60d4a8fc6..16d7e0fb3 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/importers/CalendarImporterMPXJ.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/importers/CalendarImporterMPXJ.java
@@ -19,6 +19,9 @@
 
 package org.libreplan.importers;
 
+
+import static org.libreplan.web.I18nHelper._;
+
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.ConcurrentModificationException;
@@ -103,11 +106,11 @@ public class CalendarImporterMPXJ implements ICalendarImporter {
      * @param calendarDTOs
      *            List of CalendarDTO to extract data from.
      * @return List<BaseCalendar> with all the calendars that we want.
-     * @throws InstanceNotFoundException
+     * @throws InstanceNotFoundException, ValidationException
      */
     @Override
     public List<BaseCalendar> getBaseCalendars(List<CalendarDTO> calendarDTOs)
-            throws InstanceNotFoundException {
+            throws InstanceNotFoundException, ValidationException {
         List<BaseCalendar> baseCalendars = new ArrayList<BaseCalendar>();
 
         for (CalendarDTO calendarDTO : calendarDTOs) {
@@ -171,10 +174,11 @@ public class CalendarImporterMPXJ implements ICalendarImporter {
      * @param calendarDTO
      *            CalendarDTO to extract data from.
      * @return BaseCalendar with the calendar that we want.
-     * @throws InstanceNotFoundException
+     * @throws InstanceNotFoundException, ValidationException
      */
     private BaseCalendar toBaseCalendar(CalendarDTO calendarDTO,
-            BaseCalendar parent) throws InstanceNotFoundException {
+            BaseCalendar parent) throws InstanceNotFoundException,
+            ValidationException {
 
         String code = getCode(EntityNameEnum.CALENDAR);
 
@@ -319,16 +323,17 @@ public class CalendarImporterMPXJ implements ICalendarImporter {
      * @param name
      *            String with the name to validate.
      * @return String with the valid name.
+     * @throws ValidationException
      */
     @Transactional
-    private String validateName(String name) {
+    private String validateName(String name) throws ValidationException {
 
         List<BaseCalendar> calendars = baseCalendarDAO.findByName(name);
 
         if (calendars.size() == 0) {
             return name;
         } else {
-            throw new RuntimeException("Calendar name  already in use");
+            throw new ValidationException(_("Calendar name already in use"));
         }
 
     }
@@ -389,9 +394,11 @@ public class CalendarImporterMPXJ implements ICalendarImporter {
      * @param parent
      *            BaseCalendar parent of the CalendarDayHoursDTO.
      * @return Map<Integer, Capacity>  with the data that we want.
+     * @throws ValidationException
      */
     private Map<Integer, Capacity> getCapacitiesPerDays(
-            List<CalendarDayHoursDTO> hoursPerDays, BaseCalendar parent) {
+            List<CalendarDayHoursDTO> hoursPerDays, BaseCalendar parent)
+            throws ValidationException {
 
         Map<Integer, Capacity> result = new HashMap<Integer, Capacity>();
 
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/importers/ProjectImportController.java b/libreplan-webapp/src/main/java/org/libreplan/web/importers/ProjectImportController.java
index 69dd6eec7..c9c3aaaf6 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/importers/ProjectImportController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/importers/ProjectImportController.java
@@ -7,6 +7,7 @@ import java.util.List;
 
 import org.libreplan.business.calendars.entities.BaseCalendar;
 import org.libreplan.business.common.exceptions.InstanceNotFoundException;
+import org.libreplan.business.common.exceptions.ValidationException;
 import org.libreplan.business.orders.entities.Order;
 import org.libreplan.business.planner.entities.Dependency;
 import org.libreplan.business.planner.entities.TaskGroup;
@@ -76,6 +77,8 @@ public class ProjectImportController extends GenericForwardComposer {
                             + ": Calendar import successfully!"));
                 } catch (InstanceNotFoundException e) {
                     messages.showMessage(Level.ERROR, _("Instance not found."));
+                } catch (ValidationException e) {
+                    messages.showMessage(Level.ERROR, e.getMessage());
                 }
 
             } else if (importTasks.isChecked()) {
@@ -103,7 +106,7 @@ public class ProjectImportController extends GenericForwardComposer {
 
     @Transactional
     private void importCalendar(InputStream streamData, String file)
-            throws InstanceNotFoundException {
+            throws InstanceNotFoundException, ValidationException {
 
         List<CalendarDTO> calendarDTOs = calendarImporterMPXJ.getCalendarDTOs(
                 streamData, file);