warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes code according to modern code style. Fixes a few expression bugs.

Browse source
This commit is contained in:
Kamron Batman 2018-09-15 09:58:51 -07:00
parent 89eea25e5f
commit 970fd563b2
3324 changed files with 441118 additions and 433755 deletions
Download patch file Download diff file Expand all files Collapse all files

72
Scripts/Engines/Reports/Persistance/PersistableObject.cs
View file

@ -1,48 +1,44 @@
namespace Server.Engines.Reports
{
public abstract class PersistableObject
{
public abstract PersistableType TypeID{ get; }
public abstract class PersistableObject
{
public abstract PersistableType TypeID{ get; }
public virtual void SerializeAttributes( PersistanceWriter op )
{
}
public virtual void SerializeAttributes(PersistanceWriter op)
{
}
public virtual void SerializeChildren( PersistanceWriter op )
{
}
public virtual void SerializeChildren(PersistanceWriter op)
{
}
public void Serialize( PersistanceWriter op )
{
op.BeginObject( TypeID );
SerializeAttributes( op );
op.BeginChildren();
SerializeChildren( op );
op.FinishChildren();
op.FinishObject();
}
public void Serialize(PersistanceWriter op)
{
op.BeginObject(TypeID);
SerializeAttributes(op);
op.BeginChildren();
SerializeChildren(op);
op.FinishChildren();
op.FinishObject();
}
public virtual void DeserializeAttributes( PersistanceReader ip )
{
}
public virtual void DeserializeAttributes(PersistanceReader ip)
{
}
public virtual void DeserializeChildren( PersistanceReader ip )
{
}
public virtual void DeserializeChildren(PersistanceReader ip)
{
}
public void Deserialize( PersistanceReader ip )
{
DeserializeAttributes( ip );
public void Deserialize(PersistanceReader ip)
{
DeserializeAttributes(ip);
if ( ip.BeginChildren() )
{
DeserializeChildren( ip );
ip.FinishChildren();
}
}
public PersistableObject()
{
}
}
if (ip.BeginChildren())
{
DeserializeChildren(ip);
ip.FinishChildren();
}
}
}
}

350
Scripts/Engines/Reports/Persistance/PersistableObjectCollection.cs
View file

@ -8,187 +8,181 @@
// </autogenerated>
//------------------------------------------------------------------------------
using System;
using System.Collections;
namespace Server.Engines.Reports
{
using System.Collections;
/// <summary>
/// Strongly typed collection of Server.Engines.Reports.PersistableObject.
/// </summary>
public class ObjectCollection : CollectionBase
{
/// <summary>
/// Strongly typed collection of Server.Engines.Reports.PersistableObject.
/// Gets or sets the value of the Server.Engines.Reports.PersistableObject at a specific position in the ObjectCollection.
/// </summary>
public class ObjectCollection : CollectionBase
public PersistableObject this[int index]
{
/// <summary>
/// Default constructor.
/// </summary>
public ObjectCollection() :
base()
{
}
/// <summary>
/// Gets or sets the value of the Server.Engines.Reports.PersistableObject at a specific position in the ObjectCollection.
/// </summary>
public PersistableObject this[int index]
{
get => ((PersistableObject)(List[index]));
set => List[index] = value;
}
/// <summary>
/// Append a Server.Engines.Reports.PersistableObject entry to this collection.
/// </summary>
/// <param name="value">Server.Engines.Reports.PersistableObject instance.</param>
/// <returns>The position into which the new element was inserted.</returns>
public int Add(PersistableObject value)
{
return List.Add(value);
}
public void AddRange( PersistableObject[] col )
{
InnerList.AddRange( col );
}
/// <summary>
/// Determines whether a specified Server.Engines.Reports.PersistableObject instance is in this collection.
/// </summary>
/// <param name="value">Server.Engines.Reports.PersistableObject instance to search for.</param>
/// <returns>True if the Server.Engines.Reports.PersistableObject instance is in the collection; otherwise false.</returns>
public bool Contains(PersistableObject value)
{
return List.Contains(value);
}
/// <summary>
/// Retrieve the index a specified Server.Engines.Reports.PersistableObject instance is in this collection.
/// </summary>
/// <param name="value">Server.Engines.Reports.PersistableObject instance to find.</param>
/// <returns>The zero-based index of the specified Server.Engines.Reports.PersistableObject instance. If the object is not found, the return value is -1.</returns>
public int IndexOf(PersistableObject value)
{
return List.IndexOf(value);
}
/// <summary>
/// Removes a specified Server.Engines.Reports.PersistableObject instance from this collection.
/// </summary>
/// <param name="value">The Server.Engines.Reports.PersistableObject instance to remove.</param>
public void Remove(PersistableObject value)
{
List.Remove(value);
}
/// <summary>
/// Returns an enumerator that can iterate through the Server.Engines.Reports.PersistableObject instance.
/// </summary>
/// <returns>An Server.Engines.Reports.PersistableObject's enumerator.</returns>
public new ObjectCollectionEnumerator GetEnumerator()
{
return new ObjectCollectionEnumerator(this);
}
/// <summary>
/// Insert a Server.Engines.Reports.PersistableObject instance into this collection at a specified index.
/// </summary>
/// <param name="index">Zero-based index.</param>
/// <param name="value">The Server.Engines.Reports.PersistableObject instance to insert.</param>
public void Insert(int index, PersistableObject value)
{
List.Insert(index, value);
}
/// <summary>
/// Strongly typed enumerator of Server.Engines.Reports.PersistableObject.
/// </summary>
public class ObjectCollectionEnumerator : IEnumerator
{
/// <summary>
/// Current index
/// </summary>
private int _index;
/// <summary>
/// Current element pointed to.
/// </summary>
private PersistableObject _currentElement;
/// <summary>
/// Collection to enumerate.
/// </summary>
private ObjectCollection _collection;
/// <summary>
/// Default constructor for enumerator.
/// </summary>
/// <param name="collection">Instance of the collection to enumerate.</param>
internal ObjectCollectionEnumerator(ObjectCollection collection)
{
_index = -1;
_collection = collection;
}
/// <summary>
/// Gets the Server.Engines.Reports.PersistableObject object in the enumerated ObjectCollection currently indexed by this instance.
/// </summary>
public PersistableObject Current
{
get
{
if (((_index == -1)
|| (_index >= _collection.Count)))
{
throw new System.IndexOutOfRangeException("Enumerator not started.");
}
return _currentElement;
}
}
/// <summary>
/// Gets the current element in the collection.
/// </summary>
object IEnumerator.Current
{
get
{
if (((_index == -1)
|| (_index >= _collection.Count)))
{
throw new System.IndexOutOfRangeException("Enumerator not started.");
}
return _currentElement;
}
}
/// <summary>
/// Reset the cursor, so it points to the beginning of the enumerator.
/// </summary>
public void Reset()
{
_index = -1;
_currentElement = null;
}
/// <summary>
/// Advances the enumerator to the next queue of the enumeration, if one is currently available.
/// </summary>
/// <returns>true, if the enumerator was successfully advanced to the next queue; false, if the enumerator has reached the end of the enumeration.</returns>
public bool MoveNext()
{
if ((_index
< (_collection.Count - 1)))
{
_index = (_index + 1);
_currentElement = _collection[_index];
return true;
}
_index = _collection.Count;
return false;
}
}
get => (PersistableObject)List[index];
set => List[index] = value;
}
}
/// <summary>
/// Append a Server.Engines.Reports.PersistableObject entry to this collection.
/// </summary>
/// <param name="value">Server.Engines.Reports.PersistableObject instance.</param>
/// <returns>The position into which the new element was inserted.</returns>
public int Add(PersistableObject value)
{
return List.Add(value);
}
public void AddRange(PersistableObject[] col)
{
InnerList.AddRange(col);
}
/// <summary>
/// Determines whether a specified Server.Engines.Reports.PersistableObject instance is in this collection.
/// </summary>
/// <param name="value">Server.Engines.Reports.PersistableObject instance to search for.</param>
/// <returns>True if the Server.Engines.Reports.PersistableObject instance is in the collection; otherwise false.</returns>
public bool Contains(PersistableObject value)
{
return List.Contains(value);
}
/// <summary>
/// Retrieve the index a specified Server.Engines.Reports.PersistableObject instance is in this collection.
/// </summary>
/// <param name="value">Server.Engines.Reports.PersistableObject instance to find.</param>
/// <returns>
/// The zero-based index of the specified Server.Engines.Reports.PersistableObject instance. If the object is not
/// found, the return value is -1.
/// </returns>
public int IndexOf(PersistableObject value)
{
return List.IndexOf(value);
}
/// <summary>
/// Removes a specified Server.Engines.Reports.PersistableObject instance from this collection.
/// </summary>
/// <param name="value">The Server.Engines.Reports.PersistableObject instance to remove.</param>
public void Remove(PersistableObject value)
{
List.Remove(value);
}
/// <summary>
/// Returns an enumerator that can iterate through the Server.Engines.Reports.PersistableObject instance.
/// </summary>
/// <returns>An Server.Engines.Reports.PersistableObject's enumerator.</returns>
public new ObjectCollectionEnumerator GetEnumerator()
{
return new ObjectCollectionEnumerator(this);
}
/// <summary>
/// Insert a Server.Engines.Reports.PersistableObject instance into this collection at a specified index.
/// </summary>
/// <param name="index">Zero-based index.</param>
/// <param name="value">The Server.Engines.Reports.PersistableObject instance to insert.</param>
public void Insert(int index, PersistableObject value)
{
List.Insert(index, value);
}
/// <summary>
/// Strongly typed enumerator of Server.Engines.Reports.PersistableObject.
/// </summary>
public class ObjectCollectionEnumerator : IEnumerator
{
/// <summary>
/// Collection to enumerate.
/// </summary>
private ObjectCollection _collection;
/// <summary>
/// Current element pointed to.
/// </summary>
private PersistableObject _currentElement;
/// <summary>
/// Current index
/// </summary>
private int _index;
/// <summary>
/// Default constructor for enumerator.
/// </summary>
/// <param name="collection">Instance of the collection to enumerate.</param>
internal ObjectCollectionEnumerator(ObjectCollection collection)
{
_index = -1;
_collection = collection;
}
/// <summary>
/// Gets the Server.Engines.Reports.PersistableObject object in the enumerated ObjectCollection currently indexed by this
/// instance.
/// </summary>
public PersistableObject Current
{
get
{
if (_index == -1
|| _index >= _collection.Count)
throw new IndexOutOfRangeException("Enumerator not started.");
return _currentElement;
}
}
/// <summary>
/// Gets the current element in the collection.
/// </summary>
object IEnumerator.Current
{
get
{
if (_index == -1
|| _index >= _collection.Count)
throw new IndexOutOfRangeException("Enumerator not started.");
return _currentElement;
}
}
/// <summary>
/// Reset the cursor, so it points to the beginning of the enumerator.
/// </summary>
public void Reset()
{
_index = -1;
_currentElement = null;
}
/// <summary>
/// Advances the enumerator to the next queue of the enumeration, if one is currently available.
/// </summary>
/// <returns>
/// true, if the enumerator was successfully advanced to the next queue; false, if the enumerator has reached the end
/// of the enumeration.
/// </returns>
public bool MoveNext()
{
if (_index
< _collection.Count - 1)
{
_index = _index + 1;
_currentElement = _collection[_index];
return true;
}
_index = _collection.Count;
return false;
}
}
}
}

82
Scripts/Engines/Reports/Persistance/PersistableType.cs
View file

@ -3,54 +3,54 @@ using System.Collections;
namespace Server.Engines.Reports
{
public delegate PersistableObject ConstructCallback();
public delegate PersistableObject ConstructCallback();
public sealed class PersistableTypeRegistry
{
private static Hashtable m_Table;
public sealed class PersistableTypeRegistry
{
private static Hashtable m_Table;
public static PersistableType Find( string name )
{
return m_Table[name] as PersistableType;
}
static PersistableTypeRegistry()
{
m_Table = new Hashtable(StringComparer.OrdinalIgnoreCase);
public static void Register( PersistableType type )
{
if ( type != null )
m_Table[type.Name] = type;
}
Register(Report.ThisTypeID);
Register(BarGraph.ThisTypeID);
Register(PieChart.ThisTypeID);
Register(Snapshot.ThisTypeID);
Register(ItemValue.ThisTypeID);
Register(ChartItem.ThisTypeID);
Register(ReportItem.ThisTypeID);
Register(ReportColumn.ThisTypeID);
Register(SnapshotHistory.ThisTypeID);
static PersistableTypeRegistry()
{
m_Table = new Hashtable( StringComparer.OrdinalIgnoreCase );
Register(PageInfo.ThisTypeID);
Register(QueueStatus.ThisTypeID);
Register(StaffHistory.ThisTypeID);
Register(ResponseInfo.ThisTypeID);
}
Register( Report.ThisTypeID );
Register( BarGraph.ThisTypeID );
Register( PieChart.ThisTypeID );
Register( Snapshot.ThisTypeID );
Register( ItemValue.ThisTypeID );
Register( ChartItem.ThisTypeID );
Register( ReportItem.ThisTypeID );
Register( ReportColumn.ThisTypeID );
Register( SnapshotHistory.ThisTypeID );
public static PersistableType Find(string name)
{
return m_Table[name] as PersistableType;
}
Register( PageInfo.ThisTypeID );
Register( QueueStatus.ThisTypeID );
Register( StaffHistory.ThisTypeID );
Register( ResponseInfo.ThisTypeID );
}
}
public static void Register(PersistableType type)
{
if (type != null)
m_Table[type.Name] = type;
}
}
public sealed class PersistableType
{
public string Name { get; }
public sealed class PersistableType
{
public PersistableType(string name, ConstructCallback constructor)
{
Name = name;
Constructor = constructor;
}
public ConstructCallback Constructor { get; }
public string Name{ get; }
public PersistableType( string name, ConstructCallback constructor )
{
Name = name;
Constructor = constructor;
}
}
public ConstructCallback Constructor{ get; }
}
}

167
Scripts/Engines/Reports/Persistance/PersistanceReader.cs
View file

@ -4,113 +4,108 @@ using System.Xml;
namespace Server.Engines.Reports
{
public abstract class PersistanceReader
{
public abstract int GetInt32( string key );
public abstract bool GetBoolean( string key );
public abstract string GetString( string key );
public abstract DateTime GetDateTime( string key );
public abstract class PersistanceReader
{
public abstract bool HasChild{ get; }
public abstract int GetInt32(string key);
public abstract bool GetBoolean(string key);
public abstract string GetString(string key);
public abstract DateTime GetDateTime(string key);
public abstract bool BeginChildren();
public abstract void FinishChildren();
public abstract bool HasChild{ get; }
public abstract PersistableObject GetChild();
public abstract bool BeginChildren();
public abstract void FinishChildren();
public abstract PersistableObject GetChild();
public abstract void ReadDocument( PersistableObject root );
public abstract void Close();
public abstract void ReadDocument(PersistableObject root);
public abstract void Close();
}
public PersistanceReader()
{
}
}
public class XmlPersistanceReader : PersistanceReader
{
private bool m_HasChild;
private StreamReader m_Reader;
private string m_Title;
public class XmlPersistanceReader : PersistanceReader
{
private StreamReader m_Reader;
private XmlTextReader m_Xml;
private string m_Title;
private bool m_WasEmptyElement;
private XmlTextReader m_Xml;
public XmlPersistanceReader( string filePath, string title )
{
m_Reader = new StreamReader( filePath );
m_Xml = new XmlTextReader( m_Reader );
m_Xml.WhitespaceHandling=WhitespaceHandling.None;
m_Title = title;
}
public XmlPersistanceReader(string filePath, string title)
{
m_Reader = new StreamReader(filePath);
m_Xml = new XmlTextReader(m_Reader);
m_Xml.WhitespaceHandling = WhitespaceHandling.None;
m_Title = title;
}
public override int GetInt32( string key )
{
return XmlConvert.ToInt32( m_Xml.GetAttribute( key ) );
}
public override bool HasChild => m_HasChild;
public override bool GetBoolean( string key )
{
return XmlConvert.ToBoolean( m_Xml.GetAttribute( key ) );
}
public override int GetInt32(string key)
{
return XmlConvert.ToInt32(m_Xml.GetAttribute(key));
}
public override string GetString( string key )
{
return m_Xml.GetAttribute( key );
}
public override bool GetBoolean(string key)
{
return XmlConvert.ToBoolean(m_Xml.GetAttribute(key));
}
public override DateTime GetDateTime( string key )
{
string val = m_Xml.GetAttribute( key );
public override string GetString(string key)
{
return m_Xml.GetAttribute(key);
}
if ( val == null )
return DateTime.MinValue;
public override DateTime GetDateTime(string key)
{
string val = m_Xml.GetAttribute(key);
return XmlConvert.ToDateTime( val, XmlDateTimeSerializationMode.Utc );
}
if (val == null)
return DateTime.MinValue;
private bool m_HasChild;
return XmlConvert.ToDateTime(val, XmlDateTimeSerializationMode.Utc);
}
public override bool HasChild => m_HasChild;
public override bool BeginChildren()
{
m_HasChild = !m_WasEmptyElement;
private bool m_WasEmptyElement;
m_Xml.Read();
public override bool BeginChildren()
{
m_HasChild = !m_WasEmptyElement;
return m_HasChild;
}
m_Xml.Read();
public override void FinishChildren()
{
m_Xml.Read();
}
return m_HasChild;
}
public override PersistableObject GetChild()
{
PersistableType type = PersistableTypeRegistry.Find(m_Xml.Name);
PersistableObject obj = type.Constructor();
public override void FinishChildren()
{
m_Xml.Read();
}
m_WasEmptyElement = m_Xml.IsEmptyElement;
public override PersistableObject GetChild()
{
PersistableType type = PersistableTypeRegistry.Find( m_Xml.Name );
PersistableObject obj = type.Constructor();
obj.Deserialize(this);
m_WasEmptyElement = m_Xml.IsEmptyElement;
m_HasChild = m_Xml.NodeType == XmlNodeType.Element;
obj.Deserialize( this );
return obj;
}
m_HasChild = ( m_Xml.NodeType == XmlNodeType.Element );
public override void ReadDocument(PersistableObject root)
{
Console.Write("Reports: {0}: Loading...", m_Title);
m_Xml.Read();
m_Xml.Read();
m_HasChild = !m_Xml.IsEmptyElement;
root.Deserialize(this);
Console.WriteLine("done");
}
return obj;
}
public override void ReadDocument( PersistableObject root )
{
Console.Write( "Reports: {0}: Loading...", m_Title );
m_Xml.Read();
m_Xml.Read();
m_HasChild = !m_Xml.IsEmptyElement;
root.Deserialize( this );
Console.WriteLine( "done" );
}
public override void Close()
{
m_Xml.Close();
m_Reader.Close();
}
}
public override void Close()
{
m_Xml.Close();
m_Reader.Close();
}
}
}

194
Scripts/Engines/Reports/Persistance/PersistanceWriter.cs
View file

@ -4,126 +4,122 @@ using System.Xml;
namespace Server.Engines.Reports
{
public abstract class PersistanceWriter
{
public abstract void SetInt32( string key, int value );
public abstract void SetBoolean( string key, bool value );
public abstract void SetString( string key, string value );
public abstract void SetDateTime( string key, DateTime value );
public abstract class PersistanceWriter
{
public abstract void SetInt32(string key, int value);
public abstract void SetBoolean(string key, bool value);
public abstract void SetString(string key, string value);
public abstract void SetDateTime(string key, DateTime value);
public abstract void BeginObject( PersistableType typeID );
public abstract void BeginChildren();
public abstract void FinishChildren();
public abstract void FinishObject();
public abstract void BeginObject(PersistableType typeID);
public abstract void BeginChildren();
public abstract void FinishChildren();
public abstract void FinishObject();
public abstract void WriteDocument( PersistableObject root );
public abstract void Close();
public abstract void WriteDocument(PersistableObject root);
public abstract void Close();
}
public PersistanceWriter()
{
}
}
public sealed class XmlPersistanceWriter : PersistanceWriter
{
private string m_RealFilePath;
private string m_TempFilePath;
private string m_Title;
public sealed class XmlPersistanceWriter : PersistanceWriter
{
private string m_RealFilePath;
private string m_TempFilePath;
private StreamWriter m_Writer;
private XmlTextWriter m_Xml;
private StreamWriter m_Writer;
private XmlTextWriter m_Xml;
private string m_Title;
public XmlPersistanceWriter(string filePath, string title)
{
m_RealFilePath = filePath;
m_TempFilePath = Path.ChangeExtension(filePath, ".tmp");
public XmlPersistanceWriter( string filePath, string title )
{
m_RealFilePath = filePath;
m_TempFilePath = Path.ChangeExtension( filePath, ".tmp" );
m_Writer = new StreamWriter(m_TempFilePath);
m_Xml = new XmlTextWriter(m_Writer);
m_Writer = new StreamWriter( m_TempFilePath );
m_Xml = new XmlTextWriter( m_Writer );
m_Title = title;
}
m_Title = title;
}
public override void SetInt32(string key, int value)
{
m_Xml.WriteAttributeString(key, XmlConvert.ToString(value));
}
public override void SetInt32( string key, int value )
{
m_Xml.WriteAttributeString( key, XmlConvert.ToString( value ) );
}
public override void SetBoolean(string key, bool value)
{
m_Xml.WriteAttributeString(key, XmlConvert.ToString(value));
}
public override void SetBoolean( string key, bool value )
{
m_Xml.WriteAttributeString( key, XmlConvert.ToString( value ) );
}
public override void SetString(string key, string value)
{
if (value != null)
m_Xml.WriteAttributeString(key, value);
}
public override void SetString( string key, string value )
{
if ( value != null )
m_Xml.WriteAttributeString( key, value );
}
public override void SetDateTime(string key, DateTime value)
{
if (value != DateTime.MinValue)
m_Xml.WriteAttributeString(key, XmlConvert.ToString(value, XmlDateTimeSerializationMode.Utc));
}
public override void SetDateTime( string key, DateTime value )
{
if ( value != DateTime.MinValue )
m_Xml.WriteAttributeString( key, XmlConvert.ToString( value, XmlDateTimeSerializationMode.Utc ) );
}
public override void BeginObject(PersistableType typeID)
{
m_Xml.WriteStartElement(typeID.Name);
}
public override void BeginObject( PersistableType typeID )
{
m_Xml.WriteStartElement( typeID.Name );
}
public override void BeginChildren()
{
}
public override void BeginChildren()
{
}
public override void FinishChildren()
{
}
public override void FinishChildren()
{
}
public override void FinishObject()
{
m_Xml.WriteEndElement();
}
public override void FinishObject()
{
m_Xml.WriteEndElement();
}
public override void WriteDocument(PersistableObject root)
{
Console.WriteLine("Reports: {0}: Save started", m_Title);
public override void WriteDocument( PersistableObject root )
{
Console.WriteLine( "Reports: {0}: Save started", m_Title );
m_Xml.Formatting = Formatting.Indented;
m_Xml.IndentChar = '\t';
m_Xml.Indentation = 1;
m_Xml.Formatting = Formatting.Indented;
m_Xml.IndentChar = '\t';
m_Xml.Indentation = 1;
m_Xml.WriteStartDocument(true);
m_Xml.WriteStartDocument( true );
root.Serialize(this);
root.Serialize( this );
Console.WriteLine("Reports: {0}: Save complete", m_Title);
}
Console.WriteLine( "Reports: {0}: Save complete", m_Title );
}
public override void Close()
{
m_Xml.Close();
m_Writer.Close();
public override void Close()
{
m_Xml.Close();
m_Writer.Close();
try
{
string renamed = null;
try
{
string renamed = null;
if ( File.Exists( m_RealFilePath ) )
{
renamed = Path.ChangeExtension( m_RealFilePath, ".rem" );
File.Move( m_RealFilePath, renamed );
File.Move( m_TempFilePath, m_RealFilePath );
File.Delete( renamed );
}
else
{
File.Move( m_TempFilePath, m_RealFilePath );
}
}
catch ( Exception ex )
{
Console.WriteLine( ex );
}
}
}
if (File.Exists(m_RealFilePath))
{
renamed = Path.ChangeExtension(m_RealFilePath, ".rem");
File.Move(m_RealFilePath, renamed);
File.Move(m_TempFilePath, m_RealFilePath);
File.Delete(renamed);
}
else
{
File.Move(m_TempFilePath, m_RealFilePath);
}
}
catch (Exception ex)
{
Console.WriteLine(ex);
}
}
}
}