Author: krasnov
Date: 2005-11-01 10:42:56 -0500 (Tue, 01 Nov 2005)
New Revision: 52448
Modified:
trunk/mcs/class/System.Drawing/System.Drawing/ChangeLog
trunk/mcs/class/System.Drawing/System.Drawing/StringFormat.jvm.cs
Log:
* StringFormat.jvm.cs: Refactoring
Modified: trunk/mcs/class/System.Drawing/System.Drawing/ChangeLog
===================================================================
--- trunk/mcs/class/System.Drawing/System.Drawing/ChangeLog 2005-11-01
15:28:38 UTC (rev 52447)
+++ trunk/mcs/class/System.Drawing/System.Drawing/ChangeLog 2005-11-01
15:42:56 UTC (rev 52448)
@@ -1,3 +1,7 @@
+2005-11-01 Vladimir Krasnov <[EMAIL PROTECTED]>
+
+ * StringFormat.jvm.cs: Refactoring
+
2005-10-31 Jordi Mas i Hernandez <[EMAIL PROTECTED]>
* Image.cs: Default format for MemoryBMP should be Png
Modified: trunk/mcs/class/System.Drawing/System.Drawing/StringFormat.jvm.cs
===================================================================
--- trunk/mcs/class/System.Drawing/System.Drawing/StringFormat.jvm.cs
2005-11-01 15:28:38 UTC (rev 52447)
+++ trunk/mcs/class/System.Drawing/System.Drawing/StringFormat.jvm.cs
2005-11-01 15:42:56 UTC (rev 52448)
@@ -32,203 +32,193 @@
using System;
using System.Drawing.Text;
-namespace System.Drawing
-{
+namespace System.Drawing {
/// <summary>
/// Summary description for StringFormat.
/// </summary>
- public sealed class StringFormat : IDisposable, ICloneable
- {
- private static StringFormat genericDefault;
- private int language = 0;
- internal CharacterRange [] CharRanges;
-
- //local storage
- internal StringAlignment alignment;
- internal StringAlignment linealignment;
- internal HotkeyPrefix prefix;
- internal StringFormatFlags flags;
- internal StringDigitSubstitute subst;
- internal StringTrimming trimming;
- internal float firstTabOffset;
- internal float [] tabStops;
+ public sealed class StringFormat : MarshalByRefObject, IDisposable,
ICloneable {
- public StringFormat()
- {
-
- }
- public StringFormat(StringFormatFlags options, int lang)
- {
- flags = options;
- LineAlignment = StringAlignment.Near;
- Alignment = StringAlignment.Near;
- language = lang;
+ private CharacterRange [] _charRanges;
+ private StringAlignment _alignment;
+ private StringAlignment _lineAlignment;
+ private HotkeyPrefix _hotkeyPrefix;
+ private StringFormatFlags _flags;
+ private StringDigitSubstitute _digitSubstituteMethod;
+ private int _digitSubstituteLanguage;
+ private StringTrimming _trimming;
+
+ private float _firstTabOffset;
+ private float [] _tabStops;
+
+ #region Constructors
+
+ public StringFormat() : this(0, 0) {
}
- public StringFormat(StringFormatFlags options):this(options,0)
- {
+ public StringFormat(StringFormatFlags options) :
this(options,0) {
}
-// ~StringFormat()
-// {
-// Dispose ();
-// }
+ public StringFormat(StringFormatFlags options, int lang) {
+ _alignment = StringAlignment.Near;
+ _digitSubstituteLanguage = lang;
+ _digitSubstituteMethod = StringDigitSubstitute.User;
+ _flags = options;
+ _hotkeyPrefix = HotkeyPrefix.None;
+ _lineAlignment = StringAlignment.Near;
+ _trimming = StringTrimming.Character;
+ }
- public void Dispose()
- {
+ public StringFormat (StringFormat source) {
+ if (source == null)
+ throw new ArgumentNullException("format");
+
+ _alignment = source.LineAlignment;
+ _digitSubstituteLanguage =
source.DigitSubstitutionLanguage;
+ _digitSubstituteMethod = source.DigitSubstitutionMethod;
+ _flags = source.FormatFlags;
+ _hotkeyPrefix = source.HotkeyPrefix;
+ _lineAlignment = source.LineAlignment;
+ _trimming = source.Trimming;
}
- public StringFormat (StringFormat source)
- {
- Alignment = source.Alignment;
- LineAlignment = source.LineAlignment;
- HotkeyPrefix = source.HotkeyPrefix;
- subst = source.subst;
- flags = source.flags;
+ #endregion
+
+ #region IDisposable
+
+ public void Dispose() {
}
-
- public StringAlignment Alignment
- {
- get
- {
- return alignment;
+ #endregion
+
+ #region Public properties
+
+ public StringAlignment Alignment {
+ get {
+ return _alignment;
}
- set
- {
- alignment = value;
+ set {
+ _alignment = value;
}
}
- public StringAlignment LineAlignment
- {
- get
- {
- return linealignment;
+ public StringAlignment LineAlignment {
+ get {
+ return _lineAlignment;
}
- set
- {
- linealignment = value;
+ set {
+ _lineAlignment = value;
}
}
- public StringFormatFlags FormatFlags
- {
- get
- {
- return flags;
+ public StringFormatFlags FormatFlags {
+ get {
+ return _flags;
}
- set
- {
- flags = value;
+ set {
+ _flags = value;
}
}
- public HotkeyPrefix HotkeyPrefix
- {
- get
- {
- return prefix;
+ public HotkeyPrefix HotkeyPrefix {
+ get {
+ return _hotkeyPrefix;
}
- set
- {
- prefix = value;
+ set {
+ _hotkeyPrefix = value;
}
}
-
- public StringTrimming Trimming
- {
- get
- {
- return trimming;
+ public StringTrimming Trimming {
+ get {
+ return _trimming;
}
- set
- {
- trimming = value;
+ set {
+ _trimming = value;
}
}
- public static StringFormat GenericDefault
- {
- get
- {
- return genericDefault;
+ public int DigitSubstitutionLanguage {
+ get {
+ return _digitSubstituteLanguage;
}
}
-
-
- public int DigitSubstitutionLanguage
- {
- get
- {
- return language;
+
+ public StringDigitSubstitute DigitSubstitutionMethod {
+ get {
+ return _digitSubstituteMethod;
}
}
-
- public static StringFormat GenericTypographic
- {
- get
- {
- throw new NotImplementedException();
+
+ #endregion
+
+ #region static properties
+
+ public static StringFormat GenericDefault {
+ get {
+ StringFormat genericDefault = new
StringFormat();
+ return genericDefault;
}
}
-
- public StringDigitSubstitute DigitSubstitutionMethod
- {
- get
- {
- return subst;
+
+ public static StringFormat GenericTypographic {
+ get {
+ StringFormat genericTypographic = new
StringFormat(
+ StringFormatFlags.FitBlackBox |
+ StringFormatFlags.LineLimit |
+ StringFormatFlags.NoClip,
+ 0 );
+ genericTypographic.Trimming =
StringTrimming.None;
+ return genericTypographic;
}
}
+ #endregion
- public void SetMeasurableCharacterRanges (CharacterRange []
range)
- {
- CharRanges=(CharacterRange [])range.Clone();
+ #region public methods
+
+ public void SetMeasurableCharacterRanges (CharacterRange []
range) {
+ _charRanges = (CharacterRange [])range.Clone();
}
- internal CharacterRange [] GetCharRanges
- {
- get
- {
- return(CharRanges);
+ internal CharacterRange [] GetCharRanges {
+ get {
+ return _charRanges;
}
}
- public object Clone()
- {
- throw new NotImplementedException();
+ public object Clone() {
+ StringFormat copy = (StringFormat)MemberwiseClone();
+ copy._charRanges = (CharacterRange
[])_charRanges.Clone();
+ copy._tabStops = (float[])_tabStops.Clone();
+ return copy;
}
- public override string ToString()
- {
+ public override string ToString() {
return "[StringFormat, FormatFlags=" +
this.FormatFlags.ToString() + "]";
}
- public void SetTabStops(float firstTabOffset, float[] tabStops)
- {
- this.firstTabOffset = firstTabOffset;
- this.tabStops = tabStops;
+ public void SetTabStops(float firstTabOffset, float[] tabStops)
{
+ _firstTabOffset = firstTabOffset;
+ _tabStops = (float[])tabStops.Clone();
}
- public void SetDigitSubstitution(int language,
StringDigitSubstitute substitute)
- {
- subst = substitute;
+ public void SetDigitSubstitution(int language,
StringDigitSubstitute substitute) {
+ _digitSubstituteMethod = substitute;
+ _digitSubstituteLanguage = language;
}
- public float[] GetTabStops(out float firstTabOffset)
- {
- firstTabOffset = this.firstTabOffset;
- return this.tabStops;
+ public float[] GetTabStops(out float firstTabOffset) {
+ firstTabOffset = _firstTabOffset;
+ return (float[])_tabStops.Clone();
}
+ #endregion
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
