Skip to content

Commit 673e7da

Browse files
basicx-StrgVbasicx-StrgV
committed
Improved builder naming
1 parent d9a4114 commit 673e7da

10 files changed

Lines changed: 102 additions & 102 deletions

File tree

src/WGet.NET/Builder/AdminSettingBuilder.cs renamed to src/WGet.NET/Builder/WinGetAdminSettingBuilder.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ namespace WGetNET.Builder
99
/// <summary>
1010
/// Builder to create a new <see cref="WGetNET.WinGetAdminSetting"/> instance.
1111
/// </summary>
12-
internal class AdminSettingBuilder : WinGetObjectBuilder<WinGetAdminSetting?>
12+
internal class WinGetAdminSettingBuilder : WinGetObjectBuilder<WinGetAdminSetting?>
1313
{
1414
private string _entryName = string.Empty;
1515
private string _rawContent = string.Empty;
1616
private bool _hasShortenedContent = false;
1717
private bool? _isEnabled = false;
1818

1919
/// <summary>
20-
/// Initializes a new instance of the <see cref="WGetNET.Builder.AdminSettingBuilder"/> class.
20+
/// Initializes a new instance of the <see cref="WGetNET.Builder.WinGetAdminSettingBuilder"/> class.
2121
/// </summary>
22-
public AdminSettingBuilder()
22+
public WinGetAdminSettingBuilder()
2323
{
2424
// Provide empty constructor
2525
}
@@ -62,7 +62,7 @@ public void AddRawContent(string rawContent)
6262
/// </summary>
6363
/// <remarks>
6464
/// There is no need to add raw content after using this method.
65-
/// Using <see cref="AdminSettingBuilder.AddRawContent(string)"/> will override this value again.
65+
/// Using <see cref="WinGetAdminSettingBuilder.AddRawContent(string)"/> will override this value again.
6666
/// </remarks>
6767
/// <param name="status">
6868
/// The status of the admin setting.

src/WGet.NET/Builder/DirectoryBuilder.cs renamed to src/WGet.NET/Builder/WinGetDirectoryBuilder.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ namespace WGetNET.Builder
1111
/// <summary>
1212
/// Builder to create a new <see cref="WGetNET.WinGetDirectory"/> instance.
1313
/// </summary>
14-
internal class DirectoryBuilder : WinGetObjectBuilder<WinGetDirectory?>
14+
internal class WinGetDirectoryBuilder : WinGetObjectBuilder<WinGetDirectory?>
1515
{
1616
private string _entryName = string.Empty;
1717
private string _rawContent = string.Empty;
1818
private bool _hasShortenedContent = false;
1919
private DirectoryInfo? _directoryInfo = null;
2020

2121
/// <summary>
22-
/// Initializes a new instance of the <see cref="WGetNET.Builder.DirectoryBuilder"/> class.
22+
/// Initializes a new instance of the <see cref="WGetNET.Builder.WinGetDirectoryBuilder"/> class.
2323
/// </summary>
24-
public DirectoryBuilder()
24+
public WinGetDirectoryBuilder()
2525
{
2626
// Provide empty constructor
2727
}

src/WGet.NET/Builder/InfoSetBuilder.cs renamed to src/WGet.NET/Builder/WinGetInfoBuilder.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace WGetNET.Builder
1212
/// <summary>
1313
/// Builder to create a new <see cref="WGetNET.WinGetInfo"/> instance.
1414
/// </summary>
15-
internal class InfoSetBuilder : WinGetObjectBuilder<WinGetInfo>
15+
internal class WinGetInfoBuilder : WinGetObjectBuilder<WinGetInfo>
1616
{
1717
private string _versionString = string.Empty;
1818
private Version? _version = null;
@@ -21,9 +21,9 @@ internal class InfoSetBuilder : WinGetObjectBuilder<WinGetInfo>
2121
private List<WinGetAdminSetting> _adminSettings = new();
2222

2323
/// <summary>
24-
/// Initializes a new instance of the <see cref="WGetNET.Builder.InfoSetBuilder"/> class.
24+
/// Initializes a new instance of the <see cref="WGetNET.Builder.WinGetInfoBuilder"/> class.
2525
/// </summary>
26-
public InfoSetBuilder()
26+
public WinGetInfoBuilder()
2727
{
2828
// Provide empty constructor
2929
}

src/WGet.NET/Builder/LinkBuilder.cs renamed to src/WGet.NET/Builder/WinGetLinkBuilder.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@ namespace WGetNET.Builder
1010
/// <summary>
1111
/// Builder to create a new <see cref="WGetNET.WinGetLink"/> instance.
1212
/// </summary>
13-
internal class LinkBuilder : WinGetObjectBuilder<WinGetLink?>
13+
internal class WinGetLinkBuilder : WinGetObjectBuilder<WinGetLink?>
1414
{
1515
private string _entryName = string.Empty;
1616
private string _rawContent = string.Empty;
1717
private bool _hasShortenedContent = false;
1818
private Uri? _url = null;
1919

2020
/// <summary>
21-
/// Initializes a new instance of the <see cref="WGetNET.Builder.LinkBuilder"/> class.
21+
/// Initializes a new instance of the <see cref="WGetNET.Builder.WinGetLinkBuilder"/> class.
2222
/// </summary>
23-
public LinkBuilder()
23+
public WinGetLinkBuilder()
2424
{
2525
// Provide empty constructor
2626
}

src/WGet.NET/Builder/PackageBuilder.cs renamed to src/WGet.NET/Builder/WinGetPackageBuilder.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace WGetNET.Builder
1111
/// <summary>
1212
/// Builder to create a new <see cref="WGetNET.WinGetPackage"/> instance.
1313
/// </summary>
14-
internal class PackageBuilder : WinGetObjectBuilder<WinGetPackage>
14+
internal class WinGetPackageBuilder : WinGetObjectBuilder<WinGetPackage>
1515
{
1616
private string _name = string.Empty;
1717
private string _id = string.Empty;
@@ -23,9 +23,9 @@ internal class PackageBuilder : WinGetObjectBuilder<WinGetPackage>
2323
private bool _hasShortenedId = false;
2424

2525
/// <summary>
26-
/// Initializes a new instance of the <see cref="WGetNET.Builder.PackageBuilder"/> class.
26+
/// Initializes a new instance of the <see cref="WGetNET.Builder.WinGetPackageBuilder"/> class.
2727
/// </summary>
28-
public PackageBuilder()
28+
public WinGetPackageBuilder()
2929
{
3030
// Provide empty constructor
3131
}

src/WGet.NET/Builder/PinnedPackageBuilder.cs renamed to src/WGet.NET/Builder/WinGetPinnedPackageBuilder.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace WGetNET.Builder
1111
/// <summary>
1212
/// Builder to create a new <see cref="WGetNET.WinGetPinnedPackage"/> instance.
1313
/// </summary>
14-
internal class PinnedPackageBuilder : WinGetObjectBuilder<WinGetPinnedPackage>
14+
internal class WinGetPinnedPackageBuilder : WinGetObjectBuilder<WinGetPinnedPackage>
1515
{
1616
private string _pinTypeString = string.Empty;
1717
private string _pinnedVersionString = string.Empty;
@@ -27,9 +27,9 @@ internal class PinnedPackageBuilder : WinGetObjectBuilder<WinGetPinnedPackage>
2727
private bool _hasShortenedId = false;
2828

2929
/// <summary>
30-
/// Initializes a new instance of the <see cref="WGetNET.Builder.PinnedPackageBuilder"/> class.
30+
/// Initializes a new instance of the <see cref="WGetNET.Builder.WinGetPinnedPackageBuilder"/> class.
3131
/// </summary>
32-
public PinnedPackageBuilder()
32+
public WinGetPinnedPackageBuilder()
3333
{
3434
// Provide empty constructor
3535
}

‎src/WGet.NET/Components/Internal/ProcessOutputReader.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ private List<WinGetPackage> CreatePackageListFromOutput(string[] output, int[] c
9191
return resultList;
9292
}
9393

94-
PackageBuilder builder = new();
94+
WinGetPackageBuilder builder = new();
9595

9696
for (int i = 0; i < output.Length; i++)
9797
{
@@ -247,7 +247,7 @@ private List<WinGetPinnedPackage> CreatePinnedPackageListFromOutput(string[] out
247247
return resultList;
248248
}
249249

250-
PinnedPackageBuilder builder = new();
250+
WinGetPinnedPackageBuilder builder = new();
251251

252252
for (int i = 0; i < output.Length; i++)
253253
{
@@ -441,7 +441,7 @@ private WinGetInfo ReadDataByRange(string[] output, InfoActionVersionId actionVe
441441
/// </returns>
442442
private WinGetInfo ReadDataForRange1(string[] output)
443443
{
444-
InfoSetBuilder builder = new();
444+
WinGetInfoBuilder builder = new();
445445

446446
string version = ReadVersionFromData(output);
447447

@@ -473,7 +473,7 @@ private WinGetInfo ReadDataForRange1(string[] output)
473473
/// </returns>
474474
private WinGetInfo ReadDataForRange2(string[] output)
475475
{
476-
InfoSetBuilder builder = new();
476+
WinGetInfoBuilder builder = new();
477477

478478
string version = ReadVersionFromData(output);
479479

@@ -508,7 +508,7 @@ private WinGetInfo ReadDataForRange2(string[] output)
508508
/// </returns>
509509
private WinGetInfo ReadDataForRange3(string[] output)
510510
{
511-
InfoSetBuilder builder = new();
511+
WinGetInfoBuilder builder = new();
512512

513513
string version = ReadVersionFromData(output);
514514

@@ -548,7 +548,7 @@ private WinGetInfo ReadDataForRange3(string[] output)
548548
/// </returns>
549549
private WinGetInfo ReadDataForRange4(string[] output)
550550
{
551-
InfoSetBuilder builder = new();
551+
WinGetInfoBuilder builder = new();
552552

553553
string version = ReadVersionFromData(output);
554554

@@ -591,7 +591,7 @@ private WinGetInfo ReadDataForRange4(string[] output)
591591
string[] entry = output[index].Split(':');
592592
if (entry.Length == 2)
593593
{
594-
DirectoryBuilder builder = new();
594+
WinGetDirectoryBuilder builder = new();
595595

596596
builder.AddEntryName(entry[0].Trim());
597597
builder.AddRawContent(entry[1].Trim());
@@ -618,7 +618,7 @@ private List<WinGetDirectory> ReadDirectories(string[] output)
618618
StringBuilder nameBuilder = new();
619619
StringBuilder contentBuilder = new();
620620

621-
DirectoryBuilder directoryBuilder = new();
621+
WinGetDirectoryBuilder directoryBuilder = new();
622622

623623
for (int i = 0; i < output.Length; i++)
624624
{
@@ -704,7 +704,7 @@ private List<WinGetLink> ReadLinks(string[] output)
704704

705705
StringBuilder nameBuilder = new();
706706

707-
LinkBuilder linkBuilder = new();
707+
WinGetLinkBuilder linkBuilder = new();
708708

709709
for (int i = 0; i < output.Length; i++)
710710
{
@@ -763,7 +763,7 @@ private List<WinGetAdminSetting> ReadAdminSettings(string[] output)
763763
{
764764
List<WinGetAdminSetting> adminSetting = new();
765765

766-
AdminSettingBuilder adminOptionBuilder = new();
766+
WinGetAdminSettingBuilder adminOptionBuilder = new();
767767

768768
for (int i = 0; i < output.Length; i++)
769769
{

‎src/WGet.NET/Components/WinGet.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ public List<WinGetAdminSetting> GetAdminSettings()
294294
return adminSettings;
295295
}
296296

297-
AdminSettingBuilder builder = new();
297+
WinGetAdminSettingBuilder builder = new();
298298
foreach (KeyValuePair<string, bool> entry in settings.AdminSettings)
299299
{
300300
builder.Clear();
@@ -341,7 +341,7 @@ public async Task<List<WinGetAdminSetting>> GetAdminSettingsAsync(CancellationTo
341341
return adminSettings;
342342
}
343343

344-
AdminSettingBuilder builder = new();
344+
WinGetAdminSettingBuilder builder = new();
345345
foreach (KeyValuePair<string, bool> entry in settings.AdminSettings)
346346
{
347347
if (cancellationToken.IsCancellationRequested)

‎src/WGet.NET/Data/WinGetPackage.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ public static WinGetPackage Create(string name, string id, string version, strin
229229
ArgsHelper.ThrowIfStringIsNullOrWhiteSpace(version, "version");
230230
ArgsHelper.ThrowIfObjectIsNull(sourceName, "sourceName");
231231

232-
PackageBuilder builder = new();
232+
WinGetPackageBuilder builder = new();
233233

234234
builder.AddName(name);
235235
builder.AddId(id);
@@ -264,7 +264,7 @@ public static WinGetPackage Create(string name, string id, string version, strin
264264
ArgsHelper.ThrowIfStringIsNullOrWhiteSpace(availableVersion, "availableVersion");
265265
ArgsHelper.ThrowIfObjectIsNull(sourceName, "sourceName");
266266

267-
PackageBuilder builder = new();
267+
WinGetPackageBuilder builder = new();
268268

269269
builder.AddName(name);
270270
builder.AddId(id);
@@ -298,7 +298,7 @@ public static WinGetPackage Create(string name, string id, Version version, stri
298298
ArgsHelper.ThrowIfObjectIsNull(version, "version");
299299
ArgsHelper.ThrowIfObjectIsNull(sourceName, "sourceName");
300300

301-
PackageBuilder builder = new();
301+
WinGetPackageBuilder builder = new();
302302

303303
builder.AddName(name);
304304
builder.AddId(id);
@@ -333,7 +333,7 @@ public static WinGetPackage Create(string name, string id, Version version, Vers
333333
ArgsHelper.ThrowIfObjectIsNull(availableVersion, "availableVersion");
334334
ArgsHelper.ThrowIfObjectIsNull(sourceName, "sourceName");
335335

336-
PackageBuilder builder = new();
336+
WinGetPackageBuilder builder = new();
337337

338338
builder.AddName(name);
339339
builder.AddId(id);

0 commit comments

Comments
 (0)