From d0001e2da0159ab944be75d214a910331d4f6a55 Mon Sep 17 00:00:00 2001 From: "kin%netscape.com" Date: Wed, 22 Aug 2007 04:53:08 +0000 Subject: [PATCH] Fixes for bug #66308 ([embed] XPIDL'ize transaction manager) sr=sfraser@netscape.com,mscott@netscape.com r=jfrancis@netscape.com * nsITransaction, nsITransactionListenter, nsITransactionManager have been XPIDL'ized and moved into mozilla/editor/txmgr/idl. The versions of these interfaces in mozilla/editor/txmgr/public are being CVS removed. * Renamed Do(), Undo(), and Redo() to DoTransaction(), UndoTransaction(), and RedoTransaction() to avoid reserved word problems in languages like JS. I did a sweep through editor and mailnews to remove these methods. * PeekUndoStack() and PeekRedoStack() now return an AddRef'd pointer. * Removed GetUndoString(), GetRedoString() and Write() from the nsITransaction interface. Neither editor or mailnews really made use of these methods. * Removed Write() from the nsITransactionManager.cpp interface. * The Transaction Manager now supports weak references. * Added support for nsITransactionList to the TransactionManager to allow access to all transactions on the Undo and Redo stacks, as well as auto-aggregated transactions. * Removed all references to nsITransactionDescription from txmgr and editor. * Added nsPIEditorTransaction and made all Editor internal transactions inherit from it so we can distinguish between our transactions and ones from 3rd parties. New files checked in: editor/txmgr/idl/nsITransaction.idl editor/txmgr/idl/nsITransactionList.idl editor/txmgr/idl/nsITransactionListener.idl editor/txmgr/idl/nsITransactionManager.idl editor/txmgr/src/nsITransactionList.cpp editor/txmgr/src/nsITransactionList.h editor/idl/nsPIEditorTransaction.idl Files that were CVS removed: editor/txmgr/public/nsITransaction.h editor/txmgr/public/nsITransactionListener.h editor/txmgr/public/nsITransactionManager.h editor/txmgr/idl/nsITransactionDescription.h editor/base/IMECommitTxn.cpp editor/base/IMECommitTxn.h Files modified: editor/Makefile.in editor/makefile.win editor/base/ChangeAttributeTxn.cpp editor/base/ChangeAttributeTxn.h editor/base/CreateElementTxn.cpp editor/base/CreateElementTxn.h editor/base/DeleteElementTxn.cpp editor/base/DeleteElementTxn.h editor/base/DeleteRangeTxn.cpp editor/base/DeleteRangeTxn.h editor/base/DeleteTextTxn.cpp editor/base/DeleteTextTxn.h editor/base/EditAggregateTxn.cpp editor/base/EditAggregateTxn.h editor/base/EditTxn.cpp editor/base/EditTxn.h editor/base/IMECommitTxn.cpp editor/base/IMECommitTxn.h editor/base/IMETextTxn.cpp editor/base/IMETextTxn.h editor/base/InsertElementTxn.cpp editor/base/InsertElementTxn.h editor/base/InsertTextTxn.cpp editor/base/InsertTextTxn.h editor/base/JoinElementTxn.cpp editor/base/JoinElementTxn.h editor/base/nsEditor.cpp editor/base/nsEditorShell.cpp editor/base/nsEditorShell.h editor/base/nsEditorTxnLog.cpp editor/base/nsStyleSheetTxns.cpp editor/base/nsStyleSheetTxns.h editor/base/PlaceholderTxn.cpp editor/base/PlaceholderTxn.h editor/base/SetDocTitleTxn.cpp editor/base/SetDocTitleTxn.h editor/base/SplitElementTxn.cpp editor/base/SplitElementTxn.h editor/idl/Makefile.in editor/idl/makefile.win editor/idl/MANIFEST editor/idl/nsIEditorShell.idl editor/macbuild/editor.mcp editor/macbuild/EditorIDL.mcp editor/txmgr/idl/Makefile.in editor/txmgr/idl/makefile.win editor/txmgr/idl/MANIFEST editor/txmgr/idl/nsITransactionManager.idl editor/txmgr/macbuild/txmgr.mcp editor/txmgr/macbuild/txmgrIDL.mcp editor/txmgr/public/Makefile.in editor/txmgr/public/makefile.win editor/txmgr/public/MANIFEST editor/txmgr/src/Makefile.in editor/txmgr/src/makefile.win editor/txmgr/src/nsTransactionItem.cpp editor/txmgr/src/nsTransactionItem.h editor/txmgr/src/nsTransactionList.cpp editor/txmgr/src/nsTransactionList.h editor/txmgr/src/nsTransactionManager.cpp editor/txmgr/src/nsTransactionManager.h editor/txmgr/src/nsTransactionManagerFactory.cpp editor/txmgr/src/nsTransactionStack.cpp editor/txmgr/src/nsTransactionStack.h editor/txmgr/tests/TestTXMgr.cpp editor/ui/composer/content/EditorCommandsDebug.js editor/ui/composer/content/editorOverlay.xul editor/ui/composer/locale/en-US/editorOverlay.dtd mailnews/base/src/nsMessenger.cpp mailnews/base/util/nsMsgTxn.cpp mailnews/base/util/nsMsgTxn.h mailnews/imap/src/nsImapMailFolder.cpp mailnews/imap/src/nsImapUndoTxn.cpp mailnews/imap/src/nsImapUndoTxn.h mailnews/local/src/nsLocalMailFolder.cpp mailnews/local/src/nsLocalUndoTxn.cpp mailnews/local/src/nsLocalUndoTxn.h git-svn-id: svn://10.0.0.236/trunk@232512 18797224-902f-48f8-a5cc-f745e15eee43 --- .../debugQA/content/debugQAEditorOverlay.js | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/mozilla/suite/debugQA/content/debugQAEditorOverlay.js b/mozilla/suite/debugQA/content/debugQAEditorOverlay.js index c0206f7e546..aee2fa194da 100644 --- a/mozilla/suite/debugQA/content/debugQAEditorOverlay.js +++ b/mozilla/suite/debugQA/content/debugQAEditorOverlay.js @@ -385,3 +385,69 @@ function EditorTableize() window._content.focus(); } +// --------------------------- TransactionManager --------------------------- + + +function DumpUndoStack() +{ + try { + var txmgr = editorShell.transactionManager; + + if (!txmgr) + { + dump("**** Editor has no TransactionManager!\n"); + return; + } + + dump("---------------------- BEGIN UNDO STACK DUMP\n"); + dump("\n"); + PrintTxnList(txmgr.getUndoList(), ""); + dump("\n"); + dump("Num Undo Items: " + txmgr.numberOfUndoItems + "\n"); + dump("---------------------- END UNDO STACK DUMP\n"); + } catch (e) { + dump("ERROR: DumpUndoStack() failed: " + e); + } +} + +function DumpRedoStack() +{ + try { + var txmgr = editorShell.transactionManager; + + if (!txmgr) + { + dump("**** Editor has no TransactionManager!\n"); + return; + } + + dump("---------------------- BEGIN REDO STACK DUMP\n"); + dump("\n"); + PrintTxnList(txmgr.getRedoList(), ""); + dump("\n"); + dump("Num Redo Items: " + txmgr.numberOfRedoItems + "\n"); + dump("---------------------- END REDO STACK DUMP\n"); + } catch (e) { + dump("ERROR: DumpUndoStack() failed: " + e); + } +} + +function PrintTxnList(txnList, prefixStr) +{ + var i; + + for (i=0 ; i < txnList.numItems; i++) + { + var txn = txnList.getItem(i); + var desc = "TXMgr Batch"; + + if (txn) + { + txn = txn.QueryInterface(Components.interfaces.nsPIEditorTransaction); + desc = txn.txnDescription; + } + dump(prefixStr + "+ " + desc + "\n"); + PrintTxnList(txnList.getChildListForItem(i), prefixStr + "| "); + } +} +