Disable Modal navigation if search string, fixed test

zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java

@@ -33,11 +33,13 @@
 import org.zanata.webtrans.client.editor.CheckKeyImpl;
 import org.zanata.webtrans.client.events.CopyDataToEditorEvent;
 import org.zanata.webtrans.client.events.CopyDataToEditorHandler;
+import org.zanata.webtrans.client.events.EnableModalNavigationEvent;
 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.EnableModalNavigationEventHandler;
 import org.zanata.webtrans.client.events.RequestValidationEvent;
 import org.zanata.webtrans.client.events.RequestValidationEventHandler;
 import org.zanata.webtrans.client.events.RunValidationEvent;
@@ -68,7 +70,7 @@
 import com.google.inject.Singleton;
 
 @Singleton
-public class TargetContentsPresenter implements TargetContentsDisplay.Listener, TransUnitEditEventHandler, UserConfigChangeHandler, RequestValidationEventHandler, InsertStringInEditorHandler, CopyDataToEditorHandler
+public class TargetContentsPresenter implements TargetContentsDisplay.Listener, EnableModalNavigationEventHandler, TransUnitEditEventHandler, UserConfigChangeHandler, RequestValidationEventHandler, InsertStringInEditorHandler, CopyDataToEditorHandler
 {
    public static final int NO_OPEN_EDITOR = -1;
    private static final int LAST_INDEX = -2;
@@ -90,6 +92,8 @@ public class TargetContentsPresenter implements TargetContentsDisplay.Listener,
    private ArrayList<ToggleEditor> currentEditors;
    private TransUnitsEditModel cellEditor;
 
+   private boolean isModalNavEnabled;
+
 
    private final Identity identity;
 
@@ -113,6 +117,7 @@ public TargetContentsPresenter(Provider<TargetContentsDisplay> displayProvider,
       eventBus.addHandler(InsertStringInEditorEvent.getType(), this);
       eventBus.addHandler(CopyDataToEditorEvent.getType(), this);
       eventBus.addHandler(TransUnitEditEvent.getType(), this);
+      eventBus.addHandler(EnableModalNavigationEvent.getType(), this);
    }
 
    private ToggleEditor getCurrentEditor()
@@ -495,11 +500,11 @@ else if (checkKey.isPreviousEntryKey())
       {
          movePrevious(false);
       }
-      else if (checkKey.isNextStateEntryKey())
+      else if (checkKey.isNextStateEntryKey() && isModalNavEnabled)
       {
          moveToNextState(NavTransUnitEvent.NavigationType.NextEntry);
       }
-      else if (checkKey.isPreviousStateEntryKey())
+      else if (checkKey.isPreviousStateEntryKey() && isModalNavEnabled)
       {
          moveToNextState(NavTransUnitEvent.NavigationType.PrevEntry);
       }
@@ -562,4 +567,10 @@ public void saveAndMoveRow(NavTransUnitEvent.NavigationType nav)
    {
       cellEditor.saveAndMoveRow(nav);
    }
+
+   @Override
+   public void onEnable(EnableModalNavigationEvent event)
+   {
+      isModalNavEnabled = event.isEnable();
+   }
 }

zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java

@@ -47,6 +47,7 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 import org.zanata.webtrans.client.events.CopyDataToEditorEvent;
+import org.zanata.webtrans.client.events.EnableModalNavigationEvent;
 import org.zanata.webtrans.client.events.InsertStringInEditorEvent;
 import org.zanata.webtrans.client.events.NavTransUnitEvent;
 import org.zanata.webtrans.client.events.NotificationEvent;
@@ -112,6 +113,8 @@ public void beforeMethod()
       verify(eventBus).addHandler(InsertStringInEditorEvent.getType(), presenter);
       verify(eventBus).addHandler(CopyDataToEditorEvent.getType(), presenter);
       verify(eventBus).addHandler(TransUnitEditEvent.getType(), presenter);
+      verify(eventBus).addHandler(TransUnitEditEvent.getType(), presenter);
+      verify(eventBus).addHandler(EnableModalNavigationEvent.getType(), presenter);
 
       presenter.setCellEditor(cellEditor);
 

zanata-war/src/test/java/org/zanata/webtrans/client/presenter/OptionsPanelPresenterTest.java

@@ -17,6 +17,8 @@
 import org.easymock.Capture;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
+import org.zanata.webtrans.client.events.EnableModalNavigationEvent;
+import org.zanata.webtrans.client.events.EnableModalNavigationEventHandler;
 import org.zanata.webtrans.client.events.FilterViewEvent;
 import org.zanata.webtrans.client.events.FilterViewEventHandler;
 import org.zanata.webtrans.client.events.UserConfigChangeEvent;
@@ -77,6 +79,7 @@ public class OptionsPanelPresenterTest
 
    Capture<FilterViewEventHandler> capturedFilterViewEventHandler = new Capture<FilterViewEventHandler>();
    Capture<WorkspaceContextUpdateEventHandler> capturedWorkspaceContextUpdateEventHandler = new Capture<WorkspaceContextUpdateEventHandler>();
+   Capture<EnableModalNavigationEventHandler> capturedEnableModalNavigationEventHandler = new Capture<EnableModalNavigationEventHandler>();
 
    Capture<FilterViewEvent> capturedFilterViewEvent = new Capture<FilterViewEvent>();
    Capture<UserConfigChangeEvent> capturedUserConfigChangeEvent = new Capture<UserConfigChangeEvent>();
@@ -574,6 +577,7 @@ private void expectEventBusEventHandlerRegistrations()
    {
       expect(mockEventBus.addHandler(eq(FilterViewEvent.getType()), and(capture(capturedFilterViewEventHandler), isA(FilterViewEventHandler.class)))).andReturn(createMock(HandlerRegistration.class)).once();
       expect(mockEventBus.addHandler(eq(WorkspaceContextUpdateEvent.getType()), and(capture(capturedWorkspaceContextUpdateEventHandler), isA(WorkspaceContextUpdateEventHandler.class)))).andReturn(createMock(HandlerRegistration.class)).once();
+      expect(mockEventBus.addHandler(eq(EnableModalNavigationEvent.getType()), and(capture(capturedEnableModalNavigationEventHandler), isA(EnableModalNavigationEventHandler.class)))).andReturn(createMock(HandlerRegistration.class)).once();
    }
 
    private void expectRegisterEditorOptionsChangeHandlers()