dotgnu-pnet-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[dotgnu-pnet-commits] pnetlib/System.Drawing Graphics.cs ContentAlign...


From: Deryk Robosson
Subject: [dotgnu-pnet-commits] pnetlib/System.Drawing Graphics.cs ContentAlign...
Date: Thu, 01 Jun 2006 11:55:05 +0000

CVSROOT:        /cvsroot/dotgnu-pnet
Module name:    pnetlib
Branch:         
Changes by:     Deryk Robosson <address@hidden> 06/06/01 11:55:05

Modified files:
        System.Drawing : Graphics.cs ContentAlignment.cs KnownColor.cs 
                         SizeConverter.cs ColorTranslator.cs 
                         RectangleConverter.cs PointConverter.cs 
                         ColorConverter.cs 
        System.Drawing/Imaging: MetafileFrameUnit.cs EmfType.cs 
                                EmfPlusRecordType.cs 
                                EncoderParameterValueType.cs 
                                ImageLockMode.cs PaletteFlags.cs 
        System.Drawing/Printing: Duplex.cs PaperSourceKind.cs 
        System.Drawing/Toolkit: UnixPrintingSystem.cs ToolkitManager.cs 

Log message:
        Use StringBuilder for concats
        Enums should have zero (None) value.
        Test for empty strings using string length.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnetlib/System.Drawing/Graphics.cs.diff?tr1=1.52&tr2=1.53&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnetlib/System.Drawing/ContentAlignment.cs.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnetlib/System.Drawing/KnownColor.cs.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnetlib/System.Drawing/SizeConverter.cs.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnetlib/System.Drawing/ColorTranslator.cs.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnetlib/System.Drawing/RectangleConverter.cs.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnetlib/System.Drawing/PointConverter.cs.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnetlib/System.Drawing/ColorConverter.cs.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnetlib/System.Drawing/Imaging/MetafileFrameUnit.cs.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnetlib/System.Drawing/Imaging/EmfType.cs.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnetlib/System.Drawing/Imaging/EmfPlusRecordType.cs.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnetlib/System.Drawing/Imaging/EncoderParameterValueType.cs.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnetlib/System.Drawing/Imaging/ImageLockMode.cs.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnetlib/System.Drawing/Imaging/PaletteFlags.cs.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnetlib/System.Drawing/Printing/Duplex.cs.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnetlib/System.Drawing/Printing/PaperSourceKind.cs.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnetlib/System.Drawing/Toolkit/UnixPrintingSystem.cs.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnetlib/System.Drawing/Toolkit/ToolkitManager.cs.diff?tr1=1.14&tr2=1.15&r1=text&r2=text

Patches:
Index: pnetlib/System.Drawing/ColorConverter.cs
diff -u pnetlib/System.Drawing/ColorConverter.cs:1.5 
pnetlib/System.Drawing/ColorConverter.cs:1.6
--- pnetlib/System.Drawing/ColorConverter.cs:1.5        Mon Apr 24 13:38:33 2006
+++ pnetlib/System.Drawing/ColorConverter.cs    Thu Jun  1 11:55:04 2006
@@ -165,7 +165,7 @@
 
                                // Extract the string and trim it.
                                String str = ((String)value).Trim();
-                               if(str == String.Empty)
+                               if(str.Length == 0)
                                {
                                        return Color.Empty;
                                }
Index: pnetlib/System.Drawing/ColorTranslator.cs
diff -u pnetlib/System.Drawing/ColorTranslator.cs:1.3 
pnetlib/System.Drawing/ColorTranslator.cs:1.4
--- pnetlib/System.Drawing/ColorTranslator.cs:1.3       Sat Aug  6 11:07:35 2005
+++ pnetlib/System.Drawing/ColorTranslator.cs   Thu Jun  1 11:55:04 2006
@@ -87,7 +87,7 @@
                                        // No: For compatibility
                                        return Color.Empty;
                                }
-                               if(htmlColor=="")
+                               if(htmlColor.Length == 0)
                                {
                                        // throw exception?
                                        // No: For compatibility
Index: pnetlib/System.Drawing/ContentAlignment.cs
diff -u pnetlib/System.Drawing/ContentAlignment.cs:1.2 
pnetlib/System.Drawing/ContentAlignment.cs:1.3
--- pnetlib/System.Drawing/ContentAlignment.cs:1.2      Mon Sep 29 03:56:38 2003
+++ pnetlib/System.Drawing/ContentAlignment.cs  Thu Jun  1 11:55:04 2006
@@ -31,6 +31,7 @@
 #endif
 public enum ContentAlignment
 {
+       None                    = 0x0000,
        TopLeft                 = 0x0001,
        TopCenter               = 0x0002,
        TopRight                = 0x0004,
Index: pnetlib/System.Drawing/Graphics.cs
diff -u pnetlib/System.Drawing/Graphics.cs:1.52 
pnetlib/System.Drawing/Graphics.cs:1.53
--- pnetlib/System.Drawing/Graphics.cs:1.52     Thu May  4 09:44:26 2006
+++ pnetlib/System.Drawing/Graphics.cs  Thu Jun  1 11:55:04 2006
@@ -5729,15 +5729,15 @@
                                        int cf, lf;
 
                                        // set the default return value
-                                       String retval = text.Substring(start, 
length);
+                                       System.Text.StringBuilder retval = new 
System.Text.StringBuilder(text.Substring(start, length));
 
                                        // measure the width of the return value
                                        width = toolkitGraphics.MeasureString
-                                               (retval, MEASURE_LAYOUT_RECT,
+                                               (retval.ToString(), 
MEASURE_LAYOUT_RECT,
                                                 format, out cf, out lf, 
false).Width;
 
                                        // return the text if it fits
-                                       if(width < maxWidth) { return retval; }
+                                       if(width < maxWidth) { return 
retval.ToString(); }
 
                                        // set the middle position
                                        int middle = ((start + (length / 2)) + 
2);
@@ -5777,23 +5777,23 @@
                                                if(width < maxWidth)
                                                {
                                                        // set the return value 
to the pre-removal text
-                                                       retval = text.Substring
-                                                               (start, 
(removeStart - start));
+                                                       retval = new 
System.Text.StringBuilder(text.Substring
+                                                               (start, 
(removeStart - start)));
 
                                                        // append the ellipsis 
to the return value
-                                                       retval += ellipsis;
+                                                       retval.Append(ellipsis);
 
                                                        // append the 
post-removal text to the return value
-                                                       retval += text.Substring
-                                                               (removePos, 
((start + length) - removePos));
+                                                       
retval.Append(text.Substring
+                                                               (removePos, 
((start + length) - removePos)));
 
                                                        // measure the width of 
the return value
                                                        width = 
toolkitGraphics.MeasureString
-                                                               (retval, 
MEASURE_LAYOUT_RECT, format,
+                                                               
(retval.ToString(), MEASURE_LAYOUT_RECT, format,
                                                                 out cf, out 
lf, false).Width;
 
                                                        // return the text if 
it fits
-                                                       if(width < maxWidth) { 
return retval; }
+                                                       if(width < maxWidth) { 
return retval.ToString(); }
                                                }
 
                                                // set the reduced flag
Index: pnetlib/System.Drawing/Imaging/EmfPlusRecordType.cs
diff -u pnetlib/System.Drawing/Imaging/EmfPlusRecordType.cs:1.1 
pnetlib/System.Drawing/Imaging/EmfPlusRecordType.cs:1.2
--- pnetlib/System.Drawing/Imaging/EmfPlusRecordType.cs:1.1     Sat Jun  7 
22:40:58 2003
+++ pnetlib/System.Drawing/Imaging/EmfPlusRecordType.cs Thu Jun  1 11:55:04 2006
@@ -24,6 +24,7 @@
 
 public enum EmfPlusRecordType
 {
+       None                                    = 0,
        EmfMin                                          = 1,
        EmfHeader                                       = 1,
        EmfPolyBezier                           = 2,
Index: pnetlib/System.Drawing/Imaging/EmfType.cs
diff -u pnetlib/System.Drawing/Imaging/EmfType.cs:1.1 
pnetlib/System.Drawing/Imaging/EmfType.cs:1.2
--- pnetlib/System.Drawing/Imaging/EmfType.cs:1.1       Sat Jun  7 22:40:58 2003
+++ pnetlib/System.Drawing/Imaging/EmfType.cs   Thu Jun  1 11:55:04 2006
@@ -24,6 +24,7 @@
 
 public enum EmfType
 {
+       None            = 0,
        EmfOnly     = 3,
        EmfPlusOnly = 4,
        EmfPlusDual = 5
Index: pnetlib/System.Drawing/Imaging/EncoderParameterValueType.cs
diff -u pnetlib/System.Drawing/Imaging/EncoderParameterValueType.cs:1.1 
pnetlib/System.Drawing/Imaging/EncoderParameterValueType.cs:1.2
--- pnetlib/System.Drawing/Imaging/EncoderParameterValueType.cs:1.1     Sat Jun 
 7 22:40:58 2003
+++ pnetlib/System.Drawing/Imaging/EncoderParameterValueType.cs Thu Jun  1 
11:55:04 2006
@@ -24,6 +24,7 @@
 
 public enum EncoderParameterValueType
 {
+       None                            = 0,
        ValueTypeByte                   = 1,
        ValueTypeAscii                  = 2,
        ValueTypeShort                  = 3,
Index: pnetlib/System.Drawing/Imaging/ImageLockMode.cs
diff -u pnetlib/System.Drawing/Imaging/ImageLockMode.cs:1.1 
pnetlib/System.Drawing/Imaging/ImageLockMode.cs:1.2
--- pnetlib/System.Drawing/Imaging/ImageLockMode.cs:1.1 Sat Jun  7 22:40:58 2003
+++ pnetlib/System.Drawing/Imaging/ImageLockMode.cs     Thu Jun  1 11:55:04 2006
@@ -24,6 +24,7 @@
 
 public enum ImageLockMode
 {
+       None                    = 0,
        ReadOnly                = 1,
        WriteOnly               = 2,
        ReadWrite               = 3,
Index: pnetlib/System.Drawing/Imaging/MetafileFrameUnit.cs
diff -u pnetlib/System.Drawing/Imaging/MetafileFrameUnit.cs:1.1 
pnetlib/System.Drawing/Imaging/MetafileFrameUnit.cs:1.2
--- pnetlib/System.Drawing/Imaging/MetafileFrameUnit.cs:1.1     Sat Jun  7 
22:40:58 2003
+++ pnetlib/System.Drawing/Imaging/MetafileFrameUnit.cs Thu Jun  1 11:55:04 2006
@@ -24,6 +24,7 @@
 
 public enum MetafileFrameUnit
 {
+       None                    = 0,
        Pixel                   = 2,
        Point                   = 3,
        Inch                    = 4,
Index: pnetlib/System.Drawing/Imaging/PaletteFlags.cs
diff -u pnetlib/System.Drawing/Imaging/PaletteFlags.cs:1.1 
pnetlib/System.Drawing/Imaging/PaletteFlags.cs:1.2
--- pnetlib/System.Drawing/Imaging/PaletteFlags.cs:1.1  Sat Jun  7 22:40:58 2003
+++ pnetlib/System.Drawing/Imaging/PaletteFlags.cs      Thu Jun  1 11:55:04 2006
@@ -24,6 +24,7 @@
 
 public enum PaletteFlags
 {
+       None            = 0x0000,
        HasAlpha        = 0x0001,
        GrayScale       = 0x0002,
        Halftone        = 0x0004
Index: pnetlib/System.Drawing/KnownColor.cs
diff -u pnetlib/System.Drawing/KnownColor.cs:1.1 
pnetlib/System.Drawing/KnownColor.cs:1.2
--- pnetlib/System.Drawing/KnownColor.cs:1.1    Sat Jun  7 22:40:57 2003
+++ pnetlib/System.Drawing/KnownColor.cs        Thu Jun  1 11:55:04 2006
@@ -24,6 +24,8 @@
 
 public enum KnownColor
 {
+       None                            = 0,
+
        // Special colors.
        ActiveBorder                    = 1,
        ActiveCaption                   = 2,
Index: pnetlib/System.Drawing/PointConverter.cs
diff -u pnetlib/System.Drawing/PointConverter.cs:1.5 
pnetlib/System.Drawing/PointConverter.cs:1.6
--- pnetlib/System.Drawing/PointConverter.cs:1.5        Tue Dec 23 22:07:07 2003
+++ pnetlib/System.Drawing/PointConverter.cs    Thu Jun  1 11:55:04 2006
@@ -78,7 +78,7 @@
 
                                // Extract the string and trim it.
                                String str = ((String)value).Trim();
-                               if(str == String.Empty)
+                               if(str.Length == 0)
                                {
                                        return null;
                                }
Index: pnetlib/System.Drawing/Printing/Duplex.cs
diff -u pnetlib/System.Drawing/Printing/Duplex.cs:1.2 
pnetlib/System.Drawing/Printing/Duplex.cs:1.3
--- pnetlib/System.Drawing/Printing/Duplex.cs:1.2       Wed Sep  3 06:01:27 2003
+++ pnetlib/System.Drawing/Printing/Duplex.cs   Thu Jun  1 11:55:04 2006
@@ -24,6 +24,7 @@
 
 public enum Duplex
 {
+       None            = 0,
        Default         = -1,
        Simplex         = 1,
        Vertical        = 2,
Index: pnetlib/System.Drawing/Printing/PaperSourceKind.cs
diff -u pnetlib/System.Drawing/Printing/PaperSourceKind.cs:1.1 
pnetlib/System.Drawing/Printing/PaperSourceKind.cs:1.2
--- pnetlib/System.Drawing/Printing/PaperSourceKind.cs:1.1      Sat Jun  7 
22:40:58 2003
+++ pnetlib/System.Drawing/Printing/PaperSourceKind.cs  Thu Jun  1 11:55:04 2006
@@ -24,6 +24,7 @@
 
 public enum PaperSourceKind
 {
+       None                    = 0,
        Upper                   = 1,
        Lower                   = 2,
        Middle                  = 3,
Index: pnetlib/System.Drawing/RectangleConverter.cs
diff -u pnetlib/System.Drawing/RectangleConverter.cs:1.4 
pnetlib/System.Drawing/RectangleConverter.cs:1.5
--- pnetlib/System.Drawing/RectangleConverter.cs:1.4    Tue Dec 23 22:07:07 2003
+++ pnetlib/System.Drawing/RectangleConverter.cs        Thu Jun  1 11:55:04 2006
@@ -77,7 +77,7 @@
 
                                // Extract the string and trim it.
                                String str = ((String)value).Trim();
-                               if(str == String.Empty)
+                               if(str.Length == 0)
                                {
                                        return null;
                                }
Index: pnetlib/System.Drawing/SizeConverter.cs
diff -u pnetlib/System.Drawing/SizeConverter.cs:1.4 
pnetlib/System.Drawing/SizeConverter.cs:1.5
--- pnetlib/System.Drawing/SizeConverter.cs:1.4 Tue Dec 23 22:07:07 2003
+++ pnetlib/System.Drawing/SizeConverter.cs     Thu Jun  1 11:55:04 2006
@@ -77,7 +77,7 @@
 
                                // Extract the string and trim it.
                                String str = ((String)value).Trim();
-                               if(str == String.Empty)
+                               if(str.Length == 0)
                                {
                                        return null;
                                }
Index: pnetlib/System.Drawing/Toolkit/ToolkitManager.cs
diff -u pnetlib/System.Drawing/Toolkit/ToolkitManager.cs:1.14 
pnetlib/System.Drawing/Toolkit/ToolkitManager.cs:1.15
--- pnetlib/System.Drawing/Toolkit/ToolkitManager.cs:1.14       Sun Jan 18 
23:03:16 2004
+++ pnetlib/System.Drawing/Toolkit/ToolkitManager.cs    Thu Jun  1 11:55:04 2006
@@ -248,7 +248,7 @@
                                }
 
                                // Bail out if no toolkit name specified.
-                               if(name == null || name == String.Empty)
+                               if(name == null || name.Length == 0)
                                {
                                        return null;
                                }
Index: pnetlib/System.Drawing/Toolkit/UnixPrintingSystem.cs
diff -u pnetlib/System.Drawing/Toolkit/UnixPrintingSystem.cs:1.2 
pnetlib/System.Drawing/Toolkit/UnixPrintingSystem.cs:1.3
--- pnetlib/System.Drawing/Toolkit/UnixPrintingSystem.cs:1.2    Sat Jul 19 
11:04:26 2003
+++ pnetlib/System.Drawing/Toolkit/UnixPrintingSystem.cs        Thu Jun  1 
11:55:04 2006
@@ -36,7 +36,7 @@
                                {
                                        String printer;
                                        printer = 
Environment.GetEnvironmentVariable("PRINTER");
-                                       if(printer != null && printer != 
String.Empty)
+                                       if(printer != null && printer.Length > 
0)
                                        {
                                                return printer;
                                        }




reply via email to

[Prev in Thread] Current Thread [Next in Thread]