Refactoring

svn path=/trunk/mcs/; revision=52970

diff --git a/mcs/class/System.Drawing/System.Drawing/ChangeLog b/mcs/class/System.Drawing/System.Drawing/ChangeLog
index 13e5140619092e4cdd50402557ffc3cebc61d7b7..6a5f657d7a897dd476de7622570841675e029385 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/ChangeLog
+++ b/mcs/class/System.Drawing/System.Drawing/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-13 Konstantin Triger <kostat@mainsoft.com>
+
+        * Font.jvm.cs: Refactoring.
+
 2005-11-13 Konstantin Triger <kostat@mainsoft.com>
 
         * StringFormat.jvm.cs, Graphics.jvm.cs: DrawString,

diff --git a/mcs/class/System.Drawing/System.Drawing/Font.jvm.cs b/mcs/class/System.Drawing/System.Drawing/Font.jvm.cs
index e8e7dbcb08689a1253647982191229f2e0c95923..465064e4c089755b362b9b4d7dc87aa3bd30dbb8 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/Font.jvm.cs
+++ b/mcs/class/System.Drawing/System.Drawing/Font.jvm.cs
@@ -11,9 +11,9 @@ namespace System.Drawing {
 
                #region variables
 
-               private GraphicsUnit _gUnit = GraphicsUnit.Point;
-               private FontFamily _fontFamily;
-               awt.Font _jFont;
+               private readonly GraphicsUnit _gUnit = GraphicsUnit.Point;
+               private readonly FontFamily _fontFamily;
+               private readonly awt.Font _jFont;
 
                #endregion
 
@@ -182,7 +182,7 @@ namespace System.Drawing {
 
                public float Size {
                        get {
-                               return _jFont.getSize2D() / Graphics.UnitConversion[ (int)_gUnit ];
+                               return SizeInPoints / Graphics.UnitConversion[ (int)_gUnit ];
                        }
                }