From bdccacfcc0cd19bbe21b023ea8308992ea370f37 Mon Sep 17 00:00:00 2001
From: Diego Pino Garcia <dpino@igalia.com>
Date: Thu, 24 Sep 2009 03:21:42 +0200
Subject: [PATCH]  ItEr27S11AltaEtiquetasTipoEtiquetaItEr26S13: [Refactoring]
 Rename Cancel to Close in form edit LabelType

---
 .../org/navalplanner/web/labels/LabelTypeCRUDController.java  | 2 +-
 navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java
index c9c170ad0..516b62642 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java
@@ -243,7 +243,7 @@ public class LabelTypeCRUDController extends GenericForwardComposer {
     /**
      * Cancel edition
      */
-    public void cancel() {
+    public void close() {
         goToList();
     }
 
diff --git a/navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul b/navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul
index 6ef081b64..b0d14f0bf 100644
--- a/navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul
+++ b/navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul
@@ -44,7 +44,7 @@
     <hbox>
         <button label="${i18n:_('Save')}" onClick="controller.save()" />
         <button label="${i18n:_('Save &amp; Continue')}" onClick="controller.saveAndContinue()" />
-        <button label="${i18n:_('Cancel')}"
-            onClick="controller.cancel()" />
+        <button label="${i18n:_('Close')}"
+            onClick="controller.close()" />
     </hbox>
 </window>