[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dotgnu-pnet-commits] pnetlib/System.Windows.Forms/Resources ResXNullRef
|
From: |
Rhys Weatherley <address@hidden> |
|
Subject: |
[Dotgnu-pnet-commits] pnetlib/System.Windows.Forms/Resources ResXNullRef.cs, 1.1, 1.2 ResXResourceSet.cs, 1.1, 1.2 ResXResourceWriter.cs, 1.2, 1.3 |
|
Date: |
Wed, 26 Nov 2003 01:07:12 +0000 |
Update of /cvsroot/dotgnu-pnet/pnetlib/System.Windows.Forms/Resources
In directory subversions:/tmp/cvs-serv8863/System.Windows.Forms/Resources
Modified Files:
ResXNullRef.cs ResXResourceSet.cs ResXResourceWriter.cs
Log Message:
Fix some profile-related build issues.
Index: ResXResourceSet.cs
===================================================================
RCS file:
/cvsroot/dotgnu-pnet/pnetlib/System.Windows.Forms/Resources/ResXResourceSet.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ResXResourceSet.cs 11 Oct 2003 05:55:59 -0000 1.1
--- ResXResourceSet.cs 26 Nov 2003 01:07:10 -0000 1.2
***************
*** 23,27 ****
{
! #if !ECMA_COMPAT
using System;
--- 23,27 ----
{
! #if !ECMA_COMPAT && CONFIG_SERIALIZATION
using System;
***************
*** 57,61 ****
}; // class ResXResourceSet
! #endif // !ECMA_COMPAT
}; // namespace System.Resources
--- 57,61 ----
}; // class ResXResourceSet
! #endif // !ECMA_COMPAT && CONFIG_SERIALIZATION
}; // namespace System.Resources
Index: ResXNullRef.cs
===================================================================
RCS file:
/cvsroot/dotgnu-pnet/pnetlib/System.Windows.Forms/Resources/ResXNullRef.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ResXNullRef.cs 2 Nov 2003 22:15:17 -0000 1.1
--- ResXNullRef.cs 26 Nov 2003 01:07:10 -0000 1.2
***************
*** 4,9 ****
--- 4,11 ----
namespace System.Resources
{
+ #if !ECMA_COMPAT
[Serializable]
class ResXNullRef
{}
+ #endif
}
Index: ResXResourceWriter.cs
===================================================================
RCS file:
/cvsroot/dotgnu-pnet/pnetlib/System.Windows.Forms/Resources/ResXResourceWriter.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ResXResourceWriter.cs 2 Nov 2003 22:15:17 -0000 1.2
--- ResXResourceWriter.cs 26 Nov 2003 01:07:10 -0000 1.3
***************
*** 24,28 ****
{
! #if !ECMA_COMPAT
using System;
--- 24,28 ----
{
! #if !ECMA_COMPAT && CONFIG_SERIALIZATION
using System;
***************
*** 31,35 ****
using System.Runtime.Serialization.Formatters.Binary;
using System.Xml;
! #if CONFIG_COMPONENT_MODEL && CONFIG_SERIALIZATION
using System.ComponentModel;
#endif
--- 31,35 ----
using System.Runtime.Serialization.Formatters.Binary;
using System.Xml;
! #if CONFIG_COMPONENT_MODEL
using System.ComponentModel;
#endif
***************
*** 48,55 ****
public static readonly String Version = "1.3";
! public readonly static string BinSerializedObjectMimeType =
"application/x-microsoft.net.object.binary.base64";
public readonly static string ResMimeType = "text/microsoft-resx";
! public readonly static string ByteArraySerializedObjectMimeType =
"application/x-microsoft.net.object.bytearray.base64";
! public readonly static string DefaultSerializedObjectMimeType =
BinSerializedObjectMimeType;
public readonly static string SoapSerializedObjectMimeType =
"application/x-microsoft.net.object.soap.base64";
public readonly static string ResourceSchema =
--- 48,55 ----
public static readonly String Version = "1.3";
! public readonly static string BinSerializedObjectMimeType =
"application/x-microsoft.net.object.binary.base64";
public readonly static string ResMimeType = "text/microsoft-resx";
! public readonly static string ByteArraySerializedObjectMimeType =
"application/x-microsoft.net.object.bytearray.base64";
! public readonly static string DefaultSerializedObjectMimeType =
BinSerializedObjectMimeType;
public readonly static string SoapSerializedObjectMimeType =
"application/x-microsoft.net.object.soap.base64";
public readonly static string ResourceSchema =
***************
*** 57,89 ****
" <!-- \r\n Microsoft ResX Schema Version " + Version +
"\r\n"+
" -->"+
! " <xsd:schema id=\"root\" xmlns=\"\"
xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\";
xmlns:msdata=\"urn:schemas-microsoft-com:xml-msdata\">"+
! " <xsd:element name=\"root\" msdata:IsDataSet=\"true\">"+
! " <xsd:complexType>"+
! " <xsd:choice maxOccurs=\"unbounded\">"+
! " <xsd:element name=\"data\">"+
! " <xsd:complexType>"+
! " <xsd:sequence>"+
! " <xsd:element name=\"value\"
type=\"xsd:string\" minOccurs=\"0\" msdata:Ordinal=\"1\" />"+
! " <xsd:element name=\"comment\"
type=\"xsd:string\" minOccurs=\"0\" msdata:Ordinal=\"2\" />"+
! " </xsd:sequence>"+
! " <xsd:attribute name=\"name\" type=\"xsd:string\"
msdata:Ordinal=\"1\" />"+
! " <xsd:attribute name=\"type\" type=\"xsd:string\"
msdata:Ordinal=\"3\" />"+
! " <xsd:attribute name=\"mimetype\"
type=\"xsd:string\" msdata:Ordinal=\"4\" />"+
! " </xsd:complexType>"+
! " </xsd:element>"+
! " <xsd:element name=\"resheader\">"+
! " <xsd:complexType>"+
! " <xsd:sequence>"+
! " <xsd:element name=\"value\"
type=\"xsd:string\" minOccurs=\"0\" msdata:Ordinal=\"1\" />"+
! " </xsd:sequence>"+
! " <xsd:attribute name=\"name\" type=\"xsd:string\"
use=\"required\" />"+
! " </xsd:complexType>"+
! " </xsd:element>"+
! " </xsd:choice>"+
! " </xsd:complexType>"+
! " </xsd:element>"+
" </xsd:schema>";
! private BinaryFormatter binaryFormatter = new BinaryFormatter();
// Constructors.
--- 57,89 ----
" <!-- \r\n Microsoft ResX Schema Version " + Version +
"\r\n"+
" -->"+
! " <xsd:schema id=\"root\" xmlns=\"\"
xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\";
xmlns:msdata=\"urn:schemas-microsoft-com:xml-msdata\">"+
! " <xsd:element name=\"root\" msdata:IsDataSet=\"true\">"+
! " <xsd:complexType>"+
! " <xsd:choice maxOccurs=\"unbounded\">"+
! " <xsd:element name=\"data\">"+
! " <xsd:complexType>"+
! " <xsd:sequence>"+
! " <xsd:element name=\"value\"
type=\"xsd:string\" minOccurs=\"0\" msdata:Ordinal=\"1\" />"+
! " <xsd:element name=\"comment\"
type=\"xsd:string\" minOccurs=\"0\" msdata:Ordinal=\"2\" />"+
! " </xsd:sequence>"+
! " <xsd:attribute name=\"name\" type=\"xsd:string\"
msdata:Ordinal=\"1\" />"+
! " <xsd:attribute name=\"type\" type=\"xsd:string\"
msdata:Ordinal=\"3\" />"+
! " <xsd:attribute name=\"mimetype\"
type=\"xsd:string\" msdata:Ordinal=\"4\" />"+
! " </xsd:complexType>"+
! " </xsd:element>"+
! " <xsd:element name=\"resheader\">"+
! " <xsd:complexType>"+
! " <xsd:sequence>"+
! " <xsd:element name=\"value\"
type=\"xsd:string\" minOccurs=\"0\" msdata:Ordinal=\"1\" />"+
! " </xsd:sequence>"+
! " <xsd:attribute name=\"name\" type=\"xsd:string\"
use=\"required\" />"+
! " </xsd:complexType>"+
! " </xsd:element>"+
! " </xsd:choice>"+
! " </xsd:complexType>"+
! " </xsd:element>"+
" </xsd:schema>";
! private BinaryFormatter binaryFormatter = new BinaryFormatter();
// Constructors.
***************
*** 111,162 ****
if (!setup)
Setup();
! if (value == null)
! {
! AddResourceNull(name);
! return;
}
Type type = value.GetType();
! if (type == typeof(string))
! {
! AddResource(name, value as String);
! return;
! }
! if (type == typeof(byte[]))
! {
! AddResource(name, (byte[])value);
! return;
! }
!
!
! xml.WriteStartElement("data");
! xml.WriteAttributeString("name", name);
#if CONFIG_COMPONENT_MODEL
! TypeConverter typeConverter =
TypeDescriptor.GetConverter(type);
! if (typeConverter.CanConvertTo(typeof(string))
&& typeConverter.CanConvertFrom(typeof(string)))
! {
! xml.WriteAttributeString("type",
type.AssemblyQualifiedName);
! xml.WriteStartElement("value");
!
xml.WriteString(typeConverter.ConvertToInvariantString(value));
! }
! else if
(typeConverter.CanConvertTo(typeof(byte[])) &&
typeConverter.CanConvertFrom(typeof(byte[])))
! {
! string s =
FormatString((byte[])typeConverter.ConvertTo(value, typeof(byte[])));
! xml.WriteAttributeString("type",
type.AssemblyQualifiedName);
! xml.WriteAttributeString("mimetype",
ByteArraySerializedObjectMimeType);
! xml.WriteStartElement("value");
! xml.WriteString(s);
! }
! else
! {
! MemoryStream memoryStream = new
MemoryStream();
! binaryFormatter.Serialize(memoryStream,
value);
! string s =
FormatString(memoryStream.ToArray());
! xml.WriteAttributeString("mimetype",
DefaultSerializedObjectMimeType);
! xml.WriteStartElement("value");
! xml.WriteString(s);
! }
! xml.WriteEndElement();
! xml.WriteEndElement();
#endif
}
--- 111,162 ----
if (!setup)
Setup();
! if (value == null)
! {
! AddResourceNull(name);
! return;
}
Type type = value.GetType();
! if (type == typeof(string))
! {
! AddResource(name, value as String);
! return;
! }
! if (type == typeof(byte[]))
! {
! AddResource(name, (byte[])value);
! return;
! }
!
!
! xml.WriteStartElement("data");
! xml.WriteAttributeString("name", name);
#if CONFIG_COMPONENT_MODEL
! TypeConverter typeConverter =
TypeDescriptor.GetConverter(type);
! if (typeConverter.CanConvertTo(typeof(string))
&& typeConverter.CanConvertFrom(typeof(string)))
! {
! xml.WriteAttributeString("type",
type.AssemblyQualifiedName);
! xml.WriteStartElement("value");
!
xml.WriteString(typeConverter.ConvertToInvariantString(value));
! }
! else if
(typeConverter.CanConvertTo(typeof(byte[])) &&
typeConverter.CanConvertFrom(typeof(byte[])))
! {
! string s =
FormatString((byte[])typeConverter.ConvertTo(value, typeof(byte[])));
! xml.WriteAttributeString("type",
type.AssemblyQualifiedName);
! xml.WriteAttributeString("mimetype",
ByteArraySerializedObjectMimeType);
! xml.WriteStartElement("value");
! xml.WriteString(s);
! }
! else
! {
! MemoryStream memoryStream = new
MemoryStream();
! binaryFormatter.Serialize(memoryStream,
value);
! string s =
FormatString(memoryStream.ToArray());
! xml.WriteAttributeString("mimetype",
DefaultSerializedObjectMimeType);
! xml.WriteStartElement("value");
! xml.WriteString(s);
! }
! xml.WriteEndElement();
! xml.WriteEndElement();
#endif
}
***************
*** 164,173 ****
private void AddResourceNull(String name)
{
! xml.WriteStartElement("data");
! xml.WriteAttributeString("name", name);
! xml.WriteStartElement("value");
xml.WriteString(String.Empty);
xml.WriteAttributeString("type",
typeof(ResXNullRef).AssemblyQualifiedName);
! xml.WriteEndElement();
xml.WriteEndElement();
}
--- 164,173 ----
private void AddResourceNull(String name)
{
! xml.WriteStartElement("data");
! xml.WriteAttributeString("name", name);
! xml.WriteStartElement("value");
xml.WriteString(String.Empty);
xml.WriteAttributeString("type",
typeof(ResXNullRef).AssemblyQualifiedName);
! xml.WriteEndElement();
xml.WriteEndElement();
}
***************
*** 178,186 ****
Setup();
! xml.WriteStartElement("data");
! xml.WriteAttributeString("name", name);
! xml.WriteStartElement("value");
xml.WriteString(value);
! xml.WriteEndElement();
xml.WriteEndElement();
}
--- 178,186 ----
Setup();
! xml.WriteStartElement("data");
! xml.WriteAttributeString("name", name);
! xml.WriteStartElement("value");
xml.WriteString(value);
! xml.WriteEndElement();
xml.WriteEndElement();
}
***************
*** 191,200 ****
Setup();
! xml.WriteStartElement("data");
! xml.WriteAttributeString("name", name);
! xml.WriteAttributeString("type",
typeof(byte[]).AssemblyQualifiedName);
! xml.WriteStartElement("value");
xml.WriteString(FormatString(value));
! xml.WriteEndElement();
xml.WriteEndElement();
}
--- 191,200 ----
Setup();
! xml.WriteStartElement("data");
! xml.WriteAttributeString("name", name);
! xml.WriteAttributeString("type",
typeof(byte[]).AssemblyQualifiedName);
! xml.WriteStartElement("value");
xml.WriteString(FormatString(value));
! xml.WriteEndElement();
xml.WriteEndElement();
}
***************
*** 202,269 ****
private void Setup()
{
! if (writer != null)
! {
! writer.WriteLine("<?xml version=\"1.0\"
encoding=\"utf-8\"?>");
! xml = new XmlTextWriter(writer);
! xml.Formatting = Formatting.Indented;
! }
! else
! {
! if (fileName == null)
! xml = new XmlTextWriter(stream, Encoding.UTF8);
! else
! xml = new XmlTextWriter(fileName,
Encoding.UTF8);
! xml.Formatting = Formatting.Indented;
! xml.WriteStartDocument();
! }
!
! xml.WriteStartElement("root");
! XmlTextReader xmlTextReader = new XmlTextReader(new
StringReader(ResourceSchema));
! xmlTextReader.WhitespaceHandling = WhitespaceHandling.None;
! xml.WriteNode(xmlTextReader, true);
! xml.WriteStartElement("resheader");
! xml.WriteAttributeString("name", "resmimetype");
! xml.WriteStartElement("value");
! xml.WriteString(ResMimeType);
! xml.WriteEndElement();
! xml.WriteEndElement();
! xml.WriteStartElement("resheader");
! xml.WriteAttributeString("name", "version");
! xml.WriteStartElement("value");
! xml.WriteString(Version);
! xml.WriteEndElement();
! xml.WriteEndElement();
! xml.WriteStartElement("resheader");
! xml.WriteAttributeString("name", "reader");
! xml.WriteStartElement("value");
!
xml.WriteString(typeof(ResXResourceReader).AssemblyQualifiedName);
! xml.WriteEndElement();
! xml.WriteEndElement();
! xml.WriteStartElement("resheader");
! xml.WriteAttributeString("name", "writer");
! xml.WriteStartElement("value");
!
xml.WriteString(typeof(ResXResourceWriter).AssemblyQualifiedName);
! xml.WriteEndElement();
! xml.WriteEndElement();
setup = true;
}
! private static string FormatString(byte[] data)
! {
! string s = Convert.ToBase64String(data);
! if (s.Length <= 80)
! return s;
! StringBuilder stringBuilder = new StringBuilder(s.Length * 110
/ 80);
! int i = 0;
! for (; i < s.Length - 80; i += 80)
! {
! stringBuilder.Append("\r\n ");
! stringBuilder.Append(s, i, 80);
! }
! stringBuilder.Append("\r\n ");
! stringBuilder.Append(s, i, s.Length - i);
! stringBuilder.Append("\r\n");
! return stringBuilder.ToString();
! }
public void Close()
--- 202,269 ----
private void Setup()
{
! if (writer != null)
! {
! writer.WriteLine("<?xml version=\"1.0\"
encoding=\"utf-8\"?>");
! xml = new XmlTextWriter(writer);
! xml.Formatting = Formatting.Indented;
! }
! else
! {
! if (fileName == null)
! xml = new XmlTextWriter(stream, Encoding.UTF8);
! else
! xml = new XmlTextWriter(fileName,
Encoding.UTF8);
! xml.Formatting = Formatting.Indented;
! xml.WriteStartDocument();
! }
!
! xml.WriteStartElement("root");
! XmlTextReader xmlTextReader = new XmlTextReader(new
StringReader(ResourceSchema));
! xmlTextReader.WhitespaceHandling = WhitespaceHandling.None;
! xml.WriteNode(xmlTextReader, true);
! xml.WriteStartElement("resheader");
! xml.WriteAttributeString("name", "resmimetype");
! xml.WriteStartElement("value");
! xml.WriteString(ResMimeType);
! xml.WriteEndElement();
! xml.WriteEndElement();
! xml.WriteStartElement("resheader");
! xml.WriteAttributeString("name", "version");
! xml.WriteStartElement("value");
! xml.WriteString(Version);
! xml.WriteEndElement();
! xml.WriteEndElement();
! xml.WriteStartElement("resheader");
! xml.WriteAttributeString("name", "reader");
! xml.WriteStartElement("value");
!
xml.WriteString(typeof(ResXResourceReader).AssemblyQualifiedName);
! xml.WriteEndElement();
! xml.WriteEndElement();
! xml.WriteStartElement("resheader");
! xml.WriteAttributeString("name", "writer");
! xml.WriteStartElement("value");
!
xml.WriteString(typeof(ResXResourceWriter).AssemblyQualifiedName);
! xml.WriteEndElement();
! xml.WriteEndElement();
setup = true;
}
! private static string FormatString(byte[] data)
! {
! string s = Convert.ToBase64String(data);
! if (s.Length <= 80)
! return s;
! StringBuilder stringBuilder = new StringBuilder(s.Length * 110
/ 80);
! int i = 0;
! for (; i < s.Length - 80; i += 80)
! {
! stringBuilder.Append("\r\n ");
! stringBuilder.Append(s, i, 80);
! }
! stringBuilder.Append("\r\n ");
! stringBuilder.Append(s, i, s.Length - i);
! stringBuilder.Append("\r\n");
! return stringBuilder.ToString();
! }
public void Close()
***************
*** 274,281 ****
public void Generate()
{
! if (!generated)
! {
! generated = true;
! xml.WriteEndElement();
xml.Flush();
}
--- 274,281 ----
public void Generate()
{
! if (!generated)
! {
! generated = true;
! xml.WriteEndElement();
xml.Flush();
}
***************
*** 291,305 ****
protected virtual void Dispose(bool disposing)
{
! if (disposing)
! {
! if (!generated)
! Generate();
! if (xml!= null)
! xml.Close();
! // Not sure, does the writer close the
stream?
! if (stream != null)
! stream.Close();
! if (writer != null)
! writer.Close();
}
}
--- 291,305 ----
protected virtual void Dispose(bool disposing)
{
! if (disposing)
! {
! if (!generated)
! Generate();
! if (xml!= null)
! xml.Close();
! // Not sure, does the writer close the
stream?
! if (stream != null)
! stream.Close();
! if (writer != null)
! writer.Close();
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dotgnu-pnet-commits] pnetlib/System.Windows.Forms/Resources ResXNullRef.cs, 1.1, 1.2 ResXResourceSet.cs, 1.1, 1.2 ResXResourceWriter.cs, 1.2, 1.3,
Rhys Weatherley <address@hidden> <=
- Prev by Date:
[Dotgnu-pnet-commits] pnetlib/samples FormsTest.cs, 1.17, 1.18 XClockEmbed.cs, 1.2, 1.3
- Next by Date:
[Dotgnu-pnet-commits] pnet/cscc/csharp cs_misc.tc,1.14,1.15
- Previous by thread:
[Dotgnu-pnet-commits] pnetlib/samples FormsTest.cs, 1.17, 1.18 XClockEmbed.cs, 1.2, 1.3
- Next by thread:
[Dotgnu-pnet-commits] pnet/cscc/csharp cs_misc.tc,1.14,1.15
- Index(es):