mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 3.10.0

Browse Source 
Former-commit-id: 172c8e3c300b39d5785c7a3e8dfb08ebdbc1a99b
This commit is contained in:
Jo Shields
2014-10-04 11:27:48 +01:00
parent fe777c5c82
commit 8b9b85e7f5
970 changed files with 20242 additions and 31308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mcs/class/System.Web/System.Web.UI/HtmlTextWriter.cs
View File

@ -133,10 +133,6 @@ namespace System.Web.UI {
protected virtual void AddAttribute (string name, string value, HtmlTextWriterAttribute key)
{
NextAttrStack ();
#if TARGET_JVM
if (attrs [attrs_pos] == null)
attrs [attrs_pos] = new AddedAttr ();
#endif
attrs [attrs_pos].name = name;
attrs [attrs_pos].value = value;
attrs [attrs_pos].key = key;
@ -146,10 +142,6 @@ namespace System.Web.UI {
protected virtual void AddStyleAttribute (string name, string value, HtmlTextWriterStyle key)
{
NextStyleStack ();
#if TARGET_JVM
if (styles [styles_pos] == null)
styles [styles_pos] = new AddedStyle ();
#endif
styles [styles_pos].name = name;
value = HttpUtility.HtmlAttributeEncode (value);
styles [styles_pos].value = value;
@ -765,10 +757,6 @@ namespace System.Web.UI {
return tagstack [tagstack_pos].key;
}
set {
#if TARGET_JVM
if (tagstack [tagstack_pos] == null)
tagstack [tagstack_pos] = new AddedTag ();
#endif
tagstack [tagstack_pos].key = value;
tagstack [tagstack_pos].name = GetTagName (value);
}
@ -782,10 +770,6 @@ namespace System.Web.UI {
return tagstack [tagstack_pos].name;
}
set {
#if TARGET_JVM
if (tagstack [tagstack_pos] == null)
tagstack [tagstack_pos] = new AddedTag ();
#endif
tagstack [tagstack_pos].name = value;
tagstack [tagstack_pos].key = GetTagKey (value);
if (tagstack [tagstack_pos].key != HtmlTextWriterTag.Unknown)
@ -828,33 +812,21 @@ namespace System.Web.UI {
int styles_pos = -1, attrs_pos = -1, tagstack_pos = -1;
#if TARGET_JVM
class
#else
struct
#endif
AddedTag {
public string name;
public HtmlTextWriterTag key;
public bool ignore;
}
#if TARGET_JVM
class
#else
struct
#endif
AddedStyle {
public string name;
public HtmlTextWriterStyle key;
public string value;
}
#if TARGET_JVM
class
#else
struct
#endif
AddedAttr {
public string name;
public HtmlTextWriterAttribute key;

2
mcs/class/System.Web/System.Web.UI/IScriptManager.cs
View File

@ -34,7 +34,7 @@ using System.Text;
namespace System.Web.UI
{
#if (TARGET_JVM || TARGET_DOTNET)
#if (TARGET_DOTNET)
public
#endif
interface IScriptManager

6
mcs/class/System.Web/System.Web.UI/MasterPage.cs
View File

@ -115,13 +115,7 @@ namespace System.Web.UI
var req = context.Request;
if (req != null)
masterPageFile = HostingEnvironment.VirtualPathProvider.CombineVirtualPaths (req.CurrentExecutionFilePath, masterPageFile);
#if TARGET_JVM
MasterPage masterPage = MasterPageParser.GetCompiledMasterInstance (masterPageFile,
owner.Page.MapPath (masterPageFile),
context);
#else
MasterPage masterPage = BuildManager.CreateInstanceFromVirtualPath (masterPageFile, typeof (MasterPage)) as MasterPage;
#endif
if (masterPage == null)
throw new HttpException ("Failed to create MasterPage instance for '" + masterPageFile + "'.");

39
mcs/class/System.Web/System.Web.UI/Page.cs
View File

@ -544,15 +544,11 @@ public partial class Page : TemplateControl, IHttpHandler
if (ps != null)
_styleSheetTheme = ps.StyleSheetTheme;
}
#if TARGET_JVM
if (_styleSheetTheme != null && _styleSheetTheme != "")
_styleSheetPageTheme = ThemeDirectoryCompiler.GetCompiledInstance (_styleSheetTheme, Context);
#else
if (!String.IsNullOrEmpty (_styleSheetTheme)) {
string virtualPath = "~/App_Themes/" + _styleSheetTheme;
_styleSheetPageTheme = BuildManager.CreateInstanceFromVirtualPath (virtualPath, typeof (PageTheme)) as PageTheme;
}
#endif
}
void InitializeTheme ()
@ -562,19 +558,13 @@ public partial class Page : TemplateControl, IHttpHandler
if (ps != null)
_theme = ps.Theme;
}
#if TARGET_JVM
if (_theme != null && _theme != "") {
_pageTheme = ThemeDirectoryCompiler.GetCompiledInstance (_theme, Context);
_pageTheme.SetPage (this);
}
#else
if (!String.IsNullOrEmpty (_theme)) {
string virtualPath = "~/App_Themes/" + _theme;
_pageTheme = BuildManager.CreateInstanceFromVirtualPath (virtualPath, typeof (PageTheme)) as PageTheme;
if (_pageTheme != null)
_pageTheme.SetPage (this);
}
#endif
}
#if NET_4_0
public Control AutoPostBackControl {
@ -1298,11 +1288,7 @@ public partial class Page : TemplateControl, IHttpHandler
OnError (EventArgs.Empty);
if (_context.HasError (e)) {
_context.ClearError (e);
#if TARGET_JVM
vmw.common.TypeUtils.Throw (e);
#else
throw new HttpUnhandledException (null, e);
#endif
}
}
@ -2277,26 +2263,6 @@ public partial class Page : TemplateControl, IHttpHandler
}
if (asyncResults.Count > 0) {
#if TARGET_JVM
TimeSpan timeout = AsyncTimeout;
long t1 = DateTime.Now.Ticks;
bool signalled = true;
for (int i = 0; i < asyncResults.Count; i++) {
if (asyncResults [i].IsCompleted)
continue;
if (signalled)
signalled = asyncResults [i].AsyncWaitHandle.WaitOne (timeout, false);
if (signalled) {
long t2 = DateTime.Now.Ticks;
timeout = AsyncTimeout - TimeSpan.FromTicks (t2 - t1);
if (timeout.Ticks <= 0)
signalled = false;
} else
localParallelTasks [i].TimeoutHandler (asyncResults [i]);
}
#else
WaitHandle [] waitArray = new WaitHandle [asyncResults.Count];
int i = 0;
for (i = 0; i < asyncResults.Count; i++) {
@ -2311,7 +2277,6 @@ public partial class Page : TemplateControl, IHttpHandler
}
}
}
#endif
}
DateTime endWait = DateTime.Now;
TimeSpan elapsed = endWait - startExecution;