conflict_resolution
stringlengths
27
16k
<<<<<<< @API(help = "Number of columns picked at each split") final int mtries; @API(help = "Sample rate") final float sample_rate; @API(help = "Seed") final long seed; public DRFModel(Key key, Key dataKey, Key testKey, String names[], String domains[][], String[] cmDomain, int ntrees, int max_depth, in...
<<<<<<< public double getd( long i ) { return elem2BV(elem2ChunkIdx(i)).atd(i); } ======= public double getd( long i ) { throw H2O.unimpl(); } public boolean isNA( long i ) { return elem2BV(elem2ChunkIdx(i)).isNA(i); } >>>>>>> public double getd( long i ) { return elem2BV(elem2ChunkIdx(i)).atd(i); } public...
<<<<<<< @Override protected void registered() { super.registered(); Argument c = find("ignored_cols_by_name"); Argument r = find("response"); int ci = _arguments.indexOf(c); int ri = _arguments.indexOf(r); _arguments.set(ri, c); _arguments.set(ci, r); } @Override p...
<<<<<<< @API(help = "Compute variable importance (true/false).", filter = Default.class ) protected boolean importance = false; // compute variable importance // Overall prediction Mean Squared Error as I add trees transient protected double _errs[]; ======= >>>>>>> @API(help = "Compute variable importan...
<<<<<<< private Split( int col, int bin, boolean equal, long n0, long n1, double mse0, double mse1, float preds0[], float preds1[] ) { _col = col; _bin = bin; _equal = equal; _nrows = new long[] { n0, n1 }; _mses = new double[] { mse0, mse1 }; _preds = new float[][] { preds0, pr...
<<<<<<< ======= import com.google.gson.JsonObject; >>>>>>> import com.google.gson.JsonObject; <<<<<<< ======= @Override protected JsonObject toJSON() { JsonObject jo = super.toJSON(); jo.addProperty("mtry_computed", _mtry); return jo; } >>>>>>> @Override protected JsonObject toJSON() { ...
<<<<<<< import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; ======= import static water.util.Utils.difference; import static water.util.Utils.isEmpty; import java.io.PrintWriter; import java.io.StringWriter; import java.util.Arrays; >>>>>>> import com.google.gson.JsonObject; import com.google....
<<<<<<< sc==null ? null : (_nclass>1? new ConfusionMatrix(sc._cm):null), varimp, varimpSD, sc==null ? null : (_nclass==2 ? toCMArray(sc._cms) : null) ); ======= sc==null ? null : (_nclas...
<<<<<<< Interop.register(new RGLM()); ======= Interop.register(new KmeansScore()); >>>>>>> Interop.register(new RGLM()); Interop.register(new KmeansScore());
<<<<<<< String RESTEASY_GZIP_MAX_INPUT = "resteasy.gzip.max.input"; ======= String RESTEASY_SECURE_RANDOM_MAX_USE = "resteasy.secure.random.max.use"; >>>>>>> String RESTEASY_GZIP_MAX_INPUT = "resteasy.gzip.max.input"; String RESTEASY_SECURE_RANDOM_MAX_USE = "resteasy.secure.random.max.use";
<<<<<<< List<TileData<Double>> data = _pyramidIO.readTiles(_pyramidId, _serializer, Collections.singleton(index), null); ======= List<TileData<Double>> data = null; if (null != _serializer) { data ...
<<<<<<< public <PT> PT getPropertyValue (ConfigurationProperty<PT> property) { if (!super.getPropertyValue(property).equals(property.getDefaultValue())) { return super.getPropertyValue(property); // Give precedence to overrides in server config } else if (LAYER_MAXIMUM.equals(property)) { ======= public <PT>...
<<<<<<< @RequiresApi(api = Build.VERSION_CODES.M) private void checkPermissions() { final String[] permissionsForRequest = getPermissionsForRequest(); if (permissionsForRequest.length > 0) { activity.requestPermissions(permissionsForRequest, PERMISSION_REQUEST_CODE); } else {...
<<<<<<< import com.redhat.ceylon.compiler.typechecker.tree.Tree.AndOp; import com.redhat.ceylon.compiler.typechecker.tree.Tree.BinaryOperatorExpression; import com.redhat.ceylon.compiler.typechecker.tree.Tree.Element; import com.redhat.ceylon.compiler.typechecker.tree.Tree.ElementOrRange; import com.redhat.ceylon.compi...
<<<<<<< ======= case CeylonParser.EQEQ: { // FIXME: op0 and op1 are evaluated twice. If these have side- // effects, this is a nasty bug. JCExpression op0 = convertExpression(operands[0]); JCExpression op1 = convertExpression(operands[1]); J...
<<<<<<< private LazyValue makeToplevelAttribute(ClassMirror classMirror) { LazyValue value = new LazyValue(classMirror, this); ======= protected Declaration makeToplevelAttribute(ClassMirror classMirror) { Value value = new LazyValue(classMirror, this); >>>>>>> protected LazyValue makeTop...
<<<<<<< import com.redhat.ceylon.compiler.typechecker.tree.Tree.SwitchStatement; import com.redhat.ceylon.compiler.typechecker.tree.Tree.Switched; ======= import com.redhat.ceylon.compiler.typechecker.tree.Tree.Variable; >>>>>>> import com.redhat.ceylon.compiler.typechecker.tree.Tree.Switched; import com.redhat.ceyl...
<<<<<<< if (model != null && Decl.isToplevel(model) ======= serialization(klass, objectClassBuilder); TypeDeclaration decl = model.getType().getDeclaration(); if (Decl.isToplevel(model) >>>>>>> serialization(klass, objectClassBuilder); ...
<<<<<<< assertBug659ShowInheritedMembers(destDir); ======= assertSequencedParameter(destDir); >>>>>>> assertBug659ShowInheritedMembers(destDir); assertSequencedParameter(destDir); <<<<<<< assertBug659ShowInheritedMembers(destDir); ======= assertSequencedParameter(de...
<<<<<<< .klass(this, false, "module_", null) ======= .klass(this, "module", null) >>>>>>> .klass(this, "module_", null) <<<<<<< .klass(this, false, "package_", null) ======= .klass(this, "$package", null) >>>>>>> .kla...
<<<<<<< @Test public void testSwitchInlineVar(){ compareWithJavaSource("swtch/SwitchInlineVar"); } ======= @Test public void testSwitchNarrowedElse(){ compile("swtch/FooBar.ceylon"); compareWithJavaSource("swtch/SwitchNarrowedElse"); } >>>>>>> @Test p...
<<<<<<< JCExpression n = make(expr).Literal(lit.value.longValue()); result = make(expr).Apply (null, makeSelect("ceylon", "Natural", "instance"), ======= JCExpression n = make.Literal(lit.value.longValue()); result = at(expr).Apply (null, makeSelect("cey...
<<<<<<< if ((sendFeeDto.getSendFeeCount().get() >= lastFeePayingSendCount) && !((lastFeePayingSendingCountOptional.isPresent()) && (lastFeePayingSendCount - 1 == lastFeePayingSendingCountOptional.get()))) { ======= if ((sendFeeDto.getSendFeeCount().get() >= sendCount) && !((lastFeePa...
<<<<<<< LabelDecorator.applyWrappingLabel(transactionConstructionStatusSummary, Languages.safeText(CoreMessageKey.CHANGE_PASSWORD_WORKING)); transactionConstructionStatusDetail.setText(""); transactionBroadcastStatusSummary.setText(""); transactionBroadcastStatusDetail.setText(""); ======= SwingU...
<<<<<<< import org.multibit.hd.ui.views.components.renderers.AmountBTCTableCellRenderer; import org.multibit.hd.ui.views.components.renderers.PaymentTypeTableCellRenderer; import org.multibit.hd.ui.views.components.renderers.RAGStatusTableCellRenderer; import org.multibit.hd.ui.views.components.renderers.TrailingJustif...
<<<<<<< stone("dark_pearl_ore", 3, 6, MaterialColor.OBSIDIAN), darkPearl("dark_pearl_block", 3, 6, MaterialColor.BLACK), stone("archaic_ore", 3, 6, MaterialColor.OBSIDIAN), glass("archaic_glass"), glassPanel("archaic_glass_pane") ======= stone("d...
<<<<<<< } else if (o.getClass() == BigDecimal.class) { stmt.setBigDecimal(count, (BigDecimal)o); } ======= paramtext = paramtext + "::"+o; }else if (o.getClass() == Long.class) { stmt.setLong(count, (Long) o); paramtext = paramtext + "::"+o; ...
<<<<<<< ======= >>>>>>> <<<<<<< ======= import org.hibernate.param.ParameterSpecification; import org.hibernate.persister.collection.CollectionPropertyNames; import org.hibernate.internal.util.collections.ArrayHelper; >>>>>>> <<<<<<< import org.hibernate.util.ArrayHelper; import org.jboss.logging.Logger; ===...
<<<<<<< ======= import org.hibernate.internal.util.collections.ArrayHelper; import org.hibernate.testing.junit.RequiresDialect; >>>>>>> import org.hibernate.internal.util.collections.ArrayHelper; <<<<<<< import org.hibernate.testing.junit.RequiresDialect; import org.hibernate.util.ArrayHelper; ======= >>>>>>> im...
<<<<<<< ======= import org.hibernate.internal.util.StringHelper; >>>>>>> <<<<<<< import org.hibernate.util.StringHelper; import org.jboss.logging.Logger; ======= import org.hibernate.param.CollectionFilterKeyParameterSpecification; >>>>>>> import org.jboss.logging.Logger;
<<<<<<< import org.hibernate.HibernateLogger; import org.hibernate.util.DTDEntityResolver; import org.jboss.logging.Logger; ======= import org.hibernate.internal.util.xml.DTDEntityResolver; >>>>>>> import org.hibernate.HibernateLogger; import org.hibernate.internal.util.xml.DTDEntityResolver; import org.jboss.loggi...
<<<<<<< ======= import org.hibernate.HibernateException; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.NamingStrategy; import org.hibernate.internal.util.collections.ArrayHelper; import org.hibernate.internal.util.ReflectHelper; import org.apache.tools.ant.BuildException; import org.apache.tools....
<<<<<<< ======= import org.hibernate.engine.jdbc.spi.SqlStatementLogger; import org.hibernate.internal.util.ReflectHelper; import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; import org.hibernate.service.jdbc.dialect.spi.DialectFactory; >>>>>>> <<<<<<< import org.hibernate.internal.util.jdbc.TypeI...
<<<<<<< import org.hibernate.util.ConfigHelper; import org.hibernate.util.StringHelper; import org.jboss.logging.Logger; ======= import org.hibernate.internal.util.ConfigHelper; import org.hibernate.internal.util.StringHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.net.URL; import java....
<<<<<<< ======= import java.io.Reader; >>>>>>>
<<<<<<< import java.io.IOException; import java.io.InvalidObjectException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.ObjectStreamException; import java.io.Serializable; import java.sql.Connection; import java.util.ArrayList; import java.util.Collections; import java.util.HashMa...
<<<<<<< import org.hibernate.type.Type; import org.hibernate.util.StringHelper; import antlr.collections.AST; ======= import org.hibernate.internal.util.StringHelper; import org.hibernate.HibernateException; >>>>>>> import org.hibernate.internal.util.StringHelper; import org.hibernate.type.Type; import antlr.collect...
<<<<<<< import org.hibernate.util.StringHelper; import org.jboss.logging.Logger; ======= import org.hibernate.internal.util.StringHelper; >>>>>>> import org.jboss.logging.Logger;
<<<<<<< ======= import org.hibernate.internal.util.collections.ArrayHelper; >>>>>>> import org.hibernate.internal.util.collections.ArrayHelper;
<<<<<<< import org.hibernate.util.ReflectHelper; import org.hibernate.util.StringHelper; import org.jboss.logging.Logger; ======= import org.hibernate.internal.util.ReflectHelper; import org.hibernate.internal.util.StringHelper; >>>>>>> import org.hibernate.internal.util.ReflectHelper; import org.hibernate.internal....
<<<<<<< ======= >>>>>>>
<<<<<<< package org.hibernate.jdbc; ======= package org.hibernate.jdbc; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.hibernate.StaleStateException; import org.hibernate.HibernateException; import org.hibernate.engine.ExecuteUpdateResultCheckStyle; import org.hibernate.engine.jdbc.spi.SqlExcept...
<<<<<<< ======= import org.hibernate.internal.util.config.ConfigurationHelper; import org.hibernate.internal.util.ReflectHelper; >>>>>>>
<<<<<<< import org.hibernate.util.ConfigHelper; import org.hibernate.util.StringHelper; import org.jboss.logging.Logger; ======= import org.slf4j.Logger; import org.slf4j.LoggerFactory; >>>>>>> import org.jboss.logging.Logger;
<<<<<<< import java.util.Map; ======= >>>>>>> import java.util.Map;
<<<<<<< import org.hibernate.ejb.EntityManagerLogger; import org.hibernate.util.StringHelper; import org.jboss.logging.Logger; ======= import org.hibernate.internal.util.StringHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; >>>>>>> import org.hibernate.ejb.EntityManagerLogger; import org.hibernate....
<<<<<<< import org.hibernate.proxy.HibernateProxy; ======= import org.hibernate.internal.util.SerializationHelper; >>>>>>> import org.hibernate.internal.util.SerializationHelper; import org.hibernate.proxy.HibernateProxy; <<<<<<< import org.hibernate.util.SerializationHelper; ======= import org.hibernate.proxy.Hi...
<<<<<<< import org.hibernate.util.StringHelper; import org.jboss.logging.Logger; ======= import org.hibernate.internal.util.StringHelper; import java.util.ArrayList; import java.util.HashSet; import java.util.Set; >>>>>>> import org.hibernate.internal.util.StringHelper; import org.jboss.logging.Logger;
<<<<<<< import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.engine.jdbc.spi.SQLExceptionHelper; import org.hibernate.engine.jdbc.spi.SQLStatementLogger; import org.hibernate.internal.util.jdbc.TypeInfo; ======= import org.hibernate.engine.jdbc.spi.SqlExceptionHelper; import org.hibernate.engine.jd...
<<<<<<< ======= import org.hibernate.ConnectionReleaseMode; import org.hibernate.HibernateException; import org.hibernate.JDBCException; import org.hibernate.engine.jdbc.internal.proxy.ProxyBuilder; import org.hibernate.engine.jdbc.spi.ConnectionObserver; import org.hibernate.engine.jdbc.spi.JdbcResourceRegistry; im...
<<<<<<< ======= import org.hibernate.dialect.PostgreSQLDialect; >>>>>>>
<<<<<<< import org.hibernate.util.ReflectHelper; import org.jboss.logging.Logger; import com.mchange.v2.c3p0.DataSources; ======= import org.hibernate.internal.util.ReflectHelper; >>>>>>> import org.jboss.logging.Logger; import com.mchange.v2.c3p0.DataSources;
<<<<<<< ======= import org.hibernate.engine.LoadQueryInfluencers; import org.hibernate.internal.util.collections.ArrayHelper; >>>>>>> import org.hibernate.internal.util.collections.ArrayHelper; <<<<<<< import org.hibernate.util.ArrayHelper; import org.jboss.logging.Logger; ======= >>>>>>> import org.jboss.loggin...
<<<<<<< ======= import org.hibernate.internal.util.ReflectHelper; >>>>>>>
<<<<<<< import java.io.Serializable; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; ======= >>>>>...
<<<<<<< ======= import org.hibernate.engine.loading.LoadContexts; import org.hibernate.internal.util.collections.IdentityMap; import org.hibernate.pretty.MessageHelper; >>>>>>> <<<<<<< import org.hibernate.util.IdentityMap; import org.hibernate.util.MarkerObject; import org.jboss.logging.Logger; ======= import or...
<<<<<<< ======= >>>>>>>
<<<<<<< import java.io.Serializable; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Types; import java.util.Properties; ======= >>>>>>> import java.io.Serializable; import java.sql.Connection; import java.sql.PreparedStatement...
<<<<<<< import java.util.Map; import org.hibernate.util.StringHelper; ======= import org.hibernate.internal.util.StringHelper; >>>>>>> import java.util.Map; import org.hibernate.internal.util.StringHelper;
<<<<<<< ======= import org.hibernate.internal.util.ReflectHelper; import org.hibernate.testing.junit.functional.FunctionalTestCase; >>>>>>> import org.hibernate.internal.util.ReflectHelper;
<<<<<<< import java.io.Serializable; import java.util.List; import java.util.Map; ======= >>>>>>> import java.io.Serializable; import java.util.List; import java.util.Map;
<<<<<<< import org.jboss.logging.Logger; ======= import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.jdbc.LobCreationContext; import org.hibernate.engine.transaction.spi.TransactionContext; import org.hibernate.event.EventSource; >>>>>>> import org.hibernate.engine.SessionImplementor; import ...
<<<<<<< ======= import org.hibernate.internal.util.SerializationHelper; import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; >>>>>>> import org.hibernate.internal.util.SerializationHelper; <<<<<<< import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate...
<<<<<<< ======= import org.hibernate.Hibernate; import org.hibernate.JDBCException; import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.criterion.Restrictions; import org.hibernate.test.annotations.TestCase; >>>>>>> <<<<<<< import org.hibernate.Hibernate; import org.hibernate.JD...
<<<<<<< import javax.transaction.TransactionManager; import org.hibernate.ConnectionReleaseMode; ======= import java.sql.Connection; >>>>>>> import org.hibernate.ConnectionReleaseMode; <<<<<<< ======= import org.hibernate.ConnectionReleaseMode; import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibern...
<<<<<<< import javax.persistence.ManyToOne; ======= import javax.persistence.SecondaryTable; >>>>>>> import javax.persistence.ManyToOne; import javax.persistence.SecondaryTable;
<<<<<<< ======= import java.util.Iterator; import java.util.Collection; import org.hibernate.internal.util.collections.IdentityMap; >>>>>>>
<<<<<<< ======= import org.hibernate.dialect.Dialect; >>>>>>>
<<<<<<< import org.hibernate.util.StringHelper; import antlr.SemanticException; import antlr.collections.AST; ======= import org.hibernate.internal.util.StringHelper; import java.util.List; >>>>>>> import antlr.SemanticException; import antlr.collections.AST;
<<<<<<< ======= >>>>>>> <<<<<<< ======= import org.slf4j.Logger; import org.slf4j.LoggerFactory; >>>>>>> <<<<<<< import org.hibernate.persister.PersisterClassProvider; ======= >>>>>>>
<<<<<<< import org.hibernate.util.StringHelper; import org.jboss.logging.Logger; ======= import org.hibernate.internal.util.StringHelper; >>>>>>> import org.hibernate.internal.util.StringHelper; import org.jboss.logging.Logger;
<<<<<<< package org.hibernate.test.insertordering; import java.sql.PreparedStatement; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import junit.framework.Test; import org.hibernate.Session; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernat...
<<<<<<< package org.hibernate.test.jpa.lock; import junit.framework.Test; import org.hibernate.LockMode; import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.dialect.HSQLDialect; import org.hibernate.test.jpa.AbstractJPATest; import org.hibernate.test.jpa.Item; import org.hibernate.test....
<<<<<<< import org.hibernate.util.ComparableComparator; import org.infinispan.transaction.tm.BatchModeTransactionManager; ======= import javax.transaction.TransactionManager; import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.uti...
<<<<<<< import org.hibernate.util.ReflectHelper; import org.jboss.logging.Logger; ======= import org.hibernate.internal.util.ReflectHelper; >>>>>>> import org.jboss.logging.Logger;
<<<<<<< ======= import org.hibernate.internal.util.StringHelper; import org.hibernate.dialect.Dialect; import org.hibernate.classic.Session; >>>>>>>
<<<<<<< ======= import org.hibernate.engine.LoadQueryInfluencers; import org.hibernate.internal.util.collections.ArrayHelper; >>>>>>> import org.hibernate.internal.util.collections.ArrayHelper;
<<<<<<< import org.hibernate.util.ArrayHelper; import org.hibernate.util.CollectionHelper; import org.hibernate.util.ConfigHelper; import org.hibernate.util.JoinedIterator; import org.hibernate.util.ReflectHelper; import org.hibernate.util.SerializationHelper; import org.hibernate.util.StringHelper; import org.hibernat...
<<<<<<< import org.hibernate.util.ReflectHelper; import org.hibernate.util.StringHelper; import org.jboss.logging.Logger; ======= import org.hibernate.internal.util.ReflectHelper; >>>>>>> import org.jboss.logging.Logger;
<<<<<<< ======= >>>>>>>
<<<<<<< import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import org.hibernate.AssertionFailure; import org.hibernate.HibernateException; import org.hibernate.HibernateLogger; import org.hibernate.engine.jd...
<<<<<<< ======= import org.hibernate.internal.util.ReflectHelper; import org.hibernate.mapping.PersistentClass; >>>>>>> import org.hibernate.internal.util.ReflectHelper; <<<<<<< import org.hibernate.mapping.PersistentClass; import org.hibernate.util.ReflectHelper; import org.jboss.logging.Logger; ======= >>>>>>>...
<<<<<<< import org.hibernate.util.XMLHelper; import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.SAXNotSupportedException; ======= >>>>>>> import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.SAXNotSupportedException;
<<<<<<< import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLWarning; import java.sql.Statement; import java.util.Collections; import java.util.List; ======= import antlr.RecognitionException; import antlr.collections.AST; >>>>>>> import java.sql.Connection; import java.sql.PreparedSt...
<<<<<<< import org.hibernate.param.CollectionFilterKeyParameterSpecification; ======= import org.hibernate.internal.util.collections.ArrayHelper; >>>>>>> import org.hibernate.internal.util.StringHelper; import org.hibernate.internal.util.collections.ArrayHelper; import org.hibernate.param.CollectionFilterKeyParamete...
<<<<<<< ======= import org.hibernate.MappingException; >>>>>>> <<<<<<< import org.hibernate.engine.SessionFactoryImplementor; ======= import org.hibernate.internal.util.collections.CollectionHelper; >>>>>>> import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.internal.util.collections.Coll...
<<<<<<< ======= import org.hibernate.internal.util.SerializationHelper; import org.hibernate.internal.util.collections.JoinedIterator; import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; >>>>>>> <<<<<<< import org.hibernate.util.JoinedIterator; import org.hibernate.util.SerializationHelper; =====...
<<<<<<< ======= import org.hibernate.engine.SessionImplementor; import org.hibernate.envers.RevisionType; >>>>>>> <<<<<<< import org.hibernate.envers.RevisionType; ======= import org.hibernate.type.IntegerType; >>>>>>> import org.hibernate.engine.SessionImplementor; import org.hibernate.envers.RevisionType; im...
<<<<<<< import java.lang.reflect.Method; import org.hibernate.util.ReflectHelper; ======= import org.hibernate.internal.util.ReflectHelper; >>>>>>> import java.lang.reflect.Method; import org.hibernate.internal.util.ReflectHelper;
<<<<<<< import org.hibernate.engine.query.sql.NativeSQLQuerySpecification; ======= import org.hibernate.engine.transaction.spi.TransactionContext; import org.hibernate.engine.transaction.spi.TransactionEnvironment; import java.io.Serializable; import java.util.List; >>>>>>> import org.hibernate.engine.query.sql.Nat...
<<<<<<< import com.tagtraum.perf.gcviewer.model.GCResource; ======= import com.tagtraum.perf.gcviewer.util.NumberParser; >>>>>>> import com.tagtraum.perf.gcviewer.model.GCResource; import com.tagtraum.perf.gcviewer.util.NumberParser;
<<<<<<< import com.tagtraum.perf.gcviewer.model.GCResource; import com.tagtraum.perf.gcviewer.util.ParsePosition; ======= import com.tagtraum.perf.gcviewer.util.ParseInformation; >>>>>>> import com.tagtraum.perf.gcviewer.model.GCResource; import com.tagtraum.perf.gcviewer.util.ParseInformation; <<<<<<< private ...
<<<<<<< package com.tagtraum.perf.gcviewer.imp; import java.io.IOException; import java.io.InputStream; import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; import java.util.logging.Level; import com.tagtraum.perf.gcviewer.model.AbstractGCEv...
<<<<<<< registerLootTable(MnBlocks.ARCHAIC_ORE, block -> droppingItemWithFortune(block, MnItems.ARCHAIC_SHARD)); registerSilkTouch(MnBlocks.ARCHAIC_GLASS); registerSilkTouch(MnBlocks.ARCHAIC_GLASS_PANE); ======= registerDropSelfLootTable(MnBlocks.TENEBRUM_ORE); registerDropSe...
<<<<<<< ======= private static Logger LOG = Logger.getLogger(AbstractDataReaderSun.class.getName()); >>>>>>> <<<<<<< ======= /** the reader accessing the log file */ protected BufferedReader in; >>>>>>> <<<<<<< } ======= } >>>>>>> } <<<...
<<<<<<< import java.io.IOException; import java.io.InputStream; import java.io.UnsupportedEncodingException; import java.util.StringTokenizer; import java.util.logging.Level; import com.tagtraum.perf.gcviewer.model.AbstractGCEvent; import com.tagtraum.perf.gcviewer.model.AbstractGCEvent.Type; import com.tagtraum.perf....
<<<<<<< import com.tagtraum.perf.gcviewer.model.GCResource; ======= import com.tagtraum.perf.gcviewer.util.NumberParser; >>>>>>> import com.tagtraum.perf.gcviewer.model.GCResource; import com.tagtraum.perf.gcviewer.util.NumberParser;
<<<<<<< import java.io.File; import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.util.logging.Level; import java.util.logging.Logger; import com.tagtraum.perf.gcviewer.ctrl.GCViewerGuiController; ======= import java.io.File; import java.io.IOException; import java.util.logging...
<<<<<<< DataReader dataReader = null; long nextPos = 0; String chunkOfLastLine = null; int attemptCount = 0; while (attemptCount < MAX_ATTEMPT_COUNT) { in.mark(FOUR_KB + (int) nextPos); if (nextPos > 0) { long skipped = in.skip(nextPos); ...
<<<<<<< ======= private static final Logger IMP_LOGGER = Logger.getLogger("com.tagtraum.perf.gcviewer.imp"); private static final Logger DATA_READER_FACTORY_LOGGER = Logger.getLogger("com.tagtraum.perf.gcviewer.DataReaderFactory"); private final DateTimeFormatter dateTimeFormatter = AbstractDataReaderSun...