Projects >> zanata-server >>9be435debceffa55b952012224c7c387de364d7d

Chunk
Conflicting content 
   public TransUnitCountBar(WebTransMessages messages, boolean statsByWords)
   {
      this.messages = messages;
<<<<<<< HEAD:server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.java
=======
      this.statsByWords = statsByWords;
      tooltipPanel.setStyleName("transUnitCountGraphTooltipPanel");
>>>>>>> 30cec4b344abb8b3a6052180dc3d0d5ea35276b7:server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitCountBar.java
      initWidget(uiBinder.createAndBindUi(this));
      initLayoutPanelHandler();
   }
Solution content 
   public TransUnitCountBar(WebTransMessages messages, boolean statsByWords)
   {
      this.messages = messages;
      this.statsByWords = statsByWords;
      initWidget(uiBinder.createAndBindUi(this));
      initLayoutPanelHandler();
   }
File
TransUnitCountBar.java
Developer's decision
Combination
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
      layoutPanel.sinkEvents(Event.ONMOUSEOVER | Event.ONMOUSEOUT);
   }

<<<<<<< HEAD:server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.java
=======
   public TransUnitCountBar(WebTransMessages messages, boolean isGraph, boolean statsByWords)
   {
      tooltipPanel.setStyleName("transUnitCountGraphTooltipPanel");
      this.isGraph = isGraph;
      this.messages = messages;
      this.statsByWords = statsByWords;
   }

>>>>>>> 30cec4b344abb8b3a6052180dc3d0d5ea35276b7:server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitCountBar.java
   private void setupLayoutPanel(double undefinedLeft, double undefinedWidth, double approvedLeft, double approvedWidth, double needReviewLeft, double needReviewWidth, double untranslatedLeft, double untranslatedWidth)
   {
      layoutPanel.forceLayout();
Solution content 
      layoutPanel.sinkEvents(Event.ONMOUSEOVER | Event.ONMOUSEOUT);
   }

   public TransUnitCountBar(WebTransMessages messages, boolean isGraph, boolean statsByWords)
   {
      this.isGraph = isGraph;
      this.messages = messages;
      this.statsByWords = statsByWords;

      labelFormat = LabelFormat.PERCENT_COMPLETE;
   }

   private void setupLayoutPanel(double undefinedLeft, double undefinedWidth, double approvedLeft, double approvedWidth, double needReviewLeft, double needReviewWidth, double untranslatedLeft, double untranslatedWidth)
   {
      layoutPanel.forceLayout();
File
TransUnitCountBar.java
Developer's decision
Manual
Kind of conflict
Method declaration
Chunk
Conflicting content 
   @Inject
   public TransUnitCountGraph(WebTransMessages messages)
   {
<<<<<<< HEAD:server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountGraph.java
      super(messages, true);
=======
      super(messages, true, true);
      this.labelFormat = LabelFormat.PERCENT_COMPLETE;
>>>>>>> 30cec4b344abb8b3a6052180dc3d0d5ea35276b7:server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitCountGraph.java
      initWidget(uiBinder.createAndBindUi(this));
   }
}
Solution content 
   @Inject
   public TransUnitCountGraph(WebTransMessages messages)
   {
      super(messages, true, true);
      initWidget(uiBinder.createAndBindUi(this));
   }
}
File
TransUnitCountGraph.java
Developer's decision
Combination
Kind of conflict
Method invocation
Chunk
Conflicting content 
      this.messages = messages;
      filterTextBox = new ClearableTextBox(resources, uiMessages);
      nodes = new HashMap();
<<<<<<< HEAD:server/zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java
=======
      transUnitCountBar = new TransUnitCountBar(messages, true);
>>>>>>> 30cec4b344abb8b3a6052180dc3d0d5ea35276b7:server/zanata-war/src/main/java/org/zanata/webtrans/client/DocumentListView.java
      dataProvider = new ListDataProvider();
      this.dispatcher = dispatcher;
      this.eventBus = eventBus;
Solution content 
      this.messages = messages;
      filterTextBox = new ClearableTextBox(resources, uiMessages);
      nodes = new HashMap();
      dataProvider = new ListDataProvider();
      this.dispatcher = dispatcher;
      this.eventBus = eventBus;
File
DocumentListView.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
   public TranslationEditorView(final WebTransMessages messages, final Resources resources)
   {
      this.resources = resources;
<<<<<<< HEAD:server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.java
=======
      this.transUnitCountBar = new TransUnitCountBar(messages, true);
>>>>>>> 30cec4b344abb8b3a6052180dc3d0d5ea35276b7:server/zanata-war/src/main/java/org/zanata/webtrans/client/TranslationEditorView.java
      this.pager = new Pager(messages, resources);

      initWidget(uiBinder.createAndBindUi(this));
Solution content 
   public TranslationEditorView(final WebTransMessages messages, final Resources resources)
   {
      this.resources = resources;
      this.pager = new Pager(messages, resources);

      initWidget(uiBinder.createAndBindUi(this));
File
TranslationEditorView.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation