From 3dbf0265db1dd51fb922cd36538c8351fa249d9a Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Thu, 29 Jan 2015 23:05:57 +0100 Subject: [PATCH] * SalesCatalog.csproj: clean an unused reference * TestBrands.cs: * Service.cs: * PhysicalProduct.cs: clean an obsolete reference * TestCatalogInit.cs: cleaner * XmlCatalog.cs: * XmlCatalogProvider.cs: suppressed some xml doc warnings * Estimate.aspx: new jQuery version * Web.config: removed a section dotNetOpenAuth at using the .Net framework 4.5.1 --- SalesCatalog/SalesCatalog.csproj | 1 - SalesCatalog/Tests/TestBrands.cs | 1 - SalesCatalog/Tests/TestCatalogInit.cs | 5 +-- SalesCatalog/XmlImplementation/XmlCatalog.cs | 8 ++++ .../XmlImplementation/XmlCatalogProvider.cs | 37 +++++++++++++++++-- web/Views/FrontOffice/Estimate.aspx | 2 +- web/Web.config | 29 --------------- .../FrontOffice/Catalog/PhysicalProduct.cs | 2 +- yavscModel/FrontOffice/Catalog/Service.cs | 2 +- 9 files changed, 46 insertions(+), 41 deletions(-) diff --git a/SalesCatalog/SalesCatalog.csproj b/SalesCatalog/SalesCatalog.csproj index 5aea0e3a..79f6a59f 100644 --- a/SalesCatalog/SalesCatalog.csproj +++ b/SalesCatalog/SalesCatalog.csproj @@ -35,7 +35,6 @@ - diff --git a/SalesCatalog/Tests/TestBrands.cs b/SalesCatalog/Tests/TestBrands.cs index 52fd1c39..2523b34c 100644 --- a/SalesCatalog/Tests/TestBrands.cs +++ b/SalesCatalog/Tests/TestBrands.cs @@ -2,7 +2,6 @@ #if TEST using NUnit.Framework; using System; -using SalesCatalog.Model; namespace SalesCatalog.Tests { diff --git a/SalesCatalog/Tests/TestCatalogInit.cs b/SalesCatalog/Tests/TestCatalogInit.cs index 697d6a98..5c63ceba 100644 --- a/SalesCatalog/Tests/TestCatalogInit.cs +++ b/SalesCatalog/Tests/TestCatalogInit.cs @@ -3,7 +3,6 @@ using System; using NUnit.Framework; using SalesCatalog.XmlImplementation; -using SalesCatalog.Model; using System.Xml.Serialization; using System.IO; using System.Xml; @@ -68,8 +67,8 @@ namespace SalesCatalog.Tests Option o3 = new Option (); o3.Value = "6m"; o3.Text = "6 mois"; selSize.Items = new Option [] { o1, o2, o3 }; - var txt1 = new SalesCatalog.Model.Text (); - var txt2 = new SalesCatalog.Model.Text (); + var txt1 = new Text (); + var txt2 = new Text (); txt1.Val="Choose a title : "; txt2.Val = "[br]Choose the size : "; f.Items = new FormElement[] {txt1,ticat,txt2,selSize}; diff --git a/SalesCatalog/XmlImplementation/XmlCatalog.cs b/SalesCatalog/XmlImplementation/XmlCatalog.cs index 745af5e9..d2e8c21c 100644 --- a/SalesCatalog/XmlImplementation/XmlCatalog.cs +++ b/SalesCatalog/XmlImplementation/XmlCatalog.cs @@ -4,9 +4,17 @@ using Yavsc.Model.FrontOffice; namespace SalesCatalog.XmlImplementation { + /// + /// Xml catalog. + /// Inherits of the Catalog class, + /// to make it serializable from and to Xml + /// [XmlRoot] public class XmlCatalog : Catalog { + /// + /// Initializes a new instance of the class. + /// public XmlCatalog () { } diff --git a/SalesCatalog/XmlImplementation/XmlCatalogProvider.cs b/SalesCatalog/XmlImplementation/XmlCatalogProvider.cs index d05d9830..f65c435b 100644 --- a/SalesCatalog/XmlImplementation/XmlCatalogProvider.cs +++ b/SalesCatalog/XmlImplementation/XmlCatalogProvider.cs @@ -7,10 +7,20 @@ using Yavsc.Model.FrontOffice; namespace SalesCatalog.XmlImplementation { + /// + /// Xml catalog provider. + /// In charge of getting the catalog data, + /// returning a Catalog object from GetCatalog + /// public class XmlCatalogProvider: CatalogProvider { #region implemented abstract members of SalesCatalog.CatalogProvider - + /// + /// Gets the catalog, loading it from + /// the file system at a first call, + /// and when its last write time has changed. + /// + /// The catalog. public override Catalog GetCatalog () { // Assert fileName != null @@ -22,17 +32,36 @@ namespace SalesCatalog.XmlImplementation LoadCatalog (); return catInstance; } - + /// + /// The catalog instance. + /// protected XmlCatalog catInstance = null; + /// + /// The last modification date of the file loaded. + /// protected DateTime lastModification = new DateTime(0); + /// + /// The name of the file loaded. + /// protected string fileName = null; #endregion - + /// + /// Initialize the catalog + /// using the specified name and config. + /// + /// Name. + /// Config. public override void Initialize (string name, System.Collections.Specialized.NameValueCollection config) { - fileName = config ["connection"]; + if (config ["connection"] == null) + throw new Exception ("the 'connection' parameter is null " + + "(it should be the absolute path to the xml catalog)"); + string basedir = AppDomain.CurrentDomain.BaseDirectory; + // config ["connection"] starts with "~/" + fileName = Path.Combine(basedir, config ["connection"].Substring (2)); LoadCatalog (); } + private void LoadCatalog () { try { diff --git a/web/Views/FrontOffice/Estimate.aspx b/web/Views/FrontOffice/Estimate.aspx index 9c1433fe..c75ea64a 100644 --- a/web/Views/FrontOffice/Estimate.aspx +++ b/web/Views/FrontOffice/Estimate.aspx @@ -1,7 +1,7 @@ <%@ Page Title="Devis" Language="C#" Inherits="System.Web.Mvc.ViewPage" MasterPageFile="~/Models/App.master" %> - + " type="text/css" media="print, projection, screen" /> diff --git a/web/Web.config b/web/Web.config index 107ba492..74f6228c 100644 --- a/web/Web.config +++ b/web/Web.config @@ -245,35 +245,6 @@ http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx - - - - - - - - - - - - - - - - - - - - - - - - - -