From a1ccf2cdc453317f5b9dd2d242251f696a5f68ab Mon Sep 17 00:00:00 2001
From: Alex Eng <loones1595@gmail.com>
Date: Fri, 23 Mar 2012 11:40:30 +1000
Subject: [PATCH] Work in progress: plural support - cancel button

---
 .../editor/table/TargetContentsDisplay.java   |  2 ++
 .../editor/table/TargetContentsPresenter.java | 15 ++++++++-----
 .../org/zanata/webtrans/client/ui/Editor.java | 21 +++++++------------
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsDisplay.java b/server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsDisplay.java
index 7b260ec0c4..d93a82a0be 100644
--- a/server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsDisplay.java
+++ b/server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsDisplay.java
@@ -35,6 +35,8 @@ interface Listener
       void toggleView(ToggleEditor editor);
 
       void setValidationMessagePanel(ToggleEditor editor);
+
+      void onCancel(ToggleEditor editor);
    }
 
    void setTargets(List<String> targets);
diff --git a/server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java b/server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
index d50ef5d610..c496e48759 100644
--- a/server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
+++ b/server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
@@ -20,9 +20,6 @@
 
 import javax.inject.Provider;
 
-import com.google.common.base.Preconditions;
-import com.google.common.base.Predicate;
-import com.google.common.collect.Collections2;
 import net.customware.gwt.presenter.client.EventBus;
 
 import org.zanata.webtrans.client.events.CopyDataToEditorEvent;
@@ -31,20 +28,23 @@
 import org.zanata.webtrans.client.events.InsertStringInEditorHandler;
 import org.zanata.webtrans.client.events.NavTransUnitEvent;
 import org.zanata.webtrans.client.events.NotificationEvent;
+import org.zanata.webtrans.client.events.NotificationEvent.Severity;
 import org.zanata.webtrans.client.events.RequestValidationEvent;
 import org.zanata.webtrans.client.events.RequestValidationEventHandler;
 import org.zanata.webtrans.client.events.RunValidationEvent;
 import org.zanata.webtrans.client.events.UpdateValidationWarningsEvent;
 import org.zanata.webtrans.client.events.UpdateValidationWarningsEventHandler;
-import org.zanata.webtrans.client.events.NotificationEvent.Severity;
 import org.zanata.webtrans.client.presenter.SourceContentsPresenter;
-import org.zanata.webtrans.client.resources.NavigationMessages;
 import org.zanata.webtrans.client.resources.TableEditorMessages;
 import org.zanata.webtrans.client.ui.ToggleEditor;
+import org.zanata.webtrans.client.ui.ToggleEditor.ViewMode;
 import org.zanata.webtrans.client.ui.ValidationMessagePanel;
 import org.zanata.webtrans.shared.model.TransUnit;
 
 import com.allen_sauer.gwt.log.client.Log;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Predicate;
+import com.google.common.collect.Collections2;
 import com.google.common.collect.Lists;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
@@ -233,6 +233,11 @@ public void saveAsApproved(ToggleEditor editor)
          eventBus.fireEvent(new NavTransUnitEvent(NavTransUnitEvent.NavigationType.NextEntry));
       }
    }
+   
+   @Override
+   public void onCancel(ToggleEditor editor) {
+      editor.setViewMode(ViewMode.VIEW);
+   }
 
    @Override
    public void copySource(ToggleEditor editor)
diff --git a/server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java b/server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
index 64cb694375..4283273141 100644
--- a/server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
+++ b/server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
@@ -84,8 +84,6 @@ public Editor(String displayString, String findMessage, final TargetContentsDisp
 
       fuzzyButton.addClickHandler(fuzzyHandler);
 
-      cancelButton.addClickHandler(cancelHandler);
-
       label.setText(displayString);
       if (displayString == null || displayString.isEmpty())
       {
@@ -192,6 +190,14 @@ public void onSaveAsApproved(ClickEvent event)
       listener.saveAsApproved(this);
       event.stopPropagation();
    }
+   
+   @UiHandler("cancelButton")
+   public void onCancel(ClickEvent event)
+   {
+      listener.onCancel(this);
+      event.stopPropagation();
+   }
+
 
    @UiHandler("label")
    public void onLabelClick(ClickEvent event)
@@ -253,17 +259,6 @@ public void onClick(ClickEvent event)
       }
    };
 
-   /**
-    * The click listener used to cancel.
-    */
-   private ClickHandler cancelHandler = new ClickHandler()
-   {
-      public void onClick(ClickEvent event)
-      {
-         // cancelEdit();
-      }
-   };
-
    /**
     * The click listener used to accept.
     */