Compare commits

...
Author SHA1 Message Date
Wade Berrier f2631aa17b Bump version
svn path=/branches/mono-1-1-12/mono/; revision=54632
2005-12-19 21:39:35 +00:00
Wade Berrier 342e840c5d Copy from trunk
svn path=/branches/mono-1-1-12/mcs/; revision=54630
2005-12-19 21:38:31 +00:00
Wade Berrier 767cf2983d Copy from trunk
svn path=/branches/mono-1-1-12/mcs/; revision=54629
2005-12-19 21:38:17 +00:00
Wade Berrier 429051acb3 Copy from trunk
svn path=/branches/mono-1-1-12/mcs/; revision=54628
2005-12-19 21:37:02 +00:00
Zoltan Varga b28e8eb771 Merge from HEAD.
svn path=/branches/mono-1-1-11/mono/; revision=54443
2005-12-15 11:01:35 +00:00
Wade Berrier 2b18ed7e05 unset AC_DISABLE_FAST_INSTALL
svn path=/branches/mono-1-1-11/mono/; revision=54438
2005-12-15 04:29:41 +00:00
Wade Berrier d4acb77ad9 fix xbuild make install with EXTRA_DISTFILES
svn path=/branches/mono-1-1-11/mcs/; revision=54434
2005-12-15 01:28:58 +00:00
Wade Berrier d840a80749 Merge r54425 to mcs 1.1.11 branch
svn path=/branches/mono-1-1-11/mcs/; revision=54426
2005-12-15 00:13:41 +00:00
268 changed files with 1979 additions and 6479 deletions

No files matched your search

+2 -9
View File
@@ -1,13 +1,6 @@
2005-12-18 Raja R Harinath <harinath@gmail.com>
2005-12-14 Wade Berrier <wberrier@novell.com>
* configure.in (config.make): Don't blindly copy over $INSTALL,
since it can be relative to the mono tree. Use the same trick as
ac_INSTALL, but against an absolute path.
2005-12-16 Wade Berrier <[email protected]>
* configure.in: Unset AC_DISABLE_FAST_INSTALL
This caused some weird monodis linking errors
* configure.in (AC_DISABLE_FAST_INSTALL): unset.
2005-12-12 Mike Kestner <[email protected]>
+4 -9
View File
@@ -6,7 +6,7 @@ AC_CANONICAL_SYSTEM
m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(mono,1.1.11)
AM_INIT_AUTOMAKE(mono,1.1.12)
AM_MAINTAINER_MODE
AC_PROG_LN_S
@@ -263,7 +263,8 @@ AM_CONDITIONAL(CROSS_COMPILING, [test x$cross_compiling = xyes])
# Set STDC_HEADERS
AC_HEADER_STDC
AC_LIBTOOL_WIN32_DLL
# This causes monodis to not link correctly
# Disabling because it causes some weird monodis linking
# problems if /usr/libmono.so isn't install on system
#AC_DISABLE_FAST_INSTALL
AM_PROG_LIBTOOL
@@ -1851,13 +1852,7 @@ fi
echo 'IL_FLAGS = /debug' >> $srcdir/$mcsdir/build/config.make
echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$mcsdir/build/config.make
echo "ILDISASM = $mono_build_root/runtime/monodis-wrapper" >> $srcdir/$mcsdir/build/config.make
case $INSTALL in
[[\\/$]]* | ?:[[\\/]]* ) mcs_INSTALL=$INSTALL ;;
*) mcs_INSTALL=$mono_build_root/$INSTALL ;;
esac
echo "INSTALL = $mcs_INSTALL" >> $srcdir/$mcsdir/build/config.make
echo "INSTALL = $INSTALL" >> $srcdir/$mcsdir/build/config.make
export VERSION
[myver=$($AWK 'BEGIN {
@@ -1,33 +1,3 @@
2005-12-16 Atsushi Enomoto <[email protected]>
* RncWriter.cs : it needs another namespace resolver for datatypes.
2005-12-16 Atsushi Enomoto <[email protected]>
* RncWriter.cs : actually no need to change signature; use
GetNamespacesInScope().
2005-12-16 Atsushi Enomoto <[email protected]>
* RncWriter.cs : use XmlNamespaceManager for NSResolver even in NET_2_0.
2005-12-16 Atsushi Enomoto <[email protected]>
* RncWriter.cs : another escapement is required.
2005-12-16 Atsushi Enomoto <[email protected]>
* RncWriter.cs : oops, missing keyword escapement.
2005-12-16 Atsushi Enomoto <[email protected]>
* RncWriter.cs : no xsi in grammar, please.
2005-12-16 Atsushi Enomoto <[email protected]>
* RncWriter.cs : added WriteNamespaces() to handle namespace output
by itself.
2005-03-28 Atsushi Enomoto <[email protected]>
* RncTokenizer.cs : check names strictly.
@@ -51,77 +51,26 @@ namespace Commons.Xml.Relaxng.Rnc
XmlNamespaceManager n = new XmlNamespaceManager (
new NameTable ());
n.AddNamespace ("xs", "http://www.w3.org/2001/XMLSchema-datatypes");
n.AddNamespace ("xsi", "http://www.w3.org/2001/XMLSchema-instance");
defaultNamespaceManager = n;
}
TextWriter w;
NSResolver nsmgr;
NSResolver datansmgr;
public RncWriter (TextWriter writer)
: this (writer, null, defaultNamespaceManager)
: this (writer, defaultNamespaceManager)
{
}
public RncWriter (TextWriter writer, NSResolver nsmgr)
: this (writer, nsmgr, defaultNamespaceManager)
{
}
public RncWriter (TextWriter writer, NSResolver structureNamespaces, NSResolver dataNamespaces)
{
this.w = writer;
this.nsmgr = structureNamespaces;
this.datansmgr = dataNamespaces;
XmlNameTable nt = GetNameTable (nsmgr, datansmgr);
if (nsmgr == null)
nsmgr = new XmlNamespaceManager (nt);
if (datansmgr == null)
datansmgr = new XmlNamespaceManager (nt);
this.nsmgr = nsmgr;
}
#region Utility methods
private XmlNameTable GetNameTable (NSResolver nss1, NSResolver nss2)
{
XmlNameTable nt = null;
if (nss1 is XmlNamespaceManager)
nt = ((XmlNamespaceManager) nss1).NameTable;
if (nss2 is XmlNamespaceManager)
nt = ((XmlNamespaceManager) nss2).NameTable;
if (nt == null)
nt = new NameTable ();
return nt;
}
private bool IsKeyword (string name)
{
switch (name) {
case "attribute":
case "default":
case "datatypes":
case "div":
case "element":
case "empty":
case "external":
case "grammar":
case "include":
case "inherit":
case "list":
case "mixed":
case "namespace":
case "notAllowed":
case "parent":
case "start":
case "string":
case "text":
case "token":
return true;
default:
return false;
}
}
private void WriteNames (RelaxngNameClassList l, bool wrap)
{
switch (l.Count) {
@@ -188,41 +137,30 @@ namespace Commons.Xml.Relaxng.Rnc
RelaxngGrammarContentList divs,
RelaxngGrammarContentList includes)
{
if (includes != null) {
if (includes != null)
foreach (RelaxngInclude inc in includes)
inc.WriteRnc (this);
w.WriteLine ();
}
if (divs != null) {
if (divs != null)
foreach (RelaxngDiv div in divs)
div.WriteRnc (this);
w.WriteLine ();
}
if (starts != null) {
if (starts != null)
foreach (RelaxngStart s in starts)
s.WriteRnc (this);
w.WriteLine ();
}
if (defines != null)
foreach (RelaxngDefine def in defines)
def.WriteRnc (this);
}
private void WriteQName (string name, string ns)
{
WriteQName (name, ns, nsmgr);
}
private void WriteQName (string name, string ns, NSResolver nss)
{
string prefix = String.Empty;
if (ns != null && ns != String.Empty) {
#if NET_2_0
#else
// XmlNamespaceManager sucks.
ns = nss.NameTable.Add (ns);
ns = nsmgr.NameTable.Add (ns);
#endif
prefix = nss.LookupPrefix (ns);
prefix = nsmgr.LookupPrefix (ns);
}
if (prefix == null)
throw new RelaxngException (String.Format ("Namespace '{0}' is not mapped to a prefix in argument XmlNamespaceManager.", ns));
@@ -230,8 +168,6 @@ namespace Commons.Xml.Relaxng.Rnc
w.Write (prefix);
w.Write (':');
}
if (IsKeyword (name))
w.Write ('\\');
w.Write (name);
}
@@ -262,49 +198,6 @@ namespace Commons.Xml.Relaxng.Rnc
#endregion
public void WriteNamespaces (string defaultNamespace)
{
WriteNamespaces (defaultNamespace, nsmgr, false);
WriteNamespaces (null, datansmgr, true);
}
public void WriteNamespaces (string defaultNamespace, NSResolver nsmgr, bool isData)
{
if (defaultNamespace == null)
defaultNamespace = String.Empty;
if (defaultNamespace.Length > 0)
w.WriteLine ("default namespace = {0}",
defaultNamespace);
if (nsmgr != null) {
#if NET_2_0
foreach (string s in nsmgr.GetNamespacesInScope (
XmlNamespaceScope.All).Keys) {
#else
foreach (string s in nsmgr) {
#endif
switch (s) {
case "xml":
case "xmlns":
continue;
case "":
if (defaultNamespace.Length > 0)
w.WriteLine ("default namespace = '{0}'",
nsmgr.LookupNamespace (s).Replace ('\'', '\"'));
break;
default:
w.WriteLine ("{2} {0} = '{1}'",
s,
nsmgr.LookupNamespace (s).Replace ('\'', '\"'),
isData ? "datatypes" : "namespace");
break;
}
}
}
w.WriteLine ();
}
#region Elements
// Note that it might not be used directly when a grammar
// contains more than one "start" (compact syntax does not
@@ -326,8 +219,6 @@ namespace Commons.Xml.Relaxng.Rnc
// (compact syntax does not support "combine" attribute).
public void WriteDefine (RelaxngDefine define)
{
if (IsKeyword (define.Name))
w.Write ('\\');
w.Write (define.Name);
if (define.Combine == null)
w.Write (" = ");
@@ -344,7 +235,6 @@ namespace Commons.Xml.Relaxng.Rnc
}
}
w.WriteLine ();
w.WriteLine ();
}
public void WriteInclude (RelaxngInclude include)
@@ -390,7 +280,7 @@ namespace Commons.Xml.Relaxng.Rnc
public void WriteData (RelaxngData data)
{
WriteQName (data.Type, data.DatatypeLibrary, datansmgr);
WriteQName (data.Type, data.DatatypeLibrary);
if (data.ParamList.Count > 0) {
w.Write (" { ");
foreach (RelaxngParam p in data.ParamList)
@@ -403,7 +293,7 @@ namespace Commons.Xml.Relaxng.Rnc
public void WriteValue (RelaxngValue v)
{
WriteQName (v.Type, v.DatatypeLibrary, datansmgr);
WriteQName (v.Type, v.DatatypeLibrary);
w.Write (' ');
WriteLiteral (v.Value);
}
@@ -445,16 +335,12 @@ namespace Commons.Xml.Relaxng.Rnc
public void WriteRef (RelaxngRef r)
{
if (IsKeyword (r.Name))
w.Write ('\\');
w.Write (r.Name);
}
public void WriteParentRef (RelaxngParentRef r)
{
w.Write ("parent ");
if (IsKeyword (r.Name))
w.Write ('\\');
w.Write (r.Name);
w.Write (' ');
}
@@ -502,8 +388,6 @@ namespace Commons.Xml.Relaxng.Rnc
public void WriteParam (RelaxngParam p)
{
if (IsKeyword (p.Name))
w.Write ('\\');
w.Write (p.Name);
w.Write (" = ");
WriteLiteral (p.Value);
@@ -1,13 +1,3 @@
2005-12-16 Atsushi Enomoto <[email protected]>
* RelaxngPattern.cs : RelaxngData and RelaxngValue was writing QName
instead of NCName for type attribute (wrong).
2005-12-16 Atsushi Enomoto <[email protected]>
* RelaxngPattern.cs : in WriteCompact(), use WriteNamespace() to
let RncWriter handle namespace output by itself.
2005-09-20 Atsushi Enomoto <[email protected]>
* RelaxngValidatingReader.cs : added explicit error message for
@@ -512,20 +512,17 @@ namespace Commons.Xml.Relaxng
public void WriteCompact (TextWriter writer)
{
WriteCompact (new RncWriter (writer));
WriteRnc (new RncWriter (writer));
}
public void WriteCompact (TextWriter writer, NSResolver res)
{
WriteCompact (new RncWriter (writer, res));
}
void WriteCompact (RncWriter writer)
{
RelaxngGrammar g = this as RelaxngGrammar;
string ns = (g != null ? g.DefaultNamespace : null);
writer.WriteNamespaces (ns);
WriteRnc (writer);
if (g != null && g.DefaultNamespace != null) {
writer.Write ("default namespace = ");
writer.WriteLine (g.DefaultNamespace);
}
WriteRnc (new RncWriter (writer, res));
}
// Internal
@@ -750,8 +747,10 @@ namespace Commons.Xml.Relaxng
{
writer.WriteStartElement ("", "data", RelaxngGrammar.NamespaceURI);
if (DatatypeLibrary != null && DatatypeLibrary != String.Empty)
writer.WriteAttributeString ("datatypeLibrary", DatatypeLibrary);
writer.WriteAttributeString ("type", Type);
writer.WriteAttributeString ("xmlns", "data", "http://www.w3.org/2000/xmlns/", DatatypeLibrary);
writer.WriteStartAttribute ("type", String.Empty);
writer.WriteQualifiedName (Type, DatatypeLibrary);
writer.WriteEndAttribute ();
foreach (RelaxngParam p in ParamList)
p.Write (writer);
@@ -814,8 +813,9 @@ namespace Commons.Xml.Relaxng
if (Type != null) {
writer.WriteStartAttribute ("type", String.Empty);
if (DatatypeLibrary != null && DatatypeLibrary != String.Empty)
writer.WriteAttributeString ("datatypeLibrary", DatatypeLibrary);
writer.WriteAttributeString ("type", Type);
writer.WriteAttributeString ("xmlns", "data", "http://www.w3.org/2000/xmlns/", DatatypeLibrary);
writer.WriteQualifiedName (Type, DatatypeLibrary);
writer.WriteEndAttribute ();
}
writer.WriteString (Value);
writer.WriteEndElement ();
@@ -56,7 +56,6 @@ namespace Microsoft.JScript {
internal AST left {
get { return operand1; }
set { operand1 = value; }
}
internal AST right {
@@ -1,14 +1,3 @@
2005-12-15 Cesar Lopez Nataren <[email protected]>
* Parser.cs: Use the new assign ctr and Init method.
* expression.cs (Assign): Modify the number of ctr and added the Init method.
* BinaryOp.cs: Add setter for left.
* Statement.cs (For.Emit): Take into account what relational
operator is in place.
* expression.cs (Assign.Emit): Emit box in the op= cases.
2005-12-10 Florian Gross <[email protected]> and
Evan Briones <[email protected]>
@@ -372,9 +372,7 @@ namespace Microsoft.JScript {
} else {
// FIXME
pn = fn;
Assign assign = new Assign (null, JSToken.Assign, new Location (ts.SourceName, ts.LineNumber));
assign.Init (member_expr, pn, false);
pn = assign;
pn = new Assign (null, member_expr, pn, JSToken.Assign, false, new Location (ts.SourceName, ts.LineNumber));
// FIXME, research about createExprStatement
if (ft != FunctionType.Expression)
@@ -877,17 +875,14 @@ namespace Microsoft.JScript {
if (tt == Token.ASSIGN) {
ts.GetToken ();
decompiler.AddToken (Token.ASSIGN);
Assign assign = new Assign (parent, JSToken.Assign, new Location (ts.SourceName, ts.LineNumber));
assign.Init (pn, AssignExpr (assign, in_for_init), false);
pn = assign;
pn = new Assign (parent, pn, AssignExpr (parent, in_for_init), JSToken.Assign, false, new Location (ts.SourceName, ts.LineNumber));
return pn;
} else if (tt == Token.ASSIGNOP) {
ts.GetToken ();
int op = ts.GetOp ();
decompiler.AddAssignOp (op);
Assign assign = new Assign (parent, ToJSToken (op, tt), new Location (ts.SourceName, ts.LineNumber));
assign.Init (pn, AssignExpr (assign, in_for_init), false);
pn = assign;
pn = new Assign (parent, pn, AssignExpr (parent, in_for_init), ToJSToken (op, tt), false,
new Location (ts.SourceName, ts.LineNumber));
}
return pn;
}
@@ -508,14 +508,9 @@ namespace Microsoft.JScript {
if (a is Equality)
ig.Emit (OpCodes.Brfalse, forward);
else if (a is Relational) {
Relational rel = (Relational) a;
ig.Emit (OpCodes.Ldc_I4_0);
ig.Emit (OpCodes.Conv_R8);
if (rel.op == JSToken.GreaterThan)
ig.Emit (OpCodes.Ble, forward);
else
ig.Emit (OpCodes.Bge, forward);
ig.Emit (OpCodes.Bge, forward);
}
}
/* emit stms */
@@ -1998,15 +1998,9 @@ namespace Microsoft.JScript {
internal bool is_embedded;
internal Assign (AST parent, JSToken op, Location location)
: base (parent, null, null, op, location)
internal Assign (AST parent, AST left, AST right, JSToken op, bool is_embedded, Location location)
: base (parent, left, right, op, location)
{
}
internal void Init (AST left, AST right, bool is_embedded)
{
this.left = left;
this.right = right;
this.is_embedded = is_embedded;
}
@@ -2107,10 +2101,8 @@ namespace Microsoft.JScript {
ig.Emit (OpCodes.Ldloc, local);
ig.Emit (OpCodes.Ldloc, aux);
if (right != null) {
if (right != null)
right.Emit (ec);
CodeGenerator.EmitBox (ig, right);
}
emit_evaluation (op, type, ig);
@@ -1,26 +1,3 @@
2005-12-17 Cesar Lopez Nataren <[email protected]>
* mjs-most.fail: Erase js1_3/inherit/proto_6.js,
js1_3/inherit/proto_7.js, js1_3/inherit/proto_8.js,
ecma/FunctionObjects/15.3.4-1.js, ecma_2/Exceptions/global-001.js,
ecma_2/Statements/dowhile-006.js,
ecma/ObjectObjects/15.2.3.1-2.js, js1_4/Regress/function-003.js as
they fail no more.
2005-12-16 Cesar Lopez Nataren <[email protected]>
* mjs-most-tests: Enable ecma/Expressions/11.13.1.js and
ecma/TypeConversion/9.3.1-3.js.
* mjs-most-tests: Enable ecma_2/Statements/dowhile-003.js.
2005-12-15 Cesar Lopez Nataren <[email protected]>
* mjs-most.tests: Enable js1_3/inherit/proto_11.js and
js1_3/inherit/proto_12.js.
* mjs-most.tests: Enable ecma/Date/15.9.1.1-2.js.
2005-12-10 Cesar Lopez Nataren <[email protected]>
* runner.cs: Make the current direcory the place where we create
@@ -17,7 +17,9 @@ ecma_2/Exceptions/date-001.js
ecma_2/Statements/try-003.js
ecma_2/Statements/try-004.js
ecma_2/Statements/try-012.js
js1_3/inherit/proto_6.js
js1_3/inherit/proto_7.js
js1_3/inherit/proto_8.js
# System.NotImplementedException: Should emit LateBinding.CallValue logic for unknown constructor Math
ecma/Expressions/11.2.2-10-n.js
@@ -55,9 +57,20 @@ ecma/Statements/12.6.3-19.js
# System.NotImplementedException: The requested feature is not implemented. (Convert:ToForInObject)
ecma/String/15.5.5.1.js
# System.NotImplementedException: The requested feature is not implemented.
# (Call:Emit, member_type = Property, member_exp = Function AccessField prototype)
ecma/FunctionObjects/15.3.4-1.js
# System.Exception: error JS5002 A: function expected.
ecma_2/Exceptions/exception-001.js
# System.NotImplementedException: The requested feature is not implemented.
# (Convert:ToPrimitive, value = System.Object[])
ecma_2/Exceptions/global-001.js
# System.Exception: uknown type: Microsoft.JScript.Call
# (fall_false, last_exp.GetType () == looping Microsoft.JScript.Args)
ecma_2/Statements/dowhile-006.js
# System.Exception: uknown type: Microsoft.JScript.Assign
# (fall_false, last_exp.GetType () == expression Assign object AccessField whileExpression)
ecma_2/Statements/while-002.js
@@ -85,4 +98,8 @@ ecma/Array/15.4.3.1-2.js
ecma/FunctionObjects/15.3.3.1-3.js
ecma/Number/15.7.3.3-2.js
ecma/Number/15.7.3.5-2.jsc
ecma/ObjectObjects/15.2.3.1-2.js
ecma/Number/15.7.3.5-2.js
# runtime error
js1_4/Regress/function-003.js
@@ -90,7 +90,8 @@ ecma/Boolean/15.6.4.3-3.js
ecma/Boolean/15.6.4.3.js
ecma/Boolean/15.6.4.js
ecma/Date/15.9.1.1-1.js
ecma/Date/15.9.1.1-2.js
# Invalid IL
#ecma/Date/15.9.1.1-2.js
ecma/Date/15.9.2.1.js
ecma/Date/15.9.2.2-1.js
ecma/Date/15.9.2.2-2.js
@@ -299,7 +300,7 @@ ecma/ExecutionContexts/10.2.3-1.js
ecma/Expressions/11.12-3.js
# Invalid IL
#ecma/Expressions/11.12-4.js
ecma/Expressions/11.13.1.js
#ecma/Expressions/11.13.1.js
#ecma/Expressions/11.13.2-1.js
#ecma/Expressions/11.13.2-2.js
#ecma/Expressions/11.13.2-3.js
@@ -317,7 +318,7 @@ ecma/Expressions/11.2.2-1.js
ecma/Expressions/11.2.2-10-n.js
# Needs new Function
#ecma/Expressions/11.2.2-11.js
# arguments failures
# Invalid IL
#ecma/Expressions/11.2.2-2-n.js
#ecma/Expressions/11.2.2-3-n.js
#ecma/Expressions/11.2.2-4-n.js
@@ -746,7 +747,8 @@ ecma/String/15.5.5.1.js
#ecma/TypeConversion/9.3-1.js
ecma/TypeConversion/9.3.1-1.js
ecma/TypeConversion/9.3.1-2.js
ecma/TypeConversion/9.3.1-3.js
# Invalid IL
#ecma/TypeConversion/9.3.1-3.js
# Needs eval
#ecma/TypeConversion/9.3.js
ecma/TypeConversion/9.4-1.js
@@ -908,10 +910,11 @@ ecma_2/RegExp/regress-001.js
# RegExpObject:Initialize throws JScriptException
#ecma_2/RegExp/unicode-001.js
ecma_2/Statements/dowhile-001.js
# SemanticAnalyser:NeedsToBoolean throws NotImplementedException
# invalid IL
#ecma_2/Statements/dowhile-002.js
ecma_2/Statements/dowhile-003.js
# SemanticAnalyser:NeedsToBoolean throws NotImplementedException
# Invalid IL
#ecma_2/Statements/dowhile-003.js
# invalid IL
#ecma_2/Statements/dowhile-004.js
ecma_2/Statements/dowhile-005.js
ecma_2/Statements/dowhile-006.js
@@ -951,7 +954,7 @@ ecma_2/String/match-003.js
ecma_2/String/match-004.js
ecma_2/String/replace-001.js
ecma_2/String/split-001.js
# Trace/breakpoint trap
# Invalid IL
#ecma_2/String/split-002.js
ecma_2/String/split-003.js
# Invalid IL
@@ -972,7 +975,7 @@ js1_2/Array/general2.js
# LateBinding:CallValue throws NullReferenceException
#js1_2/Array/tostring_1.js
js1_2/Array/tostring_2.js
# Trace/breakpoint trap
# Invalid IL
#js1_2/Objects/toString-001.js
js1_2/String/charCodeAt.js
js1_2/String/concat.js
@@ -1076,8 +1079,9 @@ js1_3/Script/switch-001.js
js1_3/inherit/proto_1.js
# Convert:ToObject throws JScriptException: Unexpected type
#js1_3/inherit/proto_10.js
js1_3/inherit/proto_11.js
js1_3/inherit/proto_12.js
# Invalid IL
#js1_3/inherit/proto_11.js
#js1_3/inherit/proto_12.js
js1_3/inherit/proto_2.js
js1_3/inherit/proto_3.js
js1_3/inherit/proto_4.js
@@ -1,7 +1,3 @@
2005-12-16 Sebastien Pouliot <[email protected]>
* X509Chain.cs: Fix chain building. Patch from Vincent Cote-Roy.
2005-11-18 Sebastien Pouliot <[email protected]>
* X509Extension.cs: Changed default ctor to protected to help
@@ -129,9 +129,11 @@ namespace Mono.Security.X509 {
X509Certificate x = leaf;
X509Certificate tmp = x;
while ((x != null) && (!x.IsSelfSigned)) {
tmp = x; // last valid
_chain.Add (x);
x = FindCertificateParent (x);
tmp = FindCertificateParent (x);
if (x != null) {
_chain.Add (x);
x = tmp; // last valid
}
}
// find a trusted root
_root = FindCertificateRoot (tmp);
@@ -1,33 +1,3 @@
2005-12-16 Chris Toshok <[email protected]>
* ConfigurationLockCollection.cs (Add): only add the name if it's
not already there.
(IsReadOnly): always return false for the time being, in the
non-exceptional case.
2005-12-15 Chris Toshok <[email protected]>
* ConfigurationElement.cs (LockAllAttributesExcept): implement.
(LockAllElementsExcept): implement.
(DeserializeElement): handle the built-in attributes (lock* for
the time being).
2005-12-15 Chris Toshok <[email protected]>
* ConfigurationLockCollection.cs (..ctor): don't call Populate.
(Populate): nuke.
(CheckName): make sure the passes in name is valid for this type
of lock collection.
(Add): call CheckName, and set is_modified to true.
(Clear): set is_modified.
(IsReadOnly): add plausable implementation, including exception in
the case where the name isn't found.
(Remove): set is_modified.
(SetFromList): implement.
(get_AttributeList): implement.
(set_IsModified): add internal setter so we can clear the modified
flag.
2005-12-12 Chris Toshok <[email protected]>
* AppSettingsSection.cs (DeserializeElement): provide rather naive
@@ -89,28 +89,21 @@ namespace System.Configuration
}
}
ConfigurationLockCollection lockAllAttributesExcept;
[MonoTODO]
public ConfigurationLockCollection LockAllAttributesExcept {
get {
if (lockAllAttributesExcept == null) {
lockAllAttributesExcept = new ConfigurationLockCollection (this, ConfigurationLockType.Attribute | ConfigurationLockType.Exclude);
}
return lockAllAttributesExcept;
throw new NotImplementedException ();
}
}
ConfigurationLockCollection lockAllElementsExcept;
[MonoTODO]
public ConfigurationLockCollection LockAllElementsExcept {
get {
if (lockAllElementsExcept == null) {
lockAllElementsExcept = new ConfigurationLockCollection (this, ConfigurationLockType.Element | ConfigurationLockType.Exclude);
}
return lockAllElementsExcept;
throw new NotImplementedException ();
}
}
[MonoTODO]
ConfigurationLockCollection lockAttributes;
public ConfigurationLockCollection LockAttributes {
get {
@@ -122,14 +115,10 @@ namespace System.Configuration
}
}
ConfigurationLockCollection lockElements;
[MonoTODO]
public ConfigurationLockCollection LockElements {
get {
if (lockElements == null) {
lockElements = new ConfigurationLockCollection (this, ConfigurationLockType.Element);
}
return lockElements;
throw new NotImplementedException ();
}
}
@@ -282,22 +271,8 @@ namespace System.Configuration
{
PropertyInformation prop = ElementInformation.Properties [reader.LocalName];
if (prop == null || (serializeCollectionKey && !prop.IsKey)) {
/* handle the built in ConfigurationElement attributes here */
if (reader.LocalName == "lockAllAttributesExcept") {
LockAllAttributesExcept.SetFromList (reader.Value);
}
else if (reader.LocalName == "lockAllElementsExcept") {
LockAllElementsExcept.SetFromList (reader.Value);
}
else if (reader.LocalName == "lockAttributes") {
LockAttributes.SetFromList (reader.Value);
}
else if (reader.LocalName == "lockElements") {
LockElements.SetFromList (reader.Value);
}
else if (!OnDeserializeUnrecognizedAttribute (reader.LocalName, reader.Value))
if (!OnDeserializeUnrecognizedAttribute (reader.LocalName, reader.Value))
throw new ConfigurationException ("Unrecognized attribute '" + reader.LocalName + "'.");
continue;
}
@@ -47,9 +47,6 @@ namespace System.Configuration
ArrayList names;
ConfigurationElement element;
ConfigurationLockType lockType;
bool is_modified;
Hashtable valid_name_hash;
string valid_names;
internal ConfigurationLockCollection (ConfigurationElement element,
ConfigurationLockType lockType)
@@ -57,54 +54,27 @@ namespace System.Configuration
names = new ArrayList ();
this.element = element;
this.lockType = lockType;
Populate();
}
void CheckName (string name)
void Populate ()
{
bool isAttribute = (lockType & ConfigurationLockType.Attribute) == ConfigurationLockType.Attribute;
if (valid_name_hash == null) {
valid_name_hash = new Hashtable ();
foreach (ConfigurationProperty prop in element.Properties) {
if (isAttribute == prop.IsElement)
continue;
valid_name_hash.Add (prop.Name, true);
}
/* add the add/remove/clear names of the
* default collection if there is one */
if (!isAttribute) {
ConfigurationElementCollection c = element.GetDefaultCollection ();
valid_name_hash.Add (c.AddElementName, true);
valid_name_hash.Add (c.ClearElementName, true);
valid_name_hash.Add (c.RemoveElementName, true);
}
string[] valid_name_array = new string[valid_name_hash.Keys.Count];
valid_name_hash.Keys.CopyTo (valid_name_array, 0);
valid_names = String.Join (",", valid_name_array);
foreach (ConfigurationProperty prop in element.Properties) {
if ((lockType & ConfigurationLockType.Attribute) != ConfigurationLockType.Attribute
|| !prop.IsDefaultCollection)
Add (prop.Name);
}
if (valid_name_hash [name] == null)
throw new ConfigurationErrorsException (
String.Format ("The {2} '{0}' is not valid in the locked list for this section. The following {3} can be locked: '{1}'",
name, valid_names, isAttribute ? "attribute" : "element", isAttribute ? "attributes" : "elements"));
}
public void Add (string name)
{
CheckName (name);
if (!names.Contains (name)) {
names.Add (name);
is_modified = true;
}
names.Add (name);
}
public void Clear ()
{
names.Clear ();
is_modified = true;
}
public bool Contains (string name)
@@ -122,37 +92,21 @@ namespace System.Configuration
return names.GetEnumerator ();
}
[MonoTODO ("we can't possibly *always* return false here...")]
[MonoTODO]
public bool IsReadOnly (string name)
{
for (int i = 0; i < names.Count; i ++) {
if (names[i] == name) {
/* this test used to switch off whether the collection was 'Exclude' or not
* (the LockAll*Except collections), but that doesn't seem to be the crux of
* it. maybe this returns true if the element/attribute is locked in a parent
* element's lock collections? */
return false;
}
}
throw new ConfigurationErrorsException (String.Format ("The entry '{0}' is not in the collection.", name));
return false; /* XXX */
}
public void Remove (string name)
{
names.Remove (name);
is_modified = true;
}
[MonoTODO]
public void SetFromList (string attributeList)
{
Clear ();
char [] split = {','};
string [] attrs = attributeList.Split (split);
foreach (string a in attrs) {
Add (a.Trim ());
}
throw new NotImplementedException ();
}
void ICollection.CopyTo (System.Array array, int index)
@@ -160,37 +114,45 @@ namespace System.Configuration
names.CopyTo (array, index);
}
[MonoTODO]
public string AttributeList {
get {
string[] name_arr = new string[names.Count];
names.CopyTo (name_arr, 0);
return String.Join (",", name_arr);
throw new NotImplementedException ();
}
}
public int Count {
get { return names.Count; }
get {
return names.Count;
}
}
[MonoTODO]
public bool HasParentElements {
get { return false; /* XXX */ }
get {
return false; /* XXX */
}
}
[MonoTODO]
public bool IsModified {
get { return is_modified; }
internal set { is_modified = value; }
get {
return false; /* XXX */
}
}
[MonoTODO]
public bool IsSynchronized {
get { return false; /* XXX */ }
get {
return false; /* XXX */
}
}
[MonoTODO]
public object SyncRoot {
get { return this; /* XXX */ }
get {
return this; /* XXX */
}
}
}
}
@@ -1,8 +1,3 @@
2005-12-16 Chris Toshok <[email protected]>
* System.Configuration/ConfigurationLockCollectionTest.cs
(DuplicateAdd, IsReadOnly): new tests.
2005-12-06 Chris Toshok <[email protected]>
* System.Configuration/ConnectionStringSettingsTest.cs (NameNull):
@@ -142,36 +142,7 @@ namespace MonoTests.System.Configuration {
col.SetFromList (" file ");
Assert.AreEqual (1, col.Count, "A1");
Assert.IsTrue (col.Contains ("file"), "A2");
}
[Test]
public void DuplicateAdd ()
{
SysConfig cfg = ConfigurationManager.OpenExeConfiguration (ConfigurationUserLevel.None);
AppSettingsSection app = cfg.AppSettings;
app.LockAttributes.Clear ();
app.LockAttributes.Add ("file");
app.LockAttributes.Add ("file");
Assert.AreEqual (1, app.LockAttributes.Count, "A1");
}
[Test]
public void IsReadOnly ()
{
SysConfig cfg = ConfigurationManager.OpenExeConfiguration (ConfigurationUserLevel.None);
AppSettingsSection app = cfg.AppSettings;
app.LockAttributes.Clear ();
app.LockAllAttributesExcept.Clear ();
app.LockAttributes.Add ("file");
Assert.IsFalse (app.LockAttributes.IsReadOnly ("file"), "A1");
app.LockAllAttributesExcept.Add ("file");
Assert.IsFalse (app.LockAllAttributesExcept.IsReadOnly ("file"), "A2");
}
}
}
@@ -1,4 +1,4 @@
TESTS = t1.exe t2.exe t3.exe t4.exe t5.exe t6.exe t7.exe t8.exe t9.exe t10.exe t11.exe t12.exe t13.exe t14.exe t15.exe t16.exe t17.exe t18.exe t19.exe
TESTS = t1.exe t2.exe t3.exe t4.exe t5.exe t6.exe t7.exe t8.exe t9.exe t10.exe t11.exe t12.exe t13.exe t14.exe
check: local compare
@@ -1,25 +0,0 @@
using System;
using System.Configuration;
class T1
{
static void Main(string[] args)
{
try
{
Configuration config = ConfigurationManager.OpenExeConfiguration (ConfigurationUserLevel.None);
AppSettingsSection sect = (AppSettingsSection)config.GetSection("appSettings");
foreach (string key in sect.Settings.AllKeys) {
KeyValueConfigurationElement e = sect.Settings[key];
Console.WriteLine ("{0} = {1}", e.Key, e.Value);
}
Console.WriteLine ("lockAllAttributesExcept = '{0}'", sect.LockAllAttributesExcept.AttributeList);
}
catch (Exception e)
{
Console.WriteLine ("Exception raised: {0}\n{1}", e.GetType(), e);
}
}
}
@@ -1,5 +0,0 @@
<configuration>
<appSettings lockAllAttributesExcept="file">
<add key="aloha" value="aloha" />
</appSettings>
</configuration>
@@ -1,2 +0,0 @@
aloha = aloha
lockAllAttributesExcept = 'file'
@@ -1,25 +0,0 @@
using System;
using System.Configuration;
class T1
{
static void Main(string[] args)
{
try
{
Configuration config = ConfigurationManager.OpenExeConfiguration (ConfigurationUserLevel.None);
AppSettingsSection sect = (AppSettingsSection)config.GetSection("appSettings");
foreach (string key in sect.Settings.AllKeys) {
KeyValueConfigurationElement e = sect.Settings[key];
Console.WriteLine ("{0} = {1}", e.Key, e.Value);
}
Console.WriteLine ("lockAttributes = '{0}'", sect.LockAttributes.AttributeList);
}
catch (Exception e)
{
Console.WriteLine ("Exception raised: {0}\n{1}", e.GetType(), e);
}
}
}
@@ -1,5 +0,0 @@
<configuration>
<appSettings lockAttributes="file">
<add key="aloha" value="aloha" />
</appSettings>
</configuration>
@@ -1,2 +0,0 @@
aloha = aloha
lockAttributes = 'file'
@@ -1,2 +0,0 @@
aloha = aloha
lockAttributes = 'file'
@@ -1,25 +0,0 @@
using System;
using System.Configuration;
class T1
{
static void Main(string[] args)
{
try
{
Configuration config = ConfigurationManager.OpenExeConfiguration (ConfigurationUserLevel.None);
AppSettingsSection sect = (AppSettingsSection)config.GetSection("appSettings");
foreach (string key in sect.Settings.AllKeys) {
KeyValueConfigurationElement e = sect.Settings[key];
Console.WriteLine ("{0} = {1}", e.Key, e.Value);
}
Console.WriteLine ("lockAllElementsExcept = '{0}'", sect.LockAllElementsExcept.AttributeList);
}
catch (Exception e)
{
Console.WriteLine ("Exception raised: {0}\n{1}", e.GetType(), e);
}
}
}
@@ -1,5 +0,0 @@
<configuration>
<appSettings lockAllElementsExcept="add">
<add key="aloha" value="aloha" />
</appSettings>
</configuration>
@@ -1,2 +0,0 @@
aloha = aloha
lockAllElementsExcept = 'add'
@@ -1,2 +0,0 @@
aloha = aloha
lockAllElementsExcept = 'add'
@@ -1,25 +0,0 @@
using System;
using System.Configuration;
class T1
{
static void Main(string[] args)
{
try
{
Configuration config = ConfigurationManager.OpenExeConfiguration (ConfigurationUserLevel.None);
AppSettingsSection sect = (AppSettingsSection)config.GetSection("appSettings");
foreach (string key in sect.Settings.AllKeys) {
KeyValueConfigurationElement e = sect.Settings[key];
Console.WriteLine ("{0} = {1}", e.Key, e.Value);
}
Console.WriteLine ("lockElements = '{0}'", sect.LockElements.AttributeList);
}
catch (Exception e)
{
Console.WriteLine ("Exception raised: {0}\n{1}", e.GetType(), e);
}
}
}
@@ -1,5 +0,0 @@
<configuration>
<appSettings lockElements="clear">
<add key="aloha" value="aloha" />
</appSettings>
</configuration>
@@ -1,2 +0,0 @@
aloha = aloha
lockElements = 'clear'
@@ -1,2 +0,0 @@
aloha = aloha
lockElements = 'clear'
@@ -1,25 +0,0 @@
using System;
using System.Configuration;
class T1
{
static void Main(string[] args)
{
try
{
Configuration config = ConfigurationManager.OpenExeConfiguration (ConfigurationUserLevel.None);
AppSettingsSection sect = (AppSettingsSection)config.GetSection("appSettings");
foreach (string key in sect.Settings.AllKeys) {
KeyValueConfigurationElement e = sect.Settings[key];
Console.WriteLine ("{0} = {1}", e.Key, e.Value);
}
Console.WriteLine ("lockAllAttributesExcept = '{0}'", sect.LockAllAttributesExcept.AttributeList);
}
catch (Exception e)
{
Console.WriteLine ("Exception raised: {0}", e.GetType());
}
}
}
@@ -1,5 +0,0 @@
<configuration>
<appSettings lockAllAttributesExcept="unknown">
<add key="aloha" value="aloha" />
</appSettings>
</configuration>
@@ -1 +0,0 @@
Exception raised: System.Configuration.ConfigurationErrorsException
@@ -1,14 +1,3 @@
2005-12-19 Daniel Morgan <[email protected]>
* System.Data.OracleClient/OracleConnectionPoolManager.cs
* System.Data.OracleClient/OracleConnectionPool.cs
* System.Data.OracleClient/OracleConnection.cs: for connection pooling, need to
dispose of any connection pools properly otherwise a SEGSIGV may happen trying
to detach from the server during finalization at exit of app
* System.Data.OracleClient/OracleDataReader.cs: need to make sure statement and command
exists during dispose because they are set to null when closed
2005-12-13 Daniel Morgan <[email protected]>
* System.Data.OracleClient/OracleParameter.cs: free
@@ -74,7 +74,7 @@ namespace System.Data.OracleClient.Oci {
{
if (!disposed) {
try {
//Detach (errorHandle);
Detach (errorHandle);
disposed = true;
} finally {
base.Dispose (disposing);
@@ -462,11 +462,6 @@ namespace System.Data.OracleClient
}
}
~OracleConnection()
{
Dispose (false);
}
#endregion // Methods
public event OracleInfoMessageEventHandler InfoMessage;
@@ -96,23 +96,6 @@ namespace System.Data.OracleClient
activeConnections++;
return manager.CreateConnection (info);
}
~OracleConnectionPool ()
{
if (list != null) {
if (list.Count > 0) {
for (int c = 0; c < list.Count; c++) {
// There are available connections in the pool
OciGlue connection = (OciGlue)list [c];
list.RemoveAt (c);
if (connection.Connected) {
connection.Disconnect ();
connection = null;
}
}
}
}
}
}
}
@@ -57,10 +57,6 @@ namespace System.Data.OracleClient
oci.CreateConnection (info);
return oci;
}
~OracleConnectionPoolManager ()
{
}
}
}
@@ -105,14 +105,11 @@ namespace System.Data.OracleClient {
public void Close ()
{
if (!isClosed) {
GetRecordsAffected ();
if (command != null)
command.CloseDataReader ();
}
if (statement != null) {
statement.Dispose();
statement = null;
GetRecordsAffected();
command.CloseDataReader ();
}
statement.Dispose();
statement = null;
isClosed = true;
}
@@ -412,8 +409,7 @@ namespace System.Data.OracleClient {
else {
if (this.isClosed == false) {
if (recordsAffected == -1)
if (statement != null)
recordsAffected = statement.GetAttributeInt32 (OciAttributeType.RowCount, command.ErrorHandle);
recordsAffected = statement.GetAttributeInt32 (OciAttributeType.RowCount, command.ErrorHandle);
}
}
@@ -1,11 +1,3 @@
2005-12-12 Konstantin Triger <[email protected]>
* Key.cs: Added ContainsVersion function, refactoring.
* Index.cs: Fixed Reset() to be ready for Update() calls.
Otherwise the index can be rebuilt with new values inside the
Update() call itself.
Fixed FindIndexExact(), Update(), Delete().
2005-11-22 Konstantin Triger <[email protected]>
* DbProviderFactory.cs: TARGET_JVM ifdef.
@@ -162,7 +162,6 @@ namespace System.Data.Common
internal void Reset()
{
_array = null;
RebuildIndex();
}
private void RebuildIndex()
@@ -334,11 +333,8 @@ namespace System.Data.Common
*/
private int FindIndexExact(int record)
{
for (int i = 0, size = Size; i < size; i++)
if (Array[i] == record)
return i;
return -1;
int index = System.Array.BinarySearch(Array,record);
return (index > 0) ? index : -1;
}
/*
@@ -363,7 +359,7 @@ namespace System.Data.Common
if (oldRecord == -1)
return;
int index = FindIndexExact(oldRecord);
int index = FindIndex(oldRecord);
if (index != -1) {
if ((_hasDuplicates == IndexDuplicatesState.True)) {
int c1 = 1;
@@ -392,29 +388,18 @@ namespace System.Data.Common
_size--;
}
internal void Update(DataRow row,int newRecord)
{
int oldRecord = Key.GetRecord(row);
internal void Update(DataRow row,int oldRecord, DataRowVersion oldVersion, DataRowState oldState)
{
bool contains = Key.ContainsVersion (oldState, oldVersion);
int newRecord = Key.GetRecord(row);
// the record did not appeared in the index before update
if (oldRecord == -1 || Size == 0 || !contains) {
if (newRecord >= 0) {
if (FindIndexExact(newRecord) < 0)
Add(row,newRecord);
}
return;
}
// the record will not appeare in the index after update
if (newRecord < 0 || !Key.CanContain (newRecord)) {
Delete (oldRecord);
if (oldRecord == -1 || Size == 0) {
Add(row,newRecord);
return;
}
int oldIdx = FindIndexExact(oldRecord);
int oldIdx = FindIndex(oldRecord);
if( oldIdx == -1 ) {
if( oldIdx == -1 || Key.Table.RecordCache[Array[oldIdx]] != row ) {
Add(row,newRecord);
return;
}
@@ -492,15 +477,11 @@ namespace System.Data.Common
}
}
internal void Add(DataRow row) {
Add(row, Key.GetRecord(row));
}
private void Add(DataRow row,int newRecord)
{
int newIdx;
if (newRecord < 0 || !Key.CanContain (newRecord))
if (!Key.CanContain (newRecord))
return;
if (Size == 0) {
+19 -67
View File
@@ -163,77 +163,29 @@ namespace System.Data.Common
return _filter.EvalBoolean(_tmpRow);
}
internal bool ContainsVersion (DataRowState state, DataRowVersion version)
{
switch (state) {
case DataRowState.Unchanged: {
if ((_rowStateFilter & DataViewRowState.Unchanged) != DataViewRowState.None) {
return ((version & DataRowVersion.Default) != 0);
}
break;
}
case DataRowState.Added: {
if ((_rowStateFilter & DataViewRowState.Added) != DataViewRowState.None) {
return ((version & DataRowVersion.Default) != 0);
}
break;
}
case DataRowState.Deleted: {
if ((_rowStateFilter & DataViewRowState.Deleted) != DataViewRowState.None) {
return (version == DataRowVersion.Original);
}
break;
}
default:
if ((_rowStateFilter & DataViewRowState.ModifiedCurrent) != DataViewRowState.None) {
return ((version & DataRowVersion.Default) != 0);
}
else if ((_rowStateFilter & DataViewRowState.ModifiedOriginal) != DataViewRowState.None) {
return (version == DataRowVersion.Original);
}
break;
}
return false;
}
internal static int GetRecord(DataRow row, DataViewRowState rowStateFilter)
{
switch (row.RowState) {
case DataRowState.Unchanged: {
if ((rowStateFilter & DataViewRowState.Unchanged) != DataViewRowState.None) {
return row.Proposed >= 0 ? row.Proposed : row.Current;
}
break;
}
case DataRowState.Added: {
if ((rowStateFilter & DataViewRowState.Added) != DataViewRowState.None) {
return row.Proposed >= 0 ? row.Proposed : row.Current;
}
break;
}
case DataRowState.Deleted: {
if ((rowStateFilter & DataViewRowState.Deleted) != DataViewRowState.None) {
if (row.Original == row.Current) {
if ((rowStateFilter & DataViewRowState.Unchanged) != DataViewRowState.None) {
return row.Current;
}
}
else if (row.Original == -1) {
if ((rowStateFilter & DataViewRowState.Added) != DataViewRowState.None) {
return row.Current;
}
}
else if (row.Current == -1) {
if ((rowStateFilter & DataViewRowState.Deleted) != DataViewRowState.None) {
return row.Original;
}
break;
}
default:
if ((rowStateFilter & DataViewRowState.ModifiedCurrent) != DataViewRowState.None) {
return row.Proposed >= 0 ? row.Proposed : row.Current;
}
else if ((rowStateFilter & DataViewRowState.ModifiedOriginal) != DataViewRowState.None) {
return row.Original;
}
break;
}
}
else if ((rowStateFilter & DataViewRowState.ModifiedCurrent) != DataViewRowState.None) {
return row.Current;
}
else if ((rowStateFilter & DataViewRowState.ModifiedOriginal) != DataViewRowState.None) {
return row.Original;
}
return -1;
@@ -563,14 +563,21 @@ namespace System.Data.Common
switch (ProviderType) {
case PROVIDER_TYPE.SQLOLEDB :
if (String.Empty.Equals(port)) {
try {
port = DbPortResolver.getMSSqlPort(this).ToString();
}
catch (SQLException e) {
throw CreateException(e);
}
// if needed - resolve MSSQL port
// FIXME : decide about behaviour in the case all the timeout spent on port resolution
//long start = DateTime.Now.Ticks;
port = DbPortResolver.getMSSqlPort(DataSource,InstanceName,ConnectionTimeout).ToString();
//long end = DateTime.Now.Ticks;
//if( (end - start) < ConnectionTimeout*1000000) {
//timeout -= (int)(end - start)/1000000;
//}
}
// todo : what should we do if all the timeout spent on port resolution ?
if ("-1".Equals(port)) {
string message = String.Format ("Unable to retrieve the port number for {0} using UDP on port 1434. Please see your network administrator to solve this problem or add the port number of your SQL server instance to your connection string (i.e. port=1681).",ServerName);
Exception e = CreateException (message);
throw e;
}
ConnectionStringHelper.AddValue(UserParameters,StringManager.GetStringArray("CON_PORT"),port);
break;
}
@@ -602,7 +609,7 @@ namespace System.Data.Common
}
}
internal string InstanceName
protected virtual string InstanceName
{
get {
string dataSource = ConnectionStringHelper.FindValue(UserParameters,StringManager.GetStringArray("CON_DATA_SOURCE"));
@@ -1,8 +1,3 @@
2005-14-12 Konstantin Triger <[email protected]>
* DbPortResolver.cs, AbstractDBConnection.cs: differentiate between the situation where
don't have a response and where instance name does not exist.
2005-14-12 Konstantin Triger <[email protected]>
* DbPortResolver.cs: fix port resolution for unnamed instances.
@@ -36,12 +36,10 @@ using java.net;
namespace System.Data.Common
{
internal sealed class DbPortResolver
public class DbPortResolver
{
public static int getMSSqlPort(AbstractDBConnection connection)
public static int getMSSqlPort(String sqlName, String instanceName,int timeout)
{
String instanceName = connection.InstanceName;
int timeout = connection.ConnectionTimeout;
int port = -1;
try
{
@@ -49,7 +47,7 @@ namespace System.Data.Common
// send request
sbyte[] buf = new sbyte[] {2};
InetAddress address = InetAddress.getByName(connection.DataSource);
InetAddress address = InetAddress.getByName(sqlName);
DatagramPacket packet = new DatagramPacket(buf, buf.Length, address, 1434);
socket.send(packet);
sbyte[] recbuf = new sbyte[1024];
@@ -58,7 +56,8 @@ namespace System.Data.Common
// try to receive from socket while increasing timeouts in geometric progression
int iterationTimeout = 1;
int totalTimeout = 0;
for(;;) {
while (totalTimeout < timeout*1000)
{
socket.setSoTimeout(iterationTimeout);
try
{
@@ -69,11 +68,6 @@ namespace System.Data.Common
{
totalTimeout += iterationTimeout;
iterationTimeout *= 2;
if (totalTimeout >= timeout*1000) {
throw new java.sql.SQLException(
String.Format ("Unable to retrieve the port number for {0} using UDP on port 1434. Please see your network administrator to solve this problem or add the port number of your SQL server instance to your connection string (i.e. port=1433).", connection.DataSource)
);
}
}
}
sbyte[] rcvdSbytes = packet.getData();
@@ -110,19 +104,12 @@ namespace System.Data.Common
prev = st.nextToken();
}
socket.close();
if (!instanceReached)
throw new java.sql.SQLException(
String.Format ("Specified SQL Server '{0}\\{1}' not found.", connection.DataSource, instanceName)
);
return port;
}
catch (java.sql.SQLException) {
throw;
}
catch (Exception e) {
throw new java.sql.SQLException(e.Message);
catch (java.lang.Exception e)
{
return port;
}
}
@@ -1,7 +1,3 @@
2005-12-15 Konstantin Triger <[email protected]>
* SqlConnection.cs: save StringManager into AppDomain.
2005-16-11 Boris Kirzner <[email protected]>
* SqlConnection.cs: Added override for CreateException().
@@ -45,8 +45,7 @@ namespace System.Data.SqlClient
protected static Hashtable _skippedUserParameters = new Hashtable(new CaseInsensitiveHashCodeProvider(),new CaseInsensitiveComparer());
private static readonly object _lockObjectStringManager = new object();
//private static DbStringManager _stringManager = new DbStringManager("System.Data.System.Data.ProviderBase.jvm.SqlClientStrings");
private static DbStringManager _stringManager = new DbStringManager("System.Data.System.Data.ProviderBase.jvm.SqlClientStrings");
private static readonly string[] _resourceIgnoredKeys = new string[] {"CON_DATA_SOURCE","CON_DATABASE",
"CON_PASSWORD","CON_USER_ID","CON_TIMEOUT",
@@ -143,20 +142,7 @@ namespace System.Data.SqlClient
protected override DbStringManager StringManager
{
get {
const string stringManagerName = "System.Data.OleDbConnection.stringManager";
object stringManager = AppDomain.CurrentDomain.GetData(stringManagerName);
if (stringManager == null) {
lock(_lockObjectStringManager) {
stringManager = AppDomain.CurrentDomain.GetData(stringManagerName);
if (stringManager != null)
return (DbStringManager)stringManager;
stringManager = new DbStringManager("System.Data.System.Data.ProviderBase.jvm.SqlClientStrings");
AppDomain.CurrentDomain.SetData(stringManagerName, stringManager);
}
}
return (DbStringManager)stringManager;
}
get { return _stringManager; }
}
#endregion // Properties
@@ -1,12 +1,3 @@
2005-12-12 Konstantin Triger <[email protected]>
* DataRow.cs: Added index Updates.
EndEdit() fixed to first update indices and then AssertConstraints
based on those indices.
Added Validate() and AssertConstraints() functions.
* DataRowCollection.cs: Removed ValidateDataRowInternal().
* DataTable: Fixed Clear().
2005-12-06 Atsushi Enomoto <[email protected]>
* CustomDataClassGenerator.cs : (InitializeFields) handle AllowDBNull
+46 -81
View File
@@ -592,17 +592,12 @@ namespace System.Data {
return;
case DataRowState.Added:
case DataRowState.Modified:
int original = Original;
DataRowState oldState = RowState;
if (Original >= 0) {
Table.RecordCache.DisposeRecord(Original);
}
Original = Current;
foreach (Index index in Table.Indexes)
index.Update(this, original, DataRowVersion.Original, oldState);
break;
case DataRowState.Deleted:
Table.DeleteRowFromIndexes(this);
_table.Rows.RemoveInternal (this);
DetachRow();
break;
@@ -643,13 +638,12 @@ namespace System.Data {
}
if (HasVersion (DataRowVersion.Proposed)) {
int oldRecord = Proposed;
DataRowState oldState = RowState;
Table.RecordCache.DisposeRecord(Proposed);
Proposed = -1;
int newVersion = (HasVersion (DataRowVersion.Current)) ? Current : Original;
foreach(Index index in Table.Indexes)
index.Update(this,oldRecord, DataRowVersion.Proposed, oldState);
index.Update(this,newVersion);
}
}
@@ -685,17 +679,14 @@ namespace System.Data {
default:
// check what to do with child rows
CheckChildRows(DataRowAction.Delete);
_table.DeleteRowFromIndexes (this);
break;
}
if (Current >= 0) {
int current = Current;
DataRowState oldState = RowState;
if (Current != Original) {
_table.RecordCache.DisposeRecord(Current);
}
Current = -1;
foreach(Index index in Table.Indexes)
index.Update(this, current, DataRowVersion.Current, oldState);
}
_table.DeletedDataRow(this, DataRowAction.Delete);
}
@@ -852,46 +843,38 @@ namespace System.Data {
_inChangingEvent = false;
}
DataRowState oldState = RowState;
//Calling next method validates UniqueConstraints
//and ForeignKeys.
bool rowValidated = false;
try
{
if ((_table.DataSet == null || _table.DataSet.EnforceConstraints) && !_table._duringDataLoad) {
_table.Rows.ValidateDataRowInternal(this);
rowValidated = true;
}
}
catch (Exception e)
{
Table.RecordCache.DisposeRecord(Proposed);
Proposed = -1;
throw e;
}
CheckChildRows(DataRowAction.Change);
if (Original != Current) {
Table.RecordCache.DisposeRecord(Current);
}
int oldRecord = Current;
Current = Proposed;
Proposed = -1;
if (!Table._duringDataLoad) {
if (!rowValidated) {
// keep indexes updated even if there was no need to validate row
foreach(Index index in Table.Indexes) {
index.Update(this,oldRecord, DataRowVersion.Current, oldState);
index.Update(this,Current); //FIXME: why Current ?!
}
}
try {
AssertConstraints();
// restore previous state to let the cascade update to find the rows
Proposed = Current;
Current = oldRecord;
CheckChildRows(DataRowAction.Change);
// apply new state
Current = Proposed;
Proposed = -1;
}
catch {
int proposed = Proposed >= 0 ? Proposed : Current;
Current = oldRecord;
if (!Table._duringDataLoad) {
foreach(Index index in Table.Indexes) {
index.Update(this,proposed, DataRowVersion.Current, RowState);
}
}
throw;
}
if (Original != oldRecord) {
Table.RecordCache.DisposeRecord(oldRecord);
}
// Note : row state must not be changed before all the job on indexes finished,
// since the indexes works with recods rather than with rows and the decision
// which of row records to choose depends on row state.
@@ -1321,7 +1304,10 @@ namespace System.Data {
CheckChildRows(DataRowAction.Rollback);
if (Current != Original) {
Table.DeleteRowFromIndexes(this);
foreach(Index index in Table.Indexes) {
index.Delete (this);
index.Update(this,Original);
}
Current = Original;
}
@@ -1334,9 +1320,12 @@ namespace System.Data {
_table.Rows.RemoveInternal (this);
break;
case DataRowState.Modified:
if ((_table.DataSet == null || _table.DataSet.EnforceConstraints) && !_table._duringDataLoad)
_table.Rows.ValidateDataRowInternal(this);
break;
case DataRowState.Deleted:
Table.AddRowToIndexes(this);
AssertConstraints();
if ((_table.DataSet == null || _table.DataSet.EnforceConstraints) && !_table._duringDataLoad)
_table.Rows.ValidateDataRowInternal(this);
break;
}
@@ -1635,35 +1624,6 @@ namespace System.Data {
}
}
internal void Validate() {
Table.AddRowToIndexes(this);
AssertConstraints();
}
void AssertConstraints() {
if (Table == null || Table._duringDataLoad)
return;
if (Table.DataSet != null && !Table.DataSet.EnforceConstraints)
return;
foreach(DataColumn column in Table.Columns) {
if (!column.AllowDBNull && IsNull(column)) {
throw new NoNullAllowedException(_nullConstraintMessage);
}
}
foreach(Constraint constraint in Table.Constraints) {
try {
constraint.AssertConstraint(this);
}
catch(Exception e) {
Table.DeleteRowFromIndexes(this);
throw e;
}
}
}
internal void CheckNullConstraints()
{
if (_nullConstraintViolation) {
@@ -1705,15 +1665,17 @@ namespace System.Data {
&& RowState == DataRowState.Unchanged)) {
Table.ChangingDataRow (this, DataRowAction.ChangeCurrentAndOriginal);
temp = Table.CreateRecord (values);
Table.DeleteRowFromIndexes(this);
if (HasVersion (DataRowVersion.Original) && Current != Original)
Table.RecordCache.DisposeRecord (Original);
Original = temp;
// update the pk index
index = Table.GetIndex(Table.PrimaryKey,null,DataViewRowState.None,null,false);
if (index != null)
index.Update (this, temp);
if (HasVersion (DataRowVersion.Current))
Table.RecordCache.DisposeRecord (Current);
Current = temp;
Table.AddRowToIndexes(this);
Table.ChangedDataRow (this, DataRowAction.ChangeCurrentAndOriginal);
return;
}
@@ -1735,16 +1697,19 @@ namespace System.Data {
if (RowState == DataRowState.Added
|| Table.CompareRecords (rindex, temp) != 0) {
Table.ChangingDataRow (this, DataRowAction.Change);
Table.DeleteRowFromIndexes(this);
if (HasVersion (DataRowVersion.Proposed)) {
Table.RecordCache.DisposeRecord (Proposed);
Proposed = -1;
}
// update the pk index
index = Table.GetIndex(Table.PrimaryKey,null,DataViewRowState.None,null,false);
if (index != null)
index.Update (this, temp);
if (Original != Current)
Table.RecordCache.DisposeRecord (Current);
Current = temp;
Table.AddRowToIndexes(this);
Table.ChangedDataRow (this, DataRowAction.Change);
} else {
Table.ChangingDataRow (this, DataRowAction.Nothing);
@@ -95,7 +95,9 @@ namespace System.Data
row.BeginEdit();
row.Validate();
if (!table._duringDataLoad)
// we have to check that the new row doesn't colide with existing row
ValidateDataRowInternal(row);
AddInternal(row);
}
@@ -122,8 +124,9 @@ namespace System.Data
DataRow row = table.NewNotInitializedRow();
int newRecord = table.CreateRecord(values);
row.ImportRecord(newRecord);
row.Validate();
if ((table.DataSet == null || table.DataSet.EnforceConstraints) && !table._duringDataLoad)
// we have to check that the new row doesn't colide with existing row
ValidateDataRowInternal(row);
AddInternal (row);
return row;
}
@@ -274,7 +277,9 @@ namespace System.Data
if (row.RowID != -1)
throw new ArgumentException ("This row already belongs to this table.");
row.Validate();
if ((table.DataSet == null || table.DataSet.EnforceConstraints) && !table._duringDataLoad)
// we have to check that the new row doesn't colide with existing row
ValidateDataRowInternal(row);
row.Table.ChangingDataRow (row, DataRowAction.Add);
@@ -335,5 +340,41 @@ namespace System.Data
{
Remove(this[index]);
}
///<summary>
///Internal method used to validate a given DataRow with respect
///to the DataRowCollection
///</summary>
[MonoTODO]
internal void ValidateDataRowInternal(DataRow row)
{
int newRecord = (row.Proposed >= 0) ? row.Proposed : row.Current;
if (newRecord < 0)
return;
foreach(Index index in table.Indexes) {
index.Update(row,newRecord);
}
if (!(table.DataSet == null || table.DataSet.EnforceConstraints))
return;
//first check for null violations.
row._nullConstraintViolation = true;
row.CheckNullConstraints();
foreach(Constraint constraint in table.Constraints) {
try {
constraint.AssertConstraint(row);
}
catch(Exception e) {
// remove row from indexes
foreach(Index index in table.Indexes) {
index.Delete(newRecord);
}
throw e;
}
}
}
}
}
+11 -14
View File
@@ -713,8 +713,6 @@ namespace System.Data {
public void Clear () {
// Foriegn key constraints are checked in _rows.Clear method
_rows.Clear ();
foreach(Index index in Indexes)
index.Reset();
#if NET_2_0
OnTableCleared (new DataTableClearEventArgs (this));
#endif // NET_2_0
@@ -1020,7 +1018,9 @@ namespace System.Data {
}
}
newRow.Validate();
if (EnforceConstraints)
// we have to check that the new row doesn't colide with existing row
Rows.ValidateDataRowInternal(newRow);
Rows.AddInternal(newRow);
@@ -1175,8 +1175,11 @@ namespace System.Data {
row.AcceptChanges();
}
if (shouldUpdateIndex && !fAcceptChanges) {
AddRowToIndexes(row);
if (shouldUpdateIndex || !fAcceptChanges) {
// AcceptChanges not always updates indexes because it calls EndEdit
foreach(Index index in Indexes) {
index.Update(row,tmpRecord);
}
}
}
@@ -1219,7 +1222,9 @@ namespace System.Data {
row = NewNotInitializedRow ();
row.ImportRecord (CreateRecord(values));
row.Validate(); // this adds to index ;-)
if (EnforceConstraints)
// we have to check that the new row doesn't colide with existing row
Rows.ValidateDataRowInternal(row); // this adds to index ;-)
if (loadOption == LoadOption.OverwriteChanges ||
loadOption == LoadOption.PreserveChanges) {
@@ -1583,14 +1588,6 @@ namespace System.Data {
}
}
internal void AddRowToIndexes (DataRow row) {
if (_indexes != null) {
foreach (Index indx in _indexes) {
indx.Add (row);
}
}
}
internal void DeleteRowFromIndexes (DataRow row)
{
if (_indexes != null) {
@@ -1,7 +1,3 @@
2005-12-15 Konstantin Triger <[email protected]>
* DataTableTest.cs: added SelectRowState test.
2005-12-07 Boris Kirzner <[email protected]>
* DataTableTest.cs: added ifdef for feature not supported in TARGET_JVM.
@@ -720,19 +720,6 @@ namespace MonoTests.System.Data
}
[Test]
public void SelectRowState()
{
DataTable d = new DataTable();
d.Columns.Add (new DataColumn ("aaa"));
DataRow [] rows = d.Select (null, null, DataViewRowState.Deleted);
AssertEquals(0, rows.Length);
d.Rows.Add (new object [] {"bbb"});
d.Rows.Add (new object [] {"bbb"});
rows = d.Select (null, null, DataViewRowState.Deleted);
AssertEquals(0, rows.Length);
}
[Test]
public void ToStringTest()
{
@@ -39,7 +39,6 @@ namespace System.Drawing.Drawing2D
/// <summary>
/// Summary description for AdjustableArrowCap.
/// </summary>
[MonoTODO]
public sealed class AdjustableArrowCap : CustomLineCap
{
// Constructors
@@ -48,14 +47,13 @@ namespace System.Drawing.Drawing2D
{
}
[MonoTODO]
public AdjustableArrowCap (float width, float height, bool isFilled)
{
throw new NotImplementedException();
}
// Public Properities
[MonoTODO]
public bool Filled {
get {
throw new NotImplementedException();
@@ -66,7 +64,6 @@ namespace System.Drawing.Drawing2D
}
}
[MonoTODO]
public float Width {
get {
throw new NotImplementedException();
@@ -77,7 +74,6 @@ namespace System.Drawing.Drawing2D
}
}
[MonoTODO]
public float Height {
get {
throw new NotImplementedException();
@@ -88,7 +84,6 @@ namespace System.Drawing.Drawing2D
}
}
[MonoTODO]
public float MiddleInset {
get {
throw new NotImplementedException();
@@ -40,7 +40,6 @@ namespace System.Drawing.Drawing2D
/// <summary>
/// Summary description for CustomLineCap.
/// </summary>
[MonoTODO]
public class CustomLineCap : MarshalByRefObject, ICloneable
{
private bool disposed;
@@ -57,13 +56,11 @@ namespace System.Drawing.Drawing2D
{
}
[MonoTODO]
public CustomLineCap(GraphicsPath fillPath, GraphicsPath strokePath, LineCap baseCap, float baseInset)
{
throw new NotImplementedException();
}
[MonoTODO]
public LineCap BaseCap {
get {
throw new NotImplementedException();
@@ -74,7 +71,6 @@ namespace System.Drawing.Drawing2D
}
}
[MonoTODO]
public LineJoin StrokeJoin {
get {
throw new NotImplementedException();
@@ -85,7 +81,6 @@ namespace System.Drawing.Drawing2D
}
}
[MonoTODO]
public float BaseInset {
get {
throw new NotImplementedException();
@@ -96,7 +91,6 @@ namespace System.Drawing.Drawing2D
}
}
[MonoTODO]
public float WidthScale {
get {
throw new NotImplementedException();
@@ -108,19 +102,18 @@ namespace System.Drawing.Drawing2D
}
// Public Methods
[MonoTODO]
public virtual object Clone ()
{
throw new NotImplementedException();
}
[MonoTODO]
public void GetStrokeCaps (out LineCap startCap, out LineCap endCap)
{
throw new NotImplementedException();
}
[MonoTODO]
public void SetStrokeCaps(LineCap startCap, LineCap endCap)
{
throw new NotImplementedException();
@@ -37,7 +37,6 @@ namespace System.Drawing.Drawing2D
/// <summary>
/// Summary description for GraphicsState.
/// </summary>
[MonoTODO]
public sealed class GraphicsState : MarshalByRefObject
{
readonly CompositingMode _compositingMode;
@@ -6,7 +6,6 @@ namespace System.Drawing.Drawing2D
/// <summary>
/// Summary description for HatchBrush.
/// </summary>
[MonoTODO]
public sealed class HatchBrush : Brush
{
private HatchStyle _style;
@@ -175,7 +175,6 @@ namespace System.Drawing.Drawing2D {
#region Public Properties
// FALLBACK: no functionality implemented for this property
[MonoTODO]
public Blend Blend {
get {
return _blend;
@@ -186,7 +185,6 @@ namespace System.Drawing.Drawing2D {
}
// FALLBACK: no functionality implemented for this property
[MonoTODO]
public bool GammaCorrection {
get {
return _gammaCorrection;
@@ -197,7 +195,6 @@ namespace System.Drawing.Drawing2D {
}
// FALLBACK: functionality of two color gradient is implemented
[MonoTODO]
public ColorBlend InterpolationColors {
get {
return _interpolationColors;
@@ -246,7 +243,6 @@ namespace System.Drawing.Drawing2D {
}
// FALLBACK: not functionality implemented for this property
[MonoTODO]
public WrapMode WrapMode {
get {
return _wrapmode;
@@ -302,7 +298,6 @@ namespace System.Drawing.Drawing2D {
SetSigmaBellShape (focus, 1.0F);
}
[MonoTODO]
public void SetSigmaBellShape (float focus, float scale) {
// FALLBACK: Triangle shape used
SetBlendTriangularShape (focus, scale);
@@ -9,7 +9,6 @@ namespace System.Drawing.Drawing2D {
/// <summary>
/// Summary description for PathGradientBrush.
/// </summary>
[MonoTODO]
public sealed class PathGradientBrush : Brush {
Brush _nativeObject;
Blend _blend;
@@ -122,7 +121,6 @@ namespace System.Drawing.Drawing2D {
#region Properties
[MonoTODO]
public Blend Blend {
get {
return _blend;
@@ -249,7 +247,6 @@ namespace System.Drawing.Drawing2D {
SetSigmaBellShape (focus, 1.0F);
}
[MonoTODO]
public void SetSigmaBellShape (float focus, float scale) {
// FALLBACK: Triangle shape used
SetBlendTriangularShape (focus, scale);
@@ -38,7 +38,6 @@ using System.Runtime.InteropServices;
namespace System.Drawing.Imaging {
[MonoTODO]
public sealed class EncoderParameter : IDisposable {
private Encoder encoder;
@@ -49,97 +48,82 @@ namespace System.Drawing.Imaging {
{
}
[MonoTODO]
public EncoderParameter (Encoder encoder, byte value)
{
throw new NotImplementedException();
}
[MonoTODO]
public EncoderParameter (Encoder encoder, byte[] value)
{
throw new NotImplementedException();
}
[MonoTODO]
public EncoderParameter (Encoder encoder, short value)
{
throw new NotImplementedException();
}
[MonoTODO]
public EncoderParameter (Encoder encoder, short[] value)
{
throw new NotImplementedException();
}
[MonoTODO]
public EncoderParameter (Encoder encoder, long value)
{
throw new NotImplementedException();
}
[MonoTODO]
public EncoderParameter (Encoder encoder, long[] value)
{
throw new NotImplementedException();
}
[MonoTODO]
public EncoderParameter (Encoder encoder, string value)
{
throw new NotImplementedException();
}
[MonoTODO]
public EncoderParameter (Encoder encoder, byte value, bool undefined)
{
throw new NotImplementedException();
}
[MonoTODO]
public EncoderParameter (Encoder encoder, byte[] value, bool undefined)
{
throw new NotImplementedException();
}
[MonoTODO]
public EncoderParameter (Encoder encoder, int numerator, int denominator)
{
throw new NotImplementedException();
}
[MonoTODO]
public EncoderParameter (Encoder encoder, int[] numerator, int[] denominator)
{
throw new NotImplementedException();
}
[MonoTODO]
public EncoderParameter (Encoder encoder, long rangebegin, long rangeend)
{
throw new NotImplementedException();
}
[MonoTODO]
public EncoderParameter (Encoder encoder, long[] rangebegin, long[] rangeend)
{
throw new NotImplementedException();
}
[MonoTODO]
public EncoderParameter (Encoder encoder, int numberOfValues, int type, int value)
{
throw new NotImplementedException();
}
[MonoTODO]
public EncoderParameter (Encoder encoder, int numerator1, int denominator1, int numerator2, int denominator2)
{
throw new NotImplementedException();
}
[MonoTODO]
public EncoderParameter (Encoder encoder, int[] numerator1, int[] denominator1, int[] numerator2, int[] denominator2)
{
throw new NotImplementedException();
@@ -17,7 +17,6 @@ namespace Mainsoft.Drawing.Imaging {
/// <summary>
/// Summary description for ImageCodec.
/// </summary>
[MonoTODO]
public class ImageCodec : IDisposable {
#region Members
@@ -378,8 +377,7 @@ namespace Mainsoft.Drawing.Imaging {
#endregion
#region Image read/write methods
[MonoTODO]
public PlainImage ReadPlainImage() {
awt.Image img = ReadImage( _currentFrame );
if (img == null)
@@ -42,244 +42,203 @@ namespace System.Drawing.Imaging {
#if SYSTEM_DRAWING_DESIGN_SUPPORT
[Editor ("System.Drawing.Design.MetafileEditor, " + Consts.AssemblySystem_Drawing_Design, typeof (System.Drawing.Design.UITypeEditor))]
#endif
[MonoTODO]
public sealed class Metafile : Image {
// constructors
[MonoTODO]
public Metafile (Stream stream)
{
throw new NotImplementedException ();
}
[MonoTODO]
public Metafile (string filename)
{
throw new NotImplementedException ();
}
#if INTPTR_SUPPORT
[MonoTODO]
public Metafile (IntPtr henhmetafile, bool deleteEmf)
{
throw new NotImplementedException ();
}
[MonoTODO]
public Metafile (IntPtr referenceHtc, EmfType emfType)
{
throw new NotImplementedException ();
}
[MonoTODO]
public Metafile (IntPtr referenceHtc, Rectangle frameRect)
{
throw new NotImplementedException ();
}
[MonoTODO]
public Metafile (IntPtr referenceHtc, RectangleF frameRect)
{
throw new NotImplementedException ();
}
[MonoTODO]
public Metafile (IntPtr hmetafile, WmfPlaceableFileHeader wmfHeader)
{
throw new NotImplementedException ();
}
[MonoTODO]
public Metafile (Stream stream, IntPtr referenceHtc)
{
throw new NotImplementedException ();
}
[MonoTODO]
public Metafile (String fileName, IntPtr referenceHtc)
{
throw new NotImplementedException ();
}
[MonoTODO]
public Metafile (IntPtr referenceHdc, EmfType emfType, string description)
{
throw new NotImplementedException ();
}
[MonoTODO]
public Metafile (IntPtr referenceHdc, Rectangle frameRect, MetafileFrameUnit frameUnit)
{
throw new NotImplementedException ();
}
[MonoTODO]
public Metafile (IntPtr referenceHdc, RectangleF frameRect, MetafileFrameUnit frameUnit)
{
throw new NotImplementedException ();
}
[MonoTODO]
public Metafile (IntPtr hmetafile, WmfPlaceableFileHeader wmfHeader, bool deleteWmf)
{
throw new NotImplementedException ();
}
[MonoTODO]
public Metafile (Stream stream, IntPtr referenceHdc, EmfType type)
{
throw new NotImplementedException ();
}
[MonoTODO]
public Metafile (Stream stream, IntPtr referenceHdc, Rectangle frameRect)
{
throw new NotImplementedException ();
}
[MonoTODO]
public Metafile (Stream stream, IntPtr referenceHdc, RectangleF frameRect)
{
throw new NotImplementedException ();
}
[MonoTODO]
public Metafile (string fileName, IntPtr referenceHdc, EmfType type)
{
throw new NotImplementedException ();
}
[MonoTODO]
public Metafile (string fileName, IntPtr referenceHdc, Rectangle frameRect)
{
throw new NotImplementedException ();
}
[MonoTODO]
public Metafile (string fileName, IntPtr referenceHdc, RectangleF frameRect)
{
throw new NotImplementedException ();
}
[MonoTODO]
public Metafile (IntPtr referenceHdc, Rectangle frameRect, MetafileFrameUnit frameUnit, EmfType type)
{
throw new NotImplementedException ();
}
[MonoTODO]
public Metafile (IntPtr referenceHdc, RectangleF frameRect, MetafileFrameUnit frameUnit, EmfType type)
{
throw new NotImplementedException ();
}
[MonoTODO]
public Metafile (Stream stream, IntPtr referenceHtc, EmfType type, string description)
{
throw new NotImplementedException ();
}
[MonoTODO]
public Metafile (Stream stream, IntPtr referenceHdc, Rectangle frameRect, MetafileFrameUnit frameUnit)
{
throw new NotImplementedException ();
}
[MonoTODO]
public Metafile (Stream stream, IntPtr referenceHdc, RectangleF frameRect, MetafileFrameUnit frameUnit)
{
throw new NotImplementedException ();
}
[MonoTODO]
public Metafile (string fileName, IntPtr referenceHdc, EmfType type, string description)
{
throw new NotImplementedException ();
}
[MonoTODO]
public Metafile (string fileName, IntPtr referenceHdc, Rectangle frameRect, MetafileFrameUnit frameUnit)
{
throw new NotImplementedException ();
}
[MonoTODO]
public Metafile (string fileName, IntPtr referenceHdc, RectangleF frameRect, MetafileFrameUnit frameUnit)
{
throw new NotImplementedException ();
}
[MonoTODO]
public Metafile (IntPtr referenceHdc, Rectangle frameRect, MetafileFrameUnit frameUnit, EmfType type, string description)
{
throw new NotImplementedException ();
}
[MonoTODO]
public Metafile (IntPtr referenceHdc, RectangleF frameRect, MetafileFrameUnit frameUnit, EmfType type, string description)
{
throw new NotImplementedException ();
}
[MonoTODO]
public Metafile (Stream stream, IntPtr referenceHdc, Rectangle frameRect, MetafileFrameUnit frameUnit, EmfType type)
{
throw new NotImplementedException ();
}
[MonoTODO]
public Metafile (Stream stream, IntPtr referenceHdc, RectangleF frameRect, MetafileFrameUnit frameUnit, EmfType type)
{
throw new NotImplementedException ();
}
[MonoTODO]
public Metafile (string fileName, IntPtr referenceHdc, Rectangle frameRect, MetafileFrameUnit frameUnit, EmfType type)
{
throw new NotImplementedException ();
}
[MonoTODO]
public Metafile (string fileName, IntPtr referenceHdc, Rectangle frameRect, MetafileFrameUnit frameUnit, string description)
{
throw new NotImplementedException ();
}
[MonoTODO]
public Metafile (string fileName, IntPtr referenceHdc, RectangleF frameRect, MetafileFrameUnit frameUnit, EmfType type)
{
throw new NotImplementedException ();
}
[MonoTODO]
public Metafile (string fileName, IntPtr referenceHdc, RectangleF frameRect, MetafileFrameUnit frameUnit, string description)
{
throw new NotImplementedException ();
}
[MonoTODO]
public Metafile (Stream stream, IntPtr referenceHdc, Rectangle frameRect, MetafileFrameUnit frameUnit, EmfType type,
string description)
{
throw new NotImplementedException ();
}
[MonoTODO]
public Metafile (Stream stream, IntPtr referenceHdc, RectangleF frameRect, MetafileFrameUnit frameUnit, EmfType type,
string description)
{
throw new NotImplementedException ();
}
[MonoTODO]
public Metafile (string fileName, IntPtr referenceHdc, Rectangle frameRect, MetafileFrameUnit frameUnit, EmfType type,
string description)
{
throw new NotImplementedException ();
}
[MonoTODO]
public Metafile (string fileName, IntPtr referenceHdc, RectangleF frameRect, MetafileFrameUnit frameUnit, EmfType type,
string description)
{
@@ -287,75 +246,64 @@ namespace System.Drawing.Imaging {
}
// methods
[MonoTODO]
public IntPtr GetHenhmetafile()
{
throw new NotImplementedException ();
}
#endif
[MonoTODO]
public MetafileHeader GetMetafileHeader()
{
throw new NotFiniteNumberException();
}
#if INTPTR_SUPPORT
[MonoTODO]
public static MetafileHeader GetMetafileHeader(IntPtr henhmetafile)
{
throw new NotImplementedException ();
}
#endif
[MonoTODO]
public static MetafileHeader GetMetafileHeader(Stream stream)
{
throw new NotImplementedException ();
}
[MonoTODO]
public static MetafileHeader GetMetafileHeader(string fileName)
{
throw new NotImplementedException ();
}
#if INTPTR_SUPPORT
[MonoTODO]
public static MetafileHeader GetMetafileHeader(IntPtr henhmetafile, WmfPlaceableFileHeader wmfHeader)
{
throw new NotImplementedException ();
}
#endif
[MonoTODO]
public void PlayRecord(EmfPlusRecordType recordType, int flags, int dataSize, byte[] datawmfHeader)
{
throw new NotImplementedException ();
}
// properties
[MonoTODO]
protected override void InternalSave (javax.imageio.stream.ImageOutputStream output, Guid clsid) {
throw new NotImplementedException ();
}
[MonoTODO]
protected override PixelFormat InternalPixelFormat {
get {
throw new NotImplementedException ();
}
}
[MonoTODO]
protected override java.awt.Image[] CloneNativeObjects(java.awt.Image[] src) {
throw new NotImplementedException ();
}
protected override void InternalSave (javax.imageio.stream.ImageOutputStream output, Guid clsid) {
throw new NotImplementedException ();
}
protected override PixelFormat InternalPixelFormat {
get {
throw new NotImplementedException ();
}
}
protected override java.awt.Image[] CloneNativeObjects(java.awt.Image[] src) {
throw new NotImplementedException ();
}
#region Clone
[MonoTODO]
public override object Clone() {
throw new NotImplementedException ();
}
#endregion
#endregion
}
@@ -34,10 +34,7 @@ using System.Runtime.InteropServices;
namespace System.Drawing.Imaging {
[MonoTODO]
#if !TARGET_JVM
[StructLayout(LayoutKind.Sequential)]
#endif
public sealed class MetafileHeader
{
@@ -29,7 +29,6 @@ namespace System.Drawing
base.Initialize( orig, false );
}
[MonoTODO]
private Bitmap (SerializationInfo info, StreamingContext context) {
throw new NotImplementedException ();
}
@@ -52,7 +51,6 @@ namespace System.Drawing
internal Bitmap (java.awt.Image nativeObject, ImageFormat format)
:base (nativeObject, format) {}
[MonoTODO]
private Bitmap (java.awt.Image nativeObject, ImageFormat format, PixelFormat pixFormat)
:this (nativeObject, format) {
if (pixFormat != this.PixelFormat)
@@ -105,7 +103,6 @@ namespace System.Drawing
}
}
#if INTPTR_SUPPORT
[MonoTODO]
public Bitmap (int width, int height, int stride, PixelFormat format, IntPtr scan0)
{
throw new NotImplementedException();
@@ -268,7 +265,7 @@ namespace System.Drawing
#endregion
#region LockBits
[MonoTODO]
// TBD: implement this
public BitmapData LockBits (Rectangle rect, ImageLockMode flags, PixelFormat format) {
throw new NotImplementedException();
}
@@ -315,7 +312,7 @@ namespace System.Drawing
#endregion
#region UnlockBits
[MonoTODO]
// TBD: implement this
public void UnlockBits (BitmapData bitmap_data)
{
throw new NotImplementedException();
@@ -383,31 +380,26 @@ namespace System.Drawing
#endregion
#if INTPTR_SUPPORT
[MonoTODO]
public static Bitmap FromHicon (IntPtr hicon)
{
throw new NotImplementedException();
}
[MonoTODO]
public static Bitmap FromResource (IntPtr hinstance, string bitmapName) //TBD: Untested
{
throw new NotImplementedException();
}
[MonoTODO]
public IntPtr GetHbitmap ()
{
throw new NotImplementedException();
}
[MonoTODO]
public IntPtr GetHbitmap (Color background)
{
throw new NotImplementedException();
}
[MonoTODO]
public IntPtr GetHicon ()
{
throw new NotImplementedException();
@@ -69,7 +69,6 @@ namespace System.Drawing {
: this(family, emSize, style, unit, charSet, false) {
}
[MonoTODO]
public Font(FontFamily family, float emSize, FontStyle style, GraphicsUnit unit, byte charSet, bool isVertical) {
if (family == null)
throw new ArgumentNullException("family");
@@ -133,7 +132,6 @@ namespace System.Drawing {
#endregion
#if INTPTR_SUPPORT
[MonoTODO]
public IntPtr ToHfont ()
{
throw new NotImplementedException();
@@ -217,7 +217,6 @@ namespace System.Drawing {
#region IDisposable Members
[MonoTODO]
public void Dispose() {
// TODO: Add FontFamily.Dispose implementation
}
@@ -15,7 +15,6 @@ namespace System.Drawing {
sealed class DummyStroke : awt.Stroke {
#region Stroke Members
[MonoTODO]
awt.Shape awt.Stroke.createStrokedShape(awt.Shape arg_0) {
throw new NotImplementedException("DummyStroke");
}
@@ -830,7 +829,7 @@ namespace System.Drawing {
DrawImage(image, destPoints, srcRect, srcUnit, null);
}
[MonoTODO]
public void DrawImage (Image image, Point [] destPoints, Rectangle srcRect, GraphicsUnit srcUnit, ImageAttributes imageAttr) {
//TBD: ImageAttributes
if (srcUnit != GraphicsUnit.Pixel)
@@ -843,7 +842,6 @@ namespace System.Drawing {
DrawImage(image, mx, region);
}
[MonoTODO]
public void DrawImage (Image image, PointF [] destPoints, RectangleF srcRect, GraphicsUnit srcUnit, ImageAttributes imageAttr) {
//TBD: ImageAttributes
if (srcUnit != GraphicsUnit.Pixel)
@@ -888,7 +886,6 @@ namespace System.Drawing {
}
[MonoTODO]
public void DrawImage (Image image, Rectangle destRect, int srcX, int srcY, int srcWidth, int srcHeight, GraphicsUnit srcUnit, ImageAttributes imageAttr) {
//TBD: attributes
DrawImage(
@@ -898,7 +895,6 @@ namespace System.Drawing {
srcUnit);
}
[MonoTODO]
public void DrawImage (Image image, Rectangle destRect, float srcX, float srcY, float srcWidth, float srcHeight, GraphicsUnit srcUnit, ImageAttributes imageAttrs) {
//TBD: attributes
DrawImage(
@@ -979,20 +975,19 @@ namespace System.Drawing {
#if INTPTR_SUPPORT
[MonoTODO]
public void DrawImage (Image image, PointF [] destPoints, RectangleF srcRect, GraphicsUnit srcUnit, ImageAttributes imageAttr, DrawImageAbort callback)
{
throw new NotImplementedException();
}
[MonoTODO]
public void DrawImage (Image image, Point [] destPoints, Rectangle srcRect, GraphicsUnit srcUnit, ImageAttributes imageAttr, DrawImageAbort callback)
{
throw new NotImplementedException();
}
[MonoTODO]
public void DrawImage (Image image, Point [] destPoints, Rectangle srcRect, GraphicsUnit srcUnit, ImageAttributes imageAttr, DrawImageAbort callback, int callbackData)
{
throw new NotImplementedException();
@@ -1000,7 +995,6 @@ namespace System.Drawing {
#endif
#if INTPTR_SUPPORT
[MonoTODO]
public void DrawImage (Image image, PointF [] destPoints, RectangleF srcRect, GraphicsUnit srcUnit, ImageAttributes imageAttr, DrawImageAbort callback, int callbackData)
{
throw new NotImplementedException();
@@ -1361,224 +1355,187 @@ namespace System.Drawing {
#endregion
#region Metafiles Staff
[MonoTODO]
#region Metafiles Staff [TODO NotSupp]
public void AddMetafileComment (byte [] data) {
throw new NotImplementedException ();
}
#if INTPTR_SUPPORT
[MonoTODO]
public void EnumerateMetafile (Metafile metafile, Point [] destPoints, EnumerateMetafileProc callback)
{
throw new NotImplementedException ();
}
[MonoTODO]
public void EnumerateMetafile (Metafile metafile, RectangleF destRect, EnumerateMetafileProc callback)
{
throw new NotImplementedException ();
}
[MonoTODO]
public void EnumerateMetafile (Metafile metafile, PointF [] destPoints, EnumerateMetafileProc callback)
{
throw new NotImplementedException ();
}
[MonoTODO]
public void EnumerateMetafile (Metafile metafile, Rectangle destRect, EnumerateMetafileProc callback)
{
throw new NotImplementedException ();
}
[MonoTODO]
public void EnumerateMetafile (Metafile metafile, Point destPoint, EnumerateMetafileProc callback)
{
throw new NotImplementedException ();
}
[MonoTODO]
public void EnumerateMetafile (Metafile metafile, PointF destPoint, EnumerateMetafileProc callback)
{
throw new NotImplementedException ();
}
[MonoTODO]
public void EnumerateMetafile (Metafile metafile, PointF destPoint, EnumerateMetafileProc callback, IntPtr callbackData)
{
throw new NotImplementedException ();
}
[MonoTODO]
public void EnumerateMetafile (Metafile metafile, Rectangle destRect, EnumerateMetafileProc callback, IntPtr callbackData)
{
throw new NotImplementedException ();
}
[MonoTODO]
public void EnumerateMetafile (Metafile metafile, PointF [] destPoints, EnumerateMetafileProc callback, IntPtr callbackData)
{
throw new NotImplementedException ();
}
[MonoTODO]
public void EnumerateMetafile (Metafile metafile, Point destPoint, EnumerateMetafileProc callback, IntPtr callbackData)
{
throw new NotImplementedException ();
}
[MonoTODO]
public void EnumerateMetafile (Metafile metafile, Point [] destPoints, EnumerateMetafileProc callback, IntPtr callbackData)
{
throw new NotImplementedException ();
}
[MonoTODO]
public void EnumerateMetafile (Metafile metafile, RectangleF destRect, EnumerateMetafileProc callback, IntPtr callbackData)
{
throw new NotImplementedException ();
}
[MonoTODO]
public void EnumerateMetafile (Metafile metafile, PointF destPoint, RectangleF srcRect, GraphicsUnit srcUnit, EnumerateMetafileProc callback)
{
throw new NotImplementedException ();
}
[MonoTODO]
public void EnumerateMetafile (Metafile metafile, Point destPoint, Rectangle srcRect, GraphicsUnit srcUnit, EnumerateMetafileProc callback)
{
throw new NotImplementedException ();
}
[MonoTODO]
public void EnumerateMetafile (Metafile metafile, PointF [] destPoints, RectangleF srcRect, GraphicsUnit srcUnit, EnumerateMetafileProc callback)
{
throw new NotImplementedException ();
}
[MonoTODO]
public void EnumerateMetafile (Metafile metafile, Point [] destPoints, Rectangle srcRect, GraphicsUnit srcUnit, EnumerateMetafileProc callback)
{
throw new NotImplementedException ();
}
[MonoTODO]
public void EnumerateMetafile (Metafile metafile, RectangleF destRect, RectangleF srcRect, GraphicsUnit srcUnit, EnumerateMetafileProc callback)
{
throw new NotImplementedException ();
}
[MonoTODO]
public void EnumerateMetafile (Metafile metafile, Rectangle destRect, Rectangle srcRect, GraphicsUnit srcUnit, EnumerateMetafileProc callback)
{
throw new NotImplementedException ();
}
[MonoTODO]
public void EnumerateMetafile (Metafile metafile, RectangleF destRect, EnumerateMetafileProc callback, IntPtr callbackData, ImageAttributes imageAttr)
{
throw new NotImplementedException ();
}
[MonoTODO]
public void EnumerateMetafile (Metafile metafile, Point destPoint, EnumerateMetafileProc callback, IntPtr callbackData, ImageAttributes imageAttr)
{
throw new NotImplementedException ();
}
[MonoTODO]
public void EnumerateMetafile (Metafile metafile, PointF destPoint, EnumerateMetafileProc callback, IntPtr callbackData, ImageAttributes imageAttr)
{
throw new NotImplementedException ();
}
[MonoTODO]
public void EnumerateMetafile (Metafile metafile, Point [] destPoints, EnumerateMetafileProc callback, IntPtr callbackData, ImageAttributes imageAttr)
{
throw new NotImplementedException ();
}
[MonoTODO]
public void EnumerateMetafile (Metafile metafile, PointF [] destPoints, EnumerateMetafileProc callback, IntPtr callbackData, ImageAttributes imageAttr)
{
throw new NotImplementedException ();
}
[MonoTODO]
public void EnumerateMetafile (Metafile metafile, Rectangle destRect, EnumerateMetafileProc callback, IntPtr callbackData, ImageAttributes imageAttr)
{
throw new NotImplementedException ();
}
[MonoTODO]
public void EnumerateMetafile (Metafile metafile, Rectangle destRect, Rectangle srcRect, GraphicsUnit srcUnit, EnumerateMetafileProc callback, IntPtr callbackData)
{
throw new NotImplementedException ();
}
[MonoTODO]
public void EnumerateMetafile (Metafile metafile, PointF [] destPoints, RectangleF srcRect, GraphicsUnit srcUnit, EnumerateMetafileProc callback, IntPtr callbackData)
{
throw new NotImplementedException ();
}
[MonoTODO]
public void EnumerateMetafile (Metafile metafile, RectangleF destRect, RectangleF srcRect, GraphicsUnit srcUnit, EnumerateMetafileProc callback, IntPtr callbackData)
{
throw new NotImplementedException ();
}
[MonoTODO]
public void EnumerateMetafile (Metafile metafile, PointF destPoint, RectangleF srcRect, GraphicsUnit srcUnit, EnumerateMetafileProc callback, IntPtr callbackData)
{
throw new NotImplementedException ();
}
[MonoTODO]
public void EnumerateMetafile (Metafile metafile, Point destPoint, Rectangle srcRect, GraphicsUnit srcUnit, EnumerateMetafileProc callback, IntPtr callbackData)
{
throw new NotImplementedException ();
}
[MonoTODO]
public void EnumerateMetafile (Metafile metafile, Point [] destPoints, Rectangle srcRect, GraphicsUnit srcUnit, EnumerateMetafileProc callback, IntPtr callbackData)
{
throw new NotImplementedException ();
}
[MonoTODO]
public void EnumerateMetafile (Metafile metafile, Point [] destPoints, Rectangle srcRect, GraphicsUnit unit, EnumerateMetafileProc callback, IntPtr callbackData, ImageAttributes imageAttr)
{
throw new NotImplementedException ();
}
[MonoTODO]
public void EnumerateMetafile (Metafile metafile, Rectangle destRect, Rectangle srcRect, GraphicsUnit unit, EnumerateMetafileProc callback, IntPtr callbackData, ImageAttributes imageAttr)
{
throw new NotImplementedException ();
}
[MonoTODO]
public void EnumerateMetafile (Metafile metafile, Point destPoint, Rectangle srcRect, GraphicsUnit unit, EnumerateMetafileProc callback, IntPtr callbackData, ImageAttributes imageAttr)
{
throw new NotImplementedException ();
}
[MonoTODO]
public void EnumerateMetafile (Metafile metafile, RectangleF destRect, RectangleF srcRect, GraphicsUnit unit, EnumerateMetafileProc callback, IntPtr callbackData, ImageAttributes imageAttr)
{
throw new NotImplementedException ();
}
[MonoTODO]
public void EnumerateMetafile (Metafile metafile, PointF [] destPoints, RectangleF srcRect, GraphicsUnit unit, EnumerateMetafileProc callback, IntPtr callbackData, ImageAttributes imageAttr)
{
throw new NotImplementedException ();
}
[MonoTODO]
public void EnumerateMetafile (Metafile metafile, PointF destPoint, RectangleF srcRect, GraphicsUnit unit, EnumerateMetafileProc callback, IntPtr callbackData, ImageAttributes imageAttr)
{
throw new NotImplementedException ();
@@ -1757,76 +1714,65 @@ namespace System.Drawing {
#if INTPTR_SUPPORTED
[EditorBrowsable (EditorBrowsableState.Advanced)]
[MonoTODO]
public void ReleaseHdc (IntPtr hdc)
{
throw new NotImplementedException();
}
[EditorBrowsable (EditorBrowsableState.Advanced)]
[MonoTODO]
public void ReleaseHdcInternal (IntPtr hdc)
{
throw new NotImplementedException ();
}
[EditorBrowsable (EditorBrowsableState.Advanced)]
[MonoTODO]
public static Graphics FromHdc (IntPtr hdc)
{
throw new NotImplementedException();
}
[EditorBrowsable (EditorBrowsableState.Advanced)]
[MonoTODO]
public static Graphics FromHdc (IntPtr hdc, IntPtr hdevice)
{
throw new NotImplementedException ();
}
[EditorBrowsable (EditorBrowsableState.Advanced)]
[MonoTODO]
public static Graphics FromHdcInternal (IntPtr hdc)
{
throw new NotImplementedException ();
}
[EditorBrowsable (EditorBrowsableState.Advanced)]
[MonoTODO]
public static Graphics FromHwnd (IntPtr hwnd)
{
throw new NotImplementedException();
}
[EditorBrowsable (EditorBrowsableState.Advanced)]
[MonoTODO]
public static Graphics FromHwndInternal (IntPtr hwnd)
{
throw new NotImplementedException ();
}
[MonoTODO]
internal static Graphics FromXDrawable (IntPtr drawable, IntPtr display)
{
throw new NotImplementedException();
}
[MonoTODO]
public static IntPtr GetHalftonePalette ()
{
throw new NotImplementedException ();
}
[EditorBrowsable (EditorBrowsableState.Advanced)]
[MonoTODO]
public IntPtr GetHdc ()
{
throw new NotImplementedException();
}
#endif
#region GetNearestColor
[MonoTODO]
#region GetNearestColor [TODO]
public Color GetNearestColor (Color color) {
throw new NotImplementedException();
}
@@ -2258,7 +2204,6 @@ namespace System.Drawing {
#endregion
#region TransformPoints
[MonoTODO]
public void TransformPoints (CoordinateSpace destSpace, CoordinateSpace srcSpace, PointF [] pts) {
//TBD:CoordinateSpace
java.awt.geom.AffineTransform tr = this.Transform.NativeObject;
@@ -2272,7 +2217,6 @@ namespace System.Drawing {
}
}
[MonoTODO]
public void TransformPoints (CoordinateSpace destSpace, CoordinateSpace srcSpace, Point [] pts) {
//TBD:CoordinateSpace
java.awt.geom.AffineTransform tr = this.Transform.NativeObject;
@@ -2543,7 +2487,6 @@ namespace System.Drawing {
}
}
[MonoTODO]
public Point RenderingOrigin {
get {
throw new NotImplementedException();
@@ -115,7 +115,6 @@ namespace System.Drawing
}
}
[MonoTODO]
private Icon (SerializationInfo info, StreamingContext context)
{
//FIXME, need to check how MS stores Icon structure
@@ -124,7 +123,6 @@ namespace System.Drawing
}
#endregion
[MonoTODO]
void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context)
{
throw new NotImplementedException ();
@@ -146,7 +144,6 @@ namespace System.Drawing
}
#if INTPTR_SUPPORT
[MonoTODO]
public static Icon FromHandle (IntPtr handle)
{
throw new NotImplementedException ();
@@ -103,13 +103,11 @@ namespace System.Drawing {
#endregion
#region FromFile
[MonoTODO]
public static Image FromFile(string filename) {
//FIXME: check if it's not a metafile, throw NotImplementedException
return new Bitmap (filename);
}
[MonoTODO]
public static Image FromFile(string filename, bool useIcm) {
//FIXME: check if it's not a metafile, throw NotImplementedException
return new Bitmap (filename, useIcm);
@@ -127,13 +125,11 @@ namespace System.Drawing {
// static
#region FromStream
[MonoTODO]
public static Image FromStream (Stream stream) {
//FIXME: check if it's not a metafile, throw NotImplementedException
return new Bitmap (stream);
}
[MonoTODO]
public static Image FromStream (Stream stream, bool useIcm) {
//FIXME: check if it's not a metafile, throw NotImplementedException
return new Bitmap (stream, useIcm);
@@ -209,7 +205,7 @@ namespace System.Drawing {
#endregion
#region GetEncoderParameterList
[MonoTODO]
// TBD: implement this
public EncoderParameters GetEncoderParameterList(Guid encoder) {
throw new NotImplementedException ();
}
@@ -226,14 +222,14 @@ namespace System.Drawing {
#endregion
#region GetPropertyItem
[MonoTODO]
// TBD: implement this
public PropertyItem GetPropertyItem(int propid) {
throw new NotImplementedException ();
}
#endregion
#region RemovePropertyItem
[MonoTODO]
// TBD: implement this
public void RemovePropertyItem (int propid) {
throw new NotImplementedException ();
}
@@ -298,7 +294,6 @@ namespace System.Drawing {
#region Save
protected abstract void InternalSave (ImageOutputStream output, Guid clsid);
[MonoTODO]
public void Save (Stream stream, ImageCodecInfo encoder, EncoderParameters encoderParams) {
//TBD: implement encoderParams
if (encoder == null)
@@ -336,12 +331,11 @@ namespace System.Drawing {
#endregion
#region SaveAdd
[MonoTODO]
// TBD: implement this
public void SaveAdd(EncoderParameters encoderParams) {
throw new NotImplementedException ();
}
[MonoTODO]
public void SaveAdd(Image image, EncoderParameters encoderParams) {
throw new NotImplementedException ();
}
@@ -350,7 +344,6 @@ namespace System.Drawing {
#region SelectActiveFrame
// TBD: .Net does not load all frames at the initialization. New frames loaded by request.
[MonoTODO]
public int SelectActiveFrame(FrameDimension dimension, int frameIndex) {
// FALLBACK: now, only one dimension assigned for all frames
if (dimension.Guid != CurrentImage.Dimension.Guid)
@@ -364,7 +357,7 @@ namespace System.Drawing {
#endregion
#region SetPropertyItem
[MonoTODO]
// TBD: implement this
public void SetPropertyItem(PropertyItem propitem) {
throw new NotImplementedException ();
}
@@ -374,7 +367,6 @@ namespace System.Drawing {
#region Flags
public int Flags {
// TDB: ImageFlagsScalable, ImageFlagsHasTranslucent, ImageFlagsPartiallyScalable, ImageFlagsCaching
[MonoTODO]
get {
image.ColorModel colorModel = ((BufferedImage)CurrentImage.NativeImage).getColorModel();
int t = colorModel.getColorSpace().getType();
@@ -400,7 +392,6 @@ namespace System.Drawing {
#endregion
#region FrameDimensionsList
[MonoTODO]
public Guid[] FrameDimensionsList {
// TBD: look over all frames and build array of dimensions
// FALLBACK: now, only one dimension assigned for all frames
@@ -431,7 +422,6 @@ namespace System.Drawing {
#endregion
#region ColorPalette
[MonoTODO]
public ColorPalette Palette {
get {
if (!(CurrentImage.NativeImage is BufferedImage))
@@ -451,6 +441,7 @@ namespace System.Drawing {
return new ColorPalette();
}
set {
// TBD: add set
throw new NotImplementedException ();
}
}
@@ -475,7 +466,7 @@ namespace System.Drawing {
#endregion
#region PropertiIdList
[MonoTODO]
// TBD: implement this
public int[] PropertyIdList {
get {
throw new NotImplementedException ();
@@ -484,7 +475,7 @@ namespace System.Drawing {
#endregion
#region PropertItems
[MonoTODO]
// TBD: implement this
public PropertyItem[] PropertyItems {
get {
throw new NotImplementedException ();
@@ -545,13 +536,11 @@ namespace System.Drawing {
return ImageFromNativeImage(img, RawFormat);
}
#if INTPTR_SUPPORT
[MonoTODO]
public static Bitmap FromHbitmap(IntPtr hbitmap)
{
throw new NotImplementedException ();
}
[MonoTODO]
public static Bitmap FromHbitmap(IntPtr hbitmap, IntPtr hpalette)
{
throw new NotImplementedException ();
@@ -87,7 +87,7 @@ namespace System.Drawing
/// Summary description for ImageAnimator.
/// </summary>
///
[MonoTODO]
public sealed class ImageAnimator
{
static Hashtable ht = new Hashtable ();
@@ -135,7 +135,6 @@ namespace System.Drawing
#endregion
#region CompoundArray [TODO]
[MonoTODO]
public float[] CompoundArray {
get {
throw new NotImplementedException ();
@@ -147,7 +146,6 @@ namespace System.Drawing
#endregion
#region CustomEndCap [TODO]
[MonoTODO]
public CustomLineCap CustomEndCap
{
get
@@ -163,9 +161,9 @@ namespace System.Drawing
#endregion
#region CustomStartCap [TODO]
[MonoTODO]
public CustomLineCap CustomStartCap
{
get
{
throw new NotImplementedException ();
@@ -180,7 +178,6 @@ namespace System.Drawing
#endregion
#region DashCap
[MonoTODO]
public DashCap DashCap {
get {
return _dashCap;
@@ -246,7 +243,7 @@ namespace System.Drawing
#endregion
#region StartCap [TODO - now allways endcap]
[MonoTODO]
public LineCap StartCap {
get {
return _startCap;
@@ -260,7 +257,6 @@ namespace System.Drawing
#endregion
#region EndCap
[MonoTODO]
public LineCap EndCap
{
get
@@ -278,7 +274,6 @@ namespace System.Drawing
#endregion
#region LineJoin [partial TODO - missed styles]
[MonoTODO]
public LineJoin LineJoin {
get {
return _lineJoin;
@@ -49,7 +49,6 @@ namespace System.Drawing
{
}
[MonoTODO]
public Region (RegionData region_data) : this((geom.Area)null)
{
throw new NotImplementedException ();
@@ -351,7 +350,6 @@ namespace System.Drawing
}
#endregion
[MonoTODO]
public RegionData GetRegionData()
{
throw new NotImplementedException();
@@ -359,7 +357,6 @@ namespace System.Drawing
#region GetRegionScans [TODO]
[MonoTODO]
public RectangleF[] GetRegionScans(Matrix matrix)
{
geom.Area area = NativeObject;
@@ -143,14 +143,12 @@ namespace System.Drawing {
}
}
[MonoTODO]
public int DigitSubstitutionLanguage {
get {
return _digitSubstituteLanguage;
}
}
[MonoTODO]
public StringDigitSubstitute DigitSubstitutionMethod {
get {
return _digitSubstituteMethod;
@@ -246,19 +244,16 @@ namespace System.Drawing {
return "[StringFormat, FormatFlags=" + this.FormatFlags.ToString() + "]";
}
[MonoTODO]
public void SetTabStops(float firstTabOffset, float[] tabStops) {
_firstTabOffset = firstTabOffset;
_tabStops = tabStops != null ? (float[])tabStops.Clone() : null;
}
[MonoTODO]
public void SetDigitSubstitution(int language, StringDigitSubstitute substitute) {
_digitSubstituteMethod = substitute;
_digitSubstituteLanguage = language;
}
[MonoTODO]
public float[] GetTabStops(out float firstTabOffset) {
firstTabOffset = _firstTabOffset;
return _tabStops != null ? (float[])_tabStops.Clone() : null;
@@ -73,12 +73,10 @@ namespace System.Drawing {
this( image, WrapMode.Tile, dstRect ) {
}
[MonoTODO]
public TextureBrush (Image image, Rectangle dstRect, ImageAttributes imageAttr) : this( image, dstRect ) {
// TBD: Implement ImageAttributes
}
[MonoTODO]
public TextureBrush (Image image, RectangleF dstRect, ImageAttributes imageAttr) : this( image, dstRect ) {
// TBD: Implement ImageAttributes
}
@@ -87,7 +85,6 @@ namespace System.Drawing {
this( image, wrapMode, new RectangleF(dstRect.X, dstRect.Y, dstRect.Width, dstRect.Height )){
}
[MonoTODO]
public TextureBrush (Image image, WrapMode wrapMode, RectangleF dstRect) {
// TBD: check if not metafile
_sourceRectangle = dstRect;
-16
View File
@@ -1,19 +1,3 @@
2005-12-15 Atsushi Enomoto <[email protected]>
* DTDObjectModel.cs : (CreateXsdParticle) element particle was
missing occurence indicators.
2005-12-15 Atsushi Enomoto <[email protected]>
* DTDObjectModel.cs : some fixes on GetXmlSchema()
- make generated schema cleaner.
- enumeration was missing for attribute type.
* XmlTextReader.cs, XmlTextReader2.cs : added tiny notes for dtd2xsd.
2005-12-15 Konstantin Triger <[email protected]>
* XmlTextWriter.cs: allow null string in WriteCData.
2005-12-14 Atsushi Enomoto <[email protected]>
* XmlNode.cs : (GetNamespaceOfPrefix) return const xml/xmlns URIs
@@ -439,10 +439,23 @@ namespace Mono.Xml
internal XmlSchemaParticle CreateXsdParticle ()
{
XmlSchemaParticle p = CreateXsdParticleCore ();
if (p == null)
return null;
XmlSchemaParticle p = null;
if (ElementName != null) {
XmlSchemaElement el = new XmlSchemaElement ();
SetLineInfo (el);
el.RefName = new XmlQualifiedName (ElementName);
return el;
} else {
XmlSchemaGroupBase gb =
(OrderType == DTDContentOrderType.Seq) ?
(XmlSchemaGroupBase)
new XmlSchemaSequence () :
new XmlSchemaChoice ();
SetLineInfo (gb);
foreach (DTDContentModel cm in ChildModels.Items)
gb.Items.Add (cm.CreateXsdParticle ());
p = gb;
}
switch (Occurence) {
case DTDOccurence.Optional:
p.MinOccurs = 0;
@@ -458,34 +471,6 @@ namespace Mono.Xml
return p;
}
XmlSchemaParticle CreateXsdParticleCore ()
{
XmlSchemaParticle p = null;
if (ElementName != null) {
XmlSchemaElement el = new XmlSchemaElement ();
SetLineInfo (el);
el.RefName = new XmlQualifiedName (ElementName);
return el;
}
else if (ChildModels.Count == 0)
return null;
else {
XmlSchemaGroupBase gb =
(OrderType == DTDContentOrderType.Seq) ?
(XmlSchemaGroupBase)
new XmlSchemaSequence () :
new XmlSchemaChoice ();
SetLineInfo (gb);
foreach (DTDContentModel cm in ChildModels.Items) {
XmlSchemaParticle c = cm.CreateXsdParticle ();
if (c != null)
gb.Items.Add (c);
}
p = gb;
}
return p;
}
private DTDAutomata CompileInternal ()
{
if (ElementDecl.IsAny)
@@ -688,30 +673,6 @@ namespace Mono.Xml
XmlSchemaElement el = new XmlSchemaElement ();
SetLineInfo (el);
el.Name = Name;
XmlSchemaComplexType ct = new XmlSchemaComplexType ();
el.SchemaType = ct;
if (Attributes != null) {
SetLineInfo (ct);
foreach (DTDAttributeDefinition a in
Attributes.Definitions)
ct.Attributes.Add (a.CreateXsdAttribute ());
}
if (IsEmpty)
; // nothing to do
else if (IsAny) {
XmlSchemaAny any = new XmlSchemaAny ();
any.MinOccurs = 0;
any.MaxOccursString = "unbounded";
ct.Particle = any;
}
else {
if (IsMixedContent)
ct.IsMixed = true;
ct.Particle = ContentModel.CreateXsdParticle ();
}
/*
if (IsEmpty) {
el.SchemaType = new XmlSchemaComplexType ();
SetLineInfo (el.SchemaType);
@@ -731,7 +692,6 @@ namespace Mono.Xml
ct.Particle = ContentModel.CreateXsdParticle ();
el.SchemaType = ct;
}
*/
return el;
}
}
@@ -879,7 +839,6 @@ namespace Mono.Xml
f.Value = name;
}
}
st.Content = r;
}
else if (qname != XmlQualifiedName.Empty)
a.SchemaTypeName = qname;
@@ -695,7 +695,6 @@ namespace System.Xml
#region Internals
// Parsed DTD Objects
// Note that thgis property must be kept since dtd2xsd uses it.
internal DTDObjectModel DTD {
get { return parserContext.Dtd; }
}
@@ -45,7 +45,7 @@ namespace System.Xml
IXmlLineInfo, IXmlNamespaceResolver, IHasXmlParserContext
{
XmlTextReader entity;
XmlTextReaderImpl source; // dtd2xsd expects this field's existence.
XmlTextReaderImpl source;
bool entityInsideAttribute;
bool insideAttribute;
@@ -457,9 +457,6 @@ openElements [openElementCount - 1]).IndentingOverriden;
public override void WriteCData (string text)
{
if (text == null)
text = String.Empty;
if (text.IndexOf ("]]>") >= 0)
throw ArgumentError ("CDATA section cannot contain text \"]]>\".");
@@ -1,18 +1,3 @@
2005-12-16 Gert Driesen <[email protected]>
* XmlTextWriterTests.cs: Fixed some tests that caught exception to
become useful. Added few tests that fail on Mono.
2005-12-16 Gert Driesen <[email protected]>
* XmlTextWriterTests.cs: No longer derive from deprecated Assertion
class. Added WriteDocType tests.
* XmlWriterTests.cs: No longer derive from deprecated Assertion class.
2005-12-15 Konstantin Triger <[email protected]>
* XmlTextWriterTests.cs: added WriteCDataNull test.
2005-12-14 Atsushi Enomoto <[email protected]>
* XmlDocumentTests.cs : (CreateNodeNodeTypeName) the previous fix was
File diff suppressed because it is too large. Load diff
@@ -22,7 +22,7 @@ using NUnit.Framework;
namespace MonoTests.System.Xml
{
[TestFixture]
public class XmlWriterTests
public class XmlWriterTests : Assertion
{
StringWriter writer;
XmlTextWriter xtw;
@@ -34,33 +34,39 @@ namespace MonoTests.System.Xml
xtw = new XmlTextWriter (writer);
}
private void setupWriter ()
{
writer.GetStringBuilder ().Length = 0;
}
[Test]
public void WriteNodeFullDocument ()
{
setupWriter ();
string xml = "<?xml version='1.0'?><root />";
XmlTextReader xtr = new XmlTextReader (xml, XmlNodeType.Document, null);
xtw.WriteNode (xtr, false);
Assert.AreEqual (xml, writer.ToString ());
writer.GetStringBuilder ().Length = 0;
AssertEquals (xml, writer.ToString ());
// With encoding
setupWriter ();
xml = "<?xml version='1.0' encoding='iso-2022-jp'?><root />";
xtr = new XmlTextReader (xml, XmlNodeType.Document, null);
xtw.WriteNode (xtr, false);
Assert.AreEqual (xml, writer.ToString ());
AssertEquals (xml, writer.ToString ());
xtr.Close ();
}
[Test]
public void WriteNodeXmlDecl ()
{
setupWriter ();
string xml = "<?xml version='1.0'?><root />";
StringReader sr = new StringReader (xml);
XmlTextReader xtr = new XmlTextReader (sr);
xtr.Read ();
xtw.WriteNode (xtr, false);
Assert.AreEqual ("<?xml version='1.0'?>",
AssertEquals ("<?xml version='1.0'?>",
writer.ToString ());
xtr.Close ();
}
@@ -68,11 +74,12 @@ namespace MonoTests.System.Xml
[Test]
public void WriteNodeEmptyElement ()
{
setupWriter ();
string xml = "<root attr='value' attr2='value' />";
StringReader sr = new StringReader (xml);
XmlTextReader xtr = new XmlTextReader (sr);
xtw.WriteNode (xtr, false);
Assert.AreEqual (xml.Replace ("'", "\""),
AssertEquals (xml.Replace ("'", "\""),
writer.ToString ());
xtr.Close ();
}
@@ -80,19 +87,21 @@ namespace MonoTests.System.Xml
[Test]
public void WriteNodeNonEmptyElement ()
{
setupWriter ();
string xml = @"<foo><bar></bar></foo>";
xtw.WriteNode (new XmlTextReader (xml, XmlNodeType.Document, null), false);
Assert.AreEqual (xml, writer.ToString ());
AssertEquals (xml, writer.ToString ());
}
[Test]
public void WriteNodeSingleContentElement ()
{
setupWriter ();
string xml = "<root attr='value' attr2='value'><foo /></root>";
StringReader sr = new StringReader (xml);
XmlTextReader xtr = new XmlTextReader (sr);
xtw.WriteNode (xtr, false);
Assert.AreEqual (xml.Replace ("'", "\""),
AssertEquals (xml.Replace ("'", "\""),
writer.ToString ());
xtr.Close ();
}
@@ -100,6 +109,7 @@ namespace MonoTests.System.Xml
[Test]
public void WriteNodeNone ()
{
setupWriter ();
XmlTextReader xtr = new XmlTextReader ("", XmlNodeType.Element, null);
xtr.Read ();
xtw.WriteNode (xtr, false); // does not report any errors
@@ -126,27 +136,28 @@ namespace MonoTests.System.Xml
[Test]
public void WriteSurrogateCharEntity ()
{
setupWriter ();
xtw.WriteSurrogateCharEntity ('\udfff', '\udb00');
Assert.AreEqual ("&#xD03FF;", writer.ToString ());
AssertEquals ("&#xD03FF;", writer.ToString ());
try {
xtw.WriteSurrogateCharEntity ('\ud800', '\udc00');
Assert.Fail ();
Fail ();
} catch {
}
try {
xtw.WriteSurrogateCharEntity ('\udbff', '\ud800');
Assert.Fail ();
Fail ();
} catch {
}
try {
xtw.WriteSurrogateCharEntity ('\ue000', '\ud800');
Assert.Fail ();
Fail ();
} catch {
}
try {
xtw.WriteSurrogateCharEntity ('\udfff', '\udc00');
Assert.Fail ();
Fail ();
} catch {
}
}
@@ -160,13 +171,13 @@ namespace MonoTests.System.Xml
StartElementTestWriter xw = new StartElementTestWriter ();
xw.WriteStartDocument ();
xw.WriteStartElement ("test");
Assert.IsNull (xw.NS, "StartElementOverride.NS");
Assert.IsNull (xw.Prefix, "StartElementOverride.Prefix");
AssertEquals ("StartElementOverride.NS", null, xw.NS);
AssertEquals ("StartElementOverride.Prefix", null, xw.Prefix);
xw.NS = String.Empty;
xw.Prefix = String.Empty;
xw.WriteStartElement ("test", "urn:hoge");
Assert.AreEqual ("urn:hoge", xw.NS, "StartElementOverride.NS");
Assert.IsNull (null, xw.Prefix, "StartElementOverride.Prefix");
AssertEquals ("StartElementOverride.NS", "urn:hoge", xw.NS);
AssertEquals ("StartElementOverride.Prefix", null, xw.Prefix);
}
class StartElementTestWriter : DefaultXmlWriter
@@ -194,13 +205,13 @@ namespace MonoTests.System.Xml
xtr.Read ();
xtw.WriteStartElement ("test"); // ><test
xtw.WriteAttributes (xtr, false); // a='b' c='d'
Assert.AreEqual (XmlNodeType.Element, xtr.NodeType);
AssertEquals (XmlNodeType.Element, xtr.NodeType);
xtw.WriteEndElement (); // />
xtw.WriteStartElement ("b"); // <b
xtw.WriteEndElement (); // />
xtw.WriteEndElement (); // </root>
xtw.Close ();
Assert.AreEqual (xml, writer.ToString ());
AssertEquals (xml, writer.ToString ());
}
}
@@ -78,8 +78,9 @@ namespace System.Net.Configuration
#region Methods
[MonoTODO]
protected override void PostDeserialize ()
protected override object GetRuntimeObject ()
{
throw new NotImplementedException ();
}
[MonoTODO]
@@ -59,9 +59,6 @@ namespace System.Net.Configuration
set { base [name] = value; }
}
protected override bool ThrowOnDuplicate {
get { return false; }
}
#endregion // Properties
#region Methods
@@ -1,22 +1,3 @@
2005-12-14 Chris Toshok <[email protected]>
* MailSettingsSectionGroup.cs, PerformanceCountersElement.cs,
SmtpNetworkElement.cs, SmtpSection.cs,
SmtpSpecifiedPickupDirectoryElement.cs, WebProxyScriptElement.cs:
add missing 2.0 configuration classes.
* AuthenticationModulesSection.cs, BypassElementCollection.cs,
HttpCachePolicyElement.cs, NetSectionGroup.cs,
ServicePointManagerElement.cs, SettingsSection.cs,
SocketElement.cs, WebRequestModuleElementCollection.cs,
WebRequestModuleElement.cs, WebRequestModulesSection.cs: more 2.0
config cleanup work.
* MailSettingsSection.cs, SmtpElement.cs,
UriParserElementCollection.cs, UriParserElement.cs,
UriParserSection.cs: remove these 2.0 classes as they aren't there
anymore.
2005-12-13 Chris Toshok <[email protected]>
* AuthenticationModuleElementCollection.cs,
@@ -94,7 +94,7 @@ namespace System.Net.Configuration
set { base [minimumFreshProp] = value; }
}
[ConfigurationProperty ("policyLevel", DefaultValue = "Default", Options = ConfigurationPropertyOptions.IsRequired)]
[ConfigurationProperty ("policyLevel", DefaultValue = HttpRequestCacheLevel.Default, Options = ConfigurationPropertyOptions.IsRequired)]
public HttpRequestCacheLevel PolicyLevel {
get { return (HttpRequestCacheLevel) base [policyLevelProp]; }
set { base [policyLevelProp] = value; }
@@ -1,10 +1,11 @@
//
// System.Net.Configuration.MailSettingsSectionGroup
// System.Net.Configuration.MailSettingsSection.cs
//
// Authors:
// Chris Toshok (toshok@ximian.com)
// Tim Coleman (tim@timcoleman.com)
//
// (C) 2005 Novell, Inc. (http://www.novell.com)
// Copyright (C) Tim Coleman, 2004
// (c) 2004 Novell, Inc. (http://www.novell.com)
//
//
@@ -34,14 +35,47 @@ using System.Configuration;
namespace System.Net.Configuration
{
public sealed class MailSettingsSectionGroup : ConfigurationSectionGroup
{
// for some reason MS doesn't provide a ConfigurationProperty for this property...
//[ConfigurationProperty ("smtp")]
public SmtpSection Smtp {
get { return (SmtpSection) Sections ["smtp"]; }
}
}
public sealed class MailSettingsSection : ConfigurationSection
{
#region Fields
ConfigurationPropertyCollection properties;
static ConfigurationProperty smtp = new ConfigurationProperty ("Smtp", typeof (SmtpElement), new SmtpElement ());
#endregion // Fields
#region Constructors
public MailSettingsSection ()
{
properties = new ConfigurationPropertyCollection ();
properties.Add (smtp);
}
#endregion // Constructors
#region Properties
protected override ConfigurationPropertyCollection Properties {
get { return properties; }
}
public SmtpElement Smtp {
get { return (SmtpElement) base [smtp]; }
}
#endregion // Properties
#region Methods
[MonoTODO]
protected override object GetRuntimeObject ()
{
throw new NotImplementedException ();
}
#endregion // Methods
}
}
#endif
@@ -63,11 +63,12 @@ namespace System.Net.Configuration
get { return (DefaultProxySection) Sections ["defaultProxy"]; }
}
// for some reason MS doesn't provide a ConfigurationProperty for this property...
//[ConfigurationProperty ("mailSettings")]
#if notyet
[ConfigurationProperty ("mailSettings")]
public MailSettingsSectionGroup MailSettings {
get { return (MailSettingsSectionGroup) SectionGroups ["mailSettings"]; }
}
#endif
[ConfigurationProperty ("requestCaching")]
public RequestCachingSection RequestCaching {
@@ -3,10 +3,9 @@
//
// Authors:
// Tim Coleman ([email protected])
// Chris Toshok ([email protected])
//
// Copyright (C) Tim Coleman, 2004
// (c) 2004,2005 Novell, Inc. (http://www.novell.com)
// (c) 2004 Novell, Inc. (http://www.novell.com)
//
//
@@ -41,95 +40,68 @@ namespace System.Net.Configuration
{
#region Fields
static ConfigurationPropertyCollection properties;
static ConfigurationProperty checkCertificateNameProp;
static ConfigurationProperty checkCertificateRevocationListProp;
static ConfigurationProperty dnsRefreshTimeoutProp;
static ConfigurationProperty enableDnsRoundRobinProp;
static ConfigurationProperty expect100ContinueProp;
static ConfigurationProperty useNagleAlgorithmProp;
ConfigurationPropertyCollection properties;
static ConfigurationProperty checkCertificateName = new ConfigurationProperty ("CheckCertificateName", typeof (bool), true);
static ConfigurationProperty checkCertificateRevocationList = new ConfigurationProperty ("CheckCertificateRevocationList", typeof (bool), false);
static ConfigurationProperty dnsRefreshTimeout = new ConfigurationProperty ("DnsRefreshTimeout", typeof (TimeSpan), new TimeSpan (0, 2, 0));
static ConfigurationProperty enableDnsRoundRobin = new ConfigurationProperty ("EnableDnsRoundRobin", typeof (bool), false);
static ConfigurationProperty expect100Continue = new ConfigurationProperty ("Expect100Continue", typeof (bool), true);
static ConfigurationProperty useNagleAlgorithm = new ConfigurationProperty ("UseNagleAlgorithm", typeof (bool), true);
#endregion // Fields
#region Constructors
static ServicePointManagerElement ()
{
checkCertificateNameProp = new ConfigurationProperty ("checkCertificateName", typeof (bool), true);
checkCertificateRevocationListProp = new ConfigurationProperty ("checkCertificateRevocationList", typeof (bool), false);
dnsRefreshTimeoutProp = new ConfigurationProperty ("dnsRefreshTimeout", typeof (int), 120000);
enableDnsRoundRobinProp = new ConfigurationProperty ("enableDnsRoundRobin", typeof (bool), false);
expect100ContinueProp = new ConfigurationProperty ("expect100Continue", typeof (bool), true);
useNagleAlgorithmProp = new ConfigurationProperty ("useNagleAlgorithm", typeof (bool), true);
properties = new ConfigurationPropertyCollection ();
properties.Add (checkCertificateNameProp);
properties.Add (checkCertificateRevocationListProp);
properties.Add (dnsRefreshTimeoutProp);
properties.Add (enableDnsRoundRobinProp);
properties.Add (expect100ContinueProp);
properties.Add (useNagleAlgorithmProp);
}
public ServicePointManagerElement ()
{
properties = new ConfigurationPropertyCollection ();
properties.Add (checkCertificateName);
properties.Add (checkCertificateRevocationList);
properties.Add (dnsRefreshTimeout);
properties.Add (enableDnsRoundRobin);
properties.Add (expect100Continue);
properties.Add (useNagleAlgorithm);
}
#endregion // Constructors
#region Properties
[ConfigurationProperty ("checkCertificateName", DefaultValue = "True")]
public bool CheckCertificateName {
get { return (bool) base [checkCertificateNameProp]; }
set { base [checkCertificateNameProp] = value; }
get { return (bool) base [checkCertificateName]; }
set { base [checkCertificateName] = value; }
}
[ConfigurationProperty ("checkCertificateRevocationList", DefaultValue = "False")]
public bool CheckCertificateRevocationList {
get { return (bool) base [checkCertificateRevocationListProp]; }
set { base [checkCertificateRevocationListProp] = value; }
get { return (bool) base [checkCertificateRevocationList]; }
set { base [checkCertificateRevocationList] = value; }
}
[ConfigurationProperty ("dnsRefreshTimeout", DefaultValue = "120000")]
public int DnsRefreshTimeout {
get { return (int) base [dnsRefreshTimeoutProp]; }
set { base [dnsRefreshTimeoutProp] = value; }
public TimeSpan DnsRefreshTimeout {
get { return (TimeSpan) base [dnsRefreshTimeout]; }
set { base [dnsRefreshTimeout] = value; }
}
[ConfigurationProperty ("enableDnsRoundRobin", DefaultValue = "False")]
public bool EnableDnsRoundRobin {
get { return (bool) base [enableDnsRoundRobinProp]; }
set { base [enableDnsRoundRobinProp] = value; }
get { return (bool) base [enableDnsRoundRobin]; }
set { base [enableDnsRoundRobin] = value; }
}
[ConfigurationProperty ("expect100Continue", DefaultValue = "True")]
public bool Expect100Continue {
get { return (bool) base [expect100ContinueProp]; }
set { base [expect100ContinueProp] = value; }
}
[ConfigurationProperty ("useNagleAlgorithm", DefaultValue = "True")]
public bool UseNagleAlgorithm {
get { return (bool) base [useNagleAlgorithmProp]; }
set { base [useNagleAlgorithmProp] = value; }
get { return (bool) base [expect100Continue]; }
set { base [expect100Continue] = value; }
}
protected override ConfigurationPropertyCollection Properties {
get { return properties; }
}
#endregion // Properties
#region Methods
[MonoTODO]
protected override void PostDeserialize ()
{
public bool UseNagleAlgorithm {
get { return (bool) base [useNagleAlgorithm]; }
set { base [useNagleAlgorithm] = value; }
}
#endregion // Methods
#endregion // Properties
}
}
@@ -39,79 +39,60 @@ namespace System.Net.Configuration
{
#region Fields
static ConfigurationPropertyCollection properties;
static ConfigurationProperty httpWebRequestProp;
static ConfigurationProperty ipv6Prop;
static ConfigurationProperty performanceCountersProp;
static ConfigurationProperty servicePointManagerProp;
static ConfigurationProperty webProxyScriptProp;
static ConfigurationProperty socketProp;
ConfigurationPropertyCollection properties;
static ConfigurationProperty httpWebRequest = new ConfigurationProperty ("HttpWebRequest", typeof (HttpWebRequestElement), new HttpWebRequestElement ());
static ConfigurationProperty ipv6 = new ConfigurationProperty ("Ipv6", typeof (Ipv6Element), new Ipv6Element ());
static ConfigurationProperty servicePointManager = new ConfigurationProperty ("ServicePointManager", typeof (ServicePointManagerElement), new ServicePointManagerElement ());
static ConfigurationProperty socket = new ConfigurationProperty ("Socket", typeof (SocketElement), new SocketElement ());
#endregion // Fields
#region Constructors
static SettingsSection ()
{
httpWebRequestProp = new ConfigurationProperty ("httpWebRequest", typeof (HttpWebRequestElement));
ipv6Prop = new ConfigurationProperty ("ipv6", typeof (Ipv6Element));
performanceCountersProp = new ConfigurationProperty ("performanceCounters", typeof (PerformanceCountersElement));
servicePointManagerProp = new ConfigurationProperty ("servicePointManager", typeof (ServicePointManagerElement));
socketProp = new ConfigurationProperty ("socket", typeof (SocketElement));
webProxyScriptProp = new ConfigurationProperty ("webProxyScript", typeof (WebProxyScriptElement));
properties = new ConfigurationPropertyCollection ();
properties.Add (httpWebRequestProp);
properties.Add (ipv6Prop);
properties.Add (performanceCountersProp);
properties.Add (servicePointManagerProp);
properties.Add (socketProp);
properties.Add (webProxyScriptProp);
}
public SettingsSection ()
{
properties = new ConfigurationPropertyCollection ();
properties.Add (httpWebRequest);
properties.Add (ipv6);
properties.Add (servicePointManager);
properties.Add (socket);
}
#endregion // Constructors
#region Properties
[ConfigurationProperty ("httpWebRequest")]
public HttpWebRequestElement HttpWebRequest {
get { return (HttpWebRequestElement) base [httpWebRequestProp]; }
get { return (HttpWebRequestElement) base [httpWebRequest]; }
}
[ConfigurationProperty ("ipv6")]
public Ipv6Element Ipv6 {
get { return (Ipv6Element) base [ipv6Prop]; }
}
[ConfigurationProperty ("performanceCounters")]
public PerformanceCountersElement PerformanceCounters {
get { return (PerformanceCountersElement) base[performanceCountersProp]; }
}
[ConfigurationProperty ("servicePointManager")]
public ServicePointManagerElement ServicePointManager {
get { return (ServicePointManagerElement) base [servicePointManagerProp]; }
}
[ConfigurationProperty ("socket")]
public SocketElement Socket {
get { return (SocketElement) base [socketProp]; }
}
[ConfigurationProperty ("webProxyScript")]
public WebProxyScriptElement WebProxyScript {
get { return (WebProxyScriptElement) base [webProxyScriptProp]; }
get { return (Ipv6Element) base [ipv6]; }
}
protected override ConfigurationPropertyCollection Properties {
get { return properties; }
}
public ServicePointManagerElement ServicePointManager {
get { return (ServicePointManagerElement) base [servicePointManager]; }
}
public SocketElement Socket {
get { return (SocketElement) base [socket]; }
}
#endregion // Properties
#region Methods
[MonoTODO]
protected override object GetRuntimeObject ()
{
throw new NotImplementedException ();
}
#endregion // Methods
}
}
@@ -0,0 +1,95 @@
//
// System.Net.Configuration.SmtpElement.cs
//
// Authors:
// Tim Coleman ([email protected])
//
// Copyright (C) Tim Coleman, 2004
// (c) 2004 Novell, Inc. (http://www.novell.com)
//
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0 && CONFIGURATION_DEP
using System.Configuration;
namespace System.Net.Configuration
{
public sealed class SmtpElement : ConfigurationElement
{
#region Fields
ConfigurationPropertyCollection properties;
static ConfigurationProperty defaultCredentials = new ConfigurationProperty ("DefaultCredentials", typeof (bool), false);
static ConfigurationProperty host = new ConfigurationProperty ("Host", typeof (string), null);
static ConfigurationProperty password = new ConfigurationProperty ("Password", typeof (string), null);
static ConfigurationProperty port = new ConfigurationProperty ("Port", typeof (int), 25);
static ConfigurationProperty userName = new ConfigurationProperty ("UserName", typeof (string), null);
#endregion // Fields
#region Constructors
public SmtpElement ()
{
properties = new ConfigurationPropertyCollection ();
}
#endregion // Constructors
#region Properties
public bool DefaultCredentials {
get { return (bool) base [defaultCredentials]; }
set { base [defaultCredentials] = value; }
}
public string Host {
get { return (string) base [host]; }
set { base [host] = value; }
}
public string Password {
get { return (string) base [password]; }
set { base [password] = value; }
}
public int Port {
get { return (int) base [port]; }
set { base [port] = value; }
}
protected override ConfigurationPropertyCollection Properties {
get { return properties; }
}
public string UserName {
get { return (string) base [userName]; }
set { base [userName] = value; }
}
#endregion // Properties
}
}
#endif
@@ -1,106 +0,0 @@
//
// System.Net.Configuration.SmtpNetworkElement
//
// Authors:
// Chris Toshok ([email protected])
//
// (C) 2005 Novell, Inc. (http://www.novell.com)
//
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0 && CONFIGURATION_DEP
using System;
using System.Configuration;
namespace System.Net.Configuration {
public sealed class SmtpNetworkElement : ConfigurationElement
{
static ConfigurationProperty defaultCredentialsProp;
static ConfigurationProperty hostProp;
static ConfigurationProperty passwordProp;
static ConfigurationProperty portProp;
static ConfigurationProperty userNameProp;
static ConfigurationPropertyCollection properties;
static SmtpNetworkElement ()
{
defaultCredentialsProp = new ConfigurationProperty ("defaultCredentials", typeof (bool), false);
hostProp = new ConfigurationProperty ("host", typeof (string));
passwordProp = new ConfigurationProperty ("password", typeof (string));
portProp = new ConfigurationProperty ("port", typeof (int), 25);
userNameProp = new ConfigurationProperty ("userName", typeof (string));
properties = new ConfigurationPropertyCollection ();
properties.Add (defaultCredentialsProp);
properties.Add (hostProp);
properties.Add (passwordProp);
properties.Add (portProp);
properties.Add (userNameProp);
}
protected override void PostDeserialize ()
{
}
[ConfigurationProperty ("defaultCredentials", DefaultValue = "False")]
public bool DefaultCredentials {
get { return (bool) base [defaultCredentialsProp];}
set { base[defaultCredentialsProp] = value; }
}
[ConfigurationProperty ("host")]
public string Host {
get { return (string) base [hostProp];}
set { base[hostProp] = value; }
}
[ConfigurationProperty ("password")]
public string Password {
get { return (string) base [passwordProp];}
set { base[passwordProp] = value; }
}
[ConfigurationProperty ("port", DefaultValue = "25")]
public int Port {
get { return (int) base [portProp];}
set { base[portProp] = value; }
}
[ConfigurationProperty ("userName")]
public string UserName {
get { return (string) base [userNameProp];}
set { base[userNameProp] = value; }
}
protected override ConfigurationPropertyCollection Properties {
get { return properties; }
}
}
}
#endif
@@ -1,92 +0,0 @@
//
// System.Net.Configuration.SmtpSection
//
// Authors:
// Chris Toshok ([email protected])
//
// (C) 2005 Novell, Inc. (http://www.novell.com)
//
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0 && CONFIGURATION_DEP
using System;
using System.Configuration;
using System.Net.Mail;
namespace System.Net.Configuration {
public sealed class SmtpSection : ConfigurationSection
{
static ConfigurationProperty deliveryMethodProp;
static ConfigurationProperty fromProp;
static ConfigurationProperty networkProp;
static ConfigurationProperty specifiedPickupDirectoryProp;
static ConfigurationPropertyCollection properties;
static SmtpSection ()
{
deliveryMethodProp = new ConfigurationProperty ("deliveryMethod", typeof (SmtpDeliveryMethod), SmtpDeliveryMethod.Network);
fromProp = new ConfigurationProperty ("from", typeof (string));
networkProp = new ConfigurationProperty ("network", typeof (SmtpNetworkElement));
specifiedPickupDirectoryProp = new ConfigurationProperty ("specifiedPickupDirectory", typeof (SmtpSpecifiedPickupDirectoryElement));
properties = new ConfigurationPropertyCollection ();
properties.Add (deliveryMethodProp);
properties.Add (fromProp);
properties.Add (networkProp);
properties.Add (specifiedPickupDirectoryProp);
}
[ConfigurationProperty ("deliveryMethod", DefaultValue = "Network")]
public SmtpDeliveryMethod DeliveryMethod {
get { return (SmtpDeliveryMethod) base [deliveryMethodProp];}
set { base[deliveryMethodProp] = value; }
}
[ConfigurationProperty ("from")]
public string From {
get { return (string) base [fromProp];}
set { base[fromProp] = value; }
}
[ConfigurationProperty ("network")]
public SmtpNetworkElement Network {
get { return (SmtpNetworkElement) base [networkProp];}
}
[ConfigurationProperty ("specifiedPickupDirectory")]
public SmtpSpecifiedPickupDirectoryElement SpecifiedPickupDirectory {
get { return (SmtpSpecifiedPickupDirectoryElement) base [specifiedPickupDirectoryProp];}
}
protected override ConfigurationPropertyCollection Properties {
get { return properties; }
}
}
}
#endif
Loaded 100 of 268 files, more files were not shown because too many files have changed in this diff. Show more