conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
I_M_PriceList_Version getCreatePriceListVersion(ProductPriceCreateRequest request);
=======
I_M_PriceList getPriceListByPriceListVersionId(PriceListVersionId priceListVersionId);
>>>>>>>
I_M_PriceList_Version getCreatePriceListVersion(ProductPriceCreateRequest request);
I_M_PriceList getPriceListByPr... |
<<<<<<<
import org.adempiere.service.OrgId;
import org.adempiere.util.Services;
import org.adempiere.warehouse.LocatorId;
import org.adempiere.warehouse.WarehouseId;
import org.adempiere.warehouse.api.IWarehouseBL;
import org.adempiere.warehouse.api.IWarehouseDAO;
import org.compiere.model.I_M_Warehouse;
=======
>>>... |
<<<<<<<
import org.adempiere.service.ClientId;
import org.adempiere.service.OrgId;
import org.adempiere.util.Check;
import org.adempiere.util.Services;
=======
>>>>>>>
import org.adempiere.service.ClientId;
import org.adempiere.service.OrgId;
<<<<<<<
import org.adempiere.util.time.SystemTime;
import org.adempiere.w... |
<<<<<<<
tboml.setAD_PInstance_ID(getAD_PInstance_ID());
tboml.setM_CostElement_ID(costElement.getId());
=======
tboml.setAD_PInstance_ID(getPinstanceId().getRepoId());
tboml.setM_CostElement_ID(costElement.getM_CostElement_ID());
>>>>>>>
tboml.setAD_PInstance_ID(getPinstanceId().getRepoId());
tboml... |
<<<<<<<
import java.util.Optional;
import java.util.function.Supplier;
import javax.annotation.Nullable;
=======
import javax.annotation.Nullable;
>>>>>>>
import java.util.function.Supplier;
import javax.annotation.Nullable;
<<<<<<<
import org.compiere.model.I_C_UOM;
import org.compiere.util.Util;
=======
>>>... |
<<<<<<<
import de.metas.product.IProductBL;
=======
import de.metas.util.Services;
>>>>>>>
import de.metas.product.IProductBL;
import de.metas.util.Services;
<<<<<<<
// To
int M_LocatorTo_ID = wh.getDefaultLocator().getM_Locator_ID();
// From: Look-up Storage
String MMPolicy = Services.get(IProductBL.... |
<<<<<<<
import org.adempiere.model.InterfaceWrapperHelper;
import org.adempiere.util.Check;
import org.adempiere.util.Services;
import org.compiere.model.I_C_AllocationLine;
=======
>>>>>>>
import org.adempiere.model.InterfaceWrapperHelper;
import org.compiere.model.I_C_AllocationLine; |
<<<<<<<
private Boolean enableFieldMatching;
private Boolean ignoreAmbiguity;
=======
Boolean enableFieldMatching;
Boolean ignoreAmbiguity;
private Boolean fullTypeMatchingRequired;
>>>>>>>
Boolean enableFieldMatching;
Boolean ignoreAmbiguity;
private Boolean fullTypeMatchingRequired;
<<<<<<<
... |
<<<<<<<
import com.google.common.collect.Multimaps;
import com.google.common.collect.UnmodifiableIterator;
import ch.qos.logback.classic.Level;
=======
import de.metas.bpartner.BPartnerContactId;
>>>>>>>
<<<<<<<
=======
import org.adempiere.ad.dao.IQueryBL;
import org.adempiere.ad.dao.QueryLimit;
import org.adem... |
<<<<<<<
final ProductId productId = ProductId.ofRepoId(20);
final int vendorBPartnerId = 30;
=======
final int productId = 20;
final BPartnerId vendorBPartnerId = BPartnerId.ofRepoId(30);
>>>>>>>
final ProductId productId = ProductId.ofRepoId(20);
final BPartnerId vendorBPartnerId = BPartnerId.ofRepoId(3... |
<<<<<<<
import de.metas.product.ProductId;
=======
import de.metas.util.Services;
>>>>>>>
import de.metas.product.ProductId;
import de.metas.util.Services; |
<<<<<<<
import org.compiere.model.I_M_Product;
import org.eevolution.api.ComponentIssueCreateRequest;
=======
>>>>>>>
import org.eevolution.api.ComponentIssueCreateRequest; |
<<<<<<<
import de.metas.money.CurrencyId;
=======
import de.metas.organization.IOrgDAO;
import de.metas.organization.OrgId;
import de.metas.organization.OrgInfo;
import de.metas.organization.OrgInfoUpdateRequest;
>>>>>>>
import de.metas.money.CurrencyId;
import de.metas.organization.IOrgDAO;
import de.metas.organiza... |
<<<<<<<
=======
package de.metas.product;
import de.metas.organization.OrgId;
import de.metas.util.ISingletonService;
import de.metas.util.lang.ExternalId;
import lombok.Builder;
import lombok.NonNull;
import lombok.Value;
import org.compiere.model.I_M_Product;
import org.compiere.model.I_M_Product_Category;
import... |
<<<<<<<
import org.adempiere.service.OrgId;
import org.adempiere.util.Services;
import org.adempiere.warehouse.WarehouseId;
=======
>>>>>>>
import org.adempiere.service.OrgId;
import org.adempiere.warehouse.WarehouseId; |
<<<<<<<
@NonNull final ITranslatableString description,
@NonNull final List<PickingRow> rows,
@NonNull final PickingCandidateCommand pickingCandidateCommand)
=======
final ITranslatableString description,
final Supplier<List<PickingRow>> rowsSupplier)
>>>>>>>
@NonNull final ITranslatableString desc... |
<<<<<<<
import java.util.stream.Stream;
=======
import java.util.Set;
>>>>>>>
import java.util.Set;
import java.util.stream.Stream;
<<<<<<<
I_M_InOut getById(final InOutId inoutId);
=======
I_M_InOut getById(InOutId inoutId);
>>>>>>>
I_M_InOut getById(InOutId inoutId);
<<<<<<<
Stream<InOutId> streamInOu... |
<<<<<<<
/*
* #%L
* de.metas.fresh.base
* %%
* Copyright (C) 2015 metas GmbH
* %%
* 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 version 2 of the
* License, or (at your option) a... |
<<<<<<<
import org.adempiere.util.Check;
import org.adempiere.util.Services;
import org.adempiere.warehouse.WarehouseId;
=======
>>>>>>>
import org.adempiere.warehouse.WarehouseId; |
<<<<<<<
Doc<?> getOrNull(final Properties ctx, MAcctSchema[] ass, int AD_Table_ID, int Record_ID, String trxName);
=======
Doc getOrNull(Properties ctx, MAcctSchema[] ass, TableRecordReference documentRef);
>>>>>>>
Doc<?> getOrNull(Properties ctx, MAcctSchema[] ass, TableRecordReference documentRef); |
<<<<<<<
import org.adempiere.mm.attributes.AttributeSetInstanceId;
=======
import javax.annotation.Nullable;
>>>>>>>
import org.adempiere.mm.attributes.AttributeSetInstanceId;
import javax.annotation.Nullable;
<<<<<<<
=======
if (pricingConditionsResult == null)
{
return;
}
>>>>>>>
if (pricingCo... |
<<<<<<<
import org.adempiere.minventory.api.IInventoryDAO;
import org.adempiere.util.Services;
import org.compiere.model.I_C_AcctSchema;
=======
import org.adempiere.model.InterfaceWrapperHelper;
import org.adempiere.util.Services;
>>>>>>>
import org.adempiere.util.Services;
import org.compiere.model.I_C_AcctSchema;... |
<<<<<<<
=======
/*
* #%L
* de.metas.adempiere.libero.libero
* %%
* Copyright (C) 2015 metas GmbH
* %%
* 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 version 2 of the
* License... |
<<<<<<<
final Doc<?> doc = docFactory.getOrNull(ctx, ass, AD_Table_ID, Record_ID, trxName);
=======
final Doc doc = docFactory.getOrNull(ctx, ass, documentRef);
>>>>>>>
final Doc<?> doc = docFactory.getOrNull(ctx, ass, documentRef); |
<<<<<<<
import org.adempiere.location.CountryId;
import org.adempiere.util.ISingletonService;
=======
>>>>>>>
import org.adempiere.location.CountryId; |
<<<<<<<
import org.adempiere.ad.dao.IQueryBL;
import org.adempiere.model.InterfaceWrapperHelper;
import org.adempiere.util.Services;
=======
import org.adempiere.ad.dao.IQueryBL;
import org.adempiere.model.InterfaceWrapperHelper;
import org.adempiere.util.LegacyAdapters;
import org.adempiere.util.Services;
>>>>>>>
... |
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
import org.n52.iceland.exception.ows.OwsExceptionReport;
>>>>>>>
import org.n52.iceland.exception.ows.OwsExceptionReport; |
<<<<<<<
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.deser.std.StdConvertingDeserializer;
=======
i... |
<<<<<<<
import org.compiere.model.I_C_BPartner;
=======
import org.compiere.model.I_AD_OrgInfo;
>>>>>>>
import org.compiere.model.I_AD_OrgInfo;
import org.compiere.model.I_C_BPartner;
<<<<<<<
order.setAD_Org_ID(bp.getAD_OrgBP_ID());
MOrgInfo oi = MOrgInfo.get(getCtx(), bp.getAD_OrgBP_ID());
=======
... |
<<<<<<<
import org.adempiere.util.Services;
import org.adempiere.warehouse.WarehouseId;
import org.adempiere.warehouse.api.IWarehouseBL;
import org.adempiere.warehouse.api.IWarehouseDAO;
import org.compiere.model.I_M_Warehouse;
=======
>>>>>>>
import org.adempiere.warehouse.WarehouseId;
import org.adempiere.warehous... |
<<<<<<<
import java.util.Optional;
=======
import java.util.Map;
>>>>>>>
import java.util.Optional;
import java.util.Map;
<<<<<<<
import org.adempiere.ad.dao.ICompositeQueryUpdater;
import org.adempiere.ad.dao.IQueryBL;
=======
import org.adempiere.ad.trx.api.ITrxManager;
>>>>>>>
import org.adempiere.ad.dao.ICom... |
<<<<<<<
/**
* Throw an error message if the sysconfig for mandatory pricing conditions is set ( see de.metas.order.impl.OrderLineBL.SYSCONFIG_NoPriceConditionsColorName) but the order contains lines that don't have the pricing conditions set.
*/
void failForMissingPricingConditions(de.metas.adempiere.model.I_C_O... |
<<<<<<<
import de.metas.costing.CostingLevel;
import de.metas.costing.CostingMethod;
=======
import lombok.NonNull;
>>>>>>>
import de.metas.costing.CostingLevel;
import de.metas.costing.CostingMethod;
import lombok.NonNull;
<<<<<<<
default boolean isItem(final int productId)
{
final I_M_Product product = lo... |
<<<<<<<
import org.compiere.util.Util;
import org.eevolution.api.IPPOrderRoutingRepository;
=======
import org.eevolution.api.IPPOrderWorkflowDAO;
>>>>>>>
import org.eevolution.api.IPPOrderRoutingRepository; |
<<<<<<<
import de.metas.organization.OrgId;
=======
import de.metas.logging.TableRecordMDC;
>>>>>>>
import de.metas.organization.OrgId;
import de.metas.logging.TableRecordMDC;
<<<<<<<
saveBPartnerBankAccounts(bpartner.getId(), bpartnerComposite.getBankAccounts(), bpartnerComposite.getOrgId());
}
=======
save... |
<<<<<<<
import org.adempiere.ad.dao.QueryLimit;
import lombok.NonNull;
=======
import org.adempiere.ad.dao.IQueryFilter;
import org.adempiere.archive.AdArchive;
>>>>>>>
import org.adempiere.ad.dao.IQueryFilter;
import org.adempiere.archive.AdArchive;
<<<<<<<
import org.adempiere.util.lang.impl.TableRecordReference;... |
<<<<<<<
import com.fasterxml.jackson.databind.type.CoercionTargetType;
import com.fasterxml.jackson.databind.type.TypeFactory;
import com.fasterxml.jackson.databind.util.ArrayIterator;
=======
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import com.fasterxml.jackson.databind.type.LogicalType;
>>>>>>>
... |
<<<<<<<
import org.adempiere.uom.api.UOMConversionContext;
import org.adempiere.util.Check;
import org.adempiere.util.Services;
import org.adempiere.util.collections.CollectionUtils;
=======
import org.adempiere.uom.api.IUOMConversionContext;
>>>>>>>
import org.adempiere.uom.api.UOMConversionContext; |
<<<<<<<
import de.metas.money.CurrencyId;
=======
import de.metas.order.OrderId;
>>>>>>>
import de.metas.money.CurrencyId;
import de.metas.order.OrderId; |
<<<<<<<
import org.adempiere.util.Services;
import org.adempiere.warehouse.WarehouseId;
import org.adempiere.warehouse.api.IWarehouseDAO;
=======
>>>>>>>
import org.adempiere.warehouse.WarehouseId;
import org.adempiere.warehouse.api.IWarehouseDAO;
<<<<<<<
=======
import de.metas.process.ProcessInfoParameter;
impo... |
<<<<<<<
=======
/**
* Flag that indicates whether (fulll) annotation resolution should
* occur: starting with 2.11 is disabled for JDK container types.
*
* @since 2.11
*/
>>>>>>>
/**
* Flag that indicates whether (fulll) annotation resolution should
* occur: starting with 2... |
<<<<<<<
import org.adempiere.util.Services;
import org.adempiere.util.time.TimeSource;
import org.compiere.model.I_AD_Client;
=======
>>>>>>>
import org.compiere.model.I_AD_Client;
<<<<<<<
=======
import de.metas.contracts.impl.PlainContractChangeDAO;
import de.metas.util.Services;
import de.metas.util.time.TimeS... |
<<<<<<<
import org.compiere.model.IQuery;
import org.compiere.util.TimeUtil;
=======
import org.compiere.model.IQuery.Aggregate;
>>>>>>>
import org.compiere.model.IQuery;
import org.compiere.model.IQuery.Aggregate;
import org.compiere.util.TimeUtil;
<<<<<<<
if (multiQuery.isAddToPredefinedBuckets())
=======
pr... |
<<<<<<<
import de.metas.security.permissions.Access;
=======
import de.metas.uom.IUOMDAO;
>>>>>>>
import de.metas.security.permissions.Access;
import de.metas.uom.IUOMDAO; |
<<<<<<<
import org.adempiere.uom.api.UOMConversionContext;
import org.adempiere.util.Check;
import org.adempiere.util.Services;
=======
>>>>>>>
import org.adempiere.uom.api.UOMConversionContext; |
<<<<<<<
import org.adempiere.service.OrgId;
import org.adempiere.util.Check;
import org.adempiere.util.Services;
=======
import org.adempiere.util.lang.IContextAware;
>>>>>>>
import org.adempiere.service.OrgId; |
<<<<<<<
public boolean isEmptyStorage(@NonNull final I_M_HU hu)
{
return getStorageFactory()
.streamHUProductStorages(hu)
.allMatch(IProductStorage::isEmpty);
}
=======
public void setHUStatus(@NonNull final I_M_HU hu, @NonNull final IContextAware contextProvider,@NonNull final String huStatus)
{
f... |
<<<<<<<
import de.metas.product.IProductBL;
=======
import de.metas.util.Check;
import de.metas.util.Services;
import de.metas.util.time.SystemTime;
>>>>>>>
import de.metas.product.IProductBL;
import de.metas.util.Check;
import de.metas.util.Services;
import de.metas.util.time.SystemTime; |
<<<<<<<
import org.adempiere.ad.security.IUserRolePermissions;
import org.adempiere.ad.service.IADPInstanceDAO;
=======
import org.adempiere.ad.service.IDeveloperModeBL;
>>>>>>>
<<<<<<<
* @author Jorg Janke
* @version $Id: MPInstance.java,v 1.3 2006/07/30 00:58:36 jjanke Exp $
*
=======
>>>>>>>
<<<<<<<
/*... |
<<<<<<<
import org.adempiere.util.Check;
import org.adempiere.util.Services;
import org.adempiere.warehouse.WarehouseId;
=======
import org.adempiere.ad.trx.api.ITrx;
import org.adempiere.model.I_M_PackagingContainer;
>>>>>>>
import org.adempiere.warehouse.WarehouseId;
<<<<<<<
=======
import de.metas.product.ISto... |
<<<<<<<
import org.adempiere.util.time.SystemTime;
import org.adempiere.warehouse.WarehouseId;
=======
>>>>>>>
import org.adempiere.warehouse.WarehouseId;
<<<<<<<
import de.metas.product.ProductId;
=======
import de.metas.util.Check;
import de.metas.util.time.SystemTime;
>>>>>>>
import de.metas.product.ProductId... |
<<<<<<<
@Override
public I_M_HU_PI getEffectivePI(final I_M_HU hu)
{
if (!isAggregateHU(hu))
{
return hu.getM_HU_PI_Version().getM_HU_PI();
}
// note: if hu is an aggregate HU, then there won't be an NPE here.
final I_M_HU_PI_Item parentPIItem = hu.getM_HU_Item_Parent().getM_HU_PI_Item();
if (parent... |
<<<<<<<
protected Object _unwrapAndDeserialize(JsonParser p, DeserializationContext ctxt,
JavaType rootType, JsonDeserializer<Object> deser) throws IOException
{
PropertyName expRootName = ctxt.findRootName(rootType);
// 12-Jun-2015, tatu: Should try to support namespaces etc but...
... |
<<<<<<<
import org.adempiere.util.Services;
=======
import org.adempiere.util.LegacyAdapters;
import de.metas.util.Services;
>>>>>>>
import de.metas.util.Services; |
<<<<<<<
private static final long serialVersionUID = 544868120L;
=======
private static final long serialVersionUID = -1832723065L;
>>>>>>>
private static final long serialVersionUID = -1832723065L;
<<<<<<<
/** Set Catch Einheit.
@param Catch_UOM_ID
Aus dem Produktstamm übenommene Catch Weight Einheit.
... |
<<<<<<<
import org.compiere.util.DB;
import org.compiere.util.Env;
import org.compiere.util.TimeUtil;
import org.slf4j.Logger;
import de.metas.i18n.Language;
import de.metas.i18n.Msg;
import de.metas.logging.LogManager;
import de.metas.security.IUserRolePermissions;
import de.metas.security.permissions.Access;
=====... |
<<<<<<<
* Cost Detail Model
*
* @author Jorg Janke
* @author Armen Rizal, Goodwill Consulting
* <li>BF: 2431123 Return Trx changes weighted average cost
* <li>BF: 1568752 Average invoice costing: landed costs incorrectly applied
* @author Armen Rizal & Bayu Cahya
* <li>BF [ 2129781 ] Co... |
<<<<<<<
import de.metas.product.ProductId;
=======
import de.metas.util.Check;
import de.metas.util.Services;
>>>>>>>
import de.metas.product.ProductId;
import de.metas.util.Check;
import de.metas.util.Services; |
<<<<<<<
import de.metas.bpartner.BPartnerId;
=======
import de.metas.adempiere.model.I_C_Currency;
>>>>>>>
<<<<<<<
PlainCurrencyDAO.prepareCurrency()
.currencyId(CURRENCY_ID)
.currencyCode(CurrencyCode.EUR)
.precision(CurrencyPrecision.TWO)
.build();
=======
refundTestTools = new RefundTestToo... |
<<<<<<<
import de.metas.picking.api.PickingSlotId;
=======
import de.metas.util.ISingletonService;
>>>>>>>
import de.metas.picking.api.PickingSlotId;
import de.metas.util.ISingletonService; |
<<<<<<<
import de.metas.bpartner.BPartnerId;
=======
import de.metas.adempiere.model.I_C_Currency;
>>>>>>>
<<<<<<<
PlainCurrencyDAO.prepareCurrency()
.currencyId(CURRENCY_ID)
.currencyCode(CurrencyCode.EUR)
.precision(CurrencyPrecision.TWO)
.build();
=======
refundTestTools = new RefundTestToo... |
<<<<<<<
public void setParentHU(final IHUContext huContext, @Nullable final I_M_HU_Item parentHUItem, final I_M_HU hu)
=======
public void setParentHU(final IHUContext huContext, final @Nullable I_M_HU_Item parentHUItem, final I_M_HU hu)
>>>>>>>
public void setParentHU(final IHUContext huContext, @Nullable final ... |
<<<<<<<
import java.sql.Timestamp;
=======
>>>>>>>
import java.sql.Timestamp;
<<<<<<<
final int m_HU_PI_Item_Product_ID = getM_HU_PI_Item_Product_ID();
if (m_HU_PI_Item_Product_ID <= 0)
{
return null;
}
return loadOutOfTrx(m_HU_PI_Item_Product_ID, I_M_HU_PI_Item_Product.class);
=======
final Intege... |
<<<<<<<
=======
import org.adempiere.model.engines.CostDimension;
import org.adempiere.util.LegacyAdapters;
>>>>>>>
import org.adempiere.util.LegacyAdapters;
<<<<<<<
private final ICostElementRepository costElementsRepo = Adempiere.getBean(ICostElementRepository.class);
private final ICurrentCostsRepository curre... |
<<<<<<<
=======
import java.sql.Timestamp;
import java.util.List;
/*
* #%L
* de.metas.handlingunits.base
* %%
* Copyright (C) 2015 metas GmbH
* %%
* 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 ... |
<<<<<<<
import android.text.TextUtils;
=======
>>>>>>> |
<<<<<<<
if ((_ignorableProps != null) && _ignorableProps.contains(propName)) {
=======
if (IgnorePropertiesUtil.shouldIgnore(propName, _ignorableProps, _includableProps)) {
>>>>>>>
if (IgnorePropertiesUtil.shouldIgnore(propName, _ignorableProps, _includableProps)) {
<<<<<<<
... |
<<<<<<<
import info.zamojski.soft.towercollector.MyApplication;
import info.zamojski.soft.towercollector.collector.validators.specific.WcdmaCellIdentityValidator;
import info.zamojski.soft.towercollector.model.Cell;
import timber.log.Timber;
=======
>>>>>>> |
<<<<<<<
import android.text.format.Time;
=======
import android.os.Build;
>>>>>>>
import android.text.format.Time;
import android.os.Build;
<<<<<<<
/**
* Load layout resource here. Also, load any theme settings
* @param layout The root layout
=======
/**
Load layout resource here. Also, loa... |
<<<<<<<
import com.fasterxml.jackson.core.util.SimpleTokenWriteContext;
=======
import com.fasterxml.jackson.core.util.JacksonFeatureSet;
>>>>>>>
import com.fasterxml.jackson.core.util.JacksonFeatureSet;
import com.fasterxml.jackson.core.util.SimpleTokenWriteContext;
<<<<<<<
=======
@Override
pub... |
<<<<<<<
// TODO: find a better way to flag internal errors
// if (testEnv.hasBeenStopped()) {
// // the execution has been forcefully stopped inform the user!
// throw new AssertionError("Test terminated due timeout!" +
// assertionError.getMessage());
// }
=======
>>>>>>>
// TODO: find a better w... |
<<<<<<<
/**********************************************************************
/* High-level handling of secondary input shapes (with
/* possible coercion)
/**********************************************************************
=======
/************************************************************... |
<<<<<<<
import butterknife.ButterKnife;
=======
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
>>>>>>>
import butterknife.ButterKnife;
<<<<<<<
Image image;
MorphingButton createPdf;
MorphingButton openPdf;
MorphingButton addImages;
TextView textView... |
<<<<<<<
/* Fields that can be updated */
public static final String[] FIELDS_TO_COMPARE =
{
"screen_name",
"link",
"text" // can embed rich content
};
public static PushReport saveMessagesAndImportProfile(List<Map<String, Object>> messages, int fileHash, RemoteAccess.Post po... |
<<<<<<<
jsonText = ClientConnection.download(url);
XContentParser parser = JsonXContent.jsonXContent.createParser(jsonText);
Map<String, Object> map = parser == null ? null : parser.map();
=======
byte[] jsonText = ClientConnection.download(url);
Map<String,... |
<<<<<<<
public final static String FOLLOWER_DUMP_FILE_PREFIX = "follower_";
public final static String FOLLOWING_DUMP_FILE_PREFIX = "following_";
=======
public final static String FOLLOWERS_DUMP_FILE_PREFIX = "followers_";
>>>>>>>
public final static String FOLLOWERS_DUMP_FILE_PREFIX = "followers_";... |
<<<<<<<
import org.loklak.data.Timeline;
=======
import org.loklak.data.PrivacyStatus;
>>>>>>>
import org.loklak.data.Timeline;
import org.loklak.data.PrivacyStatus;
<<<<<<<
@SuppressWarnings("unchecked")
public static boolean checkMessageExistence(Map<String, Object> message) {
String source_type =... |
<<<<<<<
import java.util.Iterator;
=======
import java.util.List;
import java.util.regex.Pattern;
import org.json.JSONArray;
import org.json.JSONObject;
>>>>>>>
import java.util.Iterator;
import java.util.List;
<<<<<<<
=======
/**
* to remember larger sets of thoughts, we can also think arguments
*... |
<<<<<<<
import org.apache.ibatis.annotations.Select;
=======
import com.fly4j.yshop.pms.pojo.vo.SkuLockVO;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
>>>>>>>
import org.apache.ibatis.annotations.Select;
import com.fly4j.yshop.... |
<<<<<<<
protected static final long emptyQueueSleepTime = 500; // 500 ms
=======
private static final long emptyQueueSleepTime = 500; // 500ms
private static final long reconnectSleepTime = 5000; // 5s
private static final int reconnectAttempts = 120; // Total time: 10min
>>>>>>>
protected static final long ... |
<<<<<<<
public SettableBeanProperty withValueDeserializer(JsonDeserializer<?> deser) {
return new CreatorProperty(this, deser, _nullProvider);
=======
public CreatorProperty withValueDeserializer(JsonDeserializer<?> deser) {
if (_valueDeserializer == deser) {
return this;
}... |
<<<<<<<
/**
* Factory to allow override of dismiss data
*/
protected PendingDismissData createPendingDismissData(int position, View view) {
return new PendingDismissData(position, view);
}
=======
@Override
public boolean isSwiping() {
return mSwiping;
}
>>>>>>>
@Override
public boolean isSwiping(... |
<<<<<<<
}
if (matchDataset == null) {
LOG.warn("Dataset "+datasetName+" not found in file "+split.getPath());
// Just work on the first dataset to ensure we return some data
matchDataset = firstDataset;
}
=======
if (matchDataset == null) {
LOG.warn("Datase... |
<<<<<<<
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
=======
>>>>>>>
<<<<<<<
import com.urbanairship.http.ResponseParser;
import com.urbanairship.util.Checks;
=======
>>>>>>>
import com.urbanairship.http.ResponseParser;
import com.urbanairship.util.Checks;
<<<<<<<
import java.util.L... |
<<<<<<<
Logger.warn("Automation - Cannot access the Automation API outside of the main process");
PendingResult<ActionSchedule> pendingResult = new PendingResult<>();
pendingResult.setResult(null);
return pendingResult;
=======
Logger.error("Automation - Can... |
<<<<<<<
import com.urbanairship.TestClock;
import com.urbanairship.TestLocaleManager;
=======
>>>>>>>
import com.urbanairship.TestClock;
<<<<<<<
runtimeConfig, testLocaleManager, mockDispatcher, clock,
mockClient, mockAttributeRegistrar, mockTagGroupRegistrar);
=======
... |
<<<<<<<
UAirship.sharedAirship.channel = new AirshipChannel(this, preferenceDataStore, UAirship.sharedAirship.runtimeConfig);
UAirship.sharedAirship.analytics = new Analytics(this, preferenceDataStore, testRuntimeConfig, UAirship.sharedAirship.channel);
=======
UAirship.sharedAirship.localeMan... |
<<<<<<<
public static final String DEFAULT_WINRM_PASSWORD_OPTION = "option.winrmPassword";
public static final int DEFAULT_WINRM_PORT = 5986;
public static final int DEFAULT_WINRM_UNENCRYPTED_PORT = 5985;
public static final String WINRM_CONNTYPE_PROPERTY = "winrm-encrypted";
public static final Str... |
<<<<<<<
// Configuration is null in some contexts (e.g. TableDesc#getDeserializer)
// so we have to be defensive here
if (configuration != null) {
configuration.set(HAIVVREO_SCHEMA, schema.toString(false));
// force output files to have a .avro extension
configuration.set("hive.output.file... |
<<<<<<<
import org.droidplanner.android.proxy.mission.item.MissionItemProxy;
import org.droidplanner.android.proxy.mission.MissionProxy;
=======
import org.droidplanner.android.mission.MissionRender;
import org.droidplanner.android.mission.MissionSelection;
import org.droidplanner.android.mission.item.MissionItemRend... |
<<<<<<<
// 15-Oct-2010, tatu: Can't assume missing message is an error, since it may be
// suppressed during serialization, as per [JACKSON-388].
//
// Should probably allow use of default constructor, too...
//throw new XxxException("No 'message' propert... |
<<<<<<<
import com.o3dr.services.android.lib.drone.action.CameraActions;
=======
import com.o3dr.services.android.lib.coordinate.LatLongAlt;
>>>>>>>
import com.o3dr.services.android.lib.drone.action.CameraActions;
import com.o3dr.services.android.lib.coordinate.LatLongAlt;
<<<<<<<
if (droneMgr != nu... |
<<<<<<<
=======
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.MapperFeature;
>>>>>>>
import com.fasterxml.jackson.databind.MapperFeature;
<<<<<<<
_propsInOrder = props.toArray(new SettableBeanProperty[0]);
// Former `assignIndexes`
// order... |
<<<<<<<
import org.droidplanner.services.android.core.survey.CameraInfo;
=======
>>>>>>>
<<<<<<<
import org.droidplanner.services.android.core.drone.manager.DroneManager;
=======
import org.droidplanner.services.android.communication.connection.AndroidMavLinkConnection;
import org.droidplanner.services.android.co... |
<<<<<<<
/* 05-Aug-2011, tatu: Also, must check for EOF here before
* calling readValue(), since that'll choke on it otherwise
*/
JsonToken t = p.currentToken();
=======
// Must check for EOF here before calling readValue(), since that'll choke on it otherwise
Deseri... |
<<<<<<<
public void setFailsafe(String newFailsafe) {
if (!this.failsafe.equals(newFailsafe)) {
this.failsafe = newFailsafe;
myDrone.notifyDroneEvent(DroneEventsType.FAILSAFE);
=======
public void setWarning(String newFailsafe) {
if (!this.warning.equals(newFailsafe)) {
this.warning = newFailsafe;
m... |
<<<<<<<
=======
@Deprecated // since 2.8, remove soon
protected BeanSerializerBase(BeanSerializerBase src, String[] toIgnore)
{
this(src, ArrayBuilders.arrayToSet(toIgnore), null);
}
@Deprecated // since 2.12
protected BeanSerializerBase(BeanSerializerBase src, Set<String> toIgnore) {... |
<<<<<<<
import com.droidplanner.fragments.SetupFragment;
=======
import com.droidplanner.fragments.SettingsFragment;
import com.droidplanner.fragments.SetupFragment;
>>>>>>>
import com.droidplanner.fragments.SetupFragment;
<<<<<<<
public class ConfigurationActivity extends SuperUI {
=======
public class Configura... |
<<<<<<<
import android.view.Surface;
=======
import android.util.Pair;
>>>>>>>
import android.util.Pair;
<<<<<<<
import com.o3dr.android.client.apis.CapabilityApi;
import com.o3dr.services.android.lib.coordinate.LatLong;
import com.o3dr.services.android.lib.coordinate.LatLongAlt;
import com.o3dr.services.android.li... |
<<<<<<<
import com.droidplanner.fragments.ChecklistFragment;
import com.droidplanner.fragments.ModesSetupFragment;
import com.droidplanner.fragments.ParamsFragment;
import com.droidplanner.fragments.RcSetupFragment;
import com.droidplanner.fragments.SettingsFragment;
import com.droidplanner.fragments.TuningFragment;
im... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.