Rename Models to Data (text)

jskeet · jskeet · commit d6a866fd14b4 · 2019-07-30T20:41:58.000+01:00
diff --git a/Drums/VDrumExplorer.Console/Program.cs b/Drums/VDrumExplorer.Console/Program.cs
@@ -7,8 +7,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 using VDrumExplorer.Midi;
-using VDrumExplorer.Models;
-using VDrumExplorer.Models.Fields;
+using VDrumExplorer.Data;
+using VDrumExplorer.Data.Fields;
 
 namespace VDrumExplorer.ConsoleDemo
 {
@@ -149,7 +149,7 @@ select Task.Run(async delegate {
         }
 
         private static ModuleFields LoadTd17ModuleFields() =>
-            ModuleFields.FromAssemblyResources(typeof(ModuleFields).Assembly, "VDrumExplorer.Models.TD17", "TD17.json");
+            ModuleFields.FromAssemblyResources(typeof(ModuleFields).Assembly, "VDrumExplorer.Data.TD17", "TD17.json");
 
         private static SysExClient CreateClientForTd17()
         {
diff --git a/Drums/VDrumExplorer.Data.Test/Class1.cs b/Drums/VDrumExplorer.Data.Test/Class1.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 
-namespace VDrumExplorer.Models.Test
+namespace VDrumExplorer.Data.Test
 {
     public class Class1
     {
diff --git a/Drums/VDrumExplorer.Data/DictionaryExtensions.cs b/Drums/VDrumExplorer.Data/DictionaryExtensions.cs
@@ -1,7 +1,7 @@
 ﻿using System.Collections.Generic;
 using System.Collections.ObjectModel;
 
-namespace VDrumExplorer.Models
+namespace VDrumExplorer.Data
 {
     internal static class DictionaryExtensions
     {
diff --git a/Drums/VDrumExplorer.Data/Fields/BooleanField.cs b/Drums/VDrumExplorer.Data/Fields/BooleanField.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace VDrumExplorer.Models.Fields
+namespace VDrumExplorer.Data.Fields
 {
     public class BooleanField : FieldBase, IPrimitiveField
     {
diff --git a/Drums/VDrumExplorer.Data/Fields/Container.cs b/Drums/VDrumExplorer.Data/Fields/Container.cs
@@ -1,8 +1,8 @@
 ﻿using System.Collections.Generic;
 using System.Linq;
-using VDrumExplorer.Models.Fields;
+using VDrumExplorer.Data.Fields;
 
-namespace VDrumExplorer.Models.Fields
+namespace VDrumExplorer.Data.Fields
 {
     /// <summary>
     /// A data container representing a portion of memory.
diff --git a/Drums/VDrumExplorer.Data/Fields/DynamicOverlay.cs b/Drums/VDrumExplorer.Data/Fields/DynamicOverlay.cs
@@ -1,7 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 
-namespace VDrumExplorer.Models.Fields
+namespace VDrumExplorer.Data.Fields
 {
     public sealed class DynamicOverlay : FieldBase, IContainerField
     {
diff --git a/Drums/VDrumExplorer.Data/Fields/EnumField.cs b/Drums/VDrumExplorer.Data/Fields/EnumField.cs
@@ -1,6 +1,6 @@
 ﻿using System.Collections.Generic;
 
-namespace VDrumExplorer.Models.Fields
+namespace VDrumExplorer.Data.Fields
 {
     public sealed class EnumField : FieldBase, IPrimitiveField
     {
diff --git a/Drums/VDrumExplorer.Data/Fields/FieldBase.cs b/Drums/VDrumExplorer.Data/Fields/FieldBase.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 
-namespace VDrumExplorer.Models.Fields
+namespace VDrumExplorer.Data.Fields
 {
     public abstract class FieldBase : IField
     {
diff --git a/Drums/VDrumExplorer.Data/Fields/FieldVisitor.cs b/Drums/VDrumExplorer.Data/Fields/FieldVisitor.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 
-namespace VDrumExplorer.Models.Fields
+namespace VDrumExplorer.Data.Fields
 {
     public abstract class FieldVisitor
     {
diff --git a/Drums/VDrumExplorer.Data/Fields/IContainerField.cs b/Drums/VDrumExplorer.Data/Fields/IContainerField.cs
@@ -1,6 +1,6 @@
 ﻿using System.Collections.Generic;
 
-namespace VDrumExplorer.Models.Fields
+namespace VDrumExplorer.Data.Fields
 {
     public interface IContainerField : IField
     {
diff --git a/Drums/VDrumExplorer.Data/Fields/IField.cs b/Drums/VDrumExplorer.Data/Fields/IField.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace VDrumExplorer.Models.Fields
+namespace VDrumExplorer.Data.Fields
 {
     public interface IField
     {
diff --git a/Drums/VDrumExplorer.Data/Fields/IPrimitiveField.cs b/Drums/VDrumExplorer.Data/Fields/IPrimitiveField.cs
@@ -1,4 +1,4 @@
-﻿namespace VDrumExplorer.Models.Fields
+﻿namespace VDrumExplorer.Data.Fields
 {
     public interface IPrimitiveField : IField
     {
diff --git a/Drums/VDrumExplorer.Data/Fields/InstrumentField.cs b/Drums/VDrumExplorer.Data/Fields/InstrumentField.cs
@@ -1,4 +1,4 @@
-﻿namespace VDrumExplorer.Models.Fields
+﻿namespace VDrumExplorer.Data.Fields
 {
     // TODO: Make this a range field? Or an enum?
     public class InstrumentField : FieldBase, IPrimitiveField
diff --git a/Drums/VDrumExplorer.Data/Fields/ModuleAddress.cs b/Drums/VDrumExplorer.Data/Fields/ModuleAddress.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 
-namespace VDrumExplorer.Models.Fields
+namespace VDrumExplorer.Data.Fields
 {
     /// <summary>
     /// An address in the compressed address sapace, which doesn't allow
diff --git a/Drums/VDrumExplorer.Data/Fields/MusicalNoteField.cs b/Drums/VDrumExplorer.Data/Fields/MusicalNoteField.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 
-namespace VDrumExplorer.Models.Fields
+namespace VDrumExplorer.Data.Fields
 {
     // TODO: Make this a range field? Or an enum?
     public class MusicalNoteField : FieldBase, IPrimitiveField
diff --git a/Drums/VDrumExplorer.Data/Fields/RangeField.cs b/Drums/VDrumExplorer.Data/Fields/RangeField.cs
@@ -2,7 +2,7 @@
 using System.Globalization;
 using static System.FormattableString;
 
-namespace VDrumExplorer.Models.Fields
+namespace VDrumExplorer.Data.Fields
 {
     public class RangeField : FieldBase, IPrimitiveField
     {
diff --git a/Drums/VDrumExplorer.Data/Fields/StringField.cs b/Drums/VDrumExplorer.Data/Fields/StringField.cs
@@ -1,7 +1,7 @@
 ﻿using System;
 using System.Text;
 
-namespace VDrumExplorer.Models.Fields
+namespace VDrumExplorer.Data.Fields
 {
     public class StringField : FieldBase, IPrimitiveField
     {
diff --git a/Drums/VDrumExplorer.Data/Fields/Volume32Field.cs b/Drums/VDrumExplorer.Data/Fields/Volume32Field.cs
@@ -1,7 +1,7 @@
 ﻿using System;
 using static System.FormattableString;
 
-namespace VDrumExplorer.Models.Fields
+namespace VDrumExplorer.Data.Fields
 {
     /// <summary>
     /// A volume value between -60DB and +6DB, or "-inf".
diff --git a/Drums/VDrumExplorer.Data/Instrument.cs b/Drums/VDrumExplorer.Data/Instrument.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace VDrumExplorer.Models
+namespace VDrumExplorer.Data
 {
     /// <summary>
     /// An instrument supported within a module. This has no settings applied, and isn't necessarily
diff --git a/Drums/VDrumExplorer.Data/InstrumentGroup.cs b/Drums/VDrumExplorer.Data/InstrumentGroup.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Text;
 
-namespace VDrumExplorer.Models
+namespace VDrumExplorer.Data
 {
     /// <summary>
     /// A group of supported instruments within a module.
diff --git a/Drums/VDrumExplorer.Data/Json/ContainerJson.cs b/Drums/VDrumExplorer.Data/Json/ContainerJson.cs
@@ -1,6 +1,6 @@
 ﻿using System.Collections.Generic;
 
-namespace VDrumExplorer.Models.Json
+namespace VDrumExplorer.Data.Json
 {
     internal class ContainerJson
     {
diff --git a/Drums/VDrumExplorer.Data/Json/DynamicOverlayJson.cs b/Drums/VDrumExplorer.Data/Json/DynamicOverlayJson.cs
@@ -3,7 +3,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace VDrumExplorer.Models.Json
+namespace VDrumExplorer.Data.Json
 {
     /// <summary>
     /// The JSON representation of information about the dynamic overlay 
diff --git a/Drums/VDrumExplorer.Data/Json/FieldJson.cs b/Drums/VDrumExplorer.Data/Json/FieldJson.cs
@@ -3,7 +3,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 
-namespace VDrumExplorer.Models.Json
+namespace VDrumExplorer.Data.Json
 {
     internal class FieldJson
     {
diff --git a/Drums/VDrumExplorer.Data/Json/HexString.cs b/Drums/VDrumExplorer.Data/Json/HexString.cs
@@ -1,7 +1,7 @@
 ﻿using System;
 using System.Globalization;
 
-namespace VDrumExplorer.Models.Json
+namespace VDrumExplorer.Data.Json
 {
     /// <summary>
     /// A wrapper for integer values written in hex.
diff --git a/Drums/VDrumExplorer.Data/Json/HexStringConverter.cs b/Drums/VDrumExplorer.Data/Json/HexStringConverter.cs
@@ -1,7 +1,7 @@
 ﻿using Newtonsoft.Json;
 using System;
 
-namespace VDrumExplorer.Models.Json
+namespace VDrumExplorer.Data.Json
 {
     internal class HexStringConverter : JsonConverter<HexString>
     {
diff --git a/Drums/VDrumExplorer.Data/Json/InstrumentGroupJson.cs b/Drums/VDrumExplorer.Data/Json/InstrumentGroupJson.cs
@@ -1,6 +1,6 @@
 ﻿using System.Collections.Generic;
 
-namespace VDrumExplorer.Models.Json
+namespace VDrumExplorer.Data.Json
 {
     internal sealed class InstrumentGroupJson
     {
diff --git a/Drums/VDrumExplorer.Data/Json/JsonLoader.cs b/Drums/VDrumExplorer.Data/Json/JsonLoader.cs
@@ -4,7 +4,7 @@
 using System.IO;
 using System.Reflection;
 
-namespace VDrumExplorer.Models.Json
+namespace VDrumExplorer.Data.Json
 {
     public sealed class JsonLoader
     {
diff --git a/Drums/VDrumExplorer.Data/Json/ModuleJson.cs b/Drums/VDrumExplorer.Data/Json/ModuleJson.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace VDrumExplorer.Models.Json
+namespace VDrumExplorer.Data.Json
 {
     /// <summary>
     /// JSON representation of module data. This is the root document, effectively.
diff --git a/Drums/VDrumExplorer.Data/ModuleData.cs b/Drums/VDrumExplorer.Data/ModuleData.cs
@@ -3,9 +3,9 @@
 using System.IO;
 using System.Linq;
 using System.Text;
-using VDrumExplorer.Models.Fields;
+using VDrumExplorer.Data.Fields;
 
-namespace VDrumExplorer.Models
+namespace VDrumExplorer.Data
 {
     public class ModuleData
     {
diff --git a/Drums/VDrumExplorer.Data/ModuleFields.cs b/Drums/VDrumExplorer.Data/ModuleFields.cs
@@ -5,11 +5,11 @@
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Reflection;
-using VDrumExplorer.Models.Fields;
-using VDrumExplorer.Models.Json;
+using VDrumExplorer.Data.Fields;
+using VDrumExplorer.Data.Json;
 using static System.FormattableString;
 
-namespace VDrumExplorer.Models
+namespace VDrumExplorer.Data
 {
     // TODO: Rename this.
 
diff --git a/Drums/VDrumExplorer.Gui/ModuleExplorer.cs b/Drums/VDrumExplorer.Gui/ModuleExplorer.cs
@@ -6,9 +6,9 @@
 using System.Linq;
 using System.Text;
 using System.Windows.Forms;
-using VDrumExplorer.Models;
-using VDrumExplorer.Models.Fields;
-using VContainer = VDrumExplorer.Models.Fields.Container;
+using VDrumExplorer.Data;
+using VDrumExplorer.Data.Fields;
+using VContainer = VDrumExplorer.Data.Fields.Container;
 
 namespace VDrumExplorer.Gui
 {
diff --git a/Drums/VDrumExplorer.Gui/Program.cs b/Drums/VDrumExplorer.Gui/Program.cs
@@ -6,8 +6,8 @@
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using VDrumExplorer.Midi;
-using VDrumExplorer.Models;
-using VDrumExplorer.Models.Fields;
+using VDrumExplorer.Data;
+using VDrumExplorer.Data.Fields;
 
 namespace VDrumExplorer.Gui
 {
@@ -38,7 +38,7 @@ private static ModuleData LoadDataFromFile(string path)
         }
 
         private static ModuleFields LoadTd17ModuleFields() =>
-            ModuleFields.FromAssemblyResources(typeof(ModuleFields).Assembly, "VDrumExplorer.Models.TD17", "TD17.json");
+            ModuleFields.FromAssemblyResources(typeof(ModuleFields).Assembly, "VDrumExplorer.Data.TD17", "TD17.json");
 
         private static SysExClient CreateClientForTd17()
         {

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@`
`7`	`7`	`using System.Threading;`
`8`	`8`	`using System.Threading.Tasks;`
`9`	`9`	`using VDrumExplorer.Midi;`
`10`		`-using VDrumExplorer.Models;`
`11`		`-using VDrumExplorer.Models.Fields;`
	`10`	`+using VDrumExplorer.Data;`
	`11`	`+using VDrumExplorer.Data.Fields;`
`12`	`12`
`13`	`13`	`namespace VDrumExplorer.ConsoleDemo`
`14`	`14`	`{`
`@@ -149,7 +149,7 @@ select Task.Run(async delegate {`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`private static ModuleFields LoadTd17ModuleFields() =>`
`152`		`- ModuleFields.FromAssemblyResources(typeof(ModuleFields).Assembly, "VDrumExplorer.Models.TD17", "TD17.json");`
	`152`	`+ ModuleFields.FromAssemblyResources(typeof(ModuleFields).Assembly, "VDrumExplorer.Data.TD17", "TD17.json");`
`153`	`153`
`154`	`154`	`private static SysExClient CreateClientForTd17()`
`155`	`155`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`
`3`		`-namespace VDrumExplorer.Models.Test`
	`3`	`+namespace VDrumExplorer.Data.Test`
`4`	`4`	`{`
`5`	`5`	`public class Class1`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`	`2`	`using System.Collections.ObjectModel;`
`3`	`3`
`4`		`-namespace VDrumExplorer.Models`
	`4`	`+namespace VDrumExplorer.Data`
`5`	`5`	`{`
`6`	`6`	`internal static class DictionaryExtensions`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Text;`
`4`	`4`
`5`		`-namespace VDrumExplorer.Models.Fields`
	`5`	`+namespace VDrumExplorer.Data.Fields`
`6`	`6`	`{`
`7`	`7`	`public class BooleanField : FieldBase, IPrimitiveField`
`8`	`8`	`{`