rhbz953734 - WIP remove specific review view and try to reuse editor …

…view

zanata-war/src/main/java/org/zanata/webtrans/client/history/MainViewTokens.java

@@ -15,7 +15,6 @@ public enum MainViewTokens implements TokensConverter
    static final String KEY_VIEW = "view";
    static final String VALUE_SEARCH_RESULTS_VIEW = "search";
    static final String VALUE_EDITOR_VIEW = "doc";
-   static final String VALUE_REVIEW_VIEW = "review";
 
    @Override
    public void populateHistoryToken(HistoryToken historyToken, Token token)
@@ -32,10 +31,6 @@ else if (value.equals(VALUE_SEARCH_RESULTS_VIEW))
          {
             historyToken.setView(MainView.Search);
          }
-         else if (value.equals(VALUE_REVIEW_VIEW))
-         {
-            historyToken.setView(MainView.Review);
-         }
          // else default (document list) will be used
       }
    }
@@ -52,9 +47,5 @@ else if (historyToken.getView() == MainView.Editor)
       {
          tokens.add(new Token(KEY_VIEW, VALUE_EDITOR_VIEW));
       }
-      else if (historyToken.getView() == MainView.Review)
-      {
-         tokens.add(new Token(KEY_VIEW, VALUE_REVIEW_VIEW));
-      }
    }
 }

zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java

@@ -216,7 +216,6 @@ public void showView(MainView viewToShow)
       switch (viewToShow)
       {
       // TODO use revealDisplay/concealDisplay for editor and document views
-      case Review:
       case Editor:
          if (selectedDocument != null)
          {
@@ -228,7 +227,6 @@ public void showView(MainView viewToShow)
          }
          currentDisplayStats = selectedDocumentStats;
          translationPresenter.revealDisplay();
-         translationPresenter.changeMode(viewToShow);
          searchResultsPresenter.concealDisplay();
          sideMenuPresenter.showValidationOptions(true);
          sideMenuPresenter.setOptionMenu(MainView.Editor);

zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java

@@ -91,16 +91,12 @@ public class TransUnitsTablePresenter extends WidgetPresenter<TransUnitsTableDis
       TableRowSelectedEventHandler,
       LoadingEventHandler,
       RefreshPageEventHandler, UserConfigChangeHandler,
-      RequestPageValidationHandler,
-      ReviewModeChangeEventHandler
+      RequestPageValidationHandler
 // @formatter:on
 {
 
    private final TransUnitsTableDisplay display;
-   private ReviewPresenter reviewPresenter;
    private final TranslationHistoryPresenter translationHistoryPresenter;
-   private final Provider<GoToRowLink> goToRowLinkProvider;
-   private final GetTransUnitActionContextHolder contextHolder;
    private final WebTransMessages messages;
    private final EventBus eventBus;
    private final NavigationService navigationService;
@@ -112,7 +108,6 @@ public class TransUnitsTablePresenter extends WidgetPresenter<TransUnitsTableDis
 
    // state we need to keep track of
    private FilterViewEvent filterOptions = FilterViewEvent.DEFAULT;
-   private boolean isInReviewMode = false;
    // In case of cancelling a filter
    private FilterViewEvent previousFilterOptions = FilterViewEvent.DEFAULT;
    private TransUnitId selectedId;
@@ -126,16 +121,12 @@ public TransUnitsTablePresenter(TransUnitsTableDisplay display, EventBus eventBu
                                    TargetContentsPresenter targetContentsPresenter,
                                    TranslatorInteractionService translatorService,
                                    TranslationHistoryPresenter translationHistoryPresenter,
-                                   Provider<GoToRowLink> goToRowLinkProvider,
-                                   GetTransUnitActionContextHolder contextHolder,
                                    WebTransMessages messages, UserOptionsService userOptionsService)
    // @formatter:on
    {
       super(display, eventBus);
       this.display = display;
       this.translationHistoryPresenter = translationHistoryPresenter;
-      this.goToRowLinkProvider = goToRowLinkProvider;
-      this.contextHolder = contextHolder;
       this.messages = messages;
       this.display.setRowSelectionListener(this);
 
@@ -159,7 +150,6 @@ protected void onBind()
       registerHandler(eventBus.addHandler(RefreshPageEvent.TYPE, this));
       registerHandler(eventBus.addHandler(UserConfigChangeEvent.TYPE, this));
       registerHandler(eventBus.addHandler(RequestPageValidationEvent.TYPE, this));
-      registerHandler(eventBus.addHandler(ReviewModeChangeEvent.TYPE, this));
 
       display.setThemes(userOptionsService.getConfigHolder().getState().getDisplayTheme().name());
    }
@@ -181,7 +171,6 @@ public void onTransUnitSelected(TransUnitSelectionEvent event)
       selectedId = selection.getId();
       Log.debug("selected id: " + selectedId);
       sourceContentsPresenter.setSelectedSource(selectedId);
-      reviewPresenter.setSelected(selectedId);
       targetContentsPresenter.setSelected(selectedId);
       display.ensureVisible(targetContentsPresenter.getCurrentDisplay());
       translatorService.transUnitSelected(selection);
@@ -258,16 +247,8 @@ public void cancelFilter()
    public void showDataForCurrentPage(List<TransUnit> transUnits)
    {
       sourceContentsPresenter.showData(transUnits);
-      reviewPresenter.showData(transUnits);
       targetContentsPresenter.showData(transUnits);
-      if (isInReviewMode)
-      {
-         display.buildTable(sourceContentsPresenter.getDisplays(), reviewPresenter.getDisplays());
-      }
-      else
-      {
-         display.buildTable(sourceContentsPresenter.getDisplays(), targetContentsPresenter.getDisplays());
-      }
+      display.buildTable(sourceContentsPresenter.getDisplays(), targetContentsPresenter.getDisplays());
    }
 
    @Override
@@ -289,29 +270,13 @@ private void buildTableForEditor()
       List<TransUnit> currentPageValues = navigationService.getCurrentPageValues();
       sourceContentsPresenter.showData(currentPageValues);
       targetContentsPresenter.showData(currentPageValues);
-      reviewPresenter.showData(currentPageValues);
       TransUnitId currentSelected = sourceContentsPresenter.getCurrentTransUnitIdOrNull();
       if (currentSelected != null)
       {
          sourceContentsPresenter.setSelectedSource(currentSelected);
          targetContentsPresenter.setSelected(currentSelected);
-         reviewPresenter.setSelected(currentSelected);
-      }
-      if (isInReviewMode)
-      {
-         display.buildTable(sourceContentsPresenter.getDisplays(), reviewPresenter.getDisplays());
       }
-      else
-      {
-         display.buildTable(sourceContentsPresenter.getDisplays(), targetContentsPresenter.getDisplays());
-      }
-   }
-
-   @Override
-   public void onReviewModeChange(ReviewModeChangeEvent event)
-   {
-      isInReviewMode = (event == ReviewModeChangeEvent.CHANGE_TO_REVIEW_MODE);
-      buildTableForEditor();
+      display.buildTable(sourceContentsPresenter.getDisplays(), targetContentsPresenter.getDisplays());
    }
 
    @Override
@@ -324,15 +289,7 @@ public void refreshRow(TransUnit updatedTransUnit, EditorClientId editorClientId
          // Ignored.
          return;
       }
-      if (isInReviewMode)
-      {
-         // FIXME rhbz953734 - need to ignore change from user itself
-         GoToRowLink goToRowLink = goToRowLinkProvider.get();
-
-         goToRowLink.prepare("", contextHolder.getContext().getDocument(), updatedTransUnit.getId());
-         eventBus.fireEvent(new NotificationEvent(Warning, "Translation has changed", goToRowLink));
-      }
-      else if (Objects.equal(selectedId, updatedTransUnit.getId()) && !Objects.equal(editorClientId, translatorService.getCurrentEditorClientId()))
+      if (Objects.equal(selectedId, updatedTransUnit.getId()) && !Objects.equal(editorClientId, translatorService.getCurrentEditorClientId()))
       {
          // updatedTU is our active row but done by another user
          eventBus.fireEvent(new NotificationEvent(Error, messages.concurrentEdit()));
@@ -343,7 +300,6 @@ else if (Objects.equal(selectedId, updatedTransUnit.getId()) && !Objects.equal(e
             translationHistoryPresenter.displayEntries(latest, Collections.<TransHistoryItem> emptyList());
          }
       }
-      reviewPresenter.updateRow(updatedTransUnit);
       targetContentsPresenter.updateRow(updatedTransUnit);
    }
 
@@ -367,15 +323,12 @@ public void refreshView()
    {
       List<TargetContentsDisplay> targetContentsDisplays = targetContentsPresenter.getDisplays();
       List<SourceContentsDisplay> sourceContentsDisplays = sourceContentsPresenter.getDisplays();
-      List<ReviewContentsDisplay> reviewContentsDisplays = reviewPresenter.getDisplays();
       for (int i = 0; i < targetContentsDisplays.size(); i++)
       {
          TargetContentsDisplay targetDisplay = targetContentsDisplays.get(i);
          SourceContentsDisplay sourceDisplay = sourceContentsDisplays.get(i);
-         ReviewContentsDisplay reviewDisplay = reviewContentsDisplays.get(i);
          targetDisplay.refresh();
          sourceDisplay.refresh();
-         reviewDisplay.refresh();
          if (!Strings.isNullOrEmpty(findMessage))
          {
             targetDisplay.highlightSearch(findMessage);
@@ -452,33 +405,20 @@ public void onRequestPageValidation(RequestPageValidationEvent event)
    {
       List<SourceContentsDisplay> sourceDisplays = sourceContentsPresenter.getDisplays();
       List<TargetContentsDisplay> targetDisplays = targetContentsPresenter.getDisplays();
-      List<ReviewContentsDisplay> reviewContentsDisplays = reviewPresenter.getDisplays();
 
       for (int i = 0; i < sourceContentsPresenter.getDisplays().size(); i++)
       {
          SourceContentsDisplay sourceDisplay = sourceDisplays.get(i);
          TargetContentsDisplay targetDisplay = targetDisplays.get(i);
-         ReviewContentsDisplay reviewDisplay = reviewContentsDisplays.get(i);
 
          String source = sourceDisplay.getSourcePanelList().get(0).getSource();
          String target = targetDisplay.getEditors().get(0).getText();
 
          RunValidationEvent runValidationEvent = new RunValidationEvent(source, target, false);
-         if (isInReviewMode)
-         {
-            runValidationEvent.addWidget(reviewDisplay);
-         }
-         else
-         {
-            runValidationEvent.addWidget(targetDisplay);
-         }
+
+         runValidationEvent.addWidget(targetDisplay);
 
          eventBus.fireEvent(runValidationEvent);
       }
    }
-
-   public void setReviewPresenter(ReviewPresenter reviewPresenter)
-   {
-      this.reviewPresenter = reviewPresenter;
-   }
 }

zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationEditorPresenter.java

@@ -37,27 +37,23 @@
 import com.google.gwt.event.logical.shared.ValueChangeHandler;
 import com.google.inject.Inject;
 
-public class TranslationEditorPresenter extends WidgetPresenter<TranslationEditorDisplay> implements PageChangeEventHandler, PageCountChangeEventHandler, TranslationEditorDisplay.Listener, ReviewModeChangeEventHandler
+public class TranslationEditorPresenter extends WidgetPresenter<TranslationEditorDisplay> implements PageChangeEventHandler, PageCountChangeEventHandler, TranslationEditorDisplay.Listener
 {
 
 
    private final TransUnitNavigationPresenter transUnitNavigationPresenter;
    private final TransFilterPresenter transFilterPresenter;
    private final TransUnitsTablePresenter transUnitsTablePresenter;
    private final EditorKeyShortcuts editorKeyShortcuts;
-   private final ReviewPresenter reviewPresenter;
 
    @Inject
-   public TranslationEditorPresenter(TranslationEditorDisplay display, EventBus eventBus, TransUnitNavigationPresenter transUnitNavigationPresenter, TransFilterPresenter transFilterPresenter, TransUnitsTablePresenter transUnitsTablePresenter, EditorKeyShortcuts editorKeyShortcuts, ReviewPresenter reviewPresenter)
+   public TranslationEditorPresenter(TranslationEditorDisplay display, EventBus eventBus, TransUnitNavigationPresenter transUnitNavigationPresenter, TransFilterPresenter transFilterPresenter, TransUnitsTablePresenter transUnitsTablePresenter, EditorKeyShortcuts editorKeyShortcuts)
    {
       super(display, eventBus);
       this.transUnitNavigationPresenter = transUnitNavigationPresenter;
       this.transFilterPresenter = transFilterPresenter;
       this.transUnitsTablePresenter = transUnitsTablePresenter;
       this.editorKeyShortcuts = editorKeyShortcuts;
-      this.reviewPresenter = reviewPresenter;
-      // TODO rhbz953734 - change this so only transUnitTablePresenter gets injected ReviewPresenter
-      transUnitsTablePresenter.setReviewPresenter(reviewPresenter);
 
       display.setListener(this);
    }
@@ -74,10 +70,6 @@ protected void onBind()
       transUnitNavigationPresenter.bind();
       display.setTransUnitNavigation(transUnitNavigationPresenter.getDisplay().asWidget());
 
-      reviewPresenter.bind();
-      display.setReviewActionView(reviewPresenter.getDisplay().asWidget());
-
-
       registerHandler(display.getPageNavigation().addValueChangeHandler(new ValueChangeHandler<Integer>()
       {
          @Override
@@ -88,7 +80,6 @@ public void onValueChange(ValueChangeEvent<Integer> event)
       }));
       registerHandler(eventBus.addHandler(PageChangeEvent.TYPE, this));
       registerHandler(eventBus.addHandler(PageCountChangeEvent.TYPE, this));
-      registerHandler(eventBus.addHandler(ReviewModeChangeEvent.TYPE, this));
    }
 
    @Override
@@ -149,10 +140,4 @@ public void setReadOnly(boolean isReadOnly)
    {
       display.getResizeButton().setVisible(isReadOnly);
    }
-
-   @Override
-   public void onReviewModeChange(ReviewModeChangeEvent event)
-   {
-      display.setReviewMode(event == ReviewModeChangeEvent.CHANGE_TO_REVIEW_MODE);
-   }
 }

zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java

@@ -302,18 +302,6 @@ private void unbindTransMemoryPresenter()
       }
    }
 
-   public void changeMode(MainView viewToShow)
-   {
-      if (viewToShow == MainView.Editor)
-      {
-         eventBus.fireEvent(ReviewModeChangeEvent.CHANGE_TO_EDIT_MODE);
-      }
-      else if (viewToShow == MainView.Review)
-      {
-         eventBus.fireEvent(ReviewModeChangeEvent.CHANGE_TO_REVIEW_MODE);
-      }
-   }
-
    public void concealDisplay()
    {
       targetContentsPresenter.concealDisplay();

zanata-war/src/main/java/org/zanata/webtrans/client/view/ReviewView.java → zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewActionPanel.java

@@ -1,22 +1,18 @@
-package org.zanata.webtrans.client.view;
+package org.zanata.webtrans.client.ui;
 
-import org.zanata.webtrans.shared.model.TransUnit;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.InlineLabel;
-import com.google.gwt.user.client.ui.VerticalPanel;
 import com.google.gwt.user.client.ui.Widget;
-import com.google.gwt.view.client.ListDataProvider;
-import com.google.gwt.view.client.SelectionModel;
 import com.google.inject.Inject;
 
 /**
  * @author Patrick Huang <a href="mailto:pahuang@redhat.com">pahuang@redhat.com</a>
  */
-public class ReviewView extends Composite implements ReviewDisplay
+public class ReviewActionPanel extends Composite
 {
    private static ReviewViewUiBinder ourUiBinder = GWT.create(ReviewViewUiBinder.class);
    private final FlowPanel root;
@@ -25,28 +21,21 @@ public class ReviewView extends Composite implements ReviewDisplay
    InlineLabel acceptAllIcon;
    @UiField
    InlineLabel rejectAllIcon;
-   private Listener listener;
 
    @Inject
-   public ReviewView()
+   public ReviewActionPanel()
    {
       root = ourUiBinder.createAndBindUi(this);
 
    }
 
-   @Override
-   public void setListener(Listener listener)
-   {
-      this.listener = listener;
-   }
-
    @Override
    public Widget asWidget()
    {
       return root;
    }
 
-   interface ReviewViewUiBinder extends UiBinder<FlowPanel, ReviewView>
+   interface ReviewViewUiBinder extends UiBinder<FlowPanel, ReviewActionPanel>
    {
    }
 }

zanata-war/src/main/java/org/zanata/webtrans/client/view/ReviewDisplay.java

@@ -1,19 +1,14 @@
 package org.zanata.webtrans.client.view;
 
-import org.zanata.webtrans.shared.model.TransUnit;
-import com.google.gwt.view.client.ListDataProvider;
-import com.google.gwt.view.client.SelectionModel;
+import org.zanata.webtrans.client.ui.ReviewActionPanel;
 import com.google.inject.ImplementedBy;
 
 import net.customware.gwt.presenter.client.widget.WidgetDisplay;
 
-@ImplementedBy(ReviewView.class)
+@ImplementedBy(ReviewView2.class)
 public interface ReviewDisplay extends WidgetDisplay
 {
-//   void setSelectionModel(SelectionModel<TransUnit> multiSelectionModel);
-
-//   void setDataProvider(ListDataProvider<TransUnit> dataProvider);
-
+   // FIXME rhbz953734 - remove this and ReviewView2, ReviewView.ui.xml, ReviewActionPanel
    void setListener(Listener listener);
 
    interface Listener

zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorDisplay.java

@@ -29,10 +29,6 @@ public interface TranslationEditorDisplay extends WidgetDisplay
 
    boolean getAndToggleResizeButton();
 
-   void setReviewMode(boolean isReviewMode);
-
-   void setReviewActionView(IsWidget widget);
-
    interface Listener
    {
       void refreshCurrentPage();