Author: noaml
Date: 2007-04-24 16:56:12 -0400 (Tue, 24 Apr 2007)
New Revision: 76224
Modified:
branches/mainsoft/gh20/mcs/class/System.Drawing/System.Drawing.Drawing2D/Matrix.jvm.cs
branches/mainsoft/gh20/mcs/class/System.Drawing/System.Drawing.Text/LineLayout.jvm.cs
branches/mainsoft/gh20/mcs/class/System.Drawing/System.Drawing/Graphics.jvm.cs
branches/mainsoft/gh20/mcs/class/System.Drawing/System.Drawing/Pen.jvm.cs
branches/mainsoft/gh20/mcs/class/System.Drawing/System.Drawing/Region.jvm.cs
Log:
Changed MemberwiseClone back to clone
Modified:
branches/mainsoft/gh20/mcs/class/System.Drawing/System.Drawing/Graphics.jvm.cs
===================================================================
---
branches/mainsoft/gh20/mcs/class/System.Drawing/System.Drawing/Graphics.jvm.cs
2007-04-24 20:07:38 UTC (rev 76223)
+++
branches/mainsoft/gh20/mcs/class/System.Drawing/System.Drawing/Graphics.jvm.cs
2007-04-24 20:56:12 UTC (rev 76224)
@@ -283,7 +283,7 @@
try {
geom.AffineTransform t =
GetFinalTransform();
if (!oldT.isIdentity()) {
- t =
(geom.AffineTransform)t.MemberwiseClone();
+ t =
(geom.AffineTransform)t.clone();
t.preConcatenate(oldT);
}
@@ -352,7 +352,7 @@
oldT = NativeObject.getTransform();
geom.AffineTransform t = GetFinalTransform();
if (!oldT.isIdentity()) {
- t = (geom.AffineTransform)
t.MemberwiseClone ();
+ t = (geom.AffineTransform) t.clone ();
t.preConcatenate(oldT);
}
shape = GetNormalizedShape(shape, t);
@@ -1421,7 +1421,7 @@
geom.AffineTransform t = GetFinalTransform();
if (!t.isIdentity()) {
- area = (geom.Area) area.MemberwiseClone ();
+ area = (geom.Area) area.clone ();
area.transform(t);
}
@@ -1667,7 +1667,7 @@
geom.AffineTransform t = GetFinalTransform();
if (!t.isIdentity()) {
- area = (geom.Area) area.MemberwiseClone ();
+ area = (geom.Area) area.clone ();
area.transform(t);
}
@@ -2011,7 +2011,7 @@
if(region == null)
throw new ArgumentNullException("region");
- CombineClipArea ((geom.Area)
region.NativeObject.MemberwiseClone (), combineMode);
+ CombineClipArea ((geom.Area) region.NativeObject.clone
(), combineMode);
}
public void SetClip (GraphicsPath path, CombineMode
combineMode) {
Modified:
branches/mainsoft/gh20/mcs/class/System.Drawing/System.Drawing/Pen.jvm.cs
===================================================================
--- branches/mainsoft/gh20/mcs/class/System.Drawing/System.Drawing/Pen.jvm.cs
2007-04-24 20:07:38 UTC (rev 76223)
+++ branches/mainsoft/gh20/mcs/class/System.Drawing/System.Drawing/Pen.jvm.cs
2007-04-24 20:56:12 UTC (rev 76224)
@@ -18,10 +18,10 @@
using awt = java.awt;
using geom = java.awt.geom;
-namespace System.Drawing
+namespace System.Drawing
{
- public sealed class Pen : MarshalByRefObject, ICloneable, IDisposable,
awt.Stroke
+ public sealed class Pen : MarshalByRefObject, ICloneable, IDisposable,
awt.Stroke
{
#region Member Vars
@@ -80,14 +80,14 @@
// Properties
//
#region Alignment [TODO]
- public PenAlignment Alignment
+ public PenAlignment Alignment
{
- get
+ get
{
return _alignment;
}
- set
+ set
{
EnsureModifiable();
_alignment = value;
@@ -96,14 +96,14 @@
#endregion
#region Brush
- public Brush Brush
+ public Brush Brush
{
- get
+ get
{
return _brush;
}
- set
+ set
{
EnsureModifiable();
if (value == null)
@@ -114,9 +114,9 @@
#endregion
#region Color
- public Color Color
+ public Color Color
{
- get
+ get
{
if(Brush is SolidBrush)
return ((SolidBrush)Brush).Color;
@@ -126,7 +126,7 @@
return Color.Empty;
}
- set
+ set
{
EnsureModifiable();
_brush = new SolidBrush (value);
@@ -148,14 +148,14 @@
#region CustomEndCap [TODO]
[MonoTODO]
- public CustomLineCap CustomEndCap
+ public CustomLineCap CustomEndCap
{
- get
+ get
{
throw new NotImplementedException ();
}
// do a check for isModifiable when implementing this
property
- set
+ set
{
throw new NotImplementedException ();
}
@@ -164,15 +164,15 @@
#region CustomStartCap [TODO]
[MonoTODO]
- public CustomLineCap CustomStartCap
+ public CustomLineCap CustomStartCap
{
- get
+ get
{
throw new NotImplementedException ();
}
// do a check for isModifiable when implementing this
property
- set
+ set
{
throw new NotImplementedException ();
}
@@ -194,15 +194,15 @@
#endregion
#region DashOffset
- public float DashOffset
+ public float DashOffset
{
- get
+ get
{
return _dashOffset;
}
- set
+ set
{
EnsureModifiable();
_dashOffset = value;
@@ -212,14 +212,14 @@
#region DashPattern
- public float [] DashPattern
+ public float [] DashPattern
{
- get
+ get
{
return (float [])_dashPattern.Clone();
}
- set
+ set
{
EnsureModifiable();
@@ -230,14 +230,14 @@
#endregion
#region DashStyle
- public DashStyle DashStyle
+ public DashStyle DashStyle
{
- get
+ get
{
return _dashStyle;
}
- set
+ set
{
EnsureModifiable();
_dashStyle = value;
@@ -261,14 +261,14 @@
#region EndCap
[MonoTODO]
- public LineCap EndCap
+ public LineCap EndCap
{
- get
+ get
{
return _endCap;
}
- set
+ set
{
EnsureModifiable();
@@ -293,15 +293,15 @@
#endregion
#region MiterLimit
- public float MiterLimit
+ public float MiterLimit
{
- get
+ get
{
return _miterLimit;
}
- set
+ set
{
EnsureModifiable();
@@ -312,9 +312,9 @@
#endregion
#region PenType
- public PenType PenType
+ public PenType PenType
{
- get
+ get
{
if (Brush is TextureBrush)
return PenType.TextureFill;
@@ -331,14 +331,14 @@
#endregion
#region Transform
- public Matrix Transform
+ public Matrix Transform
{
- get
+ get
{
return _transform.Clone();
}
- set
+ set
{
EnsureModifiable();
@@ -348,13 +348,13 @@
#endregion
#region Width
- public float Width
+ public float Width
{
- get
+ get
{
return _width;
}
- set
+ set
{
EnsureModifiable();
@@ -366,12 +366,12 @@
#region Clone
public object Clone ()
{
- Pen clone = (Pen)MemberwiseClone();
- if (clone._transform != null)
- clone._transform = clone._transform.Clone();
- if (clone._dashPattern != null)
- clone._dashPattern =
(float[])clone._dashPattern.Clone();
- return clone;
+ Pen _clone = (Pen)MemberwiseClone();
+ if (_clone._transform != null)
+ _clone._transform = _clone._transform.Clone();
+ if (_clone._dashPattern != null)
+ _clone._dashPattern =
(float[])_clone._dashPattern.Clone();
+ return _clone;
}
#endregion
@@ -477,19 +477,19 @@
internal awt.Stroke GetNativeObject(geom.AffineTransform
outputTransform, PenFit penFit) {
return GetNativeObject(null, outputTransform, penFit);
}
- /// <summary>
- ///
- /// </summary>
- /// <param name="outputTransform">transform which will be
applied on the final shape</param>
- /// <param name="fitPen">ensure the shape will wide enough to
be visible</param>
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="outputTransform">transform which will be
applied on the final shape</param>
+ /// <param name="fitPen">ensure the shape will wide enough to
be visible</param>
/// <returns></returns>
internal awt.Stroke GetNativeObject(geom.AffineTransform
penTransform, geom.AffineTransform outputTransform, PenFit penFit) {
- float[] dashPattern = null;
-
- switch (DashStyle) {
- case DashStyle.Custom:
- if (_dashPattern != null) {
- dashPattern = new
float[_dashPattern.Length];
+ float[] dashPattern = null;
+
+ switch (DashStyle) {
+ case DashStyle.Custom:
+ if (_dashPattern != null) {
+ dashPattern = new
float[_dashPattern.Length];
for(int i = 0; i <
_dashPattern.Length; i++) {
if (EndCap ==
LineCap.Flat)
@@ -505,24 +505,24 @@
// add
the size of caps to the transparent parts
dashPattern[i] = (_dashPattern[i] * Width) + Width;
}
- }
- }
- break;
- case DashStyle.Dash:
- dashPattern = DASH_ARRAY;
- break;
- case DashStyle.DashDot:
- dashPattern = DASHDOT_ARRAY;
- break;
- case DashStyle.DashDotDot:
- dashPattern = DASHDOTDOT_ARRAY;
- break;
-
- // default:
- // case
DashStyle.Solid:
- //
break;
- }
-
+ }
+ }
+ break;
+ case DashStyle.Dash:
+ dashPattern = DASH_ARRAY;
+ break;
+ case DashStyle.DashDot:
+ dashPattern = DASHDOT_ARRAY;
+ break;
+ case DashStyle.DashDotDot:
+ dashPattern = DASHDOTDOT_ARRAY;
+ break;
+
+ // default:
+ // case
DashStyle.Solid:
+ //
break;
+ }
+
int join;
switch (LineJoin) {
case LineJoin.Bevel:
@@ -534,14 +534,14 @@
join = java.awt.BasicStroke.JOIN_MITER;
break;
case LineJoin.Round:
- join = java.awt.BasicStroke.JOIN_ROUND;
- break;
- }
-
- // We go by End cap for now.
- int cap;
- switch (EndCap) {
- default:
+ join = java.awt.BasicStroke.JOIN_ROUND;
+ break;
+ }
+
+ // We go by End cap for now.
+ int cap;
+ switch (EndCap) {
+ default:
case LineCap.Square:
case LineCap.SquareAnchor:
cap = awt.BasicStroke.CAP_SQUARE;
@@ -552,26 +552,26 @@
break;
case LineCap.Flat:
cap = awt.BasicStroke.CAP_BUTT;
- break;
- }
-
- geom.AffineTransform penT = _transform.NativeObject;
- if (penTransform != null && !penTransform.isIdentity())
{
- penT = (geom.AffineTransform)
penT.MemberwiseClone();
- penT.concatenate(penTransform);
- }
-
- return StrokeFactory.CreateStroke(Width, cap,
- join, MiterLimit, dashPattern, DashOffset,
+ break;
+ }
+
+ geom.AffineTransform penT = _transform.NativeObject;
+ if (penTransform != null && !penTransform.isIdentity())
{
+ penT = (geom.AffineTransform) penT.clone();
+ penT.concatenate(penTransform);
+ }
+
+ return StrokeFactory.CreateStroke(Width, cap,
+ join, MiterLimit, dashPattern, DashOffset,
penT, outputTransform, penFit);
}
- #region Stroke Members
-
- awt.Shape awt.Stroke.createStrokedShape(awt.Shape arg_0) {
- return GetNativeObject(null,
PenFit.NotThin).createStrokedShape(arg_0);
- }
-
+ #region Stroke Members
+
+ awt.Shape awt.Stroke.createStrokedShape(awt.Shape arg_0) {
+ return GetNativeObject(null,
PenFit.NotThin).createStrokedShape(arg_0);
+ }
+
#endregion
}
}
Modified:
branches/mainsoft/gh20/mcs/class/System.Drawing/System.Drawing/Region.jvm.cs
===================================================================
---
branches/mainsoft/gh20/mcs/class/System.Drawing/System.Drawing/Region.jvm.cs
2007-04-24 20:07:38 UTC (rev 76223)
+++
branches/mainsoft/gh20/mcs/class/System.Drawing/System.Drawing/Region.jvm.cs
2007-04-24 20:56:12 UTC (rev 76224)
@@ -29,7 +29,7 @@
public Region ()
- : this ((geom.Area)
InfiniteRegion.NativeObject.MemberwiseClone ())
+ : this ((geom.Area) InfiniteRegion.NativeObject.clone
())
{
}
@@ -140,7 +140,7 @@
{
if (region == null)
throw new ArgumentNullException("region");
- geom.Area a = (geom.Area)
region.NativeObject.MemberwiseClone ();
+ geom.Area a = (geom.Area) region.NativeObject.clone ();
a.subtract(NativeObject);
Shape = a;
}
@@ -338,7 +338,7 @@
#region MakeInfinite
public void MakeInfinite()
{
- Shape = (geom.Area)
InfiniteRegion.NativeObject.MemberwiseClone ();
+ Shape = (geom.Area) InfiniteRegion.NativeObject.clone
();
}
#endregion
@@ -382,7 +382,7 @@
#region Clone
public Region Clone()
{
- return new Region ((geom.Area)
NativeObject.MemberwiseClone ());
+ return new Region ((geom.Area) NativeObject.clone ());
}
#endregion
}
Modified:
branches/mainsoft/gh20/mcs/class/System.Drawing/System.Drawing.Drawing2D/Matrix.jvm.cs
===================================================================
---
branches/mainsoft/gh20/mcs/class/System.Drawing/System.Drawing.Drawing2D/Matrix.jvm.cs
2007-04-24 20:07:38 UTC (rev 76223)
+++
branches/mainsoft/gh20/mcs/class/System.Drawing/System.Drawing.Drawing2D/Matrix.jvm.cs
2007-04-24 20:56:12 UTC (rev 76224)
@@ -119,7 +119,7 @@
public Matrix Clone()
{
- return new Matrix ((geom.AffineTransform)
NativeObject.MemberwiseClone ());
+ return new Matrix ((geom.AffineTransform)
NativeObject.clone ());
}
Modified:
branches/mainsoft/gh20/mcs/class/System.Drawing/System.Drawing.Text/LineLayout.jvm.cs
===================================================================
---
branches/mainsoft/gh20/mcs/class/System.Drawing/System.Drawing.Text/LineLayout.jvm.cs
2007-04-24 20:07:38 UTC (rev 76223)
+++
branches/mainsoft/gh20/mcs/class/System.Drawing/System.Drawing.Text/LineLayout.jvm.cs
2007-04-24 20:56:12 UTC (rev 76224)
@@ -29,9 +29,9 @@
using System;
using System.Drawing.Drawing2D;
-using font = java.awt.font;
+using font = java.awt.font;
using text = java.text;
-using awt = java.awt;
+using awt = java.awt;
using geom = java.awt.geom;
namespace System.Drawing.Text {
@@ -66,11 +66,11 @@
get { return _accumulatedHeight; }
}
- internal float MeasureWidth {
- get {
- return Width + (_lineIter.Margin*2);
- }
- }
+ internal float MeasureWidth {
+ get {
+ return Width + (_lineIter.Margin*2);
+ }
+ }
internal int CharacterCount {
get { return _layout.getCharacterCount(); }
@@ -86,70 +86,70 @@
public float Leading {
get { return _layout.getLeading(); }
- }
-
- internal float NativeY {
- get {
- if (_lineIter.Format.IsVertical) {
- float height = _lineIter.Height;
- if (float.IsPositiveInfinity(height))
- height = 0;
- switch (_lineIter.Format.Alignment) {
- case StringAlignment.Center:
- return (height - Width)
/ 2;
- case StringAlignment.Far:
- return height -
_layout.getVisibleAdvance() - _lineIter.Margin;
- default:
- return _lineIter.Margin;
- }
- }
- else
- return AccumulatedHeight + Ascent;
- }
- }
-
- internal float NativeX {
- get {
- float width = _lineIter.Width;
- if (float.IsPositiveInfinity(width))
- width = 0;
- if (_lineIter.Format.IsVertical)
- return (_lineIter.Format.IsRightToLeft)
?
- width - AccumulatedHeight -
Ascent :
- AccumulatedHeight + Leading +
Descent;
- else {
- float xOffset;
- switch ( _lineIter.Format.Alignment) {
- case StringAlignment.Center:
- xOffset = (width -
Width) / 2;
- break;
- case StringAlignment.Far:
- if
(_lineIter.Format.IsRightToLeft)
- xOffset =
_lineIter.Margin;
- else
- xOffset = width
- _layout.getVisibleAdvance() - _lineIter.Margin;
- break;
- default:
- if
(_lineIter.Format.IsRightToLeft)
- xOffset = width
- _layout.getVisibleAdvance() - _lineIter.Margin;
- else
- xOffset =
_lineIter.Margin;
- break;
- }
-
- return xOffset;
- }
- }
}
- internal float Height {
- get {
- return Ascent + Descent + Leading;
- }
- }
-
- internal float Width {
+ internal float NativeY {
get {
+ if (_lineIter.Format.IsVertical) {
+ float height = _lineIter.Height;
+ if (float.IsPositiveInfinity(height))
+ height = 0;
+ switch (_lineIter.Format.Alignment) {
+ case StringAlignment.Center:
+ return (height - Width)
/ 2;
+ case StringAlignment.Far:
+ return height -
_layout.getVisibleAdvance() - _lineIter.Margin;
+ default:
+ return _lineIter.Margin;
+ }
+ }
+ else
+ return AccumulatedHeight + Ascent;
+ }
+ }
+
+ internal float NativeX {
+ get {
+ float width = _lineIter.Width;
+ if (float.IsPositiveInfinity(width))
+ width = 0;
+ if (_lineIter.Format.IsVertical)
+ return (_lineIter.Format.IsRightToLeft)
?
+ width - AccumulatedHeight -
Ascent :
+ AccumulatedHeight + Leading +
Descent;
+ else {
+ float xOffset;
+ switch ( _lineIter.Format.Alignment) {
+ case StringAlignment.Center:
+ xOffset = (width -
Width) / 2;
+ break;
+ case StringAlignment.Far:
+ if
(_lineIter.Format.IsRightToLeft)
+ xOffset =
_lineIter.Margin;
+ else
+ xOffset = width
- _layout.getVisibleAdvance() - _lineIter.Margin;
+ break;
+ default:
+ if
(_lineIter.Format.IsRightToLeft)
+ xOffset = width
- _layout.getVisibleAdvance() - _lineIter.Margin;
+ else
+ xOffset =
_lineIter.Margin;
+ break;
+ }
+
+ return xOffset;
+ }
+ }
+ }
+
+ internal float Height {
+ get {
+ return Ascent + Descent + Leading;
+ }
+ }
+
+ internal float Width {
+ get {
if (_lineIter.Format.MeasureTrailingSpaces)
if (!(_lineIter.Format.IsRightToLeft ^
(_lineIter.Format.Alignment ==
StringAlignment.Far)))
@@ -163,22 +163,22 @@
#region Methods
- internal void Draw(awt.Graphics2D g2d, float x, float y) {
- if (_lineIter.Format.IsVertical)
- _layout.draw(g2d, y + NativeY, -(x + NativeX) );
- else
- _layout.draw(g2d, x + NativeX, y + NativeY );
+ internal void Draw(awt.Graphics2D g2d, float x, float y) {
+ if (_lineIter.Format.IsVertical)
+ _layout.draw(g2d, y + NativeY, -(x + NativeX) );
+ else
+ _layout.draw(g2d, x + NativeX, y + NativeY );
}
- internal awt.Shape GetOutline(float x, float y) {
- geom.AffineTransform t = (geom.AffineTransform)
_lineIter.Transform.MemberwiseClone();
-
- if (_lineIter.Format.IsVertical)
- t.translate(y + NativeY, -(x + NativeX));
- else
- t.translate(x + NativeX, y + NativeY);
-
- return _layout.getOutline(t);
+ internal awt.Shape GetOutline(float x, float y) {
+ geom.AffineTransform t = (geom.AffineTransform)
_lineIter.Transform.clone();
+
+ if (_lineIter.Format.IsVertical)
+ t.translate(y + NativeY, -(x + NativeX));
+ else
+ t.translate(x + NativeX, y + NativeY);
+
+ return _layout.getOutline(t);
}
#endregion
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
