[Magicajax-cvs] magicajax/Core/Configuration MagicAjaxConfiguration.cs,1.7,1.8

[Argiris K. <be...@us...>]

Update of /cvsroot/magicajax/magicajax/Core/Configuration
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7932/Core/Configuration

Modified Files:
	MagicAjaxConfiguration.cs 
Log Message:
Moved 'OutputCompareMode' to magicAjaxSection.
Renamed 'AjaxCallScriptPath' to 'ScriptPath' since we are using it for other script files too.

Index: MagicAjaxConfiguration.cs
===================================================================
RCS file: /cvsroot/magicajax/magicajax/Core/Configuration/MagicAjaxConfiguration.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** MagicAjaxConfiguration.cs	24 Nov 2005 13:13:03 -0000	1.7
--- MagicAjaxConfiguration.cs	25 Nov 2005 20:45:47 -0000	1.8
***************
*** 33,37 ****
  		private int _origMaxConcurrentPages;
  		private bool _origMaxPagesLimitAlert;
- 		private OutputCompareMode _origCompareMode;
  		// active settings
  		private PageStoreMode _mode;
--- 33,36 ----
***************
*** 40,44 ****
  		private int _maxConcurrentPages;
  		private bool _maxPagesLimitAlert;
- 		private OutputCompareMode _compareMode;
  		#endregion
  
--- 39,42 ----
***************
*** 143,166 ****
  			}
  		}
- 
- 		public OutputCompareMode CompareMode
- 		{
- 			get { return _compareMode; }
- 			set
- 			{
- 				if ( _isLocked && value != _compareMode )
- 					throw new MagicAjaxException("Configuration settings have been locked and cannot change.");
- 
- 				if ( value != _origCompareMode )
- 				{
- 					_compareMode = value;
- 					_state["CompareMode"] = _compareMode;
- 				}
- 				else
- 				{
- 					_state.Remove("CompareMode");
- 				}
- 			}
- 		}
  		#endregion
  
--- 141,144 ----
***************
*** 205,211 ****
  						MaxPagesLimitAlert = (bool) state[key];
  						break;
- 					case "CompareMode":
- 						CompareMode = (OutputCompareMode) state[key];
- 						break;
  					case "UnloadStoredPage":
  						UnloadStoredPage = (bool) state[key];
--- 183,186 ----
***************
*** 217,221 ****
  		}
  
! 		public PageStore(PageStoreMode mode, bool unloadStoredPage, int cacheTimeout, int maxConcurrentPages, bool maxPagesLimitAlert, OutputCompareMode compareMode)
  		{
  			_state = new Hashtable();
--- 192,196 ----
  		}
  
! 		public PageStore(PageStoreMode mode, bool unloadStoredPage, int cacheTimeout, int maxConcurrentPages, bool maxPagesLimitAlert)
  		{
  			_state = new Hashtable();
***************
*** 225,229 ****
  			_origMaxConcurrentPages = _maxConcurrentPages = maxConcurrentPages;
  			_origMaxPagesLimitAlert = _maxPagesLimitAlert = maxPagesLimitAlert;
- 			_origCompareMode = _compareMode = compareMode;
  			_origUnloadStoredPage = _unloadStoredPage = unloadStoredPage;
  		}
--- 200,203 ----
***************
*** 242,248 ****
--- 216,224 ----
          // web.config settings
  		private string _origScriptPath;
+ 		private OutputCompareMode _origCompareMode;
  		private bool _origTracing;
  		// active settings
  		private string _scriptPath;
+ 		private OutputCompareMode _compareMode;
  		private bool _tracing;
  		#endregion
***************
*** 269,272 ****
--- 245,268 ----
  		}
  
+ 		public OutputCompareMode CompareMode
+ 		{
+ 			get { return _compareMode; }
+ 			set
+ 			{
+ 				if ( _isLocked && value != _compareMode )
+ 					throw new MagicAjaxException("Configuration settings have been locked and cannot change.");
+ 
+ 				if ( value != _origCompareMode )
+ 				{
+ 					_compareMode = value;
+ 					_state["CompareMode"] = _compareMode;
+ 				}
+ 				else
+ 				{
+ 					_state.Remove("CompareMode");
+ 				}
+ 			}
+ 		}
+ 
  		public bool Tracing
  		{
***************
*** 335,338 ****
--- 331,337 ----
  						ScriptPath = (string) state[key];
  						break;
+ 					case "CompareMode":
+ 						CompareMode = (OutputCompareMode) state[key];
+ 						break;
  					case "Tracing":
  						Tracing = (bool) state[key];
***************
*** 351,354 ****
--- 350,354 ----
  			// Default values
  			_scriptPath = null; // Null implicates that the embedded javascripts will be used (default)
+ 			_compareMode = OutputCompareMode.HashCode;
  			_tracing = false;
  			PageStoreMode mode = PageStoreMode.NoStore;
***************
*** 357,365 ****
  			int maxPages = 5;
  			bool maxPagesLimitAlert = false;
- 			OutputCompareMode compareMode = OutputCompareMode.HashCode;
  
  			if (xml != null)
  			{
! 				XmlAttribute attrib = (XmlAttribute)xml.Attributes.GetNamedItem("ajaxCallScriptPath");
  				if (attrib != null)
  				{
--- 357,364 ----
  			int maxPages = 5;
  			bool maxPagesLimitAlert = false;
  
  			if (xml != null)
  			{
! 				XmlAttribute attrib = (XmlAttribute)xml.Attributes.GetNamedItem("scriptPath");
  				if (attrib != null)
  				{
***************
*** 463,473 ****
  					{
  						case "hashcode":
! 							compareMode = OutputCompareMode.HashCode;
  							break;
  						case "md5":
! 							compareMode = OutputCompareMode.MD5;
  							break;
  						case "fullhtml":
! 							compareMode = OutputCompareMode.FullHtml;
  							break;
  						default:
--- 462,472 ----
  					{
  						case "hashcode":
! 							_compareMode = OutputCompareMode.HashCode;
  							break;
  						case "md5":
! 							_compareMode = OutputCompareMode.MD5;
  							break;
  						case "fullhtml":
! 							_compareMode = OutputCompareMode.FullHtml;
  							break;
  						default:
***************
*** 477,482 ****
  			}
  
! 			_pageStore = new PageStore(mode, unloadStoredPage, cacheTimeout, maxPages, maxPagesLimitAlert, compareMode);
  			_origScriptPath = _scriptPath;
  			_origTracing = _tracing;
  		}
--- 476,482 ----
  			}
  
! 			_pageStore = new PageStore(mode, unloadStoredPage, cacheTimeout, maxPages, maxPagesLimitAlert);
  			_origScriptPath = _scriptPath;
+ 			_origCompareMode = _compareMode;
  			_origTracing = _tracing;
  		}