Skip to content

Commit 759ce7a

Browse files
KN4CK3RKN4CK3R
committed
Renamed class.
1 parent ea5dfa1 commit 759ce7a

File tree

10 files changed

+48
-48
lines changed

10 files changed

+48
-48
lines changed

‎ReClass.NET/DataExchange/ReClass/ReClassNetFile.Read.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public void Load(Stream input, ILogger logger)
7474
{
7575
var name = enumElement.Attribute(XmlNameAttribute)?.Value ?? string.Empty;
7676
var useFlagsMode = (bool?)enumElement.Attribute(XmlFlagsAttribute) ?? false;
77-
var size = enumElement.Attribute(XmlSizeAttribute).GetEnumValue<EnumMetaData.UnderlyingTypeSize>();
77+
var size = enumElement.Attribute(XmlSizeAttribute).GetEnumValue<EnumDescription.UnderlyingTypeSize>();
7878

7979
var values = new Dictionary<string, long>();
8080
foreach (var itemElement in enumElement.Elements(XmlItemElement))
@@ -85,7 +85,7 @@ public void Load(Stream input, ILogger logger)
8585
values.Add(itemName, itemValue);
8686
}
8787

88-
var @enum = new EnumMetaData
88+
var @enum = new EnumDescription
8989
{
9090
Name = name
9191
};
@@ -299,7 +299,7 @@ ClassNode GetClassNodeFromElementReference()
299299
case EnumNode enumNode:
300300
{
301301
var enumName = element.Attribute(XmlReferenceAttribute)?.Value ?? string.Empty;
302-
var @enum = project.Enums.FirstOrDefault(e => e.Name == enumName) ?? EnumMetaData.Default;
302+
var @enum = project.Enums.FirstOrDefault(e => e.Name == enumName) ?? EnumDescription.Default;
303303

304304
enumNode.ChangeEnum(@enum);
305305
break;

‎ReClass.NET/DataExchange/ReClass/ReClassNetFile.Write.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public void Save(Stream output, ILogger logger)
4646
}
4747
}
4848

49-
private static IEnumerable<XElement> CreateEnumElements(IEnumerable<EnumMetaData> enums)
49+
private static IEnumerable<XElement> CreateEnumElements(IEnumerable<EnumDescription> enums)
5050
{
5151
return enums.Select(e => new XElement(
5252
XmlEnumElement,
@@ -165,7 +165,7 @@ XElement CreateElement()
165165
}
166166
case EnumNode enumNode:
167167
{
168-
element.SetAttributeValue(XmlReferenceAttribute, enumNode.MetaData.Name);
168+
element.SetAttributeValue(XmlReferenceAttribute, enumNode.Enum.Name);
169169
break;
170170
}
171171
}

‎ReClass.NET/Forms/EnumEditorForm.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ namespace ReClassNET.Forms
1010
{
1111
public partial class EnumEditorForm : IconForm
1212
{
13-
private readonly EnumMetaData @enum;
13+
private readonly EnumDescription @enum;
1414

15-
public EnumEditorForm(EnumMetaData @enum)
15+
public EnumEditorForm(EnumDescription @enum)
1616
{
1717
Contract.Requires(@enum != null);
1818

@@ -84,5 +84,5 @@ void SetErrorText(string text)
8484
}
8585
}
8686

87-
internal class UnderlyingSizeComboBox : EnumComboBox<EnumMetaData.UnderlyingTypeSize> { }
87+
internal class UnderlyingSizeComboBox : EnumComboBox<EnumDescription.UnderlyingTypeSize> { }
8888
}

‎ReClass.NET/Forms/EnumSelectionForm.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public partial class EnumSelectionForm : IconForm
1111
{
1212
private readonly ReClassNetProject project;
1313

14-
public EnumMetaData SelectedItem => itemListBox.SelectedItem as EnumMetaData;
14+
public EnumDescription SelectedItem => itemListBox.SelectedItem as EnumDescription;
1515

1616
public EnumSelectionForm(ReClassNetProject project)
1717
{
@@ -64,7 +64,7 @@ private void editEnumIconButton_Click(object sender, EventArgs e)
6464

6565
private void addEnumIconButton_Click(object sender, EventArgs e)
6666
{
67-
var @enum = new EnumMetaData
67+
var @enum = new EnumDescription
6868
{
6969
Name = "Enum"
7070
};

‎ReClass.NET/Forms/MainForm.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -862,7 +862,7 @@ private void memoryViewControl_ChangeEnumTypeClick(object sender, NodeClickEvent
862862
{
863863
using (var csf = new EnumSelectionForm(CurrentProject))
864864
{
865-
var size = enumNode.MetaData.Size;
865+
var size = enumNode.Enum.Size;
866866

867867
if (csf.ShowDialog() == DialogResult.OK)
868868
{
@@ -873,7 +873,7 @@ private void memoryViewControl_ChangeEnumTypeClick(object sender, NodeClickEvent
873873
}
874874
}
875875

876-
if (size != enumNode.MetaData.Size)
876+
if (size != enumNode.Enum.Size)
877877
{
878878
// Update the parent container because the enum size has changed.
879879
enumNode.GetParentContainer()?.ChildHasChanged(enumNode);

‎ReClass.NET/Nodes/EnumNode.cs

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@ namespace ReClassNET.Nodes
1212
{
1313
public class EnumNode : BaseNode
1414
{
15-
public override int MemorySize => (int)MetaData.Size;
15+
public override int MemorySize => (int)Enum.Size;
1616

17-
public EnumMetaData MetaData { get; private set; } = EnumMetaData.Default;
17+
public EnumDescription Enum { get; private set; } = EnumDescription.Default;
1818

1919
public override void GetUserInterfaceInfo(out string name, out Image icon)
2020
{
2121
name = "Enum";
2222
icon = Properties.Resources.B16x16_Button_Enum;
2323
}
2424

25-
public void ChangeEnum(EnumMetaData @enum)
25+
public void ChangeEnum(EnumDescription @enum)
2626
{
2727
Contract.Requires(@enum != null);
2828

29-
MetaData = @enum;
29+
Enum = @enum;
3030

3131
GetParentContainer()?.ChildHasChanged(this);
3232
}
@@ -37,15 +37,15 @@ public void ChangeEnum(EnumMetaData @enum)
3737
/// <returns></returns>
3838
public BaseNumericNode GetUnderlayingNode()
3939
{
40-
switch (MetaData.Size)
40+
switch (Enum.Size)
4141
{
42-
case EnumMetaData.UnderlyingTypeSize.OneByte:
42+
case EnumDescription.UnderlyingTypeSize.OneByte:
4343
return new UInt8Node();
44-
case EnumMetaData.UnderlyingTypeSize.TwoBytes:
44+
case EnumDescription.UnderlyingTypeSize.TwoBytes:
4545
return new UInt16Node();
46-
case EnumMetaData.UnderlyingTypeSize.FourBytes:
46+
case EnumDescription.UnderlyingTypeSize.FourBytes:
4747
return new UInt32Node();
48-
case EnumMetaData.UnderlyingTypeSize.EightBytes:
48+
case EnumDescription.UnderlyingTypeSize.EightBytes:
4949
return new UInt64Node();
5050
}
5151

@@ -54,15 +54,15 @@ public BaseNumericNode GetUnderlayingNode()
5454

5555
public long ReadValueFromMemory(MemoryBuffer memory)
5656
{
57-
switch (MetaData.Size)
57+
switch (Enum.Size)
5858
{
59-
case EnumMetaData.UnderlyingTypeSize.OneByte:
59+
case EnumDescription.UnderlyingTypeSize.OneByte:
6060
return memory.ReadInt8(Offset);
61-
case EnumMetaData.UnderlyingTypeSize.TwoBytes:
61+
case EnumDescription.UnderlyingTypeSize.TwoBytes:
6262
return memory.ReadInt16(Offset);
63-
case EnumMetaData.UnderlyingTypeSize.FourBytes:
63+
case EnumDescription.UnderlyingTypeSize.FourBytes:
6464
return memory.ReadInt32(Offset);
65-
case EnumMetaData.UnderlyingTypeSize.EightBytes:
65+
case EnumDescription.UnderlyingTypeSize.EightBytes:
6666
return memory.ReadInt64(Offset);
6767
}
6868

@@ -71,15 +71,15 @@ public long ReadValueFromMemory(MemoryBuffer memory)
7171

7272
private string GetStringRepresentation(long value)
7373
{
74-
if (!MetaData.UseFlagsMode)
74+
if (!Enum.UseFlagsMode)
7575
{
76-
var index = MetaData.Values.FindIndex(kv => kv.Value == value);
76+
var index = Enum.Values.FindIndex(kv => kv.Value == value);
7777
if (index == -1)
7878
{
7979
return value.ToString();
8080
}
8181

82-
return MetaData.Values[index].Key;
82+
return Enum.Values[index].Key;
8383
}
8484

8585
return GetFlagsStringRepresentation(value);
@@ -89,7 +89,7 @@ private string GetFlagsStringRepresentation(long value)
8989
{
9090
var result = (ulong)value;
9191

92-
var values = MetaData.Values;
92+
var values = Enum.Values;
9393

9494
var index = values.Count - 1;
9595
var retval = new StringBuilder();
@@ -158,7 +158,7 @@ public override Size Draw(ViewInfo view, int x, int y)
158158
{
159159
x = AddText(view, x, y, view.Settings.NameColor, HotSpot.NameId, Name) + view.Font.Width;
160160
}
161-
x = AddText(view, x, y, view.Settings.ValueColor, HotSpot.NoneId, $"<{MetaData.Name}>") + view.Font.Width;
161+
x = AddText(view, x, y, view.Settings.ValueColor, HotSpot.NoneId, $"<{Enum.Name}>") + view.Font.Width;
162162
x = AddIcon(view, x, y, Icons.Change, 4, HotSpotType.ChangeEnumType) + view.Font.Width;
163163

164164
x = AddText(view, x, y, view.Settings.TextColor, HotSpot.NoneId, "=") + view.Font.Width;

‎ReClass.NET/Project/EnumMetaData.cs renamed to ‎ReClass.NET/Project/EnumDescription.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace ReClassNET.Project
66
{
7-
public class EnumMetaData
7+
public class EnumDescription
88
{
99
public enum UnderlyingTypeSize
1010
{
@@ -14,7 +14,7 @@ public enum UnderlyingTypeSize
1414
EightBytes = 8
1515
}
1616

17-
public static EnumMetaData Default => new EnumMetaData { Name = "DummyEnum" };
17+
public static EnumDescription Default => new EnumDescription { Name = "DummyEnum" };
1818

1919
public string Name { get; set; } = string.Empty;
2020

‎ReClass.NET/Project/ReClassNetProject.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ public class ReClassNetProject : IDisposable
1313
public event ClassesChangedEvent ClassAdded;
1414
public event ClassesChangedEvent ClassRemoved;
1515

16-
public delegate void EnumsChangedEvent(EnumMetaData sender);
16+
public delegate void EnumsChangedEvent(EnumDescription sender);
1717
public event EnumsChangedEvent EnumAdded;
1818
public event EnumsChangedEvent EnumRemoved;
1919

20-
private readonly List<EnumMetaData> enums = new List<EnumMetaData>();
20+
private readonly List<EnumDescription> enums = new List<EnumDescription>();
2121
private readonly List<ClassNode> classes = new List<ClassNode>();
2222

23-
public IEnumerable<EnumMetaData> Enums => enums;
23+
public IEnumerable<EnumDescription> Enums => enums;
2424

2525
public IEnumerable<ClassNode> Classes => classes;
2626

@@ -143,7 +143,7 @@ public void RemoveUnusedClasses()
143143
}
144144
}
145145

146-
public void AddEnum(EnumMetaData @enum)
146+
public void AddEnum(EnumDescription @enum)
147147
{
148148
Contract.Requires(@enum != null);
149149

@@ -152,7 +152,7 @@ public void AddEnum(EnumMetaData @enum)
152152
EnumAdded?.Invoke(@enum);
153153
}
154154

155-
public void RemoveEnum(EnumMetaData @enum)
155+
public void RemoveEnum(EnumDescription @enum)
156156
{
157157
Contract.Requires(@enum != null);
158158

@@ -168,14 +168,14 @@ public void RemoveEnum(EnumMetaData @enum)
168168
}
169169
}
170170

171-
private IEnumerable<EnumNode> GetEnumReferences(EnumMetaData @enum)
171+
private IEnumerable<EnumNode> GetEnumReferences(EnumDescription @enum)
172172
{
173173
Contract.Requires(@enum != null);
174174

175175
return classes
176176
.SelectMany(c => c.Nodes.Where(n => n is EnumNode || (n as BaseWrapperNode)?.ResolveMostInnerNode() is EnumNode))
177177
.Cast<EnumNode>()
178-
.Where(e => e.MetaData == @enum);
178+
.Where(e => e.Enum == @enum);
179179
}
180180
}
181181

@@ -198,10 +198,10 @@ public ClassReferencedException(ClassNode node, IEnumerable<ClassNode> reference
198198

199199
public class EnumReferencedException : Exception
200200
{
201-
public EnumMetaData Enum { get; }
201+
public EnumDescription Enum { get; }
202202
public IEnumerable<ClassNode> References { get; }
203203

204-
public EnumReferencedException(EnumMetaData @enum, IEnumerable<ClassNode> references)
204+
public EnumReferencedException(EnumDescription @enum, IEnumerable<ClassNode> references)
205205
: base($"The enum '{@enum.Name}' is referenced in other classes.")
206206
{
207207
Contract.Requires(@enum != null);

‎ReClass.NET/ReClass.NET.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@
273273
<Compile Include="Nodes\NodeUuid.cs" />
274274
<Compile Include="Nodes\PointerNode.cs" />
275275
<Compile Include="Project\CppTypeMapping.cs" />
276-
<Compile Include="Project\EnumMetaData.cs" />
276+
<Compile Include="Project\EnumDescription.cs" />
277277
<Compile Include="Project\ReClassNetProject.cs" />
278278
<Compile Include="UI\BannerBox.cs">
279279
<SubType>Component</SubType>

‎ReClass.NET/UI/ProjectView.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ private void RebuildClassHierarchy(HashSet<ClassNode> seen)
9696

9797
public class EnumTreeNode : TreeNode
9898
{
99-
public EnumMetaData Enum { get; }
99+
public EnumDescription Enum { get; }
100100

101-
public EnumTreeNode(EnumMetaData @enum)
101+
public EnumTreeNode(EnumDescription @enum)
102102
{
103103
Contract.Requires(@enum != null);
104104

@@ -429,14 +429,14 @@ public void UpdateClassNode(ClassNode node)
429429
projectTreeView.EndUpdate();
430430
}
431431

432-
public void AddEnum(EnumMetaData @enum)
432+
public void AddEnum(EnumDescription @enum)
433433
{
434434
Contract.Requires(@enum != null);
435435

436436
AddEnums(new[] { @enum });
437437
}
438438

439-
public void AddEnums(IEnumerable<EnumMetaData> enums)
439+
public void AddEnums(IEnumerable<EnumDescription> enums)
440440
{
441441
Contract.Requires(enums != null);
442442

@@ -454,7 +454,7 @@ public void AddEnums(IEnumerable<EnumMetaData> enums)
454454
projectTreeView.EndUpdate();
455455
}
456456

457-
public void UpdateEnumNode(EnumMetaData @enum)
457+
public void UpdateEnumNode(EnumDescription @enum)
458458
{
459459
Contract.Requires(@enum != null);
460460

0 commit comments

Comments
 (0)