conflict_resolution
stringlengths
27
16k
<<<<<<< import org.bonitasoft.engine.bpm.process.ProcessInstance; import org.bonitasoft.engine.bpm.flownode.HumanTaskInstance; import org.bonitasoft.engine.bpm.flownode.TimerEventTriggerInstanceNotFoundException; ======= >>>>>>> <<<<<<< @Test public void searchFailedProcessInstances_should_return_failed_pro...
<<<<<<< private final BusinessDataModelRepository businessDataModelRepository; ======= private final SchemaUpdater schemaUpdater; >>>>>>> private final BusinessDataModelRepository businessDataModelRepository; <<<<<<< private EntityManager getEntityManager() { ======= protected boolean isDBMDep...
<<<<<<< private FormMappingService formMappingService; ======= private BusinessDataRepository businessDataRespository; private RefBusinessDataService refBusinessDataService; private BusinessDataModelRepository businessDataModelRespository; private BusinessDataService businessDataService; >>...
<<<<<<< import java.lang.management.ManagementFactory; ======= import java.io.IOException; >>>>>>> import java.lang.management.ManagementFactory; import java.io.IOException; <<<<<<< final File tempDir = new File(IOUtil.TMP_DIRECTORY, "BonitaClassLoaderTest_JVM_" + ManagementFactory.getRuntimeMXBean().getNam...
<<<<<<< apiTestSPUtil.createPlatformStructure(); apiTestSPUtil.initializeAndStartPlatformWithDefaultTenant(true); ======= APITestSPUtil.createPlatformStructure(); SPBPMTestUtil.createEnvironmentWithDefaultTenant(); >>>>>>> apiTestSPUtil.createPlatformStructure(); SPBPM...
<<<<<<< import com.bonitasoft.engine.api.TenantManagementAPI; ======= import com.bonitasoft.engine.api.ThemeAPI; >>>>>>> import com.bonitasoft.engine.api.TenantManagementAPI; import com.bonitasoft.engine.api.ThemeAPI; <<<<<<< private TenantManagementAPI tenantManagementAPI; @Override public PlatformLog...
<<<<<<< import org.bonitasoft.engine.bpm.connector.impl.ConnectorInstanceWithFailureInfoImpl; ======= import org.bonitasoft.engine.bpm.data.ArchivedDataInstance; >>>>>>> import org.bonitasoft.engine.bpm.connector.impl.ConnectorInstanceWithFailureInfoImpl; import org.bonitasoft.engine.bpm.data.ArchivedDataInstance;
<<<<<<< @Column(name = "blobValue") @Type(type = "materialized_blob") ======= >>>>>>> @Column(name = "blobValue") @Type(type = "materialized_blob")
<<<<<<< @Test public void testLegacyMainMethodTests() throws Exception { MainRunner.callMainIfExists(ObjectArrayList.class, "test", /*num=*/"500", /*seed=*/"939384"); } ======= @Test public void testOf() { final ObjectArrayList<String> l = ObjectArrayList.of("0", "1", "2"); assertEquals(ObjectArrayList.w...
<<<<<<< loggerService.log(getClass(), TechnicalLogSeverity.WARNING, "Tried to register work " + work.getDescription() + " but the work service is stopped"); ======= loggerService.log(getClass(), TechnicalLogSeverity.WARNING, "Tried to register work " + work.getDescription() ...
<<<<<<< ======= boolean shouldPerformUpdateAtEnd(); >>>>>>>
<<<<<<< public static FormMapping toFormMapping(SFormMapping sFormMapping) { if (sFormMapping == null) { return null; } FormMapping formMapping = new FormMapping(); formMapping.setId(sFormMapping.getId()); formMapping.setTask(sFormMapping.getTask()); formM...
<<<<<<< import com.bonitasoft.engine.CommonAPISPIT; import com.bonitasoft.engine.bdm.BusinessObjectDAOFactory; import com.bonitasoft.engine.bdm.BusinessObjectModelConverter; import com.bonitasoft.engine.bdm.dao.BusinessObjectDAO; import com.bonitasoft.engine.bdm.model.BusinessObject; import com.bonitasoft.engine.bdm.mo...
<<<<<<< importProvidedPage("bonita-layout-page.zip"); importProvidedPage("step-autogenerated-form.zip"); importProvidedPage("process-autogenerated-form.zip"); } ======= importProvidedPage("bonita-layout-page.zip"); importProvidedPage("bonita-theme-page.zip"); } >>>>>>> impo...
<<<<<<< import org.bonitasoft.engine.api.impl.ProcessConfigurationAPIImpl; ======= import org.bonitasoft.engine.api.impl.TenantAdministrationAPIImpl; >>>>>>> import org.bonitasoft.engine.api.impl.ProcessConfigurationAPIImpl; import org.bonitasoft.engine.api.impl.TenantAdministrationAPIImpl; <<<<<<< apis.put...
<<<<<<< public int getNextAvailableIndex(Long parentMenuId) throws SBonitaReadException { int lastIndex = getLastUsedIndex(parentMenuId); return lastIndex + 1; } protected Integer executeGetLastUsedIndexQuery(Long parentMenuId) throws SBonitaReadException { SelectOneDescriptor<Integ...
<<<<<<< * Commands are used to extend engine behavior, and are classes that are called from this API and executed on the server side. <br> ======= * <code>Command</code>s are used to extend engine behavior, and are classes that are called from this API and executed on the server side. <br/> >>>>>>> * Commands are...
<<<<<<< public long getNumberOfSProcessInstanceFailed() { getSession().enableFilter("tenantFilter").setParameter("tenantId", PersistentObjectBuilder.DEFAULT_TENANT_ID); final Query namedQuery = getNamedQuery("getNumberOfSProcessInstanceFailed"); return ((Number) namedQuery.uniqueResult()).lo...
<<<<<<< try { if (!lockService.tryLock(processInstanceId, SFlowElementsContainerType.PROCESS.name())) { // reschedule the work final ExecuteFlowNodeWork runnable = new ExecuteFlowNodeWork(Type.FLOWNODE, flowNodeInstanceId, operations, expressionContext, ...
<<<<<<< private XMLNode createContractNode(final SContractDefinition contract) { final XMLNode contractNode = new XMLNode(CONTRACT_NODE); final List<SInputDefinition> inputs = contract.getInputs(); if (!inputs.isEmpty()) { final XMLNode inputsNode = new XMLNode(CONTRACT_INPUTS_NO...
<<<<<<< ======= @Mock private FlowNodeStateManager manager; >>>>>>> @Mock private FlowNodeStateManager manager; <<<<<<< public void getDocument_from_process_instance_and_name_should_return_a_document_with_generated_url_when_it_has_content() { ======= public void toArchivedUserTaskInstanc...
<<<<<<< builder.addUserTask("step1", "actor") .addData("tData", String.class.getName(), new ExpressionBuilder().createConstantStringExpression("The default value")).isTransient(); processDefinition = deployAndEnableWithActor(builder.done(), "actor", user); ======= builder.addUserTask("...
<<<<<<< import org.bonitasoft.engine.bpm.contract.ContractDefinition; import org.bonitasoft.engine.bpm.contract.ContractViolationException; import org.bonitasoft.engine.bpm.contract.Type; import org.bonitasoft.engine.bpm.contract.impl.ContractDefinitionImpl; import org.bonitasoft.engine.bpm.contract.validation.Contract...
<<<<<<< designProcessDefinition.addAutomaticTask("step2").addOperation(OperationBuilder.setDocument("textFile").with(groovyThatCreateDocumentContent).done()); designProcessDefinition.addUserTask("step3", actorName); ======= designProcessDefinition.addAutomaticTask("step2").addOperation( ...
<<<<<<< ======= private final TransactionExecutor transactionExecutor; private long callerId = -1; private long subProcessId = -1; private long targetSFlowNodeDefinitionId = -1; private Long idOfTheProcessToInterrupt; private SFlowNodeInstance subProcflowNodeInstance; >>>>>>> privat...
<<<<<<< ======= private final class MatchLeftOperandName extends BaseMatcher<SLeftOperand> { private final String name; public MatchLeftOperandName(final String name) { this.name = name; } @Override public boolean matches(final Object item) { ret...
<<<<<<< SFlowNodeInstance flowNodeInstance = activityInstanceService.getFlowNodeInstance(activityInstanceId); SDataInstance data; final long parentProcessInstanceId = flowNodeInstance.getLogicalGroup(processDefinitionIndex); final ClassLoader processClassLoader = classLoa...
<<<<<<< ======= * @author Celine Souchet * >>>>>>> * @author Celine Souchet
<<<<<<< import org.bonitasoft.engine.commons.exceptions.SBonitaException; ======= >>>>>>> import org.bonitasoft.engine.commons.exceptions.SBonitaException; <<<<<<< import com.bonitasoft.manager.Features; /** * @author Celine Souchet */ public class IdentityAPIExt extends IdentityAPIImpl implements IdentityAPI { ...
<<<<<<< public void pauseShouldStopWorkservice() throws WorkRegisterException, WorkException { ======= public void pauseShouldStopWorkservice() throws TimeoutException, SBonitaException { >>>>>>> public void pauseShouldStopWorkservice() throws SBonitaException { <<<<<<< public void should_pause_shut...
<<<<<<< import org.bonitasoft.engine.identity.CustomUserInfoValue; ======= import org.bonitasoft.engine.execution.state.CompletedActivityStateImpl; import org.bonitasoft.engine.execution.state.FlowNodeStateManager; >>>>>>> import org.bonitasoft.engine.execution.state.CompletedActivityStateImpl; import org.bonitasoft...
<<<<<<< import org.bonitasoft.engine.activity.CallActivityTest; import org.bonitasoft.engine.activity.LoopTest; import org.bonitasoft.engine.activity.MultiInstanceTest; import org.bonitasoft.engine.activity.UserTaskContractITest; import org.bonitasoft.engine.command.AdvancedStartProcessCommandIT; import org.bonitasoft....
<<<<<<< import org.bonitasoft.engine.core.process.instance.api.RefBusinessDataService; import org.bonitasoft.engine.core.process.instance.api.TokenService; ======= >>>>>>> import org.bonitasoft.engine.core.process.instance.api.RefBusinessDataService;
<<<<<<< import static org.junit.Assert.assertEquals; ======= import static org.assertj.core.api.Assertions.assertThat; >>>>>>> import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; <<<<<<< import org.bonitasoft.engine.events.model.FireEventException; ======= import...
<<<<<<< @Override public ProcessConfigurationAPI getProcessConfigurationAPIi() { return new ProcessConfigurationAPIImpl(); } ======= @Override public BusinessDataAPI getBusinessDataAPI() { return new BusinessDataAPIImpl(); } >>>>>>> @Override public ProcessConfigura...
<<<<<<< import org.bonitasoft.engine.api.impl.transaction.data.GetNumberOfDataInstanceForContainer; import org.bonitasoft.engine.api.impl.transaction.document.*; ======= import org.bonitasoft.engine.api.impl.transaction.document.AttachDocumentVersion; import org.bonitasoft.engine.api.impl.transaction.document.AttachD...
<<<<<<< * when the processInstanceId does not refer to an existing process instance * @throws org.bonitasoft.engine.session.InvalidSessionException * when the session is not valid ======= * If the identifier does not refer to an existing process instance. * @throws Inv...
<<<<<<< @Override public PageService getPageService() { return getInstanceOf(PageService.class); } ======= @Override public RefBusinessDataService getRefBusinessDataService() { return getInstanceOf(RefBusinessDataService.class); } @Override public BusinessDataModelRe...
<<<<<<< System.out.println("node started"); logoutPlatform(loginPlatform); ======= APITestUtil.logoutPlatform(loginPlatform); >>>>>>> logoutPlatform(loginPlatform); <<<<<<< "input1", new ExpressionBuilder().createGroovyScriptExpression("script", script...
<<<<<<< SessionAccessor beforeInvokeMethod(final Session session, final String apiInterfaceName) throws BonitaHomeNotSetException, InstantiationException, IllegalAccessException, ClassNotFoundException, BonitaHomeConfigurationException, IOException, NoSuchMethodException, InvocationTargetExc...
<<<<<<< * Commands in the <b>BonitaBPM Execution Engine</b> are an extension point that allows to add / call behaviour that is not available by default through * provided APIs. * The PlatformCommandAPI gives access to command registration / unregistration to 'deploy' new commands at platform level. * The commands m...
<<<<<<< import static org.mockito.Matchers.anyMapOf; ======= import static org.mockito.Matchers.argThat; >>>>>>> import static org.mockito.Matchers.anyMapOf; import static org.mockito.Matchers.argThat; <<<<<<< @Test public void deleteParentArchivedProcessInstanceAndElements_should_be_ignored_when_error_to_g...
<<<<<<< public static final BonitaHomeServer INSTANCE = new BonitaHomeServer(); ======= private String version; public static final BonitaHomeServer INSTANCE = new BonitaHomeServer();; >>>>>>> private String version; public static final BonitaHomeServer INSTANCE = new BonitaHomeServer();
<<<<<<< BPMRemoteTestsLocal.class, ======= BPMRemoteTests.class, FormMappingIT.class, >>>>>>> BPMRemoteTestsLocal.class, FormMappingIT.class,
<<<<<<< @Column(name = "clobValue") @Type(type = "materialized_clob") ======= >>>>>>> @Column(name = "clobValue") @Type(type = "materialized_clob")
<<<<<<< public void connect() throws ConnectorException { final String kind = (String) getInputParameter(KIND); if (kind.equals(CONNECT)) { ======= public void connect() { final String kind = (String) getInputParameter("kind"); if (kind.equals("connect")) { >>>>>>> public ...
<<<<<<< private static final Object mutex = new BuilderFactoryMutex(); ======= private static final Object MUTEX = new Object(); >>>>>>> private static final Object MUTEX = new BuilderFactoryMutex(); <<<<<<< //System.err.println("Looking for class: " + clazz.getName()); if (!this.factory...
<<<<<<< public void cannotAccessTenantAPIsOnMaintenanceTenant() throws Exception { final APITestSPUtil apiTestSPUtil = new APITestSPUtil(); ======= public void cannotAccessTenantAPIsOnPausedTenant() throws Exception { APITestSPUtil apiTestSPUtil = new APITestSPUtil(); >>>>>>> public void ...
<<<<<<< import org.bonitasoft.engine.bpm.document.Document; import org.bonitasoft.engine.bpm.document.DocumentNotFoundException; ======= import org.bonitasoft.engine.bpm.data.DataInstance; import org.bonitasoft.engine.bpm.data.impl.IntegerDataInstanceImpl; >>>>>>> import org.bonitasoft.engine.bpm.data.DataInstance; ...
<<<<<<< import org.bonitasoft.engine.business.data.BusinessDataReference; ======= import org.bonitasoft.engine.exception.BonitaException; >>>>>>> import org.bonitasoft.engine.business.data.BusinessDataReference; import org.bonitasoft.engine.exception.BonitaException;
<<<<<<< /** * Copyright (C) 2013 BonitaSoft S.A. * BonitaSoft, 31 rue Gustave Eiffel - 38000 Grenoble * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation * version 2.1 of the License. * Th...
<<<<<<< @Id ======= >>>>>>> @Id
<<<<<<< ======= import org.bonitasoft.engine.bpm.flownode.ArchivedFlowNodeInstance; import org.bonitasoft.engine.bpm.flownode.ArchivedFlowNodeInstanceSearchDescriptor; import org.bonitasoft.engine.bpm.flownode.CallActivityDefinition; import org.bonitasoft.engine.bpm.flownode.CallActivityInstance; >>>>>>> import org....
<<<<<<< ======= ApplicationPageIT.class, ApplicationMenuIT.class, ApplicationImportExportIT.class, DeleteEventTriggerInstanceIT.class, >>>>>>> DeleteEventTriggerInstanceIT.class,
<<<<<<< final TransactionService transactionService = platformAccessor.getTransactionService(); final SPlatform platform = constructPlatform(platformAccessor); ======= final TransactionExecutor transactionExecutor = platformAccessor.getTransactionExecutor(); >>>>>>> final TransactionS...
<<<<<<< final Thread thread = iterator.next(); if (isEngine(thread)) { ======= Thread thread = iterator.next(); if (isEngine(thread) && !thread.getName().startsWith("net.sf.ehcache.CacheManager")) { >>>>>>> final Thread thread = iterator.next(); ...
<<<<<<< /** * Get the number of the {@link SProcessInstance} with at least one failed task or the {@link org.bonitasoft.engine.bpm.process.ProcessInstanceState#ERROR} * state. * * @param queryOptions * the search criteria containing a map of specific parameters of a query * @ret...
<<<<<<< import org.bonitasoft.engine.core.process.instance.api.RefBusinessDataService; import org.bonitasoft.engine.core.process.instance.api.TokenService; ======= import org.bonitasoft.engine.core.process.instance.api.ProcessInstanceService; >>>>>>> import org.bonitasoft.engine.core.process.instance.api.RefBusiness...
<<<<<<< if (operation.getRightOperand() == null && operation.getType() != OperatorType.DELETION) { ======= checkRightOperand(operation); return this; } private void checkRightOperand(final Operation operation) { if (operation.getRightOperand() == null) { >>>>>>> check...
<<<<<<< import java.io.IOException; import java.io.Serializable; import java.util.HashMap; import java.util.Map; import java.util.concurrent.Callable; import org.apache.commons.lang3.math.NumberUtils; ======= import java.util.concurrent.Callable; >>>>>>> import java.io.IOException; import java.io.Serializable; imp...
<<<<<<< import android.util.Log; ======= import com.android.gallery3d.R; >>>>>>> import android.util.Log; import com.android.gallery3d.R;
<<<<<<< private boolean mFixedAspect = false; public void setFixedAspect(boolean t) { mFixedAspect = t; } ======= private boolean mDisableFilterButtons = false; >>>>>>> private boolean mDisableFilterButtons = false; private boolean mFixedAspect = false; public void setFixedAspec...
<<<<<<< onClickBottomSheet(findViewById(R.id.fl_bottom_sheet)); MobclickAgent.onEvent(getApplicationContext(),"enter_mainactivity_by_click_notification_dayline"); mIvSoundDayline.postDelayed(new Runnable() { @Override public void run() { ...
<<<<<<< Options options = createCommandLineOptions(); CommandLine cl = parseCommandLine(args, options); if(cl==null) { System.out.println("Error Parsing Command Line Arguments"); return; } try { KarmaStats stats = new KarmaStats(cl); if(!stats.parseCommandLineOptions(cl)) { Syst...
<<<<<<< Vector<Segment> res; ======= Vector<Segment> res = new Vector<>(); >>>>>>> Vector<Segment> res; <<<<<<< Vector<int[]> kmappings = new Vector<int[]>(); for(Dataitem elem: stringArrayListEntry.getValue()){ ======= Vector<int[]> kmappings = new Vector<>(); for(Dataitem elem: groups.get(key...
<<<<<<< int c; Vector<TNode> x = new Vector<TNode>(); ======= int c = 0; Vector<TNode> x = new Vector<>(); >>>>>>> int c; Vector<TNode> x = new Vector<>();
<<<<<<< if (modelingConfiguration.getPropertiesDirect()) { if (this.ontologyManager.isConnectedByDirectProperty(sourceUri, targetUri) || this.ontologyManager.isConnectedByDirectProperty(targetUri, sourceUri)) { ======= if (ModelingConfiguration.getPropertiesDirect()) { if (this.ontologyManage...
<<<<<<< while (!tlines.isEmpty()) { Vector<Vector<Segment>> nlines = new Vector<Vector<Segment>>(); ======= while (tlines.size() > 0) { Vector<Vector<Segment>> nlines = new Vector<>(); >>>>>>> while (!tlines.isEmpty()) { Vector<Vector<Segment>> nlines = new Vector<>(); <<<<<<< Vector<Segment> ret; ...
<<<<<<< ======= >>>>>>>
<<<<<<< addTag(CommandTag.SemanticType); ======= this.nodeId = nodeId; addTag(CommandTag.Modeling); >>>>>>> this.nodeId = nodeId; addTag(CommandTag.SemanticType);
<<<<<<< List<Attribute> rawAttributes; List<String> rawAttributeIDs = new ArrayList<String>(); List<String> rawValues; String singleValue; ======= List<Attribute> rawAttributes = null; List<String> rawAttributeIDs = new ArrayList<>(); List<String> rawValues = null; String singleValue = null; >>>>>>> ...
<<<<<<< boolean localsUninitialized = interpreter.getLocals() == initialLocals; if(localsUninitialized) { PyStringMap locals = new PyStringMap(); interpreter.setLocals(locals); interpreter.exec(scripts.get(PythonTransformationHelper.getImportStatements())); interpreter.exec(scripts.get(PythonTransform...
<<<<<<< import java.net.MalformedURLException; import java.net.URL; ======= import java.net.URL; >>>>>>> import java.net.MalformedURLException; import java.net.URL; <<<<<<< return getRDF(formParams); ======= boolean refreshModel = false; String sRefreshModel = formParams.getFirst(FormParameters.REFRESH_M...
<<<<<<< String rule; HashSet<String> vs = new HashSet<String>(); ArrayList<String> lviews = new ArrayList<String>(); ======= String rule = ""; HashSet<String> vs = new HashSet<>(); ArrayList<String> lviews = new ArrayList<>(); >>>>>>> String rule; HashSet<String> vs = new HashSet<>();...
<<<<<<< for (SemanticTypeMapping stm : mappings) { SteinerNodes sn = new SteinerNodes(contextId); sn.addNodes(stm.getSourceColumn(), stm.getSource(), stm.getTarget(), stm.getConfidence()); ======= for (SemanticTypeMapping stm : sortedMappings) { SteinerNodes sn = new SteinerNodes(); sn.addNodes(...
<<<<<<< public Vector<Integer> orgPos = new Vector<Integer>(); public Vector<Integer> tarPos = new Vector<Integer>(); public Vector<Integer> length = new Vector<Integer>(); public Vector<String[]> exps = new Vector<String[]>(); public List<ANode> children = new Vector<ANode>(); ======= public Vector<Integer> or...
<<<<<<< import java.util.Map; ======= import java.util.List; import java.util.Map; >>>>>>> import java.util.List; import java.util.Map; <<<<<<< String raw = stringEntry.getValue()[0]; String[] pair = { raw, stringEntry.getValue()[2] }; if (testdata.containsKey(stringEntry.getValue()[3])) { HashMap<...
<<<<<<< import edu.isi.karma.controller.command.selection.SuperSelection; import edu.isi.karma.kr2rml.KR2RMLRDFWriter; ======= >>>>>>> import edu.isi.karma.controller.command.selection.SuperSelection;
<<<<<<< private Boolean learnerEnabled; private Boolean learnAlignmentEnabled; private Boolean multipleSamePropertyPerNode; ======= private static Boolean learnerEnabled; private static Boolean addOntologyPaths; // private static Boolean learnAlignmentEnabled; private static Boolean multipleSamePropertyPerNode;...
<<<<<<< boolean result = true;//utilObj.saveToStore(modelFileLocalPath, tripleStoreUrl, graphName, true, null); if (tripleStoreUrl != null && tripleStoreUrl.trim().compareTo("") != 0) { String url = RESTserverAddress + "/R2RMLMapping/local/" + modelFileName; ======= boolean result = utilObj.saveToSt...
<<<<<<< List<Row> resultRows = new ArrayList<Row>(); for (Entry<String, ArrayList<String>> stringArrayListEntry : hash.entrySet()) { ArrayList<String> r = stringArrayListEntry.getValue(); ======= List<Row> resultRows = new ArrayList<>(); for (String hashKey : hash.keySet()) { ArrayList<String> r = hash....
<<<<<<< Map<Node, Integer> verticesIndex = new HashMap<Node, Integer>(); Map<String, ColumnNode> columnNodes = new HashMap<>(); ======= HashMap<Node, Integer> verticesIndex = new HashMap<>(); HashMap<String, ColumnNode> columnNodes = new HashMap<>(); >>>>>>> Map<Node, Integer> verticesIndex = new Hash...
<<<<<<< import edu.isi.karma.kr2rml.mapping.R2RMLMappingIdentifier; ======= import edu.isi.karma.kr2rml.R2RMLMappingIdentifier; import edu.isi.karma.modeling.ModelingConfiguration; >>>>>>> import edu.isi.karma.kr2rml.mapping.R2RMLMappingIdentifier; import edu.isi.karma.modeling.ModelingConfiguration;
<<<<<<< modelingConfiguration.getTopKSteinerTree(), null, null, true); ======= ModelingConfiguration.getTopKSteinerTree(), 50, 1, true); >>>>>>> modelingConfiguration.getTopKSteinerTree(), 50, 1, true); <<<<<<< int count = Math.min(sortableSemanticModels.size(), modelingConf...
<<<<<<< public HashMap<String, Boolean> legalParitions = new HashMap<String, Boolean>(); Vector<Partition> examples = new Vector<Partition>(); Set<String> exampleInputs = new HashSet<String>(); Vector<Vector<String[]>> constraints = new Vector<Vector<String[]>>(); ======= public HashMap<String, Boolean> legalPar...
<<<<<<< import edu.isi.karma.webserver.ContextParametersRegistry; import edu.isi.karma.webserver.ServletContextParameterMap; ======= >>>>>>> import edu.isi.karma.webserver.ContextParametersRegistry; import edu.isi.karma.webserver.ServletContextParameterMap; <<<<<<< if (number == modelingConfiguration.getMaxCandi...
<<<<<<< public ArrayList<Integer> deCorrelate(Map<String, double[]> data) { ArrayList<Integer> toRemove = new ArrayList<Integer>(); Set<String> signs = new HashSet<String>(); ======= public ArrayList<Integer> deCorrelate(HashMap<String, double[]> data) { ArrayList<Integer> toRemove = new ArrayList<>(); Hash...
<<<<<<< ServletContextParameterMap contextParameters = ContextParametersRegistry.getInstance().getContextParameters(workspace.getContextId()); File uploadedFile = FileUtil.downloadFileFromHTTPRequest(request, contextParameters.getParameterValue(ContextParameter.USER_UPLOADED_DIR)); ======= >>>>>>> ServletConte...
<<<<<<< isinloop, contextId); ======= isinloop); if(elem.length> 2) xsec.convert = elem[2]; >>>>>>> isinloop, contextId); if(elem.length> 2) xsec.convert = elem[2];
<<<<<<< @SuppressWarnings("CollectionDeclaredAsConcreteClass") public Map<String, Vector<TNode>> org = new HashMap<String, Vector<TNode>>(); @SuppressWarnings("CollectionDeclaredAsConcreteClass") public Map<String, Vector<TNode>> tran = new HashMap<String, Vector<TNode>>(); @SuppressWarnings("CollectionDeclaredAsC...
<<<<<<< final List<Object> rval = new ArrayList<Object>(); for (final Map.Entry<String, Object> stringObjectEntry : graph.entrySet()) { final Map<String, Object> node = (Map<String, Object>) stringObjectEntry.getValue(); final List<String> properties = new ArrayList<String>(node....
<<<<<<< Map<String, JSONArray> comMap = new HashMap<String, JSONArray>(); ======= HashMap<String, JSONArray> comMap = new HashMap<>(); >>>>>>> Map<String, JSONArray> comMap = new HashMap<>();
<<<<<<< import edu.isi.karma.util.EncodingDetector; ======= >>>>>>> import edu.isi.karma.util.EncodingDetector; <<<<<<< import edu.isi.karma.webserver.ServletContextParameterMap; import edu.isi.karma.webserver.ServletContextParameterMap.ContextParameter; ======= >>>>>>> import edu.isi.karma.webserver.ServletCont...
<<<<<<< import org.json.JSONArray; import org.json.JSONObject; ======= import org.json.JSONException; >>>>>>> import org.json.JSONArray; import org.json.JSONObject; import org.json.JSONException;
<<<<<<< import org.slf4j.Logger; import org.slf4j.LoggerFactory; import au.com.bytecode.opencsv.CSVReader; import edu.isi.karma.controller.command.selection.SuperSelection; import edu.isi.karma.rep.CellValue; import edu.isi.karma.rep.HNode; import edu.isi.karma.rep.HNode.HNodeType; import edu.isi.karma.rep.HNodePath; ...
<<<<<<< LinkedList<String> tempSubjects = new LinkedList<String>(); while(tempSubjects.size() < limit && !subjects.isEmpty()) ======= LinkedList<String> tempSubjects = new LinkedList<>(); while(tempSubjects.size() < limit && subjects.size() > 0) >>>>>>> LinkedList<String> tempSubjects = new LinkedList...
<<<<<<< private String contextId; public BANKSfromMM(String contextId) { super(); this.contextId = contextId; ======= private Integer recursiveLevel; private Integer maxPermutations; public BANKSfromMM() { // TODO Auto-generated constructor stub >>>>>>> private String contextId; private Integer recur...
<<<<<<< private PDFTranscoder pdfTranscoder; public BatikSVGImage(Element svgElement, Box box, double cssWidth, double cssHeight, ======= private final PDFTranscoder pdfTranscoder; public BatikSVGImage(Element svgElement, double cssWidth, double cssHeight, >>>>>>> private final PDFTranscod...
<<<<<<< private static final int FINAL_REVISION = Integer.MAX_VALUE / 4; /** * Creates a new LogisimVersion object without a revision number * @param major * @param minor * @param release * @return a LogisimVersion object */ public static LogisimVersion get(int major, int mino...
<<<<<<< /** * Tests that too long words fall below floats (left, right, both). * This test is needed to make sure fixes for issue 482 do not prevent * this behavior. */ @Test public void testTooLongWordsFallBelowFloats() throws IOException { assertTrue(vt.runTest("too-long-words-...