Merge branch 'rhbz803572' of github.com:zanata/zanata into rhbz803572

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

@@ -54,9 +54,6 @@ public class InlineTargetCellEditor implements CellEditor<TransUnit>
     */
    public static final String DEFAULT_STYLENAME = "gwt-TargetCellEditor";
 
-   private static final int INITIAL_LINES = 3;
-   private static final int HEIGHT_PER_LINE = 16;
-
    /**
     * The click listener used to clone.
     */
@@ -520,18 +517,6 @@ public void setText(String text)
          targetContentsPresenter.setCurrentEditorText(text);
       }
    }
-
-   public void insertTextInCursorPosition(String text)
-   {
-      if (isEditing())
-      {
-          targetContentsPresenter.insertTextInCursorPosition(text);
-//          String preCursor = currentEditor.getText().substring(0, textArea.getCursorPos());
-//         String postCursor = textArea.getText().substring(textArea.getCursorPos(), textArea.getText().length());
-
-//         textArea.setText(preCursor + text + postCursor);
-      }
-   }
 
    @Override
    public void editCell(CellEditInfo cellEditInfo, TransUnit cellValue, Callback<TransUnit> callback)
@@ -580,10 +565,6 @@ public void editCell(CellEditInfo cellEditInfo, TransUnit cellValue, Callback<Tr
       isOpened = true;
 
       DOM.scrollIntoView(table.getCellFormatter().getElement(curRow, curCol));
-
-      // hide until validation results are available
-      // validationMessagePanel.setVisible(false);
-      fireValidationEvent(eventBus);
    }
 
    public void savePendingChange(boolean cancelIfUnchanged)
@@ -850,22 +831,8 @@ public TransUnit getTargetCell()
    {
       return cellValue;
    }
-
-   public void updateValidationMessagePanel(List<String> errors)
-   {
-      // validationMesCsagePanel.setContent(errors);
-      // validationMessagePanel.setVisible(true);
-   }
-
-   /**
-    * @param eventBus
-    */
-   private void fireValidationEvent(final EventBus eventBus)
-   {
-       // TODO Plural Support
-//      eventBus.fireEvent(new RunValidationEvent(cellValue.getId(), cellValue.getSources(), currentTargetPresenter.getDisplay().getCurrentEditor().getText(), false));
-   }
 
+
    public void setReadOnly(boolean isReadOnly)
    {
       this.isReadOnly = isReadOnly;

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

@@ -25,7 +25,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import com.google.common.collect.Lists;
 import net.customware.gwt.presenter.client.EventBus;
 import net.customware.gwt.presenter.client.widget.WidgetDisplay;
 import net.customware.gwt.presenter.client.widget.WidgetPresenter;
@@ -36,6 +35,8 @@
 import org.zanata.webtrans.client.editor.HasPageNavigation;
 import org.zanata.webtrans.client.events.ButtonDisplayChangeEvent;
 import org.zanata.webtrans.client.events.ButtonDisplayChangeEventHandler;
+import org.zanata.webtrans.client.events.CopyDataToEditorEvent;
+import org.zanata.webtrans.client.events.CopyDataToEditorHandler;
 import org.zanata.webtrans.client.events.CopySourceEvent;
 import org.zanata.webtrans.client.events.CopySourceEventHandler;
 import org.zanata.webtrans.client.events.DocumentSelectionEvent;
@@ -55,8 +56,6 @@
 import org.zanata.webtrans.client.events.OpenEditorEventHandler;
 import org.zanata.webtrans.client.events.RedoFailureEvent;
 import org.zanata.webtrans.client.events.RunValidationEvent;
-import org.zanata.webtrans.client.events.CopyDataToEditorEvent;
-import org.zanata.webtrans.client.events.CopyDataToEditorHandler;
 import org.zanata.webtrans.client.events.TransUnitEditEvent;
 import org.zanata.webtrans.client.events.TransUnitEditEventHandler;
 import org.zanata.webtrans.client.events.TransUnitSelectionEvent;
@@ -65,8 +64,6 @@
 import org.zanata.webtrans.client.events.UndoAddEvent;
 import org.zanata.webtrans.client.events.UndoFailureEvent;
 import org.zanata.webtrans.client.events.UndoRedoFinishEvent;
-import org.zanata.webtrans.client.events.UpdateValidationWarningsEvent;
-import org.zanata.webtrans.client.events.UpdateValidationWarningsEventHandler;
 import org.zanata.webtrans.client.events.WorkspaceContextUpdateEvent;
 import org.zanata.webtrans.client.events.WorkspaceContextUpdateEventHandler;
 import org.zanata.webtrans.client.presenter.SourceContentsPresenter;
@@ -90,6 +87,7 @@
 import org.zanata.webtrans.shared.rpc.UpdateTransUnitResult;
 
 import com.allen_sauer.gwt.log.client.Log;
+import com.google.common.collect.Lists;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.event.logical.shared.HasSelectionHandlers;
@@ -560,82 +558,6 @@ public void onNavTransUnit(NavTransUnitEvent event)
          }
       }));
 
-      registerHandler(eventBus.addHandler(CopyDataToEditorEvent.getType(), new CopyDataToEditorHandler()
-      {
-         @Override
-         public void onTransMemoryCopy(CopyDataToEditorEvent event)
-         {
-            if (selectedTransUnit == null)
-            {
-               eventBus.fireEvent(new NotificationEvent(Severity.Error, messages.noTextFlowToCopy()));
-            }
-            else
-            {
-               if (!display.getTargetCellEditor().isEditing())
-               {
-                  gotoCurrentRow();
-               }
-               if (display.getTargetCellEditor().isEditing())
-               {
-                  display.getTargetCellEditor().setText(event.getTargetResult());
-                  display.getTargetCellEditor().autoSize();
-                  eventBus.fireEvent(new NotificationEvent(Severity.Info, messages.notifyCopied()));
-               }
-               else
-               {
-                  // Error if failed to open editor
-                  eventBus.fireEvent(new NotificationEvent(Severity.Error, messages.notifyUnopened()));
-               }
-            }
-         }
-      }));
-
-      registerHandler(eventBus.addHandler(InsertStringInEditorEvent.getType(), new InsertStringInEditorHandler()
-      {
-         @Override
-         public void onInsertString(InsertStringInEditorEvent event)
-         {
-            if (selectedTransUnit == null)
-            {
-               eventBus.fireEvent(new NotificationEvent(Severity.Error, messages.noTextFlowToCopy()));
-            }
-            else
-            {
-               if (!display.getTargetCellEditor().isEditing())
-               {
-                  gotoCurrentRow();
-               }
-               if (display.getTargetCellEditor().isEditing())
-               {
-                  display.getTargetCellEditor().insertTextInCursorPosition(event.getSuggestion());
-                  display.getTargetCellEditor().autoSize();
-                  eventBus.fireEvent(new NotificationEvent(Severity.Info, messages.notifyCopied()));
-               }
-               else
-               {
-                  // Error if failed to open editor
-                  eventBus.fireEvent(new NotificationEvent(Severity.Error, messages.notifyUnopened()));
-               }
-            }
-         }
-      }));
-
-      registerHandler(eventBus.addHandler(CopySourceEvent.getType(), new CopySourceEventHandler()
-      {
-         @Override
-         public void onCopySource(CopySourceEvent event)
-         {
-            Integer rowIndex = getRowIndex(event.getTransUnit());
-            if (rowIndex != null)
-            {
-               tableModelHandler.gotoRow(rowIndex, true);
-               // TODO Plural Support
-                event.getTextArea().setText(sourceContentsPresenter.getSelectedSource());
-            }
-         }
-
-      }));
-
       registerHandler(eventBus.addHandler(OpenEditorEvent.getType(), new OpenEditorEventHandler()
       {
          @Override
@@ -654,15 +576,6 @@ public void onButtonDisplayChange(ButtonDisplayChangeEvent event)
          }
       }));
 
-      registerHandler(eventBus.addHandler(UpdateValidationWarningsEvent.getType(), new UpdateValidationWarningsEventHandler()
-      {
-         @Override
-         public void onUpdate(UpdateValidationWarningsEvent event)
-         {
-            display.getTargetCellEditor().updateValidationMessagePanel(event.getErrors());
-         }
-      }));
-
       registerHandler(eventBus.addHandler(WorkspaceContextUpdateEvent.getType(), new WorkspaceContextUpdateEventHandler()
       {
          @Override

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

@@ -25,14 +25,21 @@
 import com.google.common.collect.Collections2;
 import net.customware.gwt.presenter.client.EventBus;
 
+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.RequestValidationEvent;
 import org.zanata.webtrans.client.events.RequestValidationEventHandler;
 import org.zanata.webtrans.client.events.RunValidationEvent;
 import org.zanata.webtrans.client.events.UpdateValidationWarningsEvent;
 import org.zanata.webtrans.client.events.UpdateValidationWarningsEventHandler;
+import org.zanata.webtrans.client.events.NotificationEvent.Severity;
 import org.zanata.webtrans.client.presenter.SourceContentsPresenter;
 import org.zanata.webtrans.client.resources.NavigationMessages;
+import org.zanata.webtrans.client.resources.TableEditorMessages;
 import org.zanata.webtrans.client.ui.ToggleEditor;
 import org.zanata.webtrans.client.ui.ValidationMessagePanel;
 import org.zanata.webtrans.shared.model.TransUnit;
@@ -46,6 +53,7 @@
 public class TargetContentsPresenter implements TargetContentsDisplay.Listener
 {
    private final EventBus eventBus;
+   private final TableEditorMessages messages;
    private final SourceContentsPresenter sourceContentsPresenter;
    private final ValidationMessagePanel validationMessagePanel;
 
@@ -56,10 +64,11 @@ public class TargetContentsPresenter implements TargetContentsDisplay.Listener
    private List<ToggleEditor> currentEditors;
 
    @Inject
-   public TargetContentsPresenter(Provider<TargetContentsDisplay> displayProvider, final EventBus eventBus, final SourceContentsPresenter sourceContentsPresenter, final NavigationMessages messages)
+   public TargetContentsPresenter(Provider<TargetContentsDisplay> displayProvider, final EventBus eventBus, final TableEditorMessages messages, final SourceContentsPresenter sourceContentsPresenter)
    {
       this.displayProvider = displayProvider;
       this.eventBus = eventBus;
+      this.messages = messages;
       this.sourceContentsPresenter = sourceContentsPresenter;
 
       validationMessagePanel = new ValidationMessagePanel(true, messages);
@@ -69,7 +78,6 @@ public TargetContentsPresenter(Provider<TargetContentsDisplay> displayProvider,
          @Override
          public void onUpdate(UpdateValidationWarningsEvent event)
          {
-            Log.info(event.getErrors().toString());
             validationMessagePanel.setContent(event.getErrors());
          }
       });
@@ -85,6 +93,40 @@ public void onRequestValidation(RequestValidationEvent event)
             }
          }
       });
+
+      eventBus.addHandler(InsertStringInEditorEvent.getType(), new InsertStringInEditorHandler()
+      {
+         @Override
+         public void onInsertString(InsertStringInEditorEvent event)
+         {
+            if (isEditing())
+            {
+               currentEditor.insertTextInCursorPosition(event.getSuggestion());
+               eventBus.fireEvent(new NotificationEvent(Severity.Info, messages.notifyCopied()));
+            }
+            else
+            {
+               eventBus.fireEvent(new NotificationEvent(Severity.Error, messages.notifyUnopened()));
+            }
+         }
+      });
+
+      eventBus.addHandler(CopyDataToEditorEvent.getType(), new CopyDataToEditorHandler()
+      {
+         @Override
+         public void onTransMemoryCopy(CopyDataToEditorEvent event)
+         {
+            if (isEditing())
+            {
+               currentEditor.setText(event.getTargetResult());
+               eventBus.fireEvent(new NotificationEvent(Severity.Info, messages.notifyCopied()));
+            }
+            else
+            {
+               eventBus.fireEvent(new NotificationEvent(Severity.Error, messages.notifyUnopened()));
+            }
+         }
+      });
    }
 
    boolean isEditing()
@@ -108,12 +150,6 @@ public void setCurrentEditorText(String text)
       }
    }
 
-   public void insertTextInCursorPosition(String text)
-   {
-      // TODO implement
-      // throw new UnsupportedOperationException("Implement me!");
-   }
-
    public void showEditors(int rowIndex)
    {
       Log.info("show editors at row:" + rowIndex);
@@ -128,11 +164,12 @@ private ToggleEditor getOpenEditorOrFirstOneIfNoneIsOpen()
       Collection<ToggleEditor> openingEditors = findOpeningEditors();
       if (openingEditors.isEmpty())
       {
-         //if no editor is open, return the first one
-          return currentEditors.get(0);
+         // if no editor is open, return the first one
+         return currentEditors.get(0);
       }
-      else {
-          return openingEditors.iterator().next();
+      else
+      {
+         return openingEditors.iterator().next();
       }
    }
 
@@ -202,6 +239,7 @@ public void copySource(ToggleEditor editor)
    {
       editor.setText(sourceContentsPresenter.getSelectedSource());
       editor.autoSize();
+      eventBus.fireEvent(new NotificationEvent(Severity.Info, messages.notifyCopied()));
    }
 
    @Override

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

@@ -24,7 +24,11 @@
 import java.util.List;
 import java.util.Map;
 
+import net.customware.gwt.presenter.client.EventBus;
+
 import org.zanata.webtrans.client.editor.table.SourceContentsView;
+import org.zanata.webtrans.client.events.RequestValidationEvent;
+import org.zanata.webtrans.client.events.RunValidationEvent;
 import org.zanata.webtrans.client.ui.HasSelectableSource;
 import org.zanata.webtrans.shared.model.TransUnit;
 
@@ -44,10 +48,13 @@ public class SourceContentsPresenter
    private final Map<Integer, SourceContentsView> sourcePanelMap;
    private HasSelectableSource selectedSource;
    private HasSelectableSource previousSource;
+
+   private final EventBus eventBus;
 
    @Inject
-   public SourceContentsPresenter()
+   public SourceContentsPresenter(final EventBus eventBus)
    {
+      this.eventBus = eventBus;
       sourcePanelMap = new HashMap<Integer, SourceContentsView>();
    }
 
@@ -64,7 +71,9 @@ public void onClick(ClickEvent event)
          {
             previousSource.setSelected(false);
          }
+
          Log.debug("Selected source: " + selectedSource.getSource());
+         eventBus.fireEvent(new RequestValidationEvent());
       }
    };
 

server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/NavigationMessages.java

@@ -126,9 +126,4 @@ public interface NavigationMessages extends Messages
 
    @DefaultMessage("Translation Unit Details")
    String transUnitDetailsHeading();
-
-   @DefaultMessage("Validation Warnings: {0}")
-   @AlternateMessage({ "=0", "Validation Warnings: none" })
-   String validationWarningsHeading(@PluralCount
-   int warningCount);
 }