Learning/mRemoteNG
1
0
Fork 0
mirror of https://github.com/mRemoteNG/mRemoteNG.git synced 2026-02-17 22:11:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

there were only 2 messages using the Report type. Move those to use the Information type and renamed Report to Debug

Browse Source
This commit is contained in:
David Sparer
2017-02-02 13:51:16 -07:00
parent 2e83f81672
commit aff5b46c5e
6 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mRemoteNGTests/Messages/MessagePrinters/TextLogMessagePrinterTests.cs
View File

@@ -39,12 +39,12 @@ namespace mRemoteNGTests.Messages.MessagePrinters
}
[Test]
public void ReportMessagesPassedToLog4Net()
public void DebugMessagesPassedToLog4Net()
{
var message = Substitute.For<IMessage>();
message.Class.Returns(MessageClass.ReportMsg);
message.Class.Returns(MessageClass.DebugMsg);
_messagePrinter.Print(message);
_log4NetLogger.ReceivedWithAnyArgs(1).Info("");
_log4NetLogger.ReceivedWithAnyArgs(1).Debug("");
}
[Test]
@@ -76,13 +76,13 @@ namespace mRemoteNGTests.Messages.MessagePrinters
}
[Test]
public void ReportMessagesNotPassedToLog4NetIfTurnedOff()
public void DebugMessagesNotPassedToLog4NetIfTurnedOff()
{
var message = Substitute.For<IMessage>();
message.Class.Returns(MessageClass.ReportMsg);
_messagePrinter.PrintReportMessages = false;
message.Class.Returns(MessageClass.DebugMsg);
_messagePrinter.PrintDebugMessages = false;
_messagePrinter.Print(message);
_log4NetLogger.DidNotReceiveWithAnyArgs().Info("");
_log4NetLogger.DidNotReceiveWithAnyArgs().Debug("");
}
[Test]

4
mRemoteV1/Connection/ConnectionInitiator.cs
View File

@@ -252,7 +252,7 @@ namespace mRemoteNG.Connection
else
connDetail = "UNKNOWN";
Runtime.MessageCollector.AddMessage(MessageClass.ReportMsg, string.Format(Language.strConnenctionClosedByUser, connDetail, Prot.InterfaceControl.Info.Protocol, Environment.UserName));
Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, string.Format(Language.strConnenctionClosedByUser, connDetail, Prot.InterfaceControl.Info.Protocol, Environment.UserName));
Prot.InterfaceControl.Info.OpenConnections.Remove(Prot);
if (Prot.InterfaceControl.Info.PostExtApp == "") return;
@@ -269,7 +269,7 @@ namespace mRemoteNG.Connection
{
var prot = (ProtocolBase)sender;
Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, Language.strConnectionEventConnected, true);
Runtime.MessageCollector.AddMessage(MessageClass.ReportMsg, string.Format(Language.strConnectionEventConnectedDetail, prot.InterfaceControl.Info.Hostname, prot.InterfaceControl.Info.Protocol, Environment.UserName, prot.InterfaceControl.Info.Description, prot.InterfaceControl.Info.UserField));
Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, string.Format(Language.strConnectionEventConnectedDetail, prot.InterfaceControl.Info.Hostname, prot.InterfaceControl.Info.Protocol, Environment.UserName, prot.InterfaceControl.Info.Description, prot.InterfaceControl.Info.UserField));
}
private static void Prot_Event_ErrorOccured(object sender, string errorMessage)

2
mRemoteV1/Messages/MessageClassEnum.cs
View File

@@ -5,6 +5,6 @@
InformationMsg = 0,
WarningMsg = 1,
ErrorMsg = 2,
ReportMsg = 3
DebugMsg = 3
}
}

10
mRemoteV1/Messages/MessageCollector.cs
View File

@@ -26,9 +26,9 @@ namespace mRemoteNG.Messages
{
var nMsg = new Message(msgClass, msgText, DateTime.Now);
if (nMsg.Class == MessageClass.ReportMsg)
if (nMsg.Class == MessageClass.DebugMsg)
{
AddReportMessage(nMsg);
AddDebugMessage(nMsg);
return;
}
@@ -98,11 +98,11 @@ namespace mRemoteNG.Messages
Logger.Instance.Error(nMsg.Text);
}
private static void AddReportMessage(IMessage nMsg)
private static void AddDebugMessage(IMessage nMsg)
{
Debug.Print("Report: " + nMsg.Text);
Debug.Print("Debug: " + nMsg.Text);
if (Settings.Default.WriteLogFile)
Logger.Instance.Info(nMsg.Text);
Logger.Instance.Debug(nMsg.Text);
}
private static ListViewItem BuildListViewItem(IMessage nMsg)

2
mRemoteV1/Messages/MessagePrinters/PopupMessagePrinter.cs
View File

@@ -10,7 +10,7 @@ namespace mRemoteNG.Messages.MessagePrinters
{
switch (message.Class)
{
case MessageClass.ReportMsg:
case MessageClass.DebugMsg:
MessageBox.Show(message.Text, string.Format(Language.strTitleInformation, message.Date), MessageBoxButtons.OK, MessageBoxIcon.Information);
break;
case MessageClass.InformationMsg:

8
mRemoteV1/Messages/MessagePrinters/TextLogMessagePrinter.cs
View File

@@ -8,7 +8,7 @@ namespace mRemoteNG.Messages.MessagePrinters
{
private readonly ILog _logger;
public bool PrintReportMessages { get; set; } = true;
public bool PrintDebugMessages { get; set; } = true;
public bool PrintInfoMessages { get; set; } = true;
public bool PrintWarningMessages { get; set; } = true;
public bool PrintErrorMessages { get; set; } = true;
@@ -29,9 +29,9 @@ namespace mRemoteNG.Messages.MessagePrinters
if (PrintInfoMessages)
_logger.Info(message.Text);
break;
case MessageClass.ReportMsg:
if (PrintReportMessages)
_logger.Info(message.Text);
case MessageClass.DebugMsg:
if (PrintDebugMessages)
_logger.Debug(message.Text);
break;
case MessageClass.WarningMsg:
if (PrintWarningMessages)