From dd6b0416b6601d4276d66c41ff71cb4051511a89 Mon Sep 17 00:00:00 2001 From: Flamefire Date: Mon, 17 Nov 2014 19:33:48 +0100 Subject: [PATCH] Rename XML to lowercase Xml in classes and names for consistency --- VocaluxeLib/Menu/CBackground.cs | 2 +- VocaluxeLib/Menu/CButton.cs | 2 +- VocaluxeLib/Menu/CEqualizer.cs | 2 +- VocaluxeLib/Menu/CLyric.cs | 2 +- VocaluxeLib/Menu/CMenu.cs | 8 +-- VocaluxeLib/Menu/CNameSelection.cs | 2 +- VocaluxeLib/Menu/CParticleEffect.cs | 2 +- VocaluxeLib/Menu/CPlaylist.cs | 2 +- VocaluxeLib/Menu/CScreenSetting.cs | 2 +- VocaluxeLib/Menu/CSelectSlide.cs | 2 +- VocaluxeLib/Menu/CStatic.cs | 2 +- VocaluxeLib/Menu/CText.cs | 4 +- VocaluxeLib/Menu/IThemeable.cs | 2 +- VocaluxeLib/Menu/SingNotes/CSingNotes.cs | 2 +- .../Menu/SongMenu/CSongMenuFramework.cs | 2 +- .../Menu/SongMenu/CSongMenuTileBoard.cs | 2 +- VocaluxeLib/VocaluxeLib.csproj | 2 +- VocaluxeLib/Xml/CXMLReader.cs | 8 +-- VocaluxeLib/Xml/CXmlSerializer.cs | 6 +- VocaluxeTests/XmlSerializerTest.cs | 58 +++++++++---------- 20 files changed, 57 insertions(+), 57 deletions(-) diff --git a/VocaluxeLib/Menu/CBackground.cs b/VocaluxeLib/Menu/CBackground.cs index 68154e89..90fab98c 100644 --- a/VocaluxeLib/Menu/CBackground.cs +++ b/VocaluxeLib/Menu/CBackground.cs @@ -92,7 +92,7 @@ namespace VocaluxeLib.Menu #endregion Constructors #region public - public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader) + public bool LoadTheme(string xmlPath, string elementName, CXmlReader xmlReader) { string item = xmlPath + "/" + elementName; _ThemeLoaded = true; diff --git a/VocaluxeLib/Menu/CButton.cs b/VocaluxeLib/Menu/CButton.cs index 6f6d5241..4fa4d4d8 100644 --- a/VocaluxeLib/Menu/CButton.cs +++ b/VocaluxeLib/Menu/CButton.cs @@ -158,7 +158,7 @@ namespace VocaluxeLib.Menu _SelReflectionSpace = button._SelReflectionSpace; } - public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader) + public bool LoadTheme(string xmlPath, string elementName, CXmlReader xmlReader) { string item = xmlPath + "/" + elementName; _ThemeLoaded = true; diff --git a/VocaluxeLib/Menu/CEqualizer.cs b/VocaluxeLib/Menu/CEqualizer.cs index 010b8e80..55ef5a61 100644 --- a/VocaluxeLib/Menu/CEqualizer.cs +++ b/VocaluxeLib/Menu/CEqualizer.cs @@ -101,7 +101,7 @@ namespace VocaluxeLib.Menu LoadSkin(); } - public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader) + public bool LoadTheme(string xmlPath, string elementName, CXmlReader xmlReader) { string item = xmlPath + "/" + elementName; _ThemeLoaded = true; diff --git a/VocaluxeLib/Menu/CLyric.cs b/VocaluxeLib/Menu/CLyric.cs index 703ec9cd..48e74062 100644 --- a/VocaluxeLib/Menu/CLyric.cs +++ b/VocaluxeLib/Menu/CLyric.cs @@ -109,7 +109,7 @@ namespace VocaluxeLib.Menu LoadSkin(); } - public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader) + public bool LoadTheme(string xmlPath, string elementName, CXmlReader xmlReader) { string item = xmlPath + "/" + elementName; _ThemeLoaded = true; diff --git a/VocaluxeLib/Menu/CMenu.cs b/VocaluxeLib/Menu/CMenu.cs index d84d7c97..8e89158d 100644 --- a/VocaluxeLib/Menu/CMenu.cs +++ b/VocaluxeLib/Menu/CMenu.cs @@ -126,7 +126,7 @@ namespace VocaluxeLib.Menu private delegate void AddElementHandler(T element, String key); - private void _LoadThemeElement(IEnumerable elements, AddElementHandler addElementHandler, CXMLReader xmlReader) where T : IThemeable + private void _LoadThemeElement(IEnumerable elements, AddElementHandler addElementHandler, CXmlReader xmlReader) where T : IThemeable { if (elements != null) { @@ -243,7 +243,7 @@ namespace VocaluxeLib.Menu { string file = Path.Combine(xmlPath, ThemeName + ".xml"); - CXMLReader xmlReader = CXMLReader.OpenFile(file); + CXmlReader xmlReader = CXmlReader.OpenFile(file); if (xmlReader == null) return; @@ -582,7 +582,7 @@ namespace VocaluxeLib.Menu } #region Theme Handling - private bool _CheckVersion(int reqVersion, CXMLReader xmlReader) + private bool _CheckVersion(int reqVersion, CXmlReader xmlReader) { int actualVersion = 0; xmlReader.TryGetIntValue("//root/" + ThemeName + "/ScreenVersion", ref actualVersion); @@ -600,7 +600,7 @@ namespace VocaluxeLib.Menu return false; } - private void _LoadThemeBasics(CXMLReader xmlReader) + private void _LoadThemeBasics(CXmlReader xmlReader) { // Backgrounds var background = new CBackground(PartyModeID); diff --git a/VocaluxeLib/Menu/CNameSelection.cs b/VocaluxeLib/Menu/CNameSelection.cs index c88949c1..3b236e27 100644 --- a/VocaluxeLib/Menu/CNameSelection.cs +++ b/VocaluxeLib/Menu/CNameSelection.cs @@ -148,7 +148,7 @@ namespace VocaluxeLib.Menu UpdateList(0); } - public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader) + public bool LoadTheme(string xmlPath, string elementName, CXmlReader xmlReader) { string item = xmlPath + "/" + elementName; _ThemeLoaded = true; diff --git a/VocaluxeLib/Menu/CParticleEffect.cs b/VocaluxeLib/Menu/CParticleEffect.cs index 5f286f6d..0db8fa9c 100644 --- a/VocaluxeLib/Menu/CParticleEffect.cs +++ b/VocaluxeLib/Menu/CParticleEffect.cs @@ -131,7 +131,7 @@ namespace VocaluxeLib.Menu LoadSkin(); } - public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader) + public bool LoadTheme(string xmlPath, string elementName, CXmlReader xmlReader) { string item = xmlPath + "/" + elementName; _ThemeLoaded = true; diff --git a/VocaluxeLib/Menu/CPlaylist.cs b/VocaluxeLib/Menu/CPlaylist.cs index d3dc8906..933a00c5 100644 --- a/VocaluxeLib/Menu/CPlaylist.cs +++ b/VocaluxeLib/Menu/CPlaylist.cs @@ -274,7 +274,7 @@ namespace VocaluxeLib.Menu LoadSkin(); } - public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader) + public bool LoadTheme(string xmlPath, string elementName, CXmlReader xmlReader) { string item = xmlPath + "/" + elementName; _ThemeLoaded = true; diff --git a/VocaluxeLib/Menu/CScreenSetting.cs b/VocaluxeLib/Menu/CScreenSetting.cs index 39ed4bfd..863fccdc 100644 --- a/VocaluxeLib/Menu/CScreenSetting.cs +++ b/VocaluxeLib/Menu/CScreenSetting.cs @@ -71,7 +71,7 @@ namespace VocaluxeLib.Menu _Theme = theme; } - public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader) + public bool LoadTheme(string xmlPath, string elementName, CXmlReader xmlReader) { string item = xmlPath + "/" + elementName; _ThemeLoaded = true; diff --git a/VocaluxeLib/Menu/CSelectSlide.cs b/VocaluxeLib/Menu/CSelectSlide.cs index 37a55fa5..55ae44f1 100644 --- a/VocaluxeLib/Menu/CSelectSlide.cs +++ b/VocaluxeLib/Menu/CSelectSlide.cs @@ -270,7 +270,7 @@ namespace VocaluxeLib.Menu LoadSkin(); } - public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader) + public bool LoadTheme(string xmlPath, string elementName, CXmlReader xmlReader) { string item = xmlPath + "/" + elementName; _ThemeLoaded = true; diff --git a/VocaluxeLib/Menu/CStatic.cs b/VocaluxeLib/Menu/CStatic.cs index 475b962a..b1774f5f 100644 --- a/VocaluxeLib/Menu/CStatic.cs +++ b/VocaluxeLib/Menu/CStatic.cs @@ -118,7 +118,7 @@ namespace VocaluxeLib.Menu LoadSkin(); } - public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader) + public bool LoadTheme(string xmlPath, string elementName, CXmlReader xmlReader) { string item = xmlPath + "/" + elementName; _ThemeLoaded = true; diff --git a/VocaluxeLib/Menu/CText.cs b/VocaluxeLib/Menu/CText.cs index 094ff333..6523d964 100644 --- a/VocaluxeLib/Menu/CText.cs +++ b/VocaluxeLib/Menu/CText.cs @@ -298,12 +298,12 @@ namespace VocaluxeLib.Menu LoadSkin(); } - public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader) + public bool LoadTheme(string xmlPath, string elementName, CXmlReader xmlReader) { return LoadTheme(xmlPath, elementName, xmlReader, false); } - public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader, bool buttonText) + public bool LoadTheme(string xmlPath, string elementName, CXmlReader xmlReader, bool buttonText) { string item = xmlPath + "/" + elementName; _ThemeLoaded = true; diff --git a/VocaluxeLib/Menu/IThemeable.cs b/VocaluxeLib/Menu/IThemeable.cs index f902a261..2de6599a 100644 --- a/VocaluxeLib/Menu/IThemeable.cs +++ b/VocaluxeLib/Menu/IThemeable.cs @@ -23,7 +23,7 @@ namespace VocaluxeLib.Menu { string GetThemeName(); - bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader); + bool LoadTheme(string xmlPath, string elementName, CXmlReader xmlReader); void UnloadSkin(); void LoadSkin(); diff --git a/VocaluxeLib/Menu/SingNotes/CSingNotes.cs b/VocaluxeLib/Menu/SingNotes/CSingNotes.cs index 54dfab94..0b6555b3 100644 --- a/VocaluxeLib/Menu/SingNotes/CSingNotes.cs +++ b/VocaluxeLib/Menu/SingNotes/CSingNotes.cs @@ -97,7 +97,7 @@ namespace VocaluxeLib.Menu.SingNotes get { return _ThemeLoaded; } } - public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader) + public bool LoadTheme(string xmlPath, string elementName, CXmlReader xmlReader) { string item = xmlPath + "/" + elementName; _ThemeLoaded = true; diff --git a/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs b/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs index 7e3832a7..27a513c5 100644 --- a/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs +++ b/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs @@ -174,7 +174,7 @@ namespace VocaluxeLib.Menu.SongMenu return _Theme; } - public virtual bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader) + public virtual bool LoadTheme(string xmlPath, string elementName, CXmlReader xmlReader) { string item = xmlPath + "/" + elementName; _ThemeLoaded = true; diff --git a/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs b/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs index 1a1043bd..ddf2b84b 100644 --- a/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs +++ b/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs @@ -120,7 +120,7 @@ namespace VocaluxeLib.Menu.SongMenu } } - public override bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader) + public override bool LoadTheme(string xmlPath, string elementName, CXmlReader xmlReader) { string item = xmlPath + "/" + elementName; diff --git a/VocaluxeLib/VocaluxeLib.csproj b/VocaluxeLib/VocaluxeLib.csproj index de99965a..7cc7248d 100644 --- a/VocaluxeLib/VocaluxeLib.csproj +++ b/VocaluxeLib/VocaluxeLib.csproj @@ -111,7 +111,7 @@ - + diff --git a/VocaluxeLib/Xml/CXMLReader.cs b/VocaluxeLib/Xml/CXMLReader.cs index a61843bd..6ff2f612 100644 --- a/VocaluxeLib/Xml/CXMLReader.cs +++ b/VocaluxeLib/Xml/CXMLReader.cs @@ -21,7 +21,7 @@ using System.Xml.XPath; namespace VocaluxeLib.Xml { - public class CXMLReader : CXmlReaderBase + public class CXmlReader : CXmlReaderBase { private readonly XPathNavigator _Navigator; private readonly String _FilePath; @@ -32,7 +32,7 @@ namespace VocaluxeLib.Xml } //Private method. Use OpenFile factory method to get an instance - private CXMLReader(string uri) + private CXmlReader(string uri) { _FilePath = uri; var xmlDoc = new XPathDocument(uri); @@ -44,11 +44,11 @@ namespace VocaluxeLib.Xml get { return _Navigator; } } - public static CXMLReader OpenFile(string fileName) + public static CXmlReader OpenFile(string fileName) { try { - return new CXMLReader(fileName); + return new CXmlReader(fileName); } catch (Exception e) { diff --git a/VocaluxeLib/Xml/CXmlSerializer.cs b/VocaluxeLib/Xml/CXmlSerializer.cs index ed790901..c0db420d 100644 --- a/VocaluxeLib/Xml/CXmlSerializer.cs +++ b/VocaluxeLib/Xml/CXmlSerializer.cs @@ -48,7 +48,7 @@ namespace VocaluxeLib.Xml /// /// Uniform settings for writing XML files. ALWAYS use this! /// - private readonly XmlWriterSettings _XMLSettings = new XmlWriterSettings + private readonly XmlWriterSettings _XmlSettings = new XmlWriterSettings { Indent = true, Encoding = Encoding.UTF8, @@ -217,7 +217,7 @@ namespace VocaluxeLib.Xml /// Name of the root node (overwrites default value specified by XmlRoot/XmlTypeAttributes which defaults to "root") public void Serialize(string filePath, object o, string rootNodeName = null) { - using (XmlWriter writer = XmlWriter.Create(filePath, _XMLSettings)) + using (XmlWriter writer = XmlWriter.Create(filePath, _XmlSettings)) _Serialize(writer, o, rootNodeName); } @@ -230,7 +230,7 @@ namespace VocaluxeLib.Xml public string Serialize(object o, string rootNodeName = null) { MemoryStream result = new MemoryStream(); - using (XmlWriter writer = XmlWriter.Create(result, _XMLSettings)) + using (XmlWriter writer = XmlWriter.Create(result, _XmlSettings)) _Serialize(writer, o, rootNodeName); result.Position = 0; return new StreamReader(result).ReadToEnd(); diff --git a/VocaluxeTests/XmlSerializerTest.cs b/VocaluxeTests/XmlSerializerTest.cs index c8276e06..a3c8ae43 100644 --- a/VocaluxeTests/XmlSerializerTest.cs +++ b/VocaluxeTests/XmlSerializerTest.cs @@ -211,7 +211,7 @@ namespace VocaluxeTests _AssertSerDeserMatch(s); } - private readonly string[] _XMLList = new string[] + private readonly string[] _XmlList = new string[] { _Head + @" @@ -237,21 +237,21 @@ namespace VocaluxeTests { var xml = new CXmlDeserializer(); var ser = new CXmlSerializer(); - SList foo = xml.DeserializeString(_XMLList[0]); + SList foo = xml.DeserializeString(_XmlList[0]); Assert.AreEqual(foo.Ints.Count, 2, "Deserialization failed"); Assert.AreEqual(foo.Ints[0].I, 1, "Deserialization failed"); Assert.AreEqual(foo.Ints[1].I, 1, "Deserialization failed"); string res = ser.Serialize(foo); - Assert.AreEqual(_XMLList[0], res, "Serialization failed"); - foo = xml.DeserializeString(_XMLList[1]); + Assert.AreEqual(_XmlList[0], res, "Serialization failed"); + foo = xml.DeserializeString(_XmlList[1]); Assert.AreEqual(foo.Ints.Count, 0, "Deserialization2 failed"); res = ser.Serialize(foo); - Assert.AreEqual(_XMLList[2], res, "Serialization2 failed"); - foo = xml.DeserializeString(_XMLList[2]); + Assert.AreEqual(_XmlList[2], res, "Serialization2 failed"); + foo = xml.DeserializeString(_XmlList[2]); Assert.AreEqual(foo.Ints.Count, 0, "Deserialization2 failed"); - _AssertSerDeserMatch(_XMLList[2]); + _AssertSerDeserMatch(_XmlList[2]); res = ser.Serialize(foo); - Assert.AreEqual(_XMLList[2], res, "Serialization2 failed"); + Assert.AreEqual(_XmlList[2], res, "Serialization2 failed"); _AssertFail(_Empty); } @@ -260,31 +260,31 @@ namespace VocaluxeTests { var xml = new CXmlDeserializer(); var ser = new CXmlSerializer(); - SArray foo = xml.DeserializeString(_XMLList[0]); + SArray foo = xml.DeserializeString(_XmlList[0]); Assert.AreEqual(foo.Ints.Length, 2, "Deserialization failed"); Assert.AreEqual(foo.Ints[0].I, 1, "Deserialization failed"); Assert.AreEqual(foo.Ints[1].I, 1, "Deserialization failed"); string res = ser.Serialize(foo); - Assert.AreEqual(_XMLList[0], res, "Serialization failed"); - foo = xml.DeserializeString(_XMLList[1]); + Assert.AreEqual(_XmlList[0], res, "Serialization failed"); + foo = xml.DeserializeString(_XmlList[1]); Assert.AreEqual(foo.Ints.Length, 0, "Deserialization2 failed"); res = ser.Serialize(foo); - Assert.AreEqual(_XMLList[2], res, "Serialization2 failed"); - foo = xml.DeserializeString(_XMLList[2]); + Assert.AreEqual(_XmlList[2], res, "Serialization2 failed"); + foo = xml.DeserializeString(_XmlList[2]); Assert.AreEqual(foo.Ints.Length, 0, "Deserialization2 failed"); res = ser.Serialize(foo); - Assert.AreEqual(_XMLList[2], res, "Serialization2 failed"); + Assert.AreEqual(_XmlList[2], res, "Serialization2 failed"); _AssertFail(_Empty); } - private const string _XMLListEmb = _Head + @" + private const string _XmlListEmb = _Head + @" 2 1 3 "; - private const string _XMLListEmb2 = _Head + @" + private const string _XmlListEmb2 = _Head + @" 2 1 @@ -294,7 +294,7 @@ namespace VocaluxeTests 3 "; - private const string _XMLListEmb3 = _Head + @" + private const string _XmlListEmb3 = _Head + @" 2 3 "; @@ -304,20 +304,20 @@ namespace VocaluxeTests { var xml = new CXmlDeserializer(); var ser = new CXmlSerializer(); - SListEmb foo = xml.DeserializeString(_XMLListEmb); + SListEmb foo = xml.DeserializeString(_XmlListEmb); Assert.AreEqual(foo.Ints.Count, 1, "Deserialization failed"); Assert.AreEqual(foo.Ints[0].I, 1, "Deserialization failed"); string res = ser.Serialize(foo); - Assert.AreEqual(_XMLListEmb, res, "Serialization failed"); - foo = xml.DeserializeString(_XMLListEmb2); + Assert.AreEqual(_XmlListEmb, res, "Serialization failed"); + foo = xml.DeserializeString(_XmlListEmb2); Assert.AreEqual(foo.Ints.Count, 2, "Deserialization failed"); Assert.AreEqual(foo.Ints[1].I, 2, "Deserialization failed"); res = ser.Serialize(foo); - Assert.AreEqual(_XMLListEmb2, res, "Serialization failed"); - foo = xml.DeserializeString(_XMLListEmb3); + Assert.AreEqual(_XmlListEmb2, res, "Serialization failed"); + foo = xml.DeserializeString(_XmlListEmb3); Assert.AreEqual(foo.Ints.Count, 0, "Deserialization failed"); res = ser.Serialize(foo); - Assert.AreEqual(_XMLListEmb3, res, "Serialization failed"); + Assert.AreEqual(_XmlListEmb3, res, "Serialization failed"); _AssertFail(_Empty); } @@ -326,20 +326,20 @@ namespace VocaluxeTests { var xml = new CXmlDeserializer(); var ser = new CXmlSerializer(); - SArrayEmb foo = xml.DeserializeString(_XMLListEmb); + SArrayEmb foo = xml.DeserializeString(_XmlListEmb); Assert.AreEqual(foo.Ints.Length, 1, "Deserialization failed"); Assert.AreEqual(foo.Ints[0].I, 1, "Deserialization failed"); string res = ser.Serialize(foo); - Assert.AreEqual(_XMLListEmb, res, "Serialization failed"); - foo = xml.DeserializeString(_XMLListEmb2); + Assert.AreEqual(_XmlListEmb, res, "Serialization failed"); + foo = xml.DeserializeString(_XmlListEmb2); Assert.AreEqual(foo.Ints.Length, 2, "Deserialization failed"); Assert.AreEqual(foo.Ints[1].I, 2, "Deserialization failed"); res = ser.Serialize(foo); - Assert.AreEqual(_XMLListEmb2, res, "Serialization failed"); - foo = xml.DeserializeString(_XMLListEmb3); + Assert.AreEqual(_XmlListEmb2, res, "Serialization failed"); + foo = xml.DeserializeString(_XmlListEmb3); Assert.AreEqual(foo.Ints.Length, 0, "Deserialization failed"); res = ser.Serialize(foo); - Assert.AreEqual(_XMLListEmb3, res, "Serialization failed"); + Assert.AreEqual(_XmlListEmb3, res, "Serialization failed"); _AssertFail(_Empty); }