diff options
| author | mark <mark@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-05-18 17:29:21 +0000 |
|---|---|---|
| committer | mark <mark@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-05-18 17:29:21 +0000 |
| commit | 64089cc9f030d8ef7972adb5d117e0b23f47d62b (patch) | |
| tree | 9f9c470de62ee62fba1331a396450d728d2b1fad /libjava/classpath/javax/swing/undo | |
| parent | 96034e28360d660d7a7708807fcbc4b519574d8e (diff) | |
| download | ppe42-gcc-64089cc9f030d8ef7972adb5d117e0b23f47d62b.tar.gz ppe42-gcc-64089cc9f030d8ef7972adb5d117e0b23f47d62b.zip | |
Imported GNU Classpath 0.90
* scripts/makemake.tcl: LocaleData.java moved to gnu/java/locale.
* sources.am: Regenerated.
* gcj/javaprims.h: Regenerated.
* Makefile.in: Regenerated.
* gcj/Makefile.in: Regenerated.
* include/Makefile.in: Regenerated.
* testsuite/Makefile.in: Regenerated.
* gnu/java/lang/VMInstrumentationImpl.java: New override.
* gnu/java/net/local/LocalSocketImpl.java: Likewise.
* gnu/classpath/jdwp/VMMethod.java: Likewise.
* gnu/classpath/jdwp/VMVirtualMachine.java: Update to latest
interface.
* java/lang/Thread.java: Add UncaughtExceptionHandler.
* java/lang/reflect/Method.java: Implements GenericDeclaration and
isSynthetic(),
* java/lang/reflect/Field.java: Likewise.
* java/lang/reflect/Constructor.java
* java/lang/Class.java: Implements Type, GenericDeclaration,
getSimpleName() and getEnclosing*() methods.
* java/lang/Class.h: Add new public methods.
* java/lang/Math.java: Add signum(), ulp() and log10().
* java/lang/natMath.cc (log10): New function.
* java/security/VMSecureRandom.java: New override.
* java/util/logging/Logger.java: Updated to latest classpath
version.
* java/util/logging/LogManager.java: New override.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@113887 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/classpath/javax/swing/undo')
4 files changed, 127 insertions, 84 deletions
diff --git a/libjava/classpath/javax/swing/undo/StateEditable.java b/libjava/classpath/javax/swing/undo/StateEditable.java index bec396e1e20..459025be7da 100644 --- a/libjava/classpath/javax/swing/undo/StateEditable.java +++ b/libjava/classpath/javax/swing/undo/StateEditable.java @@ -1,5 +1,5 @@ /* StateEditable.java -- Interface for collaborating with StateEdit. - Copyright (C) 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2006, Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -90,9 +90,9 @@ public interface StateEditable * from the specified hash table. * * <p><b>Note to implementors of this interface:</b> To increase - * efficiency, the <code>StateEdit</code> class {@linkplan - * StateEdit#removeRedundantState() removes redundant state - * information}. Therefore, implementations of this interface must be + * efficiency, the <code>StateEdit</code> class {@link + * StateEdit#removeRedundantState()} removes redundant state + * information. Therefore, implementations of this interface must be * prepared for the case where certain keys were stored into the * table by {@link #storeState}, but are not present anymore * when the <code>restoreState</code> method gets called. diff --git a/libjava/classpath/javax/swing/undo/UndoManager.java b/libjava/classpath/javax/swing/undo/UndoManager.java index 565b5ca8884..b9e6de67576 100644 --- a/libjava/classpath/javax/swing/undo/UndoManager.java +++ b/libjava/classpath/javax/swing/undo/UndoManager.java @@ -1,5 +1,5 @@ -/* AbstractTableModel.java -- - Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. +/* UndoManager.java -- + Copyright (C) 2002, 2004, 2005, 2006, Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -265,7 +265,7 @@ public class UndoManager * Determines which significant edit would be undone if {@link * #undo()} was called. * - * @returns the significant edit that would be undone, or + * @return the significant edit that would be undone, or * <code>null</code> if no significant edit would be affected by * calling {@link #undo()}. */ @@ -288,7 +288,7 @@ public class UndoManager * Determines which significant edit would be redone if {@link * #redo()} was called. * - * @returns the significant edit that would be redone, or + * @return the significant edit that would be redone, or * <code>null</code> if no significant edit would be affected by * calling {@link #redo()}. */ diff --git a/libjava/classpath/javax/swing/undo/UndoableEdit.java b/libjava/classpath/javax/swing/undo/UndoableEdit.java index 982d7f2a729..9938af751c7 100644 --- a/libjava/classpath/javax/swing/undo/UndoableEdit.java +++ b/libjava/classpath/javax/swing/undo/UndoableEdit.java @@ -1,5 +1,5 @@ -/* AbstractTableModel.java -- - Copyright (C) 2002 Free Software Foundation, Inc. +/* UndoableEdit.java -- + Copyright (C) 2002, 2006, Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,77 +38,120 @@ exception statement from your version. */ package javax.swing.undo; /** - * UndoableEdit public interface + * An editing operation that supports undo/redoability. + * * @author Andrew Selkirk */ -public interface UndoableEdit { - - /** - * anEdit - * @param anEdit TODO - * @returns TODO - */ - boolean addEdit(UndoableEdit anEdit); - - /** - * canRedo - * @returns TODO - */ - boolean canRedo(); - - /** - * canRedo - * @returns TODO - */ - boolean canUndo(); - - /** - * die - */ - void die(); - - /** - * getPresentationName - * @returns TODO - */ - String getPresentationName(); - - /** - * getRedoPresentationName - * @returns TODO - */ - String getRedoPresentationName(); - - /** - * getUndoPresentationName - * @returns TODO - */ - String getUndoPresentationName(); - - /** - * isSignificant - * @returns TODO - */ - boolean isSignificant(); - - /** - * redo - * @throws CannotRedoException TODO - */ - void redo() throws CannotRedoException; - - /** - * replaceEdit - * @param anEdit TODO - * @returns TODO - */ - boolean replaceEdit(UndoableEdit anEdit); - - /** - * undo - * @throws CannotUndoException TODO - */ - void undo() throws CannotUndoException; - - -} // UndoableEdit +public interface UndoableEdit +{ + + /** + * Incorporates another editing action into this one, thus forming a + * combined action. + * + * @param edit the editing action to be incorporated. + * + * @return <code>true</code> if the edit was combined successfully, and + * <code>false</code> if it could not be combined. + */ + boolean addEdit(UndoableEdit edit); + + /** + * Determines whether it would be possible to redo this editing + * action. + * + * @return <code>true</code> to indicate that this action can be + * redone, <code>false</code> otherwise. + * + * @see #redo() + * @see #canUndo() + */ + boolean canRedo(); + + /** + * Determines whether it would be possible to undo this editing + * action. + * + * @return <code>true</code> to indicate that this action can be + * undone, <code>false</code> otherwise. + * + * @see #undo() + * @see #canRedo() + */ + boolean canUndo(); + + /** + * Informs this edit action that it will no longer be used. Some + * actions might use this information to release resources, for + * example open files. Called by {@link UndoManager} before this + * action is removed from the edit queue. + */ + void die(); + + /** + * Returns a human-readable, localized name that describes this + * editing action and can be displayed to the user. + * + * @return The presentation name. + */ + String getPresentationName(); + + /** + * Returns the redo presentation name. + * + * @return The redo presentation name. + */ + String getRedoPresentationName(); + + /** + * Returns the undo presentation name. + * + * @return The undo presentation name. + */ + String getUndoPresentationName(); + + /** + * Determines whether this editing action is significant enough for + * being seperately undoable by the user. A typical significant + * action would be the resizing of an object. However, changing the + * selection in a text document would usually not be considered + * significant. + * + * @return <code>true</code> to indicate that the action is + * significant enough for being separately undoable, or + * <code>false</code> otherwise. + */ + boolean isSignificant(); + + /** + * Redoes this editing action. + * + * @throws CannotRedoException if the edit cannot be undone. + * + * @see #canRedo() + * @see #undo() + */ + void redo() throws CannotRedoException; + + /** + * Incorporates another editing action into this one, thus forming a + * combined action that replaces the argument action. + * + * @param edit the editing action to be replaced. + * + * @return <code>true</code> if the edit is successfully replaced, and + * <code>false</code> otherwise. + */ + boolean replaceEdit(UndoableEdit edit); + + /** + * Undoes this editing action. + * + * @throws CannotUndoException if the edit cannot be undone. + * + * @see #canUndo() + * @see #redo() + */ + void undo() throws CannotUndoException; + +} diff --git a/libjava/classpath/javax/swing/undo/UndoableEditSupport.java b/libjava/classpath/javax/swing/undo/UndoableEditSupport.java index 918e7352313..6d7bbea0728 100644 --- a/libjava/classpath/javax/swing/undo/UndoableEditSupport.java +++ b/libjava/classpath/javax/swing/undo/UndoableEditSupport.java @@ -1,5 +1,5 @@ /* UndoableEditSupport.java -- - Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005, 2006, Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -238,7 +238,7 @@ public class UndoableEditSupport * on a specific {@link #compoundEdit}, it should override this * method. * - * @returns a newly created instance of {@link CompoundEdit}. + * @return a newly created instance of {@link CompoundEdit}. */ protected CompoundEdit createCompoundEdit() { |

