From: Scott Gilbertson <scottg@mantatest.com>
Date: Thu, 12 Jun 2003 03:08:58 +0000 (+0000)
Subject: IntegerGraphicsState.java (drawOval): implemented.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a28853b01b9dfd09dee90709718cee54d1836118;p=gcc.git

IntegerGraphicsState.java (drawOval): implemented.

2003-06-11  Scott Gilbertson  <scottg@mantatest.com>

	* gnu/awt/j2d/IntegerGraphicsState.java (drawOval): implemented.
	(fillOval): implemented
	* gnu/awt/xlib/XGraphics.java (drawArc): implemented.
	(fillArc): implemented.
	* gnu/gcj/xlib/GC.java (drawArc): added native method.
	(fillArc): added native method.
	* gnu/gcj/xlib/natGC.cc (drawArc): added native method.
	(fillArc): added native method.

From-SVN: r67810
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 4ce1281dd22..f5a7dc60f4c 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,14 @@
+2003-06-11  Scott Gilbertson  <scottg@mantatest.com>
+
+	* gnu/awt/j2d/IntegerGraphicsState.java (drawOval): implemented.
+	(fillOval): implemented
+	* gnu/awt/xlib/XGraphics.java (drawArc): implemented.
+	(fillArc): implemented.
+	* gnu/gcj/xlib/GC.java (drawArc): added native method.
+	(fillArc): added native method.
+	* gnu/gcj/xlib/natGC.cc (drawArc): added native method.
+	(fillArc): added native method.
+
 2003-06-11  Michael Koch  <konqueror@gmx.de>
 
 	* java/awt/im/InputSubset.java:
diff --git a/libjava/gnu/awt/j2d/IntegerGraphicsState.java b/libjava/gnu/awt/j2d/IntegerGraphicsState.java
index bfea6611ca5..3befcb41707 100644
--- a/libjava/gnu/awt/j2d/IntegerGraphicsState.java
+++ b/libjava/gnu/awt/j2d/IntegerGraphicsState.java
@@ -187,13 +187,13 @@ public class IntegerGraphicsState extends AbstractGraphicsState
   public void drawOval(int x, int y,
 		       int width, int height)
   {
-    throw new UnsupportedOperationException("not implemented yet");
+    drawArc (x, y, width, height, 0, 360);
   }
   
   public void fillOval(int x, int y,
 		       int width, int height)
   {
-    throw new UnsupportedOperationException("not implemented yet");
+    fillArc (x, y, width, height, 0, 360);
   }
 
   public void drawArc(int x, int y,
diff --git a/libjava/gnu/awt/xlib/XGraphics.java b/libjava/gnu/awt/xlib/XGraphics.java
index 47ab2b85145..9f29fa5b94a 100644
--- a/libjava/gnu/awt/xlib/XGraphics.java
+++ b/libjava/gnu/awt/xlib/XGraphics.java
@@ -156,13 +156,13 @@ public class XGraphics implements Cloneable, DirectRasterGraphics
   public void drawArc(int x, int y, int width, int height, int
 		      startAngle, int arcAngle)
   {
-    throw new UnsupportedOperationException("not implemented");
+    context.drawArc (x, y, width, height, startAngle, arcAngle);
   }
     
   public void fillArc(int x, int y, int width, int height, int
 		      startAngle, int arcAngle)
   {
-    throw new UnsupportedOperationException("not implemented");
+    context.fillArc (x, y, width, height, startAngle, arcAngle);
   }
     
   public void drawPolyline(int[] xPoints, int[] yPoints, int
diff --git a/libjava/gnu/gcj/xlib/GC.java b/libjava/gnu/gcj/xlib/GC.java
index 2c4d8a81f6a..021f53756fb 100644
--- a/libjava/gnu/gcj/xlib/GC.java
+++ b/libjava/gnu/gcj/xlib/GC.java
@@ -110,6 +110,11 @@ public class GC implements Cloneable
   public native void fillRectangle(int x, int y, int w, int h);
   public native void fillPolygon(int[] xPoints, int[] yPoints, int nPoints,
 				 int translateX, int translateY);
+  
+  public native void drawArc(int x, int y, int w, int h,
+			     int startAngle, int arcAngle);
+  public native void fillArc(int x, int y, int w, int h,
+			     int startAngle, int arcAngle);
 
   /** 
    * 
diff --git a/libjava/gnu/gcj/xlib/natGC.cc b/libjava/gnu/gcj/xlib/natGC.cc
index 71f83f5dcce..fd9fca84564 100644
--- a/libjava/gnu/gcj/xlib/natGC.cc
+++ b/libjava/gnu/gcj/xlib/natGC.cc
@@ -147,6 +147,24 @@ void gnu::gcj::xlib::GC::fillRectangle(jint x, jint y, jint w, jint h)
   // no fast fail
 }
 
+void gnu::gcj::xlib::GC::drawArc(jint x, jint y, jint w, jint h,jint startAngle, jint arcAngle)
+{
+  Display* display = target->getDisplay();
+  ::Display* dpy = (::Display*) (display->display);
+  ::Drawable drawableXID = target->getXID();
+  ::GC gc = (::GC) structure;
+  XDrawArc(dpy, drawableXID, gc, x, y, w, h, startAngle * 64, arcAngle * 64);
+}
+
+void gnu::gcj::xlib::GC::fillArc(jint x, jint y, jint w, jint h,jint startAngle, jint arcAngle)
+{
+  Display* display = target->getDisplay();
+  ::Display* dpy = (::Display*) (display->display);
+  ::Drawable drawableXID = target->getXID();
+  ::GC gc = (::GC) structure;
+  XFillArc(dpy, drawableXID, gc, x, y, w, h, startAngle * 64, arcAngle * 64);
+}
+
 void gnu::gcj::xlib::GC::fillPolygon(jintArray xPoints, jintArray yPoints,
 				     jint nPoints,
 				     jint translateX, jint translateY)