rhbz844820 - fix unit test

zanata · Aug 23, 2012 · e05158a · e05158a
1 parent f950bbd
commit e05158a
Show file tree

Hide file tree

Showing 6 changed files with 176 additions and 111 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsDisplay.java b/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsDisplay.java
@@ -53,7 +53,7 @@ public interface TargetContentsDisplay extends WidgetDisplay, IsWidget, HasTrans
 
    List<String> getCachedTargets();
 
-   ArrayList<String> getNewTargets();
+   List<String> getNewTargets();
 
    boolean isEditing();
 

diff --git a/...ta-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java b/...ta-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
@@ -543,7 +543,8 @@ public void onFocus(TransUnitId id, int editorIndex)
    @Override
    public void onCancel()
    {
-      updateTargets(display.getId(), display.getCachedTargets());
+      display.updateCachedAndInEditorTargets(display.getCachedTargets());
+      display.setFindMessage(findMessage);
       setFocus();
    }
 
@@ -559,7 +560,7 @@ public void copySource(ToggleEditor editor)
       eventBus.fireEvent(new NotificationEvent(Severity.Info, messages.notifyCopied()));
    }
 
-   public ArrayList<String> getNewTargets()
+   public List<String> getNewTargets()
    {
       return display == null ? null : display.getNewTargets();
    }

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/OptionsPanelPresenter.java b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/OptionsPanelPresenter.java
@@ -197,7 +197,6 @@ public void onWorkspaceContextUpdated(WorkspaceContextUpdateEvent event)
          {
             userWorkspaceContext.setProjectActive(event.isProjectActive());
             setReadOnly(userWorkspaceContext.hasReadOnlyAccess());
-            eventBus.fireEvent(UserConfigChangeEvent.EVENT);
          }
       }));
 
@@ -215,6 +214,7 @@ void setReadOnly(boolean readOnly)
    {
       boolean displayButtons = readOnly ? false : display.getEditorButtonsChk().getValue();
       configHolder.setDisplayButtons(displayButtons);
+      eventBus.fireEvent(UserConfigChangeEvent.EVENT);
       display.setEditorOptionsVisible(!readOnly);
       display.setValidationOptionsVisible(!readOnly);
    }

diff --git a/...a-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java b/...a-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
@@ -4,6 +4,7 @@
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Set;
 
 import net.customware.gwt.presenter.client.EventBus;
@@ -87,7 +88,7 @@ public void onSuccess(GetTranslationHistoryResult result)
             {
                //add indicator for latest version
                latest.setVersionNum(messages.latestVersion(latest.getVersionNum()));
-               ArrayList<String> newTargets = targetContentsPresenter.getNewTargets();
+               List<String> newTargets = targetContentsPresenter.getNewTargets();
                if (!Objects.equal(latest.getContents(), newTargets))
                {
                   listDataProvider.getList().add(new TransHistoryItem(messages.unsaved(), newTargets, ContentState.New, "", ""));