mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-27 20:25:44 +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
157 lines
4.6 KiB
C++
157 lines
4.6 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-1999 Netscape Communications Corporation. All
|
|
* Rights Reserved.
|
|
*
|
|
* Contributor(s):
|
|
*/
|
|
|
|
#include "DeleteElementTxn.h"
|
|
#ifdef NS_DEBUG
|
|
#include "nsIDOMElement.h"
|
|
#endif
|
|
|
|
#ifdef NS_DEBUG
|
|
static PRBool gNoisy = PR_FALSE;
|
|
#else
|
|
static const PRBool gNoisy = PR_FALSE;
|
|
#endif
|
|
|
|
|
|
DeleteElementTxn::DeleteElementTxn()
|
|
: EditTxn()
|
|
{
|
|
}
|
|
|
|
NS_IMETHODIMP DeleteElementTxn::Init(nsIDOMNode *aElement)
|
|
{
|
|
if (nsnull!=aElement) {
|
|
mElement = do_QueryInterface(aElement);
|
|
}
|
|
else
|
|
return NS_ERROR_NULL_POINTER;
|
|
return NS_OK;
|
|
}
|
|
|
|
|
|
DeleteElementTxn::~DeleteElementTxn()
|
|
{
|
|
}
|
|
|
|
NS_IMETHODIMP DeleteElementTxn::DoTransaction(void)
|
|
{
|
|
if (gNoisy) { printf("%p Do Delete Element element = %p\n", this, mElement.get()); }
|
|
if (!mElement) return NS_ERROR_NOT_INITIALIZED;
|
|
|
|
nsresult result = mElement->GetParentNode(getter_AddRefs(mParent));
|
|
if (NS_FAILED(result)) { return result; }
|
|
if (!mParent) { return NS_OK; } // this is a no-op, there's no parent to delete mElement from
|
|
|
|
#ifdef NS_DEBUG
|
|
// begin debug output
|
|
nsCOMPtr<nsIDOMElement> element;
|
|
element = do_QueryInterface(mElement);
|
|
nsAutoString elementTag; elementTag.AssignWithConversion("text node");
|
|
if (element)
|
|
element->GetTagName(elementTag);
|
|
nsCOMPtr<nsIDOMElement> parentElement;
|
|
parentElement = do_QueryInterface(mParent);
|
|
nsAutoString parentElementTag; parentElementTag.AssignWithConversion("text node");
|
|
if (parentElement)
|
|
parentElement->GetTagName(parentElementTag);
|
|
char *c, *p;
|
|
c = elementTag.ToNewCString();
|
|
p = parentElementTag.ToNewCString();
|
|
if (c&&p)
|
|
{
|
|
if (gNoisy)
|
|
printf(" DeleteElementTxn: deleting child %s from parent %s\n", c, p);
|
|
nsCRT::free(c);
|
|
nsCRT::free(p);
|
|
}
|
|
// end debug output
|
|
#endif
|
|
|
|
// remember which child mElement was (by remembering which child was next)
|
|
result = mElement->GetNextSibling(getter_AddRefs(mRefNode)); // can return null mRefNode
|
|
|
|
nsCOMPtr<nsIDOMNode> resultNode;
|
|
result = mParent->RemoveChild(mElement, getter_AddRefs(resultNode));
|
|
return result;
|
|
}
|
|
|
|
NS_IMETHODIMP DeleteElementTxn::UndoTransaction(void)
|
|
{
|
|
if (gNoisy) { printf("%p Undo Delete Element element = %p, parent = %p\n", this, mElement.get(), mParent.get()); }
|
|
if (!mParent) { return NS_OK; } // this is a legal state, the txn is a no-op
|
|
if (!mElement) { return NS_ERROR_NULL_POINTER; }
|
|
|
|
#ifdef NS_DEBUG
|
|
// begin debug output
|
|
nsCOMPtr<nsIDOMElement> element;
|
|
element = do_QueryInterface(mElement);
|
|
nsAutoString elementTag; elementTag.AssignWithConversion("text node");
|
|
if (element)
|
|
element->GetTagName(elementTag);
|
|
nsCOMPtr<nsIDOMElement> parentElement;
|
|
parentElement = do_QueryInterface(mParent);
|
|
nsAutoString parentElementTag; parentElementTag.AssignWithConversion("text node");
|
|
if (parentElement)
|
|
parentElement->GetTagName(parentElementTag);
|
|
char *c, *p;
|
|
c = elementTag.ToNewCString();
|
|
p = parentElementTag.ToNewCString();
|
|
if (c&&p)
|
|
{
|
|
if (gNoisy)
|
|
printf(" DeleteElementTxn: inserting child %s back into parent %s\n", c, p);
|
|
nsCRT::free(c);
|
|
nsCRT::free(p);
|
|
}
|
|
// end debug output
|
|
#endif
|
|
|
|
nsCOMPtr<nsIDOMNode> resultNode;
|
|
nsresult result = mParent->InsertBefore(mElement, mRefNode, getter_AddRefs(resultNode));
|
|
return result;
|
|
}
|
|
|
|
NS_IMETHODIMP DeleteElementTxn::RedoTransaction(void)
|
|
{
|
|
if (gNoisy) { printf("%p Redo Delete Element element = %p, parent = %p\n", this, mElement.get(), mParent.get()); }
|
|
if (!mParent) { return NS_OK; } // this is a legal state, the txn is a no-op
|
|
if (!mElement) { return NS_ERROR_NULL_POINTER; }
|
|
|
|
nsCOMPtr<nsIDOMNode> resultNode;
|
|
nsresult result = mParent->RemoveChild(mElement, getter_AddRefs(resultNode));
|
|
return result;
|
|
}
|
|
|
|
|
|
NS_IMETHODIMP DeleteElementTxn::Merge(nsITransaction *aTransaction, PRBool *aDidMerge)
|
|
{
|
|
if (nsnull!=aDidMerge)
|
|
*aDidMerge=PR_FALSE;
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP DeleteElementTxn::GetTxnDescription(nsAWritableString& aString)
|
|
{
|
|
aString.Assign(NS_LITERAL_STRING("DeleteElementTxn"));
|
|
return NS_OK;
|
|
}
|