Skip to content

Commit 9c49805

Browse files
KN4CK3RKN4CK3R
committed
Removed old ParentNode.
1 parent 3dba906 commit 9c49805

File tree

11 files changed

+113
-90
lines changed

11 files changed

+113
-90
lines changed

‎ReClass.NET/Forms/MainForm.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -516,9 +516,10 @@ private void memoryViewControl_SelectionChanged(object sender, EventArgs e)
516516

517517
var count = memoryView.SelectedNodes.Count();
518518
var node = memoryView.SelectedNodes.FirstOrDefault();
519+
var parent = node?.GetParentClass();
519520

520-
addBytesToolStripDropDownButton.Enabled = node?.ParentNode != null || node is ClassNode;
521-
insertBytesToolStripDropDownButton.Enabled = count == 1 && node?.ParentNode != null;
521+
addBytesToolStripDropDownButton.Enabled = parent != null || node is ClassNode;
522+
insertBytesToolStripDropDownButton.Enabled = count == 1 && parent != null;
522523

523524
var enabled = count > 0 && !(node is ClassNode);
524525
toolStrip.Items.OfType<TypeToolStripButton>().ForEach(b => b.Enabled = enabled);

‎ReClass.NET/Memory/NodeDissector.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public static void DissectNodes(IEnumerable<BaseHexNode> nodes, MemoryBuffer mem
2020
var type = GuessType(node, memory);
2121
if (type != null)
2222
{
23-
node.ParentNode.ReplaceChildNode(node, type);
23+
node.GetParentClass()?.ReplaceChildNode(node, type);
2424
}
2525
}
2626
}

‎ReClass.NET/Nodes/BaseContainerNode.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ public virtual bool ReplaceChildNode(int index, Type nodeType, ref List<BaseNode
136136
createdNodes?.Add(node);
137137

138138
node.ParentNode = this;
139-
node.ParentNode2 = this;
140139

141140
nodes[index] = node;
142141

@@ -217,7 +216,7 @@ public virtual void InsertBytes(int index, int size, ref List<BaseNode> createdN
217216
node = new Hex8Node();
218217
}
219218

220-
node.ParentNode2 = this;
219+
node.ParentNode = this;
221220
node.Offset = offset;
222221

223222
nodes.Insert(index, node);
@@ -254,7 +253,7 @@ public virtual void InsertNode(int index, BaseNode node)
254253
Contract.Requires(index >= 0);
255254
Contract.Requires(node != null);
256255

257-
node.ParentNode2 = this;
256+
node.ParentNode = this;
258257

259258
nodes.Insert(index, node);
260259
}

‎ReClass.NET/Nodes/BaseNode.cs‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,10 @@ public abstract class BaseNode
3838
public string Comment { get => comment; set { if (value != null && comment != value) { comment = value; CommentChanged?.Invoke(this); } } }
3939

4040
/// <summary>Gets or sets the parent node.</summary>
41-
public BaseContainerNode ParentNode { get; internal set; }
42-
43-
/// <summary>Gets or sets the parent node.</summary>
44-
public BaseNode ParentNode2 { get; internal set; }
41+
public BaseNode ParentNode { get; internal set; }
4542

4643
/// <summary>Gets a value indicating whether this node is wrapped into an other node.</summary>
47-
public bool IsWrapped => ParentNode2 is BaseWrapperNode;
44+
public bool IsWrapped => ParentNode is BaseWrapperNode;
4845

4946
/// <summary>Gets or sets a value indicating whether this node is hidden.</summary>
5047
public bool IsHidden { get; set; }
@@ -94,15 +91,15 @@ protected BaseNode()
9491
/// <returns></returns>
9592
public ClassNode GetParentClass()
9693
{
97-
var parentNode = ParentNode2;
94+
var parentNode = ParentNode;
9895
while (parentNode != null)
9996
{
10097
if (parentNode is ClassNode classNode)
10198
{
10299
return classNode;
103100
}
104101

105-
parentNode = parentNode.ParentNode2;
102+
parentNode = parentNode.ParentNode;
106103
}
107104

108105
return null;
@@ -116,12 +113,12 @@ public BaseWrapperNode GetRootWrapperNode()
116113
{
117114
BaseWrapperNode rootWrapperNode = null;
118115

119-
var parentNode = ParentNode2;
116+
var parentNode = ParentNode;
120117
while (parentNode is BaseWrapperNode wrapperNode)
121118
{
122119
rootWrapperNode = wrapperNode;
123120

124-
parentNode = parentNode.ParentNode2;
121+
parentNode = parentNode.ParentNode;
125122
}
126123

127124
// Test if this node is the root wrapper node.

‎ReClass.NET/Nodes/BaseReferenceNode.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public void ChangeInnerNode(ClassNode node)
2626

2727
InnerNodeChanged?.Invoke(this);
2828

29-
ParentNode?.ChildHasChanged(this);
29+
GetParentClass()?.ChildHasChanged(this);
3030
}
3131
}
3232
}

‎ReClass.NET/Nodes/BaseTextNode.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public override void Update(HotSpot spot)
8383
{
8484
Length = val;
8585

86-
ParentNode.ChildHasChanged(this);
86+
GetParentClass()?.ChildHasChanged(this);
8787
}
8888
}
8989
}

‎ReClass.NET/Nodes/BaseWrapperArrayNode.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
using System;
22
using System.Drawing;
33
using ReClassNET.UI;
44

@@ -110,7 +110,7 @@ public override void Update(HotSpot spot)
110110
{
111111
Count = value;
112112

113-
ParentNode?.ChildHasChanged(this);
113+
GetParentClass()?.ChildHasChanged(this);
114114
}
115115
}
116116
else

‎ReClass.NET/Nodes/BaseWrapperNode.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
using System;
22

33
namespace ReClassNET.Nodes
44
{
@@ -35,12 +35,12 @@ public void ChangeInnerNode(BaseNode node)
3535

3636
if (node != null)
3737
{
38-
node.ParentNode2 = this;
38+
node.ParentNode = this;
3939
}
4040

4141
InnerNodeChanged?.Invoke(this);
4242

43-
ParentNode?.ChildHasChanged(this);
43+
GetParentClass()?.ChildHasChanged(this);
4444
}
4545
}
4646

‎ReClass.NET/Nodes/FunctionNode.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ private void DisassembleRemoteCode(MemoryBuffer memory, IntPtr address)
134134
DisassembleRemoteCode(memory, address, out memorySize);
135135
}
136136

137-
ParentNode?.ChildHasChanged(this);
137+
GetParentClass()?.ChildHasChanged(this);
138138
}
139139
}
140140
}

‎ReClass.NET/Nodes/VTableNode.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,7 @@ public override void InsertBytes(int index, int size, ref List<BaseNode> created
131131
var node = new VMethodNode
132132
{
133133
Offset = offset,
134-
ParentNode = this,
135-
ParentNode2 = this
134+
ParentNode = this
136135
};
137136

138137
nodes.Insert(index, node);

0 commit comments

Comments
 (0)