From 8f523f3a1047919d3563daf1ef47ba87336ebe89 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mark@gcc.gnu.org>
Date: Tue, 15 Nov 2005 23:20:01 +0000
Subject: Imported GNU Classpath 0.19 + gcj-import-20051115.

       * sources.am: Regenerated.
       * Makefile.in: Likewise.
       * scripts/makemake.tcl: Use glob -nocomplain.

From-SVN: r107049
---
 libjava/classpath/java/awt/im/InputContext.java              |  3 ++-
 libjava/classpath/java/awt/im/InputMethodHighlight.java      |  5 ++++-
 libjava/classpath/java/awt/im/InputMethodRequests.java       |  2 ++
 libjava/classpath/java/awt/im/spi/InputMethod.java           | 10 +++++++---
 libjava/classpath/java/awt/im/spi/InputMethodContext.java    |  4 +++-
 libjava/classpath/java/awt/im/spi/InputMethodDescriptor.java |  3 ++-
 6 files changed, 20 insertions(+), 7 deletions(-)

(limited to 'libjava/classpath/java/awt/im')

diff --git a/libjava/classpath/java/awt/im/InputContext.java b/libjava/classpath/java/awt/im/InputContext.java
index c0505e7..0bb107e 100644
--- a/libjava/classpath/java/awt/im/InputContext.java
+++ b/libjava/classpath/java/awt/im/InputContext.java
@@ -49,6 +49,7 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.URL;
+import java.text.AttributedCharacterIterator.Attribute;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -334,7 +335,7 @@ public class InputContext
 
   /**
    * Starts a reconversion operation in the current input method. The input
-   * method gets theh text to reconvert from the client component, using
+   * method gets the text to reconvert from the client component, using
    * {@link InputMethodRequests#getSelectedText(Attribute[])}. Then the
    * composed and committed text produced by the operation is sent back to
    * the client using a sequence of InputMethodRequests.
diff --git a/libjava/classpath/java/awt/im/InputMethodHighlight.java b/libjava/classpath/java/awt/im/InputMethodHighlight.java
index 0d664b1..6fbe42f 100644
--- a/libjava/classpath/java/awt/im/InputMethodHighlight.java
+++ b/libjava/classpath/java/awt/im/InputMethodHighlight.java
@@ -37,6 +37,9 @@ exception statement from your version. */
 
 package java.awt.im;
 
+import java.awt.Toolkit;
+import java.text.Annotation;
+import java.text.AttributedCharacterIterator;
 import java.util.Map;
 
 /**
@@ -53,7 +56,7 @@ import java.util.Map;
  * text segments.
  *
  * @author Eric Blake (ebb9@email.byu.edu)
- * @see AttributedCharacterIterators
+ * @see AttributedCharacterIterator
  * @see Annotation
  * @since 1.2
  * @status updated to 1.4
diff --git a/libjava/classpath/java/awt/im/InputMethodRequests.java b/libjava/classpath/java/awt/im/InputMethodRequests.java
index d50ec33..0423358 100644
--- a/libjava/classpath/java/awt/im/InputMethodRequests.java
+++ b/libjava/classpath/java/awt/im/InputMethodRequests.java
@@ -37,8 +37,10 @@ exception statement from your version. */
 
 package java.awt.im;
 
+import java.awt.Component;
 import java.awt.Rectangle;
 import java.awt.font.TextHitInfo;
+import java.awt.event.InputMethodListener;
 import java.text.AttributedCharacterIterator;
 import java.text.AttributedCharacterIterator.Attribute;
 
diff --git a/libjava/classpath/java/awt/im/spi/InputMethod.java b/libjava/classpath/java/awt/im/spi/InputMethod.java
index 840d193..ebe4508 100644
--- a/libjava/classpath/java/awt/im/spi/InputMethod.java
+++ b/libjava/classpath/java/awt/im/spi/InputMethod.java
@@ -38,7 +38,11 @@ exception statement from your version. */
 package java.awt.im.spi;
 
 import java.awt.AWTEvent;
+import java.awt.Component;
 import java.awt.Rectangle;
+import java.awt.im.InputContext;
+import java.awt.im.InputMethodRequests;
+import java.text.AttributedCharacterIterator.Attribute;
 import java.util.Locale;
 
 /**
@@ -152,8 +156,8 @@ public interface InputMethod
    * Notify this input method of changes in the client window. This is called
    * when notifications are enabled (see {@link
    * InputMethodContext#enableClientWindowNotification(InputMethod, boolean)},
-   * if {@link #removeNotify(Component)} has not been called. The following
-   * situations trigger a notification:<ul>
+   * if {@link InputContext#removeNotify(Component)} has not been called.
+   * The following situations trigger a notification:<ul>
    * <li>The client window changes in location, size, visibility,
    * iconification, or is closed.</li>
    * <li>When enabling client notification (or on the first activation after
@@ -202,7 +206,7 @@ public interface InputMethod
   /**
    * Notify the input method that a client component has been removed from its
    * hierarchy, or that input method support has been disabled. This is
-   * called by {@link InputContext#removeNotify()}, and only when the input
+   * called by {@link InputContext#removeNotify(Component)}, and only when the input
    * method is inactive.
    */
   void removeNotify();
diff --git a/libjava/classpath/java/awt/im/spi/InputMethodContext.java b/libjava/classpath/java/awt/im/spi/InputMethodContext.java
index 43bee8d..17ec4f8 100644
--- a/libjava/classpath/java/awt/im/spi/InputMethodContext.java
+++ b/libjava/classpath/java/awt/im/spi/InputMethodContext.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package java.awt.im.spi;
 
+import java.awt.HeadlessException;
+import java.awt.Rectangle;
 import java.awt.Window;
 import java.awt.font.TextHitInfo;
 import java.awt.im.InputMethodRequests;
@@ -113,7 +115,7 @@ public interface InputMethodContext extends InputMethodRequests
   /**
    * Sets whether notification of the client window's location and state should
    * be enabled for the input method. When enabled, the input method's
-   * {@link #notifyClientWindowChange(Rectangle)} method is called.
+   * {@link InputMethod#notifyClientWindowChange(Rectangle)} method is called.
    * Notification is automatically disabled when the input method is disposed.
    *
    * @param inputMethod the method to change status of
diff --git a/libjava/classpath/java/awt/im/spi/InputMethodDescriptor.java b/libjava/classpath/java/awt/im/spi/InputMethodDescriptor.java
index 093d731..d234e5c 100644
--- a/libjava/classpath/java/awt/im/spi/InputMethodDescriptor.java
+++ b/libjava/classpath/java/awt/im/spi/InputMethodDescriptor.java
@@ -39,6 +39,7 @@ package java.awt.im.spi;
 
 import java.awt.AWTException;
 import java.awt.Image;
+import java.awt.im.InputContext;
 import java.util.Locale;
 
 /**
@@ -57,7 +58,7 @@ public interface InputMethodDescriptor
    * also by country and variant), via
    * {@link InputContext#selectInputMethod(Locale)}. The returned list should
    * ignore pass-through locales, so it is usually a subset of locales for
-   * which {@link InputMethod#setContext(Locale)} returns true. If
+   * which {@link InputMethod#setLocale(Locale)} returns true. If
    * {@link #hasDynamicLocaleList()} returns true, this is called each time
    * information is needed, allowing dynamic addition or removal of supported
    * locales.
-- 
cgit v1.1