conflict_resolution
stringlengths
27
16k
<<<<<<< ======= import io.micrometer.core.instrument.Counter; >>>>>>> import io.micrometer.core.instrument.Counter; <<<<<<< import org.junit.jupiter.api.extension.ExtendWith; import ru.lanwen.wiremock.ext.WiremockResolver; ======= import reactor.ipc.netty.NettyContext; import reactor.ipc.netty.http.server.HttpSer...
<<<<<<< import static io.micrometer.core.instrument.util.StringEscapeUtils.escapeJson; import static java.util.Objects.requireNonNull; ======= import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.toList; >>>>>>> import static io.micrometer.core.instrument.util.StringEscapeUtil...
<<<<<<< import java.util.function.Function; ======= import okhttp3.Cache; >>>>>>> import java.util.function.Function; import okhttp3.Cache; <<<<<<< @Test void requestTagsWithClass(@WiremockResolver.Wiremock WireMockServer server) throws IOException { Request request = new Request.Builder() ...
<<<<<<< // fetch metrics registry.get("kafka.consumer.records.lag.max").tags(tags).gauge(); // consumer coordinator metrics registry.get("kafka.consumer.assigned.partitions").tags(tags).gauge(); ======= // consumer group metrics registry.get("kafka.cons...
<<<<<<< private Stream<String> writeFunctionCounter(FunctionCounter counter) { return Stream.of(event(counter.getId(), new Attribute("throughput", counter.count()))); ======= // VisibleForTesting Stream<String> writeCounter(FunctionCounter counter) { double count = counter.count(); ...
<<<<<<< * Copyright 2019 Pivotal Software, Inc. ======= * Copyright 2018 VMware, Inc. >>>>>>> * Copyright 2019 VMware, Inc.
<<<<<<< private final Iterable<BiFunction<Request, Response, Tag>> contextSpecificTags; private final boolean includeHostTag; ======= private final Iterable<Tag> unknownRequestTags; >>>>>>> private final Iterable<BiFunction<Request, Response, Tag>> contextSpecificTags; private final Iterable<Tag...
<<<<<<< import java.util.Map; import java.util.concurrent.ConcurrentHashMap; ======= import java.util.Arrays; import java.util.Collection; import java.util.concurrent.CopyOnWriteArrayList; >>>>>>> import java.util.Arrays; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; <<<<<<< Timer tim...
<<<<<<< * Copyright 2019 Pivotal Software, Inc. ======= * Copyright 2017 VMware, Inc. >>>>>>> * Copyright 2019 VMware, Inc.
<<<<<<< this.tags = HashTreePMap.empty(); this.conventionTags = id.getTagsAsIterable().iterator().hasNext() ? id.getConventionTags(this.namingConvention).stream() .map(t -> sanitize(t.getKey()) + ":" + sanitize(t.getValue())) ...
<<<<<<< private final ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor(); @Nullable ======= private final ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor(new DaemonThreadFactory()); >>>>>>> private final ScheduledExecutorService schedule...
<<<<<<< return majorVersion == null || majorVersion < 7 ? TEMPLATE_BODY_BEFORE_VERSION_7 : TEMPLATE_BODY_AFTER_VERSION_7; ======= return majorVersion < 7 ? TEMPLATE_BODY_BEFORE_VERSION_7.apply(config.index()) : TEMPLATE_BODY_AFTER_VERSION_7.apply(config.index()); >>>>>>> return majorVersion ...
<<<<<<< import io.micrometer.core.lang.Nullable; ======= import io.micrometer.core.util.internal.logging.InternalLogger; import io.micrometer.core.util.internal.logging.InternalLoggerFactory; >>>>>>> import io.micrometer.core.lang.Nullable; import io.micrometer.core.util.internal.logging.InternalLogger; import io.mi...
<<<<<<< @Issue("#987") @Test void indexNameSupportsIndexNameWithoutDateSuffix() { ElasticMeterRegistry registry = new ElasticMeterRegistry(new ElasticConfig() { @Override public String get(String key) { return null; } @Override ...
<<<<<<< bucket -> Tags.concat(id.getTagsAsIterable(), "le", DoubleFormat.decimalOrWhole(bucket.bucket(timer.baseTimeUnit())))); ======= // We look for Long.MAX_VALUE to ensure a sensible tag on our +Inf bucket bucket -> Tags.concat(id.getTags(), "le", bucket.bucket() !=...
<<<<<<< * Copyright 2019 Pivotal Software, Inc. ======= * Copyright 2017 VMware, Inc. >>>>>>> * Copyright 2019 VMware, Inc.
<<<<<<< import java.net.MalformedURLException; import java.net.URLEncoder; ======= import java.io.BufferedReader; import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; import java.net.*; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Base64;...
<<<<<<< @Test void clear() { registry.counter("my.counter"); registry.counter("my.counter2"); assertThat(registry.find("my.counter").counter()).isNotNull(); assertThat(registry.find("my.counter2").counter()).isNotNull(); registry.clear(); assertThat(registry.f...
<<<<<<< import io.micrometer.core.instrument.util.Assert; import io.micrometer.core.lang.Nullable; ======= import io.micrometer.core.annotation.Timed; >>>>>>> import io.micrometer.core.annotation.Timed; import io.micrometer.core.lang.Nullable; <<<<<<< Assert.notNull(f, "callable"); long id = star...
<<<<<<< * Copyright 2019 Pivotal Software, Inc. ======= * Copyright 2017 VMware, Inc. >>>>>>> * Copyright 2019 VMware, Inc.
<<<<<<< MeterRegistry registry = new StatsdMeterRegistry(config, clock); DistributionSummary summary = DistributionSummary.builder("my.summary").serviceLevelObjectives(1.0, 2).register(registry); ======= registry = new StatsdMeterRegistry(config, clock); DistributionSummary summary = D...
<<<<<<< private final Sinks.Many<String> sink; private volatile boolean shutdown; ======= private final FluxSink<String> sink; private volatile boolean shutdown = false; >>>>>>> private final FluxSink<String> sink; private volatile boolean shutdown;
<<<<<<< private Stream<WavefrontMetricLineData> writeMeter(Meter meter) { ======= // VisibleForTesting Stream<String> writeMeter(Meter meter) { >>>>>>> // VisibleForTesting Stream<WavefrontMetricLineData> writeMeter(Meter meter) {
<<<<<<< import java.util.concurrent.CountDownLatch; ======= import java.util.HashSet; import java.util.List; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; >>>>>>> import java.util.HashSet; import...
<<<<<<< import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; ======= import org.pcollections.HashTreePMap; import org.pcollections.PMap; >>>>>>> import java.util.concurrent.ConcurrentHashMap; import java.util.concu...
<<<<<<< MeterRegistryConfigurer(ObjectProvider<List<MeterRegistryCustomizer<?>>> customizers, ObjectProvider<List<MeterFilter>> filters, ObjectProvider<List<MeterBinder>> binders, boolean addToGlobalRegistry) { this.customizers = customizers; t...
<<<<<<< import com.amcolabs.quizapp.serverutils.ServerCalls; import com.squareup.picasso.Callback; ======= >>>>>>> import com.amcolabs.quizapp.serverutils.ServerCalls; import com.squareup.picasso.Callback; <<<<<<< LOST_QUIZ_MESAGE("You Lost"), GLOBAL_RANKINGS("Global Rankings"), LOCAL_RANKINGS("Local Rankings")...
<<<<<<< for(Crate crate : cc.getCrates()) { if(crate.getCrateType() != CrateType.MENU) { if(e.getView().getTitle().equals(crate.getPreviewName()) || e.getView().getTitle().equals(crate.getCrateInventoryName())) { e.setCancelled(true); ItemStack item = e.getCurrentItem(); if(item != null) {...
<<<<<<< HashMap<String,ItemDataBean> dataMap = iddao.findAllActiveMap(sb.getId(), ecb.getId()); ======= >>>>>>> <<<<<<< ======= HashMap<String,ItemDataBean> dataMap = (HashMap<String, ItemDataBean>) getAllActive(data); >>>>>>> HashMap<Stri...
<<<<<<< public ArrayList<RuleSetBean> findAllByStudyEventDefWhereItemIsNull(StudyEventDefinitionBean sed){ String query = "from " + getDomainClassName() + " ruleSet where ruleSet.studyEventDefinitionId = :studyEventDefId and ruleSet.itemId is null"; org.hibernate.Query q = getCurrentSession().createQ...
<<<<<<< sqlParameters.add(new SqlParameter(responseLabel)); sqlParameters.add(new SqlParameter(resOptions.replaceAll("\\\\,", "\\,"))); sqlParameters.add(new SqlParameter(resValues.replace("\\\\", "\\"))); sqlParameters...
<<<<<<< import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.springframework.core.io.support.ResourcePatternResolver; ======= >>>>>>> import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.springframework.core.io.support.ResourcePatternResol...
<<<<<<< SecurityManager sm = (SecurityManager) SpringServletAccess.getApplicationContext(context).getBean("securityManager"); String password = sm.genPassword(); String passwordHash = sm.encrytPassword(password, getUserDetails()); ======= SecurityManager sm = ((Security...
<<<<<<< @JsonProperty public Value targetValue; // Denotation (e.g., answer) @JsonProperty public int NBestInd = -1; // Position on the NBEST list @JsonProperty public String timeStamp; @JsonProperty public String definition; ======= public List<Formula> alternativeFormulas; // Alternative logical form...
<<<<<<< String propValue = (String) pros.get(propName); ======= String propValue = (String)pros.get(propName); >>>>>>> String propValue = (String) pros.get(propName); <<<<<<< // replacePaths(vals); vals = replaceWebapp(vals); ======= >>>>>>> ...
<<<<<<< private Filter<ReceiptRow> mFilter; private TripRow(File directory, String price, Date startDate, Date endDate, WBCurrency currency, float miles, SourceEnum source) { ======= private TripRow(File directory, Date startDate, Date endDate, WBCurrency currency, float miles, SourceEnum source) { >>>>>>> pr...
<<<<<<< } /** * 不压缩图片 * to change sd card pc to bmp type * @param pictureurl * @return * @throws IOException */ public static Bitmap GetLocalOrNetBitmapNoZip(String url) throws IOException { String sdcard=Environment.getExternalStorageDirectory().getPath(); BitmapFactory.Options options...
<<<<<<< ======= import com.thin.downloadmanager.DefaultRetryPolicy; >>>>>>> import com.thin.downloadmanager.DefaultRetryPolicy;
<<<<<<< ======= import javax.servlet.http.Part; >>>>>>> import javax.servlet.http.Part; <<<<<<< import org.slf4j.Logger; import org.slf4j.LoggerFactory; ======= import org.apache.commons.io.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; >>>>>>> import org.apache.commons.io.IOUtils; import...
<<<<<<< when(Factory.getConnection(API_KEY, false)).thenReturn(mockConnection); when(Factory.getChannelManager(mockConnection, mockPusherOptions)).thenReturn(mockChannelManager); ======= when(Factory.getConnection(API_KEY)).thenReturn(mockConnection); when(Factory.getChannelManager(mockConnection)).thenReturn(moc...
<<<<<<< import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; ======= import org.springframework.security.core.context.SecurityContextHolder; >>>>>>> import org.springframework.security.core.GrantedAuthority; import org.springframework.s...
<<<<<<< private boolean[] anchoredTokens; // Tokens which anchored rules are defined on public boolean allAnchored = true; ======= private int[] numAnchors; // Number of times each token was anchored >>>>>>> private boolean[] anchoredTokens; // Tokens which anchored rules are defined on public bool...
<<<<<<< static final String MASTER_CLIENT_ID = "master_client_id"; static final String CLONE_CERTIFICATE = "clone_certificate"; ======= public static final String ASSERTION = "assertion"; >>>>>>> public static final String ASSERTION = "assertion"; static final String MASTER_CLIENT_ID = "master_client_id"; stat...
<<<<<<< allUploadersInitalized &= initializeMongoUploader(preferences); ======= initializeMongoUploader(context, preferences); >>>>>>> allUploadersInitalized &= initializeMongoUploader(context, preferences); <<<<<<< allUploadersInitalized &= initializeRest...
<<<<<<< import android.preference.*; ======= import android.preference.Preference; import android.preference.PreferenceFragment; import android.preference.PreferenceManager; import android.support.v4.app.FragmentActivity; >>>>>>> import android.preference.Preference; import android.preference.PreferenceFragment; imp...
<<<<<<< import com.microsoft.reef.client.*; ======= import com.microsoft.reef.client.CompletedJob; import com.microsoft.reef.client.FailedJob; import com.microsoft.reef.client.JobMessage; import com.microsoft.reef.client.RunningJob; import com.microsoft.reef.client.parameters.JobCompletedHandler; import com.microsoft...
<<<<<<< String strDate = new Date().toString(); System.out.println("java side date " + strDate); long handle0 = NativeInterop.CallClrSystemOnStartHandler(new Date().toString()); ======= InteropReturnInfo interopReturnInfo = new InteropReturnInfo (); Inter...
<<<<<<< ======= import android.support.v4.app.FragmentActivity; >>>>>>> import android.support.v4.app.FragmentActivity; <<<<<<< String jsonConfig = null; NightscoutPreferences prefs; ======= private SettingsActivity.MainPreferenceFragment mainPreferenceFragment; >>>>>>> String jsonConfig = null...
<<<<<<< import com.microsoft.reef.driver.task.TaskConfigurationOptions; ======= import com.microsoft.reef.driver.activity.ActivityConfiguration; import com.microsoft.reef.driver.activity.ActivityConfigurationOptions; >>>>>>> <<<<<<< .bindNamedParameter(TaskConfigurationOptions.Identifier.class, SELF) =====...
<<<<<<< import java.io.IOException; import java.util.*; ======= import java.util.List; >>>>>>> import java.io.IOException; import java.util.List; <<<<<<< * Handle a context status update * * @param contextStatusProto indicating the current status of the context */ private synchronized void onContextSt...
<<<<<<< import com.microsoft.reef.javabridge.*; import com.microsoft.reef.util.logging.CLRBufferedLogHandler; ======= import com.microsoft.reef.webserver.AvroHttpRequest; import com.microsoft.reef.webserver.AvroHttpSerializer; >>>>>>> import com.microsoft.reef.javabridge.*; import com.microsoft.reef.util.logging.CLR...
<<<<<<< import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3i; import net.minecraft.util.registry.Registry; ======= >>>>>>> import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3i; import net.minecraft.util.registry.Registry; <<<<<<< public static void registerCarpetBehav...
<<<<<<< private GlucoseUnits units; private String pwdName; ======= public static final String DEFAULT_MONGO_COLLECTION = "entries"; public static final String DEFAULT_MONGO_DEVICE_STATUS_COLLECTION = "devicestatus"; private boolean understand; >>>>>>> private GlucoseUnits units; private ...
<<<<<<< private final Set<TestDescriptor> children = new LinkedHashSet<>(); ======= private TestSource source; private final Set<AbstractTestDescriptor> children = new LinkedHashSet<>(); >>>>>>> private TestSource source; private final Set<TestDescriptor> children = new LinkedHashSet<>();
<<<<<<< @Classes({ SucceedingTestCase.class }) @UniqueIds({ "junit5:com.example.SampleTestCase#assertAllTest()", "junit5:com.example.SampleTestCase#assertAllFailingTest()", "junit5:com.example.SampleTestCase@AnInnerTestContext" }) ======= @Classes({ SampleTestCase.class, SucceedingTestCase.class, JUnit4TestCase...
<<<<<<< ======= import lombok.Data; import lombok.EqualsAndHashCode; import org.junit.gen5.api.Name; import org.junit.gen5.api.Test; import org.junit.gen5.commons.util.AnnotationUtils; >>>>>>> import org.junit.gen5.api.Name; import org.junit.gen5.api.Test; import org.junit.gen5.commons.util.AnnotationUtils; <<<<<<...
<<<<<<< import static org.junit.gen5.commons.util.ReflectionUtils.loadClass; ======= import java.lang.reflect.AnnotatedElement; >>>>>>> import static org.junit.gen5.commons.util.ReflectionUtils.loadClass; <<<<<<< private String createParameterIdPart(Method testMethod) { String parameterString = Arrays.stream(t...
<<<<<<< import static com.salesmanager.core.business.constants.Constants.DEFAULT_STORE; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; ======= >>>>>>> import static com.salesmanager.core.business.constants.Constants.DEFAULT_STORE; import io.swagger.annotations.Api...
<<<<<<< import android.content.Context; ======= >>>>>>> import android.content.Context; <<<<<<< import com.google.common.collect.Lists; import com.nightscout.android.R; ======= >>>>>>> import com.google.common.collect.Lists; import com.nightscout.android.R; <<<<<<< /** * Enable mongo upload in shared p...
<<<<<<< import org.json.JSONException; import org.json.JSONObject; ======= >>>>>>> import org.json.JSONException; import org.json.JSONObject; <<<<<<< ======= @Test public void isSpecialValue() throws Exception { byte[] record = new byte[]{ (byte) 0xC4, (byte) 0x88, (byte) 0x1A, (byte) 0x0B, (byt...
<<<<<<< import javax.validation.constraints.Email; import javax.validation.constraints.NotEmpty; ======= import org.hibernate.validator.constraints.Email; import org.hibernate.validator.constraints.NotEmpty; import com.fasterxml.jackson.annotation.JsonIgnore; >>>>>>> import javax.validation.constraints.Email; impo...
<<<<<<< import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; ======= import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; >>>>>>> import io.swagger.annotation...
<<<<<<< private final UserService userService; ======= private static final Logger LOGGER = LoggerFactory.getLogger(GratificationService.class); @Autowired private UserService userService; >>>>>>> private static final Logger LOGGER = LoggerFactory.getLogger(GratificationService.class); priv...
<<<<<<< ======= @Autowired private WorldRepository worldRepository; >>>>>>> @Autowired private WorldRepository worldRepository; <<<<<<< public void updateStandardTask(StandardTask externalStandardTask) { StandardTask foundInternalStandardTask = standardTaskRepository.findByKey(extern...
<<<<<<< eventService.createEventForCreateQuest(questDto); ======= questDto.setCreatorName(user.getUsername()); >>>>>>> eventService.createEventForCreateQuest(questDto); questDto.setCreatorName(user.getUsername());
<<<<<<< topIcons = new TopIcons(); ======= mImageViewUSB = (ImageView) findViewById(R.id.imageViewUSB); mImageViewUpload = (ImageView) findViewById(R.id.imageViewUploadStatus); mImageViewUpload.setImageResource(R.drawable.ic_upload_fail); mImageViewUpload.setTag(R.drawable.ic_u...
<<<<<<< public static final String DEFAULT_MONGO_COLLECTION = "entries"; public static final String DEFAULT_MONGO_DEVICE_STATUS_COLLECTION = "devicestatus"; ======= private boolean understand; >>>>>>> public static final String DEFAULT_MONGO_COLLECTION = "entries"; public static final String DEFA...
<<<<<<< /* * Copyright 2012 Adam Murdoch * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by appl...
<<<<<<< import java.util.UUID; ======= import java.util.Date; >>>>>>> import java.util.Date; import java.util.UUID; <<<<<<< assertTrue(index.supports(of(UUID.class), Cmp.EQUAL)); assertTrue(index.supports(of(UUID.class), Cmp.NOT_EQUAL)); ======= assertTrue(index.supports(of(Date.clas...
<<<<<<< StandardScannerExecutor executor = new StandardScannerExecutor(job, kcvs, storeTx, manager.getFeatures(), numProcessingThreads, jobConfiguration); ======= StandardScannerExecutor executor = new StandardScannerExecutor(job, finishJob, kcvs, storeTx, ...
<<<<<<< import com.thinkaurelius.titan.diskstorage.keycolumnvalue.*; ======= import com.google.common.collect.ImmutableList; >>>>>>> import com.thinkaurelius.titan.diskstorage.keycolumnvalue.*; import com.google.common.collect.ImmutableList;
<<<<<<< import com.thinkaurelius.titan.graphdb.database.cache.SchemaCache; ======= import com.thinkaurelius.titan.graphdb.database.cache.TypeCache; >>>>>>> import com.thinkaurelius.titan.graphdb.database.cache.SchemaCache; <<<<<<< private boolean isOpen; private AtomicLong txCounter; private Set<Standa...
<<<<<<< new VertexToFaunusBinary().writeVertex(vertex, out); } public static void write(final Vertex vertex, final DataOutput out, final ElementIdHandler elementIdHandler) throws IOException { new VertexToFaunusBinary(elementIdHandler).writeVertex(vertex, out); ...
<<<<<<< private List<KeySlice> getKeySlice(Cassandra.Client client, ByteBuffer startKey, ByteBuffer endKey, SliceQuery columnSlice, int count) t...
<<<<<<< void setMongoUploadEnabled(boolean mongoUploadEnabled); void setRestApiEnabled(boolean restApiEnabled); ======= boolean getIUnderstand(); void setIUnderstand(boolean bool); // Unable to load values from res files for Robolectric tests public static final String DEFAULT_MONGO_COLLECTI...
<<<<<<< /* ================================================================================== HELPER METHODS ==================================================================================*/ private void initialize(String store) throws BackendException { ======= prote...
<<<<<<< CompositeIndexType cIndex = (CompositeIndexType)index; IndexRecords updateRecords = indexMatches(vertex,cIndex,updateType==IndexUpdate.Type.DELETE,p.getPropertyKey(),new RecordEntry(p.getLongId(),p.getValue())); ======= CompositeIndexType iIndex = (C...
<<<<<<< long relationIdDiff, vertexIdDiff = 0; if (titanType.isUnique(dir)) { assert data.getValuePosition() == in.getPosition(); if (rtype == RelationType.EDGE) ======= long relationIdDiff; Object other; int startKeyPos = in.getPosition(); int e...
<<<<<<< /** * Retrieves the time-to-live for the given {@link TitanSchemaType}. * If none has been explicitly defined, 0 (unlimited TTL) is returned. * * @param type * @return */ public int getTTL(TitanSchemaType type); /** * Sets the time-to-live for the given {@link Tit...
<<<<<<< import java.util.Collections; ======= import java.util.List; >>>>>>> import java.util.Collections; import java.util.List;
<<<<<<< import krasa.grepconsole.model.Operation; ======= import krasa.grepconsole.model.Operation; import org.jetbrains.annotations.NotNull; >>>>>>> import krasa.grepconsole.model.Operation; import org.jetbrains.annotations.NotNull; import krasa.grepconsole.model.Operation; <<<<<<< ======= import com.intell...
<<<<<<< ======= public interface SystemType extends InternalType { >>>>>>> public interface SystemType extends InternalType {
<<<<<<< ======= import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.dat...
<<<<<<< private boolean enableAnsiColoring; private boolean hideAnsiCommands; ======= >>>>>>> <<<<<<< private boolean synchronous; ======= private String maxProcessingTime = MAX_PROCESSING_TIME_DEFAULT; @Transient private transient Integer maxProcessingTimeAsInt; >>>>>>> private String maxProcessingTime =...
<<<<<<< import com.thinkaurelius.titan.graphdb.relations.factory.RelationLoader; import com.thinkaurelius.titan.graphdb.transaction.InternalTitanTransaction; import com.thinkaurelius.titan.graphdb.transaction.StandardPersistTitanTx; import com.thinkaurelius.titan.graphdb.transaction.TransactionConfig; ======= >>>>>>...
<<<<<<< private JCheckBox ansi; private JCheckBox hideAnsiCharacters; ======= >>>>>>> <<<<<<< private JCheckBox synchronous; ======= private JFormattedTextField maxProcessingTime; >>>>>>> private JFormattedTextField maxProcessingTime; private JCheckBox synchronous; <<<<<<< public void setData(Profile dat...
<<<<<<< import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.components.ApplicationComponent; import com.intellij.openapi.components.PersistentStateComponent; import com.intellij.openapi.components.State; import com.intellij.openapi.components.Storage; import com.intellij.openapi.opti...
<<<<<<< import java.util.UUID; ======= import java.util.Date; >>>>>>> import java.util.Date; import java.util.UUID; <<<<<<< assertTrue(index.supports(of(UUID.class), Cmp.EQUAL)); assertTrue(index.supports(of(UUID.class), Cmp.NOT_EQUAL)); ======= assertTrue(index.supports(of(Date.clas...
<<<<<<< @Override public Integer getTtl() { return null; } ======= @Override public Cardinality getCardinality() { return cardinality; } @Override public Iterable<IndexType> getKeyIndexes() { if (index==Index.NONE) return Collections.EMPTY_LIST; return ...
<<<<<<< import com.thinkaurelius.titan.diskstorage.util.StaticArrayEntry; ======= import com.thinkaurelius.titan.diskstorage.log.Message; import com.thinkaurelius.titan.diskstorage.log.ReadMarker; import com.thinkaurelius.titan.diskstorage.log.kcvs.KCVSLog; >>>>>>> import com.thinkaurelius.titan.diskstorage.util.Sta...
<<<<<<< import java.util.*; ======= import java.util.ArrayList; import java.util.List; import java.util.Map; >>>>>>> import java.util.*; import java.util.ArrayList; import java.util.List; import java.util.Map; <<<<<<< public XContentBuilder getContent(final List<IndexEntry> additions) throws StorageException { ...
<<<<<<< import com.thinkaurelius.titan.diskstorage.configuration.ModifiableConfiguration; import com.thinkaurelius.titan.diskstorage.inmemory.InMemoryStorageAdapter; ======= >>>>>>> import com.thinkaurelius.titan.diskstorage.configuration.ModifiableConfiguration; import com.thinkaurelius.titan.diskstorage.inmemory.I...
<<<<<<< // KeyColumnValueStoreManager storeManager=null; final KeyColumnValueStoreManager storeManager = Backend.getStorageManager(localBasicConfiguration); ======= final KeyColumnValueStoreManager storeManager = Backend.getStorageManager(localbc); >>>>>>> final KeyColumnValueStoreMana...
<<<<<<< * Set the image source from a bitmap, resource, asset, file or other URI, starting with a given orientation * setting, scale and center. This is the best method to use when you want scale and center to be restored * after screen orientation change; it avoids any redundant loading of tiles in the ...
<<<<<<< newMapping.setEntity(new StringEntity(objectMapper.writeValueAsString(readMapping("/strict_mapping.json")), Charset.forName("UTF-8"))); ======= newMapping.setEntity(new StringEntity(objectMapper.writeValueAsString(readMapping(version, "/strict_mapping.json")), StandardCharsets.UTF_8)); >>>>>>...
<<<<<<< import org.archicontribs.modelrepository.grafico.IGraficoConstants; import org.archicontribs.modelrepository.grafico.IRepositoryListener; import org.archicontribs.modelrepository.grafico.RepositoryListenerManager; ======= >>>>>>> import org.archicontribs.modelrepository.grafico.IRepositoryListener; import or...
<<<<<<< ======= import android.graphics.BitmapFactory; import android.graphics.Canvas; import android.graphics.Shader; >>>>>>> import android.graphics.BitmapFactory; import android.graphics.Canvas; import android.graphics.Shader; <<<<<<< } /* private void getGPSLocation() { Location location = null; ...
<<<<<<< TABLE_COLUMN_HIGHTLIGHTING = true; ======= QUOTING_ENFORCED = false; >>>>>>> QUOTING_ENFORCED = false; TABLE_COLUMN_HIGHTLIGHTING = true; <<<<<<< public boolean isTableColumnHighlightingEnabled() { return getState().TABLE_COLUMN_HIGHTLIGHTING; ...
<<<<<<< private JCheckBox cbTableColumnHighlighting; ======= private JCheckBox cbQuotingEnforced; >>>>>>> private JCheckBox cbQuotingEnforced; private JCheckBox cbTableColumnHighlighting; <<<<<<< !Objects.equals(cbEditorUsage.getSelectedIndex(), csvEditorSettingsExternalizable.getEdi...
<<<<<<< csvEditorSettingsExternalizable.setTableColumnHighlightingEnabled(false); ======= csvEditorSettingsExternalizable.setQuotingEnforced(true); >>>>>>> csvEditorSettingsExternalizable.setQuotingEnforced(true); csvEditorSettingsExternalizable.setTableColumnHighlightingEnabled(false...