Projects >> LoginMessage >>a472fe3edc60dc8c0b20a9ca061a050475e6d734

Chunk
Conflicting content 
		final String grouppath = keypath + ".groups";
		final String permspath = keypath + ".permissions";
		final String worldpath = keypath + ".worlds";
<<<<<<< HEAD
		//@formatter:off
		return getEntries(trigger, this.plugin, 
				getNonNullList(this.message.fileConfiguration.getStringList(grouppath)), 
				getNonNullList(this.message.fileConfiguration.getStringList(userpath)),
				getNonNullList(this.message.fileConfiguration.getStringList(permspath)),
				getNonNullList(this.message.fileConfiguration.getStringList(worldpath)));
		//@formatter:on
	}

	public static Set getEntries(final Player trigger, final Main plugin, final List groups, final List users, final List permissions, final List worlds) {
		Set entries = new HashSet();
		for (String group : groups) {
			boolean positive = DefaultEntry.isPositive(group);
			String unsignedGroup = DefaultEntry.getUnsignedText(group);
			if (unsignedGroup.equalsIgnoreCase("pub")) {
				entries.add(new Pub(positive ? null : trigger));
			} else if (unsignedGroup.equalsIgnoreCase("op")) {
				entries.add(new Op(positive));
			} else if (unsignedGroup.equalsIgnoreCase("pri")) {
				if (trigger != null) {
					entries.add(new Pri(positive, trigger));
				}
=======
		for (String group : getNonNullList(message.fileConfiguration.getStringList(grouppath))) {
			final SignedTextData signedTextData = new SignedTextData(group);
			if (signedTextData.unsignedText.equalsIgnoreCase("pub")) {
				entries.add(new Pub(signedTextData.positive ? null : trigger));
			} else if (signedTextData.unsignedText.equalsIgnoreCase("op")) {
				entries.add(new Op(signedTextData.positive));
			} else if (signedTextData.unsignedText.equalsIgnoreCase("pri")) {
				entries.add(new Pri(signedTextData.positive, trigger));
>>>>>>> 2c48bdd6f3d5d9d5cabc7fe418393e1f0109a167
			} else {
				entries.add(new Group(signedTextData, Main.getPermissions(), plugin));
			}
Solution content 
		final String grouppath = keypath + ".groups";
		final String permspath = keypath + ".permissions";
		final String worldpath = keypath + ".worlds";
		//@formatter:off
		return getEntries(trigger, this.plugin, 
				getNonNullList(this.message.fileConfiguration.getStringList(grouppath)), 
				getNonNullList(this.message.fileConfiguration.getStringList(userpath)),
				getNonNullList(this.message.fileConfiguration.getStringList(permspath)),
				getNonNullList(this.message.fileConfiguration.getStringList(worldpath)));
		//@formatter:on
	}

	public static Set getEntries(final Player trigger, final Main plugin, final List groups, final List users, final List permissions, final List worlds) {
		Set entries = new HashSet();
		for (String group : groups) {
			final SignedTextData signedTextData = new SignedTextData(group);
			if (signedTextData.unsignedText.equalsIgnoreCase("pub")) {
				entries.add(new Pub(signedTextData.positive ? null : trigger));
			} else if (signedTextData.unsignedText.equalsIgnoreCase("op")) {
				entries.add(new Op(signedTextData.positive));
			} else if (signedTextData.unsignedText.equalsIgnoreCase("pri")) {
				if (trigger != null) {
					entries.add(new Pri(signedTextData.positive, trigger));
				}
			} else {
				entries.add(new Group(signedTextData, Main.getPermissions(), plugin));
			}
File
Message.java
Developer's decision
Combination
Kind of conflict
Comment
For statement
If statement
Method invocation
Method signature
Return statement
Variable
Chunk
Conflicting content 
			entries.add(new Permission(perm, Main.getPermissions(), plugin));
		}
		
<<<<<<< HEAD
		for (String world : worlds) {
			entries.add(new com.tahkeh.loginmessage.entries.World(world, plugin));
=======
		for (String world : getNonNullList(message.fileConfiguration.getStringList(worldpath))) {
			entries.add(new com.tahkeh.loginmessage.matcher.entries.World(world, plugin));
>>>>>>> 2c48bdd6f3d5d9d5cabc7fe418393e1f0109a167
		}
		return entries;
	}
Solution content 
			entries.add(new Permission(perm, Main.getPermissions(), plugin));
		}

		for (String world : worlds) {
			entries.add(new com.tahkeh.loginmessage.matcher.entries.World(world, plugin));
		}
		return entries;
	}
File
Message.java
Developer's decision
Combination
Kind of conflict
For statement
Method invocation
Chunk
Conflicting content 
import org.bukkit.OfflinePlayer;
import org.bukkit.entity.Player;

<<<<<<< HEAD
import com.tahkeh.loginmessage.entries.Entry;
import com.tahkeh.loginmessage.methods.variables.bukkit.BukkitVariables;
import com.tahkeh.loginmessage.methods.variables.bukkit.ListVariables;
=======
import com.tahkeh.loginmessage.matcher.DefaultMatcher.SignedTextData;
import com.tahkeh.loginmessage.matcher.entries.Entry;
import com.tahkeh.loginmessage.matcher.entries.Group;
import com.tahkeh.loginmessage.matcher.entries.Op;
import com.tahkeh.loginmessage.matcher.entries.Permission;
import com.tahkeh.loginmessage.matcher.entries.Pub;
import com.tahkeh.loginmessage.matcher.entries.User;
import com.tahkeh.loginmessage.matcher.entries.World;
>>>>>>> 2c48bdd6f3d5d9d5cabc7fe418393e1f0109a167

public class PlayerList {
	private final Main plugin;
Solution content 
import org.bukkit.OfflinePlayer;
import org.bukkit.entity.Player;

import com.tahkeh.loginmessage.matcher.DefaultMatcher;
import com.tahkeh.loginmessage.matcher.entries.Entry;
import com.tahkeh.loginmessage.methods.variables.bukkit.ListVariables;

public class PlayerList {
	private final Main plugin;
File
PlayerList.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
		}
		return players;
	}
<<<<<<< HEAD
=======
	
	public Set getEntries() {
		Set entries = new HashSet();
		for (String group : groups) {
			final SignedTextData signedTextData = new SignedTextData(group);
			if (signedTextData.unsignedText.equalsIgnoreCase("pub")) {
				entries.add(new Pub(null));
			} else if (signedTextData.unsignedText.equalsIgnoreCase("op")) {
				entries.add(new Op(signedTextData.positive));
			} else {
				entries.add(new Group(signedTextData, Main.getPermissions(), plugin));
			}
		}
>>>>>>> 2c48bdd6f3d5d9d5cabc7fe418393e1f0109a167

	public Set getEntries() {
		return Message.getEntries(null, plugin, groups, users, permissions, worlds);
Solution content 
		}
		return players;
	}

	public Set getEntries() {
		return Message.getEntries(null, plugin, groups, users, permissions, worlds);
File
PlayerList.java
Developer's decision
Version 1
Kind of conflict
For statement
Method invocation
Method signature
Variable