Projects >> UniversalMediaServer >>bde29826917db57e3072ff94ec81244762ffa2b4

Chunk
Conflicting content 
	/**
	 * A loading priority comparator
	 */
<<<<<<< HEAD
	public static final Comparator rendererLoadingPriorityComparator = (RendererConfiguration r1, RendererConfiguration r2) -> {
		if (r1 == null || r2 == null) {
			return (r1 == null && r2 == null) ? 0 : r1 == null ? 1 : r2 == null ? -1 : 0;
=======
	public static final Comparator rendererLoadingPriorityComparator = new Comparator() {
		@Override
		public int compare(RendererConfiguration r1, RendererConfiguration r2) {
			if (r1 == null || r2 == null) {
				return (r1 == null && r2 == null) ? 0 : r1 == null ? 1 : r2 == null ? -1 : 0;
			}
			int p1 = r1.getLoadingPriority();
			int p2 = r2.getLoadingPriority();
			return p1 > p2 ? -1 : p1 < p2 ? 1 : r1.getConfName().compareToIgnoreCase(r2.getConfName());
>>>>>>> a00ebf2a50d740f4c1a3cef36646e950bf207f9a
		}
		int p1 = r1.getLoadingPriority();
		int p2 = r2.getLoadingPriority();
Solution content 
	/**
	 * A loading priority comparator
	 */
	public static final Comparator rendererLoadingPriorityComparator = (RendererConfiguration r1, RendererConfiguration r2) -> {
		if (r1 == null || r2 == null) {
			return (r1 == null && r2 == null) ? 0 : r1 == null ? 1 : r2 == null ? -1 : 0;
		}
		int p1 = r1.getLoadingPriority();
		int p2 = r2.getLoadingPriority();
File
RendererConfiguration.java
Developer's decision
Version 1
Kind of conflict
Attribute
If statement
Return statement
Static initializer
Chunk
Conflicting content 
		subColor = new JButton();
		subColor.setText(Messages.getString("MEncoderVideo.31"));
		subColor.setBackground(new Color(configuration.getSubsColor()));
<<<<<<< HEAD
		subColor.addActionListener((ActionEvent e) -> {
			Color newColor = JColorChooser.showDialog(
				looksFrame,
				Messages.getString("MEncoderVideo.125"),
				subColor.getBackground()
			);

			if (newColor != null) {
				subColor.setBackground(newColor);
				configuration.setSubsColor(newColor.getRGB());
				FFMpegVideo.deleteSubs(); // Color has been changed so all FFmpeg temporary subs will be deleted and make new
=======
		subColor.addActionListener(new ActionListener() {
			@Override
			public void actionPerformed(ActionEvent e) {
				Color newColor = JColorChooser.showDialog(
					looksFrame,
					Messages.getString("MEncoderVideo.125"),
					subColor.getBackground()
				);

				if (newColor != null) {
					subColor.setBackground(newColor);
					configuration.setSubsColor(newColor.getRGB());
					SubtitleUtils.deleteSubs(); // Color has been changed so all temporary subs will be deleted and make new
				}
>>>>>>> a00ebf2a50d740f4c1a3cef36646e950bf207f9a
			}
		});
		builder.add(subColor, FormLayoutUtil.flip(cc.xyw(13, 14, 3), colSpec, orientation));
Solution content 
		subColor = new JButton();
		subColor.setText(Messages.getString("MEncoderVideo.31"));
		subColor.setBackground(new Color(configuration.getSubsColor()));
		subColor.addActionListener((ActionEvent e) -> {
			Color newColor = JColorChooser.showDialog(
				looksFrame,
				Messages.getString("MEncoderVideo.125"),
				subColor.getBackground()
			);

			if (newColor != null) {
				subColor.setBackground(newColor);
				configuration.setSubsColor(newColor.getRGB());
				SubtitleUtils.deleteSubs(); // Color has been changed so all temporary subs will be deleted and make new
			}
		});
		builder.add(subColor, FormLayoutUtil.flip(cc.xyw(13, 14, 3), colSpec, orientation));
File
TranscodingTab.java
Developer's decision
Combination
Kind of conflict
Comment
Method invocation