conflict_resolution
stringlengths
27
16k
<<<<<<< protected void validateNode() throws InvalidIntermediateQueryException { getRootNode().validateNode(getChildren()); } @Override public IQTree acceptTransformer(IQTransformer transformer) { ======= public IQTree acceptTransformer(IQTreeVisitingTransformer transformer) { >>>>>>> ...
<<<<<<< int length = QueryFactory.createSPARQLs_three_concepts_opt(Settings.dbType).size(); runQueries(conn, Lists.newArrayList(QueryFactory.createSPARQLs_three_concepts_opt(Settings.dbType).get(length-1))); ======= // int length = QueryFactory.createSPARQLs_three_concepts(Settings.dbType).siz...
<<<<<<< ======= import com.google.common.base.Joiner; >>>>>>> import com.google.common.base.Joiner; <<<<<<< import org.semanticweb.ontop.ontology.Assertion; import org.semanticweb.ontop.owlrefplatform.core.basicoperations.UriTemplateMatcher; ======= import org.semanticweb.ontop.model.impl.OBDADataFactoryImpl; i...
<<<<<<< public ImmutableTerm visitBlank(BlankContext ctx) { if (ctx.BLANK_NODE_FUNCTION() != null){ ======= public Term visitBlank(BlankContext ctx) { if (ctx.BLANK_NODE_FUNCTION() != null) { >>>>>>> public ImmutableTerm visitBlank(BlankContext ctx) { if (ctx.BLANK_NODE_FUNCTION()...
<<<<<<< public void setupInVirtualMode(Collection<OBDAMappingAxiom> mappings, Connection localConnection, VocabularyValidator vocabularyValidator, TBoxReasoner reformulationReasoner, Ontology inputOntology, TMappingExclusionConfig excludeFromTMappings) throws SQLException, JSQLParserException, OBDAException { ===...
<<<<<<< import it.unibz.inf.ontop.model.vocabulary.SPARQL; import it.unibz.inf.ontop.model.vocabulary.XPathFunction; import it.unibz.inf.ontop.model.vocabulary.XSD; import it.unibz.inf.ontop.utils.ImmutableCollectors; ======= >>>>>>> import it.unibz.inf.ontop.model.vocabulary.SPARQL; import it.unibz.inf.ontop.model....
<<<<<<< import it.unibz.inf.ontop.exception.OntopUnsupportedInputQueryException; import it.unibz.inf.ontop.injection.IntermediateQueryFactory; ======= >>>>>>> import it.unibz.inf.ontop.injection.IntermediateQueryFactory; <<<<<<< this.atomFactory = atomFactory; this.termFactory = termFactory; this.iqFactory = ...
<<<<<<< import it.unibz.inf.ontop.iq.IQTree; import it.unibz.inf.ontop.iq.transform.NoNullValueEnforcer; import it.unibz.inf.ontop.model.type.TypeFactory; ======= import it.unibz.inf.ontop.model.term.TermFactory; >>>>>>> import it.unibz.inf.ontop.iq.IQTree; import it.unibz.inf.ontop.iq.transform.NoNullValueEnforcer;...
<<<<<<< import java.awt.Color; import java.awt.Component; import java.awt.event.KeyEvent; import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; import java.util.Vector; import java...
<<<<<<< <<<<<<< HEAD:ontop-protege/src/main/java/it/unibz/inf/ontop/protege/panels/OBDAPreferencesPanel.java import it.unibz.inf.ontop.protege.core.ProtegeOBDAPreferences; ======= import it.unibz.inf.ontop.utils.OBDAPreferences; >>>>>>> v3/package-names-changed:ontop-protege/src/main/java/it/unibz/inf/ontop/protege/pan...
<<<<<<< ======= import it.unibz.inf.ontop.io.ModelIOManager; import it.unibz.inf.ontop.model.OBDADataFactory; import it.unibz.inf.ontop.model.OBDAException; import it.unibz.inf.ontop.model.OBDAModel; import it.unibz.inf.ontop.model.impl.OBDADataFactoryImpl; import it.unibz.inf.ontop.owlrefplatform.core.QuestConstants...
<<<<<<< public boolean composeTerms(Term term1, Term term2) { throw new UnsupportedOperationException(); } @Override public boolean composeFunctions(Function term1, Function term2) { throw new UnsupportedOperationException(); } @Override public boolean compose(Substitution ...
<<<<<<< import com.google.inject.Inject; import it.unibz.inf.ontop.exception.MappingIOException; import it.unibz.inf.ontop.injection.MappingFactory; import it.unibz.inf.ontop.mapping.MappingMetadata; import it.unibz.inf.ontop.model.Function; import it.unibz.inf.ontop.model.UriTemplateMatcher; ======= import com.googl...
<<<<<<< import it.unibz.inf.ontop.owlrefplatform.injection.QuestCorePreferences; import it.unibz.inf.ontop.rdf4j.repository.OntopVirtualRepository; ======= import it.unibz.inf.ontop.injection.QuestCoreSettings; import it.unibz.inf.ontop.sesame.SesameVirtualRepo; >>>>>>> import it.unibz.inf.ontop.injection.QuestCoreS...
<<<<<<< ======= import it.unibz.inf.ontop.io.ModelIOManager; import it.unibz.inf.ontop.model.OBDADataFactory; import it.unibz.inf.ontop.model.OBDAModel; import it.unibz.inf.ontop.model.impl.OBDADataFactoryImpl; >>>>>>> <<<<<<< import it.unibz.inf.ontop.owlrefplatform.owlapi3.*; import junit.framework.TestCase; ===...
<<<<<<< private DummyRDBMetadata(AtomFactory atomFactory, TermFactory termFactory, TypeFactory typeFactory, DatalogFactory datalogFactory) { ======= private DummyRDBMetadata(TypeFactory typeFactory, JdbcTypeMapper jdbcTypeMapper) { >>>>>>> private DummyRDBMetadata(TypeFactory...
<<<<<<< import it.unibz.inf.ontop.model.atom.AtomFactory; import it.unibz.inf.ontop.model.atom.DistinctVariableOnlyDataAtom; import it.unibz.inf.ontop.model.term.TermFactory; import it.unibz.inf.ontop.model.term.Variable; import it.unibz.inf.ontop.model.term.functionsymbol.Predicate; ======= >>>>>>> import it.unibz....
<<<<<<< import java.util.HashMap; import java.util.Map; import java.util.Properties; ======= import java.util.List; >>>>>>> import java.util.HashMap; import java.util.Map; import java.util.List;
<<<<<<< import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import it.unibz.krdb.obda.model.AlgebraOperatorPredicate; import it.unibz.krdb.obda.model.BooleanOperationPredicate; import it.unibz.krdb.obda.model.CQIE; import it.unibz.krdb.obda.model.Constant; import it.unibz.krdb.obda...
<<<<<<< public Ontology translateAndClassify(Collection<OWLOntology> ontologies) { log.debug("Load ontologies called. Translating {} ontologies.", ontologies.size()); ======= public static Ontology translateAndClassify(OWLOntology owl) { >>>>>>> public Ontology translateAndClassify(OWLOntolog...
<<<<<<< UriTemplateMatcher.create(Stream.of(), TERM_FACTORY, TYPE_FACTORY), null, ATOM_FACTORY, TERM_FACTORY, TYPE_FACTORY, DATALOG_FACTORY, IMMUTABILITY_TOOLS); ======= UriTemplateMatcher.create(Stream.of(), TERM_FACTORY), null, ATOM_FACTORY, TERM_FACTORY, ...
<<<<<<< import org.semanticweb.ontop.model.CQIE; import org.semanticweb.ontop.model.Function; import org.semanticweb.ontop.model.OBDADataFactory; import org.semanticweb.ontop.model.Predicate; import org.semanticweb.ontop.model.Term; import org.semanticweb.ontop.model.ValueConstant; import org.semanticweb.ontop.model.Va...
<<<<<<< import it.unibz.inf.ontop.model.term.TermFactory; ======= import it.unibz.inf.ontop.model.term.ImmutableTerm; >>>>>>> import it.unibz.inf.ontop.model.term.ImmutableTerm; import it.unibz.inf.ontop.model.term.TermFactory;
<<<<<<< import it.unibz.krdb.sql.QuotedIDFactory; import it.unibz.krdb.sql.api.AllComparison; import it.unibz.krdb.sql.api.AnyComparison; import it.unibz.krdb.sql.api.ParsedSQLQuery; ======= import it.unibz.krdb.sql.api.*; >>>>>>> import it.unibz.krdb.sql.QuotedIDFactory; import it.unibz.krdb.sql.api.*; <<<<<<< imp...
<<<<<<< import it.unibz.inf.ontop.model.term.TermFactory; ======= import it.unibz.inf.ontop.iq.optimizer.MappingIQNormalizer; >>>>>>> import it.unibz.inf.ontop.iq.optimizer.MappingIQNormalizer; import it.unibz.inf.ontop.model.term.TermFactory; <<<<<<< private final TermFactory termFactory; ======= private...
<<<<<<< public QuestOWLFactory createQueryOWLFactory(String mappingFile) throws Exception { /* * Creating the instance of the reasoner using the factory. Remember * that the RDBMS that contains the data must be already running and * accepting connections. The HelloWorld and Books tutorials at our wiki ...
<<<<<<< private Constant getConstant(ProjectionElem node, TupleResultSet resSet) throws OBDAException { Constant constant = null; String node_name = node.getSourceName(); ValueExpr ve = null; if (extMap != null) { ve = extMap.get(node_name); if (v...
<<<<<<< private ImmutableSet<Variable> nullableVariables = null; @Nullable private Boolean isDistinct = null; ======= private ImmutableSet<Variable> nullableVariables; @Nullable private ImmutableSet<ImmutableSubstitution<NonVariableTerm>> possibleVariableDefinitions; >>>>>>> private Immut...
<<<<<<< private static final long serialVersionUID = 500873858691854474L; ======= private final Predicate predicate; >>>>>>> private static final long serialVersionUID = 500873858691854474L; <<<<<<< private IRI iri; // private final AnnotationPropertyDomainImpl domain; // private final AnnotationPropertyRange...
<<<<<<< : typeFactory.getOptionalDatatype(rdfFactory.createIRI(datatype.stringValue())) .orElseGet(typeFactory::getUnsupportedDatatype); c2 = termFactory.getRDFLiteralConstant(l.getLabel(), type); ======= ...
<<<<<<< /** * Constructor used in cases where unwrapping-with-name-change has been * invoked and lookup indices need to be updated. */ protected BeanDeserializerBase(BeanDeserializerBase src, UnwrappedPropertyHandler unwrapHandler, BeanPropertyMap renamedProperties, bool...
<<<<<<< import it.unibz.inf.ontop.iq.node.normalization.AscendingSubstitutionNormalizer; import it.unibz.inf.ontop.iq.node.normalization.AscendingSubstitutionNormalizer.AscendingSubstitutionNormalization; import it.unibz.inf.ontop.iq.transform.IQTransformer; ======= import it.unibz.inf.ontop.iq.transform.IQTreeVisiti...
<<<<<<< import it.unibz.inf.ontop.datalog.DatalogFactory; import it.unibz.inf.ontop.dbschema.*; ======= import it.unibz.inf.ontop.datalog.Datalog2QueryMappingConverter; import it.unibz.inf.ontop.datalog.IntermediateQuery2DatalogTranslator; import it.unibz.inf.ontop.datalog.impl.IntermediateQuery2DatalogTranslatorImpl...
<<<<<<< String newSourceQuery = getInstantiatedSQL(m.source.getSQLQuery(), templateColumns, values); IRIConstant predicateTerm = termFactory.getConstantIRI( rdfFactory.createIRI(getPredicateName(templateAtom.getTerm(0), values))); ======= // Cannot build an IRI out of nulls if (value...
<<<<<<< import it.unibz.inf.ontop.model.type.*; ======= import it.unibz.inf.ontop.model.type.NumericRDFDatatype; import it.unibz.inf.ontop.model.type.RDFDatatype; import it.unibz.inf.ontop.model.type.TypeFactory; import it.unibz.inf.ontop.model.vocabulary.OntopInternal; >>>>>>> import it.unibz.inf.ontop.model.type.*...
<<<<<<< ======= import it.unibz.inf.ontop.io.ModelIOManager; import it.unibz.inf.ontop.model.OBDADataFactory; import it.unibz.inf.ontop.model.OBDAModel; import it.unibz.inf.ontop.model.impl.OBDADataFactoryImpl; >>>>>>> import it.unibz.inf.ontop.model.OBDADataFactory; import it.unibz.inf.ontop.model.OBDAModel; import...
<<<<<<< import it.unibz.krdb.obda.model.BuiltinPredicate; ======= >>>>>>> <<<<<<< import it.unibz.krdb.obda.ontology.PropertyExpression; import it.unibz.krdb.obda.ontology.SomeValuesFrom; import it.unibz.krdb.obda.owlrefplatform.core.basicoperations.CQContainmentCheckUnderLIDs; import it.unibz.krdb.obda.owlrefpla...
<<<<<<< ======= import org.semanticweb.ontop.exception.InvalidMappingException; import org.semanticweb.ontop.exception.InvalidPredicateDeclarationException; import org.semanticweb.ontop.io.ModelIOManager; >>>>>>> import org.semanticweb.ontop.exception.DuplicateMappingException; import org.semanticweb.ontop.exception...
<<<<<<< Multimap<Predicate, List<Integer>> pkeys = HashMultimap.create(); ======= Map<Predicate, List<Integer>> pkeys = new HashMap<>(); >>>>>>> Multimap<Predicate, List<Integer>> pkeys = HashMultimap.create(); <<<<<<< // primary keys List<Integer> pkeyIdx = new LinkedList<Integer>()...
<<<<<<< package it.unibz.krdb.obda.owlrefplatform.core.dagjgrapht; import it.unibz.krdb.obda.ontology.Description; import it.unibz.krdb.obda.ontology.Ontology; import java.util.Set; /** * This is the interface for the class TBoxReasoner where we are able to retrieve all the connection built in our DAG * * */...
<<<<<<< import xyz.elevated.frequency.check.impl.fly.*; ======= import xyz.elevated.frequency.check.impl.fly.FlyA; import xyz.elevated.frequency.check.impl.fly.FlyB; import xyz.elevated.frequency.check.impl.fly.FlyC; import xyz.elevated.frequency.check.impl.fly.FlyD; import xyz.elevated.frequency.check.impl.hitbox.Hi...
<<<<<<< RESPONSE_TYPE_NOT_FOUND(BAD_REQUEST.value(), "response_type not found", BadRequestException.class), ROLE_ALREADY_EXIST(BAD_REQUEST.value(), "Role already exist!", BadRequestException.class); ======= RESPONSE_TYPE_NOT_FOUND(BAD_REQUEST.value(), "response_type not found", BadRequestException.class...
<<<<<<< RESPONSE_TYPE_NOT_FOUND(BAD_REQUEST.value(), "response_type not found", BadRequestException.class), CORS_INTERCEPTOR_NOT_API_LIFE_CYCLE(BAD_REQUEST.value(), "The CORS Interceptor must of Lifecycle type API", BadRequestException.class), CORS_INTERCEPTOR_ALREADY_ASSIGNED_TO_THIS_API(BAD_REQUEST.valu...
<<<<<<< ======= /** * Helper method for detecting Java14-added new {@code Record} types * * @since 2.12 */ public static boolean isRecordType(Class<?> cls) { Class<?> parent = cls.getSuperclass(); return (parent != null) && "java.lang.Record".equals(parent.getName()); }...
<<<<<<< package br.com.conductor.heimdall.core.dto.persist; /*- * =========================LICENSE_START================================== * heimdall-core * ======================================================================== * Copyright (C) 2018 Conductor Tecnologia SA * ====================================...
<<<<<<< import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.n52.iceland.i18n.I18NDAO; ======= import org.n52.iceland.ds.I18NDAO; import org.n52.iceland.exception.ows.OwsExceptionReport; >>>>>>> import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.n52.iceland.exception.ows.OwsExceptio...
<<<<<<< import java.time.LocalDateTime; import br.com.conductor.heimdall.core.util.LocalDateTimeSerializer; import com.fasterxml.jackson.databind.annotation.JsonSerialize; ======= >>>>>>> import java.time.LocalDateTime; import br.com.conductor.heimdall.core.util.LocalDateTimeSerializer; import com.fasterxml.jackso...
<<<<<<< Api api = new Api(10L, "foo", "v1", "fooDescription", "/foo", false, LocalDateTime.now(), new LinkedList<Resource>(), Status.ACTIVE, null, null, environments, null, null); ======= Api api = new Api(10L, "foo", "v1", "fooDescription", "/foo", LocalDateTime.now(), new HashSet<>(), Status.ACT...
<<<<<<< public static final String PRIVILEGE_READ_LDAP = "hasAuthority('READ_LDAP')"; public static final String PRIVILEGE_UPDATE_LDAP = "hasAuthority('UPDATE_LDAP')"; ======= public static final String PRIVILEGE_READ_METRICS = "hasAuthority('READ_METRICS')"; >>>>>>> public static final Str...
<<<<<<< private BookmarkReader reader; private HashMap<String, HashMap<Integer, ArrayList<Long>>> userTagTimes ; ======= private BookmarkReader userTweetReader; private BookmarkReader socialTweetReader; private HashMap<String, HashMap<String, ArrayList<Long>>> userTagTimes ; >>>>>>> private S...
<<<<<<< import minegame159.meteorclient.utils.Utils; import net.minecraft.client.gui.screen.ingame.HandledScreen; ======= import net.minecraft.client.gui.screen.ingame.ContainerScreen; import net.minecraft.container.SlotActionType; >>>>>>> import net.minecraft.client.gui.screen.ingame.HandledScreen; <<<<<<< ...
<<<<<<< if (FriendManager.INSTANCE.attack((PlayerEntity) entity)) { render(event, entity, playersColor.get()); }else{ render(event, entity, friendsColor.get()); } } else { switch (entity.getTy...
<<<<<<< @Inject(method = "applyFog", at = @At("HEAD"), cancellable = true) private static void onApplyFog(Camera camera, BackgroundRenderer.FogType fogType, float viewDistance, boolean thickFog, CallbackInfo info) { if (ModuleManager.INSTANCE.isActive(AntiFog.class) || ModuleManager.INSTANCE.isActive(XR...
<<<<<<< import net.minecraft.text.LiteralText; import net.minecraft.text.OrderedText; ======= >>>>>>> import net.minecraft.text.LiteralText; import net.minecraft.text.OrderedText; <<<<<<< @Shadow public abstract int getWidth(); @Shadow @Final private List<ChatHudLine<Text>> messages; ======= @Shadow ...
<<<<<<< if (Asimov.get() && !(mc.currentScreen instanceof HandledScreen<?>)) { ======= if ((Asimov.get() || noTotems) && !(mc.currentScreen instanceof ContainerScreen<?>)) { >>>>>>> if ((Asimov.get() || noTotems) && !(mc.currentScreen instanceof HandledScreen<?>)) {
<<<<<<< import minegame159.meteorclient.utils.InvUtils; import minegame159.meteorclient.utils.Utils; ======= import minegame159.meteorclient.utils.Chat; >>>>>>> import minegame159.meteorclient.utils.InvUtils; import minegame159.meteorclient.utils.Chat;
<<<<<<< import minegame159.meteorclient.events.RenderEvent; import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.Camera; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.math.Quaternion; ======= import org.lwjgl.opengl.GL11; >>>>>>> import net.minecraft.client.u...
<<<<<<< drawInfo("FPS: ", ((IMinecraftClient) MinecraftClient.getInstance()).getFps() + "", y); y += Utils.getTextHeight() + 2; ======= drawInfo("FPS: ", MinecraftClient.getCurrentFps() + "", y); y += MeteorClient.FONT.getHeight() + 2; >>>>>>> drawInfo("FPS...
<<<<<<< ======= import net.minecraft.client.gui.screen.ChatScreen; import net.minecraft.client.gui.screen.Screen; >>>>>>> import net.minecraft.client.gui.screen.ChatScreen; import net.minecraft.client.gui.screen.Screen; <<<<<<< if (ModuleManager.INSTANCE.isActive(InvMove.class)) { InputU...
<<<<<<< if (delayLeft > 0) { delayLeft--; return; } else { delayLeft = delay.get(); } if(place.get()) { Iterator<AbstractClientPlayerEntity> validEntities = mc.world.getPlayers().stream() .filter(FriendManager.INSTANCE:...
<<<<<<< import net.minecraft.client.util.math.Matrix4f; ======= import net.minecraft.client.render.Camera; import net.minecraft.entity.Entity; >>>>>>> import net.minecraft.client.render.Camera; import net.minecraft.entity.Entity; import net.minecraft.client.util.math.Matrix4f; <<<<<<< public static int getTextW...
<<<<<<< Map<Enchantment, Integer> enchantments = EnchantmentHelper.get(itemStack); ======= Map<Enchantment, Integer> enchantments = EnchantmentHelper.getEnchantments(itemStack); Map<Enchantment, Integer> enchantmentsToShowScale = new HashMap<>(); for (En...
<<<<<<< private Listener<TickEvent> onTick = new Listener<>(event -> { if (onlyOnGround.get() && !mc.player.isOnGround()) return; ======= private final Listener<TickEvent> onTick = new Listener<>(event -> { if (onlyOnGround.get() && !mc.player.onGround) return; >>>>>>> private final Liste...
<<<<<<< import minegame159.meteorclient.modules.render.NoRender; ======= import minegame159.meteorclient.utils.Outlines; >>>>>>> import minegame159.meteorclient.modules.render.NoRender; import minegame159.meteorclient.utils.Outlines; <<<<<<< import net.minecraft.client.util.math.MatrixStack; import net.minecraft.en...
<<<<<<< Vec3d vec2 = entity.getPos().add(0, entity.getEyeHeight(entity.getPose()), 0); double y = (entity.getBoundingBox().y2 - entity.getBoundingBox().y1) / 2.0; RenderUtils.line(vec1.x - (mc.cameraEntity.getX() - event.offsetX), vec1.y - (mc.cameraEntity.getY() - event.offsetY), vec1.z - (mc.c...
<<<<<<< import minegame159.meteorclient.modules.ModuleManager; import minegame159.meteorclient.modules.movement.SafeWalk; import minegame159.meteorclient.modules.movement.Scaffold; ======= import net.minecraft.entity.ItemEntity; >>>>>>> import minegame159.meteorclient.modules.ModuleManager; import minegame159.meteor...
<<<<<<< for(int i = 9; i < 36; i++){ if(material.get() == materialPreference.None && mc.player.inventory.getStack(i).getItem().getClass() == mc.player.getMainHandStack().getItem().getClass() && (mc.player.inventory.getStack(i).getMaxDamage() - mc.player.inventory.getS...
<<<<<<< import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.util.math.Vector3f; ======= >>>>>>> import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.util.math.Vector3f; <<<<<<< import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Matrix4f; =...
<<<<<<< import minegame159.meteorclient.utils.Utils; import net.minecraft.client.gui.screen.ingame.HandledScreen; ======= import net.minecraft.client.gui.screen.ingame.ContainerScreen; import net.minecraft.container.SlotActionType; >>>>>>> import net.minecraft.client.gui.screen.ingame.HandledScreen;
<<<<<<< if (entity instanceof EndCrystalEntity && mc.player.distanceTo(entity) < range.get()) { ======= if (entity instanceof EnderCrystalEntity && mc.player.distanceTo(entity) < range.get() && crystalLog.get()) { >>>>>>> if (entity instanceof EndCrystalEntity && mc.player.distanc...
<<<<<<< import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.core.JacksonException; ======= >>>>>>> import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.core.JacksonException; <<<<<<< * A {@link TypeDeserializer} capable of deducing polymorphic types ba...
<<<<<<< private static final DimensionType THE_NETHER = ((IDimensionType) DimensionType.getOverworldDimensionType()).getNether(); private static final DimensionType THE_END = ((IDimensionType) DimensionType.getOverworldDimensionType()).getEnd(); private final SettingGroup sgGeneral = settings.getDefaultGro...
<<<<<<< for(BlockEntity entity : mc.world.blockEntities){ if(entity instanceof BedBlockEntity && Utils.distance(entity.getPos().getX(), entity.getPos().getY(), entity.getPos().getZ(), mc.player.getX(), mc.player.getY(), mc.player.getZ()) <= breakRange.get()){ currentDamage = DamageCa...
<<<<<<< import net.minecraft.client.util.ChatMessages; ======= >>>>>>> import net.minecraft.client.util.ChatMessages; <<<<<<< @Shadow public abstract void addMessage(Text message); @Shadow private boolean hasUnreadNewMessages; @Inject(at = @At("HEAD"), method = "addMessage(Lnet/minecraft/text/StringRe...
<<<<<<< for (int j = 9; j < 45; j++) { if (mc.player.inventory.getStack(j).getItem() == stack.getItem()) { ======= for (int j = 9; j < mc.player.inventory.main.size(); j++) { if (mc.player.inventory.getInvStack(j).getItem() == sta...
<<<<<<< import minegame159.meteorclient.utils.Utils; import net.minecraft.client.gui.screen.ingame.HandledScreen; ======= import net.minecraft.client.gui.screen.ingame.ContainerScreen; import net.minecraft.container.SlotActionType; >>>>>>> import net.minecraft.client.gui.screen.ingame.HandledScreen; <<<<<<< pri...
<<<<<<< import net.minecraft.client.util.math.MatrixStack; ======= import net.minecraft.item.ItemStack; import net.minecraft.item.Items; >>>>>>> import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.client.util.math.MatrixStack; <<<<<<< private void onBobViewWhenHurt(MatrixS...
<<<<<<< if (MC.currentScreen == null) return; GenericContainerScreenHandler container = ((GenericContainerScreen) MC.currentScreen).getScreenHandler(); ======= if (!(MC.currentScreen instanceof GenericContainerScreen)) return; GenericContainer container = ((GenericContainerScreen) MC.c...
<<<<<<< mc.getItemRenderer().renderGuiItemIcon(itemStack, x, y); if(!itemStack.isEmpty()) { ======= mc.getItemRenderer().renderGuiItem(itemStack, x, y); if(!itemStack.isEmpty() && itemStack.isDamageable()) { >>>>>>> m...
<<<<<<< public static final Events Events = com.backendless.Events.getInstance(); ======= public static final Commerce Commerce = com.backendless.Commerce.getInstance(); >>>>>>> public static final Events Events = com.backendless.Events.getInstance(); public static final Commerce Commerce = com.backendless.C...
<<<<<<< if (a instanceof AnnotatedConstructor) { if (_java7Helper != null) { Boolean b = _java7Helper.hasCreatorAnnotation(a); if (b != null) { return b.booleanValue(); ======= // 19-Apr-2016, tatu: As per [databind#1197], [databind...
<<<<<<< ======= initialFill(); } private void initialFill() { addHeader( HeadersManager.HeadersEnum.APP_ID_NAME, Backendless.getApplicationId() ); addHeader( HeadersManager.HeadersEnum.SECRET_KEY_NAME, Backendless.getSecretKey() ); >>>>>>> initialFill(); } private void initialFill() {
<<<<<<< String implName = ai.findImplicitPropertyName(_config, f); ======= String implName = ai.findImplicitPropertyName(f); >>>>>>> String implName = ai.findImplicitPropertyName(_config, f); <<<<<<< /* 18-Aug-2011, tatu: As per existing unit tests, we should only...
<<<<<<< public Map<String, Object> loadMetadata( final String pointId ) { BackendlessGeoQuery query = null; if( pointId.matches( "^[1-9]\\d*$" ) ) { query = Backendless.Cache.get( Messaging.DEVICE_ID + "." + BackendlessGeoQuery.class.getSimpleName(), BackendlessGeoQuery.class ); } return (...
<<<<<<< ======= import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.Serializable; >>>>>>> import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.Serializable; <<<<<<< ======= import org.apache....
<<<<<<< ======= /** * Add an observation to the encounter. In this case, no codes are added to the observation. * It appears that some code in Synthea likes it this way (and does not like good old OO-style * encapsulation). * @param time The time of the observation * @param type The type...
<<<<<<< if (!person.alive(time)) { return true; } ======= // If the payerHistory at the current age is null, they must get insurance for the new year. // Note: This means the person will check to change insurance yearly, just after their // birthday. if (person.getPayerAtTime(time) ...
<<<<<<< import java.util.stream.Collectors; import org.hl7.fhir.r4.model.Address; import org.hl7.fhir.r4.model.AllergyIntolerance; ======= import org.hl7.fhir.r4.model.*; >>>>>>> import java.util.stream.Collectors; import org.hl7.fhir.r4.model.Address; import org.hl7.fhir.r4.model.AllergyIntolerance; import org....
<<<<<<< /** * Copy-constructor that is useful for sub-classes that just want to * copy all super-class properties without modifications. */ protected BeanSerializerBase(BeanSerializerBase src) { this(src, src._props, src._filteredProps); } public BeanSerializerBase(BeanSerializer...
<<<<<<< @Test public void testAppWithModuleFilter() throws Exception { TestHelper.exportOff(); Config.set("test_key", "pre-test value"); String[] args = {"-s", "0", "-p", "0", "-m", "copd" + pathSeparator + "allerg*"}; final PrintStream original = System.out; final ByteArrayOutputStream out = n...
<<<<<<< ======= import java.util.List; >>>>>>>
<<<<<<< import java.util.ArrayList; ======= import java.nio.file.Path; import java.nio.file.Paths; import java.util.HashMap; >>>>>>> import java.util.ArrayList; import java.util.HashMap; <<<<<<< import org.mitre.synthea.modules.QualityOfLifeModule; import org.mitre.synthea.modules.WeightLossModule; ======= import...
<<<<<<< import java.nio.file.Path; import java.nio.file.Paths; import java.util.HashMap; ======= >>>>>>> import java.nio.file.Path; import java.nio.file.Paths; import java.util.HashMap; <<<<<<< import org.mitre.synthea.helpers.Config; ======= import org.mitre.synthea.TestHelper; >>>>>>> import org.mitre.synthea....
<<<<<<< long encounter_end = encounter.stop > 0 ? encounter.stop : encounter.stop + TimeUnit.MINUTES.toMillis(15); ======= long encounter_end = encounter.stop > 0 ? encounter.stop : encounter.start + TimeUnit.MINUTES.toMillis(15); >>>>>>> long encounter_end = encounter.stop > 0 ? encounter.stop : en...
<<<<<<< ======= boolean isRHNeg = person.rand() < 0.15; attributes.put("RH_NEG", isRHNeg); >>>>>>> boolean isRHNeg = person.rand() < 0.15; attributes.put("RH_NEG", isRHNeg);
<<<<<<< public abstract class Exporter { /** * Export a single patient, into all the formats supported. * (Formats may be enabled or disabled by configuration) * * @param person Patient to export * @param stopTime Time at which the simulation stopped */ public static void export(Person person, long stopT...
<<<<<<< Provider.loadProviders(location); // Initialize Payers if (Boolean.parseBoolean(Config.get("generate.health_insurance", "false"))) { Payer.loadPayers(location); } else { Payer.loadNoInsurance(); } ======= Provider.loadProviders(location, options.clinicianSeed); >>>>>>> ...
<<<<<<< ======= import com.fasterxml.jackson.databind.type.LogicalType; import java.math.BigDecimal; import java.math.BigInteger; >>>>>>> <<<<<<< ======= * * @since 2.8 >>>>>>> <<<<<<< @Override public ValueInstantiator createContextual(DeserializationContext ctxt, Bea...
<<<<<<< import java.math.BigDecimal; import java.math.MathContext; import java.math.RoundingMode; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.UUID; import org.hl7.fhi...
<<<<<<< // Track if we renewed meds at this encounter. Used in State.java encounter state. public boolean chronicMedsRenewed; ======= public String clinicalNote; >>>>>>> // Track if we renewed meds at this encounter. Used in State.java encounter state. public boolean chronicMedsRenewed; publi...