resolve comment

eulynx-live · Nov 29, 2023 · 39e1546 · 39e1546
1 parent 7359cde
commit 39e1546
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 20 deletions.
diff --git a/src/FieldElementSubsystems.Test/Point/PointTest.cs b/src/FieldElementSubsystems.Test/Point/PointTest.cs
@@ -1,4 +1,4 @@
-using EulynxLive.Messages.IPointToInterlockingConnection;
+using IPointToInterlockingConnection = EulynxLive.Point.Interfaces.IPointToInterlockingConnection;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using Moq;

diff --git a/src/Point/Connections/Baseline4R1/PointToInterlockingConnection.cs b/src/Point/Connections/Baseline4R1/PointToInterlockingConnection.cs
@@ -1,8 +1,10 @@
 using EulynxLive.Messages.Baseline4R1;
 using Grpc.Core;
-using static EulynxLive.Messages.IPointToInterlockingConnection.IPointToInterlockingConnection;
+using IPointToInterlockingConnection = EulynxLive.Point.Interfaces.IPointToInterlockingConnection;
+using PointState = EulynxLive.Point.Interfaces.IPointToInterlockingConnection.PointState;
+using PointPosition = EulynxLive.Point.Interfaces.IPointToInterlockingConnection.PointPosition;
 using EulynxLive.Point.Interfaces;
-using EulynxLive.Messages.IPointToInterlockingConnection;
+
 
 namespace EulynxLive.Point.EulynxBaseline4R1;
 

diff --git a/src/Point/Connections/PointStateBaseline4R1.cs b/src/Point/Connections/PointStateBaseline4R1.cs
@@ -1,7 +1,9 @@
 
 using EulynxLive.Messages.Baseline4R1;
-using EulynxLive.Messages.IPointToInterlockingConnection;
-using static EulynxLive.Messages.IPointToInterlockingConnection.IPointToInterlockingConnection;
+using IPointToInterlockingConnection = EulynxLive.Point.Interfaces.IPointToInterlockingConnection;
+using PointState = EulynxLive.Point.Interfaces.IPointToInterlockingConnection.PointState;
+using PointPosition = EulynxLive.Point.Interfaces.IPointToInterlockingConnection.PointPosition;
+using DegradedPointPosition = EulynxLive.Point.Interfaces.IPointToInterlockingConnection.DegradedPointPosition;
 
 public record PointStateBaseline4R1
 {

diff --git a/...nection/IPointToInterlockingConnection.cs → ...erfaces/IPointToInterlockingConnection.cs b/...nection/IPointToInterlockingConnection.cs → ...erfaces/IPointToInterlockingConnection.cs
@@ -1,9 +1,6 @@
-using System.Threading;
-using System.Threading.Tasks;
+namespace EulynxLive.Point.Interfaces;
 
-namespace EulynxLive.Messages.IPointToInterlockingConnection;
-
-public interface IPointToInterlockingConnection: System.IDisposable {
+public interface IPointToInterlockingConnection: IDisposable {
     Task SendPointPosition(PointState state);
     Task SendTimeoutMessage();
     void Connect();

diff --git a/src/Point/Point.cs b/src/Point/Point.cs
@@ -1,10 +1,9 @@
-using DegradedPointPosition = EulynxLive.Messages.IPointToInterlockingConnection.IPointToInterlockingConnection.DegradedPointPosition;
-using EulynxLive.Messages.IPointToInterlockingConnection;
-using EulynxLive.Point.Proto;
+using EulynxLive.Point.Proto;
 using Grpc.Core;
-using PointPosition = EulynxLive.Messages.IPointToInterlockingConnection.IPointToInterlockingConnection.PointPosition;
-using PointState = EulynxLive.Messages.IPointToInterlockingConnection.IPointToInterlockingConnection.PointState;
-using Sci;
+using IPointToInterlockingConnection = EulynxLive.Point.Interfaces.IPointToInterlockingConnection;
+using PointPosition = EulynxLive.Point.Interfaces.IPointToInterlockingConnection.PointPosition;
+using PointState = EulynxLive.Point.Interfaces.IPointToInterlockingConnection.PointState;
+using DegradedPointPosition = EulynxLive.Point.Interfaces.IPointToInterlockingConnection.DegradedPointPosition;
 using System.Net.WebSockets;
 using System.Text;
 using System.Text.Json;

diff --git a/src/Point/Services/Extensions/ReportedPointPositionProtoConversion.cs b/src/Point/Services/Extensions/ReportedPointPositionProtoConversion.cs
@@ -1,8 +1,6 @@
-using System;
 using EulynxLive.Point.Proto;
 
-using ReportedPointPosition = EulynxLive.Messages.IPointToInterlockingConnection.IPointToInterlockingConnection.PointPosition ;
-using DegradedPointPosition = EulynxLive.Messages.IPointToInterlockingConnection.IPointToInterlockingConnection.DegradedPointPosition;
+using ReportedPointPosition = EulynxLive.Point.Interfaces.IPointToInterlockingConnection.PointPosition ;
 
 namespace Point.Services.Extensions
 {

diff --git a/src/Point/Startup.cs b/src/Point/Startup.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.SpaServices.ReactDevelopmentServer;
 using EulynxLive.Point.Services;
-using EulynxLive.Messages.IPointToInterlockingConnection;
+using IPointToInterlockingConnection =EulynxLive.Point.Interfaces.IPointToInterlockingConnection;
 using EulynxLive.Point.EulynxBaseline4R1;
 
 namespace EulynxLive.Point