From 3ef01a5192f01cadd5d5f8abb1e8300e458f88f5 Mon Sep 17 00:00:00 2001 From: Michael Krisper <michael.krisper@tugraz.at> Date: Mon, 18 May 2015 11:38:52 +0200 Subject: [PATCH] code formatting --- VECTO.sln.DotSettings | 1 + VectoCore/Utils/VectoCSVFile.cs | 3 ++- VectoCoreTest/Models/SimulationComponent/GearboxTest.cs | 3 +-- VectoCoreTest/Models/SimulationComponent/RetarderTest.cs | 1 + VectoCoreTest/Utils/MockPorts.cs | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/VECTO.sln.DotSettings b/VECTO.sln.DotSettings index 4fa2232d39..16a678e66c 100644 --- a/VECTO.sln.DotSettings +++ b/VECTO.sln.DotSettings @@ -16,6 +16,7 @@ <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SIMPLE_EMBEDDED_STATEMENT_STYLE/@EntryValue">LINE_BREAK</s:String> <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AROUND_MULTIPLICATIVE_OP/@EntryValue">True</s:Boolean> <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES/@EntryValue">True</s:Boolean> + <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CSV/@EntryIndexedValue">CSV</s:String> <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RP/@EntryIndexedValue">RP</s:String> <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SI/@EntryIndexedValue">SI</s:String> <s:Boolean x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=2BF7A1E51991F2458D2D1F0B29CF888B/@KeyIndexDefined">True</s:Boolean> diff --git a/VectoCore/Utils/VectoCSVFile.cs b/VectoCore/Utils/VectoCSVFile.cs index ee2d56b886..91adae4ea9 100644 --- a/VectoCore/Utils/VectoCSVFile.cs +++ b/VectoCore/Utils/VectoCSVFile.cs @@ -31,9 +31,10 @@ namespace TUGraz.VectoCore.Utils private const char Comment = '#'; /// <summary> - /// Reads a CSV file which is stored in Vecto-CSV-Format. + /// Reads a CSV file which is stored in Vecto-CSV-Format. /// </summary> /// <param name="fileName"></param> + /// <param name="ignoreEmptyColumns"></param> /// <exception cref="FileIOException"></exception> /// <returns>A DataTable which represents the CSV File.</returns> public static DataTable Read(string fileName, bool ignoreEmptyColumns = false) diff --git a/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs b/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs index 6590530b9b..6dac5b39f0 100644 --- a/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs +++ b/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs @@ -1,10 +1,9 @@ using System; -using System.Globalization; using Microsoft.VisualStudio.TestTools.UnitTesting; using TUGraz.VectoCore.Models.Simulation.Impl; using TUGraz.VectoCore.Models.SimulationComponent.Data; -using TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox; using TUGraz.VectoCore.Models.SimulationComponent.Impl; +using TUGraz.VectoCore.Tests.Utils; using TUGraz.VectoCore.Utils; namespace TUGraz.VectoCore.Tests.Models.SimulationComponent diff --git a/VectoCoreTest/Models/SimulationComponent/RetarderTest.cs b/VectoCoreTest/Models/SimulationComponent/RetarderTest.cs index fb99afb21c..281c443f8e 100644 --- a/VectoCoreTest/Models/SimulationComponent/RetarderTest.cs +++ b/VectoCoreTest/Models/SimulationComponent/RetarderTest.cs @@ -3,6 +3,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using TUGraz.VectoCore.Models.Simulation.Impl; using TUGraz.VectoCore.Models.SimulationComponent.Data; using TUGraz.VectoCore.Models.SimulationComponent.Impl; +using TUGraz.VectoCore.Tests.Utils; using TUGraz.VectoCore.Utils; namespace TUGraz.VectoCore.Tests.Models.SimulationComponent diff --git a/VectoCoreTest/Utils/MockPorts.cs b/VectoCoreTest/Utils/MockPorts.cs index d0f5b37d50..e63a2844b3 100644 --- a/VectoCoreTest/Utils/MockPorts.cs +++ b/VectoCoreTest/Utils/MockPorts.cs @@ -4,7 +4,7 @@ using TUGraz.VectoCore.Models.Connector.Ports; using TUGraz.VectoCore.Models.Connector.Ports.Impl; using TUGraz.VectoCore.Utils; -namespace TUGraz.VectoCore.Tests.Models.SimulationComponent +namespace TUGraz.VectoCore.Tests.Utils { public class MockTnOutPort : ITnOutPort { -- GitLab