[cp-patches] FYI: javax.swing.text merging from libgcj gui branch

[Mark Wielaard]

Hi,

This merges in the work of Michael on javax.swing from the gui branch.

2004-07-31  Michael Koch  <address@hidden>

       * javax/swing/JFormattedTextField.java
       (JFormattedTextField): Implemented.
       * javax/swing/text/DefaultEditorKit.java
       (BeepAction): New inner class.
       * javax/swing/text/Segment.java
       (partialReturn): New field.
       (setPartialReturn): New method.
       (isPartialReturn): Likewise.
       * javax/swing/text/View.java
       (createFragment): Fixed typo.
       (getStartOffset): New method.
       (getEndOffset): Likewise.

Committed.

Index: javax/swing/JFormattedTextField.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JFormattedTextField.java,v
retrieving revision 1.3.2.4
diff -u -b -B -r1.3.2.4 JFormattedTextField.java
--- javax/swing/JFormattedTextField.java        20 Jul 2004 19:36:46 -0000      
1.3.2.4
+++ javax/swing/JFormattedTextField.java        21 Jul 2004 09:02:32 -0000
@@ -135,7 +135,7 @@
   
   public JFormattedTextField ()
   {
-    throw new InternalError ("not implemented");
+    this((AbstractFormatterFactory) null);
   }
 
   public JFormattedTextField (Format format)
@@ -150,7 +150,7 @@
 
   public JFormattedTextField (AbstractFormatterFactory factory)
   {
-    throw new InternalError ("not implemented");
+    this(factory, null);
   }
 
   public JFormattedTextField (AbstractFormatterFactory factory, Object value)
Index: javax/swing/text/DefaultEditorKit.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/DefaultEditorKit.java,v
retrieving revision 1.4.8.3
diff -u -b -B -r1.4.8.3 DefaultEditorKit.java
--- javax/swing/text/DefaultEditorKit.java      29 Jun 2004 09:59:11 -0000      
1.4.8.3
+++ javax/swing/text/DefaultEditorKit.java      21 Jul 2004 09:02:32 -0000
@@ -37,6 +37,8 @@
 
 package javax.swing.text;
 
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
 import java.io.InputStream;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -48,7 +50,22 @@
 
 public class DefaultEditorKit extends EditorKit
 {
+  public static class BeepAction
+    extends TextAction
+  {
+    public BeepAction()
+    {
+      super(beepAction);
+    }
+
+    public void actionPerformed(ActionEvent event)
+    {
+      Toolkit.getDefaultToolkit().beep();
+    }
+  }
+
   private static final long serialVersionUID = 9017245433028523428L;
+  
   public static final String backwardAction = "caret-backward";
   public static final String beepAction = "beep";
   public static final String beginAction = "caret-begin";
Index: javax/swing/text/Segment.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/Segment.java,v
retrieving revision 1.2.8.3
diff -u -b -B -r1.2.8.3 Segment.java
--- javax/swing/text/Segment.java       29 Jun 2004 09:59:11 -0000      1.2.8.3
+++ javax/swing/text/Segment.java       21 Jul 2004 09:02:32 -0000
@@ -43,6 +43,8 @@
 public class Segment
   implements Cloneable, CharacterIterator
 {
+  private boolean partialReturn;
+  
   public char[] array;
   public int count;
   public int offset;
@@ -124,4 +126,20 @@
   {
     return new String(array, offset, count);
   }
+
+  /**
+   * @since 1.4
+   */
+  public void setPartialReturn(boolean p)
+  {
+    partialReturn = p;
+  }
+  
+  /**
+   * @since 1.4
+   */
+  public boolean isPartialReturn()
+  {
+    return partialReturn;
+  }
 }
Index: javax/swing/text/View.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/View.java,v
retrieving revision 1.2.8.3
diff -u -b -B -r1.2.8.3 View.java
--- javax/swing/text/View.java  7 Jul 2004 19:14:35 -0000       1.2.8.3
+++ javax/swing/text/View.java  21 Jul 2004 09:02:32 -0000
@@ -161,8 +161,18 @@
 
   public View createFragment(int p0, int p1)
   {
-    // The default implementation doesnt support fragmentation.
+    // The default implementation doesn't support fragmentation.
     return this;
   }
+
+  public int getStartOffset()
+  {
+    return elt.getStartOffset();
+  }
+
+  public int getEndOffset()
+  {
+    return elt.getEndOffset();
+  }
 }

signature.asc
Description: This is a digitally signed message part