# HG changeset patch # Parent 3c3a8c2f5ac2034372221d25a19c60b9f4994224 diff --git a/openide.text/src/org/openide/text/CloneableEditorSupport.java b/openide.text/src/org/openide/text/CloneableEditorSupport.java --- a/openide.text/src/org/openide/text/CloneableEditorSupport.java +++ b/openide.text/src/org/openide/text/CloneableEditorSupport.java @@ -125,8 +125,8 @@ * really implement and which not. *

* This class supports collecting multiple edits into a group which is treated -* as a single edit by undo/redo. Send {@BEGIN_COMMIT_GROUP} and -* {@END_COMMIT_GROUP} to UndoableEditListener. These must always be paired. +* as a single edit by undo/redo. Send {@link #BEGIN_COMMIT_GROUP} and +* {@link #END_COMMIT_GROUP} to UndoableEditListener. These must always be paired. * * @author Jaroslav Tulach */ @@ -3460,11 +3460,11 @@ *

    *
  1. Default behavior is defined by {@link UndoManager}.
  2. *
  3. UnddoableEdits issued between {@link #BEGIN_COMMIT_GROUP} - * and {@link END_COMMIT_GROUP} are placed into a single + * and {@link #END_COMMIT_GROUP} are placed into a single * {@link CompoundEdit}. * Thus undo() and redo() treat them * as a single undo/redo.
  4. - *
  5. Use {@link commitUndoGroup} to commit accumulated + *
  6. Use {@link #commitUndoGroup} to commit accumulated * UndoableEdits into a single CompoundEdit * (and to continue accumulating); * an application could do this at strategic points, such as EndOfLine @@ -3616,7 +3616,6 @@ } } - /** {@inheritDoc} */ @Override public synchronized void discardAllEdits() { commitUndoGroup(); diff --git a/openide.text/test/unit/src/org/openide/text/UndoRedoWrappingCooperationTest.java b/openide.text/test/unit/src/org/openide/text/UndoRedoWrappingCooperationTest.java --- a/openide.text/test/unit/src/org/openide/text/UndoRedoWrappingCooperationTest.java +++ b/openide.text/test/unit/src/org/openide/text/UndoRedoWrappingCooperationTest.java @@ -47,8 +47,6 @@ import java.beans.PropertyChangeListener; import java.io.IOException; import java.util.ArrayList; -import java.util.logging.Level; -import java.util.logging.Logger; import javax.swing.event.UndoableEditEvent; import javax.swing.event.UndoableEditListener; import javax.swing.text.*; @@ -371,92 +369,6 @@ ur().undo(); assertEquals("undo3", "", d.getText(0, d.getLength())); } - - // This is testSaveDocumentWhileActiveChunk WITHOUT chunking - private void doSaveDocumentCommon(boolean doFailCase) throws Exception { - content = ""; - StyledDocument d = support.openDocument(); - d.insertString(d.getLength(), "a", null); - - support.saveDocument (); // creates a separate undoable chunk - assertFalse("save: not modified", support.isModified()); - assertTrue("save: can undo", ur().canUndo()); - assertFalse("save: no redo", ur().canRedo()); - - d.insertString(d.getLength(), "b", null); - - assertEquals("insert, after save: data", "ab", d.getText(0, d.getLength())); - assertTrue("insert, after save: modified", support.isModified()); - assertTrue("insert, after save: can undo", ur().canUndo()); - assertFalse("insert, after save: no redo", ur().canRedo()); - - ur().undo(); - assertEquals("undo, at save: data", "a", d.getText(0, d.getLength())); - assertFalse("undo, at save: not modified", support.isModified()); - assertTrue("undo, at save: can undo", ur().canUndo()); - assertTrue("undo, at save: can redo", ur().canRedo()); - - ur().undo(); - assertEquals("undo, before save: data", "", d.getText(0, d.getLength())); - - if(doFailCase) { - // **************************************************************** - // CES BUG??? - assertTrue("undo, before save: modified", support.isModified()); - // **************************************************************** - } - - assertFalse("undo, before save: can undo", ur().canUndo()); - assertTrue("undo, before save: can redo", ur().canRedo()); - - ur().redo(); - assertEquals("redo, at save: data", "a", d.getText(0, d.getLength())); - assertFalse("redo, at save: not modified", support.isModified()); - assertTrue("redo, at save: can undo", ur().canUndo()); - assertTrue("redo, at save: can redo", ur().canRedo()); - } - - public void testSaveDocument() throws Exception { - doSaveDocumentCommon(false); - } - - public void testSaveDocumentErrorCase() throws Exception { - // NOTE: following fail is issue in CES, use true as parameter - doSaveDocumentCommon(false); - } - - // NOTE: following fail is issue in CES - public void testRedoAfterSave() throws Exception { - content = ""; - StyledDocument d = support.openDocument(); - d.insertString(d.getLength(), "a", null); - - d.insertString(d.getLength(), "b", null); - - assertEquals("insert: data", "ab", d.getText(0, d.getLength())); - assertTrue("insert: modified", support.isModified()); - assertTrue("insert: can undo", ur().canUndo()); - assertFalse("insert: no redo", ur().canRedo()); - - ur().undo(); - assertEquals("undo: data", "a", d.getText(0, d.getLength())); - assertTrue("undo: modified", support.isModified()); - assertTrue("undo: can undo", ur().canUndo()); - assertTrue("undo: can redo", ur().canRedo()); - - support.saveDocument (); - assertFalse("save: not modified", support.isModified()); - assertTrue("save: can undo", ur().canUndo()); - /* XXX: Fails right now - assertTrue("save: can redo", ur().canRedo()); - - ur().redo(); - assertEquals("redo: data", "ab", d.getText(0, d.getLength())); - assertTrue("redo: modified", support.isModified()); - assertTrue("redo: can undo", ur().canUndo()); - assertFalse("redo: no redo", ur().canRedo()); - */ - } // // Implementation of the CloneableEditorSupport.Env