Merge pull request #183 from zanata/incorrect-unsaved-style

fix issue - TransUnitUpdated event will cause editor in unsaved style
zanata · Sep 18, 2013 · 8e9c8ea · 8e9c8ea
2 parents c57bf40 + 7e09cc0
commit 8e9c8ea
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
@@ -540,8 +540,8 @@ public void updateRow(TransUnit updatedTransUnit)
       if (contentsDisplayOptional.isPresent())
       {
          TargetContentsDisplay contentsDisplay = contentsDisplayOptional.get();
-         contentsDisplay.setState(TargetContentsDisplay.EditingState.SAVED);
          contentsDisplay.setValueAndCreateNewEditors(updatedTransUnit);
+         contentsDisplay.setState(TargetContentsDisplay.EditingState.SAVED);
          contentsDisplay.refresh();
          if (equal(updatedTransUnit.getId(), currentTransUnitId))
          {

diff --git a/...a-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java b/...a-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
@@ -533,8 +533,10 @@ public void canUpdateRowIfInCurrentDisplays()
 
       presenter.updateRow(updatedTransUnit);
 
-      verify(display).setValueAndCreateNewEditors(updatedTransUnit);
-      verify(display).refresh();
+      InOrder inOrder = Mockito.inOrder(display);
+      inOrder.verify(display).setValueAndCreateNewEditors(updatedTransUnit);
+      inOrder.verify(display).setState(TargetContentsDisplay.EditingState.SAVED);
+      inOrder.verify(display).refresh();
    }
 
    @Test