[Pkg-mono-svn-commits] [SCM] mono branch, master, updated. debian/2.4.2.3+dfsg-3-14-g1a17235
Mirco Bauer
meebey at meebey.net
Sun Dec 13 01:08:45 UTC 2009
The following commit has been merged in the master branch:
commit 13271c3351cd2b7df2ab337ae0b256fada0a5eaf
Author: Mirco Bauer <meebey at meebey.net>
Date: Sun Dec 13 01:59:20 2009 +0100
* debian/patches/fix_gridview_r146128_r146133.dpatch:
+ Dropped, already applied upstream.
diff --git a/debian/changelog b/debian/changelog
index b688e79..f5b2977 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,10 +31,11 @@ mono (2.4.3+dfsg-1~pre1) UNRELEASED; urgency=medium
(Closes: #551909)
+ Fixed typo in monodoc-base and monodoc-manual package description.
(Closes: #557355, #557379)
- * debian/patches/fix_metadata_dup.dpatch:
- + Dropped, applied upstream.
+ * debian/patches/fix_metadata_dup.dpatch
+ * debian/patches/fix_gridview_r146128_r146133.dpatch:
+ + Dropped, already applied upstream.
- -- Mirco Bauer <meebey at debian.org> Sun, 13 Dec 2009 01:56:40 +0100
+ -- Mirco Bauer <meebey at debian.org> Sun, 13 Dec 2009 01:59:11 +0100
mono (2.4.2.3+dfsg-3) unstable; urgency=low
diff --git a/debian/patches/fix_gridview_r146128_r146133.dpatch b/debian/patches/fix_gridview_r146128_r146133.dpatch
deleted file mode 100755
index bc5ba72..0000000
--- a/debian/patches/fix_gridview_r146128_r146133.dpatch
+++ /dev/null
@@ -1,150 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## debian/patches/fix_gridview_r146128_r146133.dpatch by Jo Shields <directhex at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-Index: mono-2-4/mcs/class/System.Web/System.Web.UI.WebControls/TableRow.cs
-===================================================================
---- mono-2-4/mcs/class/System.Web/System.Web.UI.WebControls/TableRow.cs (revision 146127)
-+++ mono-2-4/mcs/class/System.Web/System.Web.UI.WebControls/TableRow.cs (revision 146128)
-@@ -47,6 +47,8 @@
- TableCellCollection cells;
- #if NET_2_0
- bool tableRowSectionSet;
-+
-+ internal TableRowCollection Container { get; set; }
- #endif
-
- public TableRow ()
-@@ -129,6 +131,9 @@
- throw new ArgumentOutOfRangeException ("TableSection");
- ViewState ["TableSection"] = (int) value;
- tableRowSectionSet = true;
-+ TableRowCollection container = Container;
-+ if (container != null)
-+ container.RowTableSectionSet ();
- }
- }
- #endif
---- mono-2.4.2.3+dfsg~/mcs/class/System.Web/System.Web.UI.WebControls/TableRowCollection.cs 2009-07-15 19:51:29.000000000 +0100
-+++ mono-2.4.2.3+dfsg/mcs/class/System.Web/System.Web.UI.WebControls/TableRowCollection.cs 2009-11-15 18:39:14.000000000 +0000
-@@ -43,6 +43,9 @@
-
- internal TableRowCollection (Table table)
- {
-+ if (table == null)
-+ throw new ArgumentNullException ("table");
-+
- cc = table.Controls;
- owner = table;
- }
-@@ -69,9 +72,12 @@
-
- public int Add (TableRow row)
- {
-+ if (row == null)
-+ throw new NullReferenceException (); // .NET compatibility
- #if NET_2_0
- if (row.TableRowSectionSet)
- owner.GenerateTableSections = true;
-+ row.Container = this;
- #endif
- int index = cc.IndexOf (row);
- if (index < 0) {
-@@ -83,10 +89,14 @@
-
- public void AddAt (int index, TableRow row)
- {
-+ if (row == null)
-+ throw new NullReferenceException (); // .NET compatibility
-+
- if (cc.IndexOf (row) < 0) {
- #if NET_2_0
- if (row.TableRowSectionSet)
- owner.GenerateTableSections = true;
-+ row.Container = this;
- #endif
- cc.AddAt (index, row);
- }
-@@ -95,10 +105,14 @@
- public void AddRange (TableRow[] rows)
- {
- foreach (TableRow tr in rows) {
-+ if (tr == null)
-+ throw new NullReferenceException (); // .NET compatibility
-+
- if (cc.IndexOf (tr) < 0) {
- #if NET_2_0
- if (tr.TableRowSectionSet)
- owner.GenerateTableSections = true;
-+ tr.Container = this;
- #endif
- cc.Add (tr);
- }
-@@ -128,13 +142,30 @@
- return cc.IndexOf (row);
- }
-
-+#if NET_2_0
-+ internal void RowTableSectionSet ()
-+ {
-+ owner.GenerateTableSections = true;
-+ }
-+#endif
-+
- public void Remove (TableRow row)
- {
-+#if NET_2_0
-+ if (row != null)
-+ row.Container = null;
-+#endif
- cc.Remove (row);
- }
-
- public void RemoveAt (int index)
- {
-+#if NET_2_0
-+ TableRow row = this [index] as TableRow;
-+ if (row != null)
-+ row.Container = null;
-+#endif
-+
- cc.RemoveAt (index);
- }
-
-@@ -156,28 +187,27 @@
-
- int IList.Add (object value)
- {
-- cc.Add ((TableRow)value);
-- return cc.IndexOf ((TableRow)value);
-+ return Add (value as TableRow);
- }
-
- bool IList.Contains (object value)
- {
-- return cc.Contains ((TableRow)value);
-+ return cc.Contains (value as TableRow);
- }
-
- int IList.IndexOf (object value)
- {
-- return cc.IndexOf ((TableRow)value);
-+ return cc.IndexOf (value as TableRow);
- }
-
- void IList.Insert (int index, object value)
- {
-- cc.AddAt (index, (TableRow)value);
-+ AddAt (index, value as TableRow);
- }
-
- void IList.Remove (object value)
- {
-- cc.Remove ((TableRow)value);
-+ Remove (value as TableRow);
- }
- }
- }
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TableRow.cs b/mcs/class/System.Web/System.Web.UI.WebControls/TableRow.cs
index 23e321c..86ec1e8 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/TableRow.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/TableRow.cs
@@ -47,8 +47,6 @@ namespace System.Web.UI.WebControls {
TableCellCollection cells;
#if NET_2_0
bool tableRowSectionSet;
-
- internal TableRowCollection Container { get; set; }
#endif
public TableRow ()
@@ -131,9 +129,6 @@ namespace System.Web.UI.WebControls {
throw new ArgumentOutOfRangeException ("TableSection");
ViewState ["TableSection"] = (int) value;
tableRowSectionSet = true;
- TableRowCollection container = Container;
- if (container != null)
- container.RowTableSectionSet ();
}
}
#endif
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TableRowCollection.cs b/mcs/class/System.Web/System.Web.UI.WebControls/TableRowCollection.cs
index 2267cc8..c9a9624 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/TableRowCollection.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/TableRowCollection.cs
@@ -43,9 +43,6 @@ namespace System.Web.UI.WebControls {
internal TableRowCollection (Table table)
{
- if (table == null)
- throw new ArgumentNullException ("table");
-
cc = table.Controls;
owner = table;
}
@@ -72,12 +69,9 @@ namespace System.Web.UI.WebControls {
public int Add (TableRow row)
{
- if (row == null)
- throw new NullReferenceException (); // .NET compatibility
#if NET_2_0
if (row.TableRowSectionSet)
owner.GenerateTableSections = true;
- row.Container = this;
#endif
int index = cc.IndexOf (row);
if (index < 0) {
@@ -89,14 +83,10 @@ namespace System.Web.UI.WebControls {
public void AddAt (int index, TableRow row)
{
- if (row == null)
- throw new NullReferenceException (); // .NET compatibility
-
if (cc.IndexOf (row) < 0) {
#if NET_2_0
if (row.TableRowSectionSet)
owner.GenerateTableSections = true;
- row.Container = this;
#endif
cc.AddAt (index, row);
}
@@ -105,14 +95,10 @@ namespace System.Web.UI.WebControls {
public void AddRange (TableRow[] rows)
{
foreach (TableRow tr in rows) {
- if (tr == null)
- throw new NullReferenceException (); // .NET compatibility
-
if (cc.IndexOf (tr) < 0) {
#if NET_2_0
if (tr.TableRowSectionSet)
owner.GenerateTableSections = true;
- tr.Container = this;
#endif
cc.Add (tr);
}
@@ -142,30 +128,13 @@ namespace System.Web.UI.WebControls {
return cc.IndexOf (row);
}
-#if NET_2_0
- internal void RowTableSectionSet ()
- {
- owner.GenerateTableSections = true;
- }
-#endif
-
public void Remove (TableRow row)
{
-#if NET_2_0
- if (row != null)
- row.Container = null;
-#endif
cc.Remove (row);
}
public void RemoveAt (int index)
{
-#if NET_2_0
- TableRow row = this [index] as TableRow;
- if (row != null)
- row.Container = null;
-#endif
-
cc.RemoveAt (index);
}
@@ -187,27 +156,28 @@ namespace System.Web.UI.WebControls {
int IList.Add (object value)
{
- return Add (value as TableRow);
+ cc.Add ((TableRow)value);
+ return cc.IndexOf ((TableRow)value);
}
bool IList.Contains (object value)
{
- return cc.Contains (value as TableRow);
+ return cc.Contains ((TableRow)value);
}
int IList.IndexOf (object value)
{
- return cc.IndexOf (value as TableRow);
+ return cc.IndexOf ((TableRow)value);
}
void IList.Insert (int index, object value)
{
- AddAt (index, value as TableRow);
+ cc.AddAt (index, (TableRow)value);
}
void IList.Remove (object value)
{
- Remove (value as TableRow);
+ cc.Remove ((TableRow)value);
}
}
}
--
mono
More information about the Pkg-mono-svn-commits
mailing list