diff API/Factories/AbstractNonNativeFileExtensionWarFoundryFactory.cs @ 463:cbeee87dc2d3

Re #58: Remove LogNotifier from API * Remove LogNotifier from API - mostly unnecessary logging Also: * Formatting auto-corrected * LoadFile() "try...catch {silently dispose}" removed. Code shouldn't be throwing those errors and needs to be handled elsewhere if it does
author IBBoard <dev@ibboard.co.uk>
date Sat, 17 Mar 2012 20:02:32 +0000
parents 3c4a6403a88c
children 1ed2f3ab5e35
line wrap: on
line diff
--- a/API/Factories/AbstractNonNativeFileExtensionWarFoundryFactory.cs	Tue Mar 06 20:31:31 2012 +0000
+++ b/API/Factories/AbstractNonNativeFileExtensionWarFoundryFactory.cs	Sat Mar 17 20:02:32 2012 +0000
@@ -1,11 +1,9 @@
 // This file (AbstractNonNativeFileExtensionWarFoundryFactory.cs) is a part of the IBBoard.WarFoundry.API project and is copyright 2007, 2008, 2009 IBBoard.
 //
 // The file and the library/program it is in are licensed and distributed, without warranty, under the GNU Affero GPL license, either version 3 of the License or (at your option) any later version. Please see COPYING for more information and the full license.
-
 using System;
 using System.Collections.Generic;
 using System.IO;
-using IBBoard.Logging;
 using IBBoard.WarFoundry.API.Objects;
 
 namespace IBBoard.WarFoundry.API.Factories
@@ -13,64 +11,64 @@
 	public abstract class AbstractNonNativeFileExtensionWarFoundryFactory : AbstractNonNativeWarFoundryFactory<FileInfo>
 	{
 		protected abstract string ArmyFileExtension { get; }
+
 		protected abstract string RaceFileExtension { get; }
+
 		protected abstract string GameSystemFileExtension { get; }
 		
-		protected override bool CheckCanHandleFileFormat (FileInfo file)
+		protected override bool CheckCanHandleFileFormat(FileInfo file)
 		{
 			return CheckCanHandleFileAsArmy(file) || CheckCanHandleFileAsRace(file) || CheckCanHandleFileAsGameSystem(file);
 		}
 		
 		protected override bool CheckCanHandleFileAsArmy(FileInfo file)
 		{
-			return ArmyFileExtension!=null && file.Name.ToLower().EndsWith(ArmyFileExtension);
+			return ArmyFileExtension != null && file.Name.ToLower().EndsWith(ArmyFileExtension);
 		}
 		
 		protected override bool CheckCanHandleFileAsRace(FileInfo file)
 		{
-			return RaceFileExtension!=null && file.Name.ToLower().EndsWith(RaceFileExtension);
+			return RaceFileExtension != null && file.Name.ToLower().EndsWith(RaceFileExtension);
 		}
 		
 		protected override bool CheckCanHandleFileAsGameSystem(FileInfo file)
 		{
-			return GameSystemFileExtension!=null && file.Name.ToLower().EndsWith(GameSystemFileExtension);
+			return GameSystemFileExtension != null && file.Name.ToLower().EndsWith(GameSystemFileExtension);
 		}
 		
-		protected override FileInfo GetFileAsSupportedType (FileInfo file)
+		protected override FileInfo GetFileAsSupportedType(FileInfo file)
 		{
 			return file;
-		}		
+		}
 		
 		protected abstract Army CreateArmyFromFile(FileInfo file);
+
 		protected abstract Race CreateRaceFromFile(FileInfo file);
+
 		protected abstract GameSystem CreateGameSystemFromFile(FileInfo file);
 		
-		protected override ICollection<IWarFoundryObject> DoCreateObjectsFromFile (FileInfo file)
+		protected override ICollection<IWarFoundryObject> DoCreateObjectsFromFile(FileInfo file)
 		{
 			IWarFoundryObject obj = null;
 			
 			if (CheckCanHandleFileAsGameSystem(file))
 			{
-				GameSystem gameSystem = CreateGameSystemFromFile (file);
+				GameSystem gameSystem = CreateGameSystemFromFile(file);
 				OnGameSystemLoaded(gameSystem);
 				obj = gameSystem;
 			}
 			else if (CheckCanHandleFileAsRace(file))
 			{
-				Race race = CreateRaceFromFile (file);
+				Race race = CreateRaceFromFile(file);
 				OnRaceLoaded(race);
 				obj = race;
 			}
-			else if (CheckCanHandleFileAsArmy(file))
+			else //Must have been an army file
 			{
-				Army army = CreateArmyFromFile (file);
+				Army army = CreateArmyFromFile(file);
 				OnArmyLoaded(army);
 				obj = army;
 			}
-			else
-			{
-				LogNotifier.Warn(GetType(), "Failed trying to create from "+file.FullName+" - not a Race, Army or GameSystem");
-			}
 			
 			ICollection<IWarFoundryObject> objects = new List<IWarFoundryObject>();