mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-05 08:35:26 +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
119 lines
3.8 KiB
C++
119 lines
3.8 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):
|
|
*/
|
|
|
|
#include "DeleteTextTxn.h"
|
|
#include "nsIDOMCharacterData.h"
|
|
#include "nsISelection.h"
|
|
|
|
#ifdef NS_DEBUG
|
|
static PRBool gNoisy = PR_FALSE;
|
|
#else
|
|
static const PRBool gNoisy = PR_FALSE;
|
|
#endif
|
|
|
|
DeleteTextTxn::DeleteTextTxn()
|
|
: EditTxn()
|
|
{
|
|
}
|
|
|
|
DeleteTextTxn::~DeleteTextTxn()
|
|
{
|
|
}
|
|
|
|
NS_IMETHODIMP DeleteTextTxn::Init(nsIEditor *aEditor,
|
|
nsIDOMCharacterData *aElement,
|
|
PRUint32 aOffset,
|
|
PRUint32 aNumCharsToDelete)
|
|
{
|
|
NS_ASSERTION(aEditor&&aElement, "bad arg");
|
|
if (!aEditor || !aElement) { return NS_ERROR_NULL_POINTER; }
|
|
|
|
mEditor = aEditor;
|
|
mElement = do_QueryInterface(aElement);
|
|
mOffset = aOffset;
|
|
mNumCharsToDelete = aNumCharsToDelete;
|
|
NS_ASSERTION(0!=aNumCharsToDelete, "bad arg, numCharsToDelete");
|
|
PRUint32 count;
|
|
aElement->GetLength(&count);
|
|
NS_ASSERTION(count>=aNumCharsToDelete, "bad arg, numCharsToDelete. Not enough characters in node");
|
|
NS_ASSERTION(count>=aOffset+aNumCharsToDelete, "bad arg, numCharsToDelete. Not enough characters in node");
|
|
mDeletedText.SetLength(0);
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP DeleteTextTxn::DoTransaction(void)
|
|
{
|
|
if (gNoisy) { printf("Do Delete Text\n"); }
|
|
NS_ASSERTION(mEditor && mElement, "bad state");
|
|
if (!mEditor || !mElement) { return NS_ERROR_NOT_INITIALIZED; }
|
|
// get the text that we're about to delete
|
|
nsresult result = mElement->SubstringData(mOffset, mNumCharsToDelete, mDeletedText);
|
|
NS_ASSERTION(NS_SUCCEEDED(result), "could not get text to delete.");
|
|
result = mElement->DeleteData(mOffset, mNumCharsToDelete);
|
|
if (NS_FAILED(result)) return result;
|
|
|
|
// only set selection to deletion point if editor gives permission
|
|
PRBool bAdjustSelection;
|
|
mEditor->ShouldTxnSetSelection(&bAdjustSelection);
|
|
if (bAdjustSelection)
|
|
{
|
|
nsCOMPtr<nsISelection> selection;
|
|
result = mEditor->GetSelection(getter_AddRefs(selection));
|
|
if (NS_FAILED(result)) return result;
|
|
if (!selection) return NS_ERROR_NULL_POINTER;
|
|
result = selection->Collapse(mElement, mOffset);
|
|
NS_ASSERTION((NS_SUCCEEDED(result)), "selection could not be collapsed after undo of deletetext.");
|
|
}
|
|
else
|
|
{
|
|
// do nothing - dom range gravity will adjust selection
|
|
}
|
|
return result;
|
|
}
|
|
|
|
//XXX: we may want to store the selection state and restore it properly
|
|
// was it an insertion point or an extended selection?
|
|
NS_IMETHODIMP DeleteTextTxn::UndoTransaction(void)
|
|
{
|
|
if (gNoisy) { printf("Undo Delete Text\n"); }
|
|
NS_ASSERTION(mEditor && mElement, "bad state");
|
|
if (!mEditor || !mElement) { return NS_ERROR_NOT_INITIALIZED; }
|
|
|
|
nsresult result;
|
|
result = mElement->InsertData(mOffset, mDeletedText);
|
|
return result;
|
|
}
|
|
|
|
NS_IMETHODIMP DeleteTextTxn::Merge(nsITransaction *aTransaction, PRBool *aDidMerge)
|
|
{
|
|
if (nsnull!=aDidMerge)
|
|
*aDidMerge=PR_FALSE;
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP DeleteTextTxn::GetTxnDescription(nsAWritableString& aString)
|
|
{
|
|
aString.Assign(NS_LITERAL_STRING("DeleteTextTxn: "));
|
|
aString += mDeletedText;
|
|
return NS_OK;
|
|
}
|