conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
public class TDSMPermissions : Plugin
{
/*
* @Developers
*
* Plugins need to be in .NET 4.0
* Otherwise TDSM will be unable to load it.
*
* As of June 16, 1:15 AM, TDSM should now load Plugins Dynamically.
*/
=======
public class TDSMPermissions : BasePlugin
{
/*
... |
<<<<<<<
public const int BUILD = 11;
public const int CURRENT_RELEASE = 12;
private const String WORLDS = "Worlds";
private const String PLAYERS = "Players";
private const String PLUGINS = "Plugins";
private const String DATA = "Data";
=======
public static int... |
<<<<<<<
public const int BUILD = 13;
public const int CURRENT_RELEASE = 12;
private const String WORLDS = "Worlds";
private const String PLAYERS = "Players";
private const String PLUGINS = "Plugins";
private const String DATA = "Data";
=======
public static int... |
<<<<<<<
private static bool SetupPaths()
{
try
{
CreateDirectory(Statics.WorldPath);
CreateDirectory(Statics.PlayerPath);
CreateDirectory(Statics.PluginPath);
CreateDirectory(Statics.DataPath);
}
... |
<<<<<<<
using System.Net;
=======
using Terraria_Server.Networking;
>>>>>>>
using System.Net;
using Terraria_Server.Networking; |
<<<<<<<
if (this.type == ProjectileType.POWDER_VILE && (Main.npc[k].type == 47 || Main.npc[k].type == 57))
=======
if (this.type == 11 && (Main.npcs[i].Type == 47 || Main.npcs[i].Type == 57))
>>>>>>>
if (this.type == Proj... |
<<<<<<<
using Terraria_Server.Misc;
=======
using Terraria_Server.Events;
using Terraria_Server.Plugin;
>>>>>>>
using Terraria_Server.Events;
using Terraria_Server.Plugin;
using Terraria_Server.Misc; |
<<<<<<<
for (int k = 0; k < Main.maxSectionsY; k++)
{
Netplay.slots[i].tileSection[j, k] = false;
}
=======
Netpla... |
<<<<<<<
}
for (int n = 0; n < 1000; n++)
{
NPC nPC = (NPC)Main.npcs[n].Clone();
if (nPC.Active && nPC.townNPC)
=======
... |
<<<<<<<
if (AdornmentLayer.Selector.Selections.Any())
AdornmentLayer.DrawAdornments();
AdornmentLayer.Selector.IsReversing = false;
=======
if (adornmentLayer.Selector.Selections.Any())
adornmentLayer.DrawAdornments();
>>>>>>>
if (Adorn... |
<<<<<<<
if (AdornmentLayer.Selector.Selections.Any())
AdornmentLayer.DrawAdornments();
AdornmentLayer.Selector.IsReversing = false;
=======
if (adornmentLayer.Selector.Selections.Any())
adornmentLayer.DrawAdornments();
>>>>>>>
if (Adorn... |
<<<<<<<
/// <summary>
///Load terrain, saved changes and resets
///the light for an empty chunk
/// </summary>
/// <param name="chunk">The chunk to generate and load for</param>
=======
>>>>>>>
/// <summary>
///Load terrain, saved changes and resets
///the light for an empty chu... |
<<<<<<<
public void WhenRetentionTimeIsSetOldFilesAreDeleted()
{
LogEvent e1 = Some.InformationEvent(DateTime.Today.AddDays(-5)),
e2 = Some.InformationEvent(e1.Timestamp.AddDays(2)),
e3 = Some.InformationEvent(e2.Timestamp.AddDays(5));
TestRolling... |
<<<<<<<
public static string FullNameCSharp(this TypeReference type)
{
return type.FullName.Replace('/', '.');
}
=======
internal static bool IsType(this TypeReference reference, TypeReference type)
{
return string.Equals(reference.FullName, type.FullN... |
<<<<<<<
using System.Linq;
using System.Net.Http;
using Modix.Modules;
using Modix.Services.DocsMaster;
=======
>>>>>>>
using System.Net.Http;
using Modix.Services.DocsMaster;
<<<<<<<
using (var context = _provider.GetService<ModixContext>())
=======
using (var context = _scope.ServicePro... |
<<<<<<<
private readonly Dictionary<DomainId, ContentGraphType> contentTypes = new Dictionary<DomainId, ContentGraphType>();
=======
private static readonly IDocumentExecuter Executor = new DocumentExecuter();
private readonly Dictionary<Guid, ContentGraphType> contentTypes = new Dictionary<Gu... |
<<<<<<<
using System;
using System.Diagnostics;
using System.Reflection;
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
using Discord.WebSocket;
using Modix.Data.Models;
using Serilog;
using Microsoft.Extensions.DependencyInjection;
using Modix.Services.Quote;
using Modix.Utilities;
using Serilog... |
<<<<<<<
public AppPatterns Update(DomainId id, string name, string pattern, string? message = null)
=======
public AppPatterns Update(Guid id, string? name = null, string? pattern = null, string? message = null)
>>>>>>>
public AppPatterns Update(DomainId id, string? name = null, string? patte... |
<<<<<<<
using System;
=======
using System;
using System.IO;
>>>>>>>
using System;
using System.IO;
<<<<<<<
await Receive(socket, async (result, buffer) =>
=======
await Receive(socket, async (result, serializedInvocationDescriptor) =>
>>>>>>>
await Receive(socket, async ... |
<<<<<<<
// If the atomospheric drag is too large them we will be unlikely to be able to control our attitude. Move the the parachute control step
if (mainBody.DragAccel(vesselState.CoM, vesselState.velocityVesselOrbit, vesselState.massDrag / vesselState.mass).magnitude > 1)
{
... |
<<<<<<<
=======
extern alias Legacy;
>>>>>>>
<<<<<<<
public NuGetPackageManager(ISourceRepositoryProvider sourceRepositoryProvider, Configuration.ISettings settings, string packagesFolderPath)
=======
public NuGetPackageManager(
ISourceRepositoryProvider sourceRepositoryProvider,
... |
<<<<<<<
public Task<IChangePlanResult> ChangePlanAsync(string userId, NamedId<DomainId> appId, string? planId)
=======
public Task<IChangePlanResult> ChangePlanAsync(string userId, NamedId<Guid> appId, string? planId, string? referer)
>>>>>>>
public Task<IChangePlanResult> ChangePlanAsync(str... |
<<<<<<<
// No-op all project closures are up to date and all packages exist on disk.
if (await DependencyGraphRestoreUtility.IsRestoreRequiredAsync(
SolutionManager,
=======
var isRestoreRequired = await DependencyGraphRestoreUtility.IsRestoreRequire... |
<<<<<<<
public static string GetHash(RestoreRequest request)
{
if(request.Project.RestoreMetadata.ProjectStyle == ProjectStyle.DotnetCliTool)
{
var uniqueName = request.DependencyGraphSpec.Restore.First();
var dgSpec = request.DependencyGraphSpec.W... |
<<<<<<<
var testSettings = new Configuration.NullSettings();
=======
var testSettings = new NullSettings();
var deleteOnRestartManager = new TestDeleteOnRestartManager();
>>>>>>>
var testSettings = new Configuration.NullSettings();
var deleteOnRestartManage... |
<<<<<<<
=======
using Autofac;
using SmartStore.Services.Customers;
using SmartStore.Core;
using SmartStore.Core.Domain.Customers;
>>>>>>>
using SmartStore.Services.Customers;
using SmartStore.Core;
using SmartStore.Core.Domain.Customers;
<<<<<<<
if (task.Enabled)
{
task.NextRunUtc = now.AddSeconds(tas... |
<<<<<<<
using SmartStore.Web.Framework.Plugins;
=======
using SmartStore.Web.Models.ShoppingCart;
>>>>>>>
using SmartStore.Web.Framework.Plugins;
using SmartStore.Web.Models.ShoppingCart;
<<<<<<<
// codehint: sm-add (determine brand image of shipping method)
var plugin = Plug... |
<<<<<<<
=======
using StackExchange.Profiling;
using System.Threading.Tasks;
using SmartStore.Services.Events;
// codehint: end sm-add
>>>>>>>
using StackExchange.Profiling;
using System.Threading.Tasks;
using SmartStore.Services.Events;
// codehint: end sm-add
<<<<<<<
alreadyProcessedCategoryIds.Add(category.I... |
<<<<<<<
using SmartStore.Core.Data;
using SmartStore.Core.Domain.Security;
=======
using SmartStore.Core.Domain.Customers;
>>>>>>>
using SmartStore.Core.Domain.Customers;
using SmartStore.Core.Data;
using SmartStore.Core.Domain.Security;
<<<<<<<
using SmartStore.Core.Logging;
using SmartStore.Services.Customers;
=... |
<<<<<<<
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Web;
using System.Web.Mvc;
using AmazonPay;
using AmazonPay.StandardPaymentRequests;
using Autofac;
using Newtonsoft.Json.Linq;
=======
us... |
<<<<<<<
using System.Collections.Generic;
using SmartStore.Core;
=======
using System;
using System.Collections.Generic;
using SmartStore.Core;
>>>>>>>
using System;
using System.Collections.Generic;
using SmartStore.Core;
<<<<<<<
TopCategories = topCategories ?? new List<ISearchHit>();
TopManufacturers = ... |
<<<<<<<
=======
using SmartStore.Collections;
using SmartStore.Web.Framework.Filters;
using SmartStore.Web.Framework.Security;
>>>>>>>
using SmartStore.Web.Framework.Filters;
using SmartStore.Web.Framework.Security; |
<<<<<<<
=======
using SmartStore.Web.Framework.Filters;
using SmartStore.Web.Framework.Security;
>>>>>>>
using SmartStore.Web.Framework.Security; |
<<<<<<<
if (productBundleItem != null)
model.ThumbDimensions = _mediaSettings.BundledProductPictureSize;
else if (isAssociatedProduct)
model.ThumbDimensions = _mediaSettings.AssociatedProductPictureSize;
model.DeliveryTime = _deliveryTimeService.GetDeliveryTimeById(product.DeliveryTimeId.GetV... |
<<<<<<<
RouteName = "Category",
ImageUrl = category.PictureId != null ? _pictureService.GetPictureUrl((int)category.PictureId) : ""
=======
BadgeText = category.GetLocalized(x => x.BadgeText),
BadgeStyle = (BadgeStyle)category.BadgeStyle,
... |
<<<<<<<
services.AddTransientAs<MigrationPath>()
.As<IMigrationPath>();
services.AddTransientAs<AddPatterns>()
.As<IMigration>();
services.AddTransientAs<ConvertEventStore>()
=======
services.AddSingletonAs<CreateBlogCommandMiddleware>(... |
<<<<<<<
public async override Task<List<BreachedEntry>> CheckDatabase(bool expireEntries, bool oldEntriesOnly, bool ignoreDeleted, bool ignoreExpired, IProgress<ProgressItem> progressIndicator)
=======
public async override Task<List<BreachedEntry>> CheckGroup(PwGroup group, bool expireEntries, bool o... |
<<<<<<<
using System.Diagnostics;
using System.Collections;
=======
using BreadPlayer.Models;
using BreadPlayer.SettingsViews;
using BreadPlayer.SettingsViews.ViewModels;
>>>>>>>
using BreadPlayer.Models;
using BreadPlayer.SettingsViews;
using BreadPlayer.SettingsViews.ViewModels;
using System.Diagnostics;
using Sys... |
<<<<<<<
using System.Globalization;
=======
using System.Text.RegularExpressions;
>>>>>>>
using System.Text.RegularExpressions;
using System.Globalization; |
<<<<<<<
=======
private readonly object _sendingQueueSyncRoot = new object();
private readonly List<HistoryItem> _sendingQueue = new List<HistoryItem>();
private static Timer _sendingTimer;
private static void StartSendingTimer()
{
//Helpers.Execute.ShowDebugMes... |
<<<<<<<
var title = AppResources.ProxySettingsShareTitle;
var link = new Uri(MeUrlPrefixConverter.Convert($"socks?{string.Join("&", builder)}"));
=======
var title = Strings.Resources.ProxySettingsShareTitle;
var link = new Uri(UsernameToLinkConverter.Convert($"socks?{s... |
<<<<<<<
=======
to.Write(0x2EC0533F);
>>>>>>>
<<<<<<<
to.WriteString(Title ?? string.Empty);
to.WriteString(Address ?? string.Empty);
to.WriteString(Provider ?? string.Empty);
to.WriteString(VenueId ?? string.Empty);
=======
to.Write(Title);
to.Write(Address);
to.Write(Provider);
to.Wri... |
<<<<<<<
private static IJsonValue CreateValue(double v)
=======
[Fact]
public async Task Should_add_error_if_unique_constraint_failed()
{
var sut = Field(new NumberFieldProperties { IsUnique = true });
await sut.ValidateAsync(CreateValue(12.5), errors, Validati... |
<<<<<<<
using Squidex.Infrastructure;
=======
using Squidex.Infrastructure;
using Squidex.Infrastructure.Commands;
>>>>>>>
using Squidex.Infrastructure;
using Squidex.Infrastructure.Commands;
<<<<<<<
private static readonly IReadOnlyList<IEnrichedAssetEntity> EmptyAssets = new List<IEnrichedAssetEntity>();
... |
<<<<<<<
private readonly NamedId<DomainId> appId = NamedId.Of(DomainId.NewGuid(), "my-app");
=======
private readonly IUrlGenerator urlGenerator = A.Fake<IUrlGenerator>();
>>>>>>>
private readonly NamedId<DomainId> appId = NamedId.Of(DomainId.NewGuid(), "my-app");
private readonly IUr... |
<<<<<<<
ToggleMuteCommand = new RelayCommand<bool>(ToggleMuteExecute);
=======
ToggleMuteCommand = new RelayCommand(ToggleMuteExecute);
SetAdminsCommand = new RelayCommand(SetAdminsExecute);
>>>>>>>
ToggleMuteCommand = new RelayCommand(ToggleMuteExecute); |
<<<<<<<
var json = new Dictionary<DomainId, JsonAppPattern>(value.Count);
=======
var json = new Dictionary<Guid, AppPattern>(value.Count);
>>>>>>>
var json = new Dictionary<DomainId, AppPattern>(value.Count);
<<<<<<<
var json = serializer.Deserialize<Dictionary<Domai... |
<<<<<<<
public MyEventConsumerGrain(
EventConsumerFactory eventConsumerFactory,
IStore<string> store,
IEventStore eventStore,
IEventDataFormatter eventDataFormatter,
IGrainIdentity identity,
IGrainRuntime runtime... |
<<<<<<<
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Navigation;
=======
using Telegram.Api.TL.Messages;
using Windows.UI.Notifications;
>>>>>>>
using Telegram.Api.TL.Messages;
using Windows.UI.Notifications;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml... |
<<<<<<<
public async Task<LuceneDirectory> CreateDirectoryAsync(DomainId schemaId)
=======
public async Task<LuceneDirectory> CreateDirectoryAsync(Guid ownerId)
>>>>>>>
public async Task<LuceneDirectory> CreateDirectoryAsync(DomainId ownerId) |
<<<<<<<
to.WriteInt32((Int32)Flags);
to.WriteInt32(Id);
to.WriteString(About ?? string.Empty);
if (HasParticipantsCount) to.WriteInt32(ParticipantsCount.Value);
if (HasAdminsCount) to.WriteInt32(AdminsCount.Value);
if (HasKickedCount) to.WriteInt32(KickedCount.Value);
if (HasBannedCount) to.WriteIn... |
<<<<<<<
if (container.EditingMessageFileId is int fileId)
{
ProtoService.Send(new CancelUploadFile(fileId));
}
SetText(null, false);
//Aggregator.Publish(new EditMessageEventArgs(container.Previo... |
<<<<<<<
=======
using Squidex.Domain.Apps.Entities.Schemas.Commands;
>>>>>>>
<<<<<<<
if (httpContextAccessor.HttpContext == null)
{
return next(context);
}
=======
>>>>>>>
if (httpContextAccessor.HttpContext == null)
{
r... |
<<<<<<<
string message;
while ((message = this.listener.NextQueueDownMessage (Identifier)) != null) {
if (!message.Equals (CurrentRevision))
SyncDownBase ();
}
=======
>>>>>>> |
<<<<<<<
JToken jToken = getUpdatedJsonArrayValue((JToken)JObject.Parse(strObj), propNames, scrubRule.UpdateValue, scrubRule.Type);
=======
JToken jToken = GetUpdatedJsonArrayValue((JToken)JObject.Parse(strObj), propNames, scrubRule.UpdateValue);
>>>>>>>
... |
<<<<<<<
public enum RuleType { SingleValue, NullValue, Shuffle, PartialMaskFromLeft, PartialMaskFromRight };//Can add random rule type later if required.
=======
>>>>>>> |
<<<<<<<
// PCodex
instance.Patch(typeof(CodexCache), "CollectEntries", null,
PatchMethod(nameof(CollectEntries_Postfix)));
instance.Patch(typeof(CodexCache), "CollectSubEntries", null,
PatchMethod(nameof(CollectSubEntries_Postfix)));
=======
// PLocalization
var locale = Localization.GetLocale... |
<<<<<<<
public int iRoadTexture = 0;
public Texture2D[] roadTextures;
=======
public Texture2D[] textures;
public float[] roadOffsets;
public float[] roadWidths;
Texture2D customRoadTexure;
GameObject createdRoad;
>>>>>>>
public int iRoadTexture = 0;
public Texture2D[] roadTextures;
public float[] roadOf... |
<<<<<<<
RunTests(tests, project.RunnerCommand, project.RunId, project.OutputDir);
=======
if (!tests.Any())
{
Console.WriteLine("Could not find any suitable tests.");
}
else
{
RunTes... |
<<<<<<<
=======
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
>>>>>>>
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
<<<<<<<
private static readonly ProcDomain _loggerDomain = ProcDomain.CreateDomain(nameof(... |
<<<<<<<
return eventStore.QueryAsync(async storedEvent =>
=======
await eventStore.GetEventsAsync(async storedEvent =>
>>>>>>>
await eventStore.QueryAsync(async storedEvent =>
<<<<<<<
return eventStore.QueryAsync(async storedEvent =>
=======
await eventS... |
<<<<<<<
public string MemberId;
public string MemberName;
}
public class CreateChannelResponseMessage : MessageBase
{
public string ChannelId;
public string MemberId;
public bool Created;
public string Error;
=======
public bool isInviteOnly = true;
>>>>>>>
public string MemberId;
p... |
<<<<<<<
=======
// <summary>
// A singleton class for communicating with Azure Blob Storage.
// </summary>
// --------------------------------------------------------------------------------------------------------------------
using System.Text.RegularExpressions;
>>>>>>>
// <summary>
// A singleton class for c... |
<<<<<<<
#if NET
if (newClientOptions.RequestHeaderEncoding != null)
{
handler.RequestHeaderEncodingSelector = (_, _) => newClientOptions.RequestHeaderEncoding;
}
#endif
=======
#if NET
if (newClientOptions.EnableMultipleHttp2Connections.HasValue)
... |
<<<<<<<
PropagateActivityContext = true,
#if NET
RequestHeaderEncoding = Encoding.Latin1,
#endif
=======
ActivityContextHeaders = ActivityContextHeaders.CorrelationContext,
>>>>>>>
ActivityContextHeaders = ActivityContextHeaders.CorrelationContext,
#if ... |
<<<<<<<
[TestCase('a', "'a'")]
[TestCase('h', "'h'")]
[TestCase('z', "'z'")]
public static void FormatValue_CharTest(char c, string expected)
{
Assert.That(MsgUtils.FormatValue(c), Is.EqualTo(expected));
}
#endregion
=======
[TestCase(null, ... |
<<<<<<<
#if !NETSTANDARD1_3 && !NETSTANDARD1_6
=======
>>>>>>>
#if !NETSTANDARD1_3 && !NETSTANDARD1_6
<<<<<<<
}
=======
}
#endif
>>>>>>>
}
#endif |
<<<<<<<
#region Build Tests
=======
#region Build Tests
public static TestSuite MakeSuite(string name)
{
return new TestSuite(name);
}
>>>>>>>
#region Build Tests
public static TestSuite MakeSuite(string name)
{
return new Test... |
<<<<<<<
Actions = new List<ITestAction>();
=======
State = WorkItemState.Ready;
>>>>>>>
State = WorkItemState.Ready;
<<<<<<<
/// The name of the work item - defaults to the Test name.
/// </summary>
public virtual string Name
{
get { re... |
<<<<<<<
[Test]
public void MethodWithArrayArguments([Values(
(object)new object[] { 1, "text", null },
(object)new object[0],
(object)new object[] { 1, new int[] { 2, 3 }, 4 })] object o)
{
}
[Test]
public void TestNameIntrospectsArr... |
<<<<<<<
=======
internal readonly string FullName ;
>>>>>>>
<<<<<<<
this._fullName = fullName;
this._inputParametrs = inputParametrs;
this._outputParametrs = outputParametrs;
=======
this.FullName = fullName;
>>>>>>>
this._fullName = fu... |
<<<<<<<
=======
public DelegateCommand ReportABugCommand { get; set; }
public DelegateCommand GoToWikiCommand { get; set; }
public DelegateCommand GoToSourceCodeCommand { get; set; }
public DelegateCommand<object> ExitCommand { get; set; }
public DelegateCommand Cleanu... |
<<<<<<<
=======
>>>>>>>
<<<<<<<
protected VariableInputNode(WorkspaceModel workspace) : base()
=======
protected VariableInputNode(WorkspaceModel workspace) : base(workspace)
>>>>>>>
protected VariableInputNode() |
<<<<<<<
private readonly Size highlightSize = new Size(8, 8);
private readonly Color4 defaultLineColor = new Color4(new Color3(0, 0, 0));
private readonly Color4 defaultPointColor = new Color4(new Color3(0, 0, 0));
private readonly Color4 highlightColor = new Color4(new Color3(1.0f, 0.0f... |
<<<<<<<
A.CallTo(() => appImageStore.UploadAsync(appId.Id, stream, A<CancellationToken>._))
=======
A.CallTo(() => appImageStore.UploadAsync(appId, A<Stream>._, A<CancellationToken>._))
>>>>>>>
A.CallTo(() => appImageStore.UploadAsync(appId.Id, A<Stream>._, A<CancellationToken>._)... |
<<<<<<<
=======
public override Value Evaluate(FSharpList<Value> args)
{
FSharpList<Value> unsorted = null;
if (args[0].IsList)
{
unsorted = ((Value.List)args[0]).Item;
}
else
{
//promote the sing... |
<<<<<<<
XmlNodeList elNodes = xmlDoc.GetElementsByTagName(/*NXLT*/"Elements");
if (elNodes == null || (elNodes.Count == 0))
elNodes = xmlDoc.GetElementsByTagName(/*NXLT*/"dynElements");
=======
XmlNodeList elNodes = xmlDoc.GetElementsByTagName("Elements");
... |
<<<<<<<
core.RuntimeStatus.LogWarning(RuntimeData.WarningID.kConversionNotPossible, Resources.kConvertNonConvertibleTypes);
=======
core.RuntimeStatus.LogWarning(Runtime.WarningID.kConversionNotPossible, ProtoCore.StringConstants.kConvertNonConvertibleTypes);
>>>>>>>
c... |
<<<<<<<
nodeUI.PresentationGrid.Children.Add(backgroundRect);
nodeUI.PresentationGrid.Children.Add(View);
nodeUI.PresentationGrid.Visibility = Visibility.Visible;
=======
public DynamoViewModel ViewModel { get; set; }
public IVisualizationManager VisualizationManag... |
<<<<<<<
=======
public new string Category
{
get
{
var infos = Workspace.DynamoModel.CustomNodeManager.NodeInfos;
return infos.ContainsKey(Definition.FunctionId)
? infos[Definition.FunctionId].Category
... |
<<<<<<<
RuntimeData.WarningID.kInvalidArguments,
Resources.kInvalidArguments);
=======
Runtime.WarningID.kInvalidArguments,
StringConstants.kInvalidArguments);
>>>>>>>
... |
<<<<<<<
using Dynamo.Models;
using Dynamo.Nodes;
=======
using Dynamo.UI.Controls;
using ICSharpCode.AvalonEdit.Highlighting;
using ICSharpCode.AvalonEdit.Rendering;
>>>>>>>
using Dynamo.Models;
using Dynamo.Nodes;
using ICSharpCode.AvalonEdit.Highlighting;
using ICSharpCode.AvalonEdit.Rendering;
<<<<<<<
=====... |
<<<<<<<
dynNode el = dynSettings.Controller.DynamoViewModel.CreateNodeInstance(t, nickname, guid);
// note - this is because the connectors fail to be created if there's not added
// to the canvas
ws.Nodes.Add(el);
... |
<<<<<<<
=======
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
>>>>>>>
<<<<<<<
#region events
public event NodeHelpEventHandler RequestShowNodeHelp;
public virtual void OnRequestShowNodeHelp(Object sender, NodeHelpEventArgs e)
{
if (Reques... |
<<<<<<<
/// <summary>
/// Extract the Revit GeometryObject's from a Revit Element
/// </summary>
/// <returns></returns>
internal IEnumerable<Autodesk.Revit.DB.GeometryObject> InternalGeometry(bool useSymbolGeometry = false)
=======
[SupressImportIntoVM]
public ... |
<<<<<<<
protected DynamoModel Model;
=======
private DynamoShapeManager.Preloader preloader;
>>>>>>>
protected DynamoModel Model;
private DynamoShapeManager.Preloader preloader;
<<<<<<<
DynamoPathManager.PreloadAsmLibraries(DynamoPathManager.Instance);
... |
<<<<<<<
// This event is raised only, when we can't go down, to next member.
// I.e. we are now at the last member button and we have to move to next member group.
private void MemberGroupsKeyDown(object sender, KeyEventArgs e)
{
var memberInFocus = (Keyboard.FocusedElement ... |
<<<<<<<
A.CallTo(() => appProvider.GetSchemaAsync(appId.Id, A<DomainId>._, false))
=======
A.CallTo(() => appProvider.GetSchemaAsync(appId.Id, A<Guid>._, false, false))
>>>>>>>
A.CallTo(() => appProvider.GetSchemaAsync(appId.Id, A<DomainId>._, false, false)) |
<<<<<<<
/// Formats user text by :
/// 1.Removing whitespaces form the front and back (whitespaces -> space, tab or enter)
/// 2.Removes unnecessary semi colons
/// 3.Adds a semicolon at the end if needed
=======
/// Formats user text by :
/// 1.Removes unnecess... |
<<<<<<<
=======
using System.Xml;
using System.Xml.Serialization;
using Autodesk.Revit.UI.Events;
using Dynamo.NUnit.Tests;
>>>>>>>
using Autodesk.Revit.UI.Events; |
<<<<<<<
get { return _isCurrentSpace; }
set
{
_isCurrentSpace = value;
RaisePropertyChanged(/*NXLT*/"IsCurrentSpace");
}
=======
RegisterConnector(obj);
var handler = ConnectorAdded;
if (handler != null... |
<<<<<<<
[NodeCategory(BuiltinNodeCategories.ANALYZE_STRUCTURE)]
public class dynDynamicRelaxationStep: dynNodeWithOneOutput
=======
[NodeCategory(BuiltinNodeCategories.SIMULATION)]
[IsInteractive(true)]
public class dynDynamicRelaxationStep : dynParticleSystemBase
>>>>>>>
[NodeCategory(Builti... |
<<<<<<<
[Test]
[Category("UnitTests")]
public void File_open_with_all_nodes_Frozen()
{
string openPath = Path.Combine(TestDirectory, @"core\FreezeNodes\TestFrozenStateAllNodes.dyn");
RunModel(openPath);
//check the upstream node is explicitly frozen
... |
<<<<<<<
=======
using Microsoft.Practices.Prism.ViewModel;
>>>>>>> |
<<<<<<<
private Dictionary<Guid, string> backupFilesDict = new Dictionary<Guid, string>();
=======
>>>>>>>
private Dictionary<Guid, string> backupFilesDict = new Dictionary<Guid, string>();
<<<<<<<
DynamoModel.OnRequestDispatcherBeginInvoke(() =>
{
... |
<<<<<<<
protected override void GetLibrariesToPreload(List<string> libraries)
{
libraries.Add("DSCoreNodes.dll");
libraries.Add("FunctionObject.ds");
base.GetLibrariesToPreload(libraries);
}
string TestFolder { get { return GetTestDirectory(); } }
==... |
<<<<<<<
ProtoCore.DSASM.Executable exe = MirrorTarget.exe;
nodesMarkedDirty = MirrorTarget.UpdateDependencyGraph(
graphNode.exprUID, ProtoCore.DSASM.Constants.kInvalidIndex, false, graphNode, exe.instrStreamList[outerBlock].dependencyGraph, outerBlock);
=======
Prot... |
<<<<<<<
public void CanSelectNodeAndTheRestAreDeslected()
{
Assert.Inconclusive("Test not valid after move of selection handling logic to view.");
//var model = ViewModel.Model;
//int numNodes = 100;
//// create 100 nodes, and select them as you go
... |
<<<<<<<
using Point = System.Windows.Point;
=======
using Microsoft.Practices.Prism.Commands;
using Brush = System.Windows.Media.Brush;
>>>>>>>
using Point = System.Windows.Point;
using Brush = System.Windows.Media.Brush; |
<<<<<<<
if (NodeModel.State != ElementState.Error)
=======
if (NodeModel.State != ElementState.ERROR)
>>>>>>>
if (NodeModel.State != ElementState.Error)
<<<<<<<
InfoBubbleDataPacket data = new InfoBubbleDataPacket(style, GetTopLeft(), GetBotRight(), conten... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.