Projects >> zanata-server >>89a0609c8c18e4737e21669be1ac0b7ad2e6656a

Chunk
Conflicting content 
import org.zanata.webtrans.client.events.UpdateValidationWarningsEventHandler;
import org.zanata.webtrans.client.resources.TableEditorMessages;
import org.zanata.webtrans.client.rpc.CachingDispatchAsync;
<<<<<<< HEAD
=======
import org.zanata.webtrans.client.ui.FilterViewConfirmationPanel;
import org.zanata.webtrans.client.ui.ValidationMessagePanel;
>>>>>>> 72b92388f6b6661a63ff0af631f44640593f4477
import org.zanata.webtrans.shared.auth.AuthenticationError;
import org.zanata.webtrans.shared.auth.AuthorizationError;
import org.zanata.webtrans.shared.auth.Identity;
Solution content 
import org.zanata.webtrans.client.events.UpdateValidationWarningsEventHandler;
import org.zanata.webtrans.client.resources.TableEditorMessages;
import org.zanata.webtrans.client.rpc.CachingDispatchAsync;
import org.zanata.webtrans.client.ui.FilterViewConfirmationPanel;
import org.zanata.webtrans.shared.auth.AuthenticationError;
import org.zanata.webtrans.shared.auth.AuthorizationError;
import org.zanata.webtrans.shared.auth.Identity;
File
TableEditorPresenter.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
      int getSelectedRowNumber();

      void setTransUnitDetails(TransUnit selectedTransUnit);
<<<<<<< HEAD
=======

      void setValidationMessageVisible(TransUnitId id);

      boolean isProcessing();
>>>>>>> 72b92388f6b6661a63ff0af631f44640593f4477
   }

   private DocumentId documentId;
Solution content 
      int getSelectedRowNumber();

      void setTransUnitDetails(TransUnit selectedTransUnit);

      boolean isProcessing();
   }

   private DocumentId documentId;
File
TableEditorPresenter.java
Developer's decision
Combination
Kind of conflict
Method interface
Chunk
Conflicting content 
      return targetCellEditor;
   }

<<<<<<< HEAD
=======
   public void updateValidationMessage(TransUnitId id, List errors)
   {
      ValidationMessagePanel messagePanel = messagePanelMap.get(id);
      if (messagePanel != null)
      {
         if (!errors.isEmpty())
         {
            Log.info("Validation error: " + errors.toString());
         }
         messagePanel.setContent(errors);
         messagePanelMap.put(id, messagePanel);
      }
   }

   public ValidationMessagePanel getValidationMessagePanel(TransUnitId id)
   {
      ValidationMessagePanel panel = messagePanelMap.get(id);

      if (panel == null)
      {
         panel = new ValidationMessagePanel(messages.validationMessageHeading(), false);
         messagePanelMap.put(id, panel);
      }
      return panel;
   }

   public void setValidationMessageVisible(TransUnitId id)
   {
      for (Map.Entry entry : messagePanelMap.entrySet())
      {
         if (entry.getKey().equals(id))
         {
            entry.getValue().setVisible(true);
         }
         else
         {
            entry.getValue().setVisible(false);
         }
      }
   }

>>>>>>> 72b92388f6b6661a63ff0af631f44640593f4477
   public void setTransUnitDetails(TransUnit selectedTransUnit)
   {
      VerticalPanel sourcePanel = sourcePanelMap.get(selectedTransUnit.getId());
Solution content 
      return targetCellEditor;
   }

   public void setTransUnitDetails(TransUnit selectedTransUnit)
   {
      VerticalPanel sourcePanel = sourcePanelMap.get(selectedTransUnit.getId());
File
TableEditorTableDefinition.java
Developer's decision
Version 1
Kind of conflict
Method declaration
Chunk
Conflicting content 
import org.zanata.webtrans.shared.auth.Permission;
import org.zanata.webtrans.shared.model.TransUnit;

<<<<<<< HEAD
=======
import com.google.gwt.dom.client.Element;
>>>>>>> 72b92388f6b6661a63ff0af631f44640593f4477
import com.google.gwt.event.logical.shared.HasSelectionHandlers;
import com.google.gwt.event.logical.shared.SelectionEvent;
import com.google.gwt.event.logical.shared.SelectionHandler;
Solution content 
import org.zanata.webtrans.shared.auth.Permission;
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.gwt.dom.client.Element;
import com.google.gwt.event.logical.shared.HasSelectionHandlers;
import com.google.gwt.event.logical.shared.SelectionEvent;
import com.google.gwt.event.logical.shared.SelectionHandler;
File
TableEditorView.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
      this.tableDefinition.setTransUnitDetails(selectedTransUnit);

   }
<<<<<<< HEAD
=======

   @Override
   public void setValidationMessageVisible(TransUnitId id)
   {
      this.tableDefinition.setValidationMessageVisible(id);

   }

   /*
    * Overrides DOM.scrollIntoView() - focus on element's bottom right corner
    * This implementation focus on element's top left corner
    */
   public native void scrollIntoView(Element elem) /*-{
		var left = elem.offsetLeft, top = elem.offsetTop;
		var width = elem.offsetWidth, height = elem.offsetHeight;

		if (elem.parentNode != elem.offsetParent) {
			left -= elem.parentNode.offsetLeft;
			top -= elem.parentNode.offsetTop;
		}

		var cur = elem.parentNode;
		while (cur && (cur.nodeType == 1)) {
			if (left + width > cur.scrollLeft + cur.clientWidth) {
				cur.scrollLeft = (left + width) - cur.clientWidth;
			}
			if (left < cur.scrollLeft) {
				cur.scrollLeft = left;
			}
			if (top + height > cur.scrollTop + cur.clientHeight) {
				cur.scrollTop = (top + height) - cur.clientHeight;
			}
			if (top < cur.scrollTop) {
				cur.scrollTop = top;
			}

			var offsetLeft = cur.offsetLeft, offsetTop = cur.offsetTop;
			if (cur.parentNode != cur.offsetParent) {
				offsetLeft -= cur.parentNode.offsetLeft;
				offsetTop -= cur.parentNode.offsetTop;
			}

			left += offsetLeft - cur.scrollLeft;
			top += offsetTop - cur.scrollTop;
			cur = cur.parentNode;
		}
   }-*/;

>>>>>>> 72b92388f6b6661a63ff0af631f44640593f4477
}
Solution content 
      this.tableDefinition.setTransUnitDetails(selectedTransUnit);

   }

   /*
    * Overrides DOM.scrollIntoView() - focus on element's bottom right corner
    * This implementation focus on element's top left corner
    */
   public native void scrollIntoView(Element elem) /*-{
		var left = elem.offsetLeft, top = elem.offsetTop;
		var width = elem.offsetWidth, height = elem.offsetHeight;

		if (elem.parentNode != elem.offsetParent) {
			left -= elem.parentNode.offsetLeft;
			top -= elem.parentNode.offsetTop;
		}

		var cur = elem.parentNode;
		while (cur && (cur.nodeType == 1)) {
			if (left + width > cur.scrollLeft + cur.clientWidth) {
				cur.scrollLeft = (left + width) - cur.clientWidth;
			}
			if (left < cur.scrollLeft) {
				cur.scrollLeft = left;
			}
			if (top + height > cur.scrollTop + cur.clientHeight) {
				cur.scrollTop = (top + height) - cur.clientHeight;
			}
			if (top < cur.scrollTop) {
				cur.scrollTop = top;
			}

			var offsetLeft = cur.offsetLeft, offsetTop = cur.offsetTop;
			if (cur.parentNode != cur.offsetParent) {
				offsetLeft -= cur.parentNode.offsetLeft;
				offsetTop -= cur.parentNode.offsetTop;
			}

			left += offsetLeft - cur.scrollLeft;
			top += offsetTop - cur.scrollTop;
			cur = cur.parentNode;
		}
   }-*/;
}
File
TableEditorView.java
Developer's decision
Combination
Kind of conflict
Annotation
Comment
Method declaration
Method interface