conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.HashSet;
import java.util.Set;
=======
import nl.basjes.parse.core.exceptions.DisectionFailure;
import static nl.basjes.parse.Utils.resilientUrlDecode;
>>>>>>>
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import nl.basjes... |
<<<<<<<
public DirectoryObjectReferenceRequestBuilder(final String requestUrl, final IBaseClient client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
super(requestUrl, client, requestOptions, DirectoryObjectReferenceRequest.class);
=======
public DirectoryObject... |
<<<<<<<
/**
* Creates a new Segment
* @param newSegment the Segment to create
* @return the newly created object
*/
public Segment post(final Segment newSegment) throws ClientException {
=======
@Nonnull
public Segment post(@Nonnull final Segment newSegment) throws ClientException ... |
<<<<<<<
public EndpointRequest select(final String value) {
addSelectOption(value);
return this;
=======
@Nonnull
public EndpointRequest select(@Nonnull final String value) {
getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$select", value));
return... |
<<<<<<<
public OptionRequest select(final String value) {
addSelectOption(value);
return this;
=======
@Nonnull
public OptionRequest select(@Nonnull final String value) {
getQueryOptions().add(new com.microsoft.graph.options.QueryOption("$select", value));
return (Op... |
<<<<<<<
public EntityType3CollectionWithReferencesRequestBuilder(final String requestUrl, final IBaseClient client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
super(requestUrl, client, requestOptions, EntityType3ReferenceRequestBuilder.class, EntityType3CollectionRe... |
<<<<<<<
public static final String TRANSACTION_PROCESSOR_ACTIONS_EMPTY_ERROR_MSG = "Action list can't be empty!";
public static final String TRANSACTION_PROCESSOR_RPC_GET_INFO = "Error happened on calling GetInfo RPC.";
public static final String TRANSACTION_PROCESSOR_PREPARE_RPC_GET_BLOCK = "Error happened... |
<<<<<<<
=======
import android.util.Xml;
>>>>>>>
import android.util.Xml;
<<<<<<<
=======
public void getText_withHtml() throws Exception {
assertThat(resources.getText(R.string.some_html, "value").toString()).isEqualTo("Hello, world");
}
@Test
public void getDimension() throws Exception {
Displa... |
<<<<<<<
=======
/**
* Non-Android accessor that sets the value to be returned by {@link #getDimension(int)}
*
* @param id ID to set the dimension for
* @param value value to be returned
*/
public void setDimension(int id, int value) {
resourceLoader.dimensions.put(id, value... |
<<<<<<<
@Test
public void applyStyleForced() {
Resources.Theme theme = resources.newTheme();
theme.applyStyle(R.style.MyBlackTheme, true);
TypedArray arr = theme.obtainStyledAttributes(new int[] { android.R.attr.windowBackground, android.R.attr.textColorHint });
TypedValue backgroundColor = new Typ... |
<<<<<<<
=======
import android.widget.Spinner;
import com.xtremelabs.robolectric.Robolectric;
>>>>>>>
import android.widget.Spinner;
<<<<<<<
=======
Robolectric.bindDefaultShadowClasses();
Context context = new Activity();
>>>>>>>
context = new Activity(); |
<<<<<<<
import android.os.CountDownTimer;
import android.os.Handler;
import android.os.Looper;
import android.preference.DialogPreference;
import android.preference.Preference;
import android.telephony.TelephonyManager;
import android.text.format.DateFormat;
=======
import android.os.*;
import android.preference.*;
i... |
<<<<<<<
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.Path;
import com.xtremelabs.robolectric.internal.Implementation;
import com.xtremelabs.robolectric.internal.Implements;
=======
import android.graphics.*;
import com.xtremelabs.robolectric.util.Implementation;
import com.xt... |
<<<<<<<
import android.app.ResourcesManager;
=======
import android.content.BroadcastReceiver;
import android.content.ComponentName;
>>>>>>>
import android.content.BroadcastReceiver;
import android.content.ComponentName;
<<<<<<<
import android.content.res.CompatibilityInfo;
=======
import android.content.pm.Packa... |
<<<<<<<
import android.view.View;
import android.view.View.MeasureSpec;
=======
>>>>>>>
import android.view.View;
<<<<<<<
import com.xtremelabs.robolectric.internal.Implementation;
=======
>>>>>>>
import com.xtremelabs.robolectric.internal.Implementation;
<<<<<<<
@Implementation
public void onMeasu... |
<<<<<<<
=======
import android.view.View;
import android.view.ViewGroup;
>>>>>>>
import android.view.View;
<<<<<<<
=======
@Override
protected void setChildLayoutParams(View child) {
child.setLayoutParams(new LinearLayout.LayoutParams(0, 0));
}
>>>>>>>
@Override
protected void setC... |
<<<<<<<
private int phoneType = TelephonyManager.PHONE_TYPE_GSM;
=======
private String simCountryIso;
>>>>>>>
private int phoneType = TelephonyManager.PHONE_TYPE_GSM;
private String simCountryIso; |
<<<<<<<
private PreferenceLoader preferenceLoader;
private final StringResourceLoader stringResourceLoader;
private final PluralResourceLoader pluralResourceLoader;
private final StringArrayResourceLoader stringArrayResourceLoader;
private final AttrResourceLoader attrResourceLoader;
private fin... |
<<<<<<<
sdkProvider.getSdk(16),
mock(ConfigCollection.class),
=======
sdkCollection.getSdk(16),
mock(Config.class),
>>>>>>>
sdkCollection.getSdk(16),
mock(ConfigCollection.class),
<<<<<<<
sdkProvider.getSdk(17),
mock(Con... |
<<<<<<<
ShadowIntent fakeIntent = (ShadowIntent) DogfoodRobolectricTestRunner.shadowFor(intent);
assertEquals("bar", fakeIntent.extras.get("foo"));
=======
ShadowIntent shadowIntent = (ShadowIntent) DogfoodRobolectricTestRunner.proxyFor(intent);
assertEquals("bar", shadowIntent.extras.... |
<<<<<<<
public static final class id {
public static final int time = nextId++;
public static final int title = nextId++;
public static final int subtitle = nextId++;
public static final int snippet_text = nextId++;
public static final int include_id = nextId++;
public static final int inner_text = nextId+... |
<<<<<<<
import com.xtremelabs.robolectric.internal.Implementation;
import com.xtremelabs.robolectric.internal.Implements;
import com.xtremelabs.robolectric.internal.RealObject;
=======
import com.xtremelabs.robolectric.Robolectric;
import com.xtremelabs.robolectric.util.Implementation;
import com.xtremelabs.robolectr... |
<<<<<<<
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
=======
import android.widget.TextView;
>>>>>>>
import android.widget.LinearLayout;
import android.widget.TextView;
<<<<<<<
import com.xtremelabs.robolectric.Robolectric;
import com.xtremelabs.robolectric.Te... |
<<<<<<<
@Test
public void testShouldBeAbleToTurnOffAutomaticRowUpdates() throws Exception {
try {
TranscriptAdapter adapter1 = new TranscriptAdapter();
assertThat(adapter1.getCount(), equalTo(1));
listView.setAdapter(adapter1);
transcript.assertEventsSoFar... |
<<<<<<<
assertThat(sdkPicker.selectSdks(buildConfig(new Config.Builder()), usesSdk))
.containsExactly(sdkProvider.getSdk(22));
=======
assertThat(sdkPicker.selectSdks(new Config.Builder().build(), usesSdk))
.containsExactly(sdkCollection.getSdk(22));
>>>>>>>
assertThat(sdkPicker.selectSdk... |
<<<<<<<
// the org.robolectric.res package lives in the base classloader, but not its tests; yuck.
int lastDot = name.lastIndexOf('.');
String pkgName = name.substring(0, lastDot == -1 ? 0 : lastDot);
if (pkgName.equals("org.robolectric.res")) {
return name.contains("Test");
... |
<<<<<<<
private HashMap<String, String> attributes;
private ResourceExtractor resourceExtractor;
@Before
public void setUp() throws Exception {
attributes = new HashMap<String, String>();
resourceExtractor = new ResourceExtractor();
resourceExtractor.addLocalRClass(R.class);
resourceExtractor.addSystemRCl... |
<<<<<<<
import android.content.res.AssetManager;
=======
>>>>>>>
import android.content.res.AssetManager;
<<<<<<<
import com.xtremelabs.robolectric.Robolectric;
import com.xtremelabs.robolectric.internal.Implementation;
import com.xtremelabs.robolectric.internal.Implements;
=======
>>>>>>>
import com.xtremelabs.... |
<<<<<<<
=======
import com.google.common.collect.ImmutableList;
>>>>>>>
import com.google.common.collect.ImmutableList;
<<<<<<<
@RunWith(TestRunners.MultiApiSelfTest.class)
=======
@RunWith(RobolectricTestRunner.class)
>>>>>>>
@RunWith(RobolectricTestRunner.class)
<<<<<<<
@Config(minSdk = Build.VERSION_CODES.... |
<<<<<<<
import android.os.Looper;
import android.test.mock.MockContentResolver;
=======
>>>>>>>
import android.os.Looper;
<<<<<<<
import android.widget.Toast;
import com.xtremelabs.robolectric.internal.Implementation;
import com.xtremelabs.robolectric.internal.Implements;
import com.xtremelabs.robolectric.internal.... |
<<<<<<<
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
=======
import java.io.FileNotFoundException;
>>>>>>>
import java.io.FileNotFoundException;
<<<<<<<
import org.robolectric.res.android.BagAttributeFinder;
=======
import org.robolectric.res.android.Asset;
import org.robole... |
<<<<<<<
import android.app.*;
=======
import android.app.Activity;
import android.app.ActivityGroup;
import android.app.ActivityManager;
import android.app.AlarmManager;
import android.app.AlertDialog;
import android.app.Application;
import android.app.Dialog;
import android.app.KeyguardManager;
import android.app.Li... |
<<<<<<<
import android.app.Dialog;
import android.content.Context;
=======
import android.content.ComponentName;
>>>>>>>
import android.app.Dialog;
import android.content.ComponentName;
import android.content.Context;
<<<<<<<
import android.os.Bundle;
import android.view.*;
=======
import android.content.IntentSe... |
<<<<<<<
public Intent putExtra(String key, String[] value) {
extras.put(key, value);
return realIntent;
}
@Implementation
public boolean hasExtra(String name) {
return extras.containsKey(name);
=======
public Intent putExtra(String key, int[] value) {
extras.put(ke... |
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
@Implementation
=======
@Implementation
>>>>>>>
@Implementation
<<<<<<<
=======
>>>>>>> |
<<<<<<<
import android.graphics.BitmapFactory;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
=======
import android.graphics.Point;
import android.graphics.drawable.ColorDrawable;
>>>>>>>
import android.graphics.BitmapFactory;
import android.graphics.drawable.BitmapDrawa... |
<<<<<<<
private long downTime;
private long eventTime;
=======
private int pointerCount = 1;
>>>>>>>
private int pointerCount = 1;
private long downTime;
private long eventTime; |
<<<<<<<
private boolean interceptHttpRequests = true;
=======
private boolean logHttpRequests = false;
>>>>>>>
private boolean interceptHttpRequests = true;
private boolean logHttpRequests = false; |
<<<<<<<
import static android.graphics.Shader.TileMode;
=======
import static com.xtremelabs.robolectric.Robolectric.newInstanceOf;
>>>>>>>
import static android.graphics.Shader.TileMode;
import static com.xtremelabs.robolectric.Robolectric.newInstanceOf; |
<<<<<<<
public static long getSumTotalTermFreq(IndexReader reader, String luceneField) {
long totalTerms = 0;
try {
for (LeafReaderContext ctx: reader.leaves()) {
Terms terms = ctx.reader().terms(luceneField);
if (terms == null)
throw new RuntimeException("Field " + luceneField + " does not exist!"... |
<<<<<<<
import android.location.Location;
import android.location.LocationListener;
=======
import java.util.LinkedHashSet;
import java.util.Set;
import android.location.Criteria;
import android.location.GpsStatus.Listener;
import android.location.Location;
import android.location.LocationListener;
>>>>>>>
import ja... |
<<<<<<<
import static android.os.Build.VERSION_CODES.P;
import static org.robolectric.Shadows.shadowOf;
=======
>>>>>>>
<<<<<<<
import android.os.Build;
import android.view.ContextThemeWrapper;
=======
>>>>>>> |
<<<<<<<
import com.xtremelabs.robolectric.TestRunners;
=======
import com.xtremelabs.robolectric.Robolectric;
import com.xtremelabs.robolectric.WithTestDefaultsRunner;
>>>>>>>
import com.xtremelabs.robolectric.Robolectric;
import com.xtremelabs.robolectric.TestRunners; |
<<<<<<<
@Override
public float getAttributeFloatValue(String namespace, String attribute, float defaultValue) {
String value = getAttributeValueInMap(namespace, attribute);
if (attrResourceLoader.hasAttributeFor(viewClass, "xxx", attribute)) {
value = attrResourceLoader.convertValue... |
<<<<<<<
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertTrue;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
=======
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMa... |
<<<<<<<
import org.robolectric.Robolectric;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.TestRunners;
=======
import org.robolectric.RobolectricTestRunner;
>>>>>>>
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
<<<<<<<
private Context context;
======... |
<<<<<<<
=======
import org.robolectric.Robolectric;
import org.robolectric.RuntimeEnvironment;
>>>>>>>
import org.robolectric.Robolectric; |
<<<<<<<
@Test
@Config(minSdk = Build.VERSION_CODES.P)
public void testGetAppStandbyBucket_withPackageName() throws Exception {
shadowUsageStatsManager.setAppStandbyBucket("app1", UsageStatsManager.STANDBY_BUCKET_RARE);
assertThat(shadowUsageStatsManager.getAppStandbyBucket("app1"))
.isEqualTo(... |
<<<<<<<
import android.database.sqlite.SQLiteStatement;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.ColorMatrix;
import android.graphics.Matrix;
import android.graphics.Paint;
import android.graphics.Path;
import android.graphics.Rect;
=======
import android.graphics.Bitmap... |
<<<<<<<
import android.view.animation.LayoutAnimationController;
=======
>>>>>>>
import android.view.animation.LayoutAnimationController;
<<<<<<<
private AnimationListener animListener;
private LayoutAnimationController layoutAnim;
private boolean disallowInterceptTouchEvent = false;
=======
pri... |
<<<<<<<
public AlertDialog.Builder setMessage(int messageId) {
return setMessage(context.getResources().getString(messageId));
}
@Implementation
public AlertDialog.Builder setIcon(int iconId) {
return realBuilder;
}
@Implementation
=======
... |
<<<<<<<
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
import org.robolectric.annotation.RealObject;
=======
import org.robolectric.internal.Implementation;
import org.robolectric.internal.Implements;
import org.robolectric.internal.RealObject;
import java.util.HashMap... |
<<<<<<<
import com.xtremelabs.robolectric.TestRunners;
=======
import android.view.View;
import android.view.ViewGroup;
import com.xtremelabs.robolectric.R;
import com.xtremelabs.robolectric.Robolectric;
import com.xtremelabs.robolectric.WithTestDefaultsRunner;
>>>>>>>
import android.view.View;
import android.view.V... |
<<<<<<<
import java.io.*;
import java.util.HashMap;
import java.util.Map;
import static com.xtremelabs.robolectric.Robolectric.shadowOf;
=======
>>>>>>>
import java.io.*;
import java.util.HashMap;
import java.util.Map;
import static com.xtremelabs.robolectric.Robolectric.shadowOf;
<<<<<<<
public boolean hasExt... |
<<<<<<<
import static android.R.string.ok;
import static java.nio.charset.StandardCharsets.UTF_8;
=======
>>>>>>>
<<<<<<<
import static org.junit.Assert.assertNotNull;
import static org.junit.Assume.assumeTrue;
=======
>>>>>>>
import static org.junit.Assume.assumeTrue;
<<<<<<<
import static org.robolectric.R.bo... |
<<<<<<<
public void testNew() {
TransactionResult res = new TransactionResult(valid, returns, logs, 0);
assertTrue(res.validate());
=======
public void testCode() {
for (TransactionResult.Code code : TransactionResult.Code.values()) {
if (code.name().startsWith("SUCCESS")) ... |
<<<<<<<
import android.content.res.XmlResourceParser;
import android.graphics.Color;
=======
import android.graphics.drawable.ColorDrawable;
>>>>>>>
import android.graphics.drawable.ColorDrawable;
<<<<<<<
import android.util.TypedValue;
import android.util.Xml;
=======
import android.view.View;
import android.wid... |
<<<<<<<
public boolean hasExtra(String name) {
return extras.containsKey(name);
=======
public void putExtra(String key, byte[] value) {
extras.put(key, value);
}
public String getStringExtra(String name) {
return (String) extras.get(name);
}
public Parcelable getParc... |
<<<<<<<
import java.util.*;
import java.util.Map.Entry;
=======
>>>>>>>
<<<<<<<
import android.graphics.drawable.Drawable;
=======
>>>>>>>
import android.graphics.drawable.Drawable;
<<<<<<<
public void addResolveInfoForIntent(Intent intent, ResolveInfo info) {
List<ResolveInfo> l = resolveList.ge... |
<<<<<<<
import org.semux.gui.SwingUtil;
=======
import org.semux.gui.MessagesUtil;
>>>>>>>
import org.semux.gui.SwingUtil;
import org.semux.gui.MessagesUtil; |
<<<<<<<
import static android.os.Build.VERSION_CODES.M;
import static android.os.Build.VERSION_CODES.P;
=======
>>>>>>>
import static android.os.Build.VERSION_CODES.M;
<<<<<<<
// TODO(brettchabot): properly handle displayId
// @Implementation(minSdk = P)
// @HiddenApi
// protected static long nativeInitiali... |
<<<<<<<
public class ShadowTypedArray {
private List<Object> values = new ArrayList<Object>();
=======
public class ShadowTypedArray implements UsesResources {
private Resources resources;
public void injectResources(Resources resources) {
this.resources = resources;
}
>>>>>>>
public class... |
<<<<<<<
byte[] prevHash = parent.getHash();
long timestamp = System.currentTimeMillis();
/*
* in case the previous block timestamp is drifted too munch, adjust this block
* timestamp to avoid invalid blocks (triggered by timestamp rule).
*
* See https://github... |
<<<<<<<
public void __constructor__(Context baseContext) {
this.baseContext = baseContext;
}
=======
>>>>>>>
<<<<<<<
=======
@Implementation
public boolean isRestricted() {
return false;
}
/**
* Non-Android accessor that is used to grant permissions checked via
... |
<<<<<<<
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.MatcherAssert.assertThat;
=======
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
>>>>>>>
import static org.hamcrest.CoreMatchers.equalTo;
impo... |
<<<<<<<
public static ShadowAssetManager shadowOf(AssetManager instance) {
return (ShadowAssetManager) Robolectric.shadowOf_(instance);
}
=======
public static ShadowMediaRecorder shadowOf(MediaRecorder instance) {
return (ShadowMediaRecorder) shadowOf_(instance);
}
>>>>>>>
... |
<<<<<<<
private Method getMethod(Class<?> clazz, String methodName, Class<?>[] paramClasses) {
try {
return clazz.getMethod(methodName, paramClasses);
} catch (NoSuchMethodException e) {
try {
return clazz.getDeclaredMethod(methodName, paramClasses);
... |
<<<<<<<
} catch (I18nException e) {
throw e;
=======
return true;
>>>>>>>
return true;
} catch (I18nException e) {
throw e; |
<<<<<<<
ShadowExpandableListView.class,
=======
ShadowFloatMath.class,
>>>>>>>
ShadowExpandableListView.class,
ShadowFloatMath.class,
<<<<<<<
ShadowMediaRecorder.class,
=======
ShadowMatrix.class,
Shado... |
<<<<<<<
=======
import android.os.Bundle;
import android.view.View;
>>>>>>>
import android.os.Bundle;
import android.view.View;
<<<<<<<
=======
import org.hamcrest.CoreMatchers;
import org.junit.Test;
import org.junit.runner.RunWith;
import java.util.concurrent.atomic.AtomicBoolean;
import static com.xtremela... |
<<<<<<<
import android.graphics.drawable.Drawable;
=======
import android.graphics.Point;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
>>>>>>>
import android.graphics.Point;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
<<<<<... |
<<<<<<<
TransactionResult result = exec.execute(tx, as.track(), ds.track(), bh);
assertFalse(result.isSuccess());
=======
TransactionResult result = exec.execute(tx, as.track(), ds.track());
assertFalse(result.getCode().isSuccess());
>>>>>>>
TransactionResult result = exec.exe... |
<<<<<<<
ShadowKeyEvent.class,
=======
ShadowKeyguardManager.class,
>>>>>>>
ShadowKeyEvent.class,
ShadowKeyguardManager.class,
<<<<<<<
ShadowTabActivity.class,
ShadowTabHost.class,
ShadowTabSpec.class,
==... |
<<<<<<<
import android.widget.FrameLayout;
import com.xtremelabs.robolectric.*;
import com.xtremelabs.robolectric.shadows.testing.OnMethodTestActivity;
=======
import com.xtremelabs.robolectric.ApplicationResolver;
import com.xtremelabs.robolectric.R;
import com.xtremelabs.robolectric.Robolectric;
import com.xtremel... |
<<<<<<<
import org.robolectric.shadows.LegacyManifestParser;
import org.robolectric.shadows.ShadowActivityThread;
=======
>>>>>>>
import org.robolectric.shadows.LegacyManifestParser;
import org.robolectric.shadows.ShadowActivityThread;
<<<<<<<
String qualifiers = Bootstrap.applyQualifiers(config.qualifiers(),
... |
<<<<<<<
* @param appWidgetId id of widget
* @param views views to update
=======
*
* @param appWidgetId
* @param views
>>>>>>>
*
* @param appWidgetId id of widget
* @param views views to update
<<<<<<<
* @param appWidgetProviderClass the app widget provider class
*... |
<<<<<<<
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static android.os.Build.VERSION_CODES.KITKAT_WATCH;
import static android.os.Build.VERSION_CODES.LOLLIPOP;
import stati... |
<<<<<<<
import android.text.*;
=======
import android.text.SpannableStringBuilder;
import android.text.TextPaint;
import android.text.TextWatcher;
>>>>>>>
import android.text.*;
<<<<<<<
private List<Integer> previousKeyCodes = new ArrayList<Integer>();
private List<KeyEvent> previousKeyEvents = new ArrayLis... |
<<<<<<<
=======
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.... |
<<<<<<<
OperationParser.getRequestBody(apiOperation.requestBody(), classProduces, methodProduces, components).ifPresent(operation::setRequestBody);
=======
>>>>>>> |
<<<<<<<
Map<String, Example> exampleMap = new HashMap<>();
=======
Map<String, Example> exampleMap = new LinkedHashMap<>();
final Object exampleValue;
>>>>>>>
Map<String, Example> exampleMap = new LinkedHashMap<>(); |
<<<<<<<
=======
long timestamp = TimeUtil.currentTimeMillis();
>>>>>>> |
<<<<<<<
import org.ethereum.vm.DataWord;
import org.ethereum.vm.LogInfo;
=======
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.bouncycastle.util.encoders.Hex;
>>>>>>>
import org.ethereum.vm.DataWord;
import org.ethereum.vm.LogInfo;
import java.util.ArrayList;
import java.uti... |
<<<<<<<
public interface IParent<T extends Number> extends IGrandparent<T> {
=======
@IndirectAnnotation
public interface IParent<T extends Number> {
>>>>>>>
@IndirectAnnotation
public interface IParent<T extends Number> extends IGrandparent<T> { |
<<<<<<<
this.coinbase.setText("Account #" + model.getCoinbase());
this.status.setText(model.isDelegate() ? "Delegate" : "Normal");
this.balance.setText(SwingUtil.formatDouble(model.getTotalBalance() / (double) Unit.SEM) + " SEM");
this.locked.setText(SwingUtil.formatDouble(model.getTotal... |
<<<<<<<
private final PrecompiledContractContext context;
=======
private DelegateState delegateState;
>>>>>>>
private final DelegateState delegateState;
<<<<<<<
this.context = new PrecompiledContractContext() {
};
}
@Override
public PrecompiledContractContext getContext() {... |
<<<<<<<
import com.wordnik.swagger.annotations.ApiImplicitParam;
import com.wordnik.swagger.util.Json;
=======
>>>>>>>
import com.wordnik.swagger.annotations.ApiImplicitParam;
import com.wordnik.swagger.util.Json;
<<<<<<<
final ParamWrapper<?> param = helper.getApiParam();
=======
final JavaType javaTyp... |
<<<<<<<
private Map<String, Object> vendorExtensions = new HashMap<String, Object>();
=======
private final Map<String, Object> vendorExtensions = new LinkedHashMap<String, Object>();
>>>>>>>
private Map<String, Object> vendorExtensions = new LinkedHashMap<String, Object>(); |
<<<<<<<
import java.math.BigDecimal;
=======
import java.lang.reflect.Array;
>>>>>>>
import java.math.BigDecimal;
import java.lang.reflect.Array;
<<<<<<<
if (NumberUtils.isNumber(schema.maximum())) {
String filteredMaximum = schema.maximum().replaceAll(COMMA, StringUtils.EMPTY);
sche... |
<<<<<<<
=======
import io.swagger.oas.annotations.enums.Explode;
import io.swagger.oas.annotations.media.ArraySchema;
import io.swagger.oas.annotations.media.Content;
import io.swagger.oas.annotations.media.Schema;
import io.swagger.oas.annotations.parameters.Parameters;
>>>>>>> |
<<<<<<<
byte[] prevHash = getKernel().getBlockchain().getLatestBlock().getHash();
long timestamp = TimeUtil.currentTimeMillis();
=======
long timestamp = System.currentTimeMillis();
>>>>>>>
long timestamp = TimeUtil.currentTimeMillis(); |
<<<<<<<
import org.ethereum.vm.DataWord;
import org.ethereum.vm.LogInfo;
=======
import org.ethereum.vm.program.InternalTransaction;
>>>>>>>
import org.ethereum.vm.DataWord;
import org.ethereum.vm.LogInfo;
import org.ethereum.vm.program.InternalTransaction; |
<<<<<<<
public String getType() {
return type;
}
public String getFormat() {
return format;
}
=======
public Double getDecimalMin() {
return decimalMin;
}
public boolean isMinExclusive() {
return minExclusive;
... |
<<<<<<<
=======
// fetch pending transactions
final List<PendingManager.PendingTransaction> pending = pendingMgr
.getPendingTransactions(config.maxBlockTransactionsSize());
final List<Transaction> pendingTxs = pending.stream()
.map(tx -> tx.transaction)
... |
<<<<<<<
public static ItemRadioCtrlCard ITEM_RADIO_CONTROL_CARD = new ItemRadioCtrlCard();
=======
public static ItemSwitchHammer ITEM_SWITCH_HAMMER = new ItemSwitchHammer();
>>>>>>>
public static ItemRadioCtrlCard ITEM_RADIO_CONTROL_CARD = new ItemRadioCtrlCard();
public static ItemSwitchHammer ITEM_SWITCH_HAMM... |
<<<<<<<
else if(sync.getInteger(HORN) == 0 && horn.isPlaying() && this.getDefinition().getHornSus()){
if (hornVolume > 0) {
=======
else if(this.getDataManager().get(HORN) == 0 && horn.isPlaying() && this.getDefinition().getHornSus()){
if (hornVolume > 0.5) {
>>>>>>>
else if(sync.getInteger(HOR... |
<<<<<<<
public static ItemTrackExchanger ITEM_TRACK_EXCHANGER = new ItemTrackExchanger();
=======
public static void register() {
// loads static classes and ctrs
}
>>>>>>>
public static ItemTrackExchanger ITEM_TRACK_EXCHANGER = new ItemTrackExchanger();
public static void register() {
// loads static cla... |
<<<<<<<
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.io.InputStream;
import java.util.*;
import java.util.function.Function;
import cam72cam.immersiverailroading.render.ExpireableList;
import cam72cam.immersiverailroading.render.OBJTextureSheet;
import cam72cam.immersiverailroading.tile... |
<<<<<<<
this.horn = ImmersiveRailroading.proxy.newSound(this.getDefinition().horn, this.getDefinition().getHornSus(), 100, gauge);
this.idle = ImmersiveRailroading.proxy.newSound(this.getDefinition().idle, true, 80, gauge);
this.bell = ImmersiveRailroading.proxy.newSound(this.getDefinition().bell, true, ... |
<<<<<<<
public void cycleSwitchForced() {
=======
public BlockPos getParentReplaced() {
if (this.replaced == null) {
return null;
}
if (!this.replaced.hasKey("parent")) {
return null;
}
return BlockPos.fromLong(this.replaced.getLong("parent")).add(pos);
}
public void toggleSwitchForced() {
>>>>... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.