[cp-patches] FYI: javax.tools stuff

2008-01-09 Thread Roman Kennke
I'm beginning the implementation of javax.tools with two interfaces.

2006-01-09  Roman Kennke  [EMAIL PROTECTED]

* javax/tools/Diagnostic.java,
* javax/tools/DiagnosticListener.java:
New interfaces.

/Roman

-- 
http://kennke.org/blog/
Index: gnu/java/awt/peer/x/XWindowPeer.java
===
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/x/XWindowPeer.java,v
retrieving revision 1.5
diff -u -1 -0 -r1.5 XWindowPeer.java
--- gnu/java/awt/peer/x/XWindowPeer.java	20 Sep 2007 14:01:09 -	1.5
+++ gnu/java/awt/peer/x/XWindowPeer.java	9 Jan 2008 22:05:08 -
@@ -54,20 +54,21 @@
 import java.awt.Rectangle;
 import java.awt.event.PaintEvent;
 import java.awt.event.WindowEvent;
 import java.awt.image.VolatileImage;
 
 import gnu.x11.Atom;
 import gnu.x11.Window;
 import gnu.x11.event.Event;
 
 import gnu.java.awt.font.OpenTypeFontPeer;
+import gnu.java.awt.peer.ClasspathFontPeer;
 import gnu.java.awt.peer.swing.SwingWindowPeer;
 
 public class XWindowPeer
 extends SwingWindowPeer
 {
 
   private static int standardSelect = Event.BUTTON_PRESS_MASK
   | Event.BUTTON_RELEASE_MASK
   | Event.POINTER_MOTION_MASK
   //| Event.RESIZE_REDIRECT_MASK
@@ -283,22 +284,21 @@
 return (Insets) insets.clone();
   }
 
   /**
* Returns the font metrics for the specified font.
*
* @return the font metrics for the specified font
*/
   public FontMetrics getFontMetrics(Font font)
   {
-// FIXME: Fix this for X fonts.
-OpenTypeFontPeer fontPeer = (OpenTypeFontPeer) font.getPeer();
+ClasspathFontPeer fontPeer = (ClasspathFontPeer) font.getPeer();
 return fontPeer.getFontMetrics(font);
   }
 
   /**
* Unregisters the window in the event pump when it is closed.
*/
   protected void finalize()
   {
 XGraphicsDevice dev = XToolkit.getDefaultDevice();
 dev.getEventPump().unregisterWindow(xwindow);


Re: [cp-patches] FYI: javax.tools stuff

2008-01-09 Thread Michael Koch
On Wed, Jan 09, 2008 at 11:13:00PM +0100, Roman Kennke wrote:
 I'm beginning the implementation of javax.tools with two interfaces.
 
 2006-01-09  Roman Kennke  [EMAIL PROTECTED]
 
   * javax/tools/Diagnostic.java,
   * javax/tools/DiagnosticListener.java:
   New interfaces.

Hmmm, that doesnt fit the patch below somehow ;-)


Cheers,
Michael

 /Roman
 
 -- 
 http://kennke.org/blog/

 Index: gnu/java/awt/peer/x/XWindowPeer.java
 ===
 RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/x/XWindowPeer.java,v
 retrieving revision 1.5
 diff -u -1 -0 -r1.5 XWindowPeer.java
 --- gnu/java/awt/peer/x/XWindowPeer.java  20 Sep 2007 14:01:09 -  
 1.5
 +++ gnu/java/awt/peer/x/XWindowPeer.java  9 Jan 2008 22:05:08 -
 @@ -54,20 +54,21 @@
  import java.awt.Rectangle;
  import java.awt.event.PaintEvent;
  import java.awt.event.WindowEvent;
  import java.awt.image.VolatileImage;
  
  import gnu.x11.Atom;
  import gnu.x11.Window;
  import gnu.x11.event.Event;
  
  import gnu.java.awt.font.OpenTypeFontPeer;
 +import gnu.java.awt.peer.ClasspathFontPeer;
  import gnu.java.awt.peer.swing.SwingWindowPeer;
  
  public class XWindowPeer
  extends SwingWindowPeer
  {
  
private static int standardSelect = Event.BUTTON_PRESS_MASK
| Event.BUTTON_RELEASE_MASK
| Event.POINTER_MOTION_MASK
//| Event.RESIZE_REDIRECT_MASK
 @@ -283,22 +284,21 @@
  return (Insets) insets.clone();
}
  
/**
 * Returns the font metrics for the specified font.
 *
 * @return the font metrics for the specified font
 */
public FontMetrics getFontMetrics(Font font)
{
 -// FIXME: Fix this for X fonts.
 -OpenTypeFontPeer fontPeer = (OpenTypeFontPeer) font.getPeer();
 +ClasspathFontPeer fontPeer = (ClasspathFontPeer) font.getPeer();
  return fontPeer.getFontMetrics(font);
}
  
/**
 * Unregisters the window in the event pump when it is closed.
 */
protected void finalize()
{
  XGraphicsDevice dev = XToolkit.getDefaultDevice();
  dev.getEventPump().unregisterWindow(xwindow);




Re: [cp-patches] FYI: javax.tools stuff

2008-01-09 Thread Roman Kennke
Hi,

Am Mittwoch, den 09.01.2008, 23:36 +0100 schrieb Michael Koch:
 On Wed, Jan 09, 2008 at 11:13:00PM +0100, Roman Kennke wrote:
  I'm beginning the implementation of javax.tools with two interfaces.
  
  2006-01-09  Roman Kennke  [EMAIL PROTECTED]
  
  * javax/tools/Diagnostic.java,
  * javax/tools/DiagnosticListener.java:
  New interfaces.
 
 Hmmm, that doesnt fit the patch below somehow ;-)

Ugh. Wrong patch. Here comes the correct thing.

/Roman

-- 
http://kennke.org/blog/
Index: javax/tools/Diagnostic.java
===
RCS file: javax/tools/Diagnostic.java
diff -N javax/tools/Diagnostic.java
--- /dev/null	1 Jan 1970 00:00:00 -
+++ javax/tools/Diagnostic.java	9 Jan 2008 22:12:29 -	1.1
@@ -0,0 +1,167 @@
+/* Diagnostic.java --
+   Copyright (C) 2008  Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.tools;
+
+import java.util.Locale;
+
+/**
+ * Encapsulates diagnostic information from a tool. This usually includes
+ * (but is not required) a position in a source file, line and column number
+ * information and a message.
+ *
+ * @author Roman Kennke ([EMAIL PROTECTED])
+ *
+ * @param S the type of the source object
+ *
+ * @since 1.6
+ */
+public interface DiagnosticS
+{
+  /**
+   * The kind of diagnostic information.
+   */
+  public static enum Kind
+  {
+/**
+ * Indicates and error.
+ */
+ERROR,
+
+/**
+ * Indicates a warning.
+ */
+WARNING,
+
+/**
+ * Indicates a mandatory warning.
+ */
+MANDATORY_WARNING,
+
+/**
+ * Indicates a note.
+ */
+NOTE,
+
+/**
+ * Indicates something else.
+ */
+OTHER
+  }
+
+  /**
+   * Indicates that this diagnostic object doesn't carry position information.
+   */
+  public static final long NOPOS = -1L;
+
+  /**
+   * Returns the kind of this diagnostic object.
+   *
+   * @return the kind of this diagnostic object
+   */
+  Kind getKind();
+
+  /**
+   * Returns the source of this diagnostic object.
+   *
+   * @return the source of this diagnostic object
+   */
+  S getSource();
+
+  /**
+   * Returns the position in the source object. This is a zero based value,
+   * or [EMAIL PROTECTED] # NOPOS}, indicating that this doesn't carry position
+   * information.
+   *
+   * @return the position in the source object
+   */
+  long getPosition();
+
+  /**
+   * Returns the start position in the source object. This is a zero based
+   * value, or [EMAIL PROTECTED] #NOPOS}, indicating that this doesn't carry position
+   * information.
+   *
+   * @return the start position in the source object
+   */
+  long getStartPosition();
+
+  /*
+  * Returns the end position in the source object. This is a zero based
+  * value, or [EMAIL PROTECTED] #NOPOS}, indicating that this doesn't carry position
+  * information.
+  *
+  * @return the end position in the source object
+  */
+  long getEndPosition();
+
+  /**
+   * Returns the line number or [EMAIL PROTECTED] #NOPOS}, indicating that this doesn't
+   * carry position information. This is a 1-based value indicating the line
+   * in the source object.
+   *
+   * @return the line number
+   */
+  long getLineNumber();
+
+  /**
+   * Returns the column number or [EMAIL PROTECTED] #NOPOS}, indicating that this