conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
String key;
String unlocalizedName;
String postfix;
public AnimatedEntity owner;
=======
private final AnimatedEntity<?> owner;
>>>>>>>
String key;
String unlocalizedName;
String postfix;
public AnimatedEntity owner;
<<<<<<<
public AlterEntry(String postfix, String unlocalizedName)
{
this.pos... |
<<<<<<<
public SettableBeanProperty withValueDeserializer(JsonDeserializer<?> deser) {
return new MethodProperty(this, deser, _nullProvider);
}
@Override
public SettableBeanProperty withNullProvider(NullValueProvider nva) {
return new MethodProperty(this, _valueDeserializer, nva);
====... |
<<<<<<<
fetchRatings(app.getPackageName(), stats);
stats.setNumberOfComments(fetchCommentsCount(app.getPackageName(),
Utils.getDisplayLocale()));
=======
fetchRatings(app, stats);
stats.setNumberOfComments(fetchCommentsCount(app));
>>>>>>>
fetchRatings(app, stats);
stats.setNumberOfComments(fe... |
<<<<<<<
=======
import com.github.andlyticsproject.model.Revenue;
import com.github.andlyticsproject.model.RevenueSummary;
import com.github.andlyticsproject.sync.AutosyncHandler;
>>>>>>>
import com.github.andlyticsproject.model.Revenue;
import com.github.andlyticsproject.model.RevenueSummary;
import com.github.andl... |
<<<<<<<
@SuppressWarnings("deprecation")
=======
>>>>>>>
@SuppressWarnings("deprecation") |
<<<<<<<
this(ClassUtil.rawClass(valueType));
=======
// 26-Sep-2017, tatu: [databind#1764] need to add null-check back until 3.x
_valueClass = (valueType == null) ? Object.class : valueType.getRawClass();
_valueType = valueType;
>>>>>>>
_valueType = Objects.requireNonNull(valu... |
<<<<<<<
=======
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import com.cronutils.model.Cron;
>>>>>>>
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
<<<<<<<
import java.util.*;
import ja... |
<<<<<<<
} // end-class Option
=======
}
//</editor-fold>
>>>>>>>
}
//</editor-fold>
} // end-class Option |
<<<<<<<
return new BeanDeserializer(this, _beanDesc,
_constructPropMap(props), _backRefProperties, _ignorableProps, _ignoreAllUnknown,
_anyViews(props));
=======
return new BeanDeserializer(this,
_beanDesc, propertyMap, _backRefProperties, _ignorablePro... |
<<<<<<<
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
=======
import com.gemstone.gemfire.test.junit.categories.FlakyTest;
>>>>>>>
import com.gemstone.gemfire.test.junit.categories.FlakyTest;
import org.junit.Test;
i... |
<<<<<<<
=======
import static com.gemstone.gemfire.test.dunit.Assert.*;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*;
import static com.gemstone.gemfire.test.dunit.Wait.*;
import java.util.List;
import java.util.Properties;
import org.junit.Test;
import org.junit.experimental.categories.Category;
... |
<<<<<<<
/* Ok: time to mix type id, value; and we will actually use "wrapper-array"
* style to ensure we can handle all kinds of JSON constructs.
*/
JsonParser p2 = _tokens[index].asParser(ctxt, p);
=======
// Ok: time to mix type id, value; and we will actually use "wrapper-... |
<<<<<<<
=======
import com.gemstone.gemfire.internal.logging.LogService;
import com.gemstone.org.jgroups.Event;
import com.gemstone.org.jgroups.JChannel;
import com.gemstone.org.jgroups.stack.Protocol;
>>>>>>>
import com.gemstone.gemfire.internal.logging.LogService; |
<<<<<<<
public IndexCommandsDUnitTest(boolean useHttpOnConnect, boolean enableAuth) {
super(useHttpOnConnect, enableAuth);
}
=======
>>>>>>>
public IndexCommandsDUnitTest(boolean useHttpOnConnect, boolean enableAuth) {
super(useHttpOnConnect, enableAuth);
} |
<<<<<<<
offHeap, hdfsStoreName , hdfsWriteOnly, mcastEnabled, regionAttributes);
=======
offHeap, regionAttributes);
>>>>>>>
offHeap, mcastEnabled, regionAttributes);
<<<<<<<
prTotalMaxMemory, prTotalNumBuckets, null,compressor, offHeap , hdfsStoreName , hdfsWriteOnly,... |
<<<<<<<
=======
import com.gemstone.gemfire.test.dunit.SerializableCallable;
>>>>>>>
<<<<<<<
import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.junit.runners.Parameterized;
import java.io.IOException;
import java.io.PrintStream;
import java.io.PrintWriter;
import java.io.StringWr... |
<<<<<<<
import org.n52.janmayen.Comparables;
import org.n52.shetland.util.CollectionHelper;
=======
>>>>>>>
import org.n52.janmayen.Comparables;
import org.n52.shetland.util.CollectionHelper;
<<<<<<<
public boolean hasSamplingGeometry() {
return getSamplingGeometry() != null && !getSamplingGeometry().is... |
<<<<<<<
import static com.gemstone.gemfire.test.dunit.Assert.*;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*;
import java.io.IOException;
import java.io.PrintStream;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java... |
<<<<<<<
@Category({ DistributedTest.class, FlakyTest.class }) // see GEODE-1034
@RunWith(Parameterized.class)
=======
@Category(DistributedTest.class)
>>>>>>>
@Category(DistributedTest.class)
@RunWith(Parameterized.class) |
<<<<<<<
@Category({ DistributedTest.class, FlakyTest.class }) // see GEODE-689, GEODE-1048
@RunWith(Parameterized.class)
=======
@Category(DistributedTest.class)
>>>>>>>
@Category(DistributedTest.class)
@RunWith(Parameterized.class)
<<<<<<<
=======
@Category(FlakyTest.class) // GEODE-1048: HeadlessGFSH, random ... |
<<<<<<<
SerializableRunnable disconnect = new SerializableRunnable("Disconnect from " + locators) {
public void run() {
DistributedSystem sys = InternalDistributedSystem.getAnyInstance();
if (sys != null && sys.isConnected()) {
sys.disconnect();
}
MembershipManagerHel... |
<<<<<<<
startCacheServer(vm0, port[0]);
startCacheServer(vm1, port[1]);
=======
>>>>>>>
public CopyOnReadIndexDUnitTest(String name) {
super(name);
}
public void setUp() throws Exception {
super.setUp();
getSystem();
invokeInEveryVM(new SerializableRunnable("getSystem"... |
<<<<<<<
=======
import static org.junit.Assert.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import org.jmock.Expectations;
import org.jmock.Mockery;
import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org... |
<<<<<<<
import com.gemstone.gemfire.internal.net.SSLEnabledComponent;
import com.gemstone.gemfire.internal.net.SocketCreator;
=======
import com.gemstone.gemfire.internal.security.SecurableComponent;
>>>>>>>
import com.gemstone.gemfire.internal.security.SecurableComponent;
import com.gemstone.gemfire.internal.net.SS... |
<<<<<<<
=======
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
>>>>>>>
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
<<<<<<<
@Rule
public RetryRule retryRule = new RetryRule();
public CreateAlterDestroy... |
<<<<<<<
=======
import org.junit.BeforeClass;
import org.junit.Ignore;
>>>>>>>
import org.junit.BeforeClass;
import org.junit.Ignore;
<<<<<<<
=======
private static void loadJGroupsJar(List<String> excludedClasses) throws Exception {
System.out.println("loadJGroupsJar starting");
String cp = System.get... |
<<<<<<<
=======
>>>>>>> |
<<<<<<<
c.drawBitmap(mBitmap, 0, 0, null);
=======
c.drawBitmap(mBitmap, 0, 0, null);
>>>>>>>
c.drawBitmap(mBitmap, 0, 0, null);
<<<<<<<
if (mRedoBuffer != null) {
mUndoBuffer = mRedoBuffer;
=======
if (mRedoBuffer != null) ... |
<<<<<<<
private ToolboxCategory mToolboxCategory;
private BlockFactory mBlockFactory;
=======
private final Dragger mDragger;
// The FragmentManager is used to show/hide fragments like the trash and toolbox.
private FragmentManager mFragmentManager;
>>>>>>>
private final Dragger mDragger;
... |
<<<<<<<
import org.eclipse.cdt.managedbuilder.core.ManagedCProjectNature;
=======
import org.eclipse.cdt.managedbuilder.core.IConfiguration;
import org.eclipse.cdt.managedbuilder.core.IManagedProject;
import org.eclipse.cdt.managedbuilder.core.IProjectType;
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManag... |
<<<<<<<
/**
* Searches for all libraries that can be installed but are not yet installed. A
* library is considered installed when 1 version of the library is installed.
*
* @return a map of all instalable libraries
*/
public static Map<String, io.sloeber.core.managers.Library> getAllInstallableLibraries() ... |
<<<<<<<
public static final short SCOPE_START_DATA = (short) 0xCDAB;// This is the
// 205 171 or
// -85 -51
// flag that
// indicates
// scope data is
// following
// least significant first 0xCDAB;
=======
public static final short SCOPE_START_DATA = (short... |
<<<<<<<
private void makeActions() {
this.connect = new Action() {
@SuppressWarnings("synthetic-access")
@Override
public void run() {
OpenSerialDialogBox comportSelector = new OpenSerialDialogBox(SerialMonitor.this.parent.getShell());
comportSelector.create();
if (comportSelector.open() == Wind... |
<<<<<<<
RevokeCert rCert;
=======
SignCert siCert;
>>>>>>>
RevokeCert rCert;
SignCert siCert;
<<<<<<<
public SideBarListener(CreateCert cCert, ShowCert sCert, RevokeCert rCert, Composite comp_right){
=======
public SideBarListener(CreateCert cCert, ShowCert sCert, SignCert siCert, Composite comp_right){
>>... |
<<<<<<<
RSAPrivateCrtKeyParameters privateKey = (RSAPrivateCrtKeyParameters) keypair
.getPrivate();
RSAPublicKey pkStruct = new RSAPublicKey(publicKey.getModulus(),
publicKey.getExponent());
=======
RSAPrivateCrtKeyParameters privateKey = (RSAPrivateCrtKeyParameters) keypair.getPrivate();
@SuppressWar... |
<<<<<<<
import org.eclipse.swt.custom.StyledText;
=======
import org.eclipse.swt.custom.ScrolledComposite;
>>>>>>>
import org.eclipse.swt.custom.StyledText;
import org.eclipse.swt.custom.ScrolledComposite; |
<<<<<<<
import org.eclipse.swt.custom.StyledText;
=======
import org.eclipse.swt.custom.ScrolledComposite;
>>>>>>>
import org.eclipse.swt.custom.StyledText;
import org.eclipse.swt.custom.ScrolledComposite; |
<<<<<<<
import org.jcryptool.visual.jctca.ResizeHelper;
import org.jcryptool.visual.jctca.listeners.ResizeListener;
=======
import org.jcryptool.visual.jctca.listeners.CSRListener;
>>>>>>>
import org.jcryptool.visual.jctca.ResizeHelper;
import org.jcryptool.visual.jctca.listeners.ResizeListener;
import org.jcryptool... |
<<<<<<<
=======
String txt_reason;
Combo reason;
>>>>>>>
String txt_reason;
Combo reason;
<<<<<<<
=======
>>>>>>>
<<<<<<<
Combo reason = new Combo(container, SWT.DROP_DOWN);
=======
reason = new Combo(container, SWT.DROP_DOWN);
>>>>>>>
reason = new Combo(container, SWT.DROP_DOWN);
re... |
<<<<<<<
import org.antlr.intellij.plugin.configdialogs.ANTLRv4GrammarProperties;
=======
import org.antlr.intellij.plugin.ANTLRv4TokenTypes;
>>>>>>>
import org.antlr.intellij.plugin.configdialogs.ANTLRv4GrammarProperties;
import org.antlr.intellij.plugin.ANTLRv4TokenTypes;
<<<<<<<
import java.util.*;
=======
impo... |
<<<<<<<
public NetworkPersistedBatchReadyListener(final Context context, File file, SerializationStrategy<E, T> serializationStrategy, final Handler handler, NetworkBatchListener<E, T> listener, int maxRetryCount) {
super(file, serializationStrategy, handler, null);
this.context = context;
t... |
<<<<<<<
import com.birbit.android.jobqueue.messaging.message.SchedulerMessage;
import com.birbit.android.jobqueue.scheduling.Scheduler;
import com.birbit.android.jobqueue.scheduling.SchedulerConstraint;
=======
import com.path.android.jobqueue.CancelReason;
>>>>>>>
import com.birbit.android.jobqueue.messaging.messag... |
<<<<<<<
=======
/**
* Method that should be called after {@link #writeTypePrefix(JsonGenerator, WritableTypeId)}
* and matching value write have called, passing {@link WritableTypeId} returned.
* Usual idiom is:
*<pre>
* // Indicator generator that type identifier may be needed; generator... |
<<<<<<<
/* Then with leaf-level mix-in; without (method) auto-detect, should
* use field
*/
m = ObjectMapper.builder()
.addMixIn(LeafClass.class, MixIn.class)
.build();
=======
// Then with leaf-level mix-in; without (method) auto-detect,
... |
<<<<<<<
Translator.addBundle("i18n");
Install4JUtils.applicationVersion().ifPresent(v -> LOG.info("Starting OpenWebStart {}", v));
=======
>>>>>>> |
<<<<<<<
import com.alibaba.android.vlayout.extend.PerformanceMonitor;
=======
import com.alibaba.android.vlayout.extend.ViewLifeCycleListener;
>>>>>>>
import com.alibaba.android.vlayout.extend.PerformanceMonitor;
import com.alibaba.android.vlayout.extend.ViewLifeCycleListener; |
<<<<<<<
/**
* Signals if this producer needs to be started automatically.
*
* Default: true
*/
private boolean autoStartup = true;
=======
/**
* Signals if this producer needs to be started automatically
*
* Default: true
*/
private boolean autoStartup = true;
>>>>>>>
/**
* Signals if this p... |
<<<<<<<
* Returns the name of this binding (i.e., channel name).
* @return binding name
=======
* Returns the name of the destination for this binding
*
* @return destination name
>>>>>>>
* Returns the name of the destination for this binding
*
* @return destination name
<<<<<<<
=======
/**
* R... |
<<<<<<<
//TODO: load options
FinderWindow w = new FinderWindow(); //as long as we design it well, we won’t need a reference to it ;)
=======
FinderWindow w = new FinderWindow();
>>>>>>>
FinderWindow w = new FinderWindow(); //as long as we design it well, we won’t need a reference to it ;) |
<<<<<<<
resetHandlers(_participantHandlers);
resetHandlers(_controllerHandlers);
logger.info("Handling new session, session id:" + _sessionId);
=======
resetHandlers(_handlers);
logger.info("Handling new session, session id:" + _sessionId + "instance:" + _instanceName);
>>>>>>>
resetHa... |
<<<<<<<
import com.linkedin.helix.HelixAdmin;
=======
import com.linkedin.helix.ClusterManagementService;
import com.linkedin.helix.PropertyPathConfig;
>>>>>>>
import com.linkedin.helix.HelixAdmin;
import com.linkedin.helix.PropertyPathConfig; |
<<<<<<<
private static final Logger LOG =
Logger.getLogger(ZkCachedDataAccessor.class);
=======
private static final Logger LOG = Logger
.getLogger(ZkCachedDataAccessor.class);
>>>>>>>
private static final Logger ... |
<<<<<<<
public enum IdealStateProperty {
PARTITIONS, STATE_MODEL_DEF_REF, REPLICAS, IDEAL_STATE_MODE, STATE_MODEL_FACTORY_NAME
=======
public enum IdealStateProperty
{
NUM_PARTITIONS,
STATE_MODEL_DEF_REF,
REPLICAS,
IDEAL_STATE_MODE
>>>>>>>
public enum IdealStateProperty {
NUM_PARTITIO... |
<<<<<<<
stateMach.registerStateModelFactory(LEADER_STANDBY, _stateModelFty, _resGroupName);
=======
stateMach.registerStateModelFactory(LEADER_STANDBY, _resourceName,
_stateModelFty);
>>>>>>>
stateMach.registerStateModelFactory(LEADER_STANDBY, _stateModelFty, _resourceName);
<<<<<<<
LOG.in... |
<<<<<<<
@Override
public void addHealthStateChangeListener(HealthStateChangeListener listener,
String instanceName) throws Exception {
// TODO Auto-generated method stub
}
=======
@Override
public String getVersion()
{
return _version;
}
>>>>>>>
@Override
public void addHealthStateChangeListener(... |
<<<<<<<
import com.linkedin.helix.util.StatusUpdateUtil;
import com.linkedin.helix.*;
=======
>>>>>>>
import com.linkedin.helix.util.StatusUpdateUtil;
import com.linkedin.helix.*;
<<<<<<<
=======
static class Transition implements Comparable<Transition>
{
private final String _msgID;
private final lo... |
<<<<<<<
import com.linkedin.clustermanager.ZNRecord;
import com.linkedin.clustermanager.model.Alerts;
=======
import com.linkedin.clustermanager.ZNRecordDecorator;
>>>>>>>
import com.linkedin.clustermanager.ZNRecord;
import com.linkedin.clustermanager.model.Alerts;
import com.linkedin.clustermanager.ZNRecordDecorato... |
<<<<<<<
PAUSE(Type.CONTROLLER, false,false, true),
PERSISTENTSTATS(Type.CONTROLLER, true, false, false, false),
ALERTS(Type.CONTROLLER, true, false, false, false),
MESSAGES_CONTROLLER(Type.CONTROLLER, true, false, true),
STATUSUPDATES_CONTROLLER(Type.CONTROLLER, true, true, true),
=======
PAUSE(Type.CON... |
<<<<<<<
=======
import org.flywaydb.core.internal.configuration.ConfigUtils;
>>>>>>>
import org.flywaydb.core.internal.configuration.ConfigUtils;
<<<<<<<
import java.net.MalformedURLException;
=======
import java.lang.reflect.Method;
>>>>>>>
import java.lang.reflect.Method;
import java.net.MalformedURLException;... |
<<<<<<<
* Gets the list of callbacks set for lifecycle notifications
*
* @return FlywayCallback interface implementations or an empty list
*/
public List<FlywayCallback> getCallbacks() {
return callbacks;
}
/**
* Set custom FlywayCallback interface implementations that Flyway will
... |
<<<<<<<
if (!exists()) {
LOG.info("Creating Metadata table: " + table);
final String source =
new ClassPathResource(dbSupport.getScriptLocation() + "createMetaDataTable.sql").loadAsString("UTF-8");
Map<String, String> placeholders = new HashMap<String, S... |
<<<<<<<
import com.googlecode.flyway.core.Flyway;
import com.googlecode.flyway.core.migration.Migration;
=======
import com.googlecode.flyway.core.migration.MigrationTestCase;
>>>>>>>
import com.googlecode.flyway.core.migration.Migration;
import com.googlecode.flyway.core.migration.MigrationTestCase;
<<<<<<<
import... |
<<<<<<<
ObjectMapper mapper = jsonMapperBuilder()
.enableDefaultTypingAsProperty(NoCheckSubTypeValidator.instance,
DefaultTyping.OBJECT_AND_NON_CONCRETE,
=======
final ObjectMapper mapper = JsonMapper.builder()
.activateDefaultTypingAsProperty(NoCheckSubType... |
<<<<<<<
"webelement.focus();" +
=======
"if (webelement.getAttribute('disabled') != undefined) return 'Cannot change value of disabled element';" +
>>>>>>>
"if (webelement.getAttribute('disabled') != undefined) return 'Cannot change value of disabled element';" +
"webe... |
<<<<<<<
=======
import com.codeborne.selenide.Configuration;
import com.codeborne.selenide.ex.TimeoutException;
import org.junit.Before;
import org.junit.Test;
>>>>>>>
<<<<<<<
=======
import static org.hamcrest.Matchers.endsWith;
import static org.hamcrest.Matchers.startsWith;
import static org.junit.Assert.*;
i... |
<<<<<<<
List<WebElement> actualElements = filteringCollection.getActualElements();
assertThat(actualElements)
.hasSize(1);
assertThat(actualElements.get(0))
.isEqualTo(mockedWebElement2);
=======
List<WebElement> actualElements = filteringCollection.getElements();
assertEquals(1, actua... |
<<<<<<<
=======
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.feedback.IFeedback;
>>>>>>>
import org.apache.wicket.feedback.IFeedback;
<<<<<<<
import org.wicketstuff.event.annotation.OnEvent;
=======
import org.eclipse.rdf4j.query.QueryEvaluationException;
import org.slf4j.Logger;
impo... |
<<<<<<<
// TODO what about handling type intersection when multiple range statements are
// present?
// obtain IRI of property range, if existent
Optional<KBProperty> property = kbService.readProperty(groupModel.getObject().getKb(),
groupModel.getObje... |
<<<<<<<
writeLearningRecordInDatabase(LearningRecordUserAction.ACCEPTED);
// Create annotation from recommendation
AnnotatorState annotatorState = ActiveLearningSidebar.this.getModelObject();
JCas jCas = this.getJCasProvider().get();
SpanAdapter adapter = (SpanAdapter) a... |
<<<<<<<
=======
>>>>>>>
<<<<<<<
// Query to retrieve concept for an instance
public static String CONCEPT_FOR_INSTANCE = String.join("\n"
, "SELECT DISTINCT ?s ?l WHERE {"
, " ?pInstance ?pTYPE ?s ."
, " OPTIONAL {"
, " ?pInstance ?pLABEL ?l ."
... |
<<<<<<<
public PredictionTask(User aUser, Project aProject)
=======
public PredictionTask(User aUser, Project aProject, String aTrigger)
>>>>>>>
public PredictionTask(User aUser, Project aProject, String aTrigger)
<<<<<<<
RecommendationEngine recommendationEngine = factory... |
<<<<<<<
Statement nameStmt = vf.createStatement(subject, kb.getLabelIri(),
vf.createLiteral(name));
=======
Statement nameStmt = vf.createStatement(subject, RDFS.LABEL,
vf.createLiteral(name, language));
>>>>>>>
Statement nameStmt = vf.createSta... |
<<<<<<<
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.StringField;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.... |
<<<<<<<
import java.net.URI;
=======
import java.util.ArrayList;
import java.util.Collections;
>>>>>>>
import java.net.URI;
import java.util.ArrayList;
import java.util.Collections;
<<<<<<<
import org.eclipse.rdf4j.model.IRI;
import org.eclipse.rdf4j.model.ValueFactory;
import org.eclipse.rdf4j.model.impl.SimpleVal... |
<<<<<<<
ekb.setReification(kb.getReification());
=======
ekb.setSupportConceptLinking(kb.isSupportConceptLinking());
>>>>>>>
ekb.setReification(kb.getReification());
ekb.setSupportConceptLinking(kb.isSupportConceptLinking()); |
<<<<<<<
if (aExLayer.getOverlapMode() == null) {
// This allows importing old projects which did not have the overlap mode yet
aLayer.setOverlapMode(aExLayer.isAllowStacking() ? ANY_OVERLAP : OVERLAP_ONLY);
}
else {
aLayer.setOverlapMode(aExLayer.getOverlapMod... |
<<<<<<<
=======
private LoadableDetachableModel<Boolean> annotationFinished = LoadableDetachableModel
.of(this::loadAnnotationFinished);
>>>>>>>
private LoadableDetachableModel<Boolean> annotationFinished = LoadableDetachableModel
.of(this::loadAnnotationFinished); |
<<<<<<<
import de.tudarmstadt.ukp.clarin.webanno.model.OverlapMode;
=======
import de.tudarmstadt.ukp.clarin.webanno.model.ValidationMode;
>>>>>>>
import de.tudarmstadt.ukp.clarin.webanno.model.OverlapMode;
import de.tudarmstadt.ukp.clarin.webanno.model.ValidationMode;
<<<<<<<
@JsonProperty("overlap_mode")
... |
<<<<<<<
@ImportResource({
"classpath:/META-INF/application-context.xml" })
=======
>>>>>>>
<<<<<<<
// The WebAnno User model class picks this bean up by name!
=======
// The WebAnno User model class picks this bean up by name!
@Bean
public PasswordEncoder passwordEncoder()
{
... |
<<<<<<<
tupleQuery.setBinding("pLABEL", aKB.getLabelIri());
tupleQuery.setBinding("pDESCRIPTION", aKB.getDescriptionIri());
tupleQuery.setBinding("pSUBPROPERTY", aKB.getSubPropertyIri());
=======
tupleQuery.setBinding("pLABEL", aKB.getPropertyLabelIri());
tu... |
<<<<<<<
=======
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.feedback.IFeedback;
>>>>>>>
import org.apache.wicket.feedback.IFeedback;
<<<<<<<
import org.wicketstuff.event.annotation.OnEvent;
=======
import org.eclipse.rdf4j.query.QueryEvaluationException;
import org.slf4j.Logger;
impo... |
<<<<<<<
private Label noDocsLabel;
private Label finishedLabel;
=======
private final Label noDocsLabel;
private final Label finishedLabel;
>>>>>>>
private final Label noDocsLabel;
private final Label finishedLabel;
<<<<<<<
=======
// init. state with stored curati... |
<<<<<<<
public static final String ANY_OBJECT = "<ANY>";
public static final String TYPE_ANY_OBJECT = PREFIX + ANY_OBJECT;
=======
public static final String ANY_CONCEPT = "<ANY>";
public static final String TYPE_ANY_CONCEPT = PREFIX + ANY_CONCEPT;
private static final Logger LOG = LoggerFact... |
<<<<<<<
, optionalLanguageFilteredValue("?pLABEL", aKB.getDefaultLanguage(),"?l")
, optionalLanguageFilteredValue("?pDESCRIPTION", aKB.getDefaultLanguage(),"?d")
, "} "
, "LIMIT " + aKB.getMaxResults());
=======
, optionalLanguageFiltered... |
<<<<<<<
// // If we added the input term as the first result and by freak accident
// // it is even returned as a result, then skip it.
// .filter(t -> !(inputAsFirstResult && t.getName().equals(aTerm)))
.skip(aPage * 10).li... |
<<<<<<<
/**
* Gets a list of sub-property of label
*
* @param aKB
* a knowledge base.
* @return set of properties
*/
Set<KBHandle> getSubPropertyLabels(KnowledgeBase aKB);
=======
/**
* List all Instances of a given knowledge base
* @param aKB the kno... |
<<<<<<<
corefLayer.setOverlapMode(ANY_OVERLAP);
sut.addSpan(document, username, jcas, 0, 1);
=======
sut.addSpan(document, username, jcas.getCas(), 0, 1);
>>>>>>>
corefLayer.setOverlapMode(ANY_OVERLAP);
sut.addSpan(document, username, jcas.getCas(), 0, 1);
<<<<<<<
... |
<<<<<<<
List<KBHandle> listProperties(KnowledgeBase kb, IRI aType, boolean aIncludeInferred, boolean
aAll);
=======
>>>>>>>
List<KBHandle> listProperties(KnowledgeBase kb, IRI aType, boolean aIncludeInferred, boolean
aAll); |
<<<<<<<
void render(CAS aCas, AnnotatorState aState, VDocument vdoc);
=======
void render(JCas jCas, AnnotatorState aState, VDocument vdoc,
int aWindowBeginOffset, int aWindowEndOffset);
>>>>>>>
void render(CAS aCas, AnnotatorState aState, VDocument vdoc, int aWindowBeginOffset,
... |
<<<<<<<
SuggestionDocumentGroup groups = model.getPredictions(
DocumentMetaData.get(aJcas).getDocumentTitle(), layer, aWindowBeginOffset,
aWindowEndOffset);
=======
SuggestionDocumentGroup groups = model.getPredictions(getDocumentTitle(aCas), layer,
wind... |
<<<<<<<
List<KBHandle> rootConcepts = sut.listRootConcepts(kb, false);
assertThat(rootConcepts).as("Check that root concepts have been found").hasSize(kb.getMaxResults());
=======
Stream<String> rootConcepts = sut.listRootConcepts(kb, false).stream().map(KBHandle::getIdentifier);
Stri... |
<<<<<<<
private static final String NO_LABEL = "no_label";
=======
private static final String UNKNOWN_LABEL = "unknown";
>>>>>>>
private static final String NO_LABEL = "no_label";
private static final String UNKNOWN_LABEL = "unknown"; |
<<<<<<<
void fireRender(CAS aCas, AnnotatorState aModelObject, VDocument aVdoc);
=======
void fireRender(JCas aJCas, AnnotatorState aModelObject, VDocument aVdoc,
int aWindowBeginOffset, int aWindowEndOffset);
>>>>>>>
void fireRender(CAS aCas, AnnotatorState aModelObject, VDocument aV... |
<<<<<<<
private List<KBHandle> evaluateListQuery(TupleQuery tupleQuery, boolean aAll)
=======
/**
* Method process the Tuple Query Results
*
* @param tupleQuery Tuple Query Variable
* @param aAll True if entities with implicit namespaces (e.g. defined by RDF)
* @param itemVariable Th... |
<<<<<<<
List<KBHandle> resultList = new ArrayList<>();
if (!kb.getExplicitlyDefinedRootConcepts().isEmpty()) {
for (IRI conceptIRI : kb.getExplicitlyDefinedRootConcepts()) {
KBConcept concept = readConcept(kb, conceptIRI.stringValue()).get();
KBHandle... |
<<<<<<<
=======
private AutoCompleteTextField<KBHandle> createSelectPropertyAutoCompleteTextField()
{
AutoCompleteTextField<KBHandle> field = new AutoCompleteTextField<KBHandle>("newRole",
new PropertyModel<KBHandle>(this, "selectedRole"),
new TextRenderer<KBHandle>("uiLabel"),... |
<<<<<<<
=======
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
>>>>>>>
import org.apache.wicket.model.Model;
<<<<<<<
import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
=======
import org.eclipse.rdf4j.model.vocabulary.OWL;
import org.eclipse.rdf4j.model.vocabulary.RDF;
im... |
<<<<<<<
import org.apache.wicket.markup.html.form.DropDownChoice;
=======
import org.apache.wicket.markup.html.form.CheckBox;
>>>>>>>
import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.markup.html.form.DropDownChoice; |
<<<<<<<
import de.tudarmstadt.ukp.inception.recommendation.imls.core.classificationtool.ClassificationTool;
import de.tudarmstadt.ukp.inception.recommendation.imls.core.classifier.Classifier;
import de.tudarmstadt.ukp.inception.recommendation.imls.core.dataobjects.AnnotationObject;
import de.tudarmstadt.ukp.inception.r... |
<<<<<<<
public static TupleQuery generateCandidateQuery(RepositoryConnection conn, String tokens,
int limit)
=======
public static TupleQuery generateCandidateQuery(RepositoryConnection conn, List<String>
tokens, int limit, IRI aDescriptionIri)
>>>>>>>
public static TupleQuery generateCan... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.