epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve some exception types.

Browse Source
This commit is contained in:
RoosterDragon
2016-09-11 15:14:44 +01:00
parent adc968db76
commit 9f1c872340
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Support/Log.cs
View File

@@ -39,7 +39,7 @@ namespace OpenRA
ChannelInfo info;
lock (Channels)
if (!Channels.TryGetValue(channelName, out info))
throw new Exception("Tried logging to non-existent channel " + channelName);
throw new ArgumentException("Tried logging to non-existent channel " + channelName, "channelName");
return info;
}

4
OpenRA.Mods.Common/FileFormats/InstallShieldCABCompression.cs
View File

@@ -322,7 +322,7 @@ namespace OpenRA.Mods.Common.FileFormats
fileOffset = head.FirstFileOffset;
}
else
throw new Exception("Cannot Resolve Remaining Stream");
throw new InvalidDataException("Cannot Resolve Remaining Stream");
}
else
{
@@ -403,7 +403,7 @@ namespace OpenRA.Mods.Common.FileFormats
void ExtractFile(FileDescriptor file, Stream output, Action<int> onProgress = null)
{
if (file.Flags.HasFlag(CABFlags.FileInvalid))
throw new Exception("File Invalid");
throw new InvalidDataException("File Invalid");
if (file.LinkFlags.HasFlag(LinkFlags.Prev))
{

2
OpenRA.Mods.Common/Graphics/DefaultSpriteSequence.cs
View File

@@ -48,7 +48,7 @@ namespace OpenRA.Mods.Common.Graphics
}
catch (Exception e)
{
throw new Exception("Error occurred while parsing {0}".F(node.Key), e);
throw new InvalidDataException("Error occurred while parsing {0}".F(node.Key), e);
}
foreach (var kvp in nodes)

2
OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs
View File

@@ -756,7 +756,7 @@ namespace OpenRA.Mods.Common.Server
var uid = server.LobbyInfo.GlobalSettings.Map;
server.Map = server.ModData.MapCache[uid];
if (server.Map.Status != MapStatus.Available)
throw new Exception("Map {0} not found".F(uid));
throw new InvalidOperationException("Map {0} not found".F(uid));
server.LobbyInfo.Slots = server.Map.Players.Players
.Select(p => MakeSlotFromPlayerReference(p.Value))

2
OpenRA.Mods.Common/Traits/Multipliers/UpgradableMultiplierTrait.cs
View File

@@ -45,7 +45,7 @@ namespace OpenRA.Mods.Common.Traits
protected UpgradeMultiplierTrait(UpgradeMultiplierTraitInfo info, string modifierType, string actorType)
{
if (info.Modifier.Length == 0)
throw new Exception("No modifiers in " + modifierType + " for " + actorType);
throw new ArgumentException("No modifiers in " + modifierType + " for " + actorType);
this.info = info;
IsTraitDisabled = info.UpgradeTypes.Length > 0 && info.BaseLevel > 0;
level = IsTraitDisabled ? 0 : info.BaseLevel;

2
OpenRA.Mods.D2k/UtilityCommands/D2kMapImporter.cs
View File

@@ -276,7 +276,7 @@ namespace OpenRA.Mods.D2k.UtilityCommands
stream = File.OpenRead(filename);
if (stream.Length == 0 || stream.Length % 4 != 0)
throw new Exception("The map is in an unrecognized format!");
throw new ArgumentException("The map is in an unrecognized format!", "filename");
Initialize(filename);
FillMap();