mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-01 22:55:23 +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
165 lines
5.2 KiB
C++
165 lines
5.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-1999 Netscape Communications Corporation. All
|
|
* Rights Reserved.
|
|
*
|
|
* Contributor(s):
|
|
*/
|
|
|
|
#include "JoinElementTxn.h"
|
|
#include "nsEditor.h"
|
|
#include "nsIDOMNodeList.h"
|
|
#include "nsIDOMCharacterData.h"
|
|
|
|
#ifdef NS_DEBUG
|
|
static PRBool gNoisy = PR_FALSE;
|
|
#else
|
|
static const PRBool gNoisy = PR_FALSE;
|
|
#endif
|
|
|
|
JoinElementTxn::JoinElementTxn()
|
|
: EditTxn()
|
|
{
|
|
}
|
|
|
|
NS_IMETHODIMP JoinElementTxn::Init(nsEditor *aEditor,
|
|
nsIDOMNode *aLeftNode,
|
|
nsIDOMNode *aRightNode)
|
|
{
|
|
NS_PRECONDITION((aEditor && aLeftNode && aRightNode), "null arg");
|
|
if (!aEditor || !aLeftNode || !aRightNode) { return NS_ERROR_NULL_POINTER; }
|
|
mEditor = aEditor;
|
|
mLeftNode = do_QueryInterface(aLeftNode);
|
|
mRightNode = do_QueryInterface(aRightNode);
|
|
mOffset=0;
|
|
return NS_OK;
|
|
}
|
|
|
|
JoinElementTxn::~JoinElementTxn()
|
|
{
|
|
}
|
|
|
|
// After DoTransaction() and RedoTransaction(), the left node is removed from the content tree and right node remains.
|
|
NS_IMETHODIMP JoinElementTxn::DoTransaction(void)
|
|
{
|
|
if (gNoisy) { printf("%p Do Join of %p and %p\n", this, mLeftNode.get(), mRightNode.get()); }
|
|
NS_PRECONDITION((mEditor && mLeftNode && mRightNode), "null arg");
|
|
if (!mEditor || !mLeftNode || !mRightNode) { return NS_ERROR_NOT_INITIALIZED; }
|
|
|
|
// get the parent node
|
|
nsCOMPtr<nsIDOMNode>leftParent;
|
|
nsresult result = mLeftNode->GetParentNode(getter_AddRefs(leftParent));
|
|
if (NS_FAILED(result)) return result;
|
|
if (!leftParent) return NS_ERROR_NULL_POINTER;
|
|
|
|
// verify that mLeftNode and mRightNode have the same parent
|
|
nsCOMPtr<nsIDOMNode>rightParent;
|
|
result = mRightNode->GetParentNode(getter_AddRefs(rightParent));
|
|
if (NS_FAILED(result)) return result;
|
|
if (!rightParent) return NS_ERROR_NULL_POINTER;
|
|
|
|
if (leftParent==rightParent)
|
|
{
|
|
mParent= do_QueryInterface(leftParent); // set this instance mParent.
|
|
// Other methods will see a non-null mParent and know all is well
|
|
nsCOMPtr<nsIDOMCharacterData> leftNodeAsText;
|
|
leftNodeAsText = do_QueryInterface(mLeftNode);
|
|
if (leftNodeAsText)
|
|
{
|
|
leftNodeAsText->GetLength(&mOffset);
|
|
}
|
|
else
|
|
{
|
|
nsCOMPtr<nsIDOMNodeList> childNodes;
|
|
result = mLeftNode->GetChildNodes(getter_AddRefs(childNodes));
|
|
if (NS_FAILED(result)) return result;
|
|
if (childNodes)
|
|
{
|
|
childNodes->GetLength(&mOffset);
|
|
}
|
|
}
|
|
result = mEditor->JoinNodesImpl(mRightNode, mLeftNode, mParent, PR_FALSE);
|
|
if (NS_SUCCEEDED(result))
|
|
{
|
|
if (gNoisy) { printf(" left node = %p removed\n", mLeftNode.get()); }
|
|
}
|
|
}
|
|
else
|
|
{
|
|
NS_ASSERTION(PR_FALSE, "2 nodes do not have same parent");
|
|
return NS_ERROR_INVALID_ARG;
|
|
}
|
|
return result;
|
|
}
|
|
|
|
//XXX: what if instead of split, we just deleted the unneeded children of mRight
|
|
// and re-inserted mLeft?
|
|
NS_IMETHODIMP JoinElementTxn::UndoTransaction(void)
|
|
{
|
|
if (gNoisy) { printf("%p Undo Join, right node = %p\n", this, mRightNode.get()); }
|
|
NS_ASSERTION(mRightNode && mLeftNode && mParent, "bad state");
|
|
if (!mRightNode || !mLeftNode || !mParent) { return NS_ERROR_NOT_INITIALIZED; }
|
|
nsresult result;
|
|
nsCOMPtr<nsIDOMNode>resultNode;
|
|
// first, massage the existing node so it is in its post-split state
|
|
nsCOMPtr<nsIDOMCharacterData>rightNodeAsText;
|
|
rightNodeAsText = do_QueryInterface(mRightNode);
|
|
if (rightNodeAsText)
|
|
{
|
|
result = rightNodeAsText->DeleteData(0, mOffset);
|
|
}
|
|
else
|
|
{
|
|
nsCOMPtr<nsIDOMNode>child;
|
|
nsCOMPtr<nsIDOMNode>nextSibling;
|
|
result = mRightNode->GetFirstChild(getter_AddRefs(child));
|
|
PRUint32 i;
|
|
for (i=0; i<mOffset; i++)
|
|
{
|
|
if (NS_FAILED(result)) {return result;}
|
|
if (!child) {return NS_ERROR_NULL_POINTER;}
|
|
child->GetNextSibling(getter_AddRefs(nextSibling));
|
|
result = mLeftNode->AppendChild(child, getter_AddRefs(resultNode));
|
|
child = do_QueryInterface(nextSibling);
|
|
}
|
|
}
|
|
// second, re-insert the left node into the tree
|
|
result = mParent->InsertBefore(mLeftNode, mRightNode, getter_AddRefs(resultNode));
|
|
return result;
|
|
|
|
}
|
|
|
|
NS_IMETHODIMP JoinElementTxn::GetIsTransient(PRBool *aIsTransient)
|
|
{
|
|
if (nsnull!=aIsTransient)
|
|
*aIsTransient = PR_FALSE;
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult JoinElementTxn::Merge(nsITransaction *aTransaction, PRBool *aDidMerge)
|
|
{
|
|
if (nsnull!=aDidMerge)
|
|
*aDidMerge=PR_FALSE;
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP JoinElementTxn::GetTxnDescription(nsAWritableString& aString)
|
|
{
|
|
aString.Assign(NS_LITERAL_STRING("JoinElementTxn"));
|
|
return NS_OK;
|
|
}
|