conflict_resolution
stringlengths
27
16k
<<<<<<< public void openIndex(KnowledgeBase aKb) { try { log.info("Index has been opened for KB " + aKb.getName()); } catch (Exception e) { log.error("Unable to open index", e); } } // // public SailRepository setupLuceneSail() // { // /...
<<<<<<< public static final Variable VAR_OBJECT = var(VAR_OBJECT_NAME); ======= public static final Variable VAR_RANGE = var(VAR_RANGE_NAME); public static final Variable VAR_DOMAIN = var(VAR_DOMAIN_NAME); >>>>>>> public static final Variable VAR_OBJECT = var(VAR_OBJECT_NAME); public static final...
<<<<<<< ======= import com.fasterxml.jackson.annotation.ObjectIdResolver; >>>>>>> import com.fasterxml.jackson.annotation.ObjectIdResolver;
<<<<<<< // remove existing annotations of this type, after all it is an // automation, no care clearAnnotations(aCas, type); ======= // remove existing annotations of this type, after all it is an automation, no care clearAnnotations(aJcas, aFeature); >>>>>>> ...
<<<<<<< import de.tudarmstadt.ukp.clarin.webanno.support.dialog.ConfirmationDialog; ======= import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; >>>>>>> import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; import de.tudarmstadt.ukp.clarin.webanno.support.dialog.ConfirmationDialog; <<<<<<< pr...
<<<<<<< * Call {@link KnowledgeBaseService#initStatement(KnowledgeBase, KBStatement)} after * constructing this in order to allow upserting. * * @param aInstance * {@link KBHandle} for the statement instance * @param aProperty * {@link KBHandle} for the statemen...
<<<<<<< public IRI getFtsIri() { return ftsIri; } public void setFtsIri(IRI ftsIri) { this.ftsIri = ftsIri; } ======= public IRI getLabelIri() { return labelIri; } public void setLabelIri(IRI aLabelIri) { labelIri = aLabelIri; } p...
<<<<<<< import org.springframework.security.authentication.AuthenticationProvider; ======= import org.springframework.security.authentication.DefaultAuthenticationEventPublisher; >>>>>>> import org.springframework.security.authentication.AuthenticationProvider; import org.springframework.security.authentication.Defa...
<<<<<<< .hasFieldOrPropertyWithValue("identifier", property.getIdentifier()) .hasFieldOrProperty("name") .matches(h -> h.getIdentifier().startsWith(IriConstants.INCEPTION_NAMESPACE)); ======= .hasFieldOrPropertyWithValue("identifier", handle.getIdentifier()) ...
<<<<<<< import com.fasterxml.jackson.core.io.NumberInput; ======= >>>>>>>
<<<<<<< private TokenObject token; private int id; private String label; private String uiLabel; private String feature; private String source; private double confidence; private long recommenderId; private boolean visible = false; ======= private final TokenObject token; p...
<<<<<<< private ConfirmationDialog confirmationDialog; ======= >>>>>>> private ConfirmationDialog confirmationDialog; <<<<<<< // Open accepted recommendation in the annotation detail editor panel VID vid = new VID(id); annotatorState.getSelection().selectSpan(vid, jCas, begin,...
<<<<<<< TupleQuery query = QueryUtil.generateCandidateQuery(conn, processedMention, properties.getCandidateQueryLimit()); ======= TupleQuery query = QueryUtil .generateCandidateQuery(conn, mentionArray, properties.getCandidateQueryLimit(), aK...
<<<<<<< Object id = _valueDeserializer.deserialize(p, ctxt); ======= Object id = _valueDeserializer.deserialize(jp, ctxt); /* 02-Apr-2015, tatu: Actually, as per [databind#742], let it be; * missing or null id is needed for some cases, such as cases where id * will be gene...
<<<<<<< ======= import org.eclipse.rdf4j.model.vocabulary.OWL; import org.eclipse.rdf4j.model.vocabulary.RDF; import org.eclipse.rdf4j.model.vocabulary.RDFS; import org.eclipse.rdf4j.model.vocabulary.XMLSchema; import org.eclipse.rdf4j.query.QueryEvaluationException; >>>>>>> import org.eclipse.rdf4j.query.QueryEvalu...
<<<<<<< void actionDelete(AjaxRequestTarget aTarget, DocumentMetadataAnnotationDetailPanel detailPanel) { if (selectedDetailPanel == detailPanel) { selectedAnnotation = null; selectedDetailPanel = null; } remove(detailPanel); aTarget.add(this); ...
<<<<<<< if (!isUserViewingOthersWork(state, userRepository.getCurrentUser()) && SourceDocumentState.NEW.equals(state.getDocument().getState())) { documentService.transitionSourceDocumentState(state.getDocument(), NEW_TO_ANNOTATION_IN_PROGRESS); ==...
<<<<<<< * or field. Type of definition is either instance (of type {@link JsonSerializer}) * or Class (of {@code Class&lt;JsonSerializer} implementation subtype); * if value of different type is returned, a runtime exception may be thrown by caller. ======= * or field. Type of definition is either...
<<<<<<< ======= /** * @since 2.8 */ >>>>>>> <<<<<<< String name = p.currentName(); ======= final String name = p.getCurrentName(); >>>>>>> final String name = p.currentName();
<<<<<<< void addQualifier(KnowledgeBase kb, KBQualifier newQualifier); void deleteQualifier(KnowledgeBase kb, KBQualifier oldQualifier); void upsertQualifier(KnowledgeBase kb, KBQualifier aQualifier); List<KBQualifier> listQualifiers(KnowledgeBase kb, KBStatement aStatement); ======= Repo...
<<<<<<< ======= private LoadingCache<AnnotationLayer, Boolean> hasLinkFeatureCache; >>>>>>> private LoadingCache<AnnotationLayer, Boolean> hasLinkFeatureCache;
<<<<<<< import org.springframework.test.context.ContextConfiguration; ======= import org.springframework.boot.test.context.SpringBootTest; import org.springframework.security.core.session.SessionRegistry; >>>>>>> import org.springframework.security.core.session.SessionRegistry; import org.springframework.test.contex...
<<<<<<< ======= /** * List the properties for a specific accepted domain identifier and also * include properties which do not have any domain specified. * * @param kb * The knowledge base * @param aDomain * a domain identifier. * @param aIncludeInf...
<<<<<<< public static String aLimit = "1000"; ======= public static int aLimit = 1000; >>>>>>> public static int aLimit = 1000; <<<<<<< , "LIMIT 10000"); //Query to get property specific domain elements public static String PROPERTYLIST_DOMAIN_DEPENDENT = String.join("...
<<<<<<< import de.agilecoders.wicket.core.markup.html.bootstrap.form.BootstrapRadioChoice; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxButton; import de.tudarmstadt.ukp.inception.workload.dynamic.model.WorkloadAndWorkflowService; ======= im...
<<<<<<< DateFormat df = _force(_dateFormat, tz); return new BaseSettings(_annotationIntrospector, _propertyNamingStrategy, _accessorNaming, _defaultTyper, _typeValidator, df, _handlerInstantiator, _locale, tz, _defaultBase64, _nodeFactory); ======= // 18-Oct-202...
<<<<<<< import org.eclipse.rdf4j.model.vocabulary.RDFS; ======= import org.eclipse.rdf4j.model.vocabulary.XMLSchema; >>>>>>> import org.eclipse.rdf4j.model.vocabulary.XMLSchema; import org.eclipse.rdf4j.model.vocabulary.RDFS; <<<<<<< List<KBHandle> resultList = new ArrayList<>(); resultList = read...
<<<<<<< vdoc, cas.getDocumentText(), annotationService, aPdfExtractFile); ======= vdoc, jCas.getDocumentText(), annotationService, pdfExtractFile); >>>>>>> vdoc, cas.getDocumentText(), annotationService, pdfExtractFile); <<<<<<< /** * Renders the ...
<<<<<<< ======= return handles; } private AnnotationFeature getLinkedAnnotationFeature() { String linkedType = this.getModelObject().feature.getType(); AnnotationLayer linkedLayer = annotationService .getLayer(linkedType, this.stateModel.getObject().getProject()); ...
<<<<<<< protected VDocument render(CAS aCas, int windowBeginOffset, int windowEndOffset) ======= protected VDocument render(JCas aJCas, int aWindowBeginOffset, int aWindowEndOffset) >>>>>>> protected VDocument render(CAS aCas, int aWindowBeginOffset, int aWindowEndOffset) <<<<<<< preRenderer.ren...
<<<<<<< kb_wine.setMaxResults(maxResults); kbList.add(new TestConfiguration("data/wine-ontology.rdf", kb_wine, "http://www.w3.org/TR/2003/PR-owl-guide-20031209/wine#ChateauMargaux")); ======= kb_wine.setDefaultLanguage("en"); rootConcepts = new HashSet<String>(); ...
<<<<<<< private Map<ImmutablePair<Project, String>, Set<CandidateEntity>> candidateCache; private Map<ImmutablePair<Project, String>, SemanticSignature> semanticSignatureCache; ======= private static final String WIKIDATA_PREFIX = "http://www.wikidata.org/entity/"; private static final String POS_VERB...
<<<<<<< protected TypeNameIdResolver(JavaType baseType, Map<String, String> typeToId, Map<String, JavaType> idToType) ======= protected TypeNameIdResolver(MapperConfig<?> config, JavaType baseType, ConcurrentHashMap<String, String> typeToId, HashMap<String, JavaType> idToTy...
<<<<<<< ======= import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.fileUpload; >>>>>>> import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
<<<<<<< import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; ======= >>>>>>> import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; <<<<<<< import de.tudarmst...
<<<<<<< private @SpringBean FeatureSupportRegistry featureSupportRegistry; ======= private @SpringBean FeatureSupportRegistry fsRegistry; private @SpringBean CasStorageService casStorageService; >>>>>>> private @SpringBean FeatureSupportRegistry fsRegistry; private @SpringBean CasStorageService c...
<<<<<<< neLayer.setOverlapMode(ANY_OVERLAP); sut.add(document, username, jcas, 0, 1); ======= sut.add(document, username, jcas.getCas(), 0, 1); >>>>>>> neLayer.setOverlapMode(ANY_OVERLAP); sut.add(document, username, jcas.getCas(), 0, 1); <<<<<<< .isThrownBy((...
<<<<<<< String featureValue = ""; // Test if the internal feature name is a primitive feature if (WebAnnoCasUtil.isPrimitiveFeature(annotation, feature.getName())) { // Get the feature value using the int...
<<<<<<< ======= private final LoadingCache<TagSet, List<ImmutableTag>> immutableTagsCache; >>>>>>> private final LoadingCache<TagSet, List<ImmutableTag>> immutableTagsCache; <<<<<<< ======= try (MDC.MDCCloseable closable = MDC.putCloseable(Logging.KEY_PROJECT_ID, S...
<<<<<<< ======= import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; >>>>>>>
<<<<<<< update(kb, (conn) -> { String identifier = generateIdentifier(conn, kb); ======= return update(kb, (conn) -> { String identifier = getReificationStrategy(kb).generateConceptIdentifier(conn, kb); >>>>>>> update(kb, (conn) -> { String identifier = get...
<<<<<<< userRepository = aUserRepository; ======= >>>>>>> <<<<<<< this(aRepositoryProperties, aUserRepository, aCasStorageService, aImportExportService, aProjectService, aApplicationEventPublisher); ======= this(aRepositoryProperties, aCasStorageService, aImportExportSer...
<<<<<<< /** * List the instances for the child concepts * * @param aKB The knowledge base * @param aParentIdentifier a Parent identifier. * @param aAll True if entities with implicit namespaces (e.g. defined by RDF) * @param aLimit Limit for SPARQL queries * @return All instances...
<<<<<<< ======= Map<AnnotationFS, Integer> sentenceIndexes = null; >>>>>>> Map<AnnotationFS, Integer> sentenceIndexes = null; <<<<<<< List<AnnotationFS> sentences = new ArrayList<>(select(aCas, getType(aCas, Sentence.class))); ======= >>>>>>> <<<<<<< ...
<<<<<<< import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasAccessMode.EXCLUSIVE_WRITE_ACCESS; import static de.tudarmstadt.ukp.clarin.webanno.api.dao.CasMetadataUtils.addOrUpdateCasMetadata; ======= >>>>>>> import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasAccessMode.EXCLUSIVE_WRITE_AC...
<<<<<<< import static java.util.stream.Collectors.toList; ======= import static de.tudarmstadt.ukp.clarin.webanno.support.wicket.WicketUtil.serverTiming; >>>>>>> import static de.tudarmstadt.ukp.clarin.webanno.support.wicket.WicketUtil.serverTiming; import static java.util.stream.Collectors.toList; <<<<<<< import d...
<<<<<<< private final JsonDeserializer<Object> _delegateDeserializer() { ======= /** * @since 2.9 */ protected final JsonDeserializer<Object> _delegateDeserializer() { >>>>>>> protected final JsonDeserializer<Object> _delegateDeserializer() {
<<<<<<< import de.tudarmstadt.ukp.inception.recommendation.scheduling.tasks.PredictionTask; ======= import de.tudarmstadt.ukp.inception.recommendation.api.model.Preferences; >>>>>>> import de.tudarmstadt.ukp.inception.recommendation.api.model.Preferences; import de.tudarmstadt.ukp.inception.recommendation.scheduling...
<<<<<<< for (AnnotationObject existedRecommendation : cleanRecommendationList) { if (existedRecommendation.getSource().equals(source) && existedRecommendation.getLabel() .equals(annotation) && existedRecommendation.getDocumentName() .equals(documentName)) { ======= ...
<<<<<<< import java.util.Collections; import java.util.Comparator; ======= >>>>>>> import java.util.Collections; <<<<<<< import java.util.Optional; import java.util.stream.Collectors; ======= >>>>>>> import java.util.Optional; <<<<<<< import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt...
<<<<<<< public void onDestroy() { super.onDestroy(); if (null != mBackgroundTimer) { mBackgroundTimer.cancel(); } } @Override ======= public void onPause() { super.onPause(); } @Override >>>>>>> <<<<<<< ShowFanart = get(UserPreferences.c...
<<<<<<< import androidx.leanback.media.PlayerAdapter; import com.devbrackets.android.exomedia.EMVideoView; ======= import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.ExoPlayerFactory; import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Simple...
<<<<<<< } @Test public void testDriverDeleteTable() throws SQLException, IOException { Statement stat = connection.createStatement(); stat.execute("DROP TABLE IF EXISTS AREA, MYCSV"); stat.execute("create table area(the_geom GEOMETRY, idarea int primary key)"); stat.execute(...
<<<<<<< return new Function[]{ new ST_3DLength(), new ST_ClosestPoint(), new ST_ClosestCoordinate(), new ST_CompactnessRatio(), new ST_Covers(), new ST_DWithin(), new ST_Extent(), new ST_Explode(), new ST...
<<<<<<< final DBTypes dbType = DBUtils.getDBType(connection); ======= final boolean isH2 = JDBCUtilities.isH2DataBase(connection); ArrayList<String> tableNames = new ArrayList<>(); >>>>>>> final DBTypes dbType = DBUtils.getDBType(connection); ArrayList<Stri...
<<<<<<< "COLUMN_NAME f_geometry_column,1 storage_type,GeometryTypeFromConstraint(CHECK_CONSTRAINT || REMARKS) geometry_type,2 coord_dimension,ColumnSRID(TABLE_NAME,COLUMN_NAME) srid" + " from INFORMATION_SCHEMA.COLUMNS WHERE CHECK_CONSTRAINT LIKE '%SC_GEOMETRY%' OR REMARKS LIKE '%SC_GEOM...
<<<<<<< String outputTable = TableLocation.parse(tableReference, isH2).toString(isH2); int recordCount = JDBCUtilities.getRowCount(connection, outputTable); ======= final DBTypes dbType = DBUtils.getDBType(connection); String tableName = TableLocation.pa...
<<<<<<< return new AnnotatedCreatorCollector(intr, tc, checkClassAnnotations) .collect(typeFactory, type, primaryMixIn); ======= return new AnnotatedCreatorCollector(intr, typeFactory, tc, collectAnnotations) .collect(type, primaryMixIn); >>>>>>> return new Ann...
<<<<<<< import org.h2gis.h2spatialext.function.spatial.mesh.ST_ConstrainedDelaunay; import org.h2gis.h2spatialext.function.spatial.mesh.ST_Delaunay; ======= import org.h2gis.h2spatialext.function.spatial.create.ST_MakeGrid; import org.h2gis.h2spatialext.function.spatial.create.ST_MakeGridPoints; >>>>>>> import org.h...
<<<<<<< public void importFile(Connection connection, String tableReference, File fileName, String options, boolean deleteTables, ProgressVisitor progress) throws SQLException, IOException { if (connection == null) { throw new SQLException("The connection cannot be null.\n"); } i...
<<<<<<< public static double computeSlope(Geometry geometry) throws IllegalArgumentException { return TriMarkers.getSlopeInPercent(TriMarkers.getNormalVector(TINFeatureFactory.createTriangle(geometry)), TINFeatureFactory.EPSILON); ======= public static Double computeSlope(Geometry geometry) throws Del...
<<<<<<< new ST_IsValidReason(), new ST_IsValidDetail(), ======= new ST_MakePolygon(), >>>>>>> new ST_MakePolygon(), new ST_IsValidReason(), new ST_IsValidDetail(),
<<<<<<< @Override public String toString() { StringBuilder sb = new StringBuilder(32 + (size() << 4)); sb.append("{"); int count = 0; for (Map.Entry<String, JsonNode> en : _children.entrySet()) { if (count > 0) { sb.append(","); } ...
<<<<<<< @Test public void testReadGeoJSON1() throws Exception { Statement stat = connection.createStatement(); ResultSet res = stat.executeQuery("SELECT ST_GeomFromGeoJSON('{\"type\":\"Point\",\"coordinates\":[10,1]}')"); res.next(); assertTrue(res.getString(1).equal...
<<<<<<< if (removableRoot == null || primaryRoot == null) { removableRoot = FileUtil.getStoragePath(_context, true); primaryRoot = FileUtil.getStoragePath(_context, false); } if (path.contains(removableRoot)) path = path.substring(remov...
<<<<<<< ======= /** * @since 2.12 */ protected final TypeSerializer _valueTypeSerializer; protected final JsonSerializer<Object> _valueSerializer; protected final BeanProperty _property; >>>>>>> <<<<<<< ======= _valueType = accessor.getType(); _valueTypeSerializer = vt...
<<<<<<< import com.fasterxml.jackson.annotation.JsonAutoDetect; ======= import com.fasterxml.jackson.annotation.JsonFormat; >>>>>>> import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonFormat; <<<<<<< VisibilityChecker.defaultInstance(), ...
<<<<<<< import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import javax.swing.event.ListDataEvent; import javax.swing.event.ListDataListener; ======= import javax.swing.border.EmptyBorder; import javax.swing.event.ListDataEvent; import javax.swing.event.ListDataListener; >>>>>>> impor...
<<<<<<< List<String> getAllJobs(CuratorRepository.CuratorFrameworkOp curatorFrameworkOp) throws SaturnJobConsoleException; List<String> getAllUnSystemJobs(CuratorRepository.CuratorFrameworkOp curatorFrameworkOp) throws SaturnJobConsoleException; ======= Long calculateJobNextTime(String jobName); Long ...
<<<<<<< import java.util.*; ======= import java.text.ParseException; import java.util.ArrayList; import java.util.Calendar; import java.util.Collection; import java.util.Collections; import java.util.Date; import java.util.List; import java.util.Locale; >>>>>>> import java.util.*; import java.text.ParseException; im...
<<<<<<< import cc.shinichi.bigimageviewpager.glide.GlideV4Engine; ======= >>>>>>> <<<<<<< import com.zhihu.matisse.Matisse; import com.zhihu.matisse.MimeType; import com.zhihu.matisse.internal.entity.CaptureStrategy; ======= >>>>>>>
<<<<<<< public static boolean isIsPaymentsEnable() { return isPaymentsEnable; } public static void requestUserState(Context ctx, VKPaymentsCallback callback) { VKPaymentsCallback.requestUserState(ctx, callback); } public void withPayments() { isPaymentsEnable = true; ...
<<<<<<< ======= import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.view.ViewGroup.LayoutParams; import android.view.WindowManager; //import android.view.View; >>>>>>> import android.view.View; import android.view.ViewGroup.LayoutParams;
<<<<<<< import android.webkit.WebBackForwardList; import android.webkit.WebHistoryItem; ======= import android.webkit.WebChromeClient; >>>>>>> import android.webkit.WebBackForwardList; import android.webkit.WebHistoryItem; import android.webkit.WebChromeClient; <<<<<<< NativeToJsMessageQueue jsMessageQueue; Expos...
<<<<<<< import java.util.Hashtable; import org.apache.cordova.api.CordovaInterface; ======= import java.io.IOException; import java.io.InputStream; >>>>>>> import java.util.Hashtable; import org.apache.cordova.api.CordovaInterface; import java.io.IOException; import java.io.InputStream; <<<<<<< * * @...
<<<<<<< import com.datasalt.pangool.io.HadoopInputFormat; import com.datasalt.pangool.io.HadoopOutputFormat; import com.datasalt.pangool.io.Utf8; ======= >>>>>>> import com.datasalt.pangool.io.HadoopInputFormat; import com.datasalt.pangool.io.HadoopOutputFormat;
<<<<<<< ======= public List<String> getCustomPartitionFields(){ return customPartitionFields; } >>>>>>> public List<String> getCustomPartitionFields(){ return customPartitionFields; } <<<<<<< void addSource(Schema schema) throws CoGrouperException { if(sourceNames.contains(schema.getName())) { ...
<<<<<<< ======= /** * @since 2.8 */ >>>>>>> <<<<<<< JsonIgnoreProperties.Value ignorals = intr.findPropertyIgnoralByName(config, accessor); if (ignorals != null) { Set<String> ignored = ignorals.findIgnoredForDeserialization(); if (!ignored.isEmp...
<<<<<<< import com.datasalt.pangool.io.HadoopInputFormat; import com.datasalt.pangool.io.HadoopOutputFormat; ======= import com.datasalt.pangool.cogroup.sorting.SortBy; >>>>>>> import com.datasalt.pangool.cogroup.sorting.SortBy; import com.datasalt.pangool.io.HadoopInputFormat; import com.datasalt.pangool.io.HadoopO...
<<<<<<< ======= import com.datasalt.pangolin.grouper.io.tuple.ITuple.InvalidFieldException; >>>>>>> import com.datasalt.pangolin.grouper.io.tuple.ITuple.InvalidFieldException;
<<<<<<< JavaStreamingContext ssc = new JavaStreamingContext(master, "FlumeEventCount", batchInterval, System.getenv("SPARK_HOME"), System.getenv("SPARK_EXAMPLES_JAR")); FlumeFunctions flumeFunc = new FlumeFunctions(ssc); JavaDStream<SparkFlumeEvent> flumeStream = flumeFunc.flumeStream("localhost...
<<<<<<< import scala.reflect.ClassTag; import scala.reflect.ClassTag$; ======= import scala.reflect.ClassManifest; import scala.reflect.ClassManifest$; >>>>>>> import scala.reflect.ClassTag; import scala.reflect.ClassTag$; <<<<<<< public abstract Iterable<Tuple2<K, V>> call(T t) throws Exception; public ClassT...
<<<<<<< import com.webank.api.consumer.MeshMQPushConsumer; import com.webank.eventmesh.common.config.CommonConfiguration; import com.webank.runtime.constants.ProxyConstants; ======= import com.webank.api.consumer.MeshMQPushConsumer; import com.webank.eventmesh.common.config.CommonConfiguration; >>>>>>> import com.we...
<<<<<<< import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.Executor; import java.util.concurrent.ExecutorService; import java.util.concurren...
<<<<<<< return createInVMFailoverServer(true, configuration, PagingFailoverTest.PAGE_SIZE, PagingFailoverTest.PAGE_MAX, new HashMap<String, AddressSettings>(), ...
<<<<<<< locator.setConfirmationWindowSize(10 * 1024 * 1024); sf = (ClientSessionFactoryInternal)createSessionFactoryAndWaitForTopology(locator, 2); try { ======= sf = createSessionFactoryAndWaitForTopology(locator, 2); >>>>>>> locator.setConfirm...
<<<<<<< import org.hornetq.api.core.HornetQException; ======= >>>>>>> import org.hornetq.api.core.HornetQException; <<<<<<< import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.Cl...
<<<<<<< public static final byte REPLICATION_SYNC = 103; ======= public static final byte REPLICATION_SYNC_FILE = 103; // HA >>>>>>> public static final byte REPLICATION_SYNC_FILE = 103; <<<<<<< public static final byte SESS_UNIQUE_ADD_METADATA = 106; // HA ======= >>>>...
<<<<<<< private static final boolean trace = ReplicationEndpointImpl.log.isTraceEnabled(); private final IOCriticalErrorListener criticalErrorListener; ======= private static final boolean trace = log.isTraceEnabled(); >>>>>>> private static final boolean trace = log.isTraceEnabled(); private fin...
<<<<<<< private Map<SimpleString, Pair<UUID, AtomicLong>> targetAddressInfos = new HashMap<SimpleString, Pair<UUID, AtomicLong>>(); private long creationTime = System.currentTimeMillis(); ======= private final Map<SimpleString, Pair<UUID, AtomicLong>> targetAddressInfos = new HashMap<SimpleString, Pair<UUI...
<<<<<<< isSavedInstanceNull = savedInstanceState == null; ======= lifecycleController = getArguments().getBoolean("lifecycleController"); >>>>>>> lifecycleController = getArguments().getBoolean("lifecycleController"); isSavedInstanceNull = savedInstanceState == nul...
<<<<<<< import com.aptoide.amethyst.utils.Logger; ======= import com.aptoide.amethyst.utils.LifeCycleMonitor; >>>>>>> import com.aptoide.amethyst.utils.Logger; import com.aptoide.amethyst.utils.LifeCycleMonitor; <<<<<<< Logger.d("debug", "onCreate: " + getClass().getSimpleName()); AptoideUtils.AppNa...
<<<<<<< ======= if (filter != null) { filter.depositSchemaProperty(prop, propertiesNode, provider); continue; } depositSchemaProperty(prop, propertiesNode, provider); >>>>>>> <<<<<<< ======= /** * Attempt to add the output of the given {@lin...
<<<<<<< if ((referenceBinding = this.environment.askForType(this, name, mod)) != null) { ======= //This call (to askForType) should be the last option to call, because the call is very expensive regarding performance // (a search for secondary types may get triggered which requires to parse all classes of a pac...
<<<<<<< public static final char[] TAG_SYSTEM_PROPERTY = "systemProperty".toCharArray(); //$NON-NLS-1$ ======= public static final char[] TAG_USES = "uses".toCharArray(); //$NON-NLS-1$ public static final char[] TAG_PROVIDES = "provides".toCharArray(); //$NON-NLS-1$ >>>>>>> public static final char[] TAG_SYSTEM_...
<<<<<<< protected boolean parsingJava12Plus; ======= protected boolean parsingJava11Plus; >>>>>>> protected boolean parsingJava12Plus; protected boolean parsingJava11Plus; <<<<<<< this.parsingJava12Plus = this.options.sourceLevel >= ClassFileConstants.JDK12; ======= this.parsingJava11Plus = this.options.sourceL...
<<<<<<< throws DatabindException { InvalidDefinitionException e = InvalidDefinitionException.from(getGenerator(), msg, type); e.initCause(cause); throw e; ======= throws JsonMappingException { throw InvalidDefinitionException.from(getGenerator(), msg, type) ...
<<<<<<< if (isJRE9) return; String jreDirectory = Util.getJREDirectory(); String jfxJar = Util.toNativePath(jreDirectory + "/lib/ext/jfxrt.jar"); ======= >>>>>>> if (isJRE9) return;
<<<<<<< * Copyright (c) 2000, 2018 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 ======= * Copyright (c) 2000, 2017 IBM Corporation and others. * * This program and the accompanying materials...
<<<<<<< import java.net.URI; import java.nio.file.DirectoryStream; import java.nio.file.FileSystems; import java.nio.file.FileVisitResult; import java.nio.file.FileVisitor; import java.nio.file.Files; import java.nio.file.attribute.BasicFileAttributes; import java.util.HashMap; ======= import java.util.ArrayList; >>...