Author: gonzalo
Date: 2005-12-08 15:54:16 -0500 (Thu, 08 Dec 2005)
New Revision: 54123
Modified:
branches/mono-1-1-10/mcs/class/System.Web/System.Web.UI/ChangeLog
branches/mono-1-1-10/mcs/class/System.Web/System.Web.UI/Control.cs
branches/mono-1-1-10/mcs/class/System.Web/System.Web/MimeTypes.cs
Log:
from head
Modified: branches/mono-1-1-10/mcs/class/System.Web/System.Web/MimeTypes.cs
===================================================================
--- branches/mono-1-1-10/mcs/class/System.Web/System.Web/MimeTypes.cs
2005-12-08 20:47:35 UTC (rev 54122)
+++ branches/mono-1-1-10/mcs/class/System.Web/System.Web/MimeTypes.cs
2005-12-08 20:54:16 UTC (rev 54123)
@@ -185,6 +185,7 @@
mimeTypes.Add ("jfif-tbnl", "image/jpeg");
mimeTypes.Add ("jpe", "image/jpeg");
mimeTypes.Add ("jpeg", "image/jpeg");
+ mimeTypes.Add ("jpg", "image/jpeg");
mimeTypes.Add ("jps", "image/x-jps");
mimeTypes.Add ("js", "application/x-javascript");
mimeTypes.Add ("jut", "image/jutvision");
Modified: branches/mono-1-1-10/mcs/class/System.Web/System.Web.UI/ChangeLog
===================================================================
--- branches/mono-1-1-10/mcs/class/System.Web/System.Web.UI/ChangeLog
2005-12-08 20:47:35 UTC (rev 54122)
+++ branches/mono-1-1-10/mcs/class/System.Web/System.Web.UI/ChangeLog
2005-12-08 20:54:16 UTC (rev 54123)
@@ -1,3 +1,7 @@
+2005-12-08 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
+
+ * Control.cs: use _controls instead of the property wherever possible.
+
2005-12-05 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
* Control.cs: use the _controls field instead of the Controls property.
Modified: branches/mono-1-1-10/mcs/class/System.Web/System.Web.UI/Control.cs
===================================================================
--- branches/mono-1-1-10/mcs/class/System.Web/System.Web.UI/Control.cs
2005-12-08 20:47:35 UTC (rev 54122)
+++ branches/mono-1-1-10/mcs/class/System.Web/System.Web.UI/Control.cs
2005-12-08 20:54:16 UTC (rev 54123)
@@ -437,8 +437,10 @@
protected bool ChildControlsCreated {
get { return ((stateMask & CHILD_CONTROLS_CREATED) !=
0); }
set {
- if (value == false && (stateMask &
CHILD_CONTROLS_CREATED) != 0)
- Controls.Clear();
+ if (value == false && (stateMask &
CHILD_CONTROLS_CREATED) != 0) {
+ if (_controls != null)
+ _controls.Clear();
+ }
SetMask (CHILD_CONTROLS_CREATED, value);
}
@@ -538,7 +540,7 @@
if (!HasControls ())
return;
- foreach (Control c in Controls)
+ foreach (Control c in _controls)
c.NullifyUniqueID ();
}
@@ -660,7 +662,7 @@
protected bool IsLiteralContent()
{
- if (HasControls () && Controls.Count == 1 && (Controls
[0] is LiteralControl))
+ if (HasControls () && _controls.Count == 1 &&
(_controls [0] is LiteralControl))
return true;
return false;
@@ -678,7 +680,7 @@
return null;
Control result = null;
- foreach (Control c in Controls) {
+ foreach (Control c in _controls) {
if (String.Compare (id, c._userId, true) == 0) {
if (result != null && result != c) {
throw new HttpException ("1
Found more than one control with ID '" + id + "'");
@@ -1046,9 +1048,9 @@
if (!HasControls ())
return;
- int len = Controls.Count;
+ int len = _controls.Count;
for (int i = 0; i < len; i++) {
- Control c = Controls [i];
+ Control c = _controls [i];
c.DataBind ();
}
}
@@ -1139,10 +1141,10 @@
#endif
OnLoad (EventArgs.Empty);
if (HasControls ()) {
- int len = Controls.Count;
+ int len = _controls.Count;
for (int i=0;i<len;i++)
{
- Control c = Controls[i];
+ Control c = _controls[i];
c.LoadRecursive ();
}
}
@@ -1165,10 +1167,10 @@
}
#endif
if (HasControls ()) {
- int len = Controls.Count;
+ int len = _controls.Count;
for (int i=0;i<len;i++)
{
- Control c = Controls[i];
+ Control c = _controls[i];
c.UnloadRecursive (dispose);
}
}
@@ -1208,10 +1210,10 @@
if (!HasControls ())
return;
- int len = Controls.Count;
+ int len = _controls.Count;
for (int i=0;i<len;i++)
{
- Control c = Controls[i];
+ Control c = _controls[i];
c.PreRenderRecursiveInternal ();
}
#if MONO_TRACE
@@ -1242,10 +1244,10 @@
namingContainer.AutoID)
namingContainer._userId =
namingContainer.GetDefaultName () + "b";
- int len = Controls.Count;
+ int len = _controls.Count;
for (int i=0;i<len;i++)
{
- Control c = Controls[i];
+ Control c = _controls[i];
c._page = Page;
c._namingContainer = namingContainer;
if (namingContainer != null &&
c._userId == null && c.AutoID)
@@ -1290,10 +1292,10 @@
int idx = -1;
if (HasControls ())
{
- int len = Controls.Count;
+ int len = _controls.Count;
for (int i=0;i<len;i++)
{
- Control ctrl = Controls[i];
+ Control ctrl = _controls[i];
object ctrlState =
ctrl.SaveViewStateRecursive ();
idx++;
if (ctrlState == null)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
