void (TreeConflictDescription description, JPanel main, GridBagConstraints gb, BeforeAfter<ConflictSidePresentation> ba) { if (description == null) return; JLabel descriptionLbl = new JLabel(description.toPresentableString()); descriptionLbl.setForeground(JBColor.RED); main.add(descriptionLbl, gb); ++gb.gridy; //buttons gb.insets.top = 0; addResolveButtons(description, main, gb); addSide(main, gb, ba.getBefore(), message("label.conflict.left.side", ConflictSidePresentation.getDescription(description.getSourceLeftVersion(), myChange))); addSide(main, gb, ba.getAfter(), message("label.conflict.right.side", ConflictSidePresentation.getDescription(description.getSourceRightVersion(), myChange))); }