rhbz844820 - fix validation applys on wrong source and target

zanata · Aug 23, 2012 · 006483c · 006483c
1 parent 848a62a
commit 006483c
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 33 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java b/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
@@ -31,28 +31,18 @@
 
 import org.zanata.common.ContentState;
 import org.zanata.webtrans.client.editor.HasPageNavigation;
-import org.zanata.webtrans.client.events.DocumentSelectionEvent;
-import org.zanata.webtrans.client.events.DocumentSelectionHandler;
 import org.zanata.webtrans.client.events.EnableModalNavigationEvent;
 import org.zanata.webtrans.client.events.ExitWorkspaceEvent;
 import org.zanata.webtrans.client.events.ExitWorkspaceEventHandler;
 import org.zanata.webtrans.client.events.FilterViewEvent;
 import org.zanata.webtrans.client.events.FilterViewEventHandler;
-import org.zanata.webtrans.client.events.FindMessageEvent;
-import org.zanata.webtrans.client.events.FindMessageHandler;
-import org.zanata.webtrans.client.events.NavTransUnitEvent;
-import org.zanata.webtrans.client.events.NavTransUnitEvent.NavigationType;
-import org.zanata.webtrans.client.events.NavTransUnitHandler;
 import org.zanata.webtrans.client.events.NotificationEvent;
 import org.zanata.webtrans.client.events.NotificationEvent.Severity;
 import org.zanata.webtrans.client.events.TransUnitEditEvent;
 import org.zanata.webtrans.client.events.TransUnitEditEventHandler;
 import org.zanata.webtrans.client.events.TransUnitSelectionEvent;
 import org.zanata.webtrans.client.events.TransUnitUpdatedEvent;
 import org.zanata.webtrans.client.events.TransUnitUpdatedEventHandler;
-import org.zanata.webtrans.client.events.UserConfigChangeEvent;
-import org.zanata.webtrans.client.events.WorkspaceContextUpdateEvent;
-import org.zanata.webtrans.client.events.WorkspaceContextUpdateEventHandler;
 import org.zanata.webtrans.client.presenter.SourceContentsPresenter;
 import org.zanata.webtrans.client.presenter.UserConfigHolder;
 import org.zanata.webtrans.client.resources.TableEditorMessages;
@@ -999,7 +989,7 @@ public void execute()
 
             display.setTransUnitDetails(transUnit);
 
-            sourceContentsPresenter.setSelectedSource(0);
+            sourceContentsPresenter.setSelectedSource(0, selectedTransUnit.getId());
             if (selectedTransUnit == null || !transUnit.getId().equals(selectedTransUnit.getId()))
             {
                selectedTransUnit = transUnit;

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
@@ -43,8 +43,6 @@ public interface TargetContentsDisplay extends WidgetDisplay, IsWidget
 
    void setValue(TransUnit transUnit);
 
-   TransUnitId getTransUnitId();
-
    Integer getVerNum();
 
    interface Listener

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
@@ -387,7 +387,7 @@ public void setToViewMode()
 
    public void showEditors(int rowIndex, TransUnitId currentTransUnitId)
    {
-      Log.debug("enter show editor current editor index:" + currentEditorIndex);
+      Log.info("enter show editor with rowIndex:" + rowIndex);
       display = displayList.get(rowIndex);
       currentEditors = display.getEditors();
       this.currentTransUnitId = currentTransUnitId;
@@ -521,7 +521,7 @@ private Integer getCurrentVersionOrNull()
 
    private TransUnitId getCurrentTransUnitIdOrNull()
    {
-      return display == null ? null : display.getTransUnitId();
+      return currentTransUnitId;
    }
 
    @Override
@@ -655,14 +655,14 @@ else if (configHolder.isButtonUntranslated() && configHolder.isButtonFuzzy())
    @Override
    public void onRequestValidation(RequestValidationEvent event)
    {
-      if (isEditing())
+      //If event.getTransUnitId is null it's fired from ValidationService which is caused by changing validation options.
+      if (Objects.equal(sourceContentsPresenter.getCurrentTransUnitIdOrNull(), currentTransUnitId))
       {
          for (ToggleEditor editor : display.getEditors())
          {
             editor.setViewMode(ToggleEditor.ViewMode.EDIT);
             validate(editor);
          }
-         revealDisplay();
       }
    }
 

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.java b/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.java
@@ -76,7 +76,6 @@ interface Binder extends UiBinder<VerticalPanel, TargetContentsView>
    private String findMessage;
    private ArrayList<ToggleEditor> editors;
    private Listener listener;
-   private TransUnitId transUnitId;
    private Integer verNum;
 
    public TargetContentsView()
@@ -130,7 +129,6 @@ public void postUndoSuccess()
    @Override
    public void setValue(TransUnit transUnit)
    {
-      transUnitId = transUnit.getId();
       verNum = transUnit.getVerNum();
       List<String> targets = transUnit.getTargets();
       editors.clear();
@@ -252,12 +250,6 @@ public void setListener(Listener listener)
       this.listener = listener;
    }
 
-   @Override
-   public TransUnitId getTransUnitId()
-   {
-      return transUnitId;
-   }
-
    @Override
    public Integer getVerNum()
    {

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/events/RequestValidationEvent.java b/zanata-war/src/main/java/org/zanata/webtrans/client/events/RequestValidationEvent.java
@@ -20,6 +20,7 @@
  */
 package org.zanata.webtrans.client.events;
 
+import org.zanata.webtrans.shared.model.TransUnitId;
 import com.google.gwt.event.shared.GwtEvent;
 
 /**

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/events/RunValidationEvent.java b/zanata-war/src/main/java/org/zanata/webtrans/client/events/RunValidationEvent.java
@@ -72,7 +72,7 @@ protected void dispatch(RunValidationEventHandler handler)
       handler.onValidate(this);
    }
 
-   public String getSource()
+   public String getSourceContent()
    {
       return source;
    }

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SourceContentsPresenter.java b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SourceContentsPresenter.java
@@ -30,6 +30,7 @@
 import org.zanata.webtrans.client.events.RequestValidationEvent;
 import org.zanata.webtrans.client.ui.HasSelectableSource;
 import org.zanata.webtrans.shared.model.TransUnit;
+import org.zanata.webtrans.shared.model.TransUnitId;
 import com.allen_sauer.gwt.log.client.Log;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
@@ -52,6 +53,7 @@ public class SourceContentsPresenter implements ClickHandler
    private final EventBus eventBus;
    private Provider<SourceContentsDisplay> displayProvider;
    private List<SourceContentsDisplay> displayList = Collections.emptyList();
+   private TransUnitId currentTransUnitId;
 
    @Inject
    public SourceContentsPresenter(final EventBus eventBus, Provider<SourceContentsDisplay> displayProvider)
@@ -64,8 +66,11 @@ public SourceContentsPresenter(final EventBus eventBus, Provider<SourceContentsD
     * Select first source in the list when row is selected or reselect previous selected one
     *
     */
-   public void setSelectedSource(int row)
+   public void setSelectedSource(int row, TransUnitId id)
    {
+      currentTransUnitId = id;
+      Log.debug("source content selected row:" + row + " id:" + id);
+
       SourceContentsDisplay sourceContentsView = displayList.get(row);
       if (sourceContentsView != null)
       {
@@ -153,7 +158,13 @@ public void onClick(ClickEvent event)
          selectedSource.setSelected(true);
 
          Log.debug("Selected source: " + selectedSource.getSource());
+         //TODO this is firing every time we click.
          eventBus.fireEvent(new RequestValidationEvent());
       }
    }
+
+   public TransUnitId getCurrentTransUnitIdOrNull()
+   {
+      return currentTransUnitId;
+   }
 }
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitEditPresenter.java b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitEditPresenter.java
@@ -138,7 +138,7 @@ public void onTransUnitSelected(TransUnitSelectionEvent event)
       if (selectedTransUnit != null)
       {
          Log.debug("selected id: " + selectedTransUnit.getId());
-         sourceContentsPresenter.setSelectedSource(pageModel.getCurrentRow());
+         sourceContentsPresenter.setSelectedSource(pageModel.getCurrentRow(), selectedTransUnit.getId());
          targetContentsPresenter.showEditors(pageModel.getCurrentRow(), selectedTransUnit.getId());
          translatorService.transUnitSelected(selectedTransUnit);
       }

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/service/ValidationService.java b/zanata-war/src/main/java/org/zanata/webtrans/client/service/ValidationService.java
@@ -47,6 +47,7 @@
 import org.zanata.webtrans.shared.validation.action.PrintfXSIExtensionValidation;
 import org.zanata.webtrans.shared.validation.action.XmlEntityValidation;
 
+import com.allen_sauer.gwt.log.client.Log;
 import com.google.inject.Inject;
 
 /**
@@ -88,7 +89,7 @@ public ValidationService(final EventBus eventBus, final TableEditorMessages mess
          @Override
          public void onValidate(RunValidationEvent event)
          {
-            execute(event.getSource(), event.getTarget(), event.isFireNotification(), event.getWidgetList());
+            execute(event.getSourceContent(), event.getTarget(), event.isFireNotification(), event.getWidgetList());
          }
       });
 

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java b/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
@@ -193,7 +193,6 @@ public void onTextAreaFocus(FocusEvent event)
    {
       listener.setValidationMessagePanel(this);
       listener.toggleView(this);
-      fireValidationEvent();
       event.stopPropagation();
       isFocused = true;
    }

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetGlossaryHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetGlossaryHandler.java
@@ -77,7 +77,7 @@ public GetGlossaryResult execute(GetGlossary action, ExecutionContext context) t
       final String searchText = action.getQuery();
       ShortString abbrev = new ShortString(searchText);
       final SearchType searchType = action.getSearchType();
-      log.info("Fetching Glossary matches({0}) for \"{1}\"", searchType, abbrev);
+      log.debug("Fetching Glossary matches({0}) for \"{1}\"", searchType, abbrev);
 
       LocaleId localeID = action.getLocaleId();
       HLocale hLocale = localeServiceImpl.getByLocaleId(localeID);
@@ -179,7 +179,7 @@ private int compare(int a, int b)
 
       Collections.sort(results, comp);
 
-      log.info("Returning {0} Glossary matches for \"{1}\"", results.size(), abbrev);
+      log.debug("Returning {0} Glossary matches for \"{1}\"", results.size(), abbrev);
       return new GetGlossaryResult(action, results);
    }
 

diff --git a/...ar/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java b/...ar/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java
@@ -166,7 +166,7 @@ public void canValidate()
 
       verify(eventBus).fireEvent(runValidationEventCaptor.capture());
       RunValidationEvent event = runValidationEventCaptor.getValue();
-      assertThat(event.getSource(), equalTo("source"));
+      assertThat(event.getSourceContent(), equalTo("source"));
       assertThat(event.getTarget(), equalTo("target"));
       assertThat(event.isFireNotification(), equalTo(false));
    }