conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
public void testNullTypedef() throws Throwable {
myFixture.configureByFiles("NullTypedef.hx", "std/StdTypes.hx", "std/String.hx");
doTestVariantsInner("NullTypedef.txt");
}
public void testRefTypedef() throws Throwable {
myFixture.configureByFiles("RefTypedef.hx", "std/String.hx");
doTest... |
<<<<<<<
else if (root_ == CONSTRUCTOR_NAME) {
result_ = constructorName(builder_, 0);
}
=======
else if (root_ == CONDITIONAL) {
result_ = conditional(builder_, 0);
}
>>>>>>>
else if (root_ == CONDITIONAL) {
result_ = conditional(builder_, 0);
}
else if (root_ == CONSTRU... |
<<<<<<<
// blockStatement | notBlockStatement
public static boolean statement(PsiBuilder builder_, int level_) {
=======
// blockStatement | notBlockStatement | conditional
static boolean statement(PsiBuilder builder_, int level_) {
>>>>>>>
// blockStatement | notBlockStatement | conditional
public stati... |
<<<<<<<
public void visitConstructorName(@NotNull HaxeConstructorName o) {
visitPsiCompositeElement(o);
}
=======
public void visitConditional(@NotNull HaxeConditional o) {
visitPsiCompositeElement(o);
}
>>>>>>>
public void visitConditional(@NotNull HaxeConditional o) {
visitPsiCompositeEleme... |
<<<<<<<
import com.intellij.plugins.haxe.lang.psi.*;
=======
import com.intellij.plugins.haxe.HaxeComponentType;
import com.intellij.plugins.haxe.lang.psi.*;
>>>>>>>
import com.intellij.plugins.haxe.lang.psi.*;
import com.intellij.plugins.haxe.HaxeComponentType;
<<<<<<<
import com.intellij.psi.*;
import com.intelli... |
<<<<<<<
=======
// Some other types
default:
if ("VARCHAR2".equals(type.typeName())) {
return TEXT_COLUMN;
} else if ("uuid".equals(type.typeName())) { // PostgreSQL
return TEXT_COLUMN;
} else if ("NVARCHAR2".equals(type.typeName())) {
return TEXT_COLUMN;
} else if ("TIMESTAM... |
<<<<<<<
private final static String DEFAULT_BASE_URI = "http://localhost";
=======
>>>>>>>
<<<<<<<
/** d2rq mapping file */
private String configFile;
=======
/** System loader for access to the GraphD2RQ and configuration */
private final SystemLoader loader;
>>>>>>>
/** System loader for acc... |
<<<<<<<
=======
import de.fuberlin.wiwiss.d2rq.expr.Add;
import de.fuberlin.wiwiss.d2rq.expr.Constant;
import de.fuberlin.wiwiss.d2rq.expr.Divide;
import de.fuberlin.wiwiss.d2rq.expr.Equality;
>>>>>>>
import de.fuberlin.wiwiss.d2rq.expr.Add;
import de.fuberlin.wiwiss.d2rq.expr.Constant;
import de.fuberlin.wiwiss.d2r... |
<<<<<<<
register(AttributeType.GENERIC_MAX_HEALTH, "generic.max_health");
register(AttributeType.GENERIC_FOLLOW_RANGE, "generic.follow_range");
register(AttributeType.GENERIC_KNOCKBACK_RESISTANCE, "generic.knockback_resistance");
register(AttributeType.GENERIC_MOVEMENT_SPEED, "generic.mo... |
<<<<<<<
this.primaryDistributedTraceId = distributedTraceIds.get(0);
=======
this.distributedTraceIds = distributedTraceIds;
if (entryServiceId == DictionaryUtil.nullValue()) {
this.entryOperationName = "#" + entryOperationName;
} else {
this.entryOperationName... |
<<<<<<<
public static final OfficialComponent SERVICECOMB = new OfficialComponent(27, "ServiceComb");
=======
public static final OfficialComponent KAFKA = new OfficialComponent(27, "Kafka");
>>>>>>>
public static final OfficialComponent KAFKA = new OfficialComponent(27, "Kafka");
public static ... |
<<<<<<<
return null;
=======
>>>>>>>
return null; |
<<<<<<<
import akka.actor.ActorPath;
import akka.actor.ActorRef;
import com.a.eye.skywalking.logging.ILog;
import com.a.eye.skywalking.logging.LogManager;
=======
>>>>>>>
<<<<<<<
public class WorkerRef {
private ILog logger = LogManager.getLogger(WorkerRef.class);
final ActorRef actorRef;
=======
public... |
<<<<<<<
if (operationName.length() == 0 || Config.Plugin.Toolkit.USE_QUALIFIED_NAME_AS_ENDPOINT_NAME) {
operationName = generateOperationName(method);
=======
if (operationName.length() == 0) {
operationName = MethodUtil.generateOperationName(method);
>>>>>>>
if (opera... |
<<<<<<<
=======
import com.secuso.privacyFriendlyCodeScanner.GeneralFragments.ScanFragment;
>>>>>>>
import com.secuso.privacyFriendlyCodeScanner.GeneralFragments.ScanFragment; |
<<<<<<<
private MetaDataFactory metaDataFactory;
=======
private CacheKeyFactory cacheKeyFactory;
>>>>>>>
private CacheKeyFactory cacheKeyFactory;
private MetaDataFactory metaDataFactory;
<<<<<<<
if (metaDataFactory == null) {
metaDataFactory = newMetaDataFactory();
}
=======
i... |
<<<<<<<
import org.junit.After;
=======
import org.junit.After;
import org.junit.AfterClass;
>>>>>>>
import org.junit.After;
import org.junit.AfterClass;
<<<<<<<
@After
public void tearDown() throws Exception {
victim.destroy();
Context.unset();
}
=======
@After
public void tearDown() {
... |
<<<<<<<
hash = hashBuilder.getHash(new ByteArrayInputStream(content.getBytes()));
=======
LOG.debug("Content to fingerprint: [" + StringUtils.abbreviate(content, 40) + "]");
hash = fingerprintCreator.create(new ByteArrayInputStream(content.getBytes()));
>>>>>>>
LOG.debug("Content to fingerpri... |
<<<<<<<
private long getResourceWatcherUpdatePeriod() {
return context.getConfig().getResourceWatcherUpdatePeriod();
}
/**
* @return {@link TimeUnit} used to run resourceWatcher.
* @VisibleForTesting
*/
TimeUnit getTimeUnitForResourceWatcher() {
return TimeUnit.SECONDS;
}
=======
>>... |
<<<<<<<
*
* @parameter default-value="${project.build.directory}
=======
*
* @parameter default-value="${project.build.directory}"
>>>>>>>
*
* @parameter default-value="${project.build.directory}"
<<<<<<<
* This parameter is not meant to be used. The only purpose is to hold the final build na... |
<<<<<<<
final String fileName = resource == null ? "wro4j-processed-file.js" : resource.getUri();
final JSSourceFile input = JSSourceFile.fromInputStream(fileName, new ByteArrayInputStream(content.getBytes()));
=======
final JSSourceFile input = JSSourceFile.fromInputStream("",
new ByteArr... |
<<<<<<<
final List<Group> groupAsList = new ArrayList<Group>();
//TODO update the context
getCallbackRegistry().onBeforeModelCreated();
=======
>>>>>>>
//TODO update the context
getCallbackRegistry().onBeforeModelCreated();
<<<<<<<
public final void onModelPeriodChanged() {
LOG... |
<<<<<<<
import ro.isdc.wro.config.metadata.MetaDataFactory;
=======
import ro.isdc.wro.manager.ResourceBundleProcessor;
>>>>>>>
import ro.isdc.wro.config.metadata.MetaDataFactory;
import ro.isdc.wro.manager.ResourceBundleProcessor;
<<<<<<<
assertNotNull(sample.namingStrategy);
assertNotNull(sample.preProces... |
<<<<<<<
import org.apache.commons.lang3.ArrayUtils;
=======
import javax.servlet.http.HttpServletRequest;
import ro.isdc.wro.cache.CacheKey;
import ro.isdc.wro.cache.factory.CacheKeyFactory;
import ro.isdc.wro.cache.factory.CacheKeyFactoryDecorator;
>>>>>>>
import org.apache.commons.lang3.ArrayUtils;
import javax... |
<<<<<<<
private ExecutorService consumerService;
=======
private ExecutorService completionExecutor;
>>>>>>>
private ExecutorService completionExecutor;
<<<<<<<
public ExecutorService getExecutor() {
=======
private ExecutorService getExecutor() {
>>>>>>>
private ExecutorService getExecutor() {... |
<<<<<<<
import com.fasterxml.jackson.databind.JsonNode;
import org.entando.entando.aps.system.exception.RestRourceNotFoundException;
=======
import org.entando.entando.aps.system.exception.ResourceNotFoundException;
>>>>>>>
import org.entando.entando.aps.system.exception.ResourceNotFoundException;
import com.fasterx... |
<<<<<<<
import com.quorum.tessera.recovery.workflow.BatchResendManager;
=======
import com.quorum.tessera.p2p.resend.ResendRequest;
>>>>>>>
import com.quorum.tessera.recovery.workflow.BatchResendManager;
import com.quorum.tessera.p2p.resend.ResendRequest; |
<<<<<<<
@Override
public String workdir() {
return properties.getProperty("workdir");
}
@Override
public String socket() {
return properties.getProperty("socket");
}
=======
@Override
public String databaseURL() {
return properties.getProperty("databaseURL");... |
<<<<<<<
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package org.entando.entando.aps.system.services.page;
import java.util.List;
import org.entando.entando.aps.system.services.p... |
<<<<<<<
package com.agiletec.aps;
import junit.framework.JUnit4TestAdapter;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.entando.entando.aps.system.services.dataobjectmodel.DataObjectModelServiceTest;
import org.entando.entando.aps.system.services.group.Gro... |
<<<<<<<
private final boolean isJsonOutput;
=======
private final boolean showTopics;
>>>>>>>
private final boolean isJsonOutput;
private final boolean showTopics;
<<<<<<<
isJsonOutput = subscribe.isJsonOutput();
=======
showTopics = subscribe.showTopics();
>>>>>>>
isJsonO... |
<<<<<<<
final boolean printToSTDOUT = subscribe.isPrintToSTDOUT();
client.toAsync()
.subscribe(subscribeMessage, publish -> {
byte[] payload = publish.getPayloadAsBytes();
final String payloadMessage = applyBase64EncodingIfSet(subscribe.isBase64(), payload);
... |
<<<<<<<
private final boolean isJsonOutput;
=======
private final boolean showTopics;
>>>>>>>
private final boolean isJsonOutput;
private final boolean showTopics;
<<<<<<<
isJsonOutput = subscribe.isJsonOutput();
=======
showTopics = subscribe.showTopics();
>>>>>>>
isJsonO... |
<<<<<<<
@CommandLine.Option(names = {"-J", "--jsonOutput"}, defaultValue = "false", description = "Print the received publishes in pretty Json format", order = 1)
private boolean jsonOutput;
=======
@CommandLine.Option(names = {"-T", "--showTopics"}, defaultValue = "false", description = "Prepend the spe... |
<<<<<<<
import net.minecraft.entity.EntityType;
=======
import net.minecraft.server.world.ChunkHolder;
>>>>>>>
import net.minecraft.entity.EntityType;
import net.minecraft.server.world.ChunkHolder;
<<<<<<<
import quickcarpet.utils.SpawnEntityCache;
=======
import quickcarpet.utils.IWorld;
import quickcarpet.utils... |
<<<<<<<
public void initialiseNestedObjectsWithNullValueDoesNothing() {
final Throwable throwable = catchThrowable(() -> OverrideUtil.initialiseNestedObjects(null));
assertThat(throwable).isNull();
}
@Test
=======
public void initialiseNestedObjectsWithNullValueDoesNothing() {
... |
<<<<<<<
@Test
public void testNull() {
Expression e = null;
e = new Expression("null");
assertEquals(null, e.eval());
}
@Test
public void testCalculationWithNull() {
String err = "";
try {
new Expression("null+1").eval();
} catch (ArithmeticException e) {
err = e.getMessage();
}
assertEqua... |
<<<<<<<
=======
import io.mycat.Response;
import io.vertx.core.impl.future.PromiseInternal;
>>>>>>>
import io.mycat.Response;
import io.vertx.core.impl.future.PromiseInternal; |
<<<<<<<
//
// /**
// * 参数:接收的sql
// */
// COMMANDS.put(EXECUTE_PLAN, new Command() {
// @Override
// public Runnable apply(MycatClient client, Context context, MycatSession session) {
// return () -> {
// block(session, mycat -> {
// ... |
<<<<<<<
import com.alibaba.fastsql.sql.ast.statement.SQLUpdateStatement;
import io.mycat.*;
=======
import com.alibaba.fastsql.sql.dialect.mysql.ast.statement.MySqlDeleteStatement;
import com.alibaba.fastsql.sql.dialect.mysql.ast.statement.MySqlInsertStatement;
import com.alibaba.fastsql.sql.dialect.mysql.ast.stateme... |
<<<<<<<
import java.util.Map;
=======
import java.util.Locale;
>>>>>>>
import java.util.Map;
import java.util.Locale;
<<<<<<<
=======
private short mConnectionSecurity;
private String mUsername; /* Stores the username for authentications */
private String mAlias; /* Stores the alias for the user's mai... |
<<<<<<<
public static final MessageFormat DEFAULT_MESSAGE_FORMAT = MessageFormat.HTML;
public static final QuoteStyle DEFAULT_QUOTE_STYLE = QuoteStyle.PREFIX;
public static final String DEFAULT_QUOTE_PREFIX = ">";
public static final boolean DEFAULT_REPLY_AFTER_QUOTE = false;
public static final St... |
<<<<<<<
import com.actionbarsherlock.app.SherlockDialogFragment;
import com.fsck.k9.K9;
=======
>>>>>>>
import com.fsck.k9.K9; |
<<<<<<<
=======
import android.text.Editable;
import android.text.TextUtils.TruncateAt;
import android.text.TextWatcher;
>>>>>>>
import android.text.TextUtils.TruncateAt; |
<<<<<<<
private ActivityListener mListener = new ActivityListener() {
@Override
public void informUserOfStatus() {
mHandler.refreshTitle();
}
=======
private ActivityListener mListener = new ActivityListener() {
>>>>>>>
private ActivityListe... |
<<<<<<<
private MessageReference mActiveMessage;
/**
* {@code true} after {@link #onCreate(Bundle)} was executed. Used in {@link #updateTitle()} to
* make sure we don't access member variables before initialization is complete.
*/
private boolean mInitialized = false;
=======
private ... |
<<<<<<<
public void loadContactPicture(Address address, QuickContactBadge badge) {
String email = address.getAddress();
=======
public void loadContactPicture(Address address, QuickContactBadge badge) {
String email = address.getAddress();
>>>>>>>
public void loadContactPicture(Address address, Qui... |
<<<<<<<
// This will be called either automatically for you on 2.0
// or later, or by the code above on earlier versions of the
// platform.
if (mEncryptCheckbox.isChecked()) {
showDialog(DIALOG_REFUSE_TO_SAVE_DRAFT_MARKED_ENCRYPTED);
}
else if (mDraftNeedsSav... |
<<<<<<<
MessageListFragment fragment = MessageListFragment.newInstance(mSearch, false, true);
addMessageListFragment(fragment);
=======
MessageListFragment fragment = MessageListFragment.newInstance(searchAccount, searchFolder,
queryString, true);
mMenu.findItem(R.id.s... |
<<<<<<<
import com.quorum.tessera.config.*;
import com.quorum.tessera.io.FilesDelegate;
import org.junit.Before;
=======
import com.quorum.tessera.config.KeyData;
import com.quorum.tessera.config.KeyDataConfig;
import com.quorum.tessera.config.PrivateKeyData;
import com.quorum.tessera.config.keypairs.ConfigKeyPair;
i... |
<<<<<<<
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.Serializable;
import java.nio.charset.Charset;
=======
import java.io.UnsupportedEncodingException;
>>>>>>>
import java.nio.charset.Charset;
<<<<<<<
import java.util.Locale;
import java.util.concurrent.Concu... |
<<<<<<<
=======
//TODO check all CLI options have assertions here
>>>>>>>
//TODO check all CLI options have assertions here
<<<<<<<
=======
public void resolveUnixFilePathInitialValueOnly() {
Path relativePath = Paths.get("somepath.ipc");
Optional<Path> result = LegacyCliAdapt... |
<<<<<<<
@Override
public void goBack() {
FragmentManager fragmentManager = getSupportFragmentManager();
if (fragmentManager.getBackStackEntryCount() > 0) {
fragmentManager.popBackStack();
} else if (mMessageListFragment.isManualSearch()) {
onBackPressed();
... |
<<<<<<<
// set a random selection of values that are not sufficient to make a complete key pair of any type
final UnsupportedKeyPair keyPair =
new UnsupportedKeyPair(
keyDataConfig,
"priv",
null,
... |
<<<<<<<
import com.moandjiezana.toml.Toml;
import com.quorum.tessera.config.ArgonOptions;
import com.quorum.tessera.config.KeyDataConfig;
import com.quorum.tessera.config.SslAuthenticationMode;
=======
import com.moandjiezana.toml.Toml;
import com.quorum.tessera.config.*;
>>>>>>>
import com.moandjiezana.toml.Toml;
i... |
<<<<<<<
=======
import password.pwm.PwmApplication;
>>>>>>>
import password.pwm.PwmApplication;
<<<<<<<
=======
import java.util.ArrayList;
import java.util.Collections;
>>>>>>>
import java.util.ArrayList;
import java.util.Collections;
<<<<<<<
private boolean enableExport;
private int exportMaxDepth;
=... |
<<<<<<<
REMOTE_WEB_SERVICE(RemoteWebServiceValue.factory()),
=======
CUSTOMLINKS(CustomLinkValue.factory()),
>>>>>>>
CUSTOMLINKS(CustomLinkValue.factory()),
REMOTE_WEB_SERVICE(RemoteWebServiceValue.factory()), |
<<<<<<<
try {
while (true) {
Map<K, ValueHolder<V>> chainContents = resolver.resolveAll(chainIterator.next(), timeSource.getTimeMillis());
if (!chainContents.isEmpty()) {
return chainContents.entrySet().stream().map(entry -> {
K key = e... |
<<<<<<<
import static java.lang.Math.max;
import static org.ehcache.config.Eviction.noAdvice;
import static org.ehcache.core.spi.service.ServiceUtils.findSingletonAmongst;
import static org.terracotta.offheapstore.util.MemoryUnit.BYTES;
=======
import static java.lang.Long.max;
import static java.util.Arrays.asList;
... |
<<<<<<<
ClusterTierManagerClientEntityFactory factory = new ClusterTierManagerClientEntityFactory(CONNECTION);
assertFalse(factory.abandonLeadership("testAbandonLeadershipWhenNotOwning", true));
=======
ClusterTierManagerClientEntityFactory factory = new ClusterTierManagerClientEntityFactory(CONNECTION, R... |
<<<<<<<
import org.ehcache.core.spi.service.DiskResourceService;
import org.ehcache.core.spi.store.StoreAccessException;
=======
>>>>>>>
import org.ehcache.core.spi.service.DiskResourceService;
<<<<<<<
import static java.util.Collections.singleton;
import static org.ehcache.core.internal.service.ServiceLocator.depe... |
<<<<<<<
import org.ehcache.core.store.StoreConfigurationImpl;
import org.ehcache.spi.resilience.StoreAccessException;
import org.ehcache.core.statistics.LowerCachingTierOperationsOutcome;
import org.ehcache.CachePersistenceException;
import org.ehcache.expiry.ExpiryPolicy;
import org.ehcache.impl.config.store.disk.OffH... |
<<<<<<<
Class<?> persistedKeyType = classLoader.loadClass(properties.getProperty(KEY_TYPE_PROPERTY_NAME));
if (!keyType.equals(persistedKeyType)) {
throw new IllegalArgumentException("Persisted key type '" + persistedKeyType.getName() + "' is not the same as the configured key type '" + keyType.getN... |
<<<<<<<
offHeapStore = createAndInitStore(timeSource, new Expiry<String, String>() {
@Override
public Duration getExpiryForCreation(String key, String value) {
return Duration.INFINITE;
}
@Override
public Duration getExpiryForAccess(String key, ValueSupplier<? extends String> ... |
<<<<<<<
import org.ehcache.config.Builder;
=======
import java.io.Closeable;
>>>>>>>
import java.io.Closeable;
import org.ehcache.config.Builder;
<<<<<<<
/**
* Retrieves the {@link Cache} associated with the given alias, if one is known.
*
* @param alias the alias under which to look the {@link Cache} up... |
<<<<<<<
protected PutStatus silentPut(final K key, final V value) throws StoreAccessException {
=======
private void silentPut(final K key, final V value) throws StoreAccessException {
>>>>>>>
protected void silentPut(final K key, final V value) throws StoreAccessException {
<<<<<<<
protected boolean silent... |
<<<<<<<
import org.junit.ClassRule;
=======
import org.junit.Ignore;
>>>>>>>
import org.junit.ClassRule;
import org.junit.Ignore;
<<<<<<<
import static org.ehcache.clustered.client.config.builders.TimeoutsBuilder.timeouts;
import static org.ehcache.testing.StandardTimeouts.eventually;
import static org.hamcrest.Mat... |
<<<<<<<
// Hack to keep the name of the column in order to be able to access it later
return sqlKeyword + "(" + field + ") AS " + field;
=======
return aggregatorKeyword + "(" + field + ")";
>>>>>>>
// Hack to keep the name of the column in order to be able to access it later
return aggregatorKey... |
<<<<<<<
import com.rapleaf.jack.QueryOrderConstraint;
import com.rapleaf.jack.LimitCriterion;
=======
import com.rapleaf.jack.OrderCriterion;
>>>>>>>
import com.rapleaf.jack.OrderCriterion;
import com.rapleaf.jack.LimitCriterion; |
<<<<<<<
import java.util.Map;
=======
import java.util.Collection;
>>>>>>>
import java.util.Map;
import java.util.Collection;
<<<<<<<
import com.google.common.collect.ImmutableMap;
=======
>>>>>>>
import com.google.common.collect.ImmutableMap;
<<<<<<<
@FunctionalInterface
private interface ItemGetter {
... |
<<<<<<<
protected void executeQuery(Collection<T> foundSet, PreparedStatement stmt) throws IOException {
int retryCount = 0;
=======
protected void executeQuery(Set<T> foundSet, PreparedStatement stmt) throws SQLException {
>>>>>>>
protected void executeQuery(Collection<T> foundSet, PreparedStatement stmt... |
<<<<<<<
import org.springframework.data.web.PageableHandlerMethodArgumentResolver;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.web.WebAppConfiguration;
import org.springframework.test.util.Reflect... |
<<<<<<<
authenticationManagerBuilder.userDetailsService(userDetailsService).passwordEncoder(passwordEncoder());
if(remoteUserAuthenticationProvider.isPresent()) {
authenticationManagerBuilder.authenticationProvider(remoteUserAuthenticationProvider.get());
}
=======
... |
<<<<<<<
exercise.setAllowOnlineEditor(DEFAULT_ALLOW_ONLINE_EDITOR);
=======
return exercise;
}
@Before
public void initTest() {
exercise = createEntity(em);
>>>>>>>
exercise.setAllowOnlineEditor(DEFAULT_ALLOW_ONLINE_EDITOR);
return exercise;
}
@Before
... |
<<<<<<<
=======
import com.quorum.tessera.config.keypairs.FilesystemKeyPair;
import com.quorum.tessera.key.generation.KeyGenerator;
>>>>>>>
import com.quorum.tessera.config.keypairs.FilesystemKeyPair;
import com.quorum.tessera.key.generation.KeyGenerator; |
<<<<<<<
import org.springframework.beans.factory.annotation.Value;
=======
import org.springframework.cache.CacheManager;
>>>>>>>
import org.springframework.beans.factory.annotation.Value;
import org.springframework.cache.CacheManager;
<<<<<<<
public UserService(UserRepository userRepository, PersistentTokenRep... |
<<<<<<<
import org.apache.commons.lang.exception.ExceptionUtils;
=======
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
>>>>>>>
import org.apache.commons.lang.exception.ExceptionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
<<<<<<<
//errorDTO = new ErrorDTO(ErrorConstants.ERR... |
<<<<<<<
=======
import com.github.nexus.api.Nexus;
import com.github.nexus.configuration.ConfigurationParser;
import com.github.nexus.configuration.PropertyLoader;
>>>>>>>
import com.github.nexus.api.Nexus;
import com.github.nexus.configuration.ConfigurationParser;
import com.github.nexus.configuration.PropertyLoad... |
<<<<<<<
import de.tum.in.www1.exerciseapp.domain.enumeration.ParticipationState;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
=======
import org.springframework.stereotype.Repository;
impor... |
<<<<<<<
=======
import com.asf.appcoins.sdk.iab.wallet.AndroidUtils;
import io.reactivex.Completable;
>>>>>>>
import io.reactivex.Completable;
<<<<<<<
=======
import io.reactivex.Single;
import io.reactivex.disposables.Disposable;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
... |
<<<<<<<
import com.asf.appcoins.sdk.iab.payment.PaymentStatus;
=======
import io.reactivex.Completable;
>>>>>>>
import com.asf.appcoins.sdk.iab.payment.PaymentStatus;
import io.reactivex.Completable;
<<<<<<<
PaymentDetails currentPayment = paymentService.getCurrentPayment();
String txHash = currentPayment
... |
<<<<<<<
this.addMorph(morphs, world, "minecraft:rabbit", "Toast", "{CustomName:\"Toast\"}");
=======
this.addMorph(morphs, world, "Rabbit", "Toast", "{CustomName:\"Toast\"}");
/* Blocks */
this.addBlockMorph(morphs, world, "{Block:\"minecraft:stone\"}");
this.addBlockMorph(mor... |
<<<<<<<
EntityMorph morphEntity = new EntityMorph(player.world, player.getUniqueID(), morph);
=======
SpawnGhostEvent spawnGhostEvent = new SpawnGhostEvent.Pre(player, morph);
if (MinecraftForge.EVENT_BUS.post(spawnGhostEvent) || spawnGhostEvent.morph == null)
{
... |
<<<<<<<
EntityMorph morph = name.equals("VillagerGolem") ? new IronGolemMorph() : new EntityMorph();
EntityLivingBase entity = (EntityLivingBase) EntityList.createEntityByIDFromName(new ResourceLocation(name), world);
=======
EntityMorph morph = this.morphFromName(name);
... |
<<<<<<<
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.DamageSource;
=======
>>>>>>>
<<<<<<<
}
private void updateAir(EntityLivingBase target)
{
if (target instanceof EntityPlayer)
{
IMorphing morphing = Morphing.get((EntityPlayer)target);
... |
<<<<<<<
import mchorse.metamorph.client.gui.builder.GuiMorphBuilder;
import mchorse.metamorph.client.gui.elements.GuiHud;
=======
>>>>>>>
import mchorse.metamorph.client.gui.elements.GuiHud; |
<<<<<<<
category.height = MathHelper.ceil((float) category.cells.size() / (float) this.perRow);
category.y = this.scrollHeight + 10;
=======
category.height = MathHelper.ceiling_float_int((float) category.cells.size() / (float) this.perRow);
category.y = this.scroll.scr... |
<<<<<<<
/**
* Default constructor
*
* This method is responsible for constructing the morphs for rendering and
* also selecting the morph that player uses right now.
*/
public GuiCreativeMenu()
{
EntityPlayer player = Minecraft.getMinecraft().player;
IMorphing morp... |
<<<<<<<
public class Player implements Serializable {
/**
* For serialization
*/
private static final long serialVersionUID = 559137800510426092L;
/**
* An integer that identifies the player
*/
int ID = 0;
/**
* The amount of resources owned by the player
*/
=======
public class Play... |
<<<<<<<
public class PhysicalGameState implements Serializable {
/**
*
*/
private static final long serialVersionUID = -4561827960954391384L;
/**
* Indicates a free tile
*/
public static final int TERRAIN_NONE = 0;
/**
* Indicates a blocked tile
*/
=======
public class PhysicalGameState {
... |
<<<<<<<
private boolean botUser;
private String buildServerUrl;
=======
private String authTokenCredentialId;
>>>>>>>
private String authTokenCredentialId;
private boolean botUser;
<<<<<<<
public boolean getBotUser() {
return botUser;
}
public String getBuildServerUrl() {
... |
<<<<<<<
slackSendStep.setBotUser(false);
=======
slackSendStep.setTokenCredentialId("tokenCredentialId");
>>>>>>>
slackSendStep.setTokenCredentialId("tokenCredentialId");
slackSendStep.setBotUser(false);
<<<<<<<
when(stepExecution.getSlackService(anyString(), anyString(), an... |
<<<<<<<
private boolean botUser;
=======
private String tokenCredentialId;
>>>>>>>
private String tokenCredentialId;
private boolean botUser;
<<<<<<<
public boolean getBotUser() {
return botUser;
}
@DataBoundSetter
public void setBotUser(boolean botUser) {
this.botUs... |
<<<<<<<
public SlackNotifierStub(String teamDomain, String authToken, boolean botUser, String room, String buildServerUrl,
=======
public SlackNotifierStub(String teamDomain, String authToken, String authTokenCredentialId, String room,
>>>>>>>
public SlackNotifierStub(String teamDomain, String authToken,... |
<<<<<<<
assertEquals(false, notifier.getBotUser());
assertEquals("http://localhost:8080/", notifier.getBuildServerUrl());
=======
>>>>>>>
assertEquals(false, notifier.getBotUser());
<<<<<<<
assertEquals(false, notifier.getBotUser());
assertEquals("http://localhost:8080/", not... |
<<<<<<<
import hudson.ProxyConfiguration;
import jenkins.model.Jenkins;
=======
import hudson.security.ACL;
>>>>>>>
import hudson.security.ACL;
<<<<<<<
=======
import org.jenkinsci.plugins.plaincredentials.StringCredentials;
import com.cloudbees.plugins.credentials.CredentialsMatcher;
import com.cloudbees.plu... |
<<<<<<<
=======
@NotNull
@Pattern(regexp = "[a-zA-Z0-9.\\-_/\\\\]+")
>>>>>>> |
<<<<<<<
@SpringBootTest(classes = BootElastiCacheAwsTest.BootElastiCacheAwsTestConfig.class)
class BootElastiCacheAwsTest extends ElastiCacheAwsTest {
=======
@SpringBootTest(classes = BootElastiCacheAwsTest.BootElastiCacheAwsTestConfig.class,
properties = {
"cloud.aws.credentials.access-key=${aws-integration-t... |
<<<<<<<
@SpringBootTest(classes = BootNotificationMessagingTemplateIntegrationTest.NotificationMessagingTemplateIntegrationTestConfiguration.class)
class BootNotificationMessagingTemplateIntegrationTest
=======
@SpringBootTest(
classes = BootNotificationMessagingTemplateIntegrationTest.NotificationMessagingTemplate... |
<<<<<<<
"cloud.aws.loader.queueCapacity=0" })
class BootResourceLoaderAwsTest extends ResourceLoaderAwsTest {
=======
"cloud.aws.loader.queueCapacity=0",
"cloud.aws.credentials.access-key=${aws-integration-tests.accessKey}",
"cloud.aws.credentials.secret-key=${aws-integration-tests.secretKey}" })
publ... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.