conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
import com.sleekbyte.tailor.antlr.SwiftParser.GenericParameterContext;
=======
import com.sleekbyte.tailor.antlr.SwiftParser.GetterClauseContext;
>>>>>>>
import com.sleekbyte.tailor.antlr.SwiftParser.GenericParameterContext;
import com.sleekbyte.tailor.antlr.SwiftParser.GetterClauseContext; |
<<<<<<<
public static final String ONLY_SPECIFIC_RULES_DESC = "run only the specified rules";
public static final String EXCEPT_RULES_DESC = "run all rules except the specified ones";
=======
public static final String XCODE_INTEGRATION_DESC = "add Tailor Build Phase Run Script to Xcode Project";
>>>>>>>... |
<<<<<<<
import static com.sleekbyte.tailor.antlr.SwiftParser.ElseClauseContext;
import static com.sleekbyte.tailor.antlr.SwiftParser.ExpressionContext;
import static com.sleekbyte.tailor.antlr.SwiftParser.ForInStatementContext;
import static com.sleekbyte.tailor.antlr.SwiftParser.ForStatementContext;
import static com.... |
<<<<<<<
printer.error(Rules.WHITESPACE, Messages.OPERATOR + Messages.SPACE_BEFORE,
ListenerUtil.getContextStopLocation(op));
=======
printer.error(Messages.OPERATOR + Messages.SPACE_BEFORE,
ListenerUtil.getContextStartLocation(op)... |
<<<<<<<
private void displayMessages(List<Map<String, Object>> violations, boolean parsed, String filePath)
throws IOException {
=======
private void storeMessages(List<Map<String, Object>> violations, boolean parsed) throws IOException {
>>>>>>>
private void storeMessages(List<Map<String, Object... |
<<<<<<<
addExpectedMsg(40, 21, Messages.ERROR, Messages.STATEMENTS);
addExpectedMsg(64, 2, Messages.ERROR, Messages.STATEMENTS);
=======
addExpectedMsg(40, 23, Messages.ERROR, Messages.STATEMENTS);
addExpectedMsg(41, 6, Messages.ERROR, Messages.STATEMENTS);
addExpectedMsg(42, 2... |
<<<<<<<
import com.sleekbyte.tailor.output.Printer;
import com.sleekbyte.tailor.swift.SwiftLexer;
import com.sleekbyte.tailor.swift.SwiftParser;
=======
>>>>>>>
import com.sleekbyte.tailor.output.Printer; |
<<<<<<<
public static final String XCODE_INTEGRATION_DESC = "add Tailor Build Phase Run Script to Xcode Project";
=======
public static final String DEBUG_DESC = "print ANTLR error messages when parsing error occurs";
public static final String NO_COLOR_DESC = "disable colorized console output";
publi... |
<<<<<<<
import com.sleekbyte.tailor.utils.ArgumentParser;
import com.sleekbyte.tailor.utils.ArgumentParser.ArgumentParserException;
=======
import com.sleekbyte.tailor.utils.CliArgumentParserException;
>>>>>>>
import com.sleekbyte.tailor.utils.ArgumentParser;
import com.sleekbyte.tailor.utils.ArgumentParser.Argument... |
<<<<<<<
private Eddy makeEddy() {
EddyPlugin.getInstance(myFixture.getProject()).initLibrariesEnv();
=======
private Eddy makeEddy(@Nullable String special) {
EnvironmentProcessor.clearGlobalEnvironment();
>>>>>>>
private Eddy makeEddy(@Nullable String special) {
EddyPlugin.getInstance(myFixture.ge... |
<<<<<<<
import scala.runtime.AbstractFunction2;
=======
import scala.runtime.AbstractFunction1;
>>>>>>>
import scala.runtime.AbstractFunction1;
import scala.runtime.AbstractFunction2;
<<<<<<<
private String unabbrev(final String abbrev) {
for (final Alt<ShowStmts> r : results)
=======
public String ... |
<<<<<<<
import fr.inria.papart.procam.Screen;
=======
import fr.inria.papart.procam.display.ARDisplay;
import fr.inria.papart.procam.PaperScreen;
>>>>>>>
import fr.inria.papart.procam.display.ARDisplay;
import fr.inria.papart.procam.PaperScreen;
<<<<<<<
import fr.inria.papart.multitouch.detection.ArmDetection;
impo... |
<<<<<<<
io.lumify.core.user.User authUser = CurrentUser.get(resource.session());
if (authUser == null) {
=======
String authUserId = AuthenticationProvider.getUserId(resource.session());
if (authUserId == null) {
>>>>>>>
String authUserId = CurrentUser.get(... |
<<<<<<<
import fr.inria.papart.depthcam.DepthAnalysis;
import fr.inria.papart.depthcam.devices.KinectDepthAnalysis;
import fr.inria.papart.depthcam.PixelOffset;
=======
>>>>>>>
import fr.inria.papart.depthcam.DepthAnalysis;
import fr.inria.papart.depthcam.devices.KinectDepthAnalysis;
import fr.inria.papart.depthcam.... |
<<<<<<<
import androidx.annotation.NonNull;
=======
import android.os.Environment;
import android.support.annotation.NonNull;
>>>>>>>
import androidx.annotation.NonNull;
<<<<<<<
=======
import com.zhongjh.albumcamerarecorder.settings.CameraSpec;
import com.zhongjh.albumcamerarecorder.settings.GlobalSpec;
import c... |
<<<<<<<
* 为保存内部和外部文件的位置提供的捕获策略{@link androidx.core.content.FileProvider}.
=======
* 保存文件的位置{@link android.support.v4.content.FileProvider}.
>>>>>>>
* 保存文件的位置{@link androidx.core.content.FileProvider}. |
<<<<<<<
=======
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
>>>>>>>
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
<<<<<<<
//private static... |
<<<<<<<
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.OutputStream;
import java.io.Serializable;
import java.lang.reflect.Method;
import java.security.... |
<<<<<<<
private List<ClientApiWorkspaceDiff.Item> diffEdge(Workspace workspace, Edge edge, Authorizations hiddenAuthorizations) {
List<ClientApiWorkspaceDiff.Item> result = new ArrayList<ClientApiWorkspaceDiff.Item>();
=======
private List<ClientApiWorkspaceDiff.Item> diffEdge(Workspace workspace, Edg... |
<<<<<<<
import java.util.Collection;
import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
import java.util.ResourceBundle;
=======
import java.util.Collection;
import java.util.Iterator;
import java.util.Locale;
import java.util.ResourceBundle;
>>>>>>>
import java.util.Collection;
import java.... |
<<<<<<<
import com.altamiracorp.lumify.core.model.ontology.PropertyType;
import com.altamiracorp.lumify.core.model.properties.EntityLumifyProperties;
=======
import com.altamiracorp.lumify.core.model.properties.EntityLumifyProperties;
>>>>>>>
import com.altamiracorp.lumify.core.model.ontology.PropertyType;
import co... |
<<<<<<<
import java.util.*;
=======
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFListener;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
>>>>>>>
import java.util.*;
imp... |
<<<<<<<
import com.altamiracorp.securegraph.Property;
import com.google.common.collect.ImmutableMap;
=======
import com.altamiracorp.securegraph.Graph;
import com.google.inject.Inject;
>>>>>>>
import com.altamiracorp.securegraph.Graph;
import com.altamiracorp.securegraph.Property;
import com.google.inject.Inject; |
<<<<<<<
Method m =
clazz.getMethod("handleExceptionList", new Class[] { FacesContext.class,
Exception.class });
m.invoke(errorHandler, new Object[] { facesContext, li });
}
... |
<<<<<<<
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
=======
>>>>>>>
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
<<<<<<<
import java.util.Set... |
<<<<<<<
return !resource.startsWith("/custom_") &&
!resource.equals("/terrain_nh.png") &&
!resource.equals("/terrain_s.png") &&
!resource.matches("^/mob/.*\\d+.png$")
;
=======
return !resource.startsWith("/custom_") &&
!resource.equals("/terrain... |
<<<<<<<
public void pipeFile(final LogSource logSource, final ProfileListener listener) {
=======
private Monitor() {
// utility class
}
public static void pipeFile(final LogSource logSource, final ProfileListener listener) throws IOException {
>>>>>>>
private Monitor() {
// utili... |
<<<<<<<
import static com.insightfullogic.honest_profiler.ports.javafx.util.ResourceUtil.COLUMN_SELF_PCT;
import static com.insightfullogic.honest_profiler.ports.javafx.util.ResourceUtil.COLUMN_TOTAL_PCT;
=======
import static com.insightfullogic.honest_profiler.ports.javafx.util.ResourceUtil.GENERAL_DEPTH;
import st... |
<<<<<<<
=======
>>>>>>>
<<<<<<<
private static SetupWizard wizard;
private ViewDragHelper dragHelper;
private int dragRange;
private View dragContentView;
private View topView;
private int contentTop;
private int topViewHeight;
private boolean isRefreshing;
private boolean shou... |
<<<<<<<
import android.support.design.widget.FloatingActionButton;
import android.support.v4.app.Fragment;
=======
>>>>>>>
import android.support.design.widget.FloatingActionButton;
import android.support.v4.app.Fragment;
<<<<<<<
mBtnNextChallenge = (FloatingActionButton)findViewById(R.id.btnNextChallenge);... |
<<<<<<<
import android.support.design.widget.TabLayout;
import android.support.v4.view.ViewPager;
=======
>>>>>>> |
<<<<<<<
=======
import com.altamiracorp.lumify.core.security.VisibilityTranslator;
>>>>>>>
import com.altamiracorp.lumify.core.security.VisibilityTranslator;
<<<<<<<
import com.altamiracorp.securegraph.Edge;
import com.altamiracorp.securegraph.Graph;
import com.altamiracorp.securegraph.Visibility;
=======
import ... |
<<<<<<<
import cn.nukkit.level.Sound;
import cn.nukkit.level.chunk.Chunk;
=======
import cn.nukkit.item.ItemBlock;
import cn.nukkit.level.format.FullChunk;
>>>>>>>
import cn.nukkit.level.chunk.Chunk; |
<<<<<<<
import cn.nukkit.player.Player;
=======
import cn.nukkit.utils.BlockColor;
>>>>>>>
import cn.nukkit.player.Player;
import cn.nukkit.utils.BlockColor; |
<<<<<<<
// public static ImmutableMap<Integer, String> LEGACY_IDS = ImmutableMap.<Integer, String>builder()
// .put(51, "minecraft:npc")
// .put(Blaze.NETWORK_ID, "minecraft:blaze")
// .put(CaveSpider.NETWORK_ID, "minecraft:cave_spider")
// .put(Creeper.NETWORK_ID, "minecr... |
<<<<<<<
this.containerRecipes.put(getItemHash(input.getId(), potion.getDamage()), recipe);
=======
this.containerRecipes.put(getContainerHash(input.getId(), potion.getId()), recipe);
>>>>>>>
this.containerRecipes.put(getContainerHash(input.getId(), potion.getDamage()), recipe); |
<<<<<<<
import cn.nukkit.player.Player;
=======
import cn.nukkit.utils.BlockColor;
import cn.nukkit.utils.DyeColor;
>>>>>>>
import cn.nukkit.player.Player;
import cn.nukkit.utils.BlockColor;
import cn.nukkit.utils.DyeColor; |
<<<<<<<
import cn.nukkit.player.Player;
=======
import cn.nukkit.nbt.tag.IntTag;
import cn.nukkit.nbt.tag.Tag;
>>>>>>>
import cn.nukkit.nbt.tag.IntTag;
import cn.nukkit.nbt.tag.Tag;
import cn.nukkit.player.Player; |
<<<<<<<
import cn.nukkit.level.Level;
=======
import cn.nukkit.utils.Color;
>>>>>>>
import cn.nukkit.level.Level;
import cn.nukkit.utils.Color; |
<<<<<<<
import java.net.InetAddress;
import java.net.InetSocketAddress;
=======
import java.io.ByteArrayInputStream;
import java.io.IOException;
>>>>>>>
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.io.ByteArrayInputStream;
import java.io.IOException; |
<<<<<<<
import cn.nukkit.math.Vector3f;
import cn.nukkit.player.Player;
import cn.nukkit.utils.Identifier;
import static cn.nukkit.block.BlockIds.LIT_REDSTONE_LAMP;
import static cn.nukkit.block.BlockIds.REDSTONE_LAMP;
=======
import cn.nukkit.utils.BlockColor;
>>>>>>>
import cn.nukkit.math.Vector3f;
import cn.nukk... |
<<<<<<<
protected int getBlockId(int x, int z, NukkitRandom random, Chunk chunk) {
return TALL_GRASS << 4;
=======
protected int getBlockId(int x, int z, NukkitRandom random, FullChunk chunk) {
return (TALL_GRASS << 4) | 1;
>>>>>>>
protected int getBlockId(int x, int z, NukkitRandom rando... |
<<<<<<<
LightningBolt bolt = new LightningBolt(EntityTypes.LIGHTNING_BOLT, chunk, nbt);
=======
EntityLightning bolt = (EntityLightning) Entity.createEntity("Lightning", chunk, nbt);
if(bolt == null) return;
>>>>>>>
LightningBolt bolt = new LightningBolt(EntityTypes.LI... |
<<<<<<<
String blockId = (String) recipe.get("block");
Identifier block = blockId == null ? null : Identifier.fromString(blockId);
=======
Identifier craftingBlock = BlockIds.AIR;
if (recipe.get("block") != null) {
craftingBlock = Ide... |
<<<<<<<
VertexBuilder builder = graph.prepareVertex(DEFAULT_VISIBILITY, getAuthorizations());
CONCEPT_TYPE.setProperty(builder, TYPE_RELATIONSHIP, DEFAULT_VISIBILITY);
ONTOLOGY_TITLE.setProperty(builder, relationshipName, DEFAULT_VISIBILITY);
DISPLAY_NAME.setProperty(builder, displayName... |
<<<<<<<
import cn.nukkit.math.Vector3f;
import cn.nukkit.math.Vector3i;
import cn.nukkit.player.Player;
import cn.nukkit.utils.Identifier;
import static cn.nukkit.block.BlockIds.UNLIT_REDSTONE_TORCH;
=======
import cn.nukkit.math.Vector3;
import cn.nukkit.utils.BlockColor;
>>>>>>>
import cn.nukkit.math.Vector3f;
im... |
<<<<<<<
=======
import cn.nukkit.item.ItemBlock;
import cn.nukkit.item.ItemBucket;
>>>>>>>
import cn.nukkit.item.ItemBlock;
import cn.nukkit.item.ItemBucket;
<<<<<<<
updateBlockPacket.dataLayer = layer;
=======
updateBlockPacket.dataLayer = dataLayer;
>>>>>>>
updateBlockPacket... |
<<<<<<<
if (this.getMeta() >= 8) {
if (!this.canFlowInto(this.level.getBlock((int) this.getX(), (int) this.getY(), (int) this.getZ() - 1)) ||
!this.canFlowInto(this.level.getBlock((int) this.getX(), (int) this.getY(), (int) this.getZ() + 1)) ||
!this.canFlowIn... |
<<<<<<<
import cn.nukkit.utils.Identifier;
=======
import cn.nukkit.utils.BlockColor;
>>>>>>>
import cn.nukkit.utils.BlockColor;
import cn.nukkit.utils.Identifier; |
<<<<<<<
public boolean onBreak(Item item) {
this.getLevel().setBlock(this.getPosition(), Block.get(WATER), true);
return true;
=======
public boolean onBreak(Item item, Player player) {
if (player.getGamemode() == Player.CREATIVE) {
return this.getLevel().setBlock(this, Blo... |
<<<<<<<
=======
@Override
public Color getMapColor() {
return Color.diamondColor;
}
>>>>>>>
@Override
public Color getMapColor() {
return Color.diamondColor;
} |
<<<<<<<
private class LoadingChunk implements Predicate<ChunkPos>, Function<ChunkPos, CompletableFuture<Chunk>> {
=======
@ToString
private class LoadingChunk {
>>>>>>>
@ToString
private class LoadingChunk implements Predicate<ChunkPos>, Function<ChunkPos, CompletableFuture<Chunk>> {
<<<<<<<
... |
<<<<<<<
import cn.nukkit.utils.Identifier;
import static cn.nukkit.block.BlockIds.STONE_SLAB2;
=======
import cn.nukkit.utils.BlockColor;
>>>>>>>
import cn.nukkit.utils.BlockColor;
import cn.nukkit.utils.Identifier;
import static cn.nukkit.block.BlockIds.STONE_SLAB2; |
<<<<<<<
this.getLevel().setBlock(this.getPosition(), Block.get(AIR), true, true);
this.getLevel().addSound(this.getPosition(), Sound.BLOCK_ITEMFRAME_REMOVE_ITEM);
=======
super.onBreak(item);
this.getLevel().addSound(this.asVector3f(), Sound.BLOCK_ITEMFRAME_REMOVE_ITEM);
>>>>>>>
... |
<<<<<<<
import com.nukkitx.math.vector.Vector3f;
import lombok.val;
import org.cloudburstmc.server.block.Block;
import org.cloudburstmc.server.block.BlockCategory;
import org.cloudburstmc.server.block.BlockState;
import org.cloudburstmc.server.block.BlockTraits;
import org.cloudburstmc.server.block.trait.EnumBlockTrait... |
<<<<<<<
import cn.nukkit.player.Player;
import cn.nukkit.utils.Identifier;
=======
import cn.nukkit.utils.BlockColor;
>>>>>>>
import cn.nukkit.player.Player;
import cn.nukkit.utils.BlockColor;
import cn.nukkit.utils.Identifier;
<<<<<<<
=======
@Override
public int getFullId() {
return this.getId(... |
<<<<<<<
import net.daporkchop.lib.random.impl.ThreadLocalPRandom;
=======
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.math.vector.Vector3i;
>>>>>>>
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.math.vector.Vector3i;
import net.daporkchop.lib.random.impl.ThreadLocalPRandom;
<<<<<<<
... |
<<<<<<<
import cn.nukkit.entity.EntityTypes;
import cn.nukkit.entity.vehicle.ChestMinecart;
=======
import cn.nukkit.entity.Entity;
import cn.nukkit.entity.item.EntityMinecartChest;
>>>>>>>
import cn.nukkit.entity.EntityTypes;
import cn.nukkit.entity.vehicle.ChestMinecart;
<<<<<<<
ChestMinecart minecart... |
<<<<<<<
import cn.nukkit.utils.Identifier;
=======
import cn.nukkit.utils.BlockColor;
>>>>>>>
import cn.nukkit.utils.BlockColor;
import cn.nukkit.utils.Identifier;
<<<<<<<
=======
@Override
public String getName() {
return "Purpur Stairs";
}
@Override
public BlockColor getColor() {
... |
<<<<<<<
public abstract class DataPacket extends BinaryStream {
=======
public abstract class DataPacket extends BinaryStream implements Cloneable {
>>>>>>>
public abstract class DataPacket implements Cloneable {
public int offset = 0;
public byte[] buffer = new byte[0];
<<<<<<<
@Override
public voi... |
<<<<<<<
int width = container.getWidth();
int height = container.getHeight();
// set the cursor
try {
// hide the native cursor
int min = Cursor.getMinCursorSize();
IntBuffer tmp = BufferUtils.createIntBuffer(min * min);
Cursor emptyCursor = new Cursor(min, min, min/2, min/2, 1, tmp, null);
cont... |
<<<<<<<
public static void drawResultScrollbar(Graphics g, float position, float total) {
UI.drawScrollbar(g, position, total, maxResultsShown * buttonOffset,
buttonBaseX, buttonBaseY,
buttonWidth * 1.01f, (maxResultsShown-1) * buttonOffset + buttonHeight,
BG_NORMAL, Color.white, true);
=======
pub... |
<<<<<<<
=======
/** The current tick time for the follow circle expanding animation. */
private int tickExpandTime = 0;
/** The duration of the follow circle expanding animation on ticks. */
private static final int TICK_EXPAND_TIME = 200;
>>>>>>>
/** The current tick time for the follow circle expanding anim... |
<<<<<<<
import yugecin.opsudance.ui.nodelist.NodeList;
import yugecin.opsudance.utils.Stack;
=======
import yugecin.opsudance.ui.cursor.colors.CursorColor;
>>>>>>>
import yugecin.opsudance.ui.cursor.colors.CursorColor;
import yugecin.opsudance.ui.nodelist.NodeList;
import yugecin.opsudance.utils.Stack;
<<<<<<<
s... |
<<<<<<<
MUSIC_PLAY ("music-play", "png", false, false),
MUSIC_PAUSE ("music-pause", "png", false, false),
MUSIC_NEXT ("music-next", "png", false, false),
MUSIC_PREVIOUS ("music-previous", "png", false, false),
RANKING_RETRY ("ranking-retry", "png", false, false),
RANKING_EXIT ("ranking-back", "png", false, false)... |
<<<<<<<
if (isLeadIn()) { // stop updating during song lead-in
leadInTime -= delta;
if (!isLeadIn())
MusicController.resume();
return;
}
int trackPosition = MusicController.getPosition();
if (!isReplay) {
=======
if (GameMod.AUTO.isActive() || GameMod.AUTOPILOT.isActive()) {
mouseX = autoMo... |
<<<<<<<
if (!Options.noSingleInstance()) {
try {
SERVER_SOCKET = new ServerSocket(Options.getPort(), 1, InetAddress.getLocalHost());
} catch (UnknownHostException e) {
// shouldn't happen
} catch (IOException e) {
ErrorHandler.error(String.format(
=======
try {
SERVER_SOCKET = new ServerSo... |
<<<<<<<
float curveAlpha = 1f;
if (GameMod.HIDDEN.isActive() && trackPosition > getTime()) {
curveAlpha = Math.max(0f, 1f - ((float) (trackPosition - getTime()) / (getEndTime() - getTime())) * 1.05f);
=======
float oldWhiteFadeAlpha = Colors.WHITE_FADE.a;
float sliderAlpha = 1f;
if (GameMod.HIDDEN.isActi... |
<<<<<<<
public static int getQuadrant(double x, double y) {
if (x < Options.width / 2d) {
return y < Options.height / 2d ? 2 : 3;
}
return y < Options.height / 2d ? 1 : 4;
}
/*
public static Color shiftHue(Color color, double H) {
double U = Math.cos(H * Math.PI / 180d);
double W = Math.sin(H * Math.... |
<<<<<<<
if (isAutoMod) {// "auto" mod: catch any missed notes due to lag
data.hitResult(time, GameData.HIT_300, x, y, color, comboEnd, hitObject, HitObjectType.CIRCLE, true, 0, null, false);
if (Options.isMirror() && GameMod.AUTO.isActive()) {
float[] m = Utils.mirrorPoint(x, y);
data.hitResult(tim... |
<<<<<<<
HIT_MISS = 0,
HIT_50 = 1,
HIT_100 = 2,
HIT_300 = 3,
HIT_100K = 4, // 100-Katu
HIT_300K = 5, // 300-Katu
HIT_300G = 6, // Geki
HIT_SLIDER10 = 7,
HIT_SLIDER30 = 8,
HIT_MAX = 9, // not a hit result
HIT_SLIDER_INITIAL = 10;
=======
HIT_MISS ... |
<<<<<<<
import itdelatrisu.opsu.downloads.servers.OsuMirrorServer;
import itdelatrisu.opsu.ui.KinecticScrolling;
=======
import itdelatrisu.opsu.downloads.servers.MengSkyServer;
import itdelatrisu.opsu.downloads.servers.MnetworkServer;
import itdelatrisu.opsu.downloads.servers.YaSOnlineServer;
import itdelatrisu.opsu... |
<<<<<<<
=======
import com.altamiracorp.lumify.core.model.ontology.PropertyName;
import com.altamiracorp.lumify.core.security.VisibilityTranslator;
>>>>>>>
import com.altamiracorp.lumify.core.security.VisibilityTranslator;
<<<<<<<
import com.altamiracorp.securegraph.ElementMutation;
import com.altamiracorp.securegr... |
<<<<<<<
import itdelatrisu.opsu.ui.KinecticScrolling;
=======
import itdelatrisu.opsu.ui.Colors;
import itdelatrisu.opsu.ui.Fonts;
>>>>>>>
import itdelatrisu.opsu.ui.KinecticScrolling;
import itdelatrisu.opsu.ui.Colors;
import itdelatrisu.opsu.ui.Fonts;
<<<<<<<
float offset = (node == hoverIndex) ? hoverOffset :... |
<<<<<<<
import static com.dubreuia.model.Action.accessCanBeTightened;
=======
import static com.dubreuia.model.Action.customUnqualifiedStaticMemberAccess;
>>>>>>>
import static com.dubreuia.model.Action.accessCanBeTightened;
import static com.dubreuia.model.Action.customUnqualifiedStaticMemberAccess;
<<<<<<<
... |
<<<<<<<
}
/**
* Classes that extends WebCrawler should overwrite this function to tell the
* crawler whether the given url should be crawled or not. The following
* default implementation indicates that all urls should be included in the crawl.
*
* @param url
* the url which we are int... |
<<<<<<<
import com.altamiracorp.lumify.core.model.termMention.TermMention;
import com.altamiracorp.securegraph.Vertex;
=======
import com.altamiracorp.lumify.core.model.termMention.TermMentionModel;
>>>>>>>
import com.altamiracorp.lumify.core.model.termMention.TermMentionModel;
import com.altamiracorp.securegraph.Ve... |
<<<<<<<
import com.linkedin.urls.Url;
import com.linkedin.urls.detection.UrlDetector;
import com.linkedin.urls.detection.UrlDetectorOptions;
import edu.uci.ics.crawler4j.crawler.CrawlConfig;
=======
import edu.uci.ics.crawler4j.url.TLDList;
>>>>>>>
import com.linkedin.urls.Url;
import com.linkedin.urls.detection.Ur... |
<<<<<<<
private boolean haltOnError = false;
=======
/*
* number of pages to fetch/process from the database in a single read
*/
private int batchReadSize = 50;
>>>>>>>
private boolean haltOnError = false;
/*
* number of pages to fetch/process from the database in a single read
... |
<<<<<<<
TLDList.setUseOnline(config.isOnlineTldListUpdate());
URLCanonicalizer.setHaltOnError(config.isHaltOnError());
=======
this.tldList = tldList == null ? new TLDList(config) : tldList;
>>>>>>>
this.tldList = tldList == null ? new TLDList(config) : tldList;
URLCanonicaliz... |
<<<<<<<
public final class ThanksViewModel extends ViewModel<ThanksActivity> implements ThanksViewModelOutputs, ThanksAdapter.Delegate {
=======
public final class ThanksViewModel extends ViewModel<ThanksActivity> implements ThanksAdapter.Delegate {
protected @Inject ApiClientType apiClient;
>>>>>>>
public final ... |
<<<<<<<
import com.kickstarter.ui.IntentKey;
import com.kickstarter.ui.views.LoginPopupMenu;
import com.kickstarter.viewmodels.FacebookConfirmationViewModel;
=======
>>>>>>>
<<<<<<<
=======
import com.kickstarter.ui.views.LoginPopupMenu;
import com.kickstarter.viewmodels.FacebookConfirmationViewModel;
>>>>>>> |
<<<<<<<
termTextView.setText(context.getString(R.string.Most_Popular));
=======
if (params.sort() == DiscoveryParams.Sort.POPULAR) {
termTextView.setText(context.getString(R.string.___Most_Popular));
} else {
// NOTE: This path isn't currently executed, keeping it in case we modify the design... |
<<<<<<<
import com.trello.rxlifecycle.ActivityEvent;
import com.trello.rxlifecycle.RxLifecycle;
import com.trello.rxlifecycle.components.ActivityLifecycleProvider;
=======
import com.kickstarter.ui.views.KSDialog;
>>>>>>>
import com.kickstarter.ui.views.KSDialog;
import com.trello.rxlifecycle.ActivityEvent;
import c... |
<<<<<<<
import android.support.annotation.NonNull;
=======
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
>>>>>>>
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
<<<<<<<
import com.kickstarter.libs.RequiresPresenter;
import com.kickstart... |
<<<<<<<
public class LoginToutPresenter extends Presenter<LoginToutActivity> {
=======
public final class LoginToutPresenter extends Presenter<LoginToutActivity> {
@Override
protected void onCreate(@NonNull final Context context, @Nullable Bundle savedInstanceState) {
super.onCreate(context, savedInstanceStat... |
<<<<<<<
public void projectShareClicked(@NonNull final ProjectViewHolder viewHolder) {
shareClick.onNext(null);
}
public void projectVideoStarted(@NonNull final ProjectViewHolder viewHolder) {
playVideoClick.onNext(null);
}
=======
>>>>>>>
public void projectVideoStarted(@NonNull final ProjectV... |
<<<<<<<
import com.kickstarter.ui.activities.ProjectDetailActivity;
import com.kickstarter.ui.view_holders.ProjectContextViewHolder;
import com.kickstarter.ui.view_holders.CommentListViewHolder;
=======
import com.kickstarter.ui.activities.HelpActivity;
import com.kickstarter.ui.activities.ProjectActivity;
>>>>>>>
i... |
<<<<<<<
public final class PushNotifications {
private final @ForApplication Context context;
private final ApiClientType client;
private final DeviceRegistrarType deviceRegistrar;
=======
public class PushNotifications {
protected final @ApplicationContext Context context;
protected final ApiClientType cli... |
<<<<<<<
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
=======
import android.support.annotation.LayoutRes;
import android.support.annotation.NonNull;
>>>>>>>
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotati... |
<<<<<<<
// VIDEO
public void trackVideoStart() {
client.track("Project Video Start");
}
public void trackVideoEndedScrubbing() {
client.track("Project Video End Scrubbing");
}
public void trackVideoPaused() {
client.track("Project Video Pause");
}
public void trackVideoResume() {
cli... |
<<<<<<<
=======
import com.altamiracorp.lumify.core.model.audit.AuditAction;
import com.altamiracorp.lumify.core.model.audit.AuditRepository;
import com.altamiracorp.lumify.core.user.User;
>>>>>>>
import com.altamiracorp.lumify.core.model.audit.AuditAction;
import com.altamiracorp.lumify.core.model.audit.AuditReposi... |
<<<<<<<
protected void onActivityResult(final int requestCode, final int resultCode, final Intent intent) {
if (requestCode != ActivityRequestCodes.PROJECT_ACTIVITY_LOGIN_TOUT_ACTIVITY_USER_REQUIRED) {
return;
}
=======
protected void onActivityResult(final int requestCode, final int resultCode, @No... |
<<<<<<<
public static final String WEB_APP_EMBEDDED_LONG_RUNNING_PROCESS_RUNNER_ENABLED = "webAppEmbedded.longRunningProcessRunner.enabled";
public static final String WEB_APP_EMBEDDED_LONG_RUNNING_PROCESS_RUNNER_THREAD_COUNT = "webAppEmbedded.longRunningProcessRunner.threadCount";
public static final Strin... |
<<<<<<<
import com.facebook.AccessToken;
import com.facebook.CallbackManager;
import com.facebook.FacebookCallback;
import com.facebook.FacebookException;
=======
import com.facebook.AccessToken;
import com.facebook.CallbackManager;
import com.facebook.FacebookAuthorizationException;
import com.facebook.FacebookCallb... |
<<<<<<<
return MAGIC;
}
public @NonNull String refTagSuffix() {
switch (this) {
case MAGIC:
return "";
case POPULAR:
return "_popular";
case ENDING_SOON:
return "_ending_soon";
case NEWEST:
return "_popular";
case MOST_... |
<<<<<<<
public final class DiscoveryActivity extends BaseActivity<DiscoveryViewModel> {
private DiscoveryAdapter adapter;
=======
public final class DiscoveryActivity extends BaseActivity<DiscoveryViewModel> implements DiscoveryAdapter.Delegate {
>>>>>>>
public final class DiscoveryActivity extends BaseActivity<Di... |
<<<<<<<
void inject(LoginToutPresenter __);
=======
void inject(MessageService __);
>>>>>>>
void inject(LoginToutPresenter __);
void inject(MessageService __); |
<<<<<<<
@BindString(R.string.Unable_to_login) String unableToLoginString;
=======
@BindString(R.string.intent_login_type) String intentLoginTypeString;
>>>>>>>
@BindString(R.string.Unable_to_login) String unableToLoginString;
@BindString(R.string.intent_login_type) String intentLoginTypeString;
<<<<<<<
... |
<<<<<<<
import com.kickstarter.libs.utils.ProjectUtils;
import com.kickstarter.libs.utils.ViewUtils;
=======
import com.kickstarter.libs.transformations.CircleTransformation;
import com.kickstarter.libs.utils.StringUtils;
>>>>>>>
import com.kickstarter.libs.transformations.CircleTransformation;
import com.kickstarte... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.