2005-08-15 Lillian Angel <[EMAIL PROTECTED]>
* javax/swing/JPasswordField.java
(echoCharIsSet): Fixed this to work according to API.
(getText): Implemented
(getText): Implemented
(getPassword): Implemented
(paramString): Implemented
Index: javax/swing/JPasswordField.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JPasswordField.java,v
retrieving revision 1.10
diff -u -r1.10 JPasswordField.java
--- javax/swing/JPasswordField.java 2 Jul 2005 20:32:48 -0000 1.10
+++ javax/swing/JPasswordField.java 15 Aug 2005 19:42:09 -0000
@@ -50,6 +50,7 @@
* class JPasswordField
*
* @author Andrew Selkirk
* @version 1.0
*/
public class JPasswordField extends JTextField
@@ -178,14 +179,15 @@
}
/**
- * echoCharIsSet
+ * Returns true if this JPasswordField has a character set for echoing.
+ * A character is considered to be set if the echo character is not 0.
*
* @return <code>true</code> if the echo char is set,
* <code>false</code> otherwise.
*/
public boolean echoCharIsSet()
{
- return echoChar == 0;
+ return echoChar != 0;
}
/**
@@ -207,7 +209,8 @@
}
/**
- * getText
+ * Returns the text contained in this TextComponent. If the
+ * underlying document is null, will give a NullPointerException.
*
* @return String
*
@@ -215,11 +218,20 @@
*/
public String getText()
{
- return null; // TODO
+ try
+ {
+ return getDocument().getText(0, getColumns());
+ }
+ catch (BadLocationException ble)
+ {
+ return "";
+ }
}
/**
- * getText
+ * Fetches a portion of the text represented by the component.
+ * Returns an empty string if length is 0. If the
+ * underlying document is null, will give a NullPointerException.
*
* @param offset TODO
* @param length TODO
@@ -232,27 +244,40 @@
*/
public String getText(int offset, int length) throws BadLocationException
{
- return null; // TODO
+ return getDocument().getText(offset, length);
}
/**
- * getPassword
+ * Returns the text contained in this TextComponent. If the underlying
+ * document is null, will give a NullPointerException.
+ * For stronger security, it is recommended that the returned character
+ * array be cleared after use by setting each character to zero.
*
* @return char[]
*/
public char[] getPassword()
{
- return new char[0]; // TODO
+ return getText().toCharArray();
}
/**
- * paramString
+ * Returns a string representation of this JPasswordField. This method is
+ * intended to be used only for debugging purposes,
+ * and the content and format of the returned string may vary between
+ * implementations. The returned string may be empty but may not be null.
*
* @return String
*/
protected String paramString()
{
- return null; // TODO
+ try
+ {
+ return getText();
+ }
+ catch (NullPointerException npe)
+ {
+ return "";
+ }
}
/**
_______________________________________________
Classpath-patches mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/classpath-patches
