Skip to content

Commit 1ed731e

Browse files
JanKallmanJanKallman
committed
Working on sample 30-Working with range. Merged FileUtils to one class
1 parent d931fc2 commit 1ed731e

39 files changed

+317
-208
lines changed

Diff for: ‎01-GettingStarted/GettingStartedSample.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public static string Run()
110110
package.Workbook.Properties.SetCustomPropertyValue("Checked by", "Jan Källman");
111111
package.Workbook.Properties.SetCustomPropertyValue("AssemblyName", "EPPlus");
112112

113-
var xlFile = FileOutputUtil.GetFileInfo("01-GettingStarted.xlsx");
113+
var xlFile = FileUtil.GetCleanFileInfo("01-GettingStarted.xlsx");
114114

115115
// Save our new workbook in the output directory and we are done!
116116
package.SaveAs(xlFile);

Diff for: ‎02-ReadWorkbook/ReadWorkbookSample.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class ReadWorkbookSample
2323
{
2424
public static void Run()
2525
{
26-
var filePath = FileInputUtil.GetFileInfo("02-ReadWorkbook", "ReadWorkbook.xlsx").FullName;
26+
var filePath = FileUtil.GetFileInfo("02-ReadWorkbook", "ReadWorkbook.xlsx").FullName;
2727
Console.WriteLine("Reading column 2 of {0}", filePath);
2828
Console.WriteLine();
2929

Diff for: ‎03-UsingAsyncAwait/UsingAsyncAwaitSample.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class UsingAsyncAwaitSample
3030
/// <param name="connectionString">The connection string to the SQLite database</param>
3131
public static async Task RunAsync(string connectionString)
3232
{
33-
var file = FileOutputUtil.GetFileInfo("03-AsyncAwait.xlsx");
33+
var file = FileUtil.GetCleanFileInfo("03-AsyncAwait.xlsx");
3434
using (ExcelPackage package = new ExcelPackage(file))
3535
{
3636
var ws = package.Workbook.Worksheets.Add("Sheet1");
@@ -54,10 +54,10 @@ public static async Task RunAsync(string connectionString)
5454
await package.LoadAsync(file);
5555

5656
var newWs = package.Workbook.Worksheets.Add("AddedSheet2");
57-
var range = await newWs.Cells["A1"].LoadFromTextAsync(FileInputUtil.GetFileInfo("03-UsingAsyncAwait", "Importfile.txt"), new ExcelTextFormat { Delimiter='\t' });
57+
var range = await newWs.Cells["A1"].LoadFromTextAsync(FileUtil.GetFileInfo("03-UsingAsyncAwait", "Importfile.txt"), new ExcelTextFormat { Delimiter='\t' });
5858
range.AutoFitColumns();
5959

60-
await package.SaveAsAsync(FileOutputUtil.GetFileInfo("03-AsyncAwait-LoadedAndModified.xlsx"));
60+
await package.SaveAsAsync(FileUtil.GetCleanFileInfo("03-AsyncAwait-LoadedAndModified.xlsx"));
6161
}
6262
}
6363
}

Diff for: ‎04-LoadingData/LoadingDataFromCollectionWithAttributes.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public static void Run()
5959
new Actor2{ Salary = 315.34, Tax = 0.28, FirstName = "Lisa", MiddleName = "Maria", LastName = "Gonzales", Birthdate = new DateTime(1971, 10, 2)}
6060
};
6161

62-
using (var package = new ExcelPackage(FileOutputUtil.GetFileInfo("04-LoadFromCollectionAttributes.xlsx")))
62+
using (var package = new ExcelPackage(FileUtil.GetCleanFileInfo("04-LoadFromCollectionAttributes.xlsx")))
6363
{
6464
// using the Actor class above
6565
var sheet = package.Workbook.Worksheets.Add("Actors");

Diff for: ‎04-LoadingData/LoadingDataWithDynamicObjects.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public static void Run()
5252
};
5353

5454
// Create a workbook with a worksheet and load the data into a table
55-
using(var package = new ExcelPackage(FileOutputUtil.GetFileInfo("04-LoadDynamicObjects.xlsx")))
55+
using(var package = new ExcelPackage(FileUtil.GetCleanFileInfo("04-LoadDynamicObjects.xlsx")))
5656
{
5757
var sheet = package.Workbook.Worksheets.Add("Dynamic");
5858
sheet.Cells["A1"].LoadFromDictionaries(items, c =>
@@ -69,8 +69,8 @@ public static void Run()
6969
}
7070

7171
// Load data from json (in this case a file)
72-
var jsonItems = JsonConvert.DeserializeObject<IEnumerable<ExpandoObject>>(File.ReadAllText(FileInputUtil.GetFileInfo("04-LoadingData", "testdata.json").FullName));
73-
using (var package = new ExcelPackage(FileOutputUtil.GetFileInfo("04-LoadJsonFromFile.xlsx")))
72+
var jsonItems = JsonConvert.DeserializeObject<IEnumerable<ExpandoObject>>(File.ReadAllText(FileUtil.GetFileInfo("04-LoadingData", "testdata.json").FullName));
73+
using (var package = new ExcelPackage(FileUtil.GetCleanFileInfo("04-LoadJsonFromFile.xlsx")))
7474
{
7575
var sheet = package.Workbook.Worksheets.Add("Dynamic");
7676
sheet.Cells["A1"].LoadFromDictionaries(jsonItems, c =>

Diff for: ‎04-LoadingData/LoadingDataWithTablesSample.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public static void Run()
3333
var pck = new ExcelPackage();
3434

3535
//Create a datatable with the directories and files from the current directory...
36-
DataTable dt = GetDataTable(FileOutputUtil.GetDirectoryInfo("."));
36+
DataTable dt = GetDataTable(FileUtil.GetDirectoryInfo("."));
3737

3838
var wsDt = pck.Workbook.Worksheets.Add("FromDataTable");
3939

@@ -108,7 +108,7 @@ orderby file.Name ascending
108108
wsList.Cells[wsList.Dimension.Address].AutoFitColumns();
109109

110110
//...and save
111-
var fi = FileOutputUtil.GetFileInfo("04-LoadingData.xlsx");
111+
var fi = FileUtil.GetCleanFileInfo("04-LoadingData.xlsx");
112112
pck.SaveAs(fi);
113113
pck.Dispose();
114114
}

Diff for: ‎05-ImportAndExportCsvFiles/ImportAndExportCsvFilesSample.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public static class ImportAndExportCsvFilesSample
3737
/// <returns></returns>
3838
public static async Task<string> Run()
3939
{
40-
FileInfo newFile = FileOutputUtil.GetFileInfo(@"05-LoadDataFromCsvFilesIntoTables.xlsx");
40+
FileInfo newFile = FileUtil.GetCleanFileInfo(@"05-LoadDataFromCsvFilesIntoTables.xlsx");
4141

4242
using (ExcelPackage package = new ExcelPackage())
4343
{
@@ -60,7 +60,7 @@ private static async Task ExportTableAsync(ExcelPackage package)
6060
Encoding = new UTF8Encoding(),
6161
SkipLinesEnd=1 //Skip the totals row
6262
};
63-
await ws.Cells[tbl.Address.Address].SaveToTextAsync(FileOutputUtil.GetFileInfo("05-ExportedFromEPPlus.csv"), format);
63+
await ws.Cells[tbl.Address.Address].SaveToTextAsync(FileUtil.GetCleanFileInfo("05-ExportedFromEPPlus.csv"), format);
6464

6565
Console.WriteLine($"Writing the text file 'ExportedTable.csv'...");
6666
}
@@ -79,7 +79,7 @@ private static void LoadFile1(ExcelPackage package)
7979
SkipLinesEnd = 1
8080
};
8181

82-
var file1 = FileInputUtil.GetFileInfo("05-ImportAndExportCsvFiles", "Sample5-1.txt");
82+
var file1 = FileUtil.GetFileInfo("05-ImportAndExportCsvFiles", "Sample5-1.txt");
8383

8484
//Now read the file into the sheet. Start from cell A1. Create a table with style 27. First row contains the header.
8585
Console.WriteLine("Load the text file...");
@@ -150,7 +150,7 @@ private static async Task LoadFile2Async(ExcelPackage package)
150150

151151
//Now read the file into the sheet.
152152
Console.WriteLine("Load the text file...");
153-
var file2 = FileInputUtil.GetFileInfo("05-ImportAndExportCsvFiles", "Sample5-2.txt");
153+
var file2 = FileUtil.GetFileInfo("05-ImportAndExportCsvFiles", "Sample5-2.txt");
154154

155155
var range = await sheet.Cells["A1"].LoadFromTextAsync(file2, format);
156156

Diff for: ‎06-FormulaCalculation/CalculateExistingWorkbook.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ private static void RemoveCalculatedFormulaValues(ExcelWorkbook workbook)
5252
public void Run()
5353
{
5454
//var resourceStream = GetResource("EPPlusSampleApp.Core.FormulaCalculation.FormulaCalcSample.xlsx");
55-
var filePath = FileInputUtil.GetFileInfo("06-FormulaCalculation", "FormulaCalcSample.xlsx").FullName;
55+
var filePath = FileUtil.GetFileInfo("06-FormulaCalculation", "FormulaCalcSample.xlsx").FullName;
5656
using (var package = new ExcelPackage(new FileInfo(filePath)))
5757
{
5858
// Read the value from the workbook. This is calculated by Excel.

Diff for: ‎07-OpenWorkbookAddDataAndChart/OpenWorkbookAndAddDataAndChart.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ public class OpenWorkbookAndAddDataAndChartSample
2929
/// </summary>
3030
public static string Run()
3131
{
32-
FileInfo newFile = FileOutputUtil.GetFileInfo("07-OpenWorkbookAndAddDataAndChartSample.xlsx");
33-
FileInfo templateFile = FileInputUtil.GetFileInfo("07-OpenWorkbookAddDataAndChart", "ExistingWorkbook.xlsx");
32+
FileInfo newFile = FileUtil.GetCleanFileInfo("07-OpenWorkbookAndAddDataAndChartSample.xlsx");
33+
FileInfo templateFile = FileUtil.GetFileInfo("07-OpenWorkbookAddDataAndChart", "ExistingWorkbook.xlsx");
3434

3535
using (ExcelPackage package = new ExcelPackage(newFile, templateFile))
3636
{

Diff for: ‎08-SalesReport/SalesReport.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class SalesReportFromDatabase
2929
/// <param name="connectionString">The connection string to the SQLite database</param>
3030
public static string Run(string connectionString)
3131
{
32-
var file = FileOutputUtil.GetFileInfo("08-Salesreport.xlsx");
32+
var file = FileUtil.GetCleanFileInfo("08-Salesreport.xlsx");
3333
using (ExcelPackage xlPackage = new ExcelPackage(file))
3434
{
3535
ExcelWorksheet worksheet = xlPackage.Workbook.Worksheets.Add("Sales");

Diff for: ‎09-PerformanceAndProtection/PerformanceAndProtectionSample.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class PerformanceAndProtectionSample
2929
/// <param name="rows"></param>
3030
public static string Run(int rows)
3131
{
32-
var newFile = FileOutputUtil.GetFileInfo("09-PerformanceAndProtection.xlsx");
32+
var newFile = FileUtil.GetCleanFileInfo("09-PerformanceAndProtection.xlsx");
3333
using (ExcelPackage package = new ExcelPackage())
3434
{
3535
Console.WriteLine("{0:HH.mm.ss}\tStarting...", DateTime.Now);

Diff for: ‎10-ReadDataUsingLinq/ReadDataUsingLinq.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public static void Run()
3232
Console.WriteLine("Now open sample 9 again and perform some Linq queries...");
3333
Console.WriteLine();
3434

35-
FileInfo existingFile = FileOutputUtil.GetFileInfo("09-PerformanceAndProtection.xlsx", false);
35+
FileInfo existingFile = FileUtil.GetFileInfo("09-PerformanceAndProtection.xlsx");
3636
using (ExcelPackage package = new ExcelPackage(existingFile))
3737
{
3838
ExcelWorksheet sheet = package.Workbook.Worksheets[0];

Diff for: ‎11-ConditionalFormatting/ConditionalFormattingSample.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class ConditionalFormatting
3333
/// </summary>
3434
public static string Run()
3535
{
36-
FileInfo newFile = FileOutputUtil.GetFileInfo("11-ConditionalFormatting.xlsx");
36+
FileInfo newFile = FileUtil.GetCleanFileInfo("11-ConditionalFormatting.xlsx");
3737
using (ExcelPackage package = new ExcelPackage(newFile))
3838
{
3939
// add a new worksheet to the empty workbook

Diff for: ‎12-DataValidation/DataValidationSample.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class DataValidationSample
2626
{
2727
public static string Run()
2828
{
29-
FileInfo output = FileOutputUtil.GetFileInfo("12-DataValidation.xlsx");
29+
FileInfo output = FileUtil.GetCleanFileInfo("12-DataValidation.xlsx");
3030
using (var package = new ExcelPackage(output))
3131
{
3232
AddIntegerValidation(package);

Diff for: ‎13-Filter/FilterSample.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public static async Task RunAsync(string connectionString)
4242
//Filter on a pivot table, also see sample 24-Slicers.
4343
await PivotTableFilter(connectionString, p);
4444

45-
p.SaveAs(FileOutputUtil.GetFileInfo("13-Filters.xlsx"));
45+
p.SaveAs(FileUtil.GetCleanFileInfo("13-Filters.xlsx"));
4646
}
4747

4848
private static async Task ValueFilter(string connectionString, ExcelPackage p)

Diff for: ‎14-ShapesAndImages/ShapesAndImagesSample.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public static class ShapesAndImagesSample
2727
public static void Run()
2828
{
2929
//The output package
30-
var outputFile = FileOutputUtil.GetFileInfo("14-ShapesAndImages.xlsx");
30+
var outputFile = FileUtil.GetCleanFileInfo("14-ShapesAndImages.xlsx");
3131

3232
//Create the template...
3333
using (ExcelPackage package = new ExcelPackage(outputFile))
@@ -44,25 +44,25 @@ private static void PictureSample(ExcelPackage package)
4444
var ws = package.Workbook.Worksheets.Add("Picture");
4545

4646
//Add an jpg image and apply some effects.
47-
var pic = ws.Drawings.AddPicture("Landscape", FileInputUtil.GetFileInfo("14-ShapesAndImages", "LandscapeView.jpg"));
47+
var pic = ws.Drawings.AddPicture("Landscape", FileUtil.GetFileInfo("14-ShapesAndImages", "LandscapeView.jpg"));
4848
pic.SetPosition(2, 0, 1, 0);
4949
pic.Effect.SetPresetShadow(ePresetExcelShadowType.OuterBottomRight);
5050
pic.Effect.OuterShadow.Distance = 10;
5151
pic.Effect.SetPresetSoftEdges(ePresetExcelSoftEdgesType.SoftEdge5Pt);
5252

5353
//Add the same image, but with 25 percent of the size. Let the position be absolute.
54-
pic = ws.Drawings.AddPicture("LandscapeSmall", FileInputUtil.GetFileInfo("14-ShapesAndImages", "LandscapeView.jpg"));
54+
pic = ws.Drawings.AddPicture("LandscapeSmall", FileUtil.GetFileInfo("14-ShapesAndImages", "LandscapeView.jpg"));
5555
pic.SetPosition(2, 0, 16, 0);
5656
pic.SetSize(25); //25%
5757
pic.ChangeCellAnchor(eEditAs.Absolute);
5858

5959
//Add the same image again, but let the picture move and resize when rows and colums are resized.
60-
pic = ws.Drawings.AddPicture("LandscapeMoveAndResize", FileInputUtil.GetFileInfo("14-ShapesAndImages", "LandscapeView.jpg"));
60+
pic = ws.Drawings.AddPicture("LandscapeMoveAndResize", FileUtil.GetFileInfo("14-ShapesAndImages", "LandscapeView.jpg"));
6161
pic.SetPosition(30, 0, 16, 0);
6262
pic.ChangeCellAnchor(eEditAs.TwoCell);
6363

6464
//Add the image overlapping the first image, but make sure it is behind
65-
pic = ws.Drawings.AddPicture("LandscapeSendToBack", FileInputUtil.GetFileInfo("14-ShapesAndImages", "LandscapeView.jpg"));
65+
pic = ws.Drawings.AddPicture("LandscapeSendToBack", FileUtil.GetFileInfo("14-ShapesAndImages", "LandscapeView.jpg"));
6666
pic.SetPosition(8, 0, 8, 0);
6767
pic.SetSize(25); //25%
6868
pic.SendToBack();
@@ -112,7 +112,7 @@ private static void FillAndColorSamples(ExcelPackage package)
112112
drawing.SetSize(250, 250);
113113
drawing.Fill.Style = eFillStyle.BlipFill;
114114

115-
var image = new Bitmap(FileInputUtil.GetFileInfo("14-ShapesAndImages", "EPPlusLogo.jpg").FullName);
115+
var image = new Bitmap(FileUtil.GetFileInfo("14-ShapesAndImages", "EPPlusLogo.jpg").FullName);
116116
drawing.Fill.BlipFill.Image = image;
117117
drawing.Fill.BlipFill.Stretch = true;
118118
drawing.Text = "Blip Fill";

Diff for: ‎15-ChartsAndThemes/ChartTemplateSample.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public static async Task AddAreaChart(string connectionString, ExcelPackage pack
1313

1414
//Adds an Area chart from a template file. The crtx file has it's own theme, so it does not change with the theme.
1515
//The As property provides an easy type cast for drawing objects
16-
var areaChart = ws.Drawings.AddChartFromTemplate(FileInputUtil.GetFileInfo("15-ChartsAndThemes", "AreaChartStyle3.crtx"), "areaChart")
16+
var areaChart = ws.Drawings.AddChartFromTemplate(FileUtil.GetFileInfo("15-ChartsAndThemes", "AreaChartStyle3.crtx"), "areaChart")
1717
.As.Chart.AreaChart;
1818
var areaSerie = areaChart.Series.Add(ws.Cells[2, 2, 16, 2], ws.Cells[2, 1, 16, 1]);
1919
areaSerie.Header = "Order Value";

Diff for: ‎16-Sparklines/SparklinesSample.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public static void Run()
7474
ws.Cells.AutoFitColumns();
7575
ws.Rows[15, 17].Height = 40;
7676

77-
package.SaveAs(FileOutputUtil.GetFileInfo("16-Sparklines.xlsx"));
77+
package.SaveAs(FileUtil.GetCleanFileInfo("16-Sparklines.xlsx"));
7878
}
7979
}
8080
}

Diff for: ‎17-FXReportFromDatabase/FXReportFromDatabase.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class FxReportFromDatabase
3838
/// <returns></returns>
3939
public static string Run(string connectionString)
4040
{
41-
FileInfo template = FileInputUtil.GetFileInfo("17-FXReportFromDatabase", "GraphTemplate.xlsx");
41+
FileInfo template = FileUtil.GetFileInfo("17-FXReportFromDatabase", "GraphTemplate.xlsx");
4242

4343
using (ExcelPackage p = new ExcelPackage(template, true))
4444
{
@@ -139,7 +139,7 @@ public static string Run(string connectionString)
139139
//Get the documet as a byte array from the stream and save it to disk. (This is useful in a webapplication) ...
140140
var bin = p.GetAsByteArray();
141141

142-
FileInfo file = FileOutputUtil.GetFileInfo("17-FxReportFromDatabase.xlsx");
142+
FileInfo file = FileUtil.GetCleanFileInfo("17-FxReportFromDatabase.xlsx");
143143
File.WriteAllBytes(file.FullName, bin);
144144
return file.FullName;
145145
}

Diff for: ‎18-PivotTables/PivotTablesSample.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public static string Run(string connectionStr)
4646
{
4747
var list = GetDataFromSQL(connectionStr);
4848

49-
FileInfo newFile = FileOutputUtil.GetFileInfo("18-PivotTables.xlsx");
49+
FileInfo newFile = FileUtil.GetCleanFileInfo("18-PivotTables.xlsx");
5050
using (ExcelPackage pck = new ExcelPackage(newFile))
5151
{
5252
// get the handle to the existing worksheet

Diff for: ‎18-PivotTables/PivotTablesStylingSample.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ public static class PivotTablesStylingSample
3535
{
3636
public static string Run()
3737
{
38-
FileInfo templateFile = FileOutputUtil.GetFileInfo("18-PivotTables.xlsx", false);
39-
FileInfo newFile = FileOutputUtil.GetFileInfo("18-PivotTables-Styling.xlsx");
38+
FileInfo templateFile = FileUtil.GetFileInfo("18-PivotTables.xlsx");
39+
FileInfo newFile = FileUtil.GetFileInfo("18-PivotTables-Styling.xlsx");
4040
using ( ExcelPackage pck = new ExcelPackage(newFile, templateFile))
4141
{
4242
//These two sample shows how to style different parts on the pivot table using pivot areas.

Diff for: ‎19-EncryptionAndProtection/EncryptionAndProtectionSample.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ public static class DrawingsSample
2626
public static void Run()
2727
{
2828
//Create a Sample 19 directory...
29-
var outputDir = FileOutputUtil.GetDirectoryInfo("19-EncryptionAndProtection");
29+
var outputDir = FileUtil.GetDirectoryInfo("19-EncryptionAndProtection");
3030

3131
//create the three FileInfo objects...
32-
FileInfo templateFile = FileOutputUtil.GetFileInfo(outputDir, "template.xlsx");
33-
FileInfo answerFile = FileOutputUtil.GetFileInfo(outputDir, "answers.xlsx");
34-
FileInfo JKAnswerFile = FileOutputUtil.GetFileInfo(outputDir, "JKAnswers.xlsx");
32+
FileInfo templateFile = FileUtil.GetFileInfo(outputDir, "template.xlsx");
33+
FileInfo answerFile = FileUtil.GetFileInfo(outputDir, "answers.xlsx");
34+
FileInfo JKAnswerFile = FileUtil.GetFileInfo(outputDir, "JKAnswers.xlsx");
3535

3636
//Create the template...
3737
using (ExcelPackage package = new ExcelPackage(templateFile))

Diff for: ‎20-CreateFileSystemReport/CreateAFileSystemReport.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public static string Run(DirectoryInfo dir, int depth, bool skipIcons)
6464
{
6565
_maxLevels = depth;
6666

67-
FileInfo newFile = FileOutputUtil.GetFileInfo("20-CreateAFileSystemReport.xlsx");
67+
FileInfo newFile = FileUtil.GetCleanFileInfo("20-CreateAFileSystemReport.xlsx");
6868

6969
//Create the workbook
7070
ExcelPackage pck = new ExcelPackage(newFile);

0 commit comments

Comments
 (0)