conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
=======
private static class A {
String knownField;
@JsonCreator
private A(@JsonProperty("knownField") String knownField) {
this.knownField = knownField;
}
}
>>>>>>> |
<<<<<<<
import org.osgi.framework.FrameworkEvent;
import org.osgi.framework.connect.FrameworkUtilHelper;
=======
>>>>>>>
import org.osgi.framework.connect.FrameworkUtilHelper; |
<<<<<<<
@Override
public boolean setSwitchId(Long switchId) {
this.switchId = switchId;
return true;
}
@Override
public boolean registerPort(Short ovxPortNumber, Long physicalSwitchId,
Short physicalPortNumber) throws IllegalVirtualSwitchConfiguration {
OVXPort ovxPort = getPort(ov... |
<<<<<<<
=======
>>>>>>> |
<<<<<<<
import android.content.Intent;
import android.content.pm.PackageManager;
import android.net.Uri;
import android.provider.Settings;
import android.support.annotation.NonNull;
=======
import android.os.Bundle;
>>>>>>>
import android.content.Intent;
import android.content.pm.PackageManager;
import android.net.U... |
<<<<<<<
import seemoo.fitbit.events.DumpProgressEvent;
import seemoo.fitbit.miscellaneous.AuthValues;
=======
import seemoo.fitbit.miscellaneous.FitbitDevice;
>>>>>>>
import seemoo.fitbit.events.DumpProgressEvent;
import seemoo.fitbit.miscellaneous.FitbitDevice; |
<<<<<<<
// TODO configurable nb threads
private ConcurrentHashMap<HostAndPort, Map<Interest, AppInstanceNotifier>> notifiers = new ConcurrentHashMap<HostAndPort, Map<Interest, AppInstanceNotifier>>();
// private List<ActorRef> instances = new ArrayList<ActorRef>();
=======
// TODO configurable # of th... |
<<<<<<<
import com.yahoo.omid.client.CommitUnsuccessfulException;
import com.yahoo.omid.transaction.TransactionManager;
import com.yahoo.omid.transaction.TransactionState;
import com.yahoo.omid.transaction.TTable;
=======
import com.yahoo.omid.transaction.RollbackException;
import com.yahoo.omid.transaction.Transacti... |
<<<<<<<
import com.yahoo.omid.transaction.TransactionManager;
import com.yahoo.omid.transaction.TransactionState;
import com.yahoo.omid.transaction.TTable;
=======
import com.yahoo.omid.transaction.TransactionManager;
import com.yahoo.omid.transaction.Transaction;
import com.yahoo.omid.transaction.TTable;
>>>>>>>
im... |
<<<<<<<
private static final Logger LOG = LoggerFactory.getLogger(HBaseTransactionManager.class);
static final byte[] SHADOW_CELL_SUFFIX = "\u0080".getBytes(Charsets.UTF_8); // Non printable char (128 ASCII)
public enum PostCommitMode {
SYNC, ASYNC
}
=======
>>>>>>>
private static fina... |
<<<<<<<
import com.yahoo.omid.transaction.TransactionManager;
import com.yahoo.omid.transaction.TransactionState;
import com.yahoo.omid.transaction.TTable;
=======
import com.yahoo.omid.transaction.TransactionManager;
import com.yahoo.omid.transaction.Transaction;
import com.yahoo.omid.transaction.TTable;
>>>>>>>
im... |
<<<<<<<
import com.yahoo.omid.transaction.TransactionManager;
import com.yahoo.omid.transaction.TransactionState;
import com.yahoo.omid.transaction.TTable;
=======
import com.yahoo.omid.transaction.TransactionManager;
import com.yahoo.omid.transaction.Transaction;
import com.yahoo.omid.transaction.TTable;
>>>>>>>
im... |
<<<<<<<
=======
import com.yahoo.omid.notifications.client.OmidDelta;
>>>>>>>
<<<<<<<
=======
protected static OmidDelta registrationService;
>>>>>>>
<<<<<<<
=======
registrationService = new OmidDelta("TestApp");
>>>>>>>
<<<<<<<
=======
if (registrationService != null) {
... |
<<<<<<<
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.SettableFuture;
=======
>>>>>>>
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.SettableFuture;
<<<<<<<
import com.yahoo.omid.metrics.NullMetricsProvider;
... |
<<<<<<<
static class ExplicitBean {
@JsonProperty("firstName")
String userFirstName = "Peter";
@JsonProperty("lastName")
String userLastName = "Venkman";
@JsonProperty
String userAge = "35";
}
public void testExplicitRename() throws Exception {
ObjectMapper m = ne... |
<<<<<<<
mCameraThread = new HandlerThread("CAMERA"){
public void run(){
try{
=======
EasyApplication.module = DaggerMuxerModule.builder().mediaStream(this).build();
mCameraThread = new HandlerThread("CAMERA") {
public void run() {
try {
... |
<<<<<<<
checkPendingWrites();
this.initialSize = unnamedTree.size();
this.initialNumTrees = unnamedTree.numTrees();
if (this.depth == 0) {
LOGGER.debug("Normalization took {}. Changes: {}", sw.stop(), numPendingChanges);
}
return unnamedTree;
}
priva... |
<<<<<<<
import org.locationtech.geogig.model.RevFeatureType;
import org.locationtech.geogig.model.RevObject;
=======
import org.locationtech.geogig.model.RevObject;
>>>>>>>
import org.locationtech.geogig.model.RevFeatureType;
import org.locationtech.geogig.model.RevObject;
<<<<<<<
import org.locationtech.geogig.plu... |
<<<<<<<
@ReactMethod
public void removeTransmissionTargetEventProperty(String propertyKey, String targetToken, Promise promise) {
AnalyticsTransmissionTarget transmissionTarget = mTransmissionTargets.get(targetToken);
if (transmissionTarget != null) {
PropertyConfigurator configurat... |
<<<<<<<
public final static int STD_PATH = 4;
public final static int STD_CLASS = 5;
public final static int STD_JAVA_TYPE = 6;
public final static int STD_CURRENCY = 7;
public final static int STD_PATTERN = 8;
public final static int STD_LOCALE = 9;
public final ... |
<<<<<<<
import android.support.annotation.Nullable;
import android.support.annotation.StringRes;
=======
import android.os.Build;
>>>>>>>
import android.support.annotation.Nullable;
import android.support.annotation.StringRes;
import android.os.Build;
<<<<<<<
@SuppressLint("StaticFieldLeak") // It is alright to sto... |
<<<<<<<
=======
/* <!-- +++
import com.almalence.opencam_plus.MainScreen;
import com.almalence.opencam_plus.PluginManager;
import com.almalence.opencam_plus.PluginType;
import com.almalence.opencam_plus.R;
+++ --> */
// <!-- -+-
import com.almalence.opencam.MainScreen;
import com.almalence.opencam.PluginManager;... |
<<<<<<<
if (isRecording) {
// stop recording and release camera
try {
mMediaRecorder.stop(); // stop the recording
} catch (Exception e) {
e.printStackTrace();
Log.e("video OnShutterClick", "mMediaRecorder.stop() exception: " + e.getMessage());
}
releaseMediaRecorder(); /... |
<<<<<<<
=======
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.nio.ByteBuffer;
>>>>>>>
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOExcepti... |
<<<<<<<
// if (!isSlowMode)
// {
// byte[] data = null;
//
// if (mCameraMirrored)
// {
// data = PreShot.GetFromBufferNV21(i, 0, 0, 1);
// } else
// data = PreShot.GetFromBufferNV21(i, 0, 0, 0);
//
// if (data.length == 0)
// {
// return null;
// }
//
// int frame = Swap... |
<<<<<<<
public BaseResponse handle(JsonPath jsonPath, QueryParams queryParams, RequestBody requestBody)
throws InvocationTargetException, NoSuchMethodException, InstantiationException, IllegalAccessException {
=======
public BaseResponse handle(JsonPath jsonPath, RequestParams requestParams, Repos... |
<<<<<<<
BaseResponse taskResponse = resourcePost.handle(taskPath, new QueryParams(), newTaskBody);
=======
BaseResponse taskResponse = resourcePost.handle(taskPath, new RequestParams(new ObjectMapper()), null, newTaskBody);
>>>>>>>
BaseResponse taskResponse = resourcePost.handle(taskPath, new... |
<<<<<<<
import java.util.HashMap;
import java.util.Map;
=======
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
>>>>>>>
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
<<<<<<<
public User findOne(Long aLong, QueryParams queryParams) {
User user = THREAD_LOCAL_... |
<<<<<<<
=======
import io.katharsis.resource.mock.repository.TaskToProjectRepository;
import io.katharsis.response.HttpStatus;
>>>>>>>
import io.katharsis.resource.mock.repository.TaskToProjectRepository;
import io.katharsis.response.HttpStatus;
<<<<<<<
private static final QueryParams REQUEST_PARAMS = new Quer... |
<<<<<<<
public final BaseResponse<?> handle(JsonPath jsonPath, QueryParams queryParams, RequestBody requestBody) throws
Exception {
=======
public final BaseResponse<?> handle(JsonPath jsonPath, RequestParams requestParams,
RepositoryMethodParameterProvider para... |
<<<<<<<
private static final QueryParams REQUEST_PARAMS = new QueryParams();
=======
>>>>>>>
<<<<<<<
public void onNonExistentParentResourceShouldThrowException() throws Exception {
// GIVEN
RequestBody newProjectBody = new RequestBody();
DataBody data = new DataBody();
newPr... |
<<<<<<<
import io.katharsis.queryParams.QueryParams;
=======
import io.katharsis.queryParams.RequestParams;
import io.katharsis.repository.RepositoryMethodParameterProvider;
>>>>>>>
import io.katharsis.queryParams.QueryParams;
import io.katharsis.repository.RepositoryMethodParameterProvider;
<<<<<<<
public Reso... |
<<<<<<<
BaseResponse taskResponse = resourcePost.handle(taskPath, new QueryParams(), newTaskBody);
=======
BaseResponse taskResponse = resourcePost.handle(taskPath, new RequestParams(new ObjectMapper()), null, newTaskBody);
>>>>>>>
BaseResponse taskResponse = resourcePost.handle(taskPath, new... |
<<<<<<<
sut.handle(new ResourcePath("fridges"), new QueryParams(), null);
=======
sut.handle(new ResourcePath("fridges"), new RequestParams(new ObjectMapper()), null, null);
>>>>>>>
sut.handle(new ResourcePath("fridges"), new QueryParams(), null, null);
<<<<<<<
ResourcePost resourceP... |
<<<<<<<
import io.katharsis.queryParams.QueryParams;
=======
import io.katharsis.queryParams.RequestParams;
import io.katharsis.repository.RepositoryMethodParameterProvider;
>>>>>>>
import io.katharsis.repository.RepositoryMethodParameterProvider;
import io.katharsis.queryParams.QueryParams;
<<<<<<<
* @param q... |
<<<<<<<
import io.katharsis.queryParams.QueryParams;
import io.katharsis.repository.RelationshipRepository;
=======
import io.katharsis.queryParams.RequestParams;
import io.katharsis.repository.annotations.*;
>>>>>>>
import io.katharsis.queryParams.QueryParams;
import io.katharsis.repository.annotations.*;
<<<<<<<
... |
<<<<<<<
public ResourceResponse handle(JsonPath jsonPath, QueryParams queryParams, RequestBody requestBody)
=======
public ResourceResponse handle(JsonPath jsonPath, RequestParams requestParams,
RepositoryMethodParameterProvider parameterProvider, RequestBody requestBody)
>... |
<<<<<<<
=======
import io.katharsis.resource.annotations.JsonApiId;
import io.katharsis.resource.annotations.JsonApiResource;
import io.katharsis.resource.exception.ResourceException;
import io.katharsis.resource.exception.ResourceFieldException;
>>>>>>>
import io.katharsis.resource.annotations.JsonApiId;
import io.... |
<<<<<<<
import com.fasterxml.jackson.annotation.JsonIncludeProperties;
=======
>>>>>>>
<<<<<<<
=======
/**
* @since 2.8
*/
public static MapSerializer construct(Set<String> ignoredEntries, JavaType mapType,
boolean staticValueType, TypeSerializer vts,
JsonSerializer<Obje... |
<<<<<<<
protected void validateParams() throws PubNubException
{
if (channelGroup==null || channelGroup.isEmpty())
{
throw PubNubException.builder().pubnubError(PubNubErrorBuilder.PNERROBJ_GROUP_MISSING).build();
=======
protected void validateParams() throws PubNubException {
... |
<<<<<<<
import com.pubnub.api.builder.PubNubErrorBuilder;
import com.pubnub.api.utils.Base64;
=======
import com.pubnub.api.vendor.Base64;
>>>>>>>
import com.pubnub.api.builder.PubNubErrorBuilder;
import com.pubnub.api.vendor.Base64;
<<<<<<<
/**
* Returns decoded String
*
* @param sUrl
* ... |
<<<<<<<
import org.archive.modules.extractor.Link;
import org.archive.modules.revisit.RevisitProfile;
=======
import org.archive.modules.deciderules.recrawl.IdenticalDigestDecideRule;
>>>>>>>
import org.archive.modules.revisit.RevisitProfile; |
<<<<<<<
import java.io.InterruptedIOException;
import java.io.Reader;
import java.io.UnsupportedEncodingException;
import java.net.Inet4Address;
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.net.ServerSocket;
import java.net.Socket;
import java.net.SocketTimeoutException;
import java.nio.ch... |
<<<<<<<
if (input == presumedUsernameInput()) {
nameVals.add(TextUtils.urlEscape(input.name) + "=" + TextUtils.urlEscape(username));
} else if (input == candidatePasswordInputs.get(0)) {
nameVals.add(TextUtils.urlEscape(input.name) + "=" + TextUtils.urlEscape(pass... |
<<<<<<<
import static org.archive.modules.recrawl.RecrawlAttributeConstants.A_FETCH_HISTORY;
=======
import static org.archive.modules.recrawl.RecrawlAttributeConstants.A_CONTENT_DIGEST_HISTORY;
>>>>>>>
import static org.archive.modules.recrawl.RecrawlAttributeConstants.A_FETCH_HISTORY;
import static org.archive.mod... |
<<<<<<<
=======
private SolrServer solrServer;
private TopicDao messageDao;
@Autowired
private CommentService commentService;
@Autowired
private MsgbaseDao msgbaseDao;
>>>>>>>
@Autowired
private CommentService commentService;
@Autowired
private MsgbaseDao msgbaseDao;
<<<<<<<
@Auto... |
<<<<<<<
import ru.org.linux.csrf.CSRFProtectionService;
=======
import ru.org.linux.edithistory.EditHistoryDto;
import ru.org.linux.edithistory.EditHistoryObjectTypeEnum;
import ru.org.linux.edithistory.EditHistoryService;
import ru.org.linux.site.MemCachedSettings;
>>>>>>>
import ru.org.linux.csrf.CSRFProtectionSer... |
<<<<<<<
/**
* Множество всех имен тэгов
*/
private final ImmutableSet<String> allTagsNames;
/**
* Конструктор
* @param flags флаги которые влияют на созданный объект
*/
public Parser(EnumSet<ParserFlags> flags) {
=======
public Parser(Set<ParserFlags> flags) {
// разрешенные параметры дл... |
<<<<<<<
import java.lang.Integer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
=======
>>>>>>>
import java.lang.Integer; |
<<<<<<<
if (author.getScore()>=200) {
return ParserUtil.bb2xhtml(message, includeCut, false, getLink(), db);
=======
if (author.getScore()>=100) {
return ParserUtil.bb2xhtml(message, includeCut, getLink(), db);
>>>>>>>
if (author.getScore()>=100) {
return ParserUtil.bb2xhtml... |
<<<<<<<
if (author.getScore()>=200) {
return ParserUtil.bb2xhtml(text, true, true, "", db);
=======
if (author.getScore()>=100) {
return ParserUtil.bb2xhtml(text, true, "", db);
>>>>>>>
if (author.getScore()>=100) {
return ParserUtil.bb2xhtml(text, true, true, "", db);
<<<<... |
<<<<<<<
@ApiModelProperty(notes = N_TEAM_ID, example = E_TEAM_ID)
private Integer teamId;
@ApiModelProperty(notes = N_CREATEDBY, example = E_CREATEDBY)
private String createdBy;
public String getCreatedBy() {
return createdBy;
}
public void setCreatedBy(String createdBy) {
... |
<<<<<<<
Objects.requireNonNull(patternDefinitions);
patternDefinitions.forEach((name, pattern) -> register(name, pattern));
=======
Preconditions.checkNotNull(patternDefinitions);
patternDefinitions.forEach(this::register);
>>>>>>>
Objects.requireNonNull(patternDefinitions);
patternDefinition... |
<<<<<<<
import java.time.ZoneId;
import java.time.ZoneOffset;
=======
import java.io.BufferedReader;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
import java.io.Ser... |
<<<<<<<
=======
/**
* Method that subclasses may call for standard handling of an exception thrown when
* calling constructor or factory method. Will unwrap {@link ExceptionInInitializerError}
* and {@link InvocationTargetException}s, then call {@link #wrapAsJsonMappingException}.
*
* @si... |
<<<<<<<
if (assemblyConfig != null) {
String descriptor = assemblyConfig.getDescriptor();
if (descriptor != null) {
return new String[]{EnvUtil.prepareAbsolutePath(params.getSourceDirectory(), descriptor).getAbsolutePath()};
}
=======
String descrip... |
<<<<<<<
/**
* @component
*/
private DockerAssemblyManager dockerAssemblyManager;
/** @parameter property = "docker.showLogs" default-value="false" */
private boolean showLogs;
=======
/** @component */
private DockerArchiveCreator dockerArchiveCreator;
>>>>>>>
/** @componen... |
<<<<<<<
private WaitUtil.WaitChecker getHealthyWaitChecker(final String imageConfigDesc, final DockerAccess docker, final String containerId, final List<String> logOut) {
return new WaitUtil.WaitChecker() {
private boolean first = true;
@Override
public boolean check(... |
<<<<<<<
import java.util.Arrays;
=======
import java.util.Collections;
>>>>>>>
import java.util.Arrays;
import java.util.Collections; |
<<<<<<<
protected TopicSystem loadAnnotator() throws Exception {
return new WikipediaMinerAnnotator(GerbilConfiguration.getInstance().getString(
WIKI_MINER_CONFIG_FILE_PROPERTY_NAME));
=======
protected TopicSystem loadAnnotator(ExperimentType type) throws Exception {
return ne... |
<<<<<<<
/**
* This class is a very ugly workaround performing the mapping from annotator
* names to {@link AnnotatorConfiguration} objects and from an
* {@link ExperimentType} to a list of {@link AnnotatorConfiguration}s that are
* usable for this {@link ExperimentType}.
*
* @author Michael Röder (roeder@in... |
<<<<<<<
public class BabelfyAnnotator implements Sa2WSystem {
// private static final Logger LOGGER = LoggerFactory.getLogger(BabelfyAnnotator.class);
private static final int BABELFY_MAX_TEXT_LENGTH = 3500;
public static final String NAME = "Babelfy";
// private long calib = -1;
// private long lastTime = -1;
... |
<<<<<<<
public class MSNBCDataset extends AbstractDataset implements InitializableDataset {
=======
public class MSNBCDataset implements InitializableDataset, Comparator<Span> {
>>>>>>>
public class MSNBCDataset extends AbstractDataset implements InitializableDataset, Comparator<Span> { |
<<<<<<<
* Returns either backtick-quoted `named.getName()` (if `named` not null),
* or "[null]" if `named` is null.
=======
* Returns either single-quoted (apostrophe) {@code 'named.getName()'} (if {@code named} not null),
* or "[null]" if {@code named} is null.
*<p>
* NOTE: before 2.12 ... |
<<<<<<<
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
=======
import org.aksw.gerbil.exceptions.GerbilException;
>>>>>>>
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.aksw.ge... |
<<<<<<<
/**
* When activated, edited books with more than 50 pages will be shortened to 50.
*
* @return True if enabled
*/
boolean truncate1_14Books();
=======
/**
* Handles left handed info by using unused bit 7 on Client Settings packet
*/
boolean isLeftHandedHandling... |
<<<<<<<
/**
* Should 1.15 clients respawn instantly / without showing the death screen
*
* @return True if enabled
*/
boolean is1_15InstantRespawn();
=======
/**
* Fixes non full blocks having 0 light for 1.14+ clients on sub 1.14 servers.
*
* @return True if enabled
... |
<<<<<<<
register(v1_9_3 = new ProtocolVersion(110, "1.9.3"));
register(SNAPSHOT = new ProtocolVersion(201, "16w20a"));
=======
register(v1_9_3 = new ProtocolVersion(110, "1.9.3/4"));
>>>>>>>
register(v1_9_3 = new ProtocolVersion(110, "1.9.3/4"));
register(v1_9_3 = new Protocol... |
<<<<<<<
import pneumaticCraft.common.thirdparty.ModInteractionUtils;
=======
import pneumaticCraft.common.network.DescSynced;
import pneumaticCraft.common.network.GuiSynced;
>>>>>>>
import pneumaticCraft.common.thirdparty.ModInteractionUtils;
<<<<<<<
private final TileEntityPneumaticBase vacuumHandler = new Til... |
<<<<<<<
public static final String GUI_AMADRON = GUI_LOCATION + "GuiAmadron.png";
=======
public static final String GUI_NEI_MISC_RECIPES = GUI_LOCATION + "GuiNEIMiscRecipes.png";
>>>>>>>
public static final String GUI_AMADRON = GUI_LOCATION + "GuiAmadron.png";
public static final String GUI_NEI_MISC... |
<<<<<<<
import me.desht.pneumaticcraft.common.progwidgets.*;
=======
import me.desht.pneumaticcraft.common.item.ItemRegistry;
import me.desht.pneumaticcraft.common.progwidgets.IJumpBackWidget;
import me.desht.pneumaticcraft.common.progwidgets.IProgWidget;
import me.desht.pneumaticcraft.common.progwidgets.IVariablePro... |
<<<<<<<
=======
import me.desht.pneumaticcraft.common.thirdparty.immersiveengineering.ImmersiveEngineering;
import me.desht.pneumaticcraft.common.thirdparty.mcmultipart.PneumaticMultiPart;
>>>>>>>
import me.desht.pneumaticcraft.common.thirdparty.immersiveengineering.ImmersiveEngineering; |
<<<<<<<
package redis.clients.johm.models;
import redis.clients.johm.Attribute;
import redis.clients.johm.Model;
import redis.clients.johm.Reference;
public class User extends Model {
@Attribute
private String name;
private String room;
@Reference
private Country country;
public Country getC... |
<<<<<<<
=======
private Spectrum.Block withoutAuthCheck(String path, String expectedJsonSpec) {
return () -> {
mockMvc.perform(get(path).accept(MediaType.APPLICATION_JSON))
.andExpect(status().isOk())
.andExpect(jsonPath(expectedJsonSpec).isNotEmpty());
};
}
@Configuration
... |
<<<<<<<
=======
import io.pivotal.security.service.regeneratables.CertificateSecret;
import io.pivotal.security.service.regeneratables.NotRegeneratable;
import io.pivotal.security.service.regeneratables.PasswordSecret;
import io.pivotal.security.service.regeneratables.Regeneratable;
import io.pivotal.security.service... |
<<<<<<<
this.volume.setWorld(this.location.getWorld());
this.volume.setCornerOne(locationBlock.getFace(back).getFace(left, halfHubWidth).getFace(BlockFace.DOWN));
this.volume.setCornerTwo(locationBlock.getFace(right, halfHubWidth).getFace(front, hubDepth).getFace(BlockFace.UP, hubHeigth));
=======
this.vo... |
<<<<<<<
this.lobbyMiddleWallBlock = new BlockInfo(lobbyWorld.getBlockAt(playerLocation.getBlockX(), playerLocation.getBlockY(), playerLocation.getBlockZ()).getFace(facing, 6));
=======
this.lobbyMiddleWallBlock = new BlockInfo(this.warzone.getWorld().getBlockAt(playerLocation.getBlockX(), playerLocation.getBlockY... |
<<<<<<<
public WarHub(War war, Location location, String hubOrientation) {
this.war = war;
int yaw = 0;
=======
public WarHub(Location location, String hubOrientation) {
this.location = location;
this.volume = new Volume("warhub", location.getWorld());
>>>>>>>
public WarHub(Location location, String hubOr... |
<<<<<<<
import org.neo4j.storageengine.api.NodeItem;
import org.neo4j.storageengine.api.PropertyItem;
import org.neo4j.storageengine.api.RelationshipItem;
=======
>>>>>>>
<<<<<<<
final long originalNodeId = toOriginalNodeId(nodeId);
forAllRelationships(nodeId, direction, item -> {
long r... |
<<<<<<<
importers.add(new ChallengesImporter());
=======
importers.add(new LevelConfigImporter());
importers.add(new ConfigPre13Importer());
>>>>>>>
importers.add(new ConfigPre13Importer()); |
<<<<<<<
private static boolean isPrimaryConfig(String configName) {
return configName.equalsIgnoreCase("config.yml");
}
private static void copy(InputStream stream, File file) throws IOException {
if (stream == null || file == null) {
return;
}
=======
public stati... |
<<<<<<<
private static final int VERSION = 10;
=======
private static final String VERSION = "11";
>>>>>>>
private static final String VERSION = "11";
<<<<<<<
public static boolean protectNetherIsland(uSkyBlock plugin, CommandSender sender, IslandInfo islandConfig) {
try {
WorldG... |
<<<<<<<
FlowDef definition = new FlowDef()
.setName(name)
.addTails(tails)
.addSources(sources)
.addSinks(sinks)
.addTraps(traps);
if(getProperties().containsKey(CascadingUtil.CASCADING_RUN_ID)){
definition.setRunID((String) getProperties().get(CascadingUtil.CASCAD... |
<<<<<<<
import org.junit.Test;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
=======
>>>>>>> |
<<<<<<<
/**********************************************************************
/* Deserialization, parser, format features
/**********************************************************************
=======
/**********************************************************
/* Configured helper objects
... |
<<<<<<<
cards.add(new SetCardInfo("Kindred Boon", 5, Rarity.RARE, mage.cards.k.KindredBoon.class));
cards.add(new SetCardInfo("Kindred Charge", 27, Rarity.RARE, mage.cards.k.KindredCharge.class));
cards.add(new SetCardInfo("Kindred Discovery", 11, Rarity.RARE, mage.cards.k.KindredDiscovery.class... |
<<<<<<<
/*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, ... |
<<<<<<<
filter.add(new SubtypePredicate(SubType.REFLECTION));
=======
filterToken.add(new SubtypePredicate("Reflection"));
filterToken.add(new TokenPredicate());
filter.add(new SubtypePredicate("Reflection"));
>>>>>>>
filterToken.add(new SubtypePredicate(SubType.REFLECTION));
... |
<<<<<<<
import mage.choices.ChoiceColor;
import mage.choices.ManaChoice;
=======
>>>>>>>
import mage.choices.ChoiceColor;
import mage.choices.ManaChoice;
<<<<<<<
}
class PlasmCaptureManaEffect extends ManaEffect {
int amountOfMana;
public PlasmCaptureManaEffect(int amountOfMana) {
super();
... |
<<<<<<<
tokenImageSets.addAll(Arrays.asList("ZEN", "C14", "DDD", "C15", "GVL", "MM3", "CMA", "E01", "C19"));
=======
tokenImageSets.addAll(Arrays.asList("ZEN", "C14", "DDD", "C15", "DD3GVL", "MM3", "CMA", "E01", "C19", "C20"));
>>>>>>>
tokenImageSets.addAll(Arrays.asList("ZEN", "C14", "DDD", ... |
<<<<<<<
private Map<UUID, FilterCreaturePermanent> usePowerInsteadOfToughnessForDamageLethalityFilters = new HashMap<>();
public GameImpl(MultiplayerAttackOption attackOption, RangeOfInfluence range, Mulligan mulligan, int startLife) {
=======
public GameImpl(MultiplayerAttackOption attackOption, RangeOf... |
<<<<<<<
cards.add(new SetCardInfo("Balan, Wandering Knight", 2, Rarity.RARE, mage.cards.b.BalanWanderingKnight.class));
cards.add(new SetCardInfo("O-Kagachi, Vengeful Kami", 3, Rarity.MYTHIC, mage.cards.o.OKagachiVengefulKami.class));
=======
cards.add(new SetCardInfo("O-Kagachi, Vengeful Kami... |
<<<<<<<
import com.fasterxml.jackson.databind.type.CollectionType;
import com.fasterxml.jackson.databind.type.MapType;
import com.fasterxml.jackson.databind.util.SimpleLookupCache;
=======
import com.fasterxml.jackson.databind.util.LRUMap;
>>>>>>>
import com.fasterxml.jackson.databind.util.SimpleLookupCache; |
<<<<<<<
=======
import java.lang.reflect.Type;
import java.math.BigDecimal;
>>>>>>>
import java.math.BigDecimal; |
<<<<<<<
cards.add(new SetCardInfo("Nazahn, Revered Bladesmith", 44, Rarity.MYTHIC, mage.cards.n.NazahnReveredBladesmith.class));
=======
cards.add(new SetCardInfo("Balan, Wandering Knight", 2, Rarity.RARE, mage.cards.b.BalanWanderingKnight.class));
>>>>>>>
cards.add(new SetCardInfo("Balan, Wa... |
<<<<<<<
cards.add(new SetCardInfo("Finale of Devastation", 160, Rarity.MYTHIC, mage.cards.f.FinaleOfDevastation.class));
=======
cards.add(new SetCardInfo("Finale of Eternity", 91, Rarity.MYTHIC, mage.cards.f.FinaleOfEternity.class));
>>>>>>>
cards.add(new SetCardInfo("Finale of Devastation",... |
<<<<<<<
/*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list ... |
<<<<<<<
cards.add(new SetCardInfo("As Luck Would Have It", 102, Rarity.RARE, mage.cards.a.AsLuckWouldHaveIt.class));
cards.add(new SetCardInfo("Crow Storm", 31, Rarity.UNCOMMON, mage.cards.c.CrowStorm.class));
cards.add(new SetCardInfo("Forest", 216, Rarity.LAND, mage.cards.basiclands.Forest.cla... |
<<<<<<<
public interface ServerVariables extends Constructible, Extensible<ServerVariables> {
=======
@Deprecated
public interface ServerVariables extends Constructible, Extensible<ServerVariables>, Map<String, ServerVariable> {
>>>>>>>
@Deprecated
public interface ServerVariables extends Constructible, Extensible<S... |
<<<<<<<
private final OutgoingMessageQueue<MessageType> outgoingMessageQueue;
=======
/**
* Queue of all messages being published by this publisher.
*/
private final OutgoingMessageQueue<MessageType> outgoingMessages;
/**
* All {@link PublisherListener} instances added to the publisher.
*/
priv... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.