conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
public void openPolygonGenerateDialog() {
double defaultHatchAngle = (planningMapFragment.getMapRotation() + 90) % 180;
GridDialog polygonDialog = new GridDialog() {
@Override
public void onPolygonGenerated(List<waypoint> list) {
drone.mission.addWaypoints(list);
update();
}
};
polygon... |
<<<<<<<
import com.droidplanner.DroidPlannerApp.OnWaypointUpdateListner;
=======
import com.droidplanner.DroidPlannerApp.OnWaypointReceivedListner;
>>>>>>>
import com.droidplanner.DroidPlannerApp.OnWaypointUpdateListner;
<<<<<<<
@Override
public void onAltitudeChanged(double newAltitude) {
super.onAltitudeChang... |
<<<<<<<
=======
import android.support.v4.app.FragmentManager;
import android.view.Menu;
>>>>>>>
<<<<<<<
=======
import android.view.WindowManager.LayoutParams;
import android.widget.ArrayAdapter;
import android.widget.SpinnerAdapter;
>>>>>>>
<<<<<<<
=======
@Override
public boolean onCreateOptionsMenu(Men... |
<<<<<<<
arm(drone, arm, null);
}
public static void arm(Drone drone, boolean arm, SimpleCommandListener listener){
=======
arm(drone, arm, false);
}
/**
* Arm or disarm the connected drone.
*
* @param arm true to arm, false to disarm.
* @param emergencyDisarm true... |
<<<<<<<
import com.droidplanner.MAVLink.parameters.Parameter;
import com.droidplanner.MAVLink.parameters.ParametersManager;
import com.droidplanner.MAVLink.parameters.ParametersManager.OnParameterManagerListner;
import com.droidplanner.MAVLink.waypoints.WaypointMananger;
import com.droidplanner.MAVLink.waypoints.Waypoi... |
<<<<<<<
=======
>>>>>>> |
<<<<<<<
/*notifyTest.testAll();
docTest.testAll();*/
metricsTest.testMetric();
=======
notifyTest.testAll();
docTest.testAll();
>>>>>>>
notifyTest.testAll();
docTest.testAll();
metricsTest.testMetric(); |
<<<<<<<
protected Object _deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException
=======
private final Object _deserialize(JsonParser p, DeserializationContext ctxt) throws IOException
>>>>>>>
protected Object _deserialize(JsonParser p, DeserializationContext ctxt) throws IOException |
<<<<<<<
private CodecUtils() {
}
/**
* Converts an array of shorts to a byte array.
* <p>
* Example: (short) 5 will be stored as {0, 5} since 5 = 00000000 00000101
* </p>
* <p>
* Example: (short) 257 will be stored as {1, 1} since 257 = 00000001
* 00000001
* </p>
*
* @... |
<<<<<<<
private ExecutorService bsmImporter;
private ExecutorService messageFrameImporter;
private ExecutorService bsmExporter;
private ExecutorService bsmFilteredExported;
=======
private OdeProperties odeProperties;
>>>>>>>
private OdeProperties odeProperties;
<<<<<<<
bs... |
<<<<<<<
import groovy.lang.MissingPropertyException;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.UUID... |
<<<<<<<
import java.io.BufferedInputStream;
=======
>>>>>>>
import java.io.BufferedInputStream; |
<<<<<<<
import us.dot.its.jpo.ode.coder.TimDecoderHelper;
import us.dot.its.jpo.ode.j2735.dsrc.*;
=======
import us.dot.its.jpo.ode.importer.parser.TimLogFileParser;
>>>>>>>
import us.dot.its.jpo.ode.importer.parser.TimLogFileParser;
<<<<<<<
import us.dot.its.jpo.ode.model.OdeAsn1Data;
import us.dot.its.jpo.ode.mod... |
<<<<<<<
=======
import us.dot.its.jpo.ode.j2735.J2735;
import us.dot.its.jpo.ode.j2735.dsrc.BasicSafetyMessage;
import us.dot.its.jpo.ode.j2735.dsrc.MessageFrame;
import us.dot.its.jpo.ode.j2735.dsrc.TravelerInformation;
import us.dot.its.jpo.ode.model.OdeBsmPayload;
import us.dot.its.jpo.ode.model.OdeData;
import us... |
<<<<<<<
=======
import us.dot.its.jpo.ode.model.OdeLogMetadata.SecurityResultCode;
import us.dot.its.jpo.ode.model.OdeMsgMetadata.GeneratedBy;
import us.dot.its.jpo.ode.model.SerialId;
import us.dot.its.jpo.ode.plugin.j2735.J2735Bsm;
>>>>>>>
<<<<<<<
// TODO open-ode
// public static OdeBsmData createOdeBsmData(
/... |
<<<<<<<
=======
import us.dot.its.jpo.ode.plugin.j2735.timstorage.MessageFrame;
import us.dot.its.jpo.ode.plugin.j2735.timstorage.TravelerInputData;
>>>>>>>
import us.dot.its.jpo.ode.plugin.j2735.timstorage.MessageFrame;
import us.dot.its.jpo.ode.plugin.j2735.timstorage.TravelerInputData;
<<<<<<<
asd... |
<<<<<<<
=======
*
* @param ann Annotated entity to introspect
*
* @return True if given annotation is considered an annotation
* bundle; false if not
>>>>>>>
*
* @param ann Annotated entity to introspect
*
* @return True if given annotation is considered an annotation
... |
<<<<<<<
=======
import us.dot.its.jpo.ode.plugin.j2735.timstorage.TravelerInputData;
import us.dot.its.jpo.ode.plugin.j2735.timstorage.TravelerInputDataBase;
>>>>>>>
import us.dot.its.jpo.ode.plugin.j2735.timstorage.TravelerInputData;
import us.dot.its.jpo.ode.plugin.j2735.timstorage.TravelerInputDataBase;
<<<<<<<
... |
<<<<<<<
private int bsmReceiverPort = 46800;
private int bsmBufferSize = 500;
=======
private String kafkaTopicOdeRawEncodedMessageJson = "topic.OdeRawEncodedMessageJson";
>>>>>>>
private String kafkaTopicOdeRawEncodedMessageJson = "topic.OdeRawEncodedMessageJson";
private int bsmReceiverPort = 46800;... |
<<<<<<<
private String kafkaTopicBsmSerializedPojo = "topic.J2735Bsm";
private String kafkaTopicBsmRawJson = "j2735BsmRawJson";
private String kafkaTopicBsmFilteredJson = "j2735BsmFilteredJson";
private int vsdmPort = 5556;
private int vsdmBufferSize = 10000;
=======
private String kafkaTopic... |
<<<<<<<
=======
import us.dot.its.jpo.ode.importer.parser.TimLogLocation;
import us.dot.its.jpo.ode.j2735.J2735;
import us.dot.its.jpo.ode.j2735.dsrc.BasicSafetyMessage;
import us.dot.its.jpo.ode.j2735.dsrc.MessageFrame;
import us.dot.its.jpo.ode.j2735.dsrc.TravelerInformation;
import us.dot.its.jpo.ode.model.OdeBsmP... |
<<<<<<<
private int vsdmPort = 5556;
private int vsdmBufferSize = 10000;
private Boolean vsdmVerboseJson = false;
=======
private String sdcIp = "";
private int sdcPort;
private String returnIp = "";
private int returnPort;
private int serviceRequestSenderPort;
private int vsd... |
<<<<<<<
import us.dot.its.jpo.ode.model.OdeMsgMetadata;
=======
import us.dot.its.jpo.ode.model.OdeLogMetadata;
import us.dot.its.jpo.ode.model.OdeLogMetadata.SecurityResultCode;
import us.dot.its.jpo.ode.model.OdeMsgMetadata.GeneratedBy;
import us.dot.its.jpo.ode.plugin.j2735.J2735Bsm;
>>>>>>>
<<<<<<<
//TODO open-... |
<<<<<<<
request.put(TimDepositController.RSUS_STRING, rsusOut);
=======
>>>>>>> |
<<<<<<<
=======
import us.dot.its.jpo.ode.model.OdeBsmData;
import us.dot.its.jpo.ode.plugin.PluginFactory;
import us.dot.its.jpo.ode.plugin.j2735.J2735Bsm;
import us.dot.its.jpo.ode.plugin.j2735.J2735MessageFrame;
import us.dot.its.jpo.ode.plugin.j2735.oss.Oss1609dot2Coder;
import us.dot.its.jpo.ode.plugin.j2735.oss... |
<<<<<<<
player.sendMessage(new TextComponentString("Ship construction canceled because its exceeding the ship size limit (Raise with /setPhysConstructionLimit (number)) ; Or because it's attatched to bedrock)"));
=======
player.addChatComponentMessage(new TextComponentString("Ship construction canceled becaus... |
<<<<<<<
=======
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
>>>>>>>
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
<<<<<<<
=======
import net.minecraft.util.text.TextFormatting;
import net.minecr... |
<<<<<<<
public static final String MoverTypeName = "net/minecraft/entity/MoverType";
=======
public static final String IChunkGeneratorName = "net/minecraft/world/chunk/IChunkGenerator";
>>>>>>>
public static final String MoverTypeName = "net/minecraft/entity/MoverType";
public static final String IChunkGenerato... |
<<<<<<<
shipFor = packetBuf.readUniqueId();
=======
inputType = packetBuf.readEnumValue(ControllerInputType.class);
shipFor = packetBuf.readUuid();
>>>>>>>
inputType = packetBuf.readEnumValue(ControllerInputType.class);
shipFor = packetBuf.readUniqueId();
<<<<<<<
packetBuf.writeUniqueId(shipFor);
=====... |
<<<<<<<
import java.util.List;
import java.util.Optional;
=======
>>>>>>>
import java.util.List;
import java.util.Optional; |
<<<<<<<
public void disassembleMultiblockLocal() {
super.disassembleMultiblockLocal();
Optional<PhysicsObject> object = ValkyrienUtils.getPhysicsObject(getWorld(), getPos());
=======
public void dissembleMultiblockLocal() {
super.dissembleMultiblockLocal();
Optional<PhysicsObje... |
<<<<<<<
public EnumActionResult onItemUse(EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
=======
public void addInformation(ItemStack stack, EntityPlayer player, List itemInformation, boolean par4) {
itemInformation.add(TextFormatting.BL... |
<<<<<<<
if(headList == -1){
headList = GLAllocation.generateDisplayLists(1);
GL11.glPushMatrix();
GL11.glNewList(headList, GL11.GL_COMPILE);
vertexbuffer.setTranslation(0, 0, 0);
vertexbuffer.begin(7, DefaultVertexFormats.BLOCK);
BlockPos blockpos = new BlockPos(0,0,0);
BlockRendererDispatcher bl... |
<<<<<<<
BlockPos gravControllerPos = tileEntity.controllerPos;
if (gravControllerPos.equals(BlockPos.ORIGIN)) {
playerIn.sendMessage(new TextComponentString("Set Controller To " + controllerPos.toString()));
} else {
playerIn.sendMessage(new TextComponentString("Replaced controller posit... |
<<<<<<<
import java.util.HashMap;
import ValkyrienWarfareBase.Capability.IAirshipCounterCapability;
=======
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import ValkyrienWarfareBase.API.RotationMatrices;
import ValkyrienWarfareBase... |
<<<<<<<
public static void onMarkBlocksForUpdate(ViewFrustum frustum, int p_187474_1_, int p_187474_2_, int p_187474_3_, int p_187474_4_, int p_187474_5_, int p_187474_6_, boolean requiresImmediateUpdate) {
frustum.markBlocksForUpdate(p_187474_1_, p_187474_2_, p_187474_3_, p_187474_4_, p_187474_5_, p_187474_6_, requ... |
<<<<<<<
=======
MinecraftForge.EVENT_BUS.register(new ExplosionHandler());
>>>>>>>
MinecraftForge.EVENT_BUS.register(new ExplosionHandler()); |
<<<<<<<
=======
WorldPhysObjectManager manager = ValkyrienWarfareMod.physicsManager.getManagerForWorld(worldIn);
if (manager != null) {
PhysicsWrapperEntity wrapperEnt = manager.getManagingObjectForChunk(worldIn.getChunkFromBlockCoords(pos));
if (wrapperEnt != null) {
wrapperEnt.wrapping.doPhysics ... |
<<<<<<<
if (uiShield.id == UIShield.NFC_SHIELD.id)
return addToCreatedListAndReturn(uiShield, new NfcFragment());
=======
if (uiShield.id == UIShield.COLOR_DETECTION_SHIELD.id)
return addToCreatedListAndReturn(uiShield, new ColorDetectionFragment());
>>>>>>>
if (uiShie... |
<<<<<<<
return super.setTag(tag);
=======
notifyHardwareOfTwitterSelection();
return super.init(tag);
>>>>>>>
return super.init(tag); |
<<<<<<<
// TODO: Implements call to create IN stuff
=======
if(this.field !=null && this.terms!=null) {
//TODO: Implements call to create IN stuff
}
>>>>>>>
if(this.field !=null && this.terms!=null) {
//TODO: Implements call to create IN stuff
}
<<<<... |
<<<<<<<
import com.stratio.connector.deep.configuration.ExtractorConnectConstants;
import com.stratio.crossdata.common.data.AlterOptions;
=======
import com.stratio.connector.deep.configuration.DeepConnectorConstants;
>>>>>>>
import com.stratio.crossdata.common.data.AlterOptions;
import com.stratio.connector.deep.c... |
<<<<<<<
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
=======
import static com.stratio.connector.deep.PrepareFunctionalTest.prepareDataForTest;
import static com.stratio.connector.deep.PrepareFunctionalTest.clearData;
import static org.junit.Assert.assertEquals;
import st... |
<<<<<<<
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
=======
>>>>>>>
<<<<<<<
import com.stratio.connector.deep.engine.query.utils.PartialResultsUtils;
import com.stratio.deep.commons.config.ExtractorConfig;
=======
>>>>>>>
<<<<<<<
import com.stratio.meta.common.connector.Operat... |
<<<<<<<
* Configurate and create the DeepSparkContext with the {@link com.stratio.crossdata.common.connector.IConfiguration}.
*
=======
* Configurate and create the DeepSparkContext with the {@link com.stratio.crossdata.common.connector.IConfiguration}.
*
*
>>>>>>>
* Configurate and create the DeepSparkContex... |
<<<<<<<
package com.stratio.connector.deep.engine.query;
=======
package com.stratio.connector.deep.engine.query;
>>>>>>>
package com.stratio.connector.deep.engine.query;
<<<<<<<
=======
import com.stratio.deep.core.context.DeepSparkContext;
>>>>>>> |
<<<<<<<
p.nextToken();
Object builder = deserializeFromObject(p, ctxt);
return finishBuild(ctxt, builder);
=======
return finishBuild(ctxt, deserializeFromObject(p, ctxt));
>>>>>>>
p.nextToken();
return finishBuild(ctxt, deserializeFromObject(p,... |
<<<<<<<
extractorconfig.setExtractorImplClassName(clusterProperties.getValue("cluster." + dataBaseName + "."
+ ExtractorConnectConstants.INNERCLASS));
=======
extractorconfig.setExtractorImplClassName(clusterProperties.getValue("cluster." + dataBase + "."
+ ExtractorCon... |
<<<<<<<
public SmsVerification handle(SendSmsVerificationCodeCommand command) {
if (smsVerificationRepository.exists(command.getMobile(), command.getScope())) {
throw new MobileIsStillUnderVerificationException(command.getMobile(), command.getScope());
=======
public SmsVerification handle... |
<<<<<<<
import com.thebund1st.daming.json.deserializers.SmsVerificationScopeJsonDeserializer;
=======
import com.thebund1st.daming.validation.ValidMobilePhoneNumber;
import com.thebund1st.daming.validation.ValidSmsVerificationCode;
>>>>>>>
import com.thebund1st.daming.json.deserializers.SmsVerificationScopeJsonDeser... |
<<<<<<<
import com.terraformersmc.terrestria.surface.DuneSurfaceBuilder;
=======
import com.terraformersmc.terrestria.Terrestria;
import com.terraformersmc.terrestria.surface.CanyonSurfaceBuilder;
>>>>>>>
import com.terraformersmc.terrestria.surface.DuneSurfaceBuilder;
import com.terraformersmc.terrestria.Terrestria... |
<<<<<<<
import com.terraformersmc.terrestria.feature.TreeDefinition;
import com.terraformersmc.terrestria.feature.arch.CanyonArchGenerator;
import com.terraformersmc.terrestria.feature.arch.CanyonArchStructureFeature;
import com.terraformersmc.terrestria.feature.trees.*;
=======
import com.terraformersmc.terrestria.f... |
<<<<<<<
=======
import javax.naming.ConfigurationException;
import com.sun.xml.internal.ws.util.StringUtils;
>>>>>>>
import javax.naming.ConfigurationException;
import com.sun.xml.internal.ws.util.StringUtils; |
<<<<<<<
// handle exception
if(header[3] != (byte) 20){
byteBuf.readerIndex(savedReaderIndex);
byteBuf.skipBytes(tt);
long requestId = Bytes.bytes2long(header, 4);
DubboRpcResponse response = new DubboRpcResponse();
response.setRequestId(reques... |
<<<<<<<
JCloudsCloud original = new JCloudsCloud("aws-profile", "aws-ec2", "identity",
"credential", "", "http://localhost", 1, 30,
600 * 1000, 600 * 1000, null, Collections.<JCloudsSlaveTemplate>emptyList());
=======
JCloudsCloud original = new JCloudsCloud("aws-profil... |
<<<<<<<
//Traincraft.degActivateChannel.registerMessage(PacketDEGActivate.Handler.class,
// PacketDEGActivate.class, 10, Side.SERVER);
=======
/*Traincraft.degActivateChannel.registerMessage(PacketDEGActivate.Handler.class,
PacketDEGActivate.class, 10, Side.SERVER);*/
>>>>>>>
//Traincraft.degActivateCh... |
<<<<<<<
=======
for(ItemStack dye : dyeGreen){
cm.addRecipe(2, null, new ItemStack(ItemIDs.bogie.item, 3), new ItemStack(ItemIDs.steelframe.item, 3),
new ItemStack(itemSteel, 1, itemDamageSteel), new ItemStack(ItemIDs.steelchimney.item, 2),
n... |
<<<<<<<
import org.apache.commons.lang3.RandomStringUtils;
import org.lwjgl.input.Keyboard;
=======
>>>>>>>
import org.apache.commons.lang3.RandomStringUtils;
import org.lwjgl.input.Keyboard; |
<<<<<<<
}
=======
@Override
public void onUpdate() {
if (worldObj.isRemote && ticksExisted %2 ==0 && !Minecraft.getMinecraft().ingameGUI.getChatGUI().getChatOpen()){
if (FMLClientHandler.instance().getClient().gameSettings.keyBindForward.isPressed()
&& !forwardPressed) {
Traincraft.keyChannel... |
<<<<<<<
if (mixin != null) {
_addFieldMixIns(mixin, rawType, fields);
=======
if ((fields != null) && (_mixInResolver != null)) {
Class<?> mixin = _mixInResolver.findMixInClassFor(cls);
if (mixin != null) {
_addFieldMixIns(mixin, cls, fields);
... |
<<<<<<<
Button tester = (Button) findViewById(R.id.launch_tester);
tester.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View arg0) {
startActivity(new Intent(HomePage.this, FragmentTester.class));
}
});
Button osgViewer = (Button) findViewById(R.id.launch_osgViewer);
o... |
<<<<<<<
Button tester = (Button) findViewById(R.id.launch_tester);
tester.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View arg0) {
startActivity(new Intent(HomePage.this, FragmentTester.class));
}
});
=======
Button osgViewer = (Button) findViewById(R.id.launch_osgV... |
<<<<<<<
static enum EnumWithDefaultAnno {
A, B,
@JsonEnumDefaultValue
OTHER;
}
static enum EnumWithDefaultAnnoAndConstructor {
A, B,
@JsonEnumDefaultValue
OTHER;
@JsonCreator public static EnumWithDefaultAnnoAndConstructor fromId(String value) {
... |
<<<<<<<
Button tester = (Button) findViewById(R.id.launch_tester);
tester.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View arg0) {
startActivity(new Intent(HomePage.this, FragmentTester.class));
}
});
=======
Button osgViewer = (Button) findViewById(R.id.launch_osgV... |
<<<<<<<
// this field is applicable only for client charges
final Map<String, List<GLAccountData>> incomeOrLiabilityAccountOptions = null;
=======
>>>>>>>
// this field is applicable only for client charges
final Map<String, List<GLAccountData>> incomeOrLiabilityAccountOptions = n... |
<<<<<<<
boolean isGuaranteeRequired(Long loanId);
=======
Date retrieveMinimumDateOfRepaymentTransaction(Long loanId);
PaidInAdvanceData retrieveTotalPaidInAdvance(Long loanId);
LoanTransactionData retrieveRefundByCashTemplate(Long loanId);
>>>>>>>
boolean isGuaranteeRequired(Long loanId);
... |
<<<<<<<
public Collection<CalendarData> retrieveCalendarsByEntity(final Long entityId, final Integer entityTypeId, final List<EnumOptionData> calendarTypeOptions) {
=======
public Collection<CalendarData> retrieveCalendarsByEntity(final Long entityId, final Integer entityTypeId, List<Integer> calendarTypeOpti... |
<<<<<<<
@Column(name = "principal_threshold_for_last_instalment", scale = 2, precision = 5, nullable = false)
private BigDecimal principalThresholdForLastInstalment;
=======
@Column(name = "account_moves_out_of_npa_only_on_arrears_completion")
private boolean accountMovesOutOfNPAOnlyOnArrearsCompleti... |
<<<<<<<
private final BigDecimal principalThresholdForLastInstalment;
=======
private final Integer instalmentAmountInMultiplesOf;
>>>>>>>
private final BigDecimal principalThresholdForLastInstalment;
private final Integer instalmentAmountInMultiplesOf;
<<<<<<<
final DaysInMonthType d... |
<<<<<<<
Collection<PortfolioAccountData> retrieveAllForLookup(final PortfolioAccountDTO portfolioAccountDTO);
=======
Collection<PortfolioAccountData> retrieveAllForLookup(Integer toAccountType, Long toClientId, long[] accountStatus);
Collection<PortfolioAccountData> retrieveAllForLookup(Integer toAccoun... |
<<<<<<<
"officeId", "officeName", "loanOfficerFlag", "externalId", "mobileNo", "allowedOffices", "isActive"));
=======
"officeId", "officeName", "isLoanOfficer", "externalId", "mobileNo", "allowedOffices"));
>>>>>>>
"officeId", "officeName", "isLoanOfficer", "externalId", "mobileN... |
<<<<<<<
this.createStandingInstructionAtDisbursement = createStandingInstructionAtDisbursement;
=======
/*
* During loan origination stage and before loan is approved
* principal_amount, approved_principal and principal_amount_demanded
* will same amount and that am... |
<<<<<<<
private static final String RECOVER_FROM_GUARANTORS_COMMAND = "recoverGuarantees";
=======
private static final String MAKE_REFUND_BY_CASH_COMMAND = "refundByCash";
>>>>>>>
private static final String RECOVER_FROM_GUARANTORS_COMMAND = "recoverGuarantees";
private static final String MAKE_REFU... |
<<<<<<<
=======
if (isDateInTheFuture(activationLocalDate)) {
final String defaultUserMessage = "Activation date cannot be in the future.";
final ApiParameterError error = ApiParameterError.parameterError("error.msg.clients.activationDate.in.the.future",
defaultUse... |
<<<<<<<
=======
import java.util.List;
import org.joda.time.DateTimeConstants;
>>>>>>>
<<<<<<<
import org.mifosplatform.portfolio.loanaccount.data.HolidayDetailDTO;
=======
import org.mifosplatform.portfolio.common.domain.DayOfWeekType;
>>>>>>>
import org.mifosplatform.portfolio.loanaccount.data.HolidayDetailDT... |
<<<<<<<
GlobalConfigurationData retrieveGlobalConfiguration();
GlobalConfigurationPropertyData retrieveGlobalConfiguration(Long configId);
=======
//GlobalConfigurationData retrieveGlobalConfiguration();
GlobalConfigurationData retrieveGlobalConfiguration(boolean survey);
// GlobalConfigurati... |
<<<<<<<
private static final Map<String, String[]> targetMethosMap = new HashMap<>();
=======
private static final Map<String, ClassMethodNamesPair> targetMethosMap = new HashMap<String, ClassMethodNamesPair>();
>>>>>>>
private static final Map<String, ClassMethodNamesPair> targetMethosMap = new HashMap<... |
<<<<<<<
} else if (wrapper.isGuaranteeRecovery()) {
handler = this.applicationContext.getBean("recoverFromGuarantorCommandHandler", NewCommandSourceHandler.class);
} else {
=======
}
else if (wrapper.isLoanRefundByCash()) {
handler = thi... |
<<<<<<<
final BigDecimal principalThresholdForLastInstalment = null;
=======
final boolean accountMovesOutOfNPAOnlyOnArrearsCompletion = false;
>>>>>>>
final BigDecimal principalThresholdForLastInstalment = null;
final boolean accountMovesOutOfNPAOnlyOnArrearsCompletion = false;
<<<<... |
<<<<<<<
public CommandWrapperBuilder createMap(Long relId) {
this.actionName = "CREATE";
this.entityName = "ENTITYMAPPING";
this.entityId = relId;
this.href = "/entitytoentitymapping/" + relId;
return this;
}
public CommandWrapperBuilder updateMap(Long mapId) {
... |
<<<<<<<
import org.mifosplatform.portfolio.group.exception.ClientNotInGroupException;
=======
import org.mifosplatform.portfolio.group.exception.CenterNotActiveException;
import org.mifosplatform.portfolio.group.exception.GroupNotActiveException;
>>>>>>>
import org.mifosplatform.portfolio.group.exception.ClientNotIn... |
<<<<<<<
final SavingsAccountTransactionDTO transactionDTO = new SavingsAccountTransactionDTO(fmt, activationDate,
minRequiredOpeningBalance.getAmount(), existingTransactionIds, existingReversedTransactionIds, null);
=======
final SavingsAccountTransactionDTO transactionDT... |
<<<<<<<
product, inArrears);
=======
product, graceOnArrearsAgeing);
>>>>>>>
product, inArrears, graceOnArrearsAgeing);
<<<<<<<
maxOutstandingLoanBalance, emiAmountVariations, memberVariations, product, inArrears);
=======
maxOutstand... |
<<<<<<<
=======
if(connManager != null)
connManager.deRegister(this);
closeReason = reason;
>>>>>>>
closeReason = reason; |
<<<<<<<
processingEnv.getMessager().printMessage(Diagnostic.Kind.WARNING, "TYPE!!!! " + allWrapperTypes.size());
Set<DataClass> dataClasses = new LinkedHashSet<>();
=======
>>>>>>>
Set<DataClass> dataClasses = new LinkedHashSet<>(); |
<<<<<<<
import com.kabouzeid.gramophone.model.UiPreferenceChangedEvent;
=======
>>>>>>>
import com.kabouzeid.gramophone.model.UIPreferenceChangedEvent;
<<<<<<<
@Subscribe
public void onUIChangeEvent(UiPreferenceChangedEvent event) {
switch (event.getAction()) {
case UiPreferenceChangedE... |
<<<<<<<
=======
import android.graphics.drawable.BitmapDrawable;
>>>>>>>
<<<<<<<
private void resetColors() {
int songTitleTextColor = Util.resolveColor(this, R.attr.title_text_color);
int artistNameTextColor = Util.resolveColor(this, R.attr.caption_text_color);
int defaultBarColor = Uti... |
<<<<<<<
a1.getArtistName(),
a2.getArtistName());
Comparator<Album> byYear = (a1, a2) -> a1.getYear() - a2.getYear();
Comparator<Album> byDateAdded = (a1, a2) -> ComparatorUtil.compareLongInts(a1.getDateAdded(), a2.getDateAdded());
=======
getArtistName.a... |
<<<<<<<
import android.app.Activity;
=======
>>>>>>>
<<<<<<<
import com.kabouzeid.gramophone.util.Util;
import com.koushikdutta.ion.Ion;
=======
>>>>>>>
import com.koushikdutta.ion.Ion;
<<<<<<<
import java.util.List;
=======
import java.util.ArrayList;
>>>>>>>
import java.util.ArrayList; |
<<<<<<<
protected ZeppelinConnection connection;
private URI uri;
=======
protected ThreadLocal<ZeppelinConnection> connection = new ThreadLocal<ZeppelinConnection>() {
@Override protected ZeppelinConnection initialValue() { //Lazy Init by subClass impl
return getConnection();
}
};
>>>>>... |
<<<<<<<
.add("zeppelin.spark.concurrentSQL", "false",
"Execute multiple SQL concurrently if set true.")
=======
.add("zeppelin.spark.useHiveContext", "false",
"use HiveContext instead of SQLContext if it is true")
>>>>>>>
.add("zeppelin.spark.useHiv... |
<<<<<<<
shuffle3000(scrambled);
compareSymmetric();
}
static void shuffle3000(List<? extends Object> scrambled) {
Collections.shuffle(scrambled, new Random(3000));
Collections.sort(scrambled, new NaturalOrderComparator());
System.out.println("Sorted: " + scrambled... |
<<<<<<<
import java.beans.Introspector;
import java.io.IOException;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import ja... |
<<<<<<<
=======
import java.beans.Introspector;
import java.io.StringWriter;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.ut... |
<<<<<<<
import android.app.Notification;
=======
>>>>>>>
<<<<<<<
onAlertChoice(ConfigConstants.DETECTION_TYPE_ALWAYS_BLOCKED_HERE);
showToastOnNoLocation();
checkForActivatedLocation();
locationFinder.blockMicOrSpoof(); //try to get the microphone access for choosing the blocking met... |
<<<<<<<
errorNotification("Sync not configured");
=======
displayErrorNotification(context
.getString(R.string.sync_not_configured));
>>>>>>>
errorNotification("Sync not configured");
<<<<<<<
private void pull() throws IOException, CertificateException, SSLHandshakeException {
updateNotification(20... |
<<<<<<<
import com.matburt.mobileorg.Gui.Agenda.AgendasActivity;
=======
import com.matburt.mobileorg.Gui.Wizard.WizardActivity;
>>>>>>>
import com.matburt.mobileorg.Gui.Agenda.AgendasActivity;
import com.matburt.mobileorg.Gui.Wizard.WizardActivity; |
<<<<<<<
import net.moddity.droidnubekit.responsemodels.DNKRecord;
import net.moddity.droidnubekit.responsemodels.DNKRecordField;
=======
>>>>>>>
import net.moddity.droidnubekit.responsemodels.DNKRecord;
import net.moddity.droidnubekit.responsemodels.DNKRecordField;
<<<<<<<
import retrofit.Callback;
=======
impor... |
<<<<<<<
@Suite.SuiteClasses({AlphaBetaSearchTest.class, MinimaxSearchTest.class, AssignmentTest.class, CSPTest.class, MapCSPTest.class,
MetricsTest.class, TreeCspSolverTest.class, AStarSearchTest.class, GreedyBestFirstSearchTest.class, RecursiveBestFirstSearchTest.class,
SimulatedAnnealingSearchTest.class, AndOrSea... |
<<<<<<<
/**
* No matter how formatter tries to add linewrapping there is none in the formatted result.
*
* @see PPFormatter#assignmentExpressionConfiguration(FormattingConfig c)
*/
public void test_Format_AssignmentExpression() throws Exception {
String code = "$a = 1\n$b = 2\n";
XtextResource r = getRes... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.