Projects >> zanata-server >>f455b9f19bbf83fcdfbd0e5144d117fae74f649e

Chunk
Conflicting content 
         {
            sourcePanel.highlightSearch(findMessage);
         }
<<<<<<< HEAD
=======
         if (rowValue.getStatus() == ContentState.NeedReview)
         {
            String content = sourcePanel.getLabel().getElement().getInnerHTML();
            String highlight = "" + content;
            sourcePanel.getLabel().getElement().setInnerHTML(highlight);
         }
>>>>>>> 92ce2c7e9c5b03aafd1fa7391e44ed9da4096a57
         sourcePanel.sinkEvents(Event.ONCLICK);
         sourcePanel.addClickHandler(new ClickHandler()
         {
Solution content 
         {
            sourcePanel.highlightSearch(findMessage);
         }
         if (rowValue.getStatus() == ContentState.NeedReview)
         {
            String content = sourcePanel.getLabel().getElement().getInnerHTML();
            String highlight = "" + content;
            sourcePanel.getLabel().getElement().setInnerHTML(highlight);
         }
         sourcePanel.sinkEvents(Event.ONCLICK);
         sourcePanel.addClickHandler(new ClickHandler()
         {
File
TableEditorTableDefinition.java
Developer's decision
Version 2
Kind of conflict
If statement
Chunk
Conflicting content 
            ((HighlightingLabel) label).highlightSearch(findMessage);
         }

<<<<<<< HEAD
         // if (rowValue.getStatus() == ContentState.NeedReview)
         // {
         // String content = label.getElement().getInnerHTML();
         // String newHtml =
         // "" + content;
         // label.getElement().setInnerHTML(newHtml);
         // }
=======
         if (rowValue.getStatus() == ContentState.NeedReview)
         {
            String content = label.getElement().getInnerHTML();
            String newHtml = "" + content;
            label.getElement().setInnerHTML(newHtml);
         }
>>>>>>> 92ce2c7e9c5b03aafd1fa7391e44ed9da4096a57

         label.setTitle(messages.clickHere());
Solution content 
            ((HighlightingLabel) label).highlightSearch(findMessage);
         }

         // if (rowValue.getStatus() == ContentState.NeedReview)
         // {
         // String content = label.getElement().getInnerHTML();
         // String newHtml = "" + content;
         // label.getElement().setInnerHTML(newHtml);
         // }

         label.setTitle(messages.clickHere());
File
TableEditorTableDefinition.java
Developer's decision
Manual
Kind of conflict
Comment
If statement