conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
Accumulator.accumulate(
=======
accumulators.accumulate(
executor,
>>>>>>>
Accumulator.accumulate(
executor, |
<<<<<<<
import java.util.function.Function;
=======
import java.io.Serializable;
>>>>>>>
import java.io.Serializable;
import java.util.function.Function;
<<<<<<<
* @version 1.6 — <em>$Date: 2014-03-07 $</em>
=======
* @version 2.0 — <em>$Date: 2014-03-31 $</em>
>>>>>>>
* @version 2.0 — <e... |
<<<<<<<
* @version 2.0 — <em>$Date: 2014-04-16 $</em>
=======
* @version 2.0 — <em>$Date: 2014-07-10 $</em>
>>>>>>>
* @version 2.0 — <em>$Date: 2014-07-11 $</em>
<<<<<<<
/**
* <p>
* <img
* src="doc-files/uniform-pdf.gif"
* alt="f(x)=\left\{\begin{matrix}
* \frac{1}{m... |
<<<<<<<
/*
* Copyright (C) 2012-2019 52°North Initiative for Geospatial Open Source
=======
/**
* Copyright (C) 2012-2020 52°North Initiative for Geospatial Open Source
>>>>>>>
/*
* Copyright (C) 2012-2020 52°North Initiative for Geospatial Open Source |
<<<<<<<
/*
* Copyright (C) 2012-2019 52°North Initiative for Geospatial Open Source
=======
/**
* Copyright (C) 2012-2020 52°North Initiative for Geospatial Open Source
>>>>>>>
/*
* Copyright (C) 2012-2020 52°North Initiative for Geospatial Open Source |
<<<<<<<
import org.jenetics.util.Accumulator.MinMax;
import org.jenetics.util.IO;
import org.jenetics.util.LCG64ShiftRandom;
=======
>>>>>>>
<<<<<<<
=======
import org.jenetics.util.Scoped;
import org.jenetics.util.accumulators.MinMax;
>>>>>>>
import org.jenetics.util.Scoped;
import org.jenetics.util.accumulator... |
<<<<<<<
if (parameter == null) {
parameter = derivative.getParameter();
}
Transform transform = (Transform)
xo.getChild(Transform.class);
=======
Transform transform = parseTransform(xo);
>>>>>>>
if (parameter == null) {
parameter = der... |
<<<<<<<
* @version 1.0 — <em>$Date: 2013-09-10 $</em>
=======
* @version 1.0 — <em>$Date: 2013-12-02 $</em>
>>>>>>>
* @version 1.0 — <em>$Date: 2013-12-18 $</em>
<<<<<<<
=======
* Return an alterer which does nothing.
*
* @return an alterer which does nothing.
*/
public static <G ext... |
<<<<<<<
import static org.jenetics.internal.math.arithmetic.normalize;
import static org.jenetics.internal.util.array.shuffle;
=======
>>>>>>>
import static org.jenetics.internal.math.arithmetic.normalize;
import static org.jenetics.internal.util.array.shuffle;
<<<<<<<
* @version <em>$Date: 2014-08-26 $</em>
==... |
<<<<<<<
import java.util.function.Supplier;
=======
import java.io.Serializable;
>>>>>>>
import java.util.function.Supplier;
import java.io.Serializable;
<<<<<<<
* @version 1.6 — <em>$Date: 2014-03-07 $</em>
=======
* @version 2.0 — <em>$Date: 2014-03-30 $</em>
>>>>>>>
* @version 2.0 — <em>$... |
<<<<<<<
=======
import static java.lang.String.format;
import static java.util.Objects.requireNonNull;
import static org.jenetics.util.functions.Null;
import static org.jenetics.util.object.Verify;
>>>>>>>
<<<<<<<
* @version 1.0 — <em>$Date: 2013-07-12 $</em>
=======
* @version 1.0 — <em>$Date: 2013... |
<<<<<<<
/*
* Copyright (C) 2012-2017 52°North Initiative for Geospatial Open Source
=======
/**
* Copyright (C) 2012-2017 52°North Initiative for Geospatial Open Source
>>>>>>>
/*
* Copyright (C) 2012-2017 52°North Initiative for Geospatial Open Source
<<<<<<<
import org.n52.svalbard.util.GmlHelper;
=======
im... |
<<<<<<<
* @version 1.0 — <em>$Date: 2013-02-13 $</em>
=======
* @version 1.0 — <em>$Date: 2013-03-06 $</em>
>>>>>>>
* @version 1.0 — <em>$Date: 2013-03-26 $</em>
<<<<<<<
=======
interface Function2<T1, T2, R> {
R apply(T1 t1, T2 t2);
}
*/
@Override
public boolean contains(final Object... |
<<<<<<<
* @version <em>$Date: 2014-01-20 $</em>
=======
* @version <em>$Date: 2014-08-01 $</em>
>>>>>>>
* @version <em>$Date: 2014-12-28 $</em>
<<<<<<<
=======
public void sameByteLongValueSequence(final Random rand1, final Random rand2) {
final byte[] bytes = new byte[8];
for (int i = 0; i < 1234; ++i) {... |
<<<<<<<
import dr.evolution.datatype.*;
import dr.evolution.tree.*;
=======
>>>>>>>
import dr.evolution.datatype.*;
import dr.evolution.tree.*; |
<<<<<<<
import org.jenetics.util.Accumulator.MinMax;
=======
>>>>>>>
import org.jenetics.util.Accumulator.MinMax;
<<<<<<<
* @version <em>$Date: 2013-03-26 $</em>
=======
* @version <em>$Date: 2013-09-01 $</em>
>>>>>>>
* @version <em>$Date: 2013-09-08 $</em> |
<<<<<<<
import org.jenetics.util.IO;
import org.jenetics.util.LCG64ShiftRandom;
import org.jenetics.util.RandomRegistry;
import org.jenetics.util.Scoped;
=======
>>>>>>>
import org.jenetics.util.IO;
import org.jenetics.util.LCG64ShiftRandom;
import org.jenetics.util.RandomRegistry;
import org.jenetics.util.Scoped;
... |
<<<<<<<
* @version 1.0 — <em>$Date: 2013-12-18 $</em>
=======
* @version 1.6 — <em>$Date: 2014-03-04 $</em>
>>>>>>>
* @version 1.6 — <em>$Date: 2014-03-07 $</em>
<<<<<<<
public CharacterChromosome(final int length) {
super(
new Array<CharacterGene>(length).fill(
() -> CharacterGene.v... |
<<<<<<<
import org.jenetics.util.Scoped;
=======
import org.jenetics.util.Function;
>>>>>>>
import org.jenetics.util.Scoped;
<<<<<<<
* @version 2.0 — <em>$Date: 2014-03-31 $</em>
=======
* @version 2.0 — <em>$Date: 2014-04-12 $</em>
>>>>>>>
* @version 2.0 — <em>$Date: 2014-04-14 $</em>
<<<<... |
<<<<<<<
* @version 1.0 — <em>$Date: 2013-12-18 $</em>
=======
* @version 1.0 — <em>$Date: 2014-03-01 $</em>
>>>>>>>
* @version 1.0 — <em>$Date: 2014-03-07 $</em>
<<<<<<<
=======
* Return an alterer which does nothing.
*
* @return an alterer which does nothing.
*/
public static <G ext... |
<<<<<<<
* @version @__version__@ — <em>$Date: 2014-02-04 $</em>
=======
* @version 1.2 — <em>$Date: 2014-02-15 $</em>
>>>>>>>
* @version @__version__@ — <em>$Date: 2014-02-15 $</em>
<<<<<<<
private static final class Scope<R extends Random> implements Scoped<R> {
private final Thread _thread... |
<<<<<<<
* @version @__version__@ — <em>$Date: 2014-03-07 $</em>
=======
* @version 2.0 — <em>$Date: 2014-03-31 $</em>
>>>>>>>
* @version @__version__@ — <em>$Date: 2014-03-31 $</em>
<<<<<<<
* {@code (index < 0 || index >= size())}.
=======
* (index < 0 || index >= si... |
<<<<<<<
=======
import org.jscience.mathematics.number.Float64;
import org.jenetics.util.Function;
>>>>>>>
import org.jscience.mathematics.number.Float64;
import org.jenetics.util.Function;
<<<<<<<
* @version <em>$Date: 2013-09-08 $</em>
=======
* @version <em>$Date: 2014-02-17 $</em>
>>>>>>>
* @version <em... |
<<<<<<<
import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import java.util.function.Function;
=======
>>>>>>>
<<<<<<<
import org.jscience.mathematics.number.Float64;
import org... |
<<<<<<<
import dr.inference.hmc.PathGradient;
=======
import dr.inference.model.Likelihood;
>>>>>>>
import dr.inference.hmc.PathGradient;
import dr.inference.model.Likelihood;
<<<<<<<
import dr.math.matrixAlgebra.ReadableVector;
import dr.math.matrixAlgebra.WrappedVector;
=======
>>>>>>>
import dr.math.Multivari... |
<<<<<<<
* @version 1.6 — <em>$Date: 2014-03-07 $</em>
=======
* @version 2.0 — <em>$Date: 2014-04-12 $</em>
>>>>>>>
* @version 2.0 — <em>$Date: 2014-04-16 $</em>
<<<<<<<
/**
* @author <a href="mailto:franz.wilhelmstoetter@gmx.at">Franz Wilhelmstötter</a>
* @version 1.0 — <em>$Date:... |
<<<<<<<
=======
import static org.jenetics.TestUtils.newDoubleGenePopulation;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
>>>>>>>
import static org.jenetics.TestUtils.newDoubleGenePopulation;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOut... |
<<<<<<<
final var result = genotype.toSeq()
.map(gt -> mutate(gt, p, random));
=======
final ISeq<MutatorResult<Chromosome<G>>> result = genotype.stream()
.map(gt -> mutate(gt, p, random))
.collect(ISeq.toISeq());
>>>>>>>
final var result = genotype.stream()
.map(gt -> mutate(gt, p, random))
.co... |
<<<<<<<
import org.jenetics.internal.util.IntRef;
=======
>>>>>>>
<<<<<<<
* @version 3.0 — <em>$Date: 2014-08-30 $</em>
=======
* @version 3.0 — <em>$Date: 2014-10-25 $</em>
>>>>>>>
* @version 3.0 — <em>$Date: 2014-10-30 $</em>
<<<<<<<
public final int alter(
final Population<G, C> popu... |
<<<<<<<
private List<CodeType> getNames(final SFSpatialSamplingFeatureType spatialSamplingFeature)
throws OwsExceptionReport {
final int length = spatialSamplingFeature.getNameArray().length;
final List<CodeType> names = new ArrayList<>(length);
for (int i = 0; i < length; i++) {... |
<<<<<<<
* @version 1.3 — <em>$Date: 2013-07-12 $</em>
=======
* @version 1.4 — <em>$Date: 2013-09-01 $</em>
>>>>>>>
* @version 1.4 — <em>$Date: 2013-09-08 $</em>
<<<<<<<
=======
* Test whether the given array is sorted in ascending order.
*
* @param seq the array to test.
* @return {@... |
<<<<<<<
@Test
public void dashDashEmpty() {
class Arguments {
@Parameter
public List<String> mainParameters = new ArrayList<>();
}
Arguments a = new Arguments();
new JCommander(a, "--");
Assert.assertTrue(a.mainParameters.isEmpty());
}
@Test
public void dashDashDashDash() {
... |
<<<<<<<
=======
import org.jenetics.internal.util.HashBuilder;
import org.jenetics.util.Function;
>>>>>>>
import org.jenetics.internal.util.HashBuilder;
import org.jenetics.util.Function;
<<<<<<<
* @version 1.0 — <em>$Date: 2013-12-18 $</em>
=======
* @version 1.0 — <em>$Date: 2014-03-05 $</em>
... |
<<<<<<<
import java.time.Duration;
import java.time.format.DateTimeParseException;
import javolution.lang.Immutable;
import javolution.xml.XMLFormat;
import javolution.xml.XMLSerializable;
import javolution.xml.stream.XMLStreamException;
import org.jscience.mathematics.number.Float64;
import org.jscience.mathematics.... |
<<<<<<<
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.net.InetSocketAddress;
import java.util.ArrayList;
import java.util.Collection;
import java.util.EnumMap;
import java.util.List;
import java.util.Map;
import java.util... |
<<<<<<<
import org.jenetics.util.Accumulator.MinMax;
=======
>>>>>>>
import org.jenetics.util.Accumulator.MinMax;
<<<<<<<
* @version <em>$Date: 2013-03-26 $</em>
=======
* @version <em>$Date: 2013-09-01 $</em>
>>>>>>>
* @version <em>$Date: 2013-09-08 $</em> |
<<<<<<<
* @version 2.0 — <em>$Date: 2014-04-02 $</em>
=======
* @version 2.0 — <em>$Date: 2014-12-22 $</em>
>>>>>>>
* @version 2.0 — <em>$Date: 2014-12-28 $</em>
<<<<<<<
* Parameter class for the {@code LCG64ShiftRandom} generator, for the
* parameters <i>a</i> and <i>b</i> of the LC recurs... |
<<<<<<<
* @version @__version__@ — <em>$Date: 2014-03-07 $</em>
*
=======
* @version 2.0 — <em>$Date: 2014-03-31 $</em>
>>>>>>>
* @version @__version__@ — <em>$Date: 2014-03-31 $</em>
* |
<<<<<<<
import java.util.function.Function;
import org.jscience.mathematics.number.Float64;
=======
import static org.jenetics.util.math.random.nextDouble;
import java.util.Random;
>>>>>>>
import java.util.function.Function;
import java.util.Random;
<<<<<<<
=======
import org.jenetics.util.Function;
import org... |
<<<<<<<
* @version 2.0 — <em>$Date: 2013-12-18 $</em>
=======
* @version 1.6 — <em>$Date: 2014-03-07 $</em>
>>>>>>>
* @version 2.0 — <em>$Date: 2014-03-07 $</em> |
<<<<<<<
* @version <em>$Date: 2014-06-02 $</em>
=======
* @version <em>$Date: 2014-08-12 $</em>
>>>>>>>
* @version <em>$Date: 2014-08-12 $</em>
<<<<<<<
=======
final Factory<TruncationSelector<DoubleGene, Double>>
_factory = new Factory<TruncationSelector<DoubleGene,Double>>()
{
@Override
public Truncat... |
<<<<<<<
import java.util.Collection;
import java.util.function.Function;
import javolution.lang.Immutable;
=======
>>>>>>>
<<<<<<<
* @version @__version__@ — <em>$Date: 2014-03-07 $</em>
=======
* @version 2.0 — <em>$Date: 2014-03-12 $</em>
>>>>>>>
* @version 2.0 — <em>$Date: 2014-03-31 $<... |
<<<<<<<
* @version 1.6 — <em>$Date: 2014-03-07 $</em>
=======
>>>>>>> |
<<<<<<<
final File saveFile = new File(saveDir, encode(name + JSON_EXTENSION));
=======
final File saveFile = new File(saveDir, FilenameEncoder.encode(name + ".json"));
>>>>>>>
final File saveFile = new File(saveDir, FilenameEncoder.encode(name + JSON_EXTENSION));
<<<<<<<
... |
<<<<<<<
if (sum != 0 && Math.abs(sum - 1.0) > 1.0e-10) {
System.out.printf("(Normalizing ranks after %d power iterations with error) ", numIterations, sum - 1.0);
for (int i = 0; i < numNodes; ++i) {
nodeFlow[i] /= sum;
=======
if (sum != 0) ... |
<<<<<<<
final File f = new File(delimIoDir, TemplateListDialog.encode(templName + JSON_EXTENSION));
=======
final File f = new File(delimIoDir, FilenameEncoder.encode(templName + ".json"));
>>>>>>>
final File f = new File(delimIoDir, FilenameEncoder.encode(templName + JSON_EXTENSI... |
<<<<<<<
import org.jenetics.util.MSeq;
=======
import org.jenetics.util.MSeq;
import org.jenetics.util.Seq;
>>>>>>>
import org.jenetics.util.MSeq;
import org.jenetics.util.Seq;
<<<<<<<
* @version 2.0 — <em>$Date: 2014-08-01 $</em>
=======
* @version 2.0 — <em>$Date: 2014-10-28 $</em>
>>>>>>>
* @ve... |
<<<<<<<
* @version 2.0 — <em>$Date: 2013-05-25 $</em>
=======
* @version 1.3 — <em>$Date: 2013-06-12 $</em>
>>>>>>>
* @version 2.0 — <em>$Date: 2013-07-12 $</em>
<<<<<<<
=======
* Create a new array with length one. The array will be initialized with
* the given value.
*
* @param firs... |
<<<<<<<
* Returns the range of this {@code IntRange} as a {@code LongRange} after
* a widening primitive conversion.
*
* @since !__version__!
*
* @return this {@code IntRange} as {@code LongRange}
*/
public LongRange longRange() {
return LongRange.of(_min, _max);
}
/**
* Returns the range of this ... |
<<<<<<<
teleportBackWhenFreedFromJail = _isTeleportBackWhenFreedFromJail();
=======
isCompassTowardsHomePerm = _isCompassTowardsHomePerm();
isAllowWorldInBroadcastworld = _isAllowWorldInBroadcastworld();
>>>>>>>
teleportBackWhenFreedFromJail = _isTeleportBackWhenFreedFromJail();
... |
<<<<<<<
import java.util.Locale.Category;
=======
import java.util.Map.Entry;
>>>>>>>
import java.util.Locale.Category;
import java.util.Map.Entry;
<<<<<<<
currencyFormat = _getCurrencyFormat();
=======
commandCooldowns = _getCommandCooldowns();
>>>>>>>
commandCooldowns = _getCom... |
<<<<<<<
|| event.getReason() == TargetReason.PIG_ZOMBIE_TARGET)
&& prot.getSettingBool(ProtectConfig.prevent_entitytarget)
=======
|| event.getReason() == TargetReason.PIG_ZOMBIE_TARGET
|| event.getReason() == TargetReason.RANDOM_TARGET
|| event.getReason() == TargetReason.TARGET_ATTACKED_OWNER
... |
<<<<<<<
NumberFormat getCurrencyFormat();
=======
boolean isTeleportToCenterLocation();
boolean isCommandCooldownsEnabled();
long getCommandCooldownMs(String label);
Entry<Pattern, Long> getCommandCooldownEntry(String label);
boolean isCommandCooldownPersistent(String lab... |
<<<<<<<
import com.amaze.filemanager.utils.CloudUtil;
import com.amaze.filemanager.utils.CryptUtil;
import com.amaze.filemanager.utils.Futils;
import com.amaze.filemanager.utils.OTGUtil;
=======
import com.amaze.filemanager.utils.cloud.CloudUtil;
import com.amaze.filemanager.utils.files.CryptUtil;
import com.amaze.fi... |
<<<<<<<
* From the command line, you can configure git to use AWS code commit with a credential
* helper. However, jgit does not support credential helper commands, but it does provider
* a CredentialsProvider abstract class we can extend.
=======
* From the command line, you can configure git to use AWS code com... |
<<<<<<<
import org.eclipse.jgit.api.errors.TransportException;
=======
import org.eclipse.jgit.api.errors.InvalidRemoteException;
import org.eclipse.jgit.api.errors.NotMergedException;
import org.eclipse.jgit.lib.ObjectId;
>>>>>>>
import org.eclipse.jgit.api.errors.TransportException;
import org.eclipse.jgit.api.err... |
<<<<<<<
import static org.mockito.Matchers.isNull;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.HashMap;
import ... |
<<<<<<<
import java.io.File;
import java.io.IOException;
=======
import java.io.*;
import java.util.ArrayList;
>>>>>>>
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
<<<<<<<
@Option(name = {"-o", "--old"}, description = "Provides the path to the old version of the jar.")
=======
... |
<<<<<<<
import japicmp.util.Optional;
import japicmp.model.*;
=======
import com.google.common.base.Optional;
import japicmp.model.JApiAnnotation;
import japicmp.model.JApiAnnotationElement;
import japicmp.model.JApiChangeStatus;
import japicmp.model.JApiClass;
import japicmp.model.JApiField;
import japicmp.model.JAp... |
<<<<<<<
sb.append(signs).append(" ").append(jApiClass.getChangeStatus()).append(" ").append(jApiClass.getType()).append(javaObjectSerializationStatus(jApiClass)).append(": ")
.append(accessModifierAsString(jApiClass)).append(abstractModifierAsString(jApiClass)).append(staticModifierAsString(jApiClass))
... |
<<<<<<<
// Manage public members.
HlaAttributeUpdater newObject = (HlaAttributeUpdater) super.clone(workspace);
=======
HlaAttributeUpdater newObject = (HlaAttributeUpdater) super.clone(workspace);
newObject._hlaManager = _hlaManager;
newObject._useCertiMessageBuffer = _useCer... |
<<<<<<<
import com.oneops.cms.md.service.CmsMdProcessor;
=======
import org.apache.commons.lang3.StringUtils;
>>>>>>>
import com.oneops.cms.md.service.CmsMdProcessor;
import org.apache.commons.lang3.StringUtils; |
<<<<<<<
try {
LayoutElementParcelable layoutElement = new LayoutElementParcelable(name,
aMFile.getPath(), "", "", Formatter.formatFileSize(getContext(),
aMFile.length()), aMFile.length(), false, aMFile.lastModified() + "",
... |
<<<<<<<
bomGenerationProcessor.processManifestPlatform(context,
context.loadPlatformContext(platform),
cloudRel,
1,
false);
=======
bomRfcProcessor.processManifestPlatform(context,
context.loadPlatformContext(platform),
... |
<<<<<<<
public static final String BASE_PROVIDES = "base.Provides";
public static final String BASE_PLACED_IN = "base.PlacedIn";
=======
public static final String BASE_PROVIDES = "base.Provides" ;
public static final String BASE_CONSUMES = "base.Consumes";
//manifest
>>>>>>>
public static final String BASE_PR... |
<<<<<<<
=======
import io.fabric.sdk.android.Fabric;
import java.text.DecimalFormat;
>>>>>>>
import io.fabric.sdk.android.Fabric;
import java.text.DecimalFormat;
<<<<<<<
if (tempViewport.left == 0.0 || holdViewport.left == 0.0 || holdViewport.right >= (new Date().getTime())) {
previewChart.se... |
<<<<<<<
=======
import android.content.pm.PackageManager;
import android.hardware.fingerprint.FingerprintManager;
>>>>>>>
import android.content.pm.PackageManager;
import android.hardware.fingerprint.FingerprintManager;
<<<<<<<
import com.amaze.filemanager.ui.views.CheckBx;
import com.amaze.filemanager.utils.MainAc... |
<<<<<<<
public void setBooks(ArrayList<String[]> books) {
=======
public static synchronized void setBooks(ArrayList<String[]> books) {
>>>>>>>
public void synchronized setBooks(ArrayList<String[]> books) {
<<<<<<<
public void setStorages(ArrayList<String> storages) {
this.storages = storage... |
<<<<<<<
setupCache();
testMode = props.getBoolean("test.mode", false);
if (testMode) {
logger.info("Running in testMode.");
}
=======
this.globalProps = globalProps;
>>>>>>>
setupCache();
testMode = props.getBoolean("test.mode", false);
if (testMode) {
logger.info("Running in test... |
<<<<<<<
=======
public void updateDrawer(String path) {
new AsyncTask<String, Void, Integer>() {
@Override
protected Integer doInBackground(String... strings) {
String path = strings[0];
int k = 0, i = 0;
String entryItemPathOld = "";... |
<<<<<<<
import com.amaze.filemanager.utils.AppConfig;
import com.amaze.filemanager.utils.CryptUtil;
=======
>>>>>>>
<<<<<<<
import static com.amaze.filemanager.utils.Futils.toHFileArray;
=======
import static com.amaze.filemanager.utils.files.Futils.getFreeSpace;
import static com.amaze.filemanager.utils.files.Fu... |
<<<<<<<
private String executionPath;
private HashMap<String, FlowProps> flowProps = new HashMap<String, FlowProps>();
private HashMap<String, ExecutableNode> executableNodes = new HashMap<String, ExecutableNode>();
private ArrayList<String> startNodes;
private ArrayList<String> endNodes;
=======
>>>>>>>
<<... |
<<<<<<<
private long _totalAttachmentSizeSoFar;
=======
private boolean _usesAuth = true;
>>>>>>>
private long _totalAttachmentSizeSoFar;
private boolean _usesAuth = true;
<<<<<<<
try {
t.connect(_mailHost, _mailUser, _mailPassword);
} catch (MessagingException ste) {
if (ste.getCause()... |
<<<<<<<
public static int MAX_FPS = 40;
public static final int MIN_FPS_CONFIG = 1;
public static final int MAX_FPS_CONFIG = 200;
=======
public static int MAX_FPS = 50;
>>>>>>>
public static int MAX_FPS = 50;
public static final int MIN_FPS_CONFIG = 1;
public static final int MAX_FPS_CONFIG = 200;
<<<<<<<
... |
<<<<<<<
public Display menu; // the current menu you are on.
=======
public Menu menu, newMenu; // the current menu you are on.
>>>>>>>
public Display menu, newMenu; // the current menu you are on.
<<<<<<<
Time(int ticks) {
=======
Time(int ticks) {
>>>>>>>
Time(int ticks) {
<<<<<<<
public void ... |
<<<<<<<
=======
import java.lang.ref.WeakReference;
>>>>>>>
import java.lang.ref.WeakReference;
<<<<<<<
public static MaterialDialog showBasicDialog(BasicActivity m, String[] texts) {
int accentColor = m.getColorPreference().getColor(ColorUsage.ACCENT);
MaterialDialog.Builder a = new MaterialDia... |
<<<<<<<
import android.animation.ArgbEvaluator;
import android.content.SharedPreferences;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.Build;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.util.Log;
import android.view.LayoutInfl... |
<<<<<<<
isValid = validateConnection(connection, validateAction);
LOGGER.logTransaction(DAL, transactionName, String.format(IS_VALID_FORMAT, isValid), startTime);
if (!isValid) {
LOGGER.warn(IS_VALID_RETURN_INFO);
}
=======
LOGGER.logTransac... |
<<<<<<<
=======
// We cast from string to integer ((String)testcasecountryproperty field `length` -> (Integer)testcaseexecutiondata field `length`)
// if we can't, testCaseExecutionData field `length` will be equal to 0
int tccpLength = 0;
... |
<<<<<<<
+ "conditionOper, conditionVal1Init, conditionVal2Init, conditionVal1, conditionVal2, manualExecution, UserAgent, queueId, system, robotdecli) "
+ "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
=======
... |
<<<<<<<
=======
import java.util.Map;
import org.cerberus.dto.TestCaseWithExecution;
>>>>>>>
import java.util.Map; |
<<<<<<<
CONDITIONEVAL_FAILED_IFELEMENTVISIBLE_MISSINGPARAMETER(1220, "FA", "Missing mandatory parameter for '%COND%'.", false, false, false, MessageGeneralEnum.EXECUTION_FA_CONDITION),
CONDITIONEVAL_FAILED_IFELEMENTNOTVISIBLE_MISSINGPARAMETER(1220, "FA", "Missing mandatory parameter for '%COND%'.", false, false... |
<<<<<<<
public static final String DRIVE = "drive", SMB = "smb", BOOKS = "books",
HISTORY = "Table1", HIDDEN = "Table2", LIST = "list", GRID = "grid";
private ArrayList<String> hiddenfiles = new ArrayList<>(), gridfiles = new ArrayList<>(),
listfiles = new ArrayList<>(), history = new A... |
<<<<<<<
tcParameters.put("countries", countries);
StringBuilder query = new StringBuilder("SELECT tec.*, app.system FROM testcase tec ");
if(withLabelOrBattery) {
query.append("LEFT OUTER JOIN application app ON app.application = tec.application ")
... |
<<<<<<<
public static final String KEY_INTENT_PROCESS_VIEWER = "openprocesses";
public static final String TAG_INTENT_FILTER_FAILED_OPS = "failedOps";
public static final String TAG_INTENT_FILTER_GENERAL = "general_communications";
// the current visible tab, either 0 or 1
public static int current... |
<<<<<<<
} else if (storeItemTypeindex == 2) { //accessories
=======
} else if (storeItemTypeindex == TYPE_ACCESSORIES) { //accessories
dataSource.setCurrentAccessoriesValue(index);
presenter.calculateAccessoryValue... |
<<<<<<<
=======
} else {
// TODO: ractoc! fix this! :) nifty.publishEvent(getId(), new TreeItemSelectedEvent(this, item));
>>>>>>>
<<<<<<<
selectedItem.setActiveItem(true);
=======
System.out.println("setting selected item " + selectedItem.getTreeItem... |
<<<<<<<
private static final String ISO_8601_FORMAT = "yyyy-MM-dd'T'HH:mm:ss'Z'";
=======
private static final String ISO_8601_FORMAT = "yyyy-MM-dd'T'HH:mm:ssZ";
private static final int MILLISECONDS_PER_SECOND = 1000;
>>>>>>>
private static final String ISO_8601_FORMAT = "yyyy-MM-dd'T'HH:mm:ss'Z'";
... |
<<<<<<<
import java.util.LinkedHashMap;
import java.util.Map;
=======
>>>>>>>
<<<<<<<
public class MapEntry implements Map.Entry {
private KeyMapEntry key;
private Integer value;
=======
public class MapEntry extends ImmutableEntry<ImmutableEntry<Integer, Integer>, Integer> {
>>>>>>>
public class MapEn... |
<<<<<<<
=======
import org.apache.commons.io.IOUtils;
>>>>>>>
import org.apache.commons.io.IOUtils;
<<<<<<<
import com.github.restdriver.serverdriver.http.AnyRequestModifier;
import com.github.restdriver.serverdriver.http.Header;
import com.github.restdriver.serverdriver.http.NoOpRequestProxy;
import com.github.res... |
<<<<<<<
=======
>>>>>>> |
<<<<<<<
import static android.os.Build.VERSION_CODES.JELLY_BEAN;
=======
import static com.amaze.filemanager.filesystem.ssh.SshConnectionPool.SSH_URI_PREFIX;
>>>>>>>
import static android.os.Build.VERSION_CODES.JELLY_BEAN;
import static com.amaze.filemanager.filesystem.ssh.SshConnectionPool.SSH_URI_PREFIX; |
<<<<<<<
project = ((ProjectManagerImpl) projectManager).convertAndLoadProject(baseDir.getPath());
=======
for (ProjectOpenProcessor processor : ProjectOpenProcessor.EXTENSION_POINT_NAME.getExtensions()) {
processor.refreshProjectFiles(projectDir);
}
project = ((ProjectManage... |
<<<<<<<
/**
* Show changes made in the specified revision.
*
* @param project the project
* @param revision the revision number
* @param file the file affected by the revision
* @param local pass true to let the diff be editable, i.e. making the revision "at the right" be a loca... |
<<<<<<<
public void _testLoadingModules() throws IOException, JDOMException {
CoreApplicationEnvironment appEnv = new CoreApplicationEnvironment(getTestRootDisposable());
ProjectModelEnvironment.registerApplicationEnvironment(appEnv);
CoreProjectEnvironment prjEnv = new CoreProjectEnvironment(getTestRoot... |
<<<<<<<
import com.intellij.openapi.vcs.FilePathImpl;
import com.intellij.openapi.vcs.FileStatus;
=======
>>>>>>>
import com.intellij.openapi.vcs.FileStatus;
<<<<<<<
h.addRelativePaths(filePath);
parser.parseStatusBeforeName(true);
=======
parser.setNameInOutput(true);
>>>>>>>
parser.parseStatusB... |
<<<<<<<
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.util.InheritanceUtil;
=======
>>>>>>>
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.util.InheritanceUtil;
<<<<<<<
import com.intellij.util.containers.MultiMap;
import org.jetbrains.annotations.NotNull;
impo... |
<<<<<<<
=======
//String itemsstring = res.getString(R.string.items);// TODO: 23/5/2017 use or delete
>>>>>>>
//String itemsstring = res.getString(R.string.items);// TODO: 23/5/2017 use or delete |
<<<<<<<
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
=======
import hudson.util.ListBoxModel;
import jenkins.model.Jenkins;
>>>>>>>
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import hudson.util.ListBoxModel;
import jenkins.model.Jenkins;
<<<<<<<
@DataBoundConstructor... |
<<<<<<<
import com.amaze.filemanager.fragments.Main;
import com.amaze.filemanager.fragments.preference_fragments.Preffrag;
=======
import com.amaze.filemanager.fragments.MainFragment;
>>>>>>>
import com.amaze.filemanager.fragments.preference_fragments.Preffrag;
import com.amaze.filemanager.fragments.MainFragment; |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.