From b54939e6d15d6e94295996bb33e04c803640d488 Mon Sep 17 00:00:00 2001 From: mort5161 Date: Fri, 25 Jul 2014 14:37:59 -0700 Subject: [PATCH] Rearrange namespaces --- src/NmeaParser.Shared/Nmea/Gps/Garmin/PGRME.cs | 18 +++++++++++++++++- .../Nmea/{ => LaserRange}/LaserRangeMessage.cs | 3 ++- .../LaserTech}/PLTIT.cs | 2 +- .../LaserRange => LaserRange/Trimble}/PTNLA.cs | 2 +- .../LaserRange => LaserRange/Trimble}/PTNLB.cs | 2 +- .../NmeaParser.Shared.projitems | 8 ++++---- src/NmeaParser.Tests/NmeaMessages.cs | 4 ++-- 7 files changed, 28 insertions(+), 11 deletions(-) rename src/NmeaParser.Shared/Nmea/{ => LaserRange}/LaserRangeMessage.cs (97%) rename src/NmeaParser.Shared/Nmea/{LaserTech/LaserRange => LaserRange/LaserTech}/PLTIT.cs (94%) rename src/NmeaParser.Shared/Nmea/{Trimble/LaserRange => LaserRange/Trimble}/PTNLA.cs (95%) rename src/NmeaParser.Shared/Nmea/{Trimble/LaserRange => LaserRange/Trimble}/PTNLB.cs (97%) diff --git a/src/NmeaParser.Shared/Nmea/Gps/Garmin/PGRME.cs b/src/NmeaParser.Shared/Nmea/Gps/Garmin/PGRME.cs index b0e8409..e5d4c62 100644 --- a/src/NmeaParser.Shared/Nmea/Gps/Garmin/PGRME.cs +++ b/src/NmeaParser.Shared/Nmea/Gps/Garmin/PGRME.cs @@ -1,4 +1,20 @@ -using System; +// +// Copyright (c) 2014 Morten Nielsen +// +// Licensed under the Microsoft Public License (Ms-PL) (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://opensource.org/licenses/Ms-PL.html +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +using System; using System.Collections.Generic; using System.Globalization; using System.Linq; diff --git a/src/NmeaParser.Shared/Nmea/LaserRangeMessage.cs b/src/NmeaParser.Shared/Nmea/LaserRange/LaserRangeMessage.cs similarity index 97% rename from src/NmeaParser.Shared/Nmea/LaserRangeMessage.cs rename to src/NmeaParser.Shared/Nmea/LaserRange/LaserRangeMessage.cs index 5df33de..feded4d 100644 --- a/src/NmeaParser.Shared/Nmea/LaserRangeMessage.cs +++ b/src/NmeaParser.Shared/Nmea/LaserRange/LaserRangeMessage.cs @@ -14,6 +14,7 @@ // limitations under the License. // +using NmeaParser.Nmea; using System; using System.Collections.Generic; using System.Globalization; @@ -21,7 +22,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace NmeaParser.Nmea +namespace NmeaParser.Nmea.LaserRange { /// /// Laser Range Measurement diff --git a/src/NmeaParser.Shared/Nmea/LaserTech/LaserRange/PLTIT.cs b/src/NmeaParser.Shared/Nmea/LaserRange/LaserTech/PLTIT.cs similarity index 94% rename from src/NmeaParser.Shared/Nmea/LaserTech/LaserRange/PLTIT.cs rename to src/NmeaParser.Shared/Nmea/LaserRange/LaserTech/PLTIT.cs index c76e591..65ade5c 100644 --- a/src/NmeaParser.Shared/Nmea/LaserTech/LaserRange/PLTIT.cs +++ b/src/NmeaParser.Shared/Nmea/LaserRange/LaserTech/PLTIT.cs @@ -21,7 +21,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace NmeaParser.Nmea.LaserTech.LaserRange +namespace NmeaParser.Nmea.LaserRange.LaserTech { /// /// Laser Range diff --git a/src/NmeaParser.Shared/Nmea/Trimble/LaserRange/PTNLA.cs b/src/NmeaParser.Shared/Nmea/LaserRange/Trimble/PTNLA.cs similarity index 95% rename from src/NmeaParser.Shared/Nmea/Trimble/LaserRange/PTNLA.cs rename to src/NmeaParser.Shared/Nmea/LaserRange/Trimble/PTNLA.cs index 03d9da8..451ad8e 100644 --- a/src/NmeaParser.Shared/Nmea/Trimble/LaserRange/PTNLA.cs +++ b/src/NmeaParser.Shared/Nmea/LaserRange/Trimble/PTNLA.cs @@ -21,7 +21,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace NmeaParser.Nmea.Trimble.LaserRange +namespace NmeaParser.Nmea.LaserRange.Trimble { /// /// Burden finder diff --git a/src/NmeaParser.Shared/Nmea/Trimble/LaserRange/PTNLB.cs b/src/NmeaParser.Shared/Nmea/LaserRange/Trimble/PTNLB.cs similarity index 97% rename from src/NmeaParser.Shared/Nmea/Trimble/LaserRange/PTNLB.cs rename to src/NmeaParser.Shared/Nmea/LaserRange/Trimble/PTNLB.cs index fdd6eea..4a1d348 100644 --- a/src/NmeaParser.Shared/Nmea/Trimble/LaserRange/PTNLB.cs +++ b/src/NmeaParser.Shared/Nmea/LaserRange/Trimble/PTNLB.cs @@ -21,7 +21,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace NmeaParser.Nmea.Trimble.LaserRange +namespace NmeaParser.Nmea.LaserRange.Trimble { /// /// Tree Measurement diff --git a/src/NmeaParser.Shared/NmeaParser.Shared.projitems b/src/NmeaParser.Shared/NmeaParser.Shared.projitems index 4cef398..5c35b1f 100644 --- a/src/NmeaParser.Shared/NmeaParser.Shared.projitems +++ b/src/NmeaParser.Shared/NmeaParser.Shared.projitems @@ -15,11 +15,11 @@ - - + + + + - - diff --git a/src/NmeaParser.Tests/NmeaMessages.cs b/src/NmeaParser.Tests/NmeaMessages.cs index d268824..3aa5874 100644 --- a/src/NmeaParser.Tests/NmeaMessages.cs +++ b/src/NmeaParser.Tests/NmeaMessages.cs @@ -121,8 +121,8 @@ namespace NmeaParser.Tests { string input = "$PTNLA,HV,002.94,M,288.1,D,008.6,D,002.98,M*74"; var msg = NmeaMessage.Parse(input); - Assert.IsInstanceOfType(msg, typeof(Nmea.Trimble.LaserRange.Ptnla)); - Nmea.Trimble.LaserRange.Ptnla ptlna = (Nmea.Trimble.LaserRange.Ptnla)msg; + Assert.IsInstanceOfType(msg, typeof(NmeaParser.Nmea.LaserRange.Trimble.Ptnla)); + NmeaParser.Nmea.LaserRange.Trimble.Ptnla ptlna = (NmeaParser.Nmea.LaserRange.Trimble.Ptnla)msg; Assert.AreEqual(2.94, ptlna.HorizontalDistance); Assert.AreEqual('M', ptlna.HorizontalDistanceUnits); Assert.AreEqual(288.1, ptlna.HorizontalAngle);