conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
list.add(YKMH.getDefaultSource());
=======
list.add(DmzjFix.getDefaultSource());
>>>>>>>
list.add(YKMH.getDefaultSource());
list.add(DmzjFix.getDefaultSource()); |
<<<<<<<
import com.hiroshi.cimoc.source.Cartoonmad;
import com.hiroshi.cimoc.source.ChuiXue;
=======
import com.hiroshi.cimoc.source.ChuiXue;
import com.hiroshi.cimoc.source.Chuiyao;
>>>>>>>
import com.hiroshi.cimoc.source.Cartoonmad;
import com.hiroshi.cimoc.source.ChuiXue;
<<<<<<<
import com.hiroshi.cimoc.source.... |
<<<<<<<
import org.springframework.boot.test.system.OutputCaptureRule;
import static org.hamcrest.CoreMatchers.containsString;
import static org.junit.Assert.assertThat;
=======
import static org.assertj.core.api.Assertions.assertThat;
>>>>>>>
import org.springframework.boot.test.system.OutputCaptureRule;
import s... |
<<<<<<<
import java.util.List;
=======
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
>>>>>>>
import java.util.List;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
<<<<<<<
// push just the tags listed in the pom rather than all images using i... |
<<<<<<<
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
=======
import java.io.Serializable;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
>>>>>>>
import java.io.Serializable;
import java.util.HashMap;
import java.u... |
<<<<<<<
public List<Route> getWhere() {
return where;
}
=======
public List<String> getWhere() { return where; }
/**
* Filters given messages based on filters defined in
* this object.
* @param message the message to be filtered.
... |
<<<<<<<
if(inputMetric != null){
inputMetric.waitForMetricReport();
}
=======
>>>>>>>
<<<<<<<
isClosed.set(true);
=======
if(inputMetric != null){
inputMetric.waitForReportMetrics();
}
>>>>>>>
if(inputMetric != null){
... |
<<<<<<<
=======
import java.nio.charset.Charset;
import java.nio.charset.UnsupportedCharsetException;
import java.security.PrivilegedAction;
import java.util.Map;
>>>>>>>
import java.nio.charset.Charset;
import java.nio.charset.UnsupportedCharsetException;
import java.security.PrivilegedAction;
import java.util.Map;... |
<<<<<<<
String jobPath = "/Users/tudou/Library/Preferences/IntelliJIdea2019.3/scratches/json/emqx/emqx_stream.json";
=======
String jobPath = "D:\\project\\dt-center-flinkx\\flinkx-test\\src\\main\\resources\\dev_test_job\\stream_template.json";
>>>>>>>
String jobPath = "D:\\project\\dt-cente... |
<<<<<<<
case PluginNameConstrant.PHOENIX_READER : reader = new PhoenixReader(config, env); break;
=======
case PluginNameConstrant.SQLSERVER_CDC_READER : reader = new SqlservercdcReader(config, env); break;
>>>>>>>
case PluginNameConstrant.PHOENIX_READER : reader = new PhoenixRead... |
<<<<<<<
import com.dtstack.flinkx.config.*;
import com.dtstack.flinkx.constants.ConfigConstant;
=======
import com.dtstack.flinkx.config.ContentConfig;
import com.dtstack.flinkx.config.DataTransferConfig;
import com.dtstack.flinkx.config.RestartConfig;
import com.dtstack.flinkx.config.TestConfig;
import com.dtstack.f... |
<<<<<<<
import com.dtstack.flinkx.enums.ClusterMode;
import com.dtstack.flinkx.launcher.perJob.PerJobSubmitter;
import com.dtstack.flinkx.options.OptionParser;
import com.dtstack.flinkx.options.Options;
=======
import com.dtstack.flinkx.launcher.perJob.PerJobSubmitter;
>>>>>>>
import com.dtstack.flinkx.util.StringUt... |
<<<<<<<
=======
@Override
public void configure(Configuration parameters) {
LOG.info("binlog configure...");
if (StringUtils.isNotEmpty(binlogConfig.getCat())) {
LOG.info("{}", categories);
categories = Arrays.asList(binlogConfig.getCat().toUpperCase().split(","));
... |
<<<<<<<
import org.apache.commons.lang.StringUtils;
import com.dtstack.flinkx.util.ExceptionUtil;
=======
import com.dtstack.flinkx.util.ExceptionUtil;
>>>>>>>
import org.apache.commons.lang.StringUtils;
import com.dtstack.flinkx.util.ExceptionUtil;
<<<<<<<
DtLogger.config(logConfig, jobId);
=======
... |
<<<<<<<
builder.setLogConfig(logConfig);
=======
builder.setTestConfig(testConfig);
>>>>>>>
builder.setTestConfig(testConfig);
builder.setLogConfig(logConfig); |
<<<<<<<
import com.dtstack.flinkx.util.*;
=======
import com.dtstack.flinkx.util.ClassUtil;
import com.dtstack.flinkx.util.ExceptionUtil;
import com.dtstack.flinkx.util.FileSystemUtil;
import com.dtstack.flinkx.util.StringUtil;
import com.dtstack.flinkx.util.UrlUtil;
>>>>>>>
import com.dtstack.flinkx.util.ClassUtil;... |
<<<<<<<
@OptionRequired(description = "applicationId on yarn cluster")
private String appId;
@OptionRequired(description = "Sync remote plugin root path")
private String remotePluginPath;
private Configuration flinkConfiguration = null;
public Configuration loadFlinkConfiguration() {
... |
<<<<<<<
=======
@Override
public void openInternal(InputSplit inputSplit) throws IOException {
if(isFileEmpty){
return;
}
if (openKerberos) {
ugi.doAs(new PrivilegedAction<Object>() {
@Override
public Object run() {
... |
<<<<<<<
format.setLogConfig(logConfig);
=======
format.setTestConfig(testConfig);
>>>>>>>
format.setLogConfig(logConfig);
format.setTestConfig(testConfig); |
<<<<<<<
import com.dtstack.flinkx.oraclelogminer.reader.OraclelogminerReader;
=======
import com.dtstack.flinkx.phoenix.reader.PhoenixReader;
import com.dtstack.flinkx.phoenix.writer.PhoenixWriter;
>>>>>>>
import com.dtstack.flinkx.oraclelogminer.reader.OraclelogminerReader;
import com.dtstack.flinkx.phoenix.reader.... |
<<<<<<<
LOG.info("subTaskIndex[{}]:{}", taskNumber, row);
}
if (restoreConfig.isRestore()) {
formatState.setState(row.getField(restoreConfig.getRestoreColumnIndex()));
=======
LOG.info("print data subTaskIndex[{}]:{}", taskNumber, row);
>>>>>>>
LOG.inf... |
<<<<<<<
=======
LOG.error("error to analyzeSchema, resultSet = {}, e = {}", resultSet, ExceptionUtil.getErrorMessage(e));
>>>>>>>
LOG.error("error to analyzeSchema, resultSet = {}, e = {}", resultSet, ExceptionUtil.getErrorMessage(e));
<<<<<<<
return ret;
=======
return ... |
<<<<<<<
=======
@OptionRequired(description = "json modify")
private String p = "";
>>>>>>>
@OptionRequired(description = "json modify")
private String p = "";
<<<<<<<
@Override
public String toString() {
return "Options{" +
"mode='" + mode + '\'' +
... |
<<<<<<<
DbUtil.closeDbResources(resultSet, null, null, false);
queryForPolling(endLocationAccumulator.getLocalValue());
=======
DBUtil.closeDBResources(resultSet, null, null, false);
queryForPolling(endLocationAccumulator.getLocalValue().... |
<<<<<<<
=======
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataOutputStream;
>>>>>>>
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataOutputStream;
<<<<<<<
private Map<String, Object> config;
private BufferedWriter bw;
=======
private Confi... |
<<<<<<<
String jobPath = "D:\\dtstack\\flinkx-all\\flinkx-test\\src\\main\\resources\\dev_test_job\\metadatamysql_restapi.json";
=======
String jobPath = "D:\\dtstack\\flinkx-all\\flinkx-test\\src\\main\\resources\\dev_test_job\\hive2metareader.json";
>>>>>>>
String jobPath = "D:\\dtstack\\fl... |
<<<<<<<
import com.google.common.collect.Maps;
import org.apache.hadoop.security.UserGroupInformation;
=======
>>>>>>>
import com.google.common.collect.Maps;
import org.apache.hadoop.security.UserGroupInformation; |
<<<<<<<
import hu.akarnokd.rxjava.interop.RxJavaInterop;
import io.reactivex.Observable;
=======
import retrofit2.Retrofit;
>>>>>>>
import retrofit2.Retrofit;
import hu.akarnokd.rxjava.interop.RxJavaInterop;
import io.reactivex.Observable;
<<<<<<<
public Observable<SponsorsResult> getSponsors(int type) {
=====... |
<<<<<<<
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.*;
import org.apache.hadoop.hive.ql.io.orc.OrcFile;
import org.apache.hadoop.hive.ql.io.orc.OrcInputFormat;
import org.apache.hadoop.hive.ql.io.orc.OrcSerde;
import org.apache.hadoop.hive.ql.io.orc.OrcSplit;
=======
import org.apache.hadoop.f... |
<<<<<<<
=======
public static void main(String[] args) throws Exception {
setLogLevel(Level.INFO.toString());
OptionParser optionParser = new OptionParser(args);
Options launcherOptions = optionParser.getOptions();
findDefaultConfigDir(launcherOptions);
String mode = launc... |
<<<<<<<
builder.setLogConfig(logConfig);
=======
builder.setTestConfig(testConfig);
>>>>>>>
builder.setTestConfig(testConfig);
builder.setLogConfig(logConfig); |
<<<<<<<
@Singleton
public class UpdateAlertsInteractor
{
private final DatabaseHelper helper;
private final AppPrefs prefs;
public Event event;
=======
public class UpdateAlertsInteractor {
private final AppPrefs prefs;
private final RefreshScheduleInteractor... |
<<<<<<<
=======
import org.apache.hadoop.conf.Configuration;
>>>>>>>
import org.apache.hadoop.conf.Configuration; |
<<<<<<<
import com.dtstack.flinkx.util.*;
=======
import com.dtstack.flinkx.restore.FormatState;
import com.dtstack.flinkx.util.ClassUtil;
import com.dtstack.flinkx.util.DateUtil;
import com.dtstack.flinkx.util.StringUtil;
import com.dtstack.flinkx.util.URLUtil;
>>>>>>>
import com.dtstack.flinkx.util.*;
import com.d... |
<<<<<<<
public void setLogConfig(LogConfig logConfig) {
this.logConfig = logConfig;
}
public void setRestoreConfig(RestoreConfig restoreConfig) {
this.restoreConfig = restoreConfig;
}
=======
public void setTestConfig(TestConfig testConfig) {
this.testConfig = testConfig... |
<<<<<<<
List column = config.getJob().getContent().get(0).getWriter().getParameter().getColumn();
metaColumns = MetaColumn.getMetaColumns(column);
=======
writeDelimiter = config.getJob().getContent().get(0).getWriter().getParameter().getStringVal("writeDelimiter", "|");
batchInterval... |
<<<<<<<
public static final String METADATAORACLE_READER = "metadataoraclereader";
=======
public static final String METADATAMYSQL_READER = "metadatamysqlreader";
public static final String GREENPLUM_READER = "greenplumreader";
>>>>>>>
public static final String METADATAORACLE_READER = "metadataorac... |
<<<<<<<
public static final String KUDU_READER = "kudureader";
=======
public static final String BINLOG_READER = "binlogreader";
public static final String KAFKA09_READER = "kafka09reader";
public static final String KAFKA10_READER = "kafka10reader";
public static final String KAFKA11_READER = "k... |
<<<<<<<
=======
@Override
public void configure(Configuration parameters) {
Properties props = geneConsumerProp();
consumerConnector = kafka.consumer.Consumer.createJavaConsumerConnector(new ConsumerConfig(props));
executor = Executors.newFixedThreadPool(1);
queue = new Synch... |
<<<<<<<
import co.touchlab.droidconandroid.shared.network.RefreshScheduleDataRequest;
import co.touchlab.droidconandroid.shared.presenter.AppManager;
=======
import co.touchlab.droidconandroid.shared.data.Event;
import co.touchlab.droidconandroid.shared.data.TimeBlock;
>>>>>>>
import co.touchlab.droidconandroid.shar... |
<<<<<<<
public static final String KEY_LOG = "log";
=======
public static final String KEY_TEST = "test";
public static final String KEY_RESTART = "restart";
>>>>>>>
public static final String KEY_TEST = "test";
public static final String KEY_RESTART = "restart";
public static final Stri... |
<<<<<<<
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import jdk.nashorn.internal.ir.debug.ObjectSizeCalculator;
=======
import jdk.nashorn.internal.ir.debug.ObjectSizeCalculator;
>>>>>>>
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import jdk.nashorn.internal.ir.debu... |
<<<<<<<
} else if (MapUtils.isNotEmpty(binlogConfig.getStart())) {
=======
checkBinlogFile(startPosition.getJournalName());
} else if (start != null && start.size() != 0) {
>>>>>>>
checkBinlogFile(startPosition.getJournalName());
} else if (MapUtils.isNotEmpty(binlogCo... |
<<<<<<<
import com.dtstack.flinkx.rdb.inputformat.JdbcInputSplit;
import com.dtstack.flinkx.rdb.util.DbUtil;
import com.dtstack.flinkx.util.ClassUtil;
=======
>>>>>>>
import com.dtstack.flinkx.rdb.inputformat.JdbcInputSplit;
import com.dtstack.flinkx.rdb.util.DbUtil;
import com.dtstack.flinkx.util.ClassUtil;
<<<<<<... |
<<<<<<<
=======
protected int requestAccumulatorInterval;
protected boolean useMaxFunc;
>>>>>>>
<<<<<<<
if (incrementConfig.isIncrement() && !incrementConfig.isColumnUnique()){
=======
if (useMaxFunc){
>>>>>>>
if (incrementConfig.isIncrement() && !incrementConfig.isU... |
<<<<<<<
case PluginNameConstrant.KUDU_READER : reader = new KuduReader(config, env); break;
case PluginNameConstrant.CLICKHOUSE_READER : reader = new ClickhouseReader(config, env); break;
case PluginNameConstrant.POLARDB_READER : reader = new PolardbReader(config, env); break;
=====... |
<<<<<<<
=======
builder.setBatchInterval(batchSize);
>>>>>>>
builder.setBatchInterval(batchSize); |
<<<<<<<
if ("true".equalsIgnoreCase(System.getProperty("org.pepsoft.worldpainter.westerosCraftMode"))) {
// Leave checkbox and label visible
} else if ("true".equalsIgnoreCase(System.getProperty("org.pepsoft.worldpainter.smoothGroundCover"))) {
labelWesterosCraftFeature.... |
<<<<<<<
boolean isConstant();
float getConstantValue();
=======
Icon getIcon();
>>>>>>>
boolean isConstant();
float getConstantValue();
Icon getIcon(); |
<<<<<<<
private Boolean mBound = false;
private Messenger mService;
private String mShouldBoundUrl = "", mPackageName = "pct.droid";
private static OkHttpClient sHttpClient;
private static Picasso sPicasso;
private static String sDefSystemLanguage;
private static PopcornApplication sInstance;
public PopcornApp... |
<<<<<<<
protected int mTotalPixelCount;
protected int mCropBoundWidthXLeft;
protected int mCropBoundWidthXRight = 0;
protected int mCropBoundHeightYTop;
protected int mCropBoundHeightYBottom = 0;
protected int mIntermediateCropBoundWidthXLeft;
protected int mIntermediateCropBoundWidthXRight;
protected int mInte... |
<<<<<<<
public void testFinishInitializeThenSetUndoRedoButtons() {
when(toolReference.get()).thenReturn(tool);
when(tool.getDrawPaint()).thenReturn(mock(Paint.class));
=======
public void testOnCreateToolCallsToolController() {
presenter.onCreateTool();
verify(toolController).createTool();
verifyNoMoreIn... |
<<<<<<<
case ROTATE:
return R.drawable.icon_menu_rotate;
=======
case LINE:
return R.drawable.icon_menu_straight_line;
>>>>>>>
case ROTATE:
return R.drawable.icon_menu_rotate;
case LINE:
return R.drawable.icon_menu_straight_line; |
<<<<<<<
// The toolbar buttons
protected Toolbar toolbar;
protected boolean showMenu = true;
//request codes
public static final int TOOL_MENU = 0;
public static final int REQ_IMPORTPNG = 1;
=======
private boolean openedWithCatroid;
public enum ToolbarItem {
HAND, ZOOM, BRUSH, EYEDROPPER, MAGICWAND, UNDO... |
<<<<<<<
// if (Utils.isScreenLocked(mSolo.getCurrentActivity())) {
// mScreenLocked = true;
// tearDown();
// assertFalse("Screen is locked!", mScreenLocked);
// return;
// }
Log.d("Paintroid test", "setup" + setup++);
=======
>>>>>>> |
<<<<<<<
int bitmapHeight = PaintroidApplication.DRAWING_SURFACE
.getBitmapHeight();
int bitmapWidth = PaintroidApplication.DRAWING_SURFACE.getBitmapWidth();
if ((coordinate.x > bitmapWidth) || (coordinate.y > bitmapHeight)) {
return false;
}
if (mBitmapPaint.getColor() == PaintroidApplication.DRAWIN... |
<<<<<<<
private DrawingSurfaceThread mDrawingThread;
private Bitmap mWorkingBitmap;
private final Rect mWorkingBitmapRect;
private final Canvas mWorkingBitmapCanvas;
private final Paint mFramePaint;
private final Paint mClearPaint;
protected Perspective mSurfacePerspective;
protected boolean mSurfaceCanBeUsed;
... |
<<<<<<<
public static void startActivity(Context context, Media media) {
Intent intent = new Intent(PopcornApplication.getAppContext(), MediaDetailActivity.class);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
sMedia = media;
PopcornApplication.getAppContext().startActivity(intent)... |
<<<<<<<
import at.tugraz.ist.paintroid.MainActivity.ToolType;
=======
import at.tugraz.ist.paintroid.MainActivity.ToolbarItem;
import at.tugraz.ist.paintroid.R;
>>>>>>>
import at.tugraz.ist.paintroid.MainActivity.ToolType;
import at.tugraz.ist.paintroid.R;
<<<<<<<
import at.tugraz.ist.paintroid.helper.Toolbar;
impo... |
<<<<<<<
package org.catrobat.paintroid.tools.implementation;
import org.catrobat.paintroid.PaintroidApplication;
import org.catrobat.paintroid.R;
import org.catrobat.paintroid.command.Command;
import org.catrobat.paintroid.command.implementation.StampCommand;
import org.catrobat.paintroid.dialog.colorpicker.ColorPicke... |
<<<<<<<
=======
filenames.add(PaintroidApplication.savedPictureUri.toString());
>>>>>>>
filenames.add(PaintroidApplication.savedPictureUri.toString());
<<<<<<<
mSolo.waitForDialogToOpen(SHORT_TIMEOUT);
mSolo.waitForDialogToClose(TIMEOUT);
assertNotSame(imageFile, PaintroidApplication.savedBitmapFile);
... |
<<<<<<<
import android.graphics.Point;
import at.tugraz.ist.paintroid.ui.Perspective;
import at.tugraz.ist.paintroid.ui.implementation.PerspectiveImplementation;
=======
import android.graphics.Bitmap.Config;
import android.graphics.Canvas;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.draw... |
<<<<<<<
import org.catrobat.paintroid.listener.TransformToolOptionsListener;
=======
import org.catrobat.paintroid.listener.LayerListener;
>>>>>>>
import org.catrobat.paintroid.listener.TransformToolOptionsListener;
import org.catrobat.paintroid.listener.LayerListener; |
<<<<<<<
@Test
public void testBrushToolBackPressedFromCatroidAndUsePicture() throws SecurityException, IllegalArgumentException,
NoSuchFieldException, IllegalAccessException {
mTestCaseWithActivityFinished = true;
mSolo.clickOnScreen(mScreenWidth / 2, mScreenHeight / 2);
String pathToFile = Environment.get... |
<<<<<<<
// Rotate (on symbol)
if (clickCoordinatesRotatedX < this.toolPosition.x - this.width / 2 - roationSymbolDistance
&& clickCoordinatesRotatedX > this.toolPosition.x - this.width / 2 - roationSymbolDistance
- roationSymbolWidth
&& clickCoordinatesRotatedY < this.toolPosition.y - this.height... |
<<<<<<<
=======
import android.annotation.SuppressLint;
import android.content.pm.ActivityInfo;
import android.graphics.Color;
import android.graphics.PointF;
import android.support.test.InstrumentationRegistry;
>>>>>>>
import android.content.pm.ActivityInfo;
import android.graphics.Color;
import android.graphics.Po... |
<<<<<<<
import org.catrobat.paintroid.tools.implementation.RectangleFillTool;
import org.catrobat.paintroid.tools.implementation.RotationTool;
=======
>>>>>>>
import org.catrobat.paintroid.tools.implementation.RotationTool; |
<<<<<<<
private int mPresetButtonHeight = (int) (50.0f * mScale + 0.5f);
private TableLayout mTableLayout;
=======
private int COLOR_BUTTON_MARGIN = 2;
>>>>>>>
private TableLayout mTableLayout;
private int COLOR_BUTTON_MARGIN = 2;
<<<<<<<
colorButtonLayoutParameters.setMargins(2, 2, 2, 2);
=======
color... |
<<<<<<<
public static Boolean DEBUG_ENABLED = BuildConfig.DEBUG; // will be set to true for debug builds and false for release builds
public static final String LOG_TAG = "PopcornTimeForAndroid";
public static final String PREFS_FILE = "PCT_Prefs";
public static final String DATABASE_NAME = "PCT_DB.db";... |
<<<<<<<
private ToolButton[] buttons = {
new ToolButton(R.drawable.brush64, R.string.button_brush, ToolType.BRUSH),
new ToolButton(R.drawable.cursor64, R.string.button_cursor, ToolType.CURSOR),
// new ToolButton(R.drawable.scroll64, R.string.button_choose, ToolType.SCROLL),
new ToolButton(R.drawable.pipett... |
<<<<<<<
=======
mButtonsList.add(new ToolButton(R.drawable.brush64, R.string.button_brush, ToolType.BRUSH));
mButtonsList.add(new ToolButton(R.drawable.cursor64, R.string.button_cursor, ToolType.CURSOR));
mButtonsList.add(new ToolButton(R.drawable.pipette64, R.string.button_pipette, ToolType.PIPETTE));
mButto... |
<<<<<<<
import at.tugraz.ist.paintroid.MainActivity.ToolType;
=======
import at.tugraz.ist.paintroid.MainActivity.ToolbarItem;
>>>>>>>
import at.tugraz.ist.paintroid.MainActivity.ToolType;
<<<<<<<
import at.tugraz.ist.zoomscroll.ZoomStatus;
/**
* Base class for on-Touch events on the DrawSurface
*
* Status: re... |
<<<<<<<
MapHandler STRING_STRING_MAP_HANDLER = new StringStringMapHandler(
(engine, serviceName) -> engine.getFilePerKeyMap(serviceName));
=======
MapHandler STRING_STRING_MAP_HANDLER = new StringStringMapHandler((engine, serviceName) ->
engine.getFilePerKeyMap(serviceName));
>>>>>>>
... |
<<<<<<<
NotificationCompat.Builder notification = new NotificationCompat.Builder(mContext, bundle.getString("channel"))
.setContentTitle(title)
.setContentText(bundle.getString("body"))
.setTicker(bundle.getString("ticker"))
.setVisibility(Notific... |
<<<<<<<
Bugsnag.onActivityResume(this);
getApp().startService();
CastingManager.getInstance(this).addListener(this);
}
@Override
protected void onPause() {
super.onPause();
Bugsnag.onActivityPause(this);
CastingManager.getInstance(this).removeListener(this);
}
@Override
protected void on... |
<<<<<<<
private static OkHttpClient sHttpClient;
private static Picasso sPicasso;
private static String sDefSystemLanguage;
private static PopcornApplication sInstance;
public PopcornApplication() {
sInstance = this;
}
public static PopcornApplication getInstance() {
return sInstance;
}
@Override
publi... |
<<<<<<<
public static void addItemToWishlist(final Context context, final CompressedWishlistInfo wishlistInfo) {
final ArrayList<MtgCard> currentWishlist = ReadWishlist(context, false);
=======
public static void addItemToWishlist(final Activity activity, final CompressedWishlistInfo wishlistInfo) {
... |
<<<<<<<
=======
import com.gelakinetic.mtgfam.helpers.database.CardDbAdapter;
import com.gelakinetic.mtgfam.helpers.database.DatabaseManager;
import com.gelakinetic.mtgfam.helpers.database.FamiliarDbException;
import com.gelakinetic.mtgfam.helpers.NumberButtonOnClickListener;
>>>>>>>
import com.gelakinetic.mtgfam.he... |
<<<<<<<
public synchronized @DrawableRes int getTapSymbol() {
return context.getResources().getIdentifier(
this.prefs.getString(context.getString(R.string.key_tap_symbol), "glyph_tap"),
"drawable",
context.getPackageName()
);
}
public synchro... |
<<<<<<<
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
=======
import android.support.v4.content.ContextCompat;
>>>>>>>
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.content.ContextCompat;
<<<<<<<
mFor... |
<<<<<<<
import com.gelakinetic.mtgfam.helpers.ToastWrapper;
=======
import com.gelakinetic.mtgfam.helpers.DecklistHelpers.CompressedDecklistInfo;
import com.gelakinetic.mtgfam.helpers.SnackbarWrapper;
import com.gelakinetic.mtgfam.helpers.database.CardDbAdapter;
import com.gelakinetic.mtgfam.helpers.database.Database... |
<<<<<<<
import android.widget.CheckBox;
import android.widget.CompoundButton;
=======
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.CompoundButton;
>>>>>>>
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.CompoundButton;
<<<<<<<
import org.moz... |
<<<<<<<
import android.widget.Button;
=======
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
>>>>>>>
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.Button;
<<<<<<<
=======
import android.widget.Spinner;
import android.widget.SpinnerAdapter;
>>... |
<<<<<<<
=======
import org.acra.ACRA;
import org.mozilla.mozstumbler.service.AppGlobals;
>>>>>>>
import org.acra.ACRA;
<<<<<<<
public class DataStorageManager implements IDataStorageManager {
ILogger Log = (ILogger) ServiceLocator.getInstance().getService(ILogger.class);
=======
public class DataStorageManage... |
<<<<<<<
import android.telephony.TelephonyManager;
=======
>>>>>>>
import android.telephony.TelephonyManager;
<<<<<<<
=======
import org.mozilla.mozstumbler.service.Prefs;
import org.mozilla.mozstumbler.service.core.logging.Log;
import org.mozilla.mozstumbler.service.stumblerthread.Reporter;
>>>>>>>
import org... |
<<<<<<<
setActiveLocationUpdatesEnabled(false);
}
public void setActiveLocationUpdatesEnabled(boolean enable) {
if (enable) {
// enable NetworkLocationListener first because GpsLocationListener will disable it
enableLocationListener(true, mNetworkLocationListener);
... |
<<<<<<<
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.CompoundButton;
=======
>>>>>>>
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.CompoundButton;
<<<<<<<
import org.mozilla.mozstumbler.service.Prefs;
import static org.mozilla.mozstumbler... |
<<<<<<<
import org.mozilla.mozstumbler.service.utils.NetworkInfo;
=======
import org.mozilla.mozstumbler.service.stumblerthread.datahandling.DataStorageContract;
import org.mozilla.mozstumbler.service.utils.NetworkUtils;
>>>>>>>
import org.mozilla.mozstumbler.service.utils.NetworkInfo;
import org.mozilla.mozstumbler... |
<<<<<<<
import org.mozilla.mozstumbler.service.Prefs;
=======
import org.mozilla.mozstumbler.service.stumblerthread.motiondetection.LocationChangeSensor;
import org.mozilla.mozstumbler.service.stumblerthread.motiondetection.MotionSensor;
>>>>>>>
import org.mozilla.mozstumbler.service.AppGlobals;
import org.mozilla.m... |
<<<<<<<
=======
>>>>>>> |
<<<<<<<
void captureCharacterDataFromObservedStates(){
if (observedStates ==null){
if (data != null)
data.removeListener(this);
data = null;
}
else {
CharacterData temp = observedStates.getParentData();
if (temp != data){
if (data != null)
data.removeListener(this);
if (temp != null)... |
<<<<<<<
int startLine = charCoords.y;
while (startLine > - getScrollBuffer().getLineCount()
&& myBackBuffer.getLine(startLine - 1).isWrapped()) {
startLine--;
}
int endLine = charCoords.y;
while (endLine < myBackBuffer.getHeight(... |
<<<<<<<
=======
public void addModelListener(TerminalModelListener listener) {
myListeners.add(listener);
}
public void removeModelListener(TerminalModelListener listener) {
myListeners.remove(listener);
}
private void fireModelChangeEvent() {
for (TerminalModelListener modelListener: myListen... |
<<<<<<<
@Override
public void setVolume(float volume) {
currentVolume = volume;
player.setVolume(volume, volume);
}
@Override
public float getVolume() {
return currentVolume;
}
=======
@Override
public int getCurrentTimestamp () {
return player.getCurrentPosition();
}
>>>>>>>
@Overri... |
<<<<<<<
=======
import android.os.Parcelable;
import android.util.Log;
>>>>>>>
import android.os.Parcelable;
<<<<<<<
private static String WECHAT_DETAILS_EN = "Details";
private static String WECHAT_DETAILS_CH = "红包详情";
private static String WECHAT_BETTER_LUCK_EN = "Better luck next time!";
private ... |
<<<<<<<
public HaeinsaResult get(@Nullable Transaction tx, HaeinsaGet get) throws IOException {
Preconditions.checkNotNull(get);
if (tx == null){
return getWithoutTx(get);
}
=======
public HaeinsaResult get(HaeinsaTransaction tx, HaeinsaGet get) throws IOException {
>>>>>>>
public HaeinsaResult get... |
<<<<<<<
* Creates an identifier from a string for the given authority.
*/
private ReferenceIdentifier createIdentifier(final Citation authority, final String identifier) {
if (authority == getAuthority()) {
return new ImmutableIdentifier(authority, getCodeSpace(), identifier, getVersio... |
<<<<<<<
=======
import org.apache.sis.internal.jdk8.DateTimeException;
import org.opengis.feature.Feature;
import org.opengis.feature.FeatureType;
import org.opengis.feature.PropertyType;
import org.opengis.feature.AttributeType;
>>>>>>>
import org.opengis.feature.Feature;
import org.opengis.feature.FeatureType;
imp... |
<<<<<<<
import org.opengis.referencing.ReferenceIdentifier;
=======
import org.apache.sis.internal.jaxb.Context;
import org.apache.sis.internal.metadata.NameMeaning;
>>>>>>>
import org.opengis.referencing.ReferenceIdentifier;
import org.apache.sis.internal.jaxb.Context;
import org.apache.sis.internal.metadata.NameMe... |
<<<<<<<
import org.opengis.metadata.citation.ResponsibleParty;
import org.opengis.metadata.citation.Series;
import org.opengis.metadata.constraint.Constraints;
import org.opengis.metadata.content.ContentInformation;
import org.opengis.metadata.distribution.Distribution;
import org.opengis.metadata.distribution.Format;
... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.