Mozilla/mozilla/editor/txmgr/src/nsTransactionStack.cpp
kin%netscape.com 7f79330aa2 Fix for blocker bug 126770 (Undo/Redo doesn't work in Text widgets, Composer, and Mail)
mozilla/editor/txmgr/src/nsTransactionManager.cpp
  mozilla/editor/txmgr/src/nsTransactionStack.cpp

    - nsTransactionStack::Peek() was intended to return NULL for
      an empty stack so I changed timeless' change for bug 114166
      to return NS_OK and init the return value to zero.

    - timeless also changed the behavior of nsDeque::End(), it no
      longer returns an interator that is one past the end. So
      nsTransactionStack::Peek() had to call CurrentItem() instead
      of operator--.

    - I also backed out the changes made to nsTransactionManager.cpp
      cause they are unnecessary with the changes made to
      nsTransactionStack::Peek() above.

r=timeless@bemail.org  sr=hyatt@netscape.com  a=leaf@mozilla.org


git-svn-id: svn://10.0.0.236/trunk@115118 18797224-902f-48f8-a5cc-f745e15eee43
2002-02-20 23:22:31 +00:00

203 lines
4.6 KiB
C++

/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
*
* 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 the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the NPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the NPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#include "nsITransaction.h"
#include "nsTransactionItem.h"
#include "nsTransactionStack.h"
#include "nsCOMPtr.h"
nsTransactionStack::nsTransactionStack()
: mQue(0)
{
nsTransactionReleaseFunctor* theFunctor=new nsTransactionReleaseFunctor();
mQue.SetDeallocator(theFunctor);
}
nsTransactionStack::~nsTransactionStack()
{
Clear();
}
nsresult
nsTransactionStack::Push(nsTransactionItem *aTransaction)
{
if (!aTransaction)
return NS_ERROR_NULL_POINTER;
/* nsDeque's Push() method adds new items at the back
* of the deque.
*/
mQue.Push(aTransaction);
return NS_OK;
}
nsresult
nsTransactionStack::Pop(nsTransactionItem **aTransaction)
{
if (!aTransaction)
return NS_ERROR_NULL_POINTER;
/* nsDeque is a FIFO, so the top of our stack is actually
* the back of the deque.
*/
*aTransaction = (nsTransactionItem *)mQue.Pop();
return NS_OK;
}
nsresult
nsTransactionStack::PopBottom(nsTransactionItem **aTransaction)
{
if (!aTransaction)
return NS_ERROR_NULL_POINTER;
/* nsDeque is a FIFO, so the bottom of our stack is actually
* the front of the deque.
*/
*aTransaction = (nsTransactionItem *)mQue.PopFront();
return NS_OK;
}
nsresult
nsTransactionStack::Peek(nsTransactionItem **aTransaction)
{
if (!aTransaction)
return NS_ERROR_NULL_POINTER;
if (!mQue.GetSize()) {
*aTransaction = 0;
return NS_OK;
}
*aTransaction = (nsTransactionItem *)(mQue.End().GetCurrent());
return NS_OK;
}
nsresult
nsTransactionStack::GetItem(PRInt32 aIndex, nsTransactionItem **aTransaction)
{
if (!aTransaction)
return NS_ERROR_NULL_POINTER;
if (aIndex < 0 || aIndex >= mQue.GetSize())
return NS_ERROR_FAILURE;
*aTransaction = (nsTransactionItem *)(mQue.ObjectAt(aIndex));
return NS_OK;
}
nsresult
nsTransactionStack::Clear(void)
{
nsTransactionItem *tx = 0;
nsresult result = NS_OK;
/* Pop all transactions off the stack and release them. */
result = Pop(&tx);
if (NS_FAILED(result))
return result;
while (tx) {
delete tx;
result = Pop(&tx);
if (NS_FAILED(result))
return result;
}
return NS_OK;
}
nsresult
nsTransactionStack::GetSize(PRInt32 *aStackSize)
{
if (!aStackSize)
return NS_ERROR_NULL_POINTER;
*aStackSize = mQue.GetSize();
return NS_OK;
}
nsTransactionRedoStack::~nsTransactionRedoStack()
{
Clear();
}
nsresult
nsTransactionRedoStack::Clear(void)
{
nsTransactionItem *tx = 0;
nsresult result = NS_OK;
/* When clearing a Redo stack, we have to clear from the
* bottom of the stack towards the top!
*/
result = PopBottom(&tx);
if (NS_FAILED(result))
return result;
while (tx) {
delete tx;
result = PopBottom(&tx);
if (NS_FAILED(result))
return result;
}
return NS_OK;
}
void *
nsTransactionReleaseFunctor::operator()(void *aObject)
{
nsTransactionItem *item = (nsTransactionItem *)aObject;
delete item;
return 0;
}