mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-04 19:33:18 +00:00
11f8ac97cd
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
438 lines
8.2 KiB
C++
438 lines
8.2 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
|
*
|
|
* The contents of this file are subject to the Netscape Public
|
|
* License Version 1.1 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.mozilla.org/NPL/
|
|
*
|
|
* Software distributed under the License is distributed on an "AS
|
|
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
|
* implied. See the License for the specific language governing
|
|
* rights and limitations under the License.
|
|
*
|
|
* The Original Code is mozilla.org code.
|
|
*
|
|
* The Initial Developer of the Original Code is Netscape
|
|
* Communications Corporation. Portions created by Netscape are
|
|
* Copyright (C) 1998 Netscape Communications Corporation. All
|
|
* Rights Reserved.
|
|
*
|
|
* Contributor(s):
|
|
* Pierre Phaneuf <pp@ludusdesign.com>
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include "nsHTMLEditorLog.h"
|
|
#include "nsEditorTxnLog.h"
|
|
#include "nsPIEditorTransaction.h"
|
|
|
|
#define LOCK_LOG(doc)
|
|
#define UNLOCK_LOG(doc)
|
|
#define MAX_BUF_LENGTH 256
|
|
|
|
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
|
|
|
|
nsEditorTxnLog::nsEditorTxnLog(nsHTMLEditorLog *aEditorLog)
|
|
{
|
|
mRefCnt = 0;
|
|
mIndentLevel = 0;
|
|
mBatchCount = 0;
|
|
mEditorLog = aEditorLog;
|
|
}
|
|
|
|
nsEditorTxnLog::~nsEditorTxnLog()
|
|
{
|
|
}
|
|
|
|
// #define DEBUG_EDITOR_TXN_LOG_REFCNT 1
|
|
|
|
#ifdef DEBUG_EDITOR_TXN_LOG_REFCNT
|
|
|
|
nsrefcnt nsEditorTxnLog::AddRef(void)
|
|
{
|
|
return ++mRefCnt;
|
|
}
|
|
|
|
nsrefcnt nsEditorTxnLog::Release(void)
|
|
{
|
|
NS_PRECONDITION(0 != mRefCnt, "dup release");
|
|
if (--mRefCnt == 0) {
|
|
NS_DELETEXPCOM(this);
|
|
return 0;
|
|
}
|
|
return mRefCnt;
|
|
}
|
|
|
|
#else
|
|
|
|
NS_IMPL_ADDREF(nsEditorTxnLog)
|
|
NS_IMPL_RELEASE(nsEditorTxnLog)
|
|
|
|
#endif
|
|
|
|
NS_IMETHODIMP
|
|
nsEditorTxnLog::QueryInterface(REFNSIID aIID, void** aInstancePtr)
|
|
{
|
|
if (nsnull == aInstancePtr) {
|
|
return NS_ERROR_NULL_POINTER;
|
|
}
|
|
if (aIID.Equals(kISupportsIID)) {
|
|
*aInstancePtr = (void*)(nsISupports*)this;
|
|
NS_ADDREF_THIS();
|
|
return NS_OK;
|
|
}
|
|
if (aIID.Equals(NS_GET_IID(nsITransactionListener))) {
|
|
*aInstancePtr = (void*)(nsITransactionListener*)this;
|
|
NS_ADDREF_THIS();
|
|
return NS_OK;
|
|
}
|
|
*aInstancePtr = 0;
|
|
return NS_NOINTERFACE;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsEditorTxnLog::WillDo(nsITransactionManager *aTxMgr, nsITransaction *aTransaction, PRBool *aInterrupt)
|
|
{
|
|
LOCK_LOG(this);
|
|
|
|
char buf[MAX_BUF_LENGTH];
|
|
|
|
PrintIndent(mIndentLevel++);
|
|
Write("WillDo: ");
|
|
Write(GetString(aTransaction, buf, MAX_BUF_LENGTH));
|
|
Write("\n");
|
|
Flush();
|
|
|
|
UNLOCK_LOG(this);
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsEditorTxnLog::DidDo(nsITransactionManager *aTxMgr, nsITransaction *aTransaction, nsresult aDoResult)
|
|
{
|
|
LOCK_LOG(this);
|
|
|
|
char buf[MAX_BUF_LENGTH];
|
|
|
|
PrintIndent(--mIndentLevel);
|
|
Write("DidDo: ");
|
|
Write(GetString(aTransaction, buf, MAX_BUF_LENGTH));
|
|
Write("(");
|
|
WriteInt("%d", aDoResult);
|
|
Write(")\n");
|
|
Flush();
|
|
|
|
UNLOCK_LOG(this);
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsEditorTxnLog::WillUndo(nsITransactionManager *aTxMgr, nsITransaction *aTransaction, PRBool *aInterrupt)
|
|
{
|
|
LOCK_LOG(this);
|
|
|
|
PrintIndent(mIndentLevel++);
|
|
|
|
if (aTransaction)
|
|
{
|
|
char buf[MAX_BUF_LENGTH];
|
|
|
|
Write("WillUndo: ");
|
|
Write(GetString(aTransaction, buf, MAX_BUF_LENGTH));
|
|
Write("\n");
|
|
}
|
|
else
|
|
Write("WillUndoBatch\n");
|
|
|
|
Flush();
|
|
|
|
UNLOCK_LOG(this);
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsEditorTxnLog::DidUndo(nsITransactionManager *aTxMgr, nsITransaction *aTransaction, nsresult aUndoResult)
|
|
{
|
|
LOCK_LOG(this);
|
|
|
|
PrintIndent(--mIndentLevel);
|
|
|
|
if (aTransaction)
|
|
{
|
|
char buf[MAX_BUF_LENGTH];
|
|
|
|
Write("DidUndo: ");
|
|
Write(GetString(aTransaction, buf, MAX_BUF_LENGTH));
|
|
Write("(");
|
|
WriteInt("%d", aUndoResult);
|
|
Write(")\n");
|
|
}
|
|
else
|
|
{
|
|
Write("EndUndoBatch (");
|
|
WriteInt("%d", aUndoResult);
|
|
Write(")\n");
|
|
}
|
|
|
|
Flush();
|
|
|
|
UNLOCK_LOG(this);
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsEditorTxnLog::WillRedo(nsITransactionManager *aTxMgr, nsITransaction *aTransaction, PRBool *aInterrupt)
|
|
{
|
|
LOCK_LOG(this);
|
|
|
|
PrintIndent(mIndentLevel++);
|
|
|
|
if (aTransaction)
|
|
{
|
|
char buf[MAX_BUF_LENGTH];
|
|
|
|
Write("WillRedo: ");
|
|
Write(GetString(aTransaction, buf, MAX_BUF_LENGTH));
|
|
Write("\n");
|
|
}
|
|
else
|
|
Write("WillRedoBatch\n");
|
|
|
|
Flush();
|
|
|
|
UNLOCK_LOG(this);
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsEditorTxnLog::DidRedo(nsITransactionManager *aTxMgr, nsITransaction *aTransaction, nsresult aRedoResult)
|
|
{
|
|
LOCK_LOG(this);
|
|
|
|
PrintIndent(--mIndentLevel);
|
|
|
|
if (aTransaction)
|
|
{
|
|
char buf[MAX_BUF_LENGTH];
|
|
|
|
Write("DidRedo: ");
|
|
Write(GetString(aTransaction, buf, MAX_BUF_LENGTH));
|
|
Write(" (");
|
|
WriteInt("%d", aRedoResult);
|
|
Write(")\n");
|
|
}
|
|
else
|
|
{
|
|
Write("DidRedoBatch (");
|
|
WriteInt("%d", aRedoResult);
|
|
Write(")\n");
|
|
}
|
|
|
|
Flush();
|
|
|
|
UNLOCK_LOG(this);
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsEditorTxnLog::WillBeginBatch(nsITransactionManager *aTxMgr, PRBool *aInterrupt)
|
|
{
|
|
LOCK_LOG(this);
|
|
|
|
PrintIndent(mIndentLevel);
|
|
Write("WillBeginBatch: ");
|
|
WriteInt("%d", mBatchCount);
|
|
Write("\n");
|
|
Flush();
|
|
|
|
UNLOCK_LOG(this);
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsEditorTxnLog::DidBeginBatch(nsITransactionManager *aTxMgr, nsresult aResult)
|
|
{
|
|
LOCK_LOG(this);
|
|
|
|
PrintIndent(mIndentLevel++);
|
|
Write("DidBeginBatch: ");
|
|
WriteInt("%d", mBatchCount++);
|
|
Write(" (");
|
|
WriteInt("%d", aResult);
|
|
Write(")\n");
|
|
Flush();
|
|
|
|
UNLOCK_LOG(this);
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsEditorTxnLog::WillEndBatch(nsITransactionManager *aTxMgr, PRBool *aInterrupt)
|
|
{
|
|
LOCK_LOG(this);
|
|
|
|
PrintIndent(--mIndentLevel);
|
|
Write("WillEndBatch: ");
|
|
WriteInt("%d", --mBatchCount);
|
|
Write("\n");
|
|
Flush();
|
|
|
|
UNLOCK_LOG(this);
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsEditorTxnLog::DidEndBatch(nsITransactionManager *aTxMgr, nsresult aResult)
|
|
{
|
|
LOCK_LOG(this);
|
|
|
|
PrintIndent(mIndentLevel);
|
|
Write("DidEndBatch: ");
|
|
WriteInt("%d", mBatchCount);
|
|
Write(" (");
|
|
WriteInt("%d", aResult);
|
|
Write(")\n");
|
|
Flush();
|
|
|
|
UNLOCK_LOG(this);
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsEditorTxnLog::WillMerge(nsITransactionManager *aTxMgr, nsITransaction *aTopTransaction, nsITransaction *aTransaction, PRBool *aInterrupt)
|
|
{
|
|
LOCK_LOG(this);
|
|
|
|
char buf[MAX_BUF_LENGTH];
|
|
|
|
PrintIndent(mIndentLevel);
|
|
Write("WillMerge: ");
|
|
Write(GetString(aTopTransaction, buf, MAX_BUF_LENGTH));
|
|
Write(" <-- ");
|
|
Write(GetString(aTransaction, buf, MAX_BUF_LENGTH));
|
|
Write("\n");
|
|
Flush();
|
|
|
|
UNLOCK_LOG(this);
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsEditorTxnLog::DidMerge(nsITransactionManager *aTxMgr, nsITransaction *aTopTransaction, nsITransaction *aTransaction, PRBool aDidMerge, nsresult aMergeResult)
|
|
{
|
|
LOCK_LOG(this);
|
|
|
|
char buf[MAX_BUF_LENGTH];
|
|
|
|
PrintIndent(mIndentLevel);
|
|
Write("DidMerge: ");
|
|
Write(GetString(aTopTransaction, buf, MAX_BUF_LENGTH));
|
|
Write(" <-- ");
|
|
Write(GetString(aTransaction, buf, MAX_BUF_LENGTH));
|
|
Write(" (");
|
|
Write(aDidMerge ? "TRUE" : "FALSE");
|
|
Write(", ");
|
|
WriteInt("%d", aMergeResult);
|
|
Write(")\n");
|
|
Flush();
|
|
|
|
UNLOCK_LOG(this);
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
const char *
|
|
nsEditorTxnLog::GetString(nsITransaction *aTransaction, char *aBuffer, PRInt32 aBufferLength)
|
|
{
|
|
if (!aBuffer || aBufferLength < 1)
|
|
return 0;
|
|
|
|
aBuffer[0] = '\0';
|
|
|
|
nsString str;
|
|
|
|
nsCOMPtr<nsPIEditorTransaction> txn = do_QueryInterface(aTransaction);
|
|
|
|
if (!txn)
|
|
return aBuffer;
|
|
|
|
txn->GetTxnDescription(str);
|
|
|
|
if (str.Length() == 0)
|
|
str.AssignWithConversion("<NULL>");
|
|
|
|
str.ToCString(aBuffer, aBufferLength);
|
|
aBuffer[aBufferLength - 1] = '\0';
|
|
|
|
return aBuffer;
|
|
}
|
|
|
|
nsresult
|
|
nsEditorTxnLog::PrintIndent(PRInt32 aIndentLevel)
|
|
{
|
|
PRInt32 i;
|
|
|
|
Write(" // ");
|
|
|
|
for (i = 0; i < aIndentLevel; i++)
|
|
Write(" ");
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
nsEditorTxnLog::Write(const char *aBuffer)
|
|
{
|
|
if (!aBuffer)
|
|
return NS_ERROR_NULL_POINTER;
|
|
|
|
if (mEditorLog)
|
|
mEditorLog->Write(aBuffer);
|
|
else
|
|
printf(aBuffer);
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
nsEditorTxnLog::WriteInt(const char *aFormat, PRInt32 aInt)
|
|
{
|
|
if (!aFormat)
|
|
return NS_ERROR_NULL_POINTER;
|
|
|
|
if (mEditorLog)
|
|
mEditorLog->WriteInt(aFormat, aInt);
|
|
else
|
|
printf(aFormat, aInt);
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
nsEditorTxnLog::Flush()
|
|
{
|
|
nsresult result = NS_OK;
|
|
|
|
#ifdef SLOWS_THINGS_WAY_DOWN
|
|
|
|
if (mEditorLog)
|
|
result = mEditorLog->Flush();
|
|
else
|
|
fflush(stdout);
|
|
|
|
#endif // SLOWS_THINGS_WAY_DOWN
|
|
|
|
return result;
|
|
}
|