Mercurial > repos > IBBoard.WarFoundry.API
changeset 381:30db6669f5cd
* Update to VS.Net 2010 compatibility
* Fix whitespace
no-open-ticket
author | IBBoard <dev@ibboard.co.uk> |
---|---|
date | Sun, 07 Aug 2011 19:15:33 +0000 |
parents | 7036bf04e955 |
children | 6da9db4a9c23 |
files | API/Objects/Requirement/AbstractRequirement.cs IBBoard.WarFoundry.API.csproj |
diffstat | 2 files changed, 64 insertions(+), 65 deletions(-) [+] |
line wrap: on
line diff
--- a/API/Objects/Requirement/AbstractRequirement.cs Sat Jul 23 20:01:26 2011 +0000 +++ b/API/Objects/Requirement/AbstractRequirement.cs Sun Aug 07 19:15:33 2011 +0000 @@ -3,66 +3,67 @@ // 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; + namespace IBBoard.WarFoundry.API.Objects.Requirement { public abstract class AbstractRequirement : IRequirement - { - public override bool Equals (object obj) - { - if (obj == null) - { - return false; - } - else if (obj.GetType().Equals(this.GetType())) - { - return TypeEquals(obj); - } - else - { - return false; - } - } - - /// <summary> - /// Type-specific equality checking - must be implemented by each class - /// </summary> - /// <returns> - /// <code>true</code> if this object is equal to <code>obj</code>, else <code>false</code> - /// </returns> - /// <param name='obj'> - /// The object to compare to - /// </param> - protected abstract bool TypeEquals(object obj); - - protected virtual bool IsApplicable(WarFoundryObject toObjectAdded, Army toArmy) - { - return IsApplicable(toArmy) || IsApplicable(toObjectAdded); - } - - protected virtual bool IsApplicable(Army toArmy) - { - return true; - } - - protected virtual bool IsApplicable(WarFoundryObject toObject) - { - return true; - } - - - public string GetValidationMessage(Army army) - { - string message = ""; - - Validation result = ValidatesArmy(army); - if (!Validates.AsOkay(result)) - { - message = GetValidationFailedMessage(army); - } - - return message; + { + public override bool Equals (object obj) + { + if (obj == null) + { + return false; + } + else if (obj.GetType().Equals(this.GetType())) + { + return TypeEquals(obj); + } + else + { + return false; + } } - + + /// <summary> + /// Type-specific equality checking - must be implemented by each class + /// </summary> + /// <returns> + /// <code>true</code> if this object is equal to <code>obj</code>, else <code>false</code> + /// </returns> + /// <param name='obj'> + /// The object to compare to + /// </param> + protected abstract bool TypeEquals(object obj); + + protected virtual bool IsApplicable(WarFoundryObject toObjectAdded, Army toArmy) + { + return IsApplicable(toArmy) || IsApplicable(toObjectAdded); + } + + protected virtual bool IsApplicable(Army toArmy) + { + return true; + } + + protected virtual bool IsApplicable(WarFoundryObject toObject) + { + return true; + } + + + public string GetValidationMessage(Army army) + { + string message = ""; + + Validation result = ValidatesArmy(army); + if (!Validates.AsOkay(result)) + { + message = GetValidationFailedMessage(army); + } + + return message; + } + protected abstract string GetValidationFailedMessage(Army army); public string GetAllowsAddingMessage(UnitType toAdd, Army toArmy) @@ -78,11 +79,11 @@ return message; } - protected abstract string GetAllowsAddingFailedMessage(UnitType toAdd, Army toArmy); - - public abstract Validation AllowsAdding(WarFoundryObject wfObject, Army toArmy); - - public abstract Validation ValidatesArmy(Army army); + protected abstract string GetAllowsAddingFailedMessage(UnitType toAdd, Army toArmy); + + public abstract Validation AllowsAdding(WarFoundryObject wfObject, Army toArmy); + + public abstract Validation ValidatesArmy(Army army); } }
--- a/IBBoard.WarFoundry.API.csproj Sat Jul 23 20:01:26 2011 +0000 +++ b/IBBoard.WarFoundry.API.csproj Sun Aug 07 19:15:33 2011 +0000 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -12,12 +12,10 @@ <AssemblyName>IBBoard.WarFoundry.API</AssemblyName> <FileUpgradeFlags> </FileUpgradeFlags> - <OldToolsVersion>2.0</OldToolsVersion> + <OldToolsVersion>3.5</OldToolsVersion> <UpgradeBackupLocation> </UpgradeBackupLocation> <IsWebBootstrapper>false</IsWebBootstrapper> - <TargetFrameworkSubset> - </TargetFrameworkSubset> <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> <PublishUrl>publish\</PublishUrl> <Install>true</Install>