conflict_resolution
stringlengths
27
16k
<<<<<<< List<Action> actions = new ArrayList<Action>(); actions.add(AddContentTagAction.getInstance()); ======= List<Action> actions = new ArrayList<>(); actions.add(TagAbstractFileAction.getInstance()); actions.addAll(ContextMenuExtensionPoint.getActions()); >>>>>>> L...
<<<<<<< } catch (NoCurrentCaseException ex) { logger.log(Level.SEVERE, "Exception while getting open case.", ex); //NON-NLS } ======= } catch (NoCurrentCaseException ex) { logger.log(Level.SEVERE, "Exception while getting open case.", ex); //NON-NLS } >>>>>>> } catch...
<<<<<<< ======= import java.io.File; import java.text.NumberFormat; import javax.swing.DefaultComboBoxModel; import javax.swing.JFileChooser; import javax.swing.JFormattedTextField; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; >>>>>>> import java.io.File; import javax.swing.JFil...
<<<<<<< ======= NewCaseVisualPanel2 currentComponent = getComponent(); final String caseNumber = currentComponent.getCaseNumber(); final String examiner = currentComponent.getExaminer(); try { SwingUtilities.invokeLater(new Runnable() { @Override ...
<<<<<<< + " END) AS last60," + " SUM(CASE " + " WHEN artifact_type_id = " + TSK_WEB_ACCOUNT_TYPE.getTypeID() + " THEN 1 " + " ELSE 0 " + " END) AS countOfKnownAccountType...
<<<<<<< .append("</td><td>").append(jobTotals.processTime).append("</td></tr>\n"); detailsSb.append("<tr><td>").append( ======= .append("</td><td>").append(processTime.get()).append("</td></tr>\n"); //NON-NLS detailsSb.append("<tr><td>").append( //NON-NL...
<<<<<<< return "MD5 Hash"; } }, ObjectID { @Override public String toString() { return "Object ID"; ======= return NbBundle.getMessage(this.getClass(), "AbstractAbstractFileNode.md5HashColLbl"); >>>>>>> ...
<<<<<<< import org.sleuthkit.datamodel.EventType; import org.sleuthkit.datamodel.TimelineEvent; ======= import org.sleuthkit.datamodel.TimelineEventType; >>>>>>> import org.sleuthkit.datamodel.TimelineEvent; import org.sleuthkit.datamodel.TimelineEventType; <<<<<<< Map<CombinedEventGroup, List<Time...
<<<<<<< import java.util.Objects; import org.sleuthkit.autopsy.centralrepository.datamodel.EamArtifactInstance.KnownStatus; ======= import org.sleuthkit.datamodel.TskData; >>>>>>> import java.util.Objects; import org.sleuthkit.datamodel.TskData;
<<<<<<< import org.sleuthkit.autopsy.coreutils.ImageUtils; ======= >>>>>>> import org.sleuthkit.autopsy.coreutils.ImageUtils; <<<<<<< public class MediaViewImagePanel extends JPanel { private static final Logger LOGGER = Logger.getLogger(MediaViewImagePanel.class.getName()); private final boolean fxInited...
<<<<<<< import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException; import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationAttribute; ======= import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationAttributeInstance; >>>>>>> import org.sleuth...
<<<<<<< import java.util.HashMap; import java.util.LinkedHashSet; ======= >>>>>>> import java.util.HashMap; <<<<<<< outlineView.getOutline().setAutoResizeMode(JTable.AUTO_RESIZE_ALL_COLUMNS); /* * Since we are modifying the columns, we don't want to listen ...
<<<<<<< import org.sleuthkit.autopsy.corecomponentinterfaces.FileTypeViewer; ======= import org.sleuthkit.datamodel.SleuthkitCase; import org.sleuthkit.datamodel.TskCoreException; >>>>>>> import org.sleuthkit.datamodel.SleuthkitCase; import org.sleuthkit.datamodel.TskCoreException; import org.sleuthkit.autopsy.corec...
<<<<<<< /* * Copyright (C) 2012-2018 52°North Initiative for Geospatial Open Source ======= /** * Copyright (C) 2012-2018 52°North Initiative for Geospatial Open Source >>>>>>> /* * Copyright (C) 2012-2018 52°North Initiative for Geospatial Open Source <<<<<<< private AbstractFeatureEntity featureOfInterest;...
<<<<<<< ======= boolean enableOpenMultiUserCaseButton = UserPreferences.getIsMultiUserModeEnabled(); openMultiUserCaseButton.setEnabled(enableOpenMultiUserCaseButton); openMultiUserCaseLabel.setEnabled(enableOpenMultiUserCaseButton); >>>>>>> <<<<<<< ======= private void openMultiUserC...
<<<<<<< ======= import org.controlsfx.control.action.Action; import org.controlsfx.control.action.ActionUtils; >>>>>>> import org.controlsfx.control.action.Action; import org.controlsfx.control.action.ActionUtils; <<<<<<< final List<ContentTag> fileTags = tagsManager.getContentTags(file); ...
<<<<<<< // first of all, update the current path group, regardless of what grouping is in view try { DrawableFile file = getDrawableDB().getFileFromID(fileId); String pathVal = file.getDrawablePath(); GroupKey<?> pathGroupKey = new GroupKey(Drawabl...
<<<<<<< actions.add(null); // creates a menu separator actions.add(AddContentTagAction.getInstance()); actions.add(AddBlackboardArtifactTagAction.getInstance()); ======= actions.add(null); // creates a menu separator ...
<<<<<<< logger.log(Level.WARNING, "Skipping processing, module not initialized, file: {0}", abstractFile.getName()); putIngestStatus(jobId, abstractFile.getId(), IngestStatus.SKIPPED_ERROR_INDEXING); ======= logger.log(Level.WARNING, "Skipping processing, module not initialized, fi...
<<<<<<< class IngestModulesConfigWizardPanel extends ShortcutWizardDescriptorPanel { ======= class IngestModulesConfigWizardPanel implements WizardDescriptor.FinishablePanel<WizardDescriptor> { @NbBundle.Messages("IngestModulesConfigWizardPanel.name.text=Configure Ingest Modules") >>>>>>> class IngestModu...
<<<<<<< private static final String historyQuery = "SELECT moz_historyvisits.id,url,title,visit_count,(visit_date/1000000) as visit_date,from_visit,(SELECT url FROM moz_places WHERE id=moz_historyvisits.from_visit) as ref FROM moz_places, moz_historyvisits WHERE moz_places.id = moz_historyvisits.place_id AND hidden...
<<<<<<< import org.sleuthkit.autopsy.timeline.actions.Back; import org.sleuthkit.autopsy.timeline.actions.Forward; ======= import org.sleuthkit.autopsy.timeline.datamodel.FilteredEventsModel; import org.sleuthkit.autopsy.timeline.ui.IntervalSelector; >>>>>>> import org.sleuthkit.autopsy.timeline.ui.IntervalSelector;...
<<<<<<< if (IngestManager.getDefault().isIngestRunning()) { final String msg = "<html>Ingest is ongoing on another data source. Adding a new source now might slow down the current ingest.<br />Do you want to proceed and add a new data source now?</html>"; if (JOptionPane.showConfirmDialo...
<<<<<<< import org.sleuthkit.datamodel.HashHitInfo; ======= import org.sleuthkit.datamodel.SleuthkitCase; >>>>>>> import org.sleuthkit.datamodel.HashHitInfo; import org.sleuthkit.datamodel.SleuthkitCase;
<<<<<<< // Create a "Quick Tag" sub-menu. JMenu quickTagMenu = new JMenu(NbBundle.getMessage(this.getClass(), "AddTagAction.quickTag")); add(quickTagMenu); // Each tag name in the current set of tags gets its own menu item in // the "Quick Tags" sub-menu. Sel...
<<<<<<< import com.quorum.tessera.config.KeyData; import com.quorum.tessera.config.KeyVaultConfig; ======= import com.quorum.tessera.config.keypairs.ConfigKeyPair; >>>>>>> import com.quorum.tessera.config.KeyVaultConfig; import com.quorum.tessera.config.keypairs.ConfigKeyPair;
<<<<<<< public class TextFileExtractorException extends Exception { public TextFileExtractorException(String msg, Throwable ex) { super(msg, ex); } public TextFileExtractorException(String msg) { super(msg); } } /** * Return the encoding of the f...
<<<<<<< import java.awt.Component; ======= import java.awt.Image; >>>>>>> import java.awt.Component; import java.awt.Image; <<<<<<< private final List<SwingWorker<Void, Void>> thumbnailWorkers = new ArrayList<>(); private final DefaultListModel<AbstractFile> instancesListModel = new DefaultListModel<>(); =...
<<<<<<< import java.awt.Cursor; ======= import java.beans.PropertyChangeListener; >>>>>>> import java.awt.Cursor; import java.beans.PropertyChangeListener; <<<<<<< import java.util.ArrayList; ======= import java.util.EnumSet; >>>>>>> import java.util.ArrayList; import java.util.EnumSet; <<<<<<< import org.openi...
<<<<<<< try { CaseDbConnectionInfo dbInfo = UserPreferences.getDatabaseConnectionInfo(); tbDbHostname.setText(dbInfo.getHost().trim()); tbDbPort.setText(dbInfo.getPort().trim()); tbDbUsername.setText(dbInfo.getUserName().trim()); tbDbPassword.setText(d...
<<<<<<< import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil; ======= import org.sleuthkit.datamodel.TskData; >>>>>>> import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil; import org.sleuthkit.datamodel.TskData; <<<<<<< public ImportHashDatabaseWorker(String filename, EamArtifactInstance.KnownStatus...
<<<<<<< private UNCPathUtilities uncPathUtilities = new UNCPathUtilities(); ======= private long jobId; private static class IngestJobTotals { private AtomicLong totalItemsRecovered = new AtomicLong(0); private AtomicLong totalItemsWithErrors = new AtomicLong(0); private AtomicLo...
<<<<<<< import org.apache.commons.lang.math.NumberUtils; ======= >>>>>>> import org.apache.commons.lang.math.NumberUtils; <<<<<<< double upgradeSolrIndexVersion4to5(double currentIndexVersion, String solr4IndexPath, String tempResultsDir) throws AutopsyService.AutopsyServiceException, SecurityException, IOExcep...
<<<<<<< import java.nio.file.Paths; import java.util.ArrayList; ======= import java.nio.file.Paths; >>>>>>> import java.nio.file.Paths; import java.util.ArrayList; <<<<<<< import org.netbeans.api.progress.ProgressHandle; import org.netbeans.api.progress.ProgressHandleFactory; import org.opencv.core.Core; ======= ...
<<<<<<< Map<Integer, CommonAttributeValueList> interCaseCommonFiles = eamDbAttrInst.findInterCaseValuesByCount(Case.getCurrentCase()); Set<String> mimeTypesToFilterOn = getMimeTypesToFilterOn(); return new CommonAttributeCountSearchResults(interCaseCommonFiles, this.frequencyPercentageThreshold,...
<<<<<<< import java.util.Date; ======= import java.util.Collection; >>>>>>> import java.util.Date; import java.util.Collection; <<<<<<< ======= import org.apache.commons.io.FileUtils; import org.openide.util.Lookup; >>>>>>> import org.apache.commons.io.FileUtils; <<<<<<< /** * Property name for...
<<<<<<< import java.util.HashMap; ======= import java.util.Date; >>>>>>> import java.util.HashMap; import java.util.Date; <<<<<<< private javax.swing.JButton editAccountBtn; private javax.swing.JButton editAliasBtn; private javax.swing.JButton editMetadataBtn; ======= private javax.swing.JTextFiel...
<<<<<<< import java.util.ArrayList; import java.util.Arrays; import java.util.List; ======= import java.nio.charset.StandardCharsets; >>>>>>> import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.nio.charset.StandardCharsets;
<<<<<<< OSSLog.logD("[httpdnsmini] - buildUrl: " + resolveUrl); InputStream in = null; ======= OSSLog.logDebug("[httpdnsmini] - buildUrl: " + resolveUrl); >>>>>>> InputStream in = null; OSSLog.logDebug("[httpdnsmini] - buildUrl: " + resolveUrl); <<<<<<< ...
<<<<<<< // bucket所在数据中心 public String bucketLocation; ======= // bucket's location private String bucketLocation; /** * Sets bucket location * @param location */ public void setBucketLocation(String location) { this.bucketLocation = location; } /** * Gets ...
<<<<<<< ======= //import com.aliyuncs.DefaultAcsClient; //import com.aliyuncs.exceptions.ClientException; //import com.aliyuncs.http.MethodType; //import com.aliyuncs.http.ProtocolType; //import com.aliyuncs.profile.DefaultProfile; //import com.aliyuncs.profile.IClientProfile; //import com.aliyuncs.sts.model.v2015040...
<<<<<<< // 如果Bucket是私有的,需要签出有签名的URL,并指定过期时间 public void presignConstrainedURL(final Handler handler) { new Thread(new Runnable() { @Override public void run() { try { // 获取签名url,过期时间为5分钟 String url = ...
<<<<<<< // 只获取一个文件的元信息 public void headObject(final Handler handler) { // 创建同步获取文件元信息请求 ======= // Gets file's metadata public void headObject() { // Creates a request to get the file's metadata >>>>>>> // Gets file's metadata public void headObject(final Handler handler) { ...
<<<<<<< // 异步断点上传,不设置记录保存路径,只在本次上传内做断点续传 public void resumableUpload(final Handler handler) { Log.d("thread",Thread.currentThread().getName()); // 创建断点上传请求 ======= // Resumable upload without checkpoint directory. public void resumableUpload() { // Creates the request >>>>>>> ...
<<<<<<< ======= /** * Adds an instance of {@link PartSummary} * @param partSummary * PartSummary instance */ public void addPart(PartSummary partSummary) { this.parts.add(partSummary); } >>>>>>>
<<<<<<< import com.alibaba.sdk.android.oss.model.ListBucketsRequest; import com.alibaba.sdk.android.oss.model.ListBucketsResult; ======= import com.alibaba.sdk.android.oss.model.ListMultipartUploadsRequest; import com.alibaba.sdk.android.oss.model.ListMultipartUploadsResult; >>>>>>> import com.alibaba.sdk.android.os...
<<<<<<< import org.swellrt.client.editor.doodad.WidgetDoodad; ======= import org.swellrt.model.doodad.WidgetDoodad; import org.swellrt.model.doodad.WidgetModelDoodad; >>>>>>> import org.swellrt.model.doodad.WidgetDoodad;
<<<<<<< public void testUserWithNoDomainReturnAddress() throws Exception { configureRedirectString("none"); attemptLogin("frodo", "password", true); verify(resp.getWriter()).write("frodo@example.com"); } ======= public void testAnonymousLogin() throws IOException { attemptLogin("_anonymous_", "...
<<<<<<< ======= ParticipantId participantId = sessionManager.getLoggedInUser(req); if (participantId == null) { response.sendError(HttpServletResponse.SC_FORBIDDEN); return; } >>>>>>>
<<<<<<< import org.swellrt.client.editor.doodad.ExternalAnnotationHandler; import org.swellrt.client.editor.doodad.WidgetController; import org.swellrt.client.editor.doodad.WidgetDoodad; ======= import org.swellrt.model.doodad.ExternalAnnotationHandler; import org.swellrt.model.doodad.WidgetController; import org.swe...
<<<<<<< context.setMixInAnnotations(GroupMembership.class, GroupMembershipMixin.class); context.setMixInAnnotations(FamilyMember.class, FamilyMemberMixin.class); context.setMixInAnnotations(Question.class, QuestionMixin.class); context.setMixInAnnotations(QuestionOption.class, QuestionOptionMixin.class); =====...
<<<<<<< private String appSecret; private String appId; private static final String API_VERSION = "2.5"; ======= private static final String API_VERSION = "2.8"; >>>>>>> private String appSecret; private String appId; private static final String API_VERSION = "2.8";
<<<<<<< public BoundEffect addParticleToLibrary(FileHandle handle) { ======= public void addParticle(FileHandle handle) { pathMap.put(handle.name(), handle.path()); String name = handle.nameWithoutExtension(); >>>>>>> public BoundEffect addParticle(FileHandle handle) { pathMap.pu...
<<<<<<< Integer i2 = new Integer(2); static long RUN_LENGTH = 100000; // static long REFERENCE_BIPS = 48416; ======= Integer i2 = new Integer(2); static long RUN_LENGTH = 100 * 1000; // static long REFERENCE_BIPS = 48416; >>>>>>> Integer i2 = new Integer(2); static long RUN_LENGTH = 100 * 100...
<<<<<<< String expression = getExpressionWithAbsoluteStartAndEndTimeStamps(context); sb.append(MessageFormat.format("Alert {0} was triggered at {1}\n", getDisplayedName(context, context.getAlert().getName()), ======= String expression = AlertUtils.getExpressionWithAbsoluteStartAndEndTimeStamps(context); sb.ap...
<<<<<<< @Valid @XmlElement private final KeyVaultConfig azureKeyVaultConfig; public KeyConfiguration(final Path passwordFile, final List<String> passwords, final List<KeyData> keyData, final KeyVaultConfig azureKeyVaultConfig) { ======= public KeyConfiguration(final Path passwordFile, final List<...
<<<<<<< sb.append(MessageFormat.format("Alert {0} with id {1} was triggered at {2}\n", TemplateReplacement.applyTemplateChanges(context, context.getAlert().getName()), context.getAlert().getId().intValue(), ======= sb.append(MessageFormat.format("Alert {0} was triggered at {1}\n", getDisplayedName(context, contex...
<<<<<<< import com.stratio.meta2.common.data.ClusterName; import com.stratio.meta2.metadata.ClusterMetadata; import com.stratio.meta2.metadata.ConnectorAttachedMetadata; import com.stratio.meta2.metadata.DataStoreMetadata; ======= >>>>>>> import com.stratio.meta2.common.data.ClusterName;
<<<<<<< }else if(toExecute.toLowerCase().startsWith("list connectors")){ listConnectors(); }else if(toExecute.toLowerCase().startsWith(EXPLAIN_PLAN_TOKEN)){ explainPlan(toExecute); } else { ======= ...
<<<<<<< import com.stratio.meta.core.executor.StreamExecutor; import com.stratio.streaming.api.IStratioStreamingAPI; import org.apache.log4j.Logger; ======= >>>>>>> import com.stratio.meta.core.executor.StreamExecutor; import com.stratio.streaming.api.IStratioStreamingAPI; import org.apache.log4j.Logger; <<<<<<<...
<<<<<<< import com.stratio.crossdata.core.parser.Parser; ======= import com.stratio.crossdata.common.utils.Constants; >>>>>>> import com.stratio.crossdata.core.parser.Parser; import com.stratio.crossdata.common.utils.Constants;
<<<<<<< import com.stratio.meta2.common.data.TableName; import com.stratio.meta2.core.engine.validator.Validation; import com.stratio.meta2.core.engine.validator.ValidationRequirements; ======= import com.stratio.meta2.core.validator.Validation; import com.stratio.meta2.core.validator.ValidationRequirements; import c...
<<<<<<< ======= import com.stratio.meta2.common.metadata.CatalogMetadata; >>>>>>> import com.stratio.meta2.common.metadata.CatalogMetadata;
<<<<<<< import com.datastax.driver.core.ColumnMetadata; import com.datastax.driver.core.TableMetadata; import java.util.ArrayList; ======= >>>>>>> import com.datastax.driver.core.ColumnMetadata; import com.datastax.driver.core.TableMetadata; import java.util.ArrayList;
<<<<<<< import java.util.Iterator; import java.util.List; ======= >>>>>>> import java.util.Iterator;
<<<<<<< VALIDATE_PRIORITY, ======= VALIDATE_SCOPE, >>>>>>> VALIDATE_PRIORITY, VALIDATE_SCOPE,
<<<<<<< public AttachConnectorStatement(ConnectorName connectorName, ClusterName clusterName, String json, int priority, int pagination) { ======= public AttachConnectorStatement(ConnectorName connectorName, ClusterName clusterName, String json, Integer priority) { >>>>>>> public AttachConnec...
<<<<<<< import com.stratio.crossdata.common.statements.structures.AbstractRelation; ======= import com.stratio.crossdata.common.statements.structures.Operator; >>>>>>> import com.stratio.crossdata.common.statements.structures.AbstractRelation; import com.stratio.crossdata.common.statements.structures.Operator; <<<<...
<<<<<<< import com.datastax.driver.core.DataType; import com.stratio.meta.common.result.QueryResult; import com.stratio.meta.common.result.Result; import com.stratio.meta.common.utils.StringUtils; import com.stratio.meta.core.engine.EngineConfig; import com.stratio.meta.core.metadata.CustomIndexMetadata; import com.str...
<<<<<<< //Validate FROM keyspace Result result = validateKeyspaceAndTable(metadata, targetKeyspace, keyspaceInc, keyspace, tableName); if(!result.hasError() && joinInc){ if(join.getKeyspace() != null){ result = validateKeyspaceAndTable(metadata, targe...
<<<<<<< operationsC1.add(Operations.FILTER_NON_INDEXED_GET); operationsC1.add(Operations.FILTER_NON_INDEXED_LT); //Streaming connector. Set<Operations> operationsC2 = new HashSet<>(); operationsC2.add(Operations.PROJECT); operationsC2.add(Operations.SELECT_OPERATOR); ...
<<<<<<< import com.stratio.meta2.core.metadata.MetadataManager; ======= import com.stratio.meta2.core.query.MetadataValidatedQuery; >>>>>>> import com.stratio.meta2.core.metadata.MetadataManager; import com.stratio.meta2.core.query.MetadataValidatedQuery;
<<<<<<< /* * Copyright (C) 2012-2019 52°North Initiative for Geospatial Open Source ======= /** * Copyright (C) 2012-2020 52°North Initiative for Geospatial Open Source >>>>>>> /* * Copyright (C) 2012-2020 52°North Initiative for Geospatial Open Source
<<<<<<< import com.stratio.crossdata.common.statements.structures.RelationTerm; ======= import com.stratio.crossdata.common.utils.StringUtils; >>>>>>> import com.stratio.crossdata.common.statements.structures.RelationTerm; import com.stratio.crossdata.common.utils.StringUtils;
<<<<<<< import com.stratio.meta.core.utils.QueryStatus; import com.stratio.streaming.api.IStratioStreamingAPI; ======= import com.stratio.meta.common.result.QueryStatus; >>>>>>> import com.stratio.streaming.api.IStratioStreamingAPI; import com.stratio.meta.common.result.QueryStatus;
<<<<<<< import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import org.apache.log4j.Logge...
<<<<<<< // Test with CORRECT statements @Test public void validateExplainPlanForSelect() { String inputText = "EXPLAIN PLAN FOR SELECT users.name FROM demo.users;"; validateOk(inputText, "validateExplainPlanForSelect"); } @Test public void validateExplainPlanForDropIndex() { String methodName =...
<<<<<<< actorRefUri = findAnyActorRef(clusterMetadata, Status.ONLINE, Operations.CREATE_CATALOG); } catch (PlanningException pe) { LOG.debug("Cannot determine any connector for the operation: " + Operations.CREATE_CATALOG); ...
<<<<<<< ======= import static com.stratio.crossdata.common.statements.structures.SelectorType.FUNCTION; import static com.stratio.crossdata.common.statements.structures.SelectorType.RELATION; >>>>>>>
<<<<<<< import com.stratio.crossdata.core.validator.requirements.ValidationTypes; import com.stratio.crossdata.core.validator.requirements.ValidationRequirements; ======= import com.stratio.crossdata.common.utils.StringUtils; import com.stratio.crossdata.core.structures.Option; import com.stratio.crossdata.core.valid...
<<<<<<< import com.stratio.meta2.core.grid.Grid; import com.stratio.meta2.core.grid.GridInitializer; import org.apache.log4j.Logger; import org.apache.spark.SparkConf; import org.apache.spark.SparkContext; ======= >>>>>>>
<<<<<<< public NodeMetadata getNode(NodeName name) { shouldBeInit(); shouldExist(name); return (NodeMetadata) metadata.get(name); } public NodeMetadata getNodeIfExists(NodeName name) { shouldBeInit(); IMetadata iMetadata = metadata.get(name); NodeMetadata no...
<<<<<<< ======= import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; >>>>>>> import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; <<<<<<< @Test public void azureKeyPa...
<<<<<<< Set<Operations> supportedOperations) { this(name, version, dataStoreRefs, clusterProperties, Status.OFFLINE, null, requiredProperties, ======= Set<Operations> supportedOperations) throws ManifestException { this(name, version, dataStoreRefs, clusterProperties, Connector...
<<<<<<< verify(partyInfoService, times(2)).getURLFromRecipientKey(recipientKey); verify(partyInfoService).getURLFromRecipientKey(new Key("key2".getBytes())); verify(partyInfoService, times(3)).getPartyInfo(); verify(partyInfoService, times(3)).getPartyInfo(); ======= } @Test ...
<<<<<<< import com.stratio.meta.common.result.MetaResult; import com.stratio.meta.core.metadata.CustomIndexMetadata; ======= import com.stratio.meta.common.result.QueryResult; import com.stratio.meta.common.result.Result; >>>>>>> import com.stratio.meta.core.metadata.CustomIndexMetadata; <<<<<<< import com.stratio....
<<<<<<< ======= public void testQ01Crossdata() throws ManifestException { init(); String inputText = "[tpcc], " + " SELECT ol_o_id, ol_d_id,ol_w_id,sum(ol_quantity),avg(ol_quantity),sum(ol_amount) AS suma,avg(ol_amount),count(*) " + " FROM tpcc....
<<<<<<< public static final String CLUSTER = "local"; public static final String JOB_NAME = "stratioDeepWithMeta"; public static final String CASSANDRA_HOST = "localhost"; public static final int CASSANDRA_PORT = 9160; ======= public static final String cluster = "local[2]"; public static fina...
<<<<<<< ======= import com.stratio.meta.common.metadata.structures.TableMetadata; import com.stratio.meta2.common.data.ClusterName; import com.stratio.meta2.core.statements.SelectStatement; >>>>>>> import com.stratio.meta2.core.statements.SelectStatement;
<<<<<<< import com.stratio.meta2.core.query.MetadataPlannedQuery; ======= import com.stratio.meta2.core.query.MetadataInProgressQuery; import com.stratio.meta2.core.query.MetadataPlannedQuery; >>>>>>> import com.stratio.meta2.core.query.MetadataInProgressQuery; import com.stratio.meta2.core.query.MetadataPlannedQuer...
<<<<<<< logger.debug("TRACE: Validating = " + this.toString()); ======= >>>>>>> logger.debug("TRACE: Validating = " + this.toString()); <<<<<<< logger.debug("TRACE: Relation = " + relation.toString()); logger.debug("TRACE: relation.getIdentifiers().get(0).getTable = " + relation.getId...
<<<<<<< protected ArrayList< ArrayList<TrackNode<K>> > trackSegments = null; /** Stores whether the default cost matrices from the paper should be used, * or if the user will supply their own. */ protected boolean defaultCosts = true; ======= protected ArrayList< ArrayList<Spot> > trackSegments = null; >>>>>>>...
<<<<<<< public ConfigureViewsDescriptor( final TrackMate trackmate, final FeatureColorGenerator< Spot > spotColorGenerator, final PerEdgeFeatureColorGenerator edgeColorGenerator, final PerTrackFeatureColorGenerator trackColorGenerator, final ManualSpotColorGenerator manualSpotColorGenerator, final ManualEdgeColorGener...
<<<<<<< import net.imglib2.Cursor; import net.imglib2.algorithm.region.localneighborhood.AbstractNeighborhood; import net.imglib2.algorithm.region.localneighborhood.DiscNeighborhood; import net.imglib2.algorithm.region.localneighborhood.SphereNeighborhood; import net.imglib2.img.ImgPlus; ======= >>>>>>> <<<<<<< f...
<<<<<<< final Logger logger = Logger.IJ_LOGGER; // logPanel.getLogger(); if ( null == arg0 ) ======= final Logger logger = Logger.IJ_LOGGER; // logPanel.getLogger(); if ( null == filePath ) >>>>>>> final Logger logger = Logger.IJ_LOGGER; // logPanel.getLogger(); if ( null == filePath ) <<<<<<< if ( ...
<<<<<<< ======= import net.imagej.ImgPlus; import net.imglib2.meta.view.HyperSliceImgPlus; import net.imglib2.type.NativeType; import net.imglib2.type.numeric.RealType; import org.scijava.Priority; >>>>>>> import org.scijava.Priority; <<<<<<< @Plugin( type = SpotAnalyzerFactory.class, priority = -1d ) ======= @P...
<<<<<<< public void testOptionalVarOnFunctionType() throws Throwable { doTest(true); } ======= public void testShiftRightAssign() throws Throwable { doTest(true); } public void testNestedTypedClassesAssignment() throws Throwable { doTest(true); } public void testUnsignedShiftRightAssign()...
<<<<<<< ======= import com.github.nexus.api.Nexus; import com.github.nexus.configuration.ConfigurationParser; import com.github.nexus.configuration.PropertyLoader; >>>>>>> import com.github.nexus.api.Nexus; import com.github.nexus.configuration.ConfigurationParser; import com.github.nexus.configuration.PropertyLoad...
<<<<<<< import com.intellij.plugins.haxe.model.HaxeMemberModel; import com.intellij.plugins.haxe.model.HaxeMethodModel; import com.intellij.plugins.haxe.model.type.HaxeTypeResolver; import com.intellij.plugins.haxe.model.type.SpecificTypeReference; import com.intellij.plugins.haxe.util.*; import com.intellij.psi.*; ==...
<<<<<<< IElementType CONSTRUCTOR_NAME = new HaxeElementType("CONSTRUCTOR_NAME"); ======= IElementType CONDITIONAL = new HaxeElementType("CONDITIONAL"); >>>>>>> IElementType CONDITIONAL = new HaxeElementType("CONDITIONAL"); IElementType CONSTRUCTOR_NAME = new HaxeElementType("CONSTRUCTOR_NAME"); <<<<<<< IE...