conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
private static final String CHAT_CONVERSATION_TYPE = "conversationType";
=======
>>>>>>>
private static final String CHAT_CONVERSATION_TYPE = "conversationType";
<<<<<<<
+ CHAT_CONVERSATION_TYPE + " TEXT, "//会话类型
=======
>>>>>>>
+ CHAT_CONVERSATION_TYPE + ... |
<<<<<<<
import com.teamwizardry.wizardry.common.item.ItemWizardry;
import com.teamwizardry.wizardry.init.ModBlocks;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.client.renderer.color.IItemColor;
=======
>>>>>>>
import com.teamwizardry.wizardry.common.item.ItemWizardry; |
<<<<<<<
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.SidedProxy;
import net.minecraftforge.fml.common.event.FM... |
<<<<<<<
import java.util.HashMap;
import java.util.Map;
=======
import me.lordsaad.wizardry.gui.book.MainIndex;
import me.lordsaad.wizardry.gui.book.pages.GuiPageText;
>>>>>>>
import java.util.HashMap;
import java.util.Map;
<<<<<<<
register("text", GuiPageText::new);
}
public static void register(S... |
<<<<<<<
=======
@Deprecated // since 2.11, use overloaded variant
protected final boolean _parseBooleanPrimitive(JsonParser p, DeserializationContext ctxt) throws IOException {
return _parseBooleanPrimitive(ctxt, p);
}
>>>>>>>
<<<<<<<
protected final byte _parseBytePrimitive(Deserialization... |
<<<<<<<
private HashMap<Entity, Integer> entityToTicks = new HashMap<>();
private HashMap<Entity, Entity> entityToCaster = new HashMap<>();
private HashMap<Entity, Pair<Double, Double>> entityToPotency = new HashMap<>();
=======
private HashMap<Entity, TrackingEntry> entityToEntry = new HashMap<>();
private Link... |
<<<<<<<
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import me.lordsaad.wizardry.api.modules.attribute.AttributeModifier.Operation;
import me.lordsaad.wizardry.api.modules.attribute.AttributeModifier.Priority;
... |
<<<<<<<
import com.teamwizardry.wizardry.api.spell.ProcessData.DataType;
import com.teamwizardry.wizardry.api.spell.SpellDataTypes.BlockSet;
import com.teamwizardry.wizardry.api.spell.SpellDataTypes.BlockStateCache;
=======
import com.teamwizardry.wizardry.api.spell.attribute.AttributeModifier;
import com.teamwizard... |
<<<<<<<
abstract void setZoom(@Zoom int zoom);
abstract void setTextDetector(Detector<TextBlock> detector);
=======
>>>>>>>
abstract void setZoom(@Zoom int zoom);
abstract void setTextDetector(Detector<TextBlock> detector); |
<<<<<<<
String sb1 = "";
String sb2 = "";
for (int i = 0; i < no_players; i++) {
sb1 += "Player" + i + "-" + avatars[i].getWinState().key() + ", ";
sb2 += "Player" + i + "-" + "Score:" + avatars[i].getScore() + ", ";
}
System.out.println("Result (1->win; ... |
<<<<<<<
import core.termination.Termination;
import ontology.avatar.MovingAvatar;
=======
import core.competition.CompetitionParameters;
import core.vgdl.VGDLViewer;
>>>>>>>
import core.termination.Termination;
import ontology.avatar.MovingAvatar;
import core.competition.CompetitionParameters;
import core.vgdl.VGDLV... |
<<<<<<<
Vector2d move = Utils.processMovementActionKeys(stateObs.getKeyHandler(getPlayerID()).getMask());
boolean useOn = Utils.processUseKey(stateObs.getKeyHandler(getPlayerID()).getMask());
=======
Direction move = Utils.processMovementActionKeys(Game.ki.getMask());
boolean useOn = U... |
<<<<<<<
// Type of client to test against (Python/Java)
String clientType = "java"; //"python";
//Available controllers:
=======
/** Find the write shell to build and run client */
>>>>>>>
// Type of client to test against (Python/Java)
String clientType = "java"; /... |
<<<<<<<
String games[] = new String[]{};
=======
String generateLevelPath = "examples/generatedLevels/";
>>>>>>>
String games[] = new String[]{};
String generateLevelPath = "examples/generatedLevels/";
<<<<<<<
//Training Set 5 (Validation CIG 2015, Test GECCO 2015)
//... |
<<<<<<<
Vector2d action2D = Utils.processMovementActionKeys(getKeyHandler().getMask());
=======
Direction action2D = Utils.processMovementActionKeys(game.ki.getMask());
>>>>>>>
Direction action2D = Utils.processMovementActionKeys(getKeyHandler().getMask()); |
<<<<<<<
=======
/**
* Naming strategy similar to {@link KebabCaseStrategy}, but instead of hyphens
* as separators, uses dots. Naming convention widely used as configuration properties name.
*
* @since 2.10
*/
public static class LowerDotCaseStrategy extends PropertyNamingStrategyBas... |
<<<<<<<
import org.n52.shetland.ogc.sensorML.SensorML;
=======
import org.n52.shetland.ogc.sos.Sos2Constants;
import org.n52.shetland.ogc.sos.SosConstants;
import org.n52.shetland.ogc.sos.SosProcedureDescription;
import org.n52.shetland.ogc.sos.request.InsertResultRequest;
import org.n52.shetland.ogc.sos.response.Ins... |
<<<<<<<
parseParameterSet(n.children);
=======
if(n.content.identifier.equals("SpriteSet"))
{ try{
parseSpriteSet(n.children);
} catch(Exception e) {
logger.addMessage(new Message(1, "Sprite Set Error: " + e.toStri... |
<<<<<<<
public Effect createEffect(Game game, InteractionContent content)
=======
public Effect createEffect(InteractionContent content) throws Exception
>>>>>>>
public Effect createEffect(Game game, InteractionContent content) throws Exception
<<<<<<<
public Termination createTermination(Game game,... |
<<<<<<<
return Guice.createInjector(Modules.override(new GeogitModule()).with(
new MongoStorageModule(),
new MetricsModule()));
=======
return Guice.createInjector(Modules.override(new GeogitModule(), new CachingModule()).with(
new JEStorageModule(), new... |
<<<<<<<
} else if ("revertfeature".equalsIgnoreCase(commandName)) {
command = buildRevertFeature(options);
} else if ("blame".equalsIgnoreCase(commandName)) {
command = buildBlame(options);
=======
} else if ("rebuildgraph".equalsIgnoreCase(commandName)) {
c... |
<<<<<<<
import org.geogit.api.porcelain.ConfigOp.ConfigAction;
import org.geogit.api.porcelain.ConfigOp.ConfigScope;
=======
import org.geogit.di.CanRunDuringConflict;
>>>>>>>
import org.geogit.api.porcelain.ConfigOp.ConfigAction;
import org.geogit.api.porcelain.ConfigOp.ConfigScope;
import org.geogit.di.CanRunDurin... |
<<<<<<<
import java.io.IOException;
import java.io.Serializable;
=======
>>>>>>>
import java.io.IOException;
import java.io.Serializable;
<<<<<<<
import org.eclipse.imp.pdb.facts.io.SerializableValue;
=======
>>>>>>>
<<<<<<<
import org.eclipse.imp.pdb.facts.type.TypeStore;
import org.rascalmpl.interpreter.types... |
<<<<<<<
* States of {@link com.fasterxml.jackson.core.StreamReadFeature}s to enable/disable.
=======
* @since 2.12
*/
protected final CoercionConfigs _coercionConfigs;
/**
* @since 2.12
*/
protected final ConstructorDetector _ctorDetector;
/*
/***************************... |
<<<<<<<
<V extends IValue> Result<IBool> elementOf(ElementResult<V> elementResult) {
=======
protected <U extends IValue, V extends IValue> Result<U> elementOf(ElementResult<V> elementResult) {
>>>>>>>
protected <V extends IValue> Result<IBool> elementOf(ElementResult<V> elementResult) {
<<<<<<<
<V extends IVal... |
<<<<<<<
=======
import org.rascalmpl.ast.KeywordFormal;
import org.rascalmpl.ast.NullASTVisitor;
import org.rascalmpl.ast.Parameters;
>>>>>>>
import org.rascalmpl.ast.NullASTVisitor;
<<<<<<<
protected final Map<String, String> tags;
=======
protected final Map<String, IValue> tags;
protected final Type[] key... |
<<<<<<<
import java.nio.file.Paths;
import java.util.Map;
=======
>>>>>>>
import java.util.Map; |
<<<<<<<
import org.rascalmpl.values.uptr.RascalValueFactory;
=======
import org.rascalmpl.values.ValueFactoryFactory;
import org.rascalmpl.values.uptr.Factory;
>>>>>>>
import org.rascalmpl.values.uptr.RascalValueFactory;
import org.rascalmpl.values.ValueFactoryFactory;
<<<<<<<
TypeStore typeStore = new TypeStore(... |
<<<<<<<
.enableDefaultTyping(new SimpleNameBasedValidator())
=======
.activateDefaultTyping(new SimpleClassBasedValidator())
>>>>>>>
.activateDefaultTyping(new SimpleNameBasedValidator()) |
<<<<<<<
mv.visitFieldInsn(GETFIELD, FRAME_NAME, "function", Type.getDescriptor(Function.class));
mv.visitFieldInsn(GETFIELD, FUNCTION_NAME, "typeConstantStore", Type.getDescriptor(io.usethesource.vallang.type.Type[].class));
=======
mv.visitFieldInsn(GETFIELD, FRAME_NAME, "function", getDescriptor(Function.c... |
<<<<<<<
import android.widget.ImageView;
import android.widget.LinearLayout;
=======
import android.widget.ImageView;
>>>>>>>
import android.widget.ImageView;
import android.widget.LinearLayout;
<<<<<<<
if(!quizzes.isEmpty()) {
mLLEmptyFilterResultContainer.setVisibility(View.GONE);
}
=... |
<<<<<<<
void navigateToQuizDiscussion(String quizId);
void navigateToQuizDetails(String quizId);
=======
void handleEmptyView(String selectedFilter);
>>>>>>>
void navigateToQuizDiscussion(String quizId);
void navigateToQuizDetails(String quizId);
void handleEmpty... |
<<<<<<<
=======
import pcgen.cdom.base.Ungranted;
import pcgen.cdom.enumeration.ListKey;
>>>>>>>
import pcgen.cdom.base.Ungranted; |
<<<<<<<
public void push(@Nullable Fragment fragment, @Nullable FragNavTransactionOptions transactionOptions) {
=======
public void pushFragment(@Nullable Fragment fragment) {
>>>>>>>
public void pushFragment(@Nullable Fragment fragment, @Nullable FragNavTransactionOptions transactionOptions) {
<<<<<<<
... |
<<<<<<<
@Test public void filestat() throws Throwable {
=======
@Test
public void filestat() throws Throwable {
>>>>>>>
@Test
public void filestat() throws Throwable {
<<<<<<<
FileStat stat = posix.stat(f.getAbsolutePath());
assertNotNull("posix.stat failed", stat);
... |
<<<<<<<
int getdtablesize();
=======
int dup(int fd);
int dup2(int oldFd, int newFd);
>>>>>>>
int dup(int fd);
int dup2(int oldFd, int newFd);
int getdtablesize(); |
<<<<<<<
import javax.swing.JScrollPane;
=======
import javax.swing.SwingConstants;
>>>>>>>
import javax.swing.JScrollPane;
import javax.swing.SwingConstants;
<<<<<<<
final FreeplaneToolBar toolbar = new FreeplaneToolBar();
toolbar.putClientProperty(ViewController.VISIBLE_PROPERTY_KEY, "toolbarVisible");
userI... |
<<<<<<<
import org.freeplane.plugin.script.IFreeplaneScript;
import org.freeplane.plugin.script.GroovyShellFreeplaneScript;
=======
import org.freeplane.plugin.script.ScriptingEngine;
import org.freeplane.plugin.script.ScriptingPermissions;
>>>>>>>
import org.freeplane.plugin.script.IFreeplaneScript;
import org.free... |
<<<<<<<
import org.freeplane.features.common.addins.styles.MapStyle;
import org.freeplane.features.common.addins.styles.MapStyleModel;
import org.freeplane.features.common.addins.styles.MapViewLayout;
=======
import org.freeplane.core.resources.ResourceController;
import org.freeplane.features.common.addins.mapstyle.... |
<<<<<<<
private View view;
=======
private PointF point;
private float radius;
private View overlay;
>>>>>>>
private View overlay;
<<<<<<<
private OnTargetActionListener actionListener;
private Shape shape;
=======
>>>>>>>
private Shape shape;
<<<<<<<
private CustomTarget(Sh... |
<<<<<<<
import org.freeplane.core.filter.condition.ICondition;
import org.freeplane.core.modecontroller.ModeController;
=======
import org.freeplane.core.filter.condition.ISelectableCondition;
>>>>>>>
import org.freeplane.core.modecontroller.ModeController;
import org.freeplane.core.filter.condition.ISelectableCondi... |
<<<<<<<
Shape getShape();
=======
View getOverlay();
>>>>>>>
Shape getShape();
<<<<<<<
public View getView() {
=======
public float getRadius() {
return 100f;
}
@Override
public View getOverlay() {
>>>>>>>
public View getOverlay() { |
<<<<<<<
userInputListenerFactory.addToolBar("/fbuttons", ViewController.TOP, fButtonToolBar);
controller.addAction(new ToggleToolbarAction(controller, "ToggleFBarAction", "/fbuttons"));
SModeControllerFactory.createModeController(modeController);
=======
userInputListenerFactory.addMainToolBar("/fbutto... |
<<<<<<<
/**
*/
=======
protected int depth(final NodeModel node) {
if (node.isRoot()) {
return 0;
}
return depth((NodeModel) node.getParent()) + 1;
}
>>>>>>>
<<<<<<<
if (controller.getModeController().getMapController().isFolded(node)
|| !controller.getModeController().getMapController().... |
<<<<<<<
import org.freeplane.core.filter.condition.ICondition;
import org.freeplane.core.modecontroller.ModeController;
=======
import org.freeplane.core.filter.condition.ISelectableCondition;
>>>>>>>
import org.freeplane.core.modecontroller.ModeController;
import org.freeplane.core.filter.condition.ISelectableCondi... |
<<<<<<<
import org.freeplane.features.common.map.MapModel;
import org.freeplane.features.common.map.NodeModel;
=======
import java.io.File;
import org.freeplane.core.model.MapModel;
import org.freeplane.core.model.NodeModel;
>>>>>>>
import java.io.File;
import org.freeplane.features.common.map.MapModel;
import org... |
<<<<<<<
public static boolean useRibbonsMenu() {
String bool = ResourceController.getResourceController().getProperty("menu.ribbons", null);
if(bool == null) {
bool = "true";
ResourceController.getResourceController().setProperty("menu.ribbons", bool);
}
return Boolean.parseBoolean(bool);
}
=======
... |
<<<<<<<
controller.addExtension(HighlightController.class, new HighlightController());
=======
controller.addAction(currentController.getAction("AboutAction"));
>>>>>>>
controller.addExtension(HighlightController.class, new HighlightController());
controller.addAction(currentController.getAction("AboutAction... |
<<<<<<<
=======
import org.freeplane.features.mindmapnode.pattern.IExternalPatternAction;
import org.freeplane.features.mindmapnode.pattern.Pattern;
import org.freeplane.features.mindmapnode.pattern.ScriptEditorProperty;
import org.freeplane.plugin.script.ExecuteScriptAction.ExecutionMode;
>>>>>>>
import org.freepla... |
<<<<<<<
import org.freeplane.core.ui.menubuilders.generic.BuildProcessFactory;
=======
import org.freeplane.core.ui.menubuilders.generic.BuildPhaseListener;
import org.freeplane.core.ui.menubuilders.generic.ChildEntryFilter;
import org.freeplane.core.ui.menubuilders.generic.Entry;
>>>>>>>
import org.freeplane.core.u... |
<<<<<<<
import org.n52.shetland.ogc.ows.exception.CodedException;
import org.n52.shetland.ogc.ows.exception.OwsExceptionReport;
import org.n52.shetland.ogc.sos.request.GetObservationRequest;
=======
import org.n52.sos.ds.hibernate.dao.observation.ValuedObservationFactory;
>>>>>>>
import org.n52.shetland.ogc.ows.exce... |
<<<<<<<
final JFileChooser chooser = getFileChooser(true);
new MindMapPreview(chooser);
=======
final JFileChooser chooser = getFileChooser();
>>>>>>>
final JFileChooser chooser = getFileChooser();
new MindMapPreview(chooser); |
<<<<<<<
public boolean checkNode(ModeController modeController, final NodeModel node) {
for(ICondition condition : conditions) {
if (!condition.checkNode(modeController, node)) {
=======
public boolean checkNode(final NodeModel node) {
for(ISelectableCondition condition : conditions) {
if (!condition.chec... |
<<<<<<<
public int depth() {
final NodeModel parentNode = getParentNode();
if (parentNode == null) {
return 0;
}
return parentNode.depth() + 1;
}
=======
public void insert(NodeModel newNodeModel) {
insert(newNodeModel, getChildCount());
}
>>>>>>>
public int depth() {
final NodeModel parentN... |
<<<<<<<
else{
final String shape = NodeStyleController.getController(modeController).getShape(model);
if (shape.equals(NodeStyleModel.STYLE_FORK)) {
view = new ForkMainView();
}
else if (shape.equals(NodeStyleModel.STYLE_BUBBLE)) {
view = new BubbleMainView();
}
else {
System.err.printl... |
<<<<<<<
modeController.registerExtensionCopier(new ExtensionCopier());
iconToolBar = new FreeplaneToolBar();
=======
iconToolBar = new FreeplaneToolBar("icon_toolbar", SwingConstants.VERTICAL);
>>>>>>>
modeController.registerExtensionCopier(new ExtensionCopier());
iconToolBar = new FreeplaneToolBar("icon_t... |
<<<<<<<
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
=======
>>>>>>>
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
<<<<<<<
import javax.swing.Timer;
=======
import javax.swing.UIDefaults;
>>>>>>>
import javax.swing.Timer;
import javax.swing.UIDefaults; |
<<<<<<<
=======
import javax.swing.event.ChangeEvent;
>>>>>>>
import javax.swing.event.ChangeEvent;
<<<<<<<
import org.freeplane.features.common.map.NodeModel;
import org.freeplane.features.mindmapmode.MModeController;
=======
>>>>>>>
import org.freeplane.features.common.map.NodeModel;
import org.freeplane.featu... |
<<<<<<<
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.UUID;
=======
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.Arrays... |
<<<<<<<
import org.freeplane.core.ui.menubuilders.generic.BuildProcessFactory;
=======
import org.freeplane.core.ui.menubuilders.generic.BuildPhaseListener;
>>>>>>>
import org.freeplane.core.ui.menubuilders.generic.BuildProcessFactory;
import org.freeplane.core.ui.menubuilders.generic.BuildPhaseListener;
<<<<<<<
=... |
<<<<<<<
private boolean copyMap(final MapModel map, final String pDirectoryName) throws IOException {
final boolean success = true;
=======
private boolean copyMap(MapModel map, final String pDirectoryName){
boolean success = true;
try {
>>>>>>>
private boolean copyMap(final MapModel map, final String pDire... |
<<<<<<<
Controller.getCurrentController().getViewController().removeSplitPane();
=======
if(noteViewer != null){
noteViewer.setText("");
}
>>>>>>>
if(noteViewer != null){
noteViewer.setText("");
}
<<<<<<<
Controller.getCurrentController().getViewController().insertComponentIntoSplitPane(getNoteVi... |
<<<<<<<
/*
* Freeplane - mind map editor
* Copyright (C) 2008 Joerg Mueller, Daniel Polansky, Christian Foltin, Dimitry Polivaev
*
* This file is modified by Dimitry Polivaev in 2008.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public Lice... |
<<<<<<<
import org.apache.commons.lang.StringUtils;
import org.freeplane.core.controller.IMapSelection;
=======
>>>>>>>
import org.apache.commons.lang.StringUtils;
import org.freeplane.core.controller.IMapSelection;
<<<<<<<
import org.freeplane.features.common.addins.styles.MapStyle;
import org.freeplane.features.c... |
<<<<<<<
import java.util.List;
=======
import java.util.Optional;
>>>>>>>
import java.util.List;
import java.util.Optional; |
<<<<<<<
if (url.getPath().toLowerCase(Locale.ENGLISH).endsWith(".svg")) {
result = FreeplaneIconUtils.createSVGIcon(url, widthPixels, heightPixels);
} else {
result = new ImageIcon(url);
}
ICON_CACHE.put(cacheKey, result);
=======
result = FreeplaneIconUtils.createImageIconPrivileged(url... |
<<<<<<<
=======
import org.freeplane.core.modecontroller.ModeController;
import org.freeplane.core.model.NodeModel;
import org.freeplane.core.resources.FpStringUtils;
import org.freeplane.core.resources.ResourceBundles;
>>>>>>>
<<<<<<<
import org.freeplane.core.util.LogUtils;
import org.freeplane.core.util.TextUtil... |
<<<<<<<
final NodeStyleController style = (NodeStyleController) getModeController().getExtension(NodeStyleController.class);
final Font defaultFont = style.getDefaultFont(node.getMap());
final StringBuilder rule = new StringBuilder();
rule.append("font-family: " + defaultFont.getFamily() + ";");
rule.app... |
<<<<<<<
/*
* Freeplane - mind map editor
* Copyright (C) 2008 Dimitry Polivaev
*
* This file author is Dimitry Polivaev
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either ver... |
<<<<<<<
// // final private Controller controller;
private JScrollPane noteScrollPane;
private JLabel noteViewer;
=======
final private Controller controller;
private JScrollPane noteScrollPane;
private JEditorPane noteViewer;
>>>>>>>
private JScrollPane noteScrollPane;
private JEditorPane noteViewer; |
<<<<<<<
final private LastOpenedMapsRibbonContributorFactory lastOpenedMapsRibbonContributorFactory;
public LastOpenedMapsRibbonContributorFactory getLastOpenedMapsRibbonContributorFactory() {
return lastOpenedMapsRibbonContributorFactory;
}
=======
private String mapSelectedOnStart;
>>>>>>>
final private La... |
<<<<<<<
try {
if (newTheme.isDark()) {
LafManager.getInstance().setCurrentLookAndFeel(new DarculaLookAndFeelInfo());
UIManager.setLookAndFeel(new MTLaf(newTheme));
}
else {
LafManager.getInstance().setCurrentLookAndFeel(new IntelliJLookAndFeelInfo());
UIManager.setL... |
<<<<<<<
Menu file = new PopupMenu("File");
addSubMenu(file, "New");
=======
Menu file = getMenu("File");
Menu newMenu = getMenu("File>New", true);
>>>>>>>
Menu file = getMenu("File");
Menu newMenu = getMenu("File>New", true);
<<<<<<<
if (applet == null)
addSubMenu(file, "Open Samples");
=====... |
<<<<<<<
private static Menus instance;
=======
>>>>>>>
<<<<<<<
private static ImageJApplet applet;
private static Hashtable demoImagesTable = new Hashtable();
=======
private static Applet applet;
private Hashtable demoImagesTable = new Hashtable();
>>>>>>>
private static ImageJApplet applet;
private H... |
<<<<<<<
Button runButton;
Button closeButton;
Checkbox fullInfoCheckbox, fuzzyCheckbox, closeCheckbox;
=======
Button runButton, closeButton, exportButton;
Checkbox fullInfoCheckbox, closeCheckbox;
>>>>>>>
Button runButton, closeButton, exportButton;
Checkbox fullInfoCheckbox, fuzzyCheckbox, closeCheckbox;
<... |
<<<<<<<
String path = IJ.getDirectory("luts")+cmd.command+".lut";
=======
String path = IJ.getDirectory("luts")+cmd+".lut";
>>>>>>>
String path = IJ.getDirectory("luts")+cmd.command+".lut";
<<<<<<<
if (f.exists()) {
=======
if (f.exists()) {
String dir = OpenDialog.getLastDirectory();
>>>>>>>
... |
<<<<<<<
hyperstacksMenu = addSubMenu(image, "HyperStacks");
=======
addSubMenu(image, "Hyperstacks");
>>>>>>>
hyperstacksMenu = addSubMenu(image, "Hyperstacks"); |
<<<<<<<
if (!changes && Menus.window.getItemCount()>Menus.WINDOW_MENU_ITEMS && !(IJ.macroRunning()&&WindowManager.getImageCount()==0)) {
GenericDialog gd = new GenericDialog("ImageJA", this);
gd.addMessage("Are you sure you want to quit ImageJA?");
=======
if (windowClosed && !changes && Menus.window.getIte... |
<<<<<<<
private static Menus instance;
private MenuBar mbar;
private CheckboxMenuItem gray8Item,gray16Item,gray32Item,
=======
private static Menus instance;
private static MenuBar mbar;
private static CheckboxMenuItem gray8Item,gray16Item,gray32Item,
>>>>>>>
private static Menus instance;
private static Men... |
<<<<<<<
import ij.util.Levenshtein;
=======
>>>>>>>
import ij.util.Levenshtein;
<<<<<<<
JFrame d;
JTextField prompt;
JList completions;
JScrollPane scrollPane;
DefaultListModel completionsModel;
JButton runButton, closeButton, exportButton;
JCheckBox fullInfoCheckBox, fuzzyCheckBox, closeCheckBox;
=======... |
<<<<<<<
gd.addCheckbox("Run single instance listener", Prefs.enableRMIListener != 0);
//if (IJ.isWindows())
// gd.addCheckbox("Disable DirecDraw", Prefs.disableDirectDraw);
=======
gd.addCheckbox("Run single instance listener", Prefs.runSocketListener);
>>>>>>>
gd.addCheckbox("Run single instance listener"... |
<<<<<<<
if (!changes && Menus.window.getItemCount()>Menus.WINDOW_MENU_ITEMS && !(IJ.macroRunning()&&WindowManager.getImageCount()==0)) {
GenericDialog gd = new GenericDialog(getTitle(), this);
gd.addMessage("Are you sure you want to quit "
+ getTitle() + "?");
=======
if (windowClosed && !changes && Men... |
<<<<<<<
private ImageJApplet applet;
private Hashtable demoImagesTable = new Hashtable();
private String pluginsPath, macrosPath;
private Properties menus = new Properties();
private Properties menuSeparators;
static Menu window, openRecentMenu, pluginsMenu, shortcutsMenu, utilitiesMenu, macrosMenu;
private Hash... |
<<<<<<<
{IJ.noImage(); return;}
write(this, path);
=======
{IJ.noImage(); return;}
try {
writeImage(imp, path);
} catch (Exception e) {
String msg = e.getMessage();
if (msg==null || msg.equals(""))
msg = ""+e;
IJ.error("BMP Writer", "An error occured writing the file.\n \n" + m... |
<<<<<<<
spiceServiceListenerNotifier.notifyObserversOfRequestSuccess(request);
requestListenerNotifier.notifyListenersOfRequestSuccess(request, result, listeners);
notifyOfRequestProcessed(request);
=======
requestProgressReporter.notifyListenersOfRequestSuccess(request, result, liste... |
<<<<<<<
=======
private static final String leaseException =
"org.apache.hadoop.hdfs.protocol.AlreadyBeingCreatedException";
private static final long MAX_SLEEP_INTERVAL_MS = 16000L;
>>>>>>>
<<<<<<<
private Configuration conf = null;
private Storage storage = null;
private long sleepIntervalMs = WAL... |
<<<<<<<
import java.util.ArrayList;
import java.util.Collections;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
=======
import io.confluent.connect.hdfs.parquet.ParquetFormat;
import io.confluent.connect.hdfs.string.StringFormat;
>>>>>>>
import java.ut... |
<<<<<<<
public List<TransferEventResponse> getTransferEvents(TransactionReceipt transactionReceipt) {
List<Contract.EventValuesWithLog> valueList = extractEventParametersWithLog(TRANSFER_EVENT, transactionReceipt);
ArrayList<TransferEventResponse> responses = new ArrayList<TransferEventResponse>(val... |
<<<<<<<
+ " org.web3j.abi.datatypes.Function function = new org.web3j.abi.datatypes.Function(\n"
+ " FUNC_FUNCTIONNAME, \n"
=======
+ " final org.web3j.abi.datatypes.Function function = new org.web3j.abi.datatypes.Function(\n"
... |
<<<<<<<
public static class DurationSerializer extends ImmutableSerializer<Duration> {
=======
static public class DurationSerializer extends ImmutableSerializer<Duration> {
@Override
>>>>>>>
public static class DurationSerializer extends ImmutableSerializer<Duration> {
@Override
<<<<<<<
public static class... |
<<<<<<<
public static class VoidSerializer extends ImmutableSerializer {
=======
static public class VoidSerializer extends ImmutableSerializer {
@Override
>>>>>>>
public static class VoidSerializer extends ImmutableSerializer {
@Override
<<<<<<<
public static class BooleanSerializer extends ImmutableSerial... |
<<<<<<<
// Game Dev
public static final String LEVEL = "Storage/Game/Maps/tiledMap.dat";
=======
>>>>>>>
// Game Dev
public static final String LEVEL = "Storage/Game/Maps/tiledMap.dat";
<<<<<<<
//Util.convertTiledLevel("tiledmap.json");
=======
Audio.setGainBGM(-6); // TODO
Audio.setGainSFX(-6); // TO... |
<<<<<<<
// Default image
image = Tileset.getTile("MIRROR_BOX");
=======
id = "MIRROR_BOX";
image = applet.gameGraphics.get("MIRROR_BOX");
>>>>>>>
id = "MIRROR_BOX";
image = Tileset.getTile("MIRROR_BOX");
<<<<<<<
if (!rotating) {
if (activated) {
image = Tileset.getTile(352, 160, 16, 16); //... |
<<<<<<<
import sidescroller.SideScroller.debugType;
=======
import sidescroller.Tileset;
>>>>>>>
import sidescroller.SideScroller.debugType;
import sidescroller.Tileset; |
<<<<<<<
=======
import com.artipie.http.auth.Authentication;
import io.vertx.reactivex.core.Vertx;
>>>>>>>
import com.artipie.http.auth.Authentication; |
<<<<<<<
import java.io.BufferedReader;
import java.io.BufferedOutputStream;
=======
import java.io.BufferedWriter;
import java.io.OutputStreamWriter;
>>>>>>>
import java.io.BufferedOutputStream; |
<<<<<<<
new YamlPermissions(new File(RpPermissionsTest.CONF_YAML)),
new AllOf<YamlPermissions>(
new ListOf<org.hamcrest.Matcher<? super YamlPermissions>>(
new MatcherOf<>(new ProcOf<>(perm -> perm.allowed(uname, "delete"))),
new MatcherOf<>... |
<<<<<<<
=======
// swuser.getAuthorities().forEach(auth -> {
// user.getPrivileges().add(auth);
// });
>>>>>>>
<<<<<<<
request.getRoles().forEach(role -> {
userPatch.getRoles().add(new StringPatchItem.Builder().value(role).build());
=======
swuser.getRoles().forEach(role -> {
role.getAuthorities(... |
<<<<<<<
private int serializeNumber = 0;// default serialization is hession2
=======
private TraceableContext traceableContext = new TraceableContext();
>>>>>>>
private int serializeNumber = 0;// default serialization is hession2
private TraceableContext traceableContext = new TraceableContext();
<<... |
<<<<<<<
final boolean configured = chooser.scanHadoopConfigFiles(serverInformationCatalog, selectedServer);
if (!configured) {
=======
final boolean configured = chooser.scanHadoopConfigFiles(serverInformationCatalog);
if (configured) {
... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.