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

Fixes body expression style.

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 08:46:14 -07:00
parent 3f0a72a62f
commit 33f5e77a24
957 changed files with 7424 additions and 15973 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Scripts/Engines/Reports/Objects/Charts/BarGraph.cs
View file

@ -33,16 +33,30 @@ namespace Server.Engines.Reports
private BarRegion[] m_Regions;
public int Ticks{ get{ return m_Ticks; } set{ m_Ticks = value; } }
public BarGraphRenderMode RenderMode{ get{ return m_RenderMode; } set{ m_RenderMode = value; } }
public int Ticks{ get => m_Ticks;
set => m_Ticks = value;
}
public BarGraphRenderMode RenderMode{ get => m_RenderMode;
set => m_RenderMode = value;
}
public string xTitle{ get{ return m_xTitle; } set{ m_xTitle = value; } }
public string yTitle{ get{ return m_yTitle; } set{ m_yTitle = value; } }
public string xTitle{ get => m_xTitle;
set => m_xTitle = value;
}
public string yTitle{ get => m_yTitle;
set => m_yTitle = value;
}
public int FontSize{ get{ return m_FontSize; } set{ m_FontSize = value; } }
public int Interval{ get{ return m_Interval; } set{ m_Interval = value; } }
public int FontSize{ get => m_FontSize;
set => m_FontSize = value;
}
public int Interval{ get => m_Interval;
set => m_Interval = value;
}
public BarRegion[] Regions{ get{ return m_Regions; } set{ m_Regions = value; } }
public BarRegion[] Regions{ get => m_Regions;
set => m_Regions = value;
}
public BarGraph( string name, string fileName, int ticks, string xTitle, string yTitle, BarGraphRenderMode rm )
{

10
Scripts/Engines/Reports/Objects/Charts/Chart.cs
View file

@ -6,9 +6,13 @@ namespace Server.Engines.Reports
protected string m_FileName;
protected ChartItemCollection m_Items;
public string Name{ get{ return m_Name; } set{ m_Name = value; } }
public string FileName{ get{ return m_FileName; } set{ m_FileName = value; } }
public ChartItemCollection Items{ get{ return m_Items; } }
public string Name{ get => m_Name;
set => m_Name = value;
}
public string FileName{ get => m_FileName;
set => m_FileName = value;
}
public ChartItemCollection Items => m_Items;
public Chart()
{

8
Scripts/Engines/Reports/Objects/Charts/ChartItem.cs
View file

@ -16,8 +16,12 @@ namespace Server.Engines.Reports
private string m_Name;
private int m_Value;
public string Name{ get{ return m_Name; } set{ m_Name = value; } }
public int Value{ get{ return m_Value; } set{ m_Value = value; } }
public string Name{ get => m_Name;
set => m_Name = value;
}
public int Value{ get => m_Value;
set => m_Value = value;
}
private ChartItem()
{

12
Scripts/Engines/Reports/Objects/Charts/ChartItemCollection.cs
View file

@ -32,15 +32,9 @@ namespace Server.Engines.Reports
/// </summary>
public Server.Engines.Reports.ChartItem this[int index]
{
get
{
return ((Server.Engines.Reports.ChartItem)(this.List[index]));
}
set
{
this.List[index] = value;
}
}
get => ((Server.Engines.Reports.ChartItem)(this.List[index]));
set => this.List[index] = value;
}
public int Add( string name, int value )
{

4
Scripts/Engines/Reports/Objects/Charts/PieChart.cs
View file

@ -15,7 +15,9 @@ namespace Server.Engines.Reports
private bool m_ShowPercents;
public bool ShowPercents{ get{ return m_ShowPercents; } set{ m_ShowPercents = value; } }
public bool ShowPercents{ get => m_ShowPercents;
set => m_ShowPercents = value;
}
public PieChart( string name, string fileName, bool showPercents )
{

8
Scripts/Engines/Reports/Objects/Reports/ItemValue.cs
View file

@ -16,8 +16,12 @@ namespace Server.Engines.Reports
private string m_Value;
private string m_Format;
public string Value{ get{ return m_Value; } set{ m_Value = value; } }
public string Format{ get{ return m_Format; } set{ m_Format = value; } }
public string Value{ get => m_Value;
set => m_Value = value;
}
public string Format{ get => m_Format;
set => m_Format = value;
}
private ItemValue()
{

10
Scripts/Engines/Reports/Objects/Reports/ItemValueCollection.cs
View file

@ -32,14 +32,8 @@ namespace Server.Engines.Reports
/// </summary>
public Server.Engines.Reports.ItemValue this[int index]
{
get
{
return ((Server.Engines.Reports.ItemValue)(this.List[index]));
}
set
{
this.List[index] = value;
}
get => ((Server.Engines.Reports.ItemValue)(this.List[index]));
set => this.List[index] = value;
}
public int Add( string value )

12
Scripts/Engines/Reports/Objects/Reports/Report.cs
View file

@ -18,10 +18,14 @@ namespace Server.Engines.Reports
private ReportColumnCollection m_Columns;
private ReportItemCollection m_Items;
public string Name{ get{ return m_Name; } set{ m_Name = value; } }
public string Width{ get{ return m_Width; } set{ m_Width = value; } }
public ReportColumnCollection Columns{ get{ return m_Columns; } }
public ReportItemCollection Items{ get{ return m_Items; } }
public string Name{ get => m_Name;
set => m_Name = value;
}
public string Width{ get => m_Width;
set => m_Width = value;
}
public ReportColumnCollection Columns => m_Columns;
public ReportItemCollection Items => m_Items;
private Report() : this( null, null )
{

12
Scripts/Engines/Reports/Objects/Reports/ReportColumn.cs
View file

@ -17,9 +17,15 @@ namespace Server.Engines.Reports
private string m_Align;
private string m_Name;
public string Width{ get{ return m_Width; } set{ m_Width = value; } }
public string Align{ get{ return m_Align; } set{ m_Align = value; } }
public string Name{ get{ return m_Name; } set{ m_Name = value; } }
public string Width{ get => m_Width;
set => m_Width = value;
}
public string Align{ get => m_Align;
set => m_Align = value;
}
public string Name{ get => m_Name;
set => m_Name = value;
}
private ReportColumn()
{

10
Scripts/Engines/Reports/Objects/Reports/ReportColumnCollection.cs
View file

@ -32,14 +32,8 @@ namespace Server.Engines.Reports
/// </summary>
public Server.Engines.Reports.ReportColumn this[int index]
{
get
{
return ((Server.Engines.Reports.ReportColumn)(this.List[index]));
}
set
{
this.List[index] = value;
}
get => ((Server.Engines.Reports.ReportColumn)(this.List[index]));
set => this.List[index] = value;
}
public int Add( string width, string align )

2
Scripts/Engines/Reports/Objects/Reports/ReportItem.cs
View file

@ -15,7 +15,7 @@ namespace Server.Engines.Reports
private ItemValueCollection m_Values;
public ItemValueCollection Values{ get{ return m_Values; } }
public ItemValueCollection Values => m_Values;
public ReportItem()
{

12
Scripts/Engines/Reports/Objects/Reports/ReportItemCollection.cs
View file

@ -32,15 +32,9 @@ namespace Server.Engines.Reports
/// </summary>
public Server.Engines.Reports.ReportItem this[int index]
{
get
{
return ((Server.Engines.Reports.ReportItem)(this.List[index]));
}
set
{
this.List[index] = value;
}
}
get => ((Server.Engines.Reports.ReportItem)(this.List[index]));
set => this.List[index] = value;
}
public int Add( string name, object value )
{

8
Scripts/Engines/Reports/Objects/Snapshots/Snapshot.cs
View file

@ -18,8 +18,12 @@ namespace Server.Engines.Reports
private DateTime m_TimeStamp;
private ObjectCollection m_Children;
public DateTime TimeStamp{ get{ return m_TimeStamp; } set{ m_TimeStamp = value; } }
public ObjectCollection Children{ get{ return m_Children; } set{ m_Children = value; } }
public DateTime TimeStamp{ get => m_TimeStamp;
set => m_TimeStamp = value;
}
public ObjectCollection Children{ get => m_Children;
set => m_Children = value;
}
public Snapshot()
{

10
Scripts/Engines/Reports/Objects/Snapshots/SnapshotCollection.cs
View file

@ -32,14 +32,8 @@ namespace Server.Engines.Reports
/// </summary>
public Server.Engines.Reports.Snapshot this[int index]
{
get
{
return ((Server.Engines.Reports.Snapshot)(this.List[index]));
}
set
{
this.List[index] = value;
}
get => ((Server.Engines.Reports.Snapshot)(this.List[index]));
set => this.List[index] = value;
}
/// <summary>

4
Scripts/Engines/Reports/Objects/Snapshots/SnapshotHistory.cs
View file

@ -17,7 +17,9 @@ namespace Server.Engines.Reports
private SnapshotCollection m_Snapshots;
public SnapshotCollection Snapshots{ get{ return m_Snapshots; } set{ m_Snapshots = value; } }
public SnapshotCollection Snapshots{ get => m_Snapshots;
set => m_Snapshots = value;
}
public SnapshotHistory()
{

12
Scripts/Engines/Reports/Objects/Staffing/Info.cs
View file

@ -7,14 +7,20 @@ namespace Server.Engines.Reports
{
private static TimeSpan m_SortRange;
public static TimeSpan SortRange{ get{ return m_SortRange; } set{ m_SortRange = value; } }
public static TimeSpan SortRange{ get => m_SortRange;
set => m_SortRange = value;
}
private string m_Account;
private string m_Display;
private PageInfoCollection m_Pages;
public string Account{ get{ return m_Account; } set{ m_Account = value; } }
public PageInfoCollection Pages{ get{ return m_Pages; } set{ m_Pages = value; } }
public string Account{ get => m_Account;
set => m_Account = value;
}
public PageInfoCollection Pages{ get => m_Pages;
set => m_Pages = value;
}
public string Display
{

33
Scripts/Engines/Reports/Objects/Staffing/PageInfo.cs
View file

@ -32,7 +32,7 @@ namespace Server.Engines.Reports
public StaffInfo Resolver
{
get{ return m_Resolver; }
get => m_Resolver;
set
{
if ( m_Resolver == value )
@ -53,7 +53,7 @@ namespace Server.Engines.Reports
public UserInfo Sender
{
get{ return m_Sender; }
get => m_Sender;
set
{
if ( m_Sender == value )
@ -86,7 +86,7 @@ namespace Server.Engines.Reports
public StaffHistory History
{
get{ return m_History; }
get => m_History;
set
{
if ( m_History == value )
@ -108,15 +108,19 @@ namespace Server.Engines.Reports
}
}
public PageType PageType{ get{ return m_PageType; } set{ m_PageType = value; } }
public PageResolution Resolution{ get{ return m_Resolution; } }
public PageType PageType{ get => m_PageType;
set => m_PageType = value;
}
public PageResolution Resolution => m_Resolution;
public DateTime TimeSent{ get{ return m_TimeSent; } set{ m_TimeSent = value; } }
public DateTime TimeResolved{ get{ return m_TimeResolved; } }
public DateTime TimeSent{ get => m_TimeSent;
set => m_TimeSent = value;
}
public DateTime TimeResolved => m_TimeResolved;
public string SentBy
{
get{ return m_SentBy; }
get => m_SentBy;
set
{
m_SentBy = value;
@ -126,13 +130,14 @@ namespace Server.Engines.Reports
}
}
public string ResolvedBy
{
get{ return m_ResolvedBy; }
}
public string ResolvedBy => m_ResolvedBy;
public string Message{ get{ return m_Message; } set{ m_Message = value; } }
public ResponseInfoCollection Responses{ get{ return m_Responses; } set{ m_Responses = value; } }
public string Message{ get => m_Message;
set => m_Message = value;
}
public ResponseInfoCollection Responses{ get => m_Responses;
set => m_Responses = value;
}
public void UpdateResolver()
{

10
Scripts/Engines/Reports/Objects/Staffing/PageInfoCollection.cs
View file

@ -32,14 +32,8 @@ namespace Server.Engines.Reports
/// </summary>
public Server.Engines.Reports.PageInfo this[int index]
{
get
{
return ((Server.Engines.Reports.PageInfo)(this.List[index]));
}
set
{
this.List[index] = value;
}
get => ((Server.Engines.Reports.PageInfo)(this.List[index]));
set => this.List[index] = value;
}
/// <summary>

8
Scripts/Engines/Reports/Objects/Staffing/QueueStatus.cs
View file

@ -18,8 +18,12 @@ namespace Server.Engines.Reports
private DateTime m_TimeStamp;
private int m_Count;
public DateTime TimeStamp{ get{ return m_TimeStamp; } set{ m_TimeStamp = value; } }
public int Count{ get{ return m_Count; } set{ m_Count = value; } }
public DateTime TimeStamp{ get => m_TimeStamp;
set => m_TimeStamp = value;
}
public int Count{ get => m_Count;
set => m_Count = value;
}
public QueueStatus()
{

10
Scripts/Engines/Reports/Objects/Staffing/QueueStatusCollection.cs
View file

@ -32,14 +32,8 @@ namespace Server.Engines.Reports
/// </summary>
public Server.Engines.Reports.QueueStatus this[int index]
{
get
{
return ((Server.Engines.Reports.QueueStatus)(this.List[index]));
}
set
{
this.List[index] = value;
}
get => ((Server.Engines.Reports.QueueStatus)(this.List[index]));
set => this.List[index] = value;
}
/// <summary>

12
Scripts/Engines/Reports/Objects/Staffing/ResponseInfo.cs
View file

@ -20,10 +20,16 @@ namespace Server.Engines.Reports
private string m_SentBy;
private string m_Message;
public DateTime TimeStamp{ get{ return m_TimeStamp; } set{ m_TimeStamp = value; } }
public DateTime TimeStamp{ get => m_TimeStamp;
set => m_TimeStamp = value;
}
public string SentBy{ get{ return m_SentBy; } set{ m_SentBy = value; } }
public string Message{ get{ return m_Message; } set{ m_Message = value; } }
public string SentBy{ get => m_SentBy;
set => m_SentBy = value;
}
public string Message{ get => m_Message;
set => m_Message = value;
}
public ResponseInfo()
{

10
Scripts/Engines/Reports/Objects/Staffing/ResponseInfoCollection.cs
View file

@ -32,14 +32,8 @@ namespace Server.Engines.Reports
/// </summary>
public Server.Engines.Reports.ResponseInfo this[int index]
{
get
{
return ((Server.Engines.Reports.ResponseInfo)(this.List[index]));
}
set
{
this.List[index] = value;
}
get => ((Server.Engines.Reports.ResponseInfo)(this.List[index]));
set => this.List[index] = value;
}
public int Add( string sentBy, string message )

16
Scripts/Engines/Reports/Objects/Staffing/StaffHistory.cs
View file

@ -23,11 +23,19 @@ namespace Server.Engines.Reports
private Hashtable m_UserInfo;
private Hashtable m_StaffInfo;
public PageInfoCollection Pages{ get{ return m_Pages; } set{ m_Pages = value; } }
public QueueStatusCollection QueueStats{ get{ return m_QueueStats; } set{ m_QueueStats = value; } }
public PageInfoCollection Pages{ get => m_Pages;
set => m_Pages = value;
}
public QueueStatusCollection QueueStats{ get => m_QueueStats;
set => m_QueueStats = value;
}
public Hashtable UserInfo{ get{ return m_UserInfo; } set{ m_UserInfo = value; } }
public Hashtable StaffInfo{ get{ return m_StaffInfo; } set{ m_StaffInfo = value; } }
public Hashtable UserInfo{ get => m_UserInfo;
set => m_UserInfo = value;
}
public Hashtable StaffInfo{ get => m_StaffInfo;
set => m_StaffInfo = value;
}
public void AddPage( PageInfo info )
{

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

@ -32,14 +32,8 @@ namespace Server.Engines.Reports
/// </summary>
public Server.Engines.Reports.PersistableObject this[int index]
{
get
{
return ((Server.Engines.Reports.PersistableObject)(this.List[index]));
}
set
{
this.List[index] = value;
}
get => ((Server.Engines.Reports.PersistableObject)(this.List[index]));
set => this.List[index] = value;
}
/// <summary>

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

@ -46,8 +46,8 @@ namespace Server.Engines.Reports
private string m_Name;
private ConstructCallback m_Constructor;
public string Name{ get{ return m_Name; } }
public ConstructCallback Constructor{ get{ return m_Constructor; } }
public string Name => m_Name;
public ConstructCallback Constructor => m_Constructor;
public PersistableType( string name, ConstructCallback constructor )
{

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

@ -65,13 +65,7 @@ namespace Server.Engines.Reports
private bool m_HasChild;
public override bool HasChild
{
get
{
return m_HasChild;
}
}
public override bool HasChild => m_HasChild;
private bool m_WasEmptyElement;

40
Scripts/Engines/Reports/Rendering/BarGraphRenderer.cs
View file

@ -73,69 +73,69 @@ namespace Server.Engines.Reports
public string FontFamily
{
get{ return _fontFamily; }
set{ _fontFamily = value; }
get => _fontFamily;
set => _fontFamily = value;
}
public BarGraphRenderMode RenderMode
{
get{ return _renderMode; }
set{ _renderMode = value; }
get => _renderMode;
set => _renderMode = value;
}
public Color BackgroundColor
{
set{ _backColor = value; }
set => _backColor = value;
}
public int BottomBuffer
{
set { _bottomBuffer = Convert.ToSingle(value); }
set => _bottomBuffer = Convert.ToSingle(value);
}
public Color FontColor
{
set{ _fontColor = value; }
set => _fontColor = value;
}
public int Height
{
get{ return Convert.ToInt32(_totalHeight); }
set{ _totalHeight = Convert.ToSingle(value); }
get => Convert.ToInt32(_totalHeight);
set => _totalHeight = Convert.ToSingle(value);
}
public int Width
{
get{ return Convert.ToInt32(_totalWidth); }
set{ _totalWidth = Convert.ToSingle(value); }
get => Convert.ToInt32(_totalWidth);
set => _totalWidth = Convert.ToSingle(value);
}
public bool ShowLegend
{
get{ return _displayLegend; }
set{ _displayLegend = value; }
get => _displayLegend;
set => _displayLegend = value;
}
public bool ShowData
{
get{ return _displayBarData; }
set{ _displayBarData = value; }
get => _displayBarData;
set => _displayBarData = value;
}
public int TopBuffer
{
set { _topBuffer = Convert.ToSingle(value); }
set => _topBuffer = Convert.ToSingle(value);
}
public string VerticalLabel
{
get{ return _yLabel; }
set{ _yLabel = value; }
get => _yLabel;
set => _yLabel = value;
}
public int VerticalTickCount
{
get{ return _yTickCount; }
set{ _yTickCount = value; }
get => _yTickCount;
set => _yTickCount = value;
}
private string _xTitle, _yTitle;

4
Scripts/Engines/Reports/Rendering/ChartRenderer.cs
View file

@ -36,8 +36,8 @@ namespace Server.Engines.Reports
public ChartItemsCollection DataPoints
{
get{ return _dataPoints; }
set{ _dataPoints = value; }
get => _dataPoints;
set => _dataPoints = value;
}
public void SetColor(int index, Color NewColor)

28
Scripts/Engines/Reports/Rendering/DataItem.cs
View file

@ -36,38 +36,38 @@ namespace Server.Engines.Reports
public string Label
{
get{ return _label; }
set{ _label = value; }
get => _label;
set => _label = value;
}
public string Description
{
get{ return _description; }
set{ _description = value; }
get => _description;
set => _description = value;
}
public float Value
{
get{ return _value; }
set{ _value = value; }
get => _value;
set => _value = value;
}
public Color ItemColor
{
get{ return _color; }
set{ _color = value; }
get => _color;
set => _color = value;
}
public float StartPos
{
get{ return _startPos; }
set{ _startPos = value; }
get => _startPos;
set => _startPos = value;
}
public float SweepSize
{
get{ return _sweepSize; }
set{ _sweepSize = value; }
get => _sweepSize;
set => _sweepSize = value;
}
}
@ -81,8 +81,8 @@ namespace Server.Engines.Reports
{
public DataItem this[int index]
{
get{ return (DataItem)(List[index]); }
set{ List[index] = value; }
get => (DataItem)(List[index]);
set => List[index] = value;
}
public int Add(DataItem value)

4
Scripts/Engines/Reports/Rendering/PieChartRenderer.cs
View file

@ -30,7 +30,9 @@ namespace Server.Engines.Reports
private float _legendFontSize;
private bool _showPercents;
public bool ShowPercents{ get{ return _showPercents; } set{ _showPercents = value; } }
public bool ShowPercents{ get => _showPercents;
set => _showPercents = value;
}
public PieChartRenderer()
{

2
Scripts/Engines/Reports/Reports.cs
View file

@ -49,7 +49,7 @@ namespace Server.Engines.Reports
private static SnapshotHistory m_StatsHistory;
private static StaffHistory m_StaffHistory;
public static StaffHistory StaffHistory{ get{ return m_StaffHistory; } }
public static StaffHistory StaffHistory => m_StaffHistory;
public static void Generate()
{