From c819e577bef7b230dbbf9bc3f1a2356e65a71023 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenzo=20Tilve=20=C3=81lvaro?= <ltilve@igalia.com>
Date: Tue, 30 Aug 2011 13:51:56 +0200
Subject: [PATCH] [Bug #1132] Adding more selectable colours for calendar
 exception types

FEA: ItEr75S04BugFixing
---
 .../entities/CalendarExceptionTypeColor.java  | 12 +++++--
 .../api/CalendarExceptionTypeColorDTO.java    |  2 +-
 .../CalendarExceptionTypeColorConverter.java  | 36 ++++++++++++-------
 .../src/main/webapp/calendars/calendars.zul   |  1 -
 4 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarExceptionTypeColor.java b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarExceptionTypeColor.java
index 993c5f177..bb2c7be40 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarExceptionTypeColor.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarExceptionTypeColor.java
@@ -28,9 +28,15 @@ import static org.navalplanner.business.i18n.I18nHelper._;
  * @author Manuel Rego Casasnovas <rego@igalia.com>
  */
 public enum CalendarExceptionTypeColor {
-    DEFAULT(_("red (default)"), "red", "lightcoral"),
-    GREEN(_("green"), "green", "lightgreen"),
-    BLUE(_("blue"), "blue", "lightblue");
+    DEFAULT(_("red (default)"), "#FF3333", "#FF9999"),
+    GREEN(_("green"),"#2ee62e", "#8ae68a"),
+    BLUE(_("blue"), "#3333FF", "#9999FF"),
+    CYAN(_("cyan"), "#33FFFF", "#99FFFF"),
+    MAGENTA(_("magenta"), "#FF33FF", "#FF99FF"),
+    YELLOW(_("yellow"), "#e6e62e", "#e6e6a1"),
+    BLACK(_("black"), "#333333", "#999999"),
+    ORANGE(_("orange"), "#ffb733", "#ffdb99"),
+    PURPLE(_("purple"), "#801a80", "#b38eb3");
 
     private final String name;
     private final String colorOwnException;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/calendarexceptiontypes/api/CalendarExceptionTypeColorDTO.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/calendarexceptiontypes/api/CalendarExceptionTypeColorDTO.java
index 84850897c..288ce902e 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/calendarexceptiontypes/api/CalendarExceptionTypeColorDTO.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/calendarexceptiontypes/api/CalendarExceptionTypeColorDTO.java
@@ -30,5 +30,5 @@ import org.navalplanner.business.calendars.entities.CalendarExceptionTypeColor;
  */
 @XmlEnum
 public enum CalendarExceptionTypeColorDTO {
-    DEFAULT, RED, GREEN, BLUE;
+    DEFAULT, RED, GREEN, BLUE, CYAN, MAGENTA, YELLOW, BLACK, ORANGE, PURPLE;
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/calendarexceptiontypes/impl/CalendarExceptionTypeColorConverter.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/calendarexceptiontypes/impl/CalendarExceptionTypeColorConverter.java
index 4e47302a9..f11b0a9ef 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/calendarexceptiontypes/impl/CalendarExceptionTypeColorConverter.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/calendarexceptiontypes/impl/CalendarExceptionTypeColorConverter.java
@@ -44,24 +44,36 @@ public class CalendarExceptionTypeColorConverter {
                 CalendarExceptionTypeColorDTO.RED,
                 CalendarExceptionTypeColor.DEFAULT);
 
-        calendarExceptionTypeColorToDTO.put(CalendarExceptionTypeColor.DEFAULT,
+        addEquivalence(CalendarExceptionTypeColor.DEFAULT,
                 CalendarExceptionTypeColorDTO.DEFAULT);
-        calendarExceptionTypeColorFromDTO.put(
-                CalendarExceptionTypeColorDTO.DEFAULT,
-                CalendarExceptionTypeColor.DEFAULT);
 
-        calendarExceptionTypeColorToDTO.put(CalendarExceptionTypeColor.GREEN,
+        addEquivalence(CalendarExceptionTypeColor.GREEN,
                 CalendarExceptionTypeColorDTO.GREEN);
-        calendarExceptionTypeColorFromDTO.put(
-                CalendarExceptionTypeColorDTO.GREEN,
-                CalendarExceptionTypeColor.GREEN);
 
-        calendarExceptionTypeColorToDTO.put(CalendarExceptionTypeColor.BLUE,
+        addEquivalence(CalendarExceptionTypeColor.BLUE,
                 CalendarExceptionTypeColorDTO.BLUE);
-        calendarExceptionTypeColorFromDTO.put(
-                CalendarExceptionTypeColorDTO.BLUE,
-                CalendarExceptionTypeColor.BLUE);
 
+        addEquivalence(CalendarExceptionTypeColor.MAGENTA,
+                CalendarExceptionTypeColorDTO.MAGENTA);
+
+        addEquivalence(CalendarExceptionTypeColor.CYAN,
+                CalendarExceptionTypeColorDTO.CYAN);
+
+        addEquivalence(CalendarExceptionTypeColor.YELLOW,
+                CalendarExceptionTypeColorDTO.YELLOW);
+
+        addEquivalence(CalendarExceptionTypeColor.ORANGE,
+                CalendarExceptionTypeColorDTO.ORANGE);
+
+        addEquivalence(CalendarExceptionTypeColor.BLACK,
+                CalendarExceptionTypeColorDTO.BLACK);
+
+    }
+
+    private static void addEquivalence(CalendarExceptionTypeColor origin,
+            CalendarExceptionTypeColorDTO destination) {
+        calendarExceptionTypeColorToDTO.put(origin, destination);
+        calendarExceptionTypeColorFromDTO.put(destination, origin);
     }
 
     public final static CalendarExceptionTypeColorDTO toDTO(
diff --git a/navalplanner-webapp/src/main/webapp/calendars/calendars.zul b/navalplanner-webapp/src/main/webapp/calendars/calendars.zul
index 9639cf3ec..ac125e75c 100644
--- a/navalplanner-webapp/src/main/webapp/calendars/calendars.zul
+++ b/navalplanner-webapp/src/main/webapp/calendars/calendars.zul
@@ -20,7 +20,6 @@
 -->
 
 <?page title="${i18n:_('NavalPlan: Calendars')}"?>
-
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>