From d593b59a666783bfbeed763dae3fac85c05db0b9 Mon Sep 17 00:00:00 2001
From: Michael Krisper <michael.krisper@tugraz.at>
Date: Wed, 19 Aug 2015 14:44:29 +0200
Subject: [PATCH] refactor: remove redundant qualifier
---
VectoCore/FileIO/EngineeringFile/JobFileEng.cs | 4 ++--
.../FileIO/Reader/DataObjectAdaper/EngineeringDataAdapter.cs | 2 +-
.../FileIO/Reader/Impl/DeclarationModeSimulationDataReader.cs | 2 +-
VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs | 2 +-
VectoCoreTest/Models/SimulationComponent/DriverTest.cs | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/VectoCore/FileIO/EngineeringFile/JobFileEng.cs b/VectoCore/FileIO/EngineeringFile/JobFileEng.cs
index df57fd5cf9..5408128904 100644
--- a/VectoCore/FileIO/EngineeringFile/JobFileEng.cs
+++ b/VectoCore/FileIO/EngineeringFile/JobFileEng.cs
@@ -71,7 +71,7 @@ namespace TUGraz.VectoCore.FileIO.EngineeringFile
[JsonProperty(Required = Required.Always)] public new DataBodyEng Body;
- public class DataBodyEng : VectoJobFileV2Declaration.DataBodyDecl
+ public class DataBodyEng : DataBodyDecl
{
[JsonProperty(Required = Required.Always)] public IList<string> Cycles;
[JsonProperty] public new IList<AuxDataEng> Aux = new List<AuxDataEng>();
@@ -81,7 +81,7 @@ namespace TUGraz.VectoCore.FileIO.EngineeringFile
[JsonProperty("LAC", Required = Required.Always)] public LACDataEng LookAheadCoasting;
[JsonProperty(Required = Required.Always)] public new OverSpeedEcoRollDataEng OverSpeedEcoRoll;
- public class AuxDataEng : DataBodyDecl.AuxDataDecl
+ public class AuxDataEng : AuxDataDecl
{
[JsonProperty(Required = Required.Always)] public string Path;
}
diff --git a/VectoCore/FileIO/Reader/DataObjectAdaper/EngineeringDataAdapter.cs b/VectoCore/FileIO/Reader/DataObjectAdaper/EngineeringDataAdapter.cs
index 9c1d9d275a..695fb9915a 100644
--- a/VectoCore/FileIO/Reader/DataObjectAdaper/EngineeringDataAdapter.cs
+++ b/VectoCore/FileIO/Reader/DataObjectAdaper/EngineeringDataAdapter.cs
@@ -17,7 +17,7 @@ namespace TUGraz.VectoCore.FileIO.Reader.DataObjectAdaper
{
public class EngineeringDataAdapter : AbstractSimulationDataAdapter
{
- public override VehicleData CreateVehicleData(VectoVehicleFile vehicle, Models.Declaration.Mission segment,
+ public override VehicleData CreateVehicleData(VectoVehicleFile vehicle, Mission segment,
Kilogram loading)
{
return CreateVehicleData(vehicle);
diff --git a/VectoCore/FileIO/Reader/Impl/DeclarationModeSimulationDataReader.cs b/VectoCore/FileIO/Reader/Impl/DeclarationModeSimulationDataReader.cs
index 70ee243384..d5d31acb78 100644
--- a/VectoCore/FileIO/Reader/Impl/DeclarationModeSimulationDataReader.cs
+++ b/VectoCore/FileIO/Reader/Impl/DeclarationModeSimulationDataReader.cs
@@ -16,7 +16,7 @@ namespace TUGraz.VectoCore.FileIO.Reader.Impl
{
internal DeclarationModeSimulationDataReader() {}
- protected void CheckForDeclarationMode(InputFileReader.VersionInfo info, string msg)
+ protected void CheckForDeclarationMode(VersionInfo info, string msg)
{
if (!info.SavedInDeclarationMode) {
// throw new VectoException("File not saved in Declaration Mode! - " + msg);
diff --git a/VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs b/VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs
index 71be19e5e0..d84384e365 100644
--- a/VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs
+++ b/VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs
@@ -284,7 +284,7 @@ namespace TUGraz.VectoCore.Tests.Integration.SimulationRuns
Enabled = false,
},
OverSpeedEcoRoll = new DriverData.OverSpeedEcoRollData {
- Mode = VectoCore.Models.SimulationComponent.Data.DriverData.DriverMode.Off
+ Mode = DriverData.DriverMode.Off
},
StartStop = new VectoRunData.StartStopData {
Enabled = false,
diff --git a/VectoCoreTest/Models/SimulationComponent/DriverTest.cs b/VectoCoreTest/Models/SimulationComponent/DriverTest.cs
index 9a9d2e7de8..2471823b9b 100644
--- a/VectoCoreTest/Models/SimulationComponent/DriverTest.cs
+++ b/VectoCoreTest/Models/SimulationComponent/DriverTest.cs
@@ -378,7 +378,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
Enabled = false,
},
OverSpeedEcoRoll = new DriverData.OverSpeedEcoRollData {
- Mode = VectoCore.Models.SimulationComponent.Data.DriverData.DriverMode.Off
+ Mode = DriverData.DriverMode.Off
},
StartStop = new VectoRunData.StartStopData {
Enabled = false,
--
GitLab