Merge commit '7bcad57237f42ac070c2055ef252a494dd83634c' into HEAD

zanata · Sep 30, 2013 · c0cb56d · c0cb56d
2 parents a7530a3 + 7bcad57
commit c0cb56d
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 31 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
@@ -20,28 +20,63 @@
  */
 package org.zanata.webtrans.client.presenter;
 
-import java.util.*;
-
-import org.zanata.common.*;
-import org.zanata.webtrans.client.events.*;
-import org.zanata.webtrans.client.events.NotificationEvent.*;
-import org.zanata.webtrans.client.resources.*;
-import org.zanata.webtrans.client.service.*;
-import org.zanata.webtrans.client.ui.*;
-import org.zanata.webtrans.client.ui.ToggleEditor.*;
-import org.zanata.webtrans.client.view.*;
-import org.zanata.webtrans.shared.model.*;
-import org.zanata.webtrans.shared.util.*;
-import com.allen_sauer.gwt.log.client.*;
+import static com.google.common.base.Objects.equal;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import net.customware.gwt.presenter.client.EventBus;
+
+import org.zanata.common.ContentState;
+import org.zanata.webtrans.client.events.CheckStateHasChangedEvent;
+import org.zanata.webtrans.client.events.CommentBeforeSaveEvent;
+import org.zanata.webtrans.client.events.CopyDataToEditorEvent;
+import org.zanata.webtrans.client.events.CopyDataToEditorHandler;
+import org.zanata.webtrans.client.events.InsertStringInEditorEvent;
+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.ReloadUserConfigUIEvent;
+import org.zanata.webtrans.client.events.RequestSelectTableRowEvent;
+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.TableRowSelectedEvent;
+import org.zanata.webtrans.client.events.TransUnitEditEvent;
+import org.zanata.webtrans.client.events.TransUnitEditEventHandler;
+import org.zanata.webtrans.client.events.TransUnitSaveEvent;
+import org.zanata.webtrans.client.events.UserConfigChangeEvent;
+import org.zanata.webtrans.client.events.UserConfigChangeHandler;
+import org.zanata.webtrans.client.events.WorkspaceContextUpdateEvent;
+import org.zanata.webtrans.client.events.WorkspaceContextUpdateEventHandler;
+import org.zanata.webtrans.client.resources.TableEditorMessages;
+import org.zanata.webtrans.client.service.UserOptionsService;
+import org.zanata.webtrans.client.ui.SaveAsApprovedConfirmationDisplay;
+import org.zanata.webtrans.client.ui.ToggleEditor;
+import org.zanata.webtrans.client.ui.ToggleEditor.ViewMode;
+import org.zanata.webtrans.client.ui.UndoLink;
+import org.zanata.webtrans.client.ui.ValidationWarningDisplay;
+import org.zanata.webtrans.client.view.TargetContentsDisplay;
+import org.zanata.webtrans.shared.model.DocumentInfo;
+import org.zanata.webtrans.shared.model.TransUnit;
+import org.zanata.webtrans.shared.model.TransUnitId;
+import org.zanata.webtrans.shared.model.UserWorkspaceContext;
+import org.zanata.webtrans.shared.model.ValidationAction;
+import org.zanata.webtrans.shared.model.WorkspaceRestrictions;
+import org.zanata.webtrans.shared.util.Finds;
+
+import com.allen_sauer.gwt.log.client.Log;
 import com.google.common.base.Objects;
-import com.google.common.base.*;
-import com.google.common.collect.*;
-import com.google.gwt.core.client.*;
-import com.google.inject.*;
-
-import static com.google.common.base.Objects.*;
-
-import net.customware.gwt.presenter.client.*;
+import com.google.common.base.Optional;
+import com.google.common.collect.ImmutableList;
+import com.google.gwt.core.client.GWT;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import com.google.inject.Singleton;
 
 @Singleton
 // @formatter:off
@@ -131,6 +166,11 @@ public void savePendingChangesIfApplicable() {
         }
     }
 
+    public void gotoRow(DocumentInfo documentInfo, TransUnitId transUnitId) {
+        eventBus.fireEvent(new RequestSelectTableRowEvent(documentInfo,
+                transUnitId));
+    }
+
     /**
      * Fire TransUnitSaveEvent if there's no validation error
      *
@@ -142,8 +182,9 @@ public boolean saveCurrentIfValid(ContentState status) {
                 display.getErrorMessages();
 
         if (status.isTranslated() && !errorMessages.isEmpty()) {
-            validationWarning.center(display.getId(), currentEditorIndex,
-                    getNewTargets(), errorMessages);
+            validationWarning.center(display.getId(),
+                    userWorkspaceContext.getSelectedDoc(), getNewTargets(),
+                    errorMessages);
             return false;
         } else {
             eventBus.fireEvent(new TransUnitSaveEvent(getNewTargets(), status,

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningDisplay.java b/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningDisplay.java
@@ -25,6 +25,7 @@
 import java.util.Map;
 
 import org.zanata.webtrans.client.view.TargetContentsDisplay;
+import org.zanata.webtrans.shared.model.DocumentInfo;
 import org.zanata.webtrans.shared.model.TransUnitId;
 import org.zanata.webtrans.shared.model.ValidationAction;
 
@@ -37,7 +38,7 @@
  */
 @ImplementedBy(ValidationWarningPanel.class)
 public interface ValidationWarningDisplay {
-    void center(TransUnitId transUnitId, int editorIndex,
+    void center(TransUnitId transUnitId, DocumentInfo documentInfo,
             List<String> translations,
             Map<ValidationAction, List<String>> errorMessages);
 

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.java b/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.java
@@ -27,6 +27,7 @@
 import org.zanata.webtrans.client.presenter.KeyShortcutPresenter;
 import org.zanata.webtrans.client.resources.TableEditorMessages;
 import org.zanata.webtrans.client.view.TargetContentsDisplay;
+import org.zanata.webtrans.shared.model.DocumentInfo;
 import org.zanata.webtrans.shared.model.TransUnitId;
 import org.zanata.webtrans.shared.model.ValidationAction;
 
@@ -57,7 +58,7 @@ interface ValidationWarningPanelUiBinder extends
 
     private TransUnitId transUnitId;
 
-    private int editorIndex;
+    private DocumentInfo documentInfo;
 
     private TargetContentsDisplay.Listener listener;
 
@@ -108,17 +109,17 @@ public void onClick(ClickEvent event) {
             @Override
             public void onClick(ClickEvent event) {
                 hide();
-                listener.onEditorClicked(transUnitId, editorIndex);
+                listener.gotoRow(documentInfo, transUnitId);
             }
         });
     }
 
     @Override
-    public void center(TransUnitId transUnitId, int editorIndex,
+    public void center(TransUnitId transUnitId, DocumentInfo documentInfo,
             List<String> targets,
             Map<ValidationAction, List<String>> errorMessages) {
         this.transUnitId = transUnitId;
-        this.editorIndex = editorIndex;
+        this.documentInfo = documentInfo;
         refreshView(targets, errorMessages);
         center();
     }

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java b/zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
@@ -31,6 +31,7 @@
 import org.zanata.webtrans.client.ui.HasUpdateValidationMessage;
 import org.zanata.webtrans.client.ui.ToggleEditor;
 import org.zanata.webtrans.client.ui.UndoLink;
+import org.zanata.webtrans.shared.model.DocumentInfo;
 import org.zanata.webtrans.shared.model.HasTransUnitId;
 import org.zanata.webtrans.shared.model.TransUnit;
 import org.zanata.webtrans.shared.model.TransUnitId;
@@ -109,6 +110,8 @@ interface Listener {
         void acceptTranslation(TransUnitId id);
 
         void rejectTranslation(TransUnitId id);
+
+        void gotoRow(DocumentInfo documentInfo, TransUnitId transUnitId);
     }
 
     enum EditingState {

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
@@ -79,8 +79,6 @@
 import org.zanata.webtrans.client.ui.UndoLink;
 import org.zanata.webtrans.client.ui.ValidationWarningDisplay;
 import org.zanata.webtrans.client.view.TargetContentsDisplay;
-import org.zanata.webtrans.server.locale.Gwti18nReader;
-import org.zanata.webtrans.shared.model.DocumentInfo;
 import org.zanata.webtrans.shared.model.TransUnit;
 import org.zanata.webtrans.shared.model.TransUnitId;
 import org.zanata.webtrans.shared.model.UserWorkspaceContext;
@@ -383,7 +381,8 @@ public void willNotMoveToNextEntryIfTranslationHasError() {
         presenter.saveAsApprovedAndMoveNext(selectedTU.getId());
 
         // Then:
-        verify(validationWarning).center(selectedTU.getId(), 0, NEW_TARGETS,
+        verify(validationWarning).center(selectedTU.getId(),
+                userWorkspaceContext.getSelectedDoc(), NEW_TARGETS,
                 errorMessage);
     }