conflict_resolution
stringlengths
27
16k
<<<<<<< import org.junit.After; ======= import org.apache.streams.util.ComponentUtils; import org.junit.After; >>>>>>> import org.apache.streams.util.ComponentUtils; import org.junit.After; <<<<<<< private static final String MBEAN_ID = "test_bean"; /** * Remove registered mbeans from previous tests ...
<<<<<<< protected final Daten daten; // private final SpacerIcon spacerIcon = new SpacerIcon(30); /* private final JSpinner jSpinnerAnzahl = new JSpinner(new SpinnerNumberModel(1, 1, 9, 1)); ======= private static final String TEXT_LINE = "=========================================="; private static ...
<<<<<<< ListeMediaDB tmp = new ListeMediaDB(); this.forEach(m -> { ======= ListeMediaDB tmp = new ListeMediaDB(daten); this.stream().forEach(m -> { >>>>>>> ListeMediaDB tmp = new ListeMediaDB(daten); this.forEach(m -> { <<<<<<< Daten.listeMediaPath...
<<<<<<< private ArrayMap<BaseCell, ArrayMap<Method, Object>> methodMap = new ArrayMap<>(128); private ArrayMap<Class, Method[]> methodCacheMap = new ArrayMap<>(128); private ArrayMap<BaseCell, Method> postBindMap = new ArrayMap<>(128); private ArrayMap<BaseCell, Method> postUnBindMap = new ArrayMap<>(12...
<<<<<<< EdDSAParameterSpec spec = EdDSANamedCurveTable.getByName( EdDSANamedCurveTable.CURVE_ED25519_SHA512); PrivateKey privKey = new EdDSAPrivateKey(new EdDSAPrivateKeySpec( ======= EdDSAParameterSpec spec = EdDSANamedCurveTable.getByName(Ed25519Verify.ED25519_CURVE_NAME); privKey = new EdDSAP...
<<<<<<< void setState(@NonNull State state) { ======= public void setState(@Nonnull State state) { >>>>>>> public void setState(@NonNull State state) { <<<<<<< @SuppressWarnings("WeakerAccess") @NonNull public JDA getJda() { return lavalink.getJdaFromSnowflake(String.valueOf(guild));...
<<<<<<< import edu.umd.cs.findbugs.annotations.NonNull; import lavalink.client.LavalinkUtil; import net.dv8tion.jda.core.JDA; import net.dv8tion.jda.core.entities.Guild; import net.dv8tion.jda.core.entities.impl.JDAImpl; import net.dv8tion.jda.core.events.ReadyEvent; import net.dv8tion.jda.core.events.ReconnectedEvent;...
<<<<<<< import org.syncany.config.to.DaemonConfigTO.FolderTO; import org.syncany.operations.daemon.messages.BadRequestResponse; import org.syncany.operations.daemon.messages.WatchRequest; ======= import org.syncany.config.to.FolderTO; >>>>>>> import org.syncany.config.to.FolderTO; import org.syncany.operations.daemo...
<<<<<<< OptionSpec<Void> optionNoDaemon = parser.acceptsAll(asList("N", "no-daemon")); ======= OptionSpec<Void> optionNonInteractive = parser.acceptsAll(asList("I", "no-interaction")); OptionSpec<Void> optionAddDaemon = parser.acceptsAll(asList("n", "add-daemon")); >>>>>>> OptionSpec<Void> optionAddDaemon = ...
<<<<<<< private Config config; private PluginListener listener; private File repositoryPath; ======= protected File repositoryPath; >>>>>>> protected Config config; protected PluginListener listener; protected File repositoryPath;
<<<<<<< ======= import org.syncany.cli.util.InitConsole; >>>>>>> import org.syncany.cli.util.InitConsole;
<<<<<<< * Copyright (C) 2011-2014 Philipp C. Heckel <philipp.heckel@gmail.com> ======= * Copyright (C) 2011-2015 Philipp C. Heckel <philipp.heckel@gmail.com> >>>>>>> * Copyright (C) 2011-2015 Philipp C. Heckel <philipp.heckel@gmail.com> <<<<<<< import org.syncany.operations.daemon.messages.api.JsonMessageFactor...
<<<<<<< private Request createRestRequest(Command command, String commandName) throws Exception { if (command.getRequiredCommandScope() == CommandScope.INITIALIZED_LOCALDIR) { return buildFolderRequestFromCommand(command, commandName, config.getLocalDir().getAbsolutePath()); } else { return buildManagement...
<<<<<<< return new Config(localDir, applicationContext, configTO, repoTO); ======= String pluginId = (configTO.getConnectionTO() != null) ? configTO.getConnectionTO().getType() : null; Plugin plugin = Plugins.get(pluginId); if (plugin == null) { logger.log(Level.WARNING, "Not loading config! Plugi...
<<<<<<< import org.apache.commons.codec.binary.Base64; ======= import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; import java.util.Arrays; import java.util.List; import java.util.logging.Level; ...
<<<<<<< /** * @see #{Context.BindServiceFlags} * @param flags */ void setBindServiceFlags(int flags); ======= void setKVStorage(KVStorage kvStorage); >>>>>>> void setKVStorage(KVStorage kvStorage); /** * @see #{Context.BindServiceFlags} * @param flags */ void...
<<<<<<< nSkipped = 0; nProcessed = 0; ======= >>>>>>> nSkipped = 0; nProcessed = 0; <<<<<<< // TODO debug StringBuilder sadValsString = new StringBuilder(); for (int k = 0; k < sadVals.length - 1; k++) { sadValsString.append(Str...
<<<<<<< import java.awt.geom.Point2D; ======= import com.jmatio.io.MatFileWriter; import com.jmatio.types.MLDouble; >>>>>>> import java.awt.geom.Point2D; import com.jmatio.io.MatFileWriter; import com.jmatio.types.MLDouble; <<<<<<< /** computes statistics and clear buffers of accumulated values */ v...
<<<<<<< loadLabels(new File(getLastManuallyLoadedLabels())); ======= sendUDPMessage(CMD_RESET_TO_BASE_NETWORK); >>>>>>> loadLabels(new File(getLastManuallyLoadedLabels())); sendUDPMessage(CMD_RESET_TO_BASE_NETWORK);
<<<<<<< import de.metas.rest_api.invoicecandidates.request.JsonRequestInvoiceCandidateExternalIdSpec; import de.metas.util.lang.ExternalHeaderIdWithExternalLineIds; import de.metas.util.lang.ExternalId; ======= import de.metas.rest_api.invoicecandidates.request.JsonInvoiceCandidateReference; import de.metas.util.rest...
<<<<<<< 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.LocatorId; import org.adempiere.warehouse.WarehouseId; import org.adempiere.warehouse.api.I...
<<<<<<< ======= import static org.adempiere.model.InterfaceWrapperHelper.newInstance; import static org.adempiere.model.InterfaceWrapperHelper.saveRecord; import java.math.BigDecimal; import java.sql.ResultSet; import java.sql.Timestamp; import java.util.List; import java.util.Map; import java.util.Properties; impo...
<<<<<<< package org.adempiere.acct.api; /* * #%L * de.metas.adempiere.adempiere.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 ver...
<<<<<<< import static org.adempiere.model.InterfaceWrapperHelper.loadOutOfTrx; ======= >>>>>>> import static org.adempiere.model.InterfaceWrapperHelper.loadOutOfTrx; <<<<<<< import org.adempiere.ad.dao.IQueryBL; ======= >>>>>>> import org.adempiere.ad.dao.IQueryBL; <<<<<<< @Deprecated public static MProduct...
<<<<<<< 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;
<<<<<<< .salesOrderId(purchaseCandidate.getSalesOrderId()) .rowType(PurchaseRowType.LINE).product(product) .purchasePriceActual(purchasePriceActual.getValue()) .customerPriceGrossProfit(customerPriceGrossProfit.getValue()) .percentGrossProfit(percentGrossProfit.getValueAsBigDecimal()) ======= ...
<<<<<<< import java.util.stream.Stream; ======= import java.util.Set; >>>>>>> import java.util.Set; import java.util.stream.Stream; <<<<<<< import de.metas.inout.InOutId; ======= import de.metas.inout.InOutAndLineId; import de.metas.inout.InOutId; >>>>>>> import de.metas.inout.InOutAndLineId; import de.metas.ino...
<<<<<<< import org.adempiere.util.Services; import org.compiere.model.I_C_AcctSchema; ======= import org.adempiere.model.InterfaceWrapperHelper; >>>>>>> import org.compiere.model.I_C_AcctSchema; <<<<<<< ======= import de.metas.quantity.Quantity; import de.metas.util.Services; >>>>>>> import de.metas.util.Service...
<<<<<<< import graphql.execution.instrumentation.Instrumentation; import graphql.execution.instrumentation.InstrumentationContext; import graphql.execution.instrumentation.NoOpInstrumentation; import graphql.execution.instrumentation.parameters.ExecutionParameters; import graphql.execution.instrumentation.parameters.Va...
<<<<<<< import org.adempiere.archive.api.ArchiveAction; import org.adempiere.archive.api.ArchiveEmailSentStatus; import org.adempiere.archive.api.ArchivePrintOutStatus; import org.adempiere.archive.api.IArchiveEventManager; import org.compiere.model.I_AD_Archive; ======= import org.adempiere.archive.api.IArchiveEvent...
<<<<<<< import static org.adempiere.model.InterfaceWrapperHelper.newInstance; import static org.adempiere.model.InterfaceWrapperHelper.saveRecord; import java.math.BigDecimal; import java.sql.ResultSet; import java.sql.Timestamp; import java.util.List; import java.util.Map; import java.util.Properties; import javax.a...
<<<<<<< import org.adempiere.util.Services; import org.adempiere.warehouse.WarehouseId; ======= >>>>>>> import org.adempiere.warehouse.WarehouseId;
<<<<<<< import org.adempiere.util.Services; import org.compiere.Adempiere; import org.compiere.model.I_M_Cost; ======= >>>>>>> import org.compiere.Adempiere; import org.compiere.model.I_M_Cost;
<<<<<<< import org.adempiere.ad.dao.QueryLimit; ======= import lombok.NonNull; >>>>>>> import org.adempiere.ad.dao.QueryLimit; import lombok.NonNull;
<<<<<<< import de.metas.common.util.CoalesceUtil; import de.metas.common.util.time.SystemTime; ======= import de.metas.common.util.CoalesceUtil; >>>>>>> import de.metas.common.util.CoalesceUtil; import de.metas.common.util.time.SystemTime; <<<<<<< ======= import de.metas.util.time.SystemTime; >>>>>>> <<<<<<< im...
<<<<<<< import graphql.Scalars; ======= import graphql.StarWarsData; >>>>>>> import graphql.StarWarsData; import graphql.Scalars; <<<<<<< import java.util.HashMap; import java.util.Map; ======= import java.io.File; >>>>>>> import java.io.File; import java.util.HashMap; import java.util.Map; <<<<<<< @SuppressWar...
<<<<<<< ======= import graphql.AssertException; import graphql.Directives; >>>>>>> import graphql.AssertException; import graphql.Directives; <<<<<<< ======= import graphql.schema.GraphQLInterfaceType; import graphql.schema.GraphQLNamedInputType; import graphql.schema.GraphQLNamedOutputType; import graphql.schema...
<<<<<<< import org.adempiere.uom.api.UOMConversionContext; import org.adempiere.util.Check; import org.adempiere.util.Services; ======= import org.adempiere.uom.api.IUOMConversionContext; >>>>>>> import org.adempiere.uom.api.UOMConversionContext;
<<<<<<< IEditablePricingContext setC_BPartner_ID(final int c_BPartner_ID); ======= void setBPartnerId(final BPartnerId bpartnerId); >>>>>>> IEditablePricingContext setC_BPartner_ID(final BPartnerId bpartnerId);
<<<<<<< import de.metas.order.OrderId; import de.metas.order.payment_reservation.OrderPaymentReservationCreateResult; import de.metas.order.payment_reservation.OrderPaymentReservationService; import de.metas.payment.PaymentRule; ======= import de.metas.organization.IOrgDAO; import de.metas.organization.OrgId; >>>>>>...
<<<<<<< if (operation == MUTATION) { result = mutationStrategy.execute(executionContext, operationRootType, root, fields); } else if (operation == SUBSCRIPTION) { result = subscriptionStrategy.execute(executionContext, operationRootType, root, fields); } else { ...
<<<<<<< import de.metas.material.dispo.commons.repository.MaterialQuery; import de.metas.material.dispo.commons.repository.StockRepository; import de.metas.material.event.MaterialDemandEvent; ======= >>>>>>> import de.metas.material.dispo.commons.repository.MaterialQuery; import de.metas.material.dispo.commons.repos...
<<<<<<< import org.adempiere.exceptions.AdempiereException; ======= import org.adempiere.ad.dao.IQueryFilter; >>>>>>> import org.adempiere.exceptions.AdempiereException; import org.adempiere.ad.dao.IQueryFilter; <<<<<<< try { final int docTypeId = computeDocType(assignableInvoiceCandidateRecord, refundConfig...
<<<<<<< import java.util.Collection; import org.adempiere.util.Check; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; import com.google.common.collect.ImmutableSet; ======= >>>>>>> import java.util.Collection; import com.fasterxml.jackson.annotation.JsonCre...
<<<<<<< protected ExecutionResult completeValueForList(ExecutionContext executionContext, ExecutionParameters parameters, List<Field> fields, Iterable<Object> result) { List<Object> completedResults = new ArrayList<Object>(); TypeInfo typeInfo = parameters.typeInfo(); GraphQLList fieldType =...
<<<<<<< this.subscriptionType = subscriptionType; this.dictionary = dictionary; typeMap = new SchemaUtil().allTypes(this, dictionary); ======= this.additionalTypes = additionalTypes; typeMap = new SchemaUtil().allTypes(this, additionalTypes); >>>>>>> this.subscriptionT...
<<<<<<< import org.compiere.util.TimeUtil; import org.eevolution.api.BOMComponentType; import org.eevolution.api.CostCollectorType; import org.eevolution.api.IPPOrderDAO; ======= import org.compiere.util.Env; >>>>>>> import org.eevolution.api.BOMComponentType; import org.eevolution.api.CostCollectorType; import org....
<<<<<<< .dataFetcher(new DataFetcher() { @Override public Object get(DataFetchingEnvironment environment) { if (environment.getSource() instanceof GraphQLArgument) { GraphQLArgument inputField...
<<<<<<< import org.adempiere.exceptions.DBException; import org.adempiere.util.Services; ======= >>>>>>> import org.adempiere.exceptions.DBException;
<<<<<<< import de.metas.shipping.ShipperId; ======= import de.metas.util.ISingletonService; >>>>>>> import de.metas.shipping.ShipperId; import de.metas.util.ISingletonService;
<<<<<<< private final ExecutionId executionId; private final ExecutionStrategy executionStrategy; ======= private final ExecutionStrategy queryStrategy; private final ExecutionStrategy mutationStrategy; >>>>>>> private final ExecutionId executionId; private final ExecutionStrategy queryStrate...
<<<<<<< ======= import java.nio.charset.StandardCharsets; >>>>>>> import java.nio.charset.StandardCharsets; <<<<<<< public class SimpleListConnection<T> implements DataFetcher<Connection<T>> { ======= import static java.util.Base64.getDecoder; import static java.util.Base64.getEncoder; public class SimpleListC...
<<<<<<< import de.metas.uom.CreateUOMConversionRequest; import de.metas.uom.IUOMDAO; import de.metas.uom.UomId; import org.adempiere.test.AdempiereTestHelper; import org.compiere.model.I_M_Product; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import java.math.BigDecimal; import static d...
<<<<<<< @NonNull final InvoiceHeaderImplBuilder invoiceHeader, @NonNull final I_C_Invoice_Candidate icRecord, @Nullable final InOutId inoutId) ======= final InvoiceHeaderImplBuilder invoiceHeader, final I_C_Invoice_Candidate icRecord, final InOutId inoutId) >>>>>>> @NonNull final InvoiceHeaderIm...
<<<<<<< import de.metas.rest_api.utils.MissingPropertyException; import de.metas.rest_api.utils.MissingResourceException; import de.metas.shipping.ShipperId; ======= import de.metas.uom.IUOMDAO; import de.metas.uom.UomId; >>>>>>> import de.metas.rest_api.utils.MissingPropertyException; import de.metas.rest_api.utils...
<<<<<<< import org.slf4j.Logger; import com.google.common.annotations.VisibleForTesting; ======= import org.slf4j.Logger; >>>>>>> import org.slf4j.Logger; import com.google.common.annotations.VisibleForTesting; <<<<<<< @VisibleForTesting public void loadAndEvaluateESRImportStream(@NonNull final I_ESR_Import esr...
<<<<<<< import org.adempiere.util.Check; import org.adempiere.util.Services; ======= >>>>>>> import org.adempiere.util.Check; import org.adempiere.util.Services; <<<<<<< Services.get(IShipmentSchedulePA.class).deleteUnprocessedLocksForShipmentRun(0, Env.getAD_User_ID(Env.getCtx()), null); ======= >>>>>>>
<<<<<<< /** Just Prepared Flag */ private boolean m_justPrepared = false; ======= /** * Create & Complete Cost Collector * * @param order * @param M_Product_ID * @param M_Locator_ID * @param M_AttributeSetInstance_ID * @param S_Resource_ID * @param PP_Order_BOMLine_ID * @param PP_Order_Node_ID ...
<<<<<<< import de.metas.currency.CurrencyCode; ======= import de.metas.common.rest_api.payment.JsonInboundPaymentInfo; >>>>>>> import de.metas.common.rest_api.payment.JsonInboundPaymentInfo; import de.metas.currency.CurrencyCode; <<<<<<< public static final CurrencyCode CURRENCY_CODE_EUR = CurrencyCode.EUR; publi...
<<<<<<< .rows(rows) .pickingCandidateCommand(pickingCandidateCommand) ======= .rowsSupplier(rowsSupplier) >>>>>>> .rowsSupplier(rowsSupplier) .pickingCandidateCommand(pickingCandidateCommand)
<<<<<<< import org.adempiere.util.Check; import org.adempiere.util.Services; ======= import org.compiere.model.I_M_Product; >>>>>>> <<<<<<< 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.document.references.zoom_into.RecordWindowFinder; >>>>>>> import de.metas.document.references.zoom_into.RecordWindowFinder; <<<<<<< ======= private void openOrder(@NonNull final I_C_Order order) { final AdWindowId orderWindowId = RecordWindowFinder .findAdWindowId(TableReco...
<<<<<<< import de.metas.util.Check; import de.metas.util.Services; ======= import com.google.common.collect.ImmutableSet; import de.metas.user.UserId; import de.metas.util.Check; import de.metas.util.Services; >>>>>>> import com.google.common.collect.ImmutableSet; import de.metas.user.UserId; import de.metas.util.Ch...
<<<<<<< import org.adempiere.util.Services; import org.compiere.model.I_C_BPartner; import org.compiere.model.I_C_BPartner_Location; ======= >>>>>>> import org.compiere.model.I_C_BPartner; import org.compiere.model.I_C_BPartner_Location;
<<<<<<< /** * This class is the developers' entrypoint to using <code>model</code> instances of different types. * It internally relates on a {@link CompositeInterfaceWrapperHelper} which in turn supports all the types that are supported by this class. * * @author metas-dev <dev@metasfresh.com> * */ ======= /**...
<<<<<<< import org.adempiere.util.Check; import org.adempiere.util.Services; ======= >>>>>>> <<<<<<< import de.metas.product.IProductBL; import de.metas.product.ProductId; ======= import de.metas.util.Check; >>>>>>> import de.metas.product.IProductBL; import de.metas.product.ProductId; import de.metas.util.Check...
<<<<<<< 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.payment.TenderType; ======= import de.metas.organization.IOrgDAO; import de.metas.payment.api.DefaultPaymentBuilder.TenderType; >>>>>>> import de.metas.organization.IOrgDAO; import de.metas.payment.TenderType;
<<<<<<< import de.metas.costing.CostAmount; ======= import de.metas.bpartner.service.IBPartnerDAO; >>>>>>> import de.metas.bpartner.service.IBPartnerDAO; import de.metas.costing.CostAmount; <<<<<<< public CostAmount getCostPrice(final org.compiere.model.I_C_OrderLine orderLine) { final int currencyId = orderLin...
<<<<<<< int retrieveOrgIdByLocatorId(int locatorId); ======= int retrieveLocatorIdByValueAndWarehouseId(String locatorvalue, int warehouseId); >>>>>>> int retrieveOrgIdByLocatorId(int locatorId); int retrieveLocatorIdByValueAndWarehouseId(String locatorvalue, int warehouseId);
<<<<<<< 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;
<<<<<<< import org.slf4j.Logger; import org.slf4j.Logger; ======= import org.compiere.util.Ini; import org.compiere.util.Trx; import org.slf4j.Logger; import org.slf4j.Logger; >>>>>>> import org.slf4j.Logger;
<<<<<<< import org.apache.storm.task.OutputCollector; ======= >>>>>>> import org.apache.storm.task.OutputCollector;
<<<<<<< import com.digitalpebble.stormcrawler.elasticsearch.persistence.CollapsingSpout; ======= import com.digitalpebble.stormcrawler.elasticsearch.metrics.StatusMetricsBolt; import com.digitalpebble.stormcrawler.elasticsearch.persistence.ElasticSearchSpout; >>>>>>> import com.digitalpebble.stormcrawler.elasticsear...
<<<<<<< import org.compiere.util.Env; ======= import org.compiere.util.TimeUtil; >>>>>>> import org.compiere.util.Env; import org.compiere.util.TimeUtil;
<<<<<<< private static final long serialVersionUID = 280932628L; ======= private static final long serialVersionUID = 1394461433L; >>>>>>> private static final long serialVersionUID = 1657479232L; <<<<<<< setIsPickingOrder (false); // N setM_Product_ID (0); ======= >>>>>>> setIsPickingOrder (false); ...
<<<<<<< import de.metas.rest_api.invoicecandidates.request.JsonRequestEnqueueForInvoicing; import de.metas.rest_api.invoicecandidates.request.JsonRequestInvoiceCandidateUpsert; import de.metas.rest_api.invoicecandidates.response.JsonResponseEnqueueForInvoicing; import de.metas.rest_api.invoicecandidates.response.JsonRe...
<<<<<<< import java.util.Collection; import java.util.Map; import java.util.Set; import java.util.function.Function; import org.adempiere.exceptions.AdempiereException; import org.compiere.model.I_AD_User; import org.compiere.model.I_C_BPartner; import org.compiere.model.I_C_BPartner_Location; ======= >>>>>>> <<<...
<<<<<<< public static ClientId ofRepoIdOrSystem(final int repoId) { if (repoId == SYSTEM.repoId) { return SYSTEM; } else if (repoId <= 0) { return SYSTEM; } else { return ofRepoId(repoId); } } ======= public static Optional<ClientId> optionalOfRepoId(final int repoId) { return Optio...
<<<<<<< import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; ======= import butterknife.OnClick; import retrofit.Callback; import retrofit.Response; import retrofit.Retrofit; >>>>>>> import butterknife.OnClick; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response;
<<<<<<< private static final long serialVersionUID = 1022426465L; ======= private static final long serialVersionUID = -2004309149L; >>>>>>> private static final long serialVersionUID = -1061256606L; <<<<<<< @Override public org.compiere.model.I_C_BP_BankAccount getC_BP_BankAccount() { return get_ValueAsPO(...
<<<<<<< import org.compiere.model.GridField; import org.compiere.util.Env; import org.compiere.util.TrxRunnable; ======= >>>>>>> import org.compiere.util.TrxRunnable;
<<<<<<< @Nullable ======= /** * Please use {@link #asLocalDate(Timestamp, ZoneId)} */ @Deprecated >>>>>>> /** * Please use {@link #asLocalDate(Timestamp, ZoneId)} */ @Deprecated @Nullable <<<<<<< @Nullable public static LocalTime asLocalTime(@Nullable final Object obj) ======= @Deprecated @Nulla...
<<<<<<< * Helper class for massive generation of HUs for a receipt schedule. * <p> * Note:The respective {@link I_M_ReceiptSchedule_Alloc}s and {@link I_M_HU_Assignment}s are created via {@link ReceiptScheduleHUTrxListener}. ======= * Helper class for massive generation of HUs for receipt schedule(s). >>>>>>> *...
<<<<<<< ======= import android.graphics.Color; import android.view.LayoutInflater; >>>>>>> import android.graphics.Color; import android.view.LayoutInflater; <<<<<<< ======= private LayoutInflater mInflater; private int mUpvoteColor; private int mDownVoteColor; private boolean mAllowNSFWThumb; >...
<<<<<<< import org.adempiere.util.NumberUtils; import org.adempiere.util.Services; import org.compiere.model.I_C_AcctSchema; import org.compiere.model.I_C_UOM; ======= import org.adempiere.util.LegacyAdapters; import org.compiere.model.I_C_ValidCombination; >>>>>>> import org.compiere.model.I_C_AcctSchema; import or...
<<<<<<< import org.adempiere.util.Services; import org.eevolution.api.ActivityControlCreateRequest; import org.eevolution.api.IPPCostCollectorBL; ======= import org.compiere.model.MClient; import org.compiere.model.MDocType; import org.compiere.util.Env; >>>>>>> import org.eevolution.api.ActivityControlCreateRequest...
<<<<<<< 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.LocatorId; import org.adempiere.warehouse.WarehouseId; import org.adempiere.warehouse.api.I...
<<<<<<< mUploadMenu = findViewById(R.id.uploadMenu); mUploadButton = (FloatingActionButton) mUploadMenu.findViewById(R.id.uploadButton); mUploadButton.setColor(getResources().getColor(theme.accentColor)); mLinkUpload = (FloatingActionButton) mUploadMenu.findViewById(R.id.linkUpload); ...
<<<<<<< public void onResponse(Call<TrophyResponse> call, Response<TrophyResponse> response) { ======= public void onResponse(Response<TrophyResponse> response, Retrofit retrofit) { if (!isAdded()) return; >>>>>>> public void onResponse(Call<TrophyResponse> call, ...
<<<<<<< final Builder layoutSingleRow = layoutSingleRow(); final DocumentLayoutDetailDescriptor.Builder layoutDetail = DocumentLayoutDetailDescriptor .builder(entityDescriptor.getWindowId(), entityDescriptor.getDetailId()) .caption(entityDescriptor.getCaption()) .description(entityDescriptor.getDescrip...
<<<<<<< ======= import com.kenny.openimgur.util.SqlHelper; import com.squareup.okhttp.Interceptor; import com.squareup.okhttp.Request; import com.squareup.okhttp.Response; >>>>>>> import com.kenny.openimgur.util.SqlHelper;
<<<<<<< import org.adempiere.util.Services; ======= >>>>>>> <<<<<<< import lombok.Builder; ======= import de.metas.util.Check; import de.metas.util.Services; >>>>>>> import de.metas.util.Services; import lombok.Builder;
<<<<<<< import org.adempiere.service.ClientId; import org.compiere.model.I_C_BP_BankAccount; import org.compiere.model.I_C_BP_Group; ======= import org.adempiere.service.ClientId; import org.compiere.model.I_C_BP_Group; >>>>>>> import org.adempiere.service.ClientId; import org.compiere.model.I_C_BP_BankAccount; impo...
<<<<<<< import de.metas.product.IProductBL; ======= import de.metas.util.Services; >>>>>>> import de.metas.product.IProductBL; import de.metas.util.Services;
<<<<<<< ======= import org.slf4j.Logger; import de.metas.logging.LogManager; import de.metas.process.ProcessInfoParameter; import de.metas.util.Services; import de.metas.process.JavaProcess; >>>>>>>
<<<<<<< import org.adempiere.util.Check; import org.adempiere.util.Services; ======= >>>>>>> <<<<<<< import de.metas.product.IProductDAO; import de.metas.product.ProductId; ======= import de.metas.util.Check; >>>>>>> import de.metas.product.IProductDAO; import de.metas.product.ProductId; import de.metas.util.Che...
<<<<<<< import org.adempiere.util.Services; import org.compiere.Adempiere; ======= import org.adempiere.model.engines.CostDimension; >>>>>>> import org.compiere.Adempiere; <<<<<<< import de.metas.product.IProductBL; ======= import de.metas.util.Services; >>>>>>> import de.metas.product.IProductBL; import de.meta...
<<<<<<< import de.metas.picking.api.PickingSlotId; ======= import de.metas.util.Services; >>>>>>> import de.metas.picking.api.PickingSlotId; import de.metas.util.Services;
<<<<<<< import de.metas.handlingunits.picking.PickingCandidateCommand; import de.metas.handlingunits.picking.PickingCandidateCommand.RemoveQtyFromHURequest; import de.metas.handlingunits.sourcehu.HuId2SourceHUsService; ======= import de.metas.handlingunits.picking.PickingCandidateService; import de.metas.handlingunit...