conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
using System;
=======
#region license
// Copyright (C) 2020 ClassicUO Development Community on Github
//
// This project is an alternative client for the game Ultima Online.
// The goal of this is to develop a lightweight client considering
// new technologies.
//
// This program is free software: you c... |
<<<<<<<
private StbTextBox _autoOpenCorpseRange;
private Checkbox _buffBarTime,_castSpellsByOneClick, _queryBeforAttackCheckbox, _spellColoringCheckbox, _spellFormatCheckbox;
=======
private TextBox _autoOpenCorpseRange;
private Checkbox _buffBarTime,_castSpellsByOneClick, _queryBeforA... |
<<<<<<<
using Composite.Data;
=======
using Composite.Core.WebClient.Services.WampRouter;
>>>>>>>
using Composite.Core.WebClient.Services.WampRouter;
using Composite.Data; |
<<<<<<<
s_DistortionBuffer = Shader.PropertyToID("_DistortionTexture");
s_DistortionBufferRT = new RenderTargetIdentifier(s_DistortionBuffer);
=======
m_DistortionBuffer = Shader.PropertyToID("_DistortionTexture");
>>>>>>>
m_DistortionBuffer = Shader.PropertyToID("_Dis... |
<<<<<<<
input = GetComponent<AIInput>();
controller.collisions.OnLeftWall += OnLeftWall;
controller.collisions.OnRightWall += OnRightWall;
=======
controller.collisions.onLeftWall += onLeftWall;
controller.collisions.onRightWall += onRightWall;
>>>>>>>
input = GetComponent<AIInput>();
controller... |
<<<<<<<
/// Calls <see cref="Win32Interop.SetWindowThemeAttribute"/> to set various attributes on the window.
/// </summary>
/// <param name="attributes">Attributes to set on the window.</param>
private void SetWindowThemeAttributes(WTNCA attributes)
{
if (!IsComposit... |
<<<<<<<
vCache = (from cv in _db.CommentSaveTrackers.AsNoTracking()
join c in _db.Comments on cv.CommentID equals c.ID
where c.SubmissionID == submissionID && cv.UserName.Equals(User.Identity.Name, StringComparison.OrdinalIgnoreCase)
=======
... |
<<<<<<<
clientMock.Verify(x => x.GetStatusAsync(It.IsAny<OrchestrationStatusQueryCondition>(), It.IsAny<CancellationToken>()));
=======
clientMock.Verify(x => x.GetStatusAsync(createdTimeFrom, createdTimeTo, runtimeStatus, pageSize, continuationToken, It.IsAny<CancellationToken>()));
... |
<<<<<<<
// Todo:
// - implement history missing
=======
using static CommandRights;
>>>>>>>
using static CommandRights;
<<<<<<<
public PlayManager PlayManager { get; private set; }
=======
public WebDisplay WebInterface { get; private set; }
>>>>>>>
public WebDisplay WebInterface { get; private set;... |
<<<<<<<
path = null;
=======
this.path = GetDefaultPath();
>>>>>>>
this.path = null; |
<<<<<<<
private static readonly int DEFAULT_DURATION = 200;
=======
// bool used to determine if cancel was called during vibrateWithPattern
private bool cancelWasCalled = false;
>>>>>>>
private static readonly int DEFAULT_DURATION = 200;
// bool used to determine if cancel w... |
<<<<<<<
using Gate.Helpers;
=======
using System;
using System.Collections.Generic;
using Gate;
using Gate.Helpers;
>>>>>>>
using System;
using System.Collections.Generic;
using Gate;
using Gate.Helpers; |
<<<<<<<
/*
* extension methods take an AppDelegate factory func and it's associated parameters
*/
=======
>>>>>>>
/*
* extension methods take an AppDelegate factory func and it's associated parameters
*/ |
<<<<<<<
var facade = FacadeServiceResolver.Current.Service.CreateFacade(null); // fixme
=======
var uniqueTypes = new HashSet<string>();
>>>>>>>
var uniqueTypes = new HashSet<string>();
var facade = FacadeServiceResolver.Current.Service.CreateFacade(null); // fixme
<<... |
<<<<<<<
ModelsBuilderBackOfficeController.GenerateModels(appData, config.EnableDllModels ? bin : null);
=======
ModelsBuilderController.GenerateModels(appData, config.ModelsMode.IsAnyDll() ? bin : null);
>>>>>>>
ModelsBuilderBackOfficeController.GenerateModels(appData, config.Mod... |
<<<<<<<
[assembly: AssemblyCopyright("Copyright © 2014 John Gietzen")]
[assembly: AssemblyVersion("4.0.0.0")]
[assembly: AssemblyFileVersion("4.0.0.0")]
=======
[assembly: AssemblyCopyright("Copyright © 2015 John Gietzen")]
[assembly: AssemblyVersion("3.2.0.0")]
[assembly: AssemblyFileVersion("3.2.0.0")]
>>>>>>>
[as... |
<<<<<<<
[Browsable(false)]
=======
>>>>>>> |
<<<<<<<
using NutzCode.CloudFileSystem;
using Directory = System.IO.Directory;
=======
using JMMServer.Commands.TvDB;
>>>>>>>
using NutzCode.CloudFileSystem;
using Directory = System.IO.Directory;
using JMMServer.Commands.TvDB; |
<<<<<<<
using NutzCode.CloudFileSystem;
=======
using Path = Pri.LongPath.Path;
using Directory = Pri.LongPath.Directory;
using DirectoryInfo = Pri.LongPath.DirectoryInfo;
using File = Pri.LongPath.File;
>>>>>>>
using Path = Pri.LongPath.Path;
using Directory = Pri.LongPath.Directory;
using DirectoryInfo = Pri.LongP... |
<<<<<<<
ret.MediaContainer.Title1 = ret.MediaContainer.Title2 = basegrp.GroupName;
List<AnimeSeries> sers2 = grp.GetSeries(session);
ret.MediaContainer.Art = KodiHelper.GetRandomFanartFromSeries(sers2, session);
foreach (Ani... |
<<<<<<<
using NutzCode.CloudFileSystem;
using CrossRef_File_Episode = JMMServer.Entities.CrossRef_File_Episode;
=======
using Path = Pri.LongPath.Path;
using File = Pri.LongPath.File;
using FileInfo = Pri.LongPath.FileInfo;
>>>>>>>
using Path = Pri.LongPath.Path;
using File = Pri.LongPath.File;
using FileInfo = Pri.... |
<<<<<<<
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using NutzCode.CloudFileSystem;
=======
using FluentNHibernate.Utils;
using JMMContracts;
>>>>>>>
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Media;
using System.Wi... |
<<<<<<<
if (!string.IsNullOrEmpty(anim.AllTags))
{
v.Tags = new List<Tag> { new Tag { Value = anim.AllTags.Replace("|", ",") } };
}
... |
<<<<<<<
private static void UpdateSchema_050(int currentVersionNumber)
{
int thisVersion = 50;
if (currentVersionNumber >= thisVersion) return;
if (currentVersionNumber >= thisVersion) return;
logger.Info("Updating schema to VERSION: {0}", thisVersion);... |
<<<<<<<
$"React has not been loaded correctly: missing ({String.Join(result, ", ")})." +
"Please expose your version of React as global variables named " +
"'React', 'ReactDOM' and 'ReactDOMServer', or enable the 'LoadReact'" +
"configuration option to use the built-in version of React."
=======
... |
<<<<<<<
using Autofac;
=======
using Microsoft.Practices.Unity;
using Newtonsoft.Json;
>>>>>>>
using Autofac;
using Newtonsoft.Json; |
<<<<<<<
var exporters = new List<NVPair>() {
new NVPair(ExporterType.BRSTM, "BRSTM"),
new NVPair(ExporterType.BCSTM, "BCSTM"),
new NVPair(ExporterType.BFSTM, "BFSTM"),
new NVPair(ExporterType.DSP, "DSP"),
new NVPair(ExporterType.IDSP, "IDSP"),
new NVPair(Ex... |
<<<<<<<
public static async Task RunAsync(Options o) {
=======
public static void Run(Options o, bool showEndDialog = true) {
>>>>>>>
public static async Task RunAsync(Options o, bool showEndDialog = true) {
<<<<<<<
new VGMImporter(ConfigurationManager.AppSettings["vgmplay_path"]),
=======
new VGM... |
<<<<<<<
case "BxstmCodec":
o.BxstmCodec = (BxstmCodec)Enum.Parse(typeof(BxstmCodec), v, true);
break;
=======
case nameof(o.AACEncodingParameters):
... |
<<<<<<<
internal override void CopyToUnchecked(VectorStorage<T> target, bool skipClearing = false)
=======
public override bool Equals(VectorStorage<T> other)
{
// Reject equality when the argument is null or has a different shape.
if (other == null || Length != other.L... |
<<<<<<<
[SerializeField]
protected Vector2 m_localScaling = Vector2.one;
public Vector2 LocalScaling
{
get { return m_localScaling; }
set
{
m_localScaling = value;
if (collisionShapePtr != null)
{
... |
<<<<<<<
_colorHelpBuilder = new ColorHelpBuilder(_console);
_output = output;
=======
_rawHelpBuilder = new ColorHelpBuilder(_console);
>>>>>>>
_colorHelpBuilder = new ColorHelpBuilder(_console);
<<<<<<<
_console.ResetColorCalls.Should().Be(2);
=======
... |
<<<<<<<
using static CommandLine.Create;
using Xunit.Abstractions;
=======
using static Microsoft.DotNet.Cli.CommandLine.Create;
>>>>>>>
using Xunit.Abstractions;
using static Microsoft.DotNet.Cli.CommandLine.Create; |
<<<<<<<
using System;
using System.Collections.Generic;
=======
using ChartJs.Blazor.Interop;
>>>>>>>
using System;
using System.Collections.Generic;
using ChartJs.Blazor.Interop;
<<<<<<<
/// <summary>
/// Gets or sets the animation-configuration for this chart.
/// </summary>
public... |
<<<<<<<
public async Task<IHttpActionResult> GetNewAsync(string filter = null, string time = null, string offset = null, string mode = null, int page = 1, int limit = 10) {
var organizations = await GetAssociatedActiveOrganizationsAsync(_organizationRepository);
if (organizations.Count =... |
<<<<<<<
pw.DebugDrawMode = (BulletSharp.DebugDrawModes) EditorGUILayout.EnumPopup("Debug Draw Mode", pw.DebugDrawMode);
EditorGUILayout.Separator();
pw.gravity = EditorGUILayout.Vector3Field("Gravity", pw.gravity);
EditorGUILayout.Separator();
pw.collisionType = (BDynamicsWorld... |
<<<<<<<
if (!response.IsValid) {
Logger.Error().Message("Retrieving stats failed: {0}", response.ServerError.Error).Write();
throw new ApplicationException("Retrieving stats failed.");
=======
if (!res.IsValid) {
_logger.Error().Message("Retrievi... |
<<<<<<<
Logger.Info().Message("Sending daily summary: users={0} project={1}", users.Count, project.Id).Write();
=======
_logger.Info().Message("Sending daily summary: users={0} project={1}", users.Count, project.Id).Write();
//var paging = new PagingOptions { Limit = 5 };
... |
<<<<<<<
_metricsClient.DisplayStats();
var fields = FieldAggregationProcessor.Process("distinct:stack_id,term:is_first_occurrence:-F", false);
Assert.True(fields.IsValid);
Assert.Equal(2, fields.Aggregations.Count);
var result = await _stats.GetNumbersTimel... |
<<<<<<<
[assembly: Exceptionless("LhhP1C9gijpSKCslHHCvwdSIz298twx271n1l6xw", ServerUrl = "http://localhost:50000")]
=======
[assembly: Exceptionless("e3d51ea621464280bbcb79c11fd6483e", EnableSSL = false, ServerUrl = "http://localhost:50000")]
>>>>>>>
[assembly: Exceptionless("LhhP1C9gijpSKCslHHCvwdSIz298twx271n1l6xw... |
<<<<<<<
using Exceptionless.Plugins.Default;
=======
using Exceptionless.Insulation.Redis;
>>>>>>>
using Exceptionless.Plugins.Default;
using Exceptionless.Insulation.Redis; |
<<<<<<<
if (settings.EnableMetricsReporting && String.Equals(settings.MetricsReportingStrategy, "AppMetrics", StringComparison.OrdinalIgnoreCase)) {
builder = builder.UseMetrics();
}
return builder;
=======
if (!String.IsNullOrEmpty(Settings.Current.A... |
<<<<<<<
var filter = Query<PersistentEvent>.DateRange(r => r.Field(e => e.Date).LessThan(utcCutoffDate));
return RemoveAllAsync(new ExceptionlessQuery().WithOrganizationId(organizationId).WithElasticFilter(filter), false);
=======
var filter = Filter<PersistentEvent>.Range(r => r.O... |
<<<<<<<
using Exceptionless.Insulation.Metrics;
=======
using Exceptionless.Web.Utility;
using Microsoft.ApplicationInsights.Extensibility;
>>>>>>>
using Exceptionless.Web.Utility;
using Microsoft.ApplicationInsights.Extensibility;
using Exceptionless.Insulation.Metrics; |
<<<<<<<
// SharpZipLibrary samples
// Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team
=======
// SharpZipLib samples
// Copyright (c) 2007, AlphaSierraPapa
>>>>>>>
// SharpZipLib samples
// Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team |
<<<<<<<
if (hit != null) touch.Target = hit.Transform;
if (touchBeganInvoker != null)
touchBeganInvoker.InvokeHandleExceptions(this, new TouchLayerEventArgs(touch));
=======
if (hit.Transform != null) touch.Target = hit.Transform;
tou... |
<<<<<<<
private ITouchHit hit;
private bool isDirty = false;
=======
private Dictionary<string, System.Object> properties;
>>>>>>>
private ITouchHit hit;
private bool isDirty = false;
private Dictionary<string, System.Object> properties; |
<<<<<<<
ITouch BeginTouch(Vector2 position, Tags tags);
=======
/// <summary>
/// Registers a touch with global Touch Manager.
/// <seealso cref="ITouch"/>
/// </summary>
/// <param name="position">Screen position of the touch.</param>
/// <param name="tags">Ini... |
<<<<<<<
protected override ITouch beginTouch(Vector2 position)
=======
/// <inheritdoc />
protected override int beginTouch(Vector2 position)
>>>>>>>
/// <inheritdoc />
protected override ITouch beginTouch(Vector2 position) |
<<<<<<<
/// <inheritdoc />
public TouchLayer Layer { get; internal set; }
/// <inheritdoc />
=======
>>>>>>>
/// <inheritdoc />
public TouchLayer Layer { get; internal set; }
/// <inheritdoc />
<<<<<<<
private ITouchHit hit;
private bool isDirty;
==... |
<<<<<<<
private ColumnHeader columnHeader1;
private ColumnHeader columnHeader3;
private ColumnHeader columnHeader2;
private ColumnHeader columnHeader4;
private Label passwordPreview;
private global::Sequencer.Forms.SubstitutionListControl substitutionList1;
privat... |
<<<<<<<
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "macOS is what we want.", Scope = "member", Target = "~P:Xamarin.Essentials.DevicePlatform.macOS")]
=======
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", ... |
<<<<<<<
RTHandles.Release(m_AmbientOcclusionBuffer);
RTHandles.Release(m_VelocityBuffer);
RTHandles.Release(m_DistortionBuffer);
RTHandles.Release(m_DeferredShadowBuffer);
RTHandles.Release(m_DebugColorPickerBuffer);
RTHandles.Release(m_DebugFullS... |
<<<<<<<
}
}
// Pass global parameters to compute shader
// TODO: get rid of this by making global parameters visible to compute shaders
PushGlobalParams(ca... |
<<<<<<<
if (m_PerformBC6HCompression)
{
cmd.BC6HEncodeFastCubemap(
result, m_ProbeSize, m_TextureCache.GetTexCache(),
0, int.MaxValue, sliceIndex);
m_Te... |
<<<<<<<
void OnSubsurfaceInspectorGUI()
{
EditorGUILayout.LabelField(styles.sssCategory);
EditorGUI.indentLevel++;
EditorGUILayout.PropertyField(m_SssProfileStdDev1, styles.sssProfileStdDev1);
EditorGUILayout.PropertyField(m_SssProfileStdDev2, styles... |
<<<<<<<
private Socket CreateRawSocket(uint localAddress, uint remoteAddress)
=======
private static Socket CreateRawSocket(uint localAddress, uint remoteAddress)
>>>>>>>
private static Socket CreateRawSocket(uint localAddress, uint remoteAddress)
<<<<<<<
socket.ReceiveBufferSize... |
<<<<<<<
using ExtraRoles.Medic;
=======
using ExtraRoles.Officer;
>>>>>>>
using ExtraRoles.Medic;
using ExtraRoles.Officer; |
<<<<<<<
public const string Wox = "Wox";
public const string Plugins = "Plugins";
private static readonly Assembly Assembly = Assembly.GetExecutingAssembly();
public static readonly string ProgramDirectory = Directory.GetParent(Assembly.Location.NonNull()).ToString();
public sta... |
<<<<<<<
UpdateInfo newUpdateInfo;
if (!silentUpdate)
api.ShowMsg("Please wait...", "Checking for new update");
using var updateManager = await GitHubUpdateManager(GitHubRepository);
=======
updateManager = await GitHubUpdateManager... |
<<<<<<<
using System.Reflection;
=======
using System.Runtime.Serialization.Formatters;
>>>>>>>
using System.Reflection;
using System.Runtime.Serialization.Formatters; |
<<<<<<<
private static bool IsDriveOrSharedFolder(string search)
{
if (search.StartsWith(@"\\"))
{ // share folder
return true;
}
if (_driverNames != null && _driverNames.Any(search.StartsWith))
{ // normal drive letter
... |
<<<<<<<
string search = query.Search.ToLower();
List<FolderLink> userFolderLinks = _settings.FolderLinks.Where(
x => x.Nickname.StartsWith(search, StringComparison.OrdinalIgnoreCase)).ToList();
List<Result> results =
userFolderLinks.Select(
... |
<<<<<<<
=======
>>>>>>>
<<<<<<<
this.MainVM.ProgressBarVisibility = Visibility.Visible;
=======
MainVM.IsProgressBarVisible = true;
>>>>>>>
MainVM.ProgressBarVisibility = Visibility.Visible;
<<<<<<<
this.MainVM.ProgressBarVisibility = Visibility.Collapsed;
=====... |
<<<<<<<
cbStartWithWindows.IsChecked = CheckApplicationIsStartupWithWindow();
=======
comboMaxResultsToShow.SelectionChanged += (o, e) =>
{
UserSettingStorage.Instance.MaxResultsToShow = (int)comboMaxResultsToShow.SelectedItem;
UserSettingStorage.Ins... |
<<<<<<<
=======
Task.Delay(200, currentCancellationToken).ContinueWith(_ =>
{
// start the progress bar if query takes more than 200 ms and this is the current running query and it didn't finish yet
if (currentUpdateSource == _upd... |
<<<<<<<
[InlineData("DA250-ConditionalWithRichXPath.docx", "DA250-Address.xml", false)]
=======
[InlineData("DA251-EnhancedTables.docx", "DA-Data.xml", false)]
>>>>>>>
[InlineData("DA250-ConditionalWithRichXPath.docx", "DA250-Address.xml", false)]
[InlineData("DA251-EnhancedTables.do... |
<<<<<<<
private readonly Stream _output;
private Thread _thread;
=======
private readonly TextWriter _output;
private readonly Thread _thread;
>>>>>>>
private readonly Stream _output;
private readonly Thread _thread;
<<<<<<<
var headerBytes = S... |
<<<<<<<
Task Initialize();
event ShutdownEventHandler Shutdown;
event ExitEventHandler Exit;
Task WasShutDown { get; }
Task WaitForExit { get; }
=======
Task Initialize();
IObservable<bool> Shutdown { get; }
IObservable<int> Exit { get; }
Tas... |
<<<<<<<
[Fact]
public async Task ShouldHandle_Request_WithNullParameters()
{
bool wasShutDown = false;
ShutdownHandler shutdownHandler = new ShutdownHandler();
shutdownHandler.Shutdown += shutdownRequested =>
{
wasShutDown = true;... |
<<<<<<<
if (e.PropertyName == AnimationView.IsPlayingProperty.PropertyName &&
!string.IsNullOrEmpty(Element.Animation))
{
if (Element.IsPlaying)
_animationView.PlayAnimation();
else
_animationView.PauseAnimat... |
<<<<<<<
public virtual void RenderDeferredLighting(HDRenderPipeline.HDCamera hdCamera, ScriptableRenderContext renderContext,
RenderTargetIdentifier[] colorBuffers, RenderTargetIdentifier stencilBuffer,
bool ou... |
<<<<<<<
#region Lighting
bool bPlayerVision = false;
ILight playerVision;
QuadRenderer quadRenderer;
ShadowMapResolver shadowMapResolver;
LightArea lightArea128;
LightArea lightArea256;
LightArea lightArea512;
LightArea lightArea1024;
Rend... |
<<<<<<<
// JB: TODO - why is this needed? Don't we have a unique key for an opponent? RF1 has vehicleName
// which is of the form classname: driver name #number (e.g. "F309: Jim Britton #14") - can't we just
// rely on this for our opponent keys?
=======
>>>>>>>
// JB: TODO - wh... |
<<<<<<<
public bool IsAsyncEnabled()
{
return m_LightLoopSettings.enableAsyncCompute;
}
public void BuildGPULightListsCommon(Camera camera, CommandBuffer cmd, RenderTargetIdentifier cameraDepthBufferRT, RenderTargetIdentifier stencilTextureRT, bool skyEnabled)
=======
... |
<<<<<<<
this.isOfflineSession = true;
this.distanceOffTrack = 0;
this.isApproachingTrack = false;
this.playerLapsWhenFCYPosAssigned = -1;
this.detectedTrackNoDRSZones = false;
=======
>>>>>>>
this.isOfflineSession = tr... |
<<<<<<<
// just entered the pit lane with no limiter active
audioPlayer.playMessageImmediately(new QueuedMessage(folderEngageLimiter, 0, this));
timeOfLastLimiterWarning = currentGameState.Now;
=======
// just passed the l... |
<<<<<<<
// Player lap times with sector information
public List<LapData> PlayerLapData = new List<LapData>();
public void playerStartNewLap(int lapNumber, int position, Boolean inPits, float gameTimeAtStart, Boolean isRaining, float trackTemp, float airTemp)
{
LapData thisLa... |
<<<<<<<
m_IsCameraRendering = false;
Lightmapping.SetDelegate(lightsDelegate);
=======
>>>>>>>
Lightmapping.SetDelegate(lightsDelegate); |
<<<<<<<
=======
import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationAttributeInstance;
import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationCase;
import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationDataSource;
import org.sleuthkit.autopsy.centralrepository.datamodel.EamA... |
<<<<<<<
import org.sleuthkit.autopsy.timeline.ui.detailview.datamodel.DetailViewEvent;
import org.sleuthkit.autopsy.timeline.ui.filtering.datamodel.FilterModel;
import org.sleuthkit.autopsy.timeline.ui.filtering.datamodel.RootFilterModel;
import org.sleuthkit.autopsy.timeline.utils.IntervalUtils;
import org.sleuthkit.a... |
<<<<<<<
=======
import org.openide.util.NbBundle;
import org.sleuthkit.autopsy.coreutils.ExecUtil;
import org.sleuthkit.autopsy.coreutils.NetworkUtils;
>>>>>>>
<<<<<<<
import java.util.Optional;
import java.util.Scanner;
import java.util.Set;
=======
>>>>>>>
import java.util.Optional;
import java.util.Scanner;
i... |
<<<<<<<
Map<Integer, CommonAttributeValueList> interCaseCommonFiles = eamDbAttrInst.findSingleInterCaseValuesByCount(Case.getCurrentCase(), correlationCase);
Set<String> mimeTypesToFilterOn = getMimeTypesToFilterOn();
return new CommonAttributeCountSearchResults(interCaseCommonFiles, this.freque... |
<<<<<<<
private final static IngestServices ingestServices = IngestServices.getInstance();
private final static Logger logger = ingestServices.getLogger(SQLiteReader.class.getName());
=======
private final static IngestServices services = IngestServices.getInstance();
private final static Logger ... |
<<<<<<<
=======
>>>>>>>
<<<<<<<
@Override
protected synchronized void setFileHelper(Long newFileID) {
=======
@Override
synchronized protected void setFileHelper(Long newFileID) {
>>>>>>>
@Override
protected synchronized void setFileHelper(Long newFileID) {
<<<<<<<
=======
>>>>>>> |
<<<<<<<
import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.autopsy.timeline.ui.detailview.datamodel.MultiEvent;
import org.sleuthkit.datamodel.DescriptionLoD;
=======
import org.sleuthkit.datamodel.TskCoreException;
import org.sleuthkit.datamodel.timeline.DescriptionLoD;
import org.sleuthkit.datamode... |
<<<<<<<
this.knownStatus = knownStatus;
=======
this.knownStatusDenoted = notable;
>>>>>>>
this.knownStatusDenoted = knownStatus; |
<<<<<<<
=======
/**
* Configure the listener to create correlation properties
*
* @param value True to create properties; otherwise false.
*/
public synchronized static void setCreateCrProperties(boolean value) {
createCrProperties = value;
}
>>>>>>>
/**
* Con... |
<<<<<<<
import org.sleuthkit.autopsy.datamodel.ContentUtils;
=======
import org.sleuthkit.autopsy.coreutils.NetworkUtils;
>>>>>>>
import org.sleuthkit.autopsy.coreutils.NetworkUtils;
import org.sleuthkit.autopsy.datamodel.ContentUtils;
<<<<<<<
Collection<BlackboardAttribute> bbattributes = Arrays.as... |
<<<<<<<
private static class ShortNameVisitor extends ContentVisitor.Default<String> {
ShortNameVisitor() {
}
@Override
protected String defaultVisit(Content cntnt) {
return cntnt.getName();
}
}
private static class GetPathVisitor implements ContentVisi... |
<<<<<<<
=======
import java.beans.FeatureDescriptor;
import java.beans.PropertyChangeEvent;
>>>>>>>
<<<<<<<
=======
import java.util.Comparator;
import java.util.LinkedHashSet;
>>>>>>>
import java.util.Comparator;
import java.util.LinkedHashSet;
<<<<<<<
import java.util.prefs.Preferences;
=======
import java.... |
<<<<<<<
//try {
file.setKnown(TskData.FileKnown.BAD);
// skCase.setKnown(file, TskData.FileKnown.BAD);
//} catch (TskException ex) {
// logger.log(Level.WARNING, "Couldn't set notable state for file " + name + ... |
<<<<<<<
//If there is not Text Translator implementation, then hide these buttons
//from the user.
TextTranslationService tts = TextTranslationService.getInstance();
translateNamesRadioButton.setEnabled(tts.hasProvider());
=======
this.timeZoneList.setListData... |
<<<<<<<
=======
import org.sleuthkit.autopsy.coreutils.ContextMenuExtensionPoint;
import org.sleuthkit.autopsy.datamodel.DisplayableItemNode.TYPE;
>>>>>>>
import org.sleuthkit.autopsy.coreutils.ContextMenuExtensionPoint;
<<<<<<<
actionsList.add(AddContentTagAction.getInstance());
=======
actionsLi... |
<<<<<<<
=======
import java.nio.file.Path;
import static java.util.TimeZone.getTimeZone;
import org.openide.util.Lookup;
import org.sleuthkit.autopsy.ingest.DataSourceIngestModuleProgress;
import org.sleuthkit.autopsy.ingest.IngestModule.IngestModuleException;
import org.sleuthkit.autopsy.ingest.IngestServices;
impor... |
<<<<<<<
new DataSourceTab(Bundle.DataSourceSummaryTabbedPane_userActivityTab_title(), new UserActivityPanel()),
new DataSourceTab(Bundle.DataSourceSummaryTabbedPane_recentFileTab_title(), new RecentFilesPanel()),
=======
new DataSourceTab(Bundle.DataSourceSummaryTabbedPane_userActi... |
<<<<<<<
=======
import java.util.Collections;
import java.util.Comparator;
>>>>>>>
<<<<<<<
return new TimelineEvent(
resultSet.getLong("event_id"), // NON-NLS
resultSet.getLong("data_source_obj_id"), // NON-NLS
resultSet.getLong("file_obj_id"), // NON-NLS
... |
<<<<<<<
=======
import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationAttributeInstance;
import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationCase;
import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationDataSource;
import org.sleuthkit.autopsy.centralrepository.datamodel.EamA... |
<<<<<<<
String workdir();
String socket();
=======
List<String> generatekeys();
>>>>>>>
List<String> generatekeys();
String workdir();
String socket(); |
<<<<<<<
class AddImageWizardIngestConfigPanel extends ShortcutWizardDescriptorPanel {
private IngestJobSettingsPanel ingestJobSettingsPanel;
=======
class AddImageWizardIngestConfigPanel implements WizardDescriptor.Panel<WizardDescriptor> {
@Messages("AddImageWizardIngestConfigPanel.name.text=Configure Inges... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.