зеркало из https://github.com/mozilla/pjs.git
Bug 119504, 96748. Fix off-by-one error when computing right-edge of insertion sort. Fix problem with asynchronous insertion doesn't take into account open folders preceding the insertion point. r=varga@utcru.sk, sr=hyatt, a=blizzard.
This commit is contained in:
waterson%netscape.com
Родитель
46b207c806
Коммит
225b90dbf6
|
|
@ -99,7 +99,7 @@ nsOutlinerRows::iterator
|
|||
nsOutlinerRows::First()
|
||||
{
|
||||
iterator result;
|
||||
result.Push(&mRoot, 0);
|
||||
result.Append(&mRoot, 0);
|
||||
result.SetRowIndex(0);
|
||||
return result;
|
||||
}
|
||||
|
|
@ -114,7 +114,7 @@ nsOutlinerRows::Last()
|
|||
PRInt32 count = current->Count();
|
||||
do {
|
||||
PRInt32 last = count - 1;
|
||||
result.Push(current, last);
|
||||
result.Append(current, last);
|
||||
current = count ? GetSubtreeFor(current, last) : nsnull;
|
||||
} while (current && ((count = current->Count()) != 0));
|
||||
|
||||
|
|
@ -159,7 +159,7 @@ nsOutlinerRows::operator[](PRInt32 aRow)
|
|||
Subtree* subtree = GetSubtreeFor(current, index, &subtreeSize);
|
||||
|
||||
if (subtreeSize >= aRow) {
|
||||
result.Push(current, index);
|
||||
result.Append(current, index);
|
||||
current = subtree;
|
||||
index = 0;
|
||||
--aRow;
|
||||
|
|
@ -223,14 +223,14 @@ nsOutlinerRows::Subtree::Clear()
|
|||
mCount = mCapacity = mSubtreeSize = 0;
|
||||
}
|
||||
|
||||
PRBool
|
||||
nsOutlinerRows::iterator
|
||||
nsOutlinerRows::Subtree::InsertRowAt(nsTemplateMatch* aMatch, PRInt32 aIndex)
|
||||
{
|
||||
if (mCount >= mCapacity || aIndex >= mCapacity) {
|
||||
PRInt32 newCapacity = NS_MAX(mCapacity * 2, aIndex + 1);
|
||||
Row* newRows = new Row[newCapacity];
|
||||
if (! newRows)
|
||||
return PR_FALSE;
|
||||
return iterator();
|
||||
|
||||
for (PRInt32 i = mCount - 1; i >= 0; --i)
|
||||
newRows[i] = mRows[i];
|
||||
|
|
@ -250,10 +250,47 @@ nsOutlinerRows::Subtree::InsertRowAt(nsTemplateMatch* aMatch, PRInt32 aIndex)
|
|||
mRows[aIndex].mSubtree = nsnull;
|
||||
++mCount;
|
||||
|
||||
for (Subtree* subtree = this; subtree != nsnull; subtree = subtree->mParent)
|
||||
// Now build an iterator that points to the newly inserted element.
|
||||
PRInt32 rowIndex = 0;
|
||||
iterator result;
|
||||
result.Push(this, aIndex);
|
||||
|
||||
for ( ; --aIndex >= 0; ++rowIndex) {
|
||||
// Account for open subtrees in the absolute row index.
|
||||
const Subtree *subtree = mRows[aIndex].mSubtree;
|
||||
if (subtree)
|
||||
rowIndex += subtree->mSubtreeSize;
|
||||
}
|
||||
|
||||
Subtree *subtree = this;
|
||||
do {
|
||||
// Note that the subtree's size has expanded.
|
||||
++subtree->mSubtreeSize;
|
||||
|
||||
return PR_TRUE;
|
||||
Subtree *parent = subtree->mParent;
|
||||
if (! parent)
|
||||
break;
|
||||
|
||||
// Account for open subtrees in the absolute row index.
|
||||
PRInt32 count = parent->Count();
|
||||
for (aIndex = 0; aIndex < count; ++aIndex, ++rowIndex) {
|
||||
const Subtree *child = (*parent)[aIndex].mSubtree;
|
||||
if (subtree == child)
|
||||
break;
|
||||
|
||||
if (child)
|
||||
rowIndex += child->mSubtreeSize;
|
||||
}
|
||||
|
||||
NS_ASSERTION(aIndex < count, "couldn't find subtree in parent");
|
||||
|
||||
result.Push(parent, aIndex);
|
||||
subtree = parent;
|
||||
++rowIndex; // One for the parent row.
|
||||
} while (1);
|
||||
|
||||
result.SetRowIndex(rowIndex);
|
||||
return result;
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -263,6 +300,7 @@ nsOutlinerRows::Subtree::RemoveRowAt(PRInt32 aIndex)
|
|||
if (aIndex < 0 || aIndex >= Count())
|
||||
return;
|
||||
|
||||
// How big is the subtree we're going to be removing?
|
||||
PRInt32 subtreeSize = mRows[aIndex].mSubtree
|
||||
? mRows[aIndex].mSubtree->GetSubtreeSize()
|
||||
: 0;
|
||||
|
|
@ -304,7 +342,7 @@ nsOutlinerRows::iterator::operator=(const iterator& aIterator)
|
|||
}
|
||||
|
||||
void
|
||||
nsOutlinerRows::iterator::Push(Subtree* aParent, PRInt32 aChildIndex)
|
||||
nsOutlinerRows::iterator::Append(Subtree* aParent, PRInt32 aChildIndex)
|
||||
{
|
||||
if (mTop < kMaxDepth - 1) {
|
||||
++mTop;
|
||||
|
|
@ -315,6 +353,21 @@ nsOutlinerRows::iterator::Push(Subtree* aParent, PRInt32 aChildIndex)
|
|||
NS_ERROR("overflow");
|
||||
}
|
||||
|
||||
void
|
||||
nsOutlinerRows::iterator::Push(Subtree *aParent, PRInt32 aChildIndex)
|
||||
{
|
||||
if (mTop < kMaxDepth - 1) {
|
||||
for (PRInt32 i = mTop; i >= 0; ++i)
|
||||
mLink[i + 1] = mLink[i];
|
||||
|
||||
mLink[0].mParent = aParent;
|
||||
mLink[0].mChildIndex = aChildIndex;
|
||||
++mTop;
|
||||
}
|
||||
else
|
||||
NS_ERROR("overflow");
|
||||
}
|
||||
|
||||
PRBool
|
||||
nsOutlinerRows::iterator::operator==(const iterator& aIterator) const
|
||||
{
|
||||
|
|
@ -342,7 +395,7 @@ nsOutlinerRows::iterator::Next()
|
|||
Subtree* subtree = top.GetRow().mSubtree;
|
||||
|
||||
if (subtree && subtree->Count()) {
|
||||
Push(subtree, 0);
|
||||
Append(subtree, 0);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -421,7 +474,7 @@ nsOutlinerRows::iterator::Prev()
|
|||
if (subtree && subtree->Count()) {
|
||||
do {
|
||||
index = subtree->Count() - 1;
|
||||
Push(subtree, index);
|
||||
Append(subtree, index);
|
||||
|
||||
parent = subtree;
|
||||
subtree = (*parent)[index].mSubtree;
|
||||
|
|
|
|||
|
|
@ -1,447 +0,0 @@
|
|||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
||||
/* ***** 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 Communicator client 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):
|
||||
* Chris Waterson <waterson@netscape.com>
|
||||
*
|
||||
*
|
||||
* 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 ***** */
|
||||
|
||||
#ifndef nsOutlinerRows_h__
|
||||
#define nsOutlinerRows_h__
|
||||
|
||||
#include "nsCOMPtr.h"
|
||||
#include "nsIRDFResource.h"
|
||||
#include "pldhash.h"
|
||||
class nsConflictSet;
|
||||
class nsTemplateMatch;
|
||||
|
||||
/**
|
||||
* This class maintains the state of the XUL outliner builder's
|
||||
* rows. It maps a row number to the nsTemplateMatch object that
|
||||
* populates the row.
|
||||
*/
|
||||
class nsOutlinerRows
|
||||
{
|
||||
public:
|
||||
enum Direction { eDirection_Forwards = +1, eDirection_Backwards = -1 };
|
||||
|
||||
// N.B. these values are chosen to avoid problems with
|
||||
// sign-extension from the bit-packed Row structure.
|
||||
enum ContainerType {
|
||||
eContainerType_Unknown = 0,
|
||||
eContainerType_Noncontainer = 1,
|
||||
eContainerType_Container = -2
|
||||
};
|
||||
|
||||
enum ContainerState {
|
||||
eContainerState_Unknown = 0,
|
||||
eContainerState_Empty = 1,
|
||||
eContainerState_Nonempty = -2
|
||||
};
|
||||
|
||||
class Subtree;
|
||||
|
||||
/**
|
||||
* A row in the outliner. Contains the match that the row
|
||||
* corresponds to, and a pointer to the row's subtree, if there
|
||||
* are any.
|
||||
*/
|
||||
struct Row {
|
||||
nsTemplateMatch* mMatch;
|
||||
ContainerType mContainerType : 2;
|
||||
ContainerState mContainerState : 2;
|
||||
Subtree* mSubtree; // XXX eventually move to hashtable
|
||||
};
|
||||
|
||||
/**
|
||||
* A subtree in the outliner. A subtree contains rows, which may
|
||||
* contain other subtrees.
|
||||
*/
|
||||
class Subtree {
|
||||
protected:
|
||||
friend class nsOutlinerRows; // so that it can access members, for now
|
||||
|
||||
/**
|
||||
* The parent subtree; null if we're the root
|
||||
*/
|
||||
Subtree* mParent;
|
||||
|
||||
/**
|
||||
* The number of immediate children in this subtree
|
||||
*/
|
||||
PRInt32 mCount;
|
||||
|
||||
/**
|
||||
* The capacity of the subtree
|
||||
*/
|
||||
PRInt32 mCapacity;
|
||||
|
||||
/**
|
||||
* The total number of rows in this subtree, recursively
|
||||
* including child subtrees.
|
||||
*/
|
||||
PRInt32 mSubtreeSize;
|
||||
|
||||
/**
|
||||
* The array of rows in the subtree
|
||||
*/
|
||||
Row* mRows;
|
||||
|
||||
public:
|
||||
/**
|
||||
* Creates a subtree with the specified parent.
|
||||
*/
|
||||
Subtree(Subtree* aParent)
|
||||
: mParent(aParent),
|
||||
mCount(0),
|
||||
mCapacity(0),
|
||||
mSubtreeSize(0),
|
||||
mRows(nsnull) {}
|
||||
|
||||
~Subtree();
|
||||
|
||||
/**
|
||||
* Return the number of immediate child rows in the subtree
|
||||
*/
|
||||
PRInt32 Count() const { return mCount; }
|
||||
|
||||
/**
|
||||
* Return the number of rows in this subtree, as well as all
|
||||
* the subtrees it contains.
|
||||
*/
|
||||
PRInt32 GetSubtreeSize() const { return mSubtreeSize; }
|
||||
|
||||
/**
|
||||
* Retrieve the immediate child row at the specified index.
|
||||
*/
|
||||
const Row& operator[](PRInt32 aIndex) const {
|
||||
NS_PRECONDITION(aIndex >= 0 && aIndex < mCount, "bad index");
|
||||
return mRows[aIndex]; }
|
||||
|
||||
/**
|
||||
* Retrieve the immediate row at the specified index.
|
||||
*/
|
||||
Row& operator[](PRInt32 aIndex) {
|
||||
NS_PRECONDITION(aIndex >= 0 && aIndex < mCount, "bad index");
|
||||
return mRows[aIndex]; }
|
||||
|
||||
/**
|
||||
* Remove all rows from the subtree.
|
||||
*/
|
||||
void Clear();
|
||||
|
||||
protected:
|
||||
/**
|
||||
* Insert an immediate child row at the specified index.
|
||||
*/
|
||||
PRBool InsertRowAt(nsTemplateMatch* aMatch, PRInt32 aIndex);
|
||||
|
||||
/**
|
||||
* Remove an immediate child row from the specified index.
|
||||
*/
|
||||
void RemoveRowAt(PRInt32 aChildIndex);
|
||||
};
|
||||
|
||||
friend class Subtree;
|
||||
|
||||
enum { kMaxDepth = 32 };
|
||||
|
||||
protected:
|
||||
/**
|
||||
* A link in the path through the view's tree.
|
||||
*/
|
||||
struct Link {
|
||||
Subtree* mParent;
|
||||
PRInt32 mChildIndex;
|
||||
|
||||
Link&
|
||||
operator=(const Link& aLink) {
|
||||
mParent = aLink.mParent;
|
||||
mChildIndex = aLink.mChildIndex;
|
||||
return *this; }
|
||||
|
||||
PRBool
|
||||
operator==(const Link& aLink) const {
|
||||
return (mParent == aLink.mParent)
|
||||
&& (mChildIndex == aLink.mChildIndex); }
|
||||
|
||||
Subtree* GetParent() { return mParent; }
|
||||
const Subtree* GetParent() const { return mParent; }
|
||||
|
||||
PRInt32 GetChildIndex() const { return mChildIndex; }
|
||||
|
||||
Row& GetRow() { return (*mParent)[mChildIndex]; }
|
||||
const Row& GetRow() const { return (*mParent)[mChildIndex]; }
|
||||
};
|
||||
|
||||
public:
|
||||
class iterator;
|
||||
friend class iterator;
|
||||
|
||||
/**
|
||||
* An iterator that can be used to traverse the outliner view.
|
||||
*/
|
||||
class iterator {
|
||||
protected:
|
||||
PRInt32 mTop;
|
||||
PRInt32 mRowIndex;
|
||||
Link mLink[kMaxDepth];
|
||||
|
||||
void Next();
|
||||
void Prev();
|
||||
|
||||
friend class nsOutlinerRows; // so nsOutlinerRows can initialize us
|
||||
|
||||
/**
|
||||
* Used by PathTo() to initialize an iterator.
|
||||
*/
|
||||
void Push(Subtree* aParent, PRInt32 aChildIndex);
|
||||
|
||||
/**
|
||||
* Used by PathTo() to initialize an iterator.
|
||||
*/
|
||||
void SetRowIndex(PRInt32 aRowIndex) { mRowIndex = aRowIndex; }
|
||||
|
||||
public:
|
||||
iterator() : mTop(-1), mRowIndex(-1) {}
|
||||
|
||||
iterator(const iterator& aIterator);
|
||||
iterator& operator=(const iterator& aIterator);
|
||||
|
||||
PRBool operator==(const iterator& aIterator) const;
|
||||
|
||||
PRBool operator!=(const iterator& aIterator) const {
|
||||
return !aIterator.operator==(*this); }
|
||||
|
||||
const Row& operator*() const { return mLink[mTop].GetRow(); }
|
||||
Row& operator*() { return mLink[mTop].GetRow(); }
|
||||
|
||||
const Row* operator->() const { return &(mLink[mTop].GetRow()); }
|
||||
Row* operator->() { return &(mLink[mTop].GetRow()); }
|
||||
|
||||
iterator& operator++() { Next(); return *this; }
|
||||
iterator operator++(int) { iterator temp(*this); Next(); return temp; }
|
||||
iterator& operator--() { Prev(); return *this; }
|
||||
iterator operator--(int) { iterator temp(*this); Prev(); return temp; }
|
||||
|
||||
/**
|
||||
* Return the current parent link
|
||||
*/
|
||||
Subtree* GetParent() {
|
||||
return mLink[mTop].GetParent(); }
|
||||
|
||||
const Subtree* GetParent() const {
|
||||
return mLink[mTop].GetParent(); }
|
||||
|
||||
/**
|
||||
* Return the current child index
|
||||
*/
|
||||
PRInt32 GetChildIndex() const {
|
||||
return mLink[mTop].GetChildIndex(); }
|
||||
|
||||
/**
|
||||
* Return the depth of the path the iterator is maintaining
|
||||
* into the tree.
|
||||
*/
|
||||
PRInt32 GetDepth() const { return mTop + 1; }
|
||||
|
||||
/**
|
||||
* Return the current row index of the iterator
|
||||
*/
|
||||
PRInt32 GetRowIndex() const { return mRowIndex; }
|
||||
};
|
||||
|
||||
/**
|
||||
* Retrieve the first element in the view
|
||||
*/
|
||||
iterator First();
|
||||
|
||||
/**
|
||||
* Retrieve (one past) the last element in the view
|
||||
*/
|
||||
iterator Last();
|
||||
|
||||
/**
|
||||
* Find the row that contains the match with the specified member
|
||||
* resource.
|
||||
*/
|
||||
iterator Find(nsConflictSet& aConflictSet, nsIRDFResource* aMember);
|
||||
|
||||
/**
|
||||
* Retrieve the ith element in the view
|
||||
*/
|
||||
iterator operator[](PRInt32 aIndex);
|
||||
|
||||
nsOutlinerRows() : mRoot(nsnull), mRootResource(nsnull) {}
|
||||
~nsOutlinerRows() {}
|
||||
|
||||
/**
|
||||
* Ensure that a child subtree exists within the specified parent
|
||||
* at the specified child index within the parent. (In other
|
||||
* words, create a subtree if one doesn't already exist.)
|
||||
*/
|
||||
Subtree*
|
||||
EnsureSubtreeFor(Subtree* aParent, PRInt32 aChildIndex);
|
||||
|
||||
/**
|
||||
* Ensure that a child subtree exists at the iterator's position.
|
||||
*/
|
||||
Subtree*
|
||||
EnsureSubtreeFor(iterator& aIterator) {
|
||||
return EnsureSubtreeFor(aIterator.GetParent(),
|
||||
aIterator.GetChildIndex()); }
|
||||
|
||||
/**
|
||||
* Get the child subtree for the specified parent at the specified
|
||||
* child index. Optionally return the child subtree's size. Will
|
||||
* return `null' if no subtree exists.
|
||||
*/
|
||||
Subtree*
|
||||
GetSubtreeFor(const Subtree* aParent,
|
||||
PRInt32 aChildIndex,
|
||||
PRInt32* aSubtreeSize = nsnull);
|
||||
|
||||
/**
|
||||
* Retrieve the size of the subtree within the specified parent.
|
||||
*/
|
||||
PRInt32
|
||||
GetSubtreeSizeFor(const Subtree* aParent,
|
||||
PRInt32 aChildIndex) {
|
||||
PRInt32 size;
|
||||
GetSubtreeFor(aParent, aChildIndex, &size);
|
||||
return size; }
|
||||
|
||||
/**
|
||||
* Retrieve the size of the subtree within the specified parent.
|
||||
*/
|
||||
PRInt32
|
||||
GetSubtreeSizeFor(const iterator& aIterator) {
|
||||
PRInt32 size;
|
||||
GetSubtreeFor(aIterator.GetParent(), aIterator.GetChildIndex(), &size);
|
||||
return size; }
|
||||
|
||||
/**
|
||||
* Remove the specified subtree for a row, leaving the row itself
|
||||
* intact.
|
||||
*/
|
||||
void
|
||||
RemoveSubtreeFor(Subtree* aParent, PRInt32 aChildIndex);
|
||||
|
||||
/**
|
||||
* Remove the specified subtree for a row, leaving the row itself
|
||||
* intact.
|
||||
*/
|
||||
void
|
||||
RemoveSubtreeFor(iterator& aIterator) {
|
||||
RemoveSubtreeFor(aIterator.GetParent(), aIterator.GetChildIndex()); }
|
||||
|
||||
/**
|
||||
* Remove the specified row from the view
|
||||
*/
|
||||
void
|
||||
RemoveRowAt(iterator& aIterator) {
|
||||
iterator temp = aIterator++;
|
||||
Subtree* parent = temp.GetParent();
|
||||
parent->RemoveRowAt(temp.GetChildIndex());
|
||||
InvalidateCachedRow(); }
|
||||
|
||||
/**
|
||||
* Insert a new match into the view
|
||||
*/
|
||||
void
|
||||
InsertRowAt(nsTemplateMatch* aMatch, Subtree* aSubtree, PRInt32 aChildIndex) {
|
||||
aSubtree->InsertRowAt(aMatch, aChildIndex);
|
||||
InvalidateCachedRow(); }
|
||||
|
||||
/**
|
||||
* Raw access to the rows; e.g., for sorting.
|
||||
*/
|
||||
Row*
|
||||
GetRowsFor(Subtree* aSubtree) { return aSubtree->mRows; }
|
||||
|
||||
/**
|
||||
* Remove all of the rows
|
||||
*/
|
||||
void Clear();
|
||||
|
||||
/**
|
||||
* Return the total number of rows in the outliner view.
|
||||
*/
|
||||
PRInt32 Count() const { return mRoot.GetSubtreeSize(); }
|
||||
|
||||
/**
|
||||
* Retrieve the root subtree
|
||||
*/
|
||||
Subtree* GetRoot() { return &mRoot; }
|
||||
|
||||
/**
|
||||
* Set the root resource for the view
|
||||
*/
|
||||
void SetRootResource(nsIRDFResource* aResource) {
|
||||
mRootResource = aResource; }
|
||||
|
||||
/**
|
||||
* Retrieve hte root resource for the view
|
||||
*/
|
||||
nsIRDFResource* GetRootResource() {
|
||||
return mRootResource.get(); }
|
||||
|
||||
/**
|
||||
* Invalidate the cached row; e.g., because the view has changed
|
||||
* in a way that would corrupt the iterator.
|
||||
*/
|
||||
void
|
||||
InvalidateCachedRow() { mLastRow = iterator(); }
|
||||
|
||||
protected:
|
||||
/**
|
||||
* The root subtree.
|
||||
*/
|
||||
Subtree mRoot;
|
||||
|
||||
/**
|
||||
* The root resource for the view
|
||||
*/
|
||||
nsCOMPtr<nsIRDFResource> mRootResource;
|
||||
|
||||
/**
|
||||
* The last row that was asked for by operator[]. By remembering
|
||||
* this, we can usually avoid the O(n) search through the row
|
||||
* array to find the row at the specified index.
|
||||
*/
|
||||
iterator mLastRow;
|
||||
};
|
||||
|
||||
|
||||
#endif // nsOutlinerRows_h__
|
||||
|
|
@ -99,7 +99,7 @@ nsOutlinerRows::iterator
|
|||
nsOutlinerRows::First()
|
||||
{
|
||||
iterator result;
|
||||
result.Push(&mRoot, 0);
|
||||
result.Append(&mRoot, 0);
|
||||
result.SetRowIndex(0);
|
||||
return result;
|
||||
}
|
||||
|
|
@ -114,7 +114,7 @@ nsOutlinerRows::Last()
|
|||
PRInt32 count = current->Count();
|
||||
do {
|
||||
PRInt32 last = count - 1;
|
||||
result.Push(current, last);
|
||||
result.Append(current, last);
|
||||
current = count ? GetSubtreeFor(current, last) : nsnull;
|
||||
} while (current && ((count = current->Count()) != 0));
|
||||
|
||||
|
|
@ -159,7 +159,7 @@ nsOutlinerRows::operator[](PRInt32 aRow)
|
|||
Subtree* subtree = GetSubtreeFor(current, index, &subtreeSize);
|
||||
|
||||
if (subtreeSize >= aRow) {
|
||||
result.Push(current, index);
|
||||
result.Append(current, index);
|
||||
current = subtree;
|
||||
index = 0;
|
||||
--aRow;
|
||||
|
|
@ -223,14 +223,14 @@ nsOutlinerRows::Subtree::Clear()
|
|||
mCount = mCapacity = mSubtreeSize = 0;
|
||||
}
|
||||
|
||||
PRBool
|
||||
nsOutlinerRows::iterator
|
||||
nsOutlinerRows::Subtree::InsertRowAt(nsTemplateMatch* aMatch, PRInt32 aIndex)
|
||||
{
|
||||
if (mCount >= mCapacity || aIndex >= mCapacity) {
|
||||
PRInt32 newCapacity = NS_MAX(mCapacity * 2, aIndex + 1);
|
||||
Row* newRows = new Row[newCapacity];
|
||||
if (! newRows)
|
||||
return PR_FALSE;
|
||||
return iterator();
|
||||
|
||||
for (PRInt32 i = mCount - 1; i >= 0; --i)
|
||||
newRows[i] = mRows[i];
|
||||
|
|
@ -250,10 +250,47 @@ nsOutlinerRows::Subtree::InsertRowAt(nsTemplateMatch* aMatch, PRInt32 aIndex)
|
|||
mRows[aIndex].mSubtree = nsnull;
|
||||
++mCount;
|
||||
|
||||
for (Subtree* subtree = this; subtree != nsnull; subtree = subtree->mParent)
|
||||
// Now build an iterator that points to the newly inserted element.
|
||||
PRInt32 rowIndex = 0;
|
||||
iterator result;
|
||||
result.Push(this, aIndex);
|
||||
|
||||
for ( ; --aIndex >= 0; ++rowIndex) {
|
||||
// Account for open subtrees in the absolute row index.
|
||||
const Subtree *subtree = mRows[aIndex].mSubtree;
|
||||
if (subtree)
|
||||
rowIndex += subtree->mSubtreeSize;
|
||||
}
|
||||
|
||||
Subtree *subtree = this;
|
||||
do {
|
||||
// Note that the subtree's size has expanded.
|
||||
++subtree->mSubtreeSize;
|
||||
|
||||
return PR_TRUE;
|
||||
Subtree *parent = subtree->mParent;
|
||||
if (! parent)
|
||||
break;
|
||||
|
||||
// Account for open subtrees in the absolute row index.
|
||||
PRInt32 count = parent->Count();
|
||||
for (aIndex = 0; aIndex < count; ++aIndex, ++rowIndex) {
|
||||
const Subtree *child = (*parent)[aIndex].mSubtree;
|
||||
if (subtree == child)
|
||||
break;
|
||||
|
||||
if (child)
|
||||
rowIndex += child->mSubtreeSize;
|
||||
}
|
||||
|
||||
NS_ASSERTION(aIndex < count, "couldn't find subtree in parent");
|
||||
|
||||
result.Push(parent, aIndex);
|
||||
subtree = parent;
|
||||
++rowIndex; // One for the parent row.
|
||||
} while (1);
|
||||
|
||||
result.SetRowIndex(rowIndex);
|
||||
return result;
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -263,6 +300,7 @@ nsOutlinerRows::Subtree::RemoveRowAt(PRInt32 aIndex)
|
|||
if (aIndex < 0 || aIndex >= Count())
|
||||
return;
|
||||
|
||||
// How big is the subtree we're going to be removing?
|
||||
PRInt32 subtreeSize = mRows[aIndex].mSubtree
|
||||
? mRows[aIndex].mSubtree->GetSubtreeSize()
|
||||
: 0;
|
||||
|
|
@ -304,7 +342,7 @@ nsOutlinerRows::iterator::operator=(const iterator& aIterator)
|
|||
}
|
||||
|
||||
void
|
||||
nsOutlinerRows::iterator::Push(Subtree* aParent, PRInt32 aChildIndex)
|
||||
nsOutlinerRows::iterator::Append(Subtree* aParent, PRInt32 aChildIndex)
|
||||
{
|
||||
if (mTop < kMaxDepth - 1) {
|
||||
++mTop;
|
||||
|
|
@ -315,6 +353,21 @@ nsOutlinerRows::iterator::Push(Subtree* aParent, PRInt32 aChildIndex)
|
|||
NS_ERROR("overflow");
|
||||
}
|
||||
|
||||
void
|
||||
nsOutlinerRows::iterator::Push(Subtree *aParent, PRInt32 aChildIndex)
|
||||
{
|
||||
if (mTop < kMaxDepth - 1) {
|
||||
for (PRInt32 i = mTop; i >= 0; ++i)
|
||||
mLink[i + 1] = mLink[i];
|
||||
|
||||
mLink[0].mParent = aParent;
|
||||
mLink[0].mChildIndex = aChildIndex;
|
||||
++mTop;
|
||||
}
|
||||
else
|
||||
NS_ERROR("overflow");
|
||||
}
|
||||
|
||||
PRBool
|
||||
nsOutlinerRows::iterator::operator==(const iterator& aIterator) const
|
||||
{
|
||||
|
|
@ -342,7 +395,7 @@ nsOutlinerRows::iterator::Next()
|
|||
Subtree* subtree = top.GetRow().mSubtree;
|
||||
|
||||
if (subtree && subtree->Count()) {
|
||||
Push(subtree, 0);
|
||||
Append(subtree, 0);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -421,7 +474,7 @@ nsOutlinerRows::iterator::Prev()
|
|||
if (subtree && subtree->Count()) {
|
||||
do {
|
||||
index = subtree->Count() - 1;
|
||||
Push(subtree, index);
|
||||
Append(subtree, index);
|
||||
|
||||
parent = subtree;
|
||||
subtree = (*parent)[index].mSubtree;
|
||||
|
|
|
|||
|
|
@ -54,6 +54,9 @@ class nsTemplateMatch;
|
|||
class nsOutlinerRows
|
||||
{
|
||||
public:
|
||||
class iterator;
|
||||
friend class iterator;
|
||||
|
||||
enum Direction { eDirection_Forwards = +1, eDirection_Backwards = -1 };
|
||||
|
||||
// N.B. these values are chosen to avoid problems with
|
||||
|
|
@ -165,7 +168,7 @@ public:
|
|||
/**
|
||||
* Insert an immediate child row at the specified index.
|
||||
*/
|
||||
PRBool InsertRowAt(nsTemplateMatch* aMatch, PRInt32 aIndex);
|
||||
iterator InsertRowAt(nsTemplateMatch* aMatch, PRInt32 aIndex);
|
||||
|
||||
/**
|
||||
* Remove an immediate child row from the specified index.
|
||||
|
|
@ -206,9 +209,6 @@ protected:
|
|||
};
|
||||
|
||||
public:
|
||||
class iterator;
|
||||
friend class iterator;
|
||||
|
||||
/**
|
||||
* An iterator that can be used to traverse the outliner view.
|
||||
*/
|
||||
|
|
@ -221,15 +221,21 @@ public:
|
|||
void Next();
|
||||
void Prev();
|
||||
|
||||
friend class Subtree; // so InsertRowAt can initialize us
|
||||
friend class nsOutlinerRows; // so nsOutlinerRows can initialize us
|
||||
|
||||
/**
|
||||
* Used by PathTo() to initialize an iterator.
|
||||
* Used by operator[]() to initialize an iterator.
|
||||
*/
|
||||
void Push(Subtree* aParent, PRInt32 aChildIndex);
|
||||
void Append(Subtree* aParent, PRInt32 aChildIndex);
|
||||
|
||||
/**
|
||||
* Used by PathTo() to initialize an iterator.
|
||||
* Used by InsertRowAt() to initialize an iterator.
|
||||
*/
|
||||
void Push(Subtree *aParent, PRInt32 aChildIndex);
|
||||
|
||||
/**
|
||||
* Used by operator[]() and InsertRowAt() to initialize an iterator.
|
||||
*/
|
||||
void SetRowIndex(PRInt32 aRowIndex) { mRowIndex = aRowIndex; }
|
||||
|
||||
|
|
@ -379,10 +385,10 @@ public:
|
|||
/**
|
||||
* Insert a new match into the view
|
||||
*/
|
||||
void
|
||||
iterator
|
||||
InsertRowAt(nsTemplateMatch* aMatch, Subtree* aSubtree, PRInt32 aChildIndex) {
|
||||
aSubtree->InsertRowAt(aMatch, aChildIndex);
|
||||
InvalidateCachedRow(); }
|
||||
InvalidateCachedRow();
|
||||
return aSubtree->InsertRowAt(aMatch, aChildIndex); }
|
||||
|
||||
/**
|
||||
* Raw access to the rows; e.g., for sorting.
|
||||
|
|
|
|||
|
|
@ -1124,16 +1124,16 @@ nsXULOutlinerBuilder::ReplaceMatch(nsIRDFResource* aMember,
|
|||
if (cmp < 0)
|
||||
left = ++index;
|
||||
else if (cmp > 0)
|
||||
right = index - 1;
|
||||
right = index;
|
||||
else
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
mRows.InsertRowAt(aNewMatch, parent, index);
|
||||
nsOutlinerRows::iterator iter =
|
||||
mRows.InsertRowAt(aNewMatch, parent, index);
|
||||
|
||||
row += index + 1;
|
||||
mBoxObject->RowCountChanged(row, +1);
|
||||
mBoxObject->RowCountChanged(iter.GetRowIndex(), +1);
|
||||
|
||||
// See if this newly added row is open; in which case,
|
||||
// recursively add its children to the outliner, too.
|
||||
|
|
@ -1145,7 +1145,7 @@ nsXULOutlinerBuilder::ReplaceMatch(nsIRDFResource* aMember,
|
|||
PRBool open;
|
||||
IsContainerOpen(member, &open);
|
||||
if (open)
|
||||
OpenContainer(row, member);
|
||||
OpenContainer(iter.GetRowIndex(), member);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1124,16 +1124,16 @@ nsXULOutlinerBuilder::ReplaceMatch(nsIRDFResource* aMember,
|
|||
if (cmp < 0)
|
||||
left = ++index;
|
||||
else if (cmp > 0)
|
||||
right = index - 1;
|
||||
right = index;
|
||||
else
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
mRows.InsertRowAt(aNewMatch, parent, index);
|
||||
nsOutlinerRows::iterator iter =
|
||||
mRows.InsertRowAt(aNewMatch, parent, index);
|
||||
|
||||
row += index + 1;
|
||||
mBoxObject->RowCountChanged(row, +1);
|
||||
mBoxObject->RowCountChanged(iter.GetRowIndex(), +1);
|
||||
|
||||
// See if this newly added row is open; in which case,
|
||||
// recursively add its children to the outliner, too.
|
||||
|
|
@ -1145,7 +1145,7 @@ nsXULOutlinerBuilder::ReplaceMatch(nsIRDFResource* aMember,
|
|||
PRBool open;
|
||||
IsContainerOpen(member, &open);
|
||||
if (open)
|
||||
OpenContainer(row, member);
|
||||
OpenContainer(iter.GetRowIndex(), member);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче