< prev index next >
src/java.desktop/share/classes/javax/swing/text/TextAction.java
Print this page
*** 51,61 ****
* Serialized objects of this class will not be compatible with
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
* of all JavaBeans™
! * has been added to the <code>java.beans</code> package.
* Please see {@link java.beans.XMLEncoder}.
*
* @author Timothy Prinzing
*/
@SuppressWarnings("serial") // Same-version serialization only
--- 51,61 ----
* Serialized objects of this class will not be compatible with
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
* of all JavaBeans™
! * has been added to the {@code java.beans} package.
* Please see {@link java.beans.XMLEncoder}.
*
* @author Timothy Prinzing
*/
@SuppressWarnings("serial") // Same-version serialization only
*** 96,108 ****
* over the first list; that is, when both lists
* contain a command with the same name, the command
* from the second list is used.
*
* @param list1 the first list, may be empty but not
! * <code>null</code>
* @param list2 the second list, may be empty but not
! * <code>null</code>
* @return the augmented list
*/
public static final Action[] augmentList(Action[] list1, Action[] list2) {
Hashtable<String, Action> h = new Hashtable<String, Action>();
for (Action a : list1) {
--- 96,108 ----
* over the first list; that is, when both lists
* contain a command with the same name, the command
* from the second list is used.
*
* @param list1 the first list, may be empty but not
! * {@code null}
* @param list2 the second list, may be empty but not
! * {@code null}
* @return the augmented list
*/
public static final Action[] augmentList(Action[] list1, Action[] list2) {
Hashtable<String, Action> h = new Hashtable<String, Action>();
for (Action a : list1) {
< prev index next >