From: <dr...@us...> - 2003-12-05 05:38:04
|
Update of /cvsroot/sharpcvslib/sharpcvslib/src/ICSharpCode/SharpCvsLib/Config In directory sc8-pr-cvs1:/tmp/cvs-serv6109/src/ICSharpCode/SharpCvsLib/Config Modified Files: SharpCvsLibConfig.cs Log Message: Various changes to get the AddCommand working. Reworked the filesystem to check for duplicates and filter out problems with path. Also added exception if attempt is made to add files outside of the working path. Added a CvsRootParseException, various modifications to fix the formatting from astyle. Index: SharpCvsLibConfig.cs =================================================================== RCS file: /cvsroot/sharpcvslib/sharpcvslib/src/ICSharpCode/SharpCvsLib/Config/SharpCvsLibConfig.cs,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SharpCvsLibConfig.cs 22 Nov 2003 18:18:09 -0000 1.6 --- SharpCvsLibConfig.cs 5 Dec 2003 05:27:52 -0000 1.7 *************** *** 33,36 **** --- 33,38 ---- using System; + using System.Configuration; + using System.Text; using System.Xml; using System.Xml.Serialization; *************** *** 38,43 **** using ICSharpCode.SharpCvsLib.Config.Logging; ! namespace ICSharpCode.SharpCvsLib.Config { /// <summary> /// Holds the core configuration settings for sharpcvslib. --- 40,46 ---- using ICSharpCode.SharpCvsLib.Config.Logging; ! using log4net; + namespace ICSharpCode.SharpCvsLib.Config { /// <summary> /// Holds the core configuration settings for sharpcvslib. *************** *** 49,52 **** --- 52,60 ---- /// </summary> public const int DEFAULT_PORT = 2401; + /// <summary> + /// The default encoding type for the application. + /// </summary> + private static Encoding DEFAULT_ENCODING = Encoding.ASCII; + private const int DEFAULT_TIMEOUT = 1000; private const int DEFAULT_AUTH_SLEEP = 1000; *************** *** 54,57 **** --- 62,67 ---- private const string VAR_CVS_RSH = "CVS_RSH"; + private static readonly ILog LOGGER = + LogManager.GetLogger(typeof(SharpCvsLibConfig)); /// <summary> /// The cvs connection type *************** *** 124,127 **** --- 134,151 ---- /// <summary> + /// The encoding to use for streams. + /// </summary> + public Encoding Encoding { + get {return SharpCvsLibConfig.DEFAULT_ENCODING;} + } + + /// <summary> + /// The default encoding to use for streams. + /// </summary> + public static Encoding DefaultEncoding { + get {return SharpCvsLibConfig.DEFAULT_ENCODING;} + } + + /// <summary> /// Create a new instance of the logging configuration. /// </summary> *************** *** 143,146 **** --- 167,190 ---- return formatter.ToString(); + } + + /// <summary> + /// Get a new instance of the configuration settings. If the configuration + /// file cannot be loaded then use default configuration settings. + /// </summary> + /// <returns>The configuration settings contained in the configuration file, + /// or if that cannot be loaded then default configurations are + /// returned.</returns> + public static SharpCvsLibConfig GetInstance () { + SharpCvsLibConfig config; + try { + config = + (SharpCvsLibConfig)ConfigurationSettings.GetConfig + (SharpCvsLibConfigHandler.APP_CONFIG_SECTION); + } catch (Exception e) { + LOGGER.Error(e); + config = new SharpCvsLibConfig(); + } + return config; } } |