Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-28 05:10:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added GetNumberOfChildren() method. Changed all occurences of !NS_SUCCEEDED()

Browse Source 
to NS_FAILED(). Modified GetNumberOfUndoItems() and GetNumberOfRedoItems() to
handle the case where their stack is NULL.
This commit is contained in:
kin%netscape.com 1999-02-08 17:27:42 +00:00
parent ca82fa4359
commit 5797e5b2a3
2 changed files with 60 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
editor/txmgr/src/nsTransactionItem.cpp
View File

@ -63,6 +63,34 @@ nsTransactionItem::GetTransaction(nsITransaction **aTransaction)
return NS_OK;
}
nsresult
nsTransactionItem::GetNumberOfChildren(PRInt32 *aNumChildren)
{
nsresult result;
if (!aNumChildren)
return NS_ERROR_NULL_POINTER;
*aNumChildren = 0;
PRInt32 ui = 0;
PRInt32 ri = 0;
result = GetNumberOfUndoItems(&ui);
if (NS_FAILED(result))
return result;
result = GetNumberOfRedoItems(&ri);
if (NS_FAILED(result))
return result;
*aNumChildren = ui + ri;
return NS_OK;
}
nsresult
nsTransactionItem::Do()
{
@ -76,7 +104,7 @@ nsTransactionItem::Undo()
{
nsresult result = UndoChildren();
if (!NS_SUCCEEDED(result)) {
if (NS_FAILED(result)) {
RecoverFromUndoError();
return result;
}
@ -86,7 +114,7 @@ nsTransactionItem::Undo()
result = mTransaction->Undo();
if (!NS_SUCCEEDED(result)) {
if (NS_FAILED(result)) {
RecoverFromUndoError();
return result;
}
@ -111,31 +139,31 @@ nsTransactionItem::UndoChildren()
/* Undo all of the transaction items children! */
result = mUndoStack->GetSize(&sz);
if (!NS_SUCCEEDED(result))
if (NS_FAILED(result))
return result;
while (sz-- > 0) {
result = mUndoStack->Peek(&item);
if (!NS_SUCCEEDED(result)) {
if (NS_FAILED(result)) {
return result;
}
result = item->Undo();
if (!NS_SUCCEEDED(result)) {
if (NS_FAILED(result)) {
return result;
}
result = mUndoStack->Pop(&item);
if (!NS_SUCCEEDED(result)) {
if (NS_FAILED(result)) {
return result;
}
result = mRedoStack->Push(item);
if (!NS_SUCCEEDED(result)) {
if (NS_FAILED(result)) {
/* XXX: If we got an error here, I doubt we can recover!
* XXX: Should we just push the item back on the undo stack?
*/
@ -155,13 +183,13 @@ nsTransactionItem::Redo()
if (mTransaction) {
result = mTransaction->Redo();
if (!NS_SUCCEEDED(result))
if (NS_FAILED(result))
return result;
}
result = RedoChildren();
if (!NS_SUCCEEDED(result)) {
if (NS_FAILED(result)) {
RecoverFromRedoError();
return result;
}
@ -182,32 +210,32 @@ nsTransactionItem::RedoChildren()
/* Redo all of the transaction items children! */
result = mRedoStack->GetSize(&sz);
if (!NS_SUCCEEDED(result))
if (NS_FAILED(result))
return result;
while (sz-- > 0) {
result = mRedoStack->Peek(&item);
if (!NS_SUCCEEDED(result)) {
if (NS_FAILED(result)) {
return result;
}
result = item->Redo();
if (!NS_SUCCEEDED(result)) {
if (NS_FAILED(result)) {
return result;
}
result = mRedoStack->Pop(&item);
if (!NS_SUCCEEDED(result)) {
if (NS_FAILED(result)) {
return result;
}
result = mUndoStack->Push(item);
if (!NS_SUCCEEDED(result)) {
if (NS_FAILED(result)) {
// XXX: If we got an error here, I doubt we can recover!
// XXX: Should we just push the item back on the redo stack?
return result;
@ -220,12 +248,28 @@ nsTransactionItem::RedoChildren()
nsresult
nsTransactionItem::GetNumberOfUndoItems(PRInt32 *aNumItems)
{
if (!aNumItems)
return NS_ERROR_NULL_POINTER;
if (!mUndoStack) {
*aNumItems = 0;
return NS_OK;
}
return mUndoStack->GetSize(aNumItems);
}
nsresult
nsTransactionItem::GetNumberOfRedoItems(PRInt32 *aNumItems)
{
if (!aNumItems)
return NS_ERROR_NULL_POINTER;
if (!mRedoStack) {
*aNumItems = 0;
return NS_OK;
}
return mRedoStack->GetSize(aNumItems);
}
@ -275,7 +319,7 @@ nsTransactionItem::RecoverFromRedoError(void)
result = UndoChildren();
if (!NS_SUCCEEDED(result)) {
if (NS_FAILED(result)) {
return result;
}

1
editor/txmgr/src/nsTransactionItem.h
View File

@ -38,6 +38,7 @@ public:
virtual nsresult AddChild(nsTransactionItem *aTransactionItem);
virtual nsresult GetTransaction(nsITransaction **aTransaction);
virtual nsresult GetNumberOfChildren(PRInt32 *aNumChildren);
virtual nsresult Do(void);
virtual nsresult Undo(void);