conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
try {
SubMonitor subMonitor = SubMonitor.convert(monitor,
Messages.bind(Messages.importRewrite_processDescription), 2);
if (!hasRecordedChanges()) {
this.createdImports= CharOperation.NO_STRINGS;
this.createdStaticImports= CharOperation.NO_STRINGS;
return new MultiTextEdit();
}
... |
<<<<<<<
/*
/**********************************************************************
/* Immutable config, factories
/**********************************************************************
*/
=======
private final static long DEFAULT_MAPPER_FEATURES = MapperFeature.collectLongDefaults();
>>>>>>... |
<<<<<<<
static int[] RestrictedIdentifierSealedRule;
static int[] RestrictedIdentifierPermitsRule;
=======
static int SwitchLabelCaseLhsRule = 0;
>>>>>>>
static int SwitchLabelCaseLhsRule = 0;
static int[] RestrictedIdentifierSealedRule;
static int[] RestrictedIdentifierPermitsRule;
<<<<<<<
static Goal Restr... |
<<<<<<<
@Override
=======
public TypeBinding patchType(TypeBinding newType) {
// Perform upwards projection on type wrt mentioned type variables
TypeBinding[] mentionedTypeVariables= findCapturedTypeVariables(newType);
if (mentionedTypeVariables != null && mentionedTypeVariables.length > 0) {
newType = new... |
<<<<<<<
expectedProblemAttributes.put("VarIsNotAllowedHere", new ProblemAttributes(CategorizedProblem.CAT_SYNTAX));
expectedProblemAttributes.put("VarIsReserved", new ProblemAttributes(CategorizedProblem.CAT_SYNTAX));
expectedProblemAttributes.put("VarIsReservedInFuture", new ProblemAttributes(CategorizedProblem.... |
<<<<<<<
// TODO(sxenos): the old code always passed null as the third argument to setupExternalAnnotationProvider,
// but this looks like a bug. I've preserved it for now but we need to figure out what was supposed to go
// there.
if (root.getKind() == IPackageFragmentRoot.K_BINARY) {
JavaProject javaProject = (J... |
<<<<<<<
* Copyright (c) 2006, 2017 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
=======
* Copyright (c) 2006, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
... |
<<<<<<<
if (this.isJimage) return false; // TODO: Revisit
return this.zipFile.getEntry(qualifiedTypeName+'.'+ExternalAnnotationProvider.ANNOTION_FILE_EXTENSION) != null;
=======
return this.zipFile.getEntry(qualifiedTypeName+ExternalAnnotationProvider.ANNOTATION_FILE_SUFFIX) != null;
>>>>>>>
if (this.isJimage)... |
<<<<<<<
import java.io.IOException;
import com.fasterxml.jackson.core.*;
import com.fasterxml.jackson.core.type.WritableTypeId;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.SerializerProvider;
=======
>>>>>>>
<<<<<... |
<<<<<<<
=======
import com.fasterxml.jackson.databind.util.ArrayBuilders;
import com.fasterxml.jackson.databind.util.ClassUtil;
>>>>>>>
import com.fasterxml.jackson.databind.util.ClassUtil;
<<<<<<<
ctxt.reportBadDefinition(_beanType, String.format(
"In... |
<<<<<<<
=======
import java.util.Arrays;
import java.util.List;
import org.eclipse.jdt.core.IClasspathAttribute;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IJavaProject;
>>>>>>>
import org.eclipse.jdt.core.IJavaElement;
<<<<<<<
=======
impor... |
<<<<<<<
* Copyright (c) 2006, 2017 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
=======
* Copyright (c) 2006, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
... |
<<<<<<<
* Copyright (c) 2000, 2017 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
=======
* Copyright (c) 2000, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
... |
<<<<<<<
public void test528818a() throws CoreException, IOException {
if (!AbstractJavaModelTests.isJRE9) {
return;
}
try {
IJavaProject project = createJava9Project("P");
waitForAutoBuild();
IType type = project.findType("java.lang.annotation.Target");
assertNotNull("Type should not be null", type);
Str... |
<<<<<<<
this.env = env;
=======
if (externalAnnotationPath != null)
this.externalAnnotationPath = externalAnnotationPath.toOSString();
>>>>>>>
this.env = env;
if (externalAnnotationPath != null)
this.externalAnnotationPath = externalAnnotationPath.toOSString();
<<<<<<<
reader.moduleName = this.module == n... |
<<<<<<<
return new ResourceCompilationUnit(file, null) {
=======
return new ResourceCompilationUnit(file) {
@Override
>>>>>>>
return new ResourceCompilationUnit(file, null) {
@Override |
<<<<<<<
@Override
=======
/*
* @see ASTVisitor#visit(ModuleModifier)
* @since 3.14
*/
>>>>>>>
@Override
/*
* @see ASTVisitor#visit(ModuleModifier)
* @since 3.14
*/ |
<<<<<<<
@Override
=======
public boolean visit(
LocalDeclaration localDeclaration, BlockScope scope) {
if (localDeclaration.type instanceof SingleTypeReference && ((SingleTypeReference)localDeclaration.type).token == assistIdentifier)
throw new SelectionNodeFound(localDeclaration.binding.type);... |
<<<<<<<
* Copyright (c) 2000, 2017 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
=======
* Copyright (c) 2000, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
... |
<<<<<<<
import java.util.HashMap;
=======
import java.util.Arrays;
>>>>>>>
import java.util.HashMap;
import java.util.Arrays;
<<<<<<<
char[] sourceArray;
private IRegion[] formatRegions;
=======
private char[] sourceArray;
private List<IRegion> formatRegions;
>>>>>>>
char[] sourceArray;
private List<IRegio... |
<<<<<<<
=======
final boolean findImplicit;
>>>>>>>
final boolean findImplicit;
<<<<<<<
CreatorCollectionState ccState)
throws JsonMappingException
=======
CreatorCollectionState ccState, boolean findImplicit)
throws JsonMappingException
>>>>>... |
<<<<<<<
updateNestInfo();
=======
FieldDeclaration[] fieldsDecls = this.fields;
if (fieldsDecls != null) {
for (FieldDeclaration fieldDeclaration : fieldsDecls)
fieldDeclaration.resolveJavadoc(this.initializerScope);
}
AbstractMethodDeclaration[] methodDecls = this.methods;
if (methodDecls != null)... |
<<<<<<<
if (packageBinding == null) { // have not looked for it before
if ((packageBinding = findPackage(name, mod)) != null) {
return packageBinding;
}
if (referenceBinding != null && referenceBinding != LookupEnvironment.TheNotFoundType) {
return referenceBinding; // found cached missing type - check if... |
<<<<<<<
import org.junit.Assert;
=======
import org.junit.AfterClass;
import org.junit.BeforeClass;
>>>>>>>
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass; |
<<<<<<<
import io.joynr.messaging.mqtt.settings.LimitAndBackpressureSettings;
=======
import io.joynr.messaging.mqtt.statusmetrics.MqttStatusReceiver;
>>>>>>>
import io.joynr.messaging.mqtt.settings.LimitAndBackpressureSettings;
import io.joynr.messaging.mqtt.statusmetrics.MqttStatusReceiver; |
<<<<<<<
String replyToMqttAddress = message.getReplyTo();
=======
String replyToMqttAddress = message.getHeaderValue(JoynrMessage.HEADER_NAME_REPLY_CHANNELID);
// because the message is received via global transport, isGloballyVisible must be true
final boolean isGlobal... |
<<<<<<<
Mockito.doAnswer(new Answer<Object>() { //TODO simulate resolve here ! subscription reply bastern ... handle subscriptionreply ausführen..
@Override
public Object answer(InvocationOnMock invocation) {
Object[] args = invocation.getArguments()... |
<<<<<<<
import static com.google.inject.util.Modules.override;
=======
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
>>>>>>>
import static com.google.inject.util.Modules.override;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
<<<<<<<
... |
<<<<<<<
private final MqttClientFactory mqttClientFactory;
private final MqttAddress ownAddress;
private final ConcurrentMap<String, AtomicInteger> multicastSubscriptionCount;
private final MqttTopicPrefixProvider mqttTopicPrefixProvider;
private final RawMessagingPreprocessor rawMessagingPreprocess... |
<<<<<<<
import java.util.LinkedHashSet;
=======
import java.util.Set;
>>>>>>>
import java.util.LinkedHashSet;
import java.util.Set;
<<<<<<<
import io.joynr.statusmetrics.MessageWorkerStatus;
import io.joynr.statusmetrics.StatusReceiver;
=======
import io.joynr.runtime.ShutdownNotifier;
>>>>>>>
import io.joynr.st... |
<<<<<<<
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.eq;
=======
import static org.junit.Assert.fail;
>>>>>>>
import static org.junit.Assert.fail;
import static o... |
<<<<<<<
CreatorCandidate.construct(config, ctor, creatorParams.get(ctor)));
=======
CreatorCandidate.construct(intr, ctor, creatorParams.get(ctor)),
ctxt.getConfig().getConstructorDetector());
>>>>>>>
CreatorCandidate.con... |
<<<<<<<
private final ShutdownNotifier shutdownNotifier;
=======
private final StatelessAsyncCallbackDirectory statelessAsyncCallbackDirectory;
>>>>>>>
private final ShutdownNotifier shutdownNotifier;
private final StatelessAsyncCallbackDirectory statelessAsyncCallbackDirectory;
<<<<<<<
... |
<<<<<<<
import joynr.types.DiscoveryEntryWithMetaInfo;
=======
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.runners.MockitoJUnitRunner;
>>>>>>>
import joynr.types.DiscoveryEntryWithMetaInfo;
import org.junit.B... |
<<<<<<<
// test that assertThat runs at least once
verify(messagingStubMock, Mockito.atLeast(10)).transmit(eq(immutableMessage),
any(SuccessAction.class),
any(FailureAction.cla... |
<<<<<<<
=======
@Override
public void onLeavesDecay(LeavesDecayEvent event) {
if (event.isCancelled()) {
return;
}
if (!plugin.getGlobalRegionManager().allows(DefaultFlag.LEAF_DECAY, event.getBlock().getLocation())) {
event.setCancelled(true);
}
}
... |
<<<<<<<
if (points.size() < 3) {
logger.warning(String.format("Invalid polygonal region '%s': region only has %d point(s). Ignoring.", id, points.size()));
continue;
}
=======
closeResource(poly2dVectorResultSet);
>>>>>>>
... |
<<<<<<<
USE, PLACE_VEHICLE, GREET_MESSAGE, FAREWELL_MESSAGE, NOTIFY_ENTER,
NOTIFY_LEAVE, DENY_SPAWN, HEAL_DELAY, HEAL_AMOUNT, TELE_LOC,
TELE_PERM, SPAWN_LOC, SPAWN_PERM, BUYABLE, PRICE, SNOW_FALL,
=======
USE, PLACE_VEHICLE, GREET_MESSAGE, FAREWELL_MESSAGE, NOTIFY_GREET,
NOTIFY... |
<<<<<<<
/**
* No matter how formatter tries to add linewrapping there is none in the formatted result.
*
* @see PPFormatter#assignmentExpressionConfiguration(FormattingConfig c)
*/
public void test_Format_AssignmentExpression() throws Exception {
String code = "$a = 1\n$b = 2\n";
XtextResource r = getRes... |
<<<<<<<
public ReadableMap headers;
=======
public float progressDivider;
>>>>>>>
public ReadableMap headers;
public float progressDivider; |
<<<<<<<
* Get a {@link FullJid} constructed from a {@link BareJid} and a {@link Resourcepart}.
*
* @param bareJid a entity bare JID.
* @param resource a resourcepart.
* @return a full JID.
*/
public static FullJid fullFrom(BareJid bareJid, Resourcepart resource) {
if (bareJid.isEntityBareJid()) {
Enti... |
<<<<<<<
=======
import org.jclouds.vcloud.director.v1_5.domain.UsersList;
import org.jclouds.vcloud.director.v1_5.domain.Vdcs;
import org.jclouds.vcloud.director.v1_5.features.admin.GroupClient;
>>>>>>>
import org.jclouds.vcloud.director.v1_5.features.admin.AdminOrgClient;
<<<<<<<
assertEquals(client.getAdmin... |
<<<<<<<
import java.io.File;
import java.io.IOException;
=======
>>>>>>>
import java.io.IOException; |
<<<<<<<
=======
import java.util.*;
import java.util.concurrent.atomic.AtomicReference;
>>>>>>>
import java.util.*;
import java.util.concurrent.atomic.AtomicReference; |
<<<<<<<
final FilePath cache = Cache.fromURL(source, credentials).repositoryCache(inst, node, launcher, listener, true);
=======
FilePath cache = Cache.fromURL(source, credentials, inst.getMasterCacheRoot()).repositoryCache(inst, node, launcher, listener, true);
>>>>>>>
final FilePath cache =... |
<<<<<<<
public void onClick() {
openHTMLPage(config.webHomePage);
=======
public void onClick(boolean b) {
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(config.webHomePage)));
>>>>>>>
public void onCl... |
<<<<<<<
import org.apache.commons.lang.StringUtils;
=======
import com.google.code.morphia.query.CriteriaContainer;
import com.google.code.morphia.query.CriteriaContainerImpl;
>>>>>>>
import org.apache.commons.lang.StringUtils;
import com.google.code.morphia.query.CriteriaContainer;
import com.google.code.morphia.qu... |
<<<<<<<
ApiDefinitionExecResult selectMaxResultByResourceIdAndType(String resourceId, String type);
@Select({
"SELECT count(id) AS countNumber FROM api_definition_exec_result ",
"WHERE resource_id IN ( ",
"SELECT testCase.id FROM api_test_case testCase ",
"WHERE ... |
<<<<<<<
private HistoricalDataUpgradeService historicalDataUpgradeService;
=======
private APIReportService apiReportService;
@Resource
private PerformanceTestService performanceTestService;
@Resource
private CheckPermissionService checkPermissionService;
>>>>>>>
private APIReportService ... |
<<<<<<<
private String runMode;
private List<String> planCaseIds;
=======
private String reportUserID;
>>>>>>>
private String runMode;
private List<String> planCaseIds;
private String reportUserID; |
<<<<<<<
@Resource
private ScheduleService scheduleService;
=======
@Resource
private TestCaseMapper testCaseMapper;
>>>>>>>
@Resource
private ScheduleService scheduleService;
@Resource
private TestCaseMapper testCaseMapper; |
<<<<<<<
=======
@PostMapping(value = "/genPerformanceTestJmx")
public JmxInfoDTO genPerformanceTestJmx(@RequestBody RunScenarioRequest runRequest) {
runRequest.setExecuteType(ExecuteType.Completed.name());
return apiAutomationService.genPerformanceTestJmx(runRequest);
}
>>>>>>>
@Po... |
<<<<<<<
public void relevanceByApi(ApiCaseRelevanceRequest request) {
if (CollectionUtils.isEmpty(request.getSelectIds())) {
return;
}
ApiTestCaseExample example = new ApiTestCaseExample();
example.createCriteria().andApiDefinitionIdIn(request.getSelectIds());
Li... |
<<<<<<<
import java.util.List;
import java.util.Objects;
import java.util.UUID;
=======
import java.util.*;
>>>>>>>
import java.util.List;
import java.util.Objects;
import java.util.UUID;
import java.util.*;
<<<<<<<
public void deleteByResourceId(String resourceId) {
ApiDefinitionExecResultExample exam... |
<<<<<<<
import io.metersphere.api.dto.scenario.request.HttpRequest;
=======
import io.metersphere.api.dto.scenario.Request;
import io.metersphere.api.dto.scenario.Scenario;
>>>>>>>
import io.metersphere.api.dto.scenario.Scenario;
import io.metersphere.api.dto.scenario.request.HttpRequest;
<<<<<<<
protected void... |
<<<<<<<
import net.aufdemrand.denizen.flags.FlagManager;
import net.aufdemrand.denizen.npc.dNPC;
=======
>>>>>>>
import net.aufdemrand.denizen.flags.FlagManager;
<<<<<<<
=======
import net.aufdemrand.denizen.flags.FlagManager;
import net.aufdemrand.denizen.flags.FlagManager.Flag;
>>>>>>>
<<<<<<<
import org.buk... |
<<<<<<<
package com.werb.pickphotosample;
import android.content.Context;
import android.graphics.BitmapFactory;
import android.net.Uri;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import an... |
<<<<<<<
assertTrue(MAPPER.isEnabled(JsonParser.Feature.AUTO_CLOSE_SOURCE));
assertFalse(MAPPER.isEnabled(JsonParser.Feature.ALLOW_COMMENTS));
=======
public void testParserFeatures()
{
// and also for mapper
ObjectMapper mapper = new ObjectMapper();
ass... |
<<<<<<<
import com.graphaware.nlp.ml.similarity.CosineSimilarity;
import com.graphaware.nlp.ml.similarity.Similarity;
import java.util.Arrays;
=======
>>>>>>>
import com.graphaware.nlp.ml.similarity.CosineSimilarity;
import com.graphaware.nlp.ml.similarity.Similarity;
import java.util.Arrays;
<<<<<<<
public flo... |
<<<<<<<
public void testDoubleAsArray() throws Exception
{
ObjectMapper mapper = jsonMapperBuilder()
.disable(DeserializationFeature.UNWRAP_SINGLE_VALUE_ARRAYS)
.build();
final double value = 0.016;
try {
mapper.readValue("{\"v\":[" + value + "... |
<<<<<<<
=======
case PULL_REQUEST_COMMENT:
return user.isSiteManager();
>>>>>>>
<<<<<<<
case COMMENT_THREAD:
case REVIEW_COMMENT:
return resource.getAuthorId().equals(user.id);
=======
case PULL_REQUEST:
case PULL_REQUEST_COMMENT:
return ... |
<<<<<<<
=======
Attachment attachment = null;
List<Attachment> list = Attachment.findByContainer(Resource.USER_AVATAR, currentUser().id);
if(!list.isEmpty()) {
attachment = list.get(0);
user.avatarPath = attachment.id;
}
>>>>>>>
<<<<<<<
=======
Lis... |
<<<<<<<
private static Finder<Long, Milestone> find = new Finder<Long, Milestone>(
Long.class, Milestone.class);
=======
public static Finder<Long, Milestone> find = new Finder<Long, Milestone>(
Long.class, Milestone.class);
>>>>>>>
private static Finder<Long, Milestone> find = new Fi... |
<<<<<<<
/**
* 프로젝트 목록을 가져온다.
*
* when : 프로젝트명, 프로젝트 관리자, 공개여부로 프로젝트 목록 조회시
*
* 프로젝트명 / 관리자 아이디 / Overview 중 {@code query}를 포함하고
* 공개여부가 @{code state} 인 프로젝트 목록을 최근생성일로 정렬하여 페이징 형태로 가져온다.
*
* @param query 검색질의(프로젝트명 / 관리자 아이디 / Overview)
* @param pageNum 페이지번호
* @ret... |
<<<<<<<
Ebean.save(all.get("Articles"));
=======
Ebean.save(all.get("issues"));
>>>>>>>
Ebean.save(all.get("Articles"));
Ebean.save(all.get("issues")); |
<<<<<<<
private Action<Void> getDefaultAction(final Http.Request request) {
=======
@SuppressWarnings("rawtypes")
private Action getDefaultAction(final Http.Request request) {
final long start = System.currentTimeMillis();
>>>>>>>
@SuppressWarnings("rawtypes")
private Action<Void> getDefa... |
<<<<<<<
import com.avaje.ebean.Ebean;
=======
import models.enumeration.Resource;
>>>>>>>
import com.avaje.ebean.Ebean;
import models.enumeration.Resource;
<<<<<<<
*
* @param userId
=======
*
* @param ownerId
>>>>>>>
*
* @param userId
<<<<<<<
public static class SortByNameWithIgnoreCase implem... |
<<<<<<<
final SwipeUpModel swipeUp = currentStory.getSwipeUp();
if (swipeUp != null) {
binding.swipeUp.setVisibility(View.VISIBLE);
binding.swipeUp.setText(swipeUp.getText());
binding.swipeUp.setTag(swipeUp.getUrl());
=======
swipeUp = currentStory.getSw... |
<<<<<<<
viewModel = new ViewModelProvider(this).get(PostViewV2ViewModel.class);
=======
fragmentActivity = (MainActivity) getActivity();
mediaService = MediaService.getInstance();
final Bundle arguments = getArguments();
if (arguments == null) return;
final Serializable... |
<<<<<<<
import awais.instagrabber.interfaces.FetchListener;
=======
>>>>>>> |
<<<<<<<
=======
import java.io.DataOutputStream;
import java.io.File;
import java.io.FileNotFoundException;
>>>>>>>
import java.io.DataOutputStream;
import java.io.File;
import java.io.FileNotFoundException;
<<<<<<<
final DialogInterface.OnClickListener onDialogListener = (dialogInterface, which) -> {
... |
<<<<<<<
protected boolean verifyDrawable(Drawable who) {
if (mForegroundDelegate != null) {
=======
protected boolean verifyDrawable(@NonNull Drawable who) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
>>>>>>>
protected boolean verifyDrawable(@NonNull Drawable who) {
if (... |
<<<<<<<
import android.support.v7.widget.LinearLayoutCompat;
=======
import android.support.annotation.NonNull;
>>>>>>>
import android.support.v7.widget.LinearLayoutCompat;
import android.support.annotation.NonNull;
<<<<<<<
protected boolean verifyDrawable(Drawable who) {
if (mForegroundDelegate != null... |
<<<<<<<
_addConstructorCreators(ctxt, beanDesc, vchecker, intr, creators, creatorDefs);
=======
// 25-Jan-2017, tatu: As per [databind#1501], [databind#1502], [databind#1503], best
// for now to skip attempts at using anything but no-args constructor (see
// `In... |
<<<<<<<
=======
import com.fasterxml.jackson.annotation.JsonIncludeProperties;
>>>>>>>
import com.fasterxml.jackson.annotation.JsonIncludeProperties;
<<<<<<<
/**********************************************************************
=======
/**********************************************************
... |
<<<<<<<
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
=======
import cpw.mods.fml.common.event.FMLServerStartingEvent;
>>>>>>>
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.event.FMLServerStartingEvent;
<<<<<<<
proxy.registerClient();//must be loaded after configs
=... |
<<<<<<<
/**
* Vehicle Module Entity Registrations
*/
=======
public static final String NPC_FACTION_BANDIT_BARD = "bandit.bard";
public static final String NPC_FACTION_DESERT_BARD = "desert.bard";
public static final String NPC_FACTION_NATIVE_BARD = "native.bard";
public static final String NPC_FACTION_PIRATE_BARD ... |
<<<<<<<
public class TileEngineeringStation extends TileEntity implements IRotatableTile {
ForgeDirection facing = ForgeDirection.NORTH;
public InventoryCrafting layoutMatrix;
public InventoryCraftResult result;
public InventoryBasic bookInventory = new InventoryBasic(1) {
public void markDirt... |
<<<<<<<
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent;
import cpw.mods.fml.common.gameevent.TickEvent.RenderTickEvent;
=======
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.TickEvent;
import cpw.mod... |
<<<<<<<
=======
private String zoneOffset(String raw) {
// Add colon or not -- difference between 2.10 and earlier, 2.11 and later
return raw.substring(0, 2) + ":" + raw.substring(2); // 2.11 and later
// return raw; // 2.10 and earlier
}
>>>>>>> |
<<<<<<<
=======
import cpw.mods.fml.common.registry.EntityRegistry;
>>>>>>>
import cpw.mods.fml.common.registry.EntityRegistry; |
<<<<<<<
if (properties != null && !properties.isEmpty()) {
for (Property property : properties) {
JMethod method = jc.method(NONE, getGetterMethodReturnType(property),
Constants.STRING_GET + property.getFieldGetterName());
addJavadocToMethod(me... |
<<<<<<<
=======
import org.apache.http.impl.conn.SystemDefaultDnsResolver;
>>>>>>>
import org.apache.http.impl.conn.SystemDefaultDnsResolver; |
<<<<<<<
import de.is24.infrastructure.gridfs.http.security.PGPSigner;
=======
import de.is24.infrastructure.gridfs.http.security.HostNamePatternFilter;
>>>>>>>
import de.is24.infrastructure.gridfs.http.security.HostNamePatternFilter;
import de.is24.infrastructure.gridfs.http.security.PGPSigner;
<<<<<<<
public PGP... |
<<<<<<<
hostAndRows.getValue(), batchColumnRangeSelection, timestamp),
"Atlas getRowsColumnRange " + hostAndRows.getValue().size() + " rows from " + tableRef + " on " + hostAndRows.getKey(),
=======
hostAndRows.getValue(), columnRangeSelectio... |
<<<<<<<
import org.joda.time.Duration;
=======
import java.io.IOException;
import java.net.InetSocketAddress;
import org.junit.AfterClass;
>>>>>>>
import java.net.InetSocketAddress;
import org.joda.time.Duration;
<<<<<<<
public static void waitUntilCassandraIsUp() {
CassandraTestTools.waitTillServiceI... |
<<<<<<<
keyValueService = CassandraKeyValueService.create(
CassandraKeyValueServiceConfigManager.createSimpleManager(CassandraTestSuite.CASSANDRA_KVS_CONFIG), CassandraTestSuite.LEADER_CONFIG);
=======
keyValueService = getKeyValueService();
}
@Override
protected KeyValueS... |
<<<<<<<
public abstract Optional<Integer> timestampsGetterBatchSize();
=======
@Value.Default
public boolean scyllaDb() {
return false;
}
>>>>>>>
@Value.Default
public boolean scyllaDb() {
return false;
}
public abstract Optional<Integer> timestampsGetterBatchSize()... |
<<<<<<<
import java.util.Objects;
=======
import java.util.Optional;
>>>>>>>
import java.util.Objects;
import java.util.Optional;
<<<<<<<
public Map<byte[], RowColumnRangeIterator> getRowsColumnRange(TableReference tableRef, Iterable<byte[]> rows, BatchColumnRangeSelection columnRangeSelection, long timestamp) ... |
<<<<<<<
import com.palantir.atlasdb.qos.config.QosServiceInstallConfig;
import com.palantir.atlasdb.qos.config.QosServiceRuntimeConfig;
=======
import com.palantir.atlasdb.qos.ratelimit.OneReturningClientLimitMultiplier;
>>>>>>>
import com.palantir.atlasdb.qos.config.QosServiceInstallConfig;
import com.palantir.atla... |
<<<<<<<
import com.palantir.atlasdb.keyvalue.impl.TableMappingNotFoundException;
=======
import com.palantir.atlasdb.keyvalue.dbkvs.impl.TableSizeCache;
>>>>>>>
import com.palantir.atlasdb.keyvalue.dbkvs.impl.TableSizeCache;
import com.palantir.atlasdb.keyvalue.impl.TableMappingNotFoundException; |
<<<<<<<
KeyValueService kvs = getKeyValueService(atlasFactory, lockAndTimestampServices);
=======
KeyValueService kvs = NamespacedKeyValueServices.wrapWithStaticNamespaceMappingKvs(rawKvs);
kvs = ProfilingKeyValueService.create(kvs);
kvs = TracingKeyValueService.create(kvs);
kv... |
<<<<<<<
public void setupEditor(GUIEditorGrid editor, MapUIController controller) {
super.setupEditor(editor, controller);
addColorEditor(editor);
}
@Override
public TextureTreeNode getNode(TextureMap map) {
return getTreeNode(map);
}
@Override
public void makeTextu... |
<<<<<<<
import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.LoggerContext;
import com.google.common.collect.Maps;
import com.mongodb.MongoClientURI;
=======
>>>>>>>
<<<<<<<
=======
import com.google.common.collect.Maps;
import com.mongodb.MongoClientURI;
import ch.qos.logback.classic.Level;
impor... |
<<<<<<<
=======
private static final Logger LOGGER = LoggerFactory.getLogger(PutDocumentHandler.class);
private final DocumentDAO documentDAO;
>>>>>>>
private final DocumentDAO documentDAO; |
<<<<<<<
=======
public static String getReferenceLink(
RequestContext context,
String parentUrl,
BsonValue docId) {
if (context == null || parentUrl == null) {
LOGGER.error("error creating URI, null arguments: "
+ "context = {}, parentUrl... |
<<<<<<<
=======
// scanResult is null if the plugins directory is empty
if (this.scanResult == null) {
return ret;
}
>>>>>>>
// scanResult is null if the plugins directory is empty
if (this.scanResult == null) {
return ret;
} |
<<<<<<<
import com.softinstigate.restheart.utils.FileUtils;
=======
import com.softinstigate.restheart.utils.HttpStatus;
>>>>>>>
import com.softinstigate.restheart.utils.FileUtils;
import com.softinstigate.restheart.utils.HttpStatus;
<<<<<<<
private URL url;
=======
private String url;
>>>>>>>
priv... |
<<<<<<<
public static final BasicDBObject PROPS_QUERY = new BasicDBObject("_id", "_properties");
=======
>>>>>>>
public static final BasicDBObject PROPS_QUERY = new BasicDBObject("_id", "_properties");
<<<<<<<
final CollectionDAO collectionDAO = new CollectionDAO();
DBCollection propsColl = ... |
<<<<<<<
long stringBlockId = nextStringBlockId();
=======
String string = (String) value;
if ( ShortString.encode( string, record ) )
{
record.setType( PropertyType.SHORT_STRING );
return;
}
int stringBlockId = ne... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.