mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-13 05:15:45 +00:00
Forgot to remove nsXFormsMDGSet ... bug 278369
This commit is contained in:
parent
7d3aed3043
commit
b15a475d7f
@ -1,98 +0,0 @@
|
||||
#include "nsXFormsMDGSet.h"
|
||||
|
||||
MOZ_DECL_CTOR_COUNTER(nsXFormsMDGSet)
|
||||
|
||||
nsXFormsMDGSet::nsXFormsMDGSet()
|
||||
{
|
||||
MOZ_COUNT_CTOR(nsXFormsMDGSet);
|
||||
}
|
||||
|
||||
nsXFormsMDGSet::~nsXFormsMDGSet() {
|
||||
Clear();
|
||||
|
||||
MOZ_COUNT_DTOR(nsXFormsMDGSet);
|
||||
}
|
||||
|
||||
int
|
||||
nsXFormsMDGSet::sortFunc(const void* aElement1, const void* aElement2, void* aData)
|
||||
{
|
||||
int res = 0;
|
||||
if (aElement1 < aElement2)
|
||||
res = -1;
|
||||
if (aElement1 > aElement2)
|
||||
res = 1;
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
nsXFormsMDGSet::Clear()
|
||||
{
|
||||
// Remove reference counters
|
||||
nsISupports* node;
|
||||
for (PRInt32 i = 0; i < array.Count(); ++i) {
|
||||
node = NS_STATIC_CAST(nsISupports*, array[i]);
|
||||
node->Release();
|
||||
}
|
||||
// Clear array
|
||||
array.Clear();
|
||||
}
|
||||
|
||||
void
|
||||
nsXFormsMDGSet::MakeUnique()
|
||||
{
|
||||
array.Sort(sortFunc, nsnull);
|
||||
|
||||
PRInt32 pos = 0;
|
||||
nsIDOMNode* node;
|
||||
while (pos + 1 < array.Count()) {
|
||||
if (array[pos] == array[pos + 1]) {
|
||||
node = NS_STATIC_CAST(nsIDOMNode*, array[pos + 1]);
|
||||
node->Release();
|
||||
array.RemoveElementAt(pos + 1);
|
||||
} else {
|
||||
++pos;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
PRInt32
|
||||
nsXFormsMDGSet::Count() const
|
||||
{
|
||||
return array.Count();
|
||||
}
|
||||
|
||||
PRBool
|
||||
nsXFormsMDGSet::AddNode(nsIDOMNode* aDomNode)
|
||||
{
|
||||
if (!aDomNode) {
|
||||
return PR_FALSE;
|
||||
}
|
||||
|
||||
aDomNode->AddRef();
|
||||
return array.AppendElement(aDomNode);
|
||||
}
|
||||
|
||||
PRBool
|
||||
nsXFormsMDGSet::AddSet(nsXFormsMDGSet& aSet)
|
||||
{
|
||||
nsIDOMNode* node;
|
||||
for (PRInt32 i = 0; i < aSet.array.Count(); ++i) {
|
||||
node = NS_STATIC_CAST(nsIDOMNode*, aSet.array[i]);
|
||||
if (!AddNode(node)) {
|
||||
return PR_FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
return PR_TRUE;
|
||||
}
|
||||
|
||||
|
||||
///
|
||||
/// @todo Is in fact a getter, should addref? (XXX)
|
||||
/// AddRef it, and use already_AddRefed<nsIDOMNode>
|
||||
nsIDOMNode*
|
||||
nsXFormsMDGSet::GetNode(const PRInt32 aIndex) const {
|
||||
return NS_STATIC_CAST(nsIDOMNode*, array[aIndex]);
|
||||
}
|
@ -1,112 +0,0 @@
|
||||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla 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/MPL/
|
||||
*
|
||||
* 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 XForms support.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Novell, Inc.
|
||||
* Portions created by the Initial Developer are Copyright (C) 2004
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Allan Beaufour <abeaufour@novell.com>
|
||||
* David Landwehr <dlandwehr@novell.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 MPL, 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 MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#ifndef __NSXFORMSMDGSET_H__
|
||||
#define __NSXFORMSMDGSET_H__
|
||||
|
||||
#include "nsVoidArray.h"
|
||||
#include "nsIDOMNode.h"
|
||||
|
||||
/**
|
||||
* A simple "set" implementation. For now it is just a wrapper for nsVoidArray,
|
||||
* but nsVoidArray can be changed if a more suitable structure is found.
|
||||
*
|
||||
* It is not a set, in that no two same nodes can exist. You need to call
|
||||
* MakeUnique() manually for that to be true.
|
||||
*
|
||||
* The class owns the nsIDOMNodes that it stores, and manages the reference
|
||||
* counters automatically.
|
||||
*
|
||||
* @todo Use nsIMutableArray of some sort instead! (XXX)
|
||||
*/
|
||||
class nsXFormsMDGSet {
|
||||
private:
|
||||
/** The data structure */
|
||||
nsVoidArray array;
|
||||
|
||||
/** The sorting function used by MakeUnique() */
|
||||
static int sortFunc(const void* aElement1, const void* aElement2, void* aData);
|
||||
|
||||
public:
|
||||
/** Constructor */
|
||||
nsXFormsMDGSet();
|
||||
|
||||
/** Destructor */
|
||||
~nsXFormsMDGSet();
|
||||
|
||||
/** Clears the struture (removes all stored data) */
|
||||
void Clear();
|
||||
|
||||
/**
|
||||
* Delete any duplicates (ie. make the set a set...).
|
||||
*
|
||||
* As a side effect, it also sorts the data structure by the data pointer in
|
||||
* ascending order.
|
||||
*/
|
||||
void MakeUnique();
|
||||
|
||||
/** Returns the number of members */
|
||||
PRInt32 Count() const;
|
||||
|
||||
/**
|
||||
* Adds a node to the set.
|
||||
*
|
||||
* @param aDomNode The node to add.
|
||||
* @return Did the storage succeed?
|
||||
*/
|
||||
PRBool AddNode(nsIDOMNode* aDomNode);
|
||||
|
||||
/**
|
||||
* Adds all nodes from another set to this set
|
||||
*
|
||||
* @param aSet The set to add nodes from
|
||||
* @return Did the operation succeed?
|
||||
*/
|
||||
PRBool AddSet(nsXFormsMDGSet& aSet);
|
||||
|
||||
/**
|
||||
* Get a specific node from the set
|
||||
*
|
||||
* @param aIndex The position of the node to get
|
||||
* @return The node
|
||||
*/
|
||||
nsIDOMNode* GetNode(const PRInt32 aIndex) const;
|
||||
};
|
||||
|
||||
#endif
|
Loading…
Reference in New Issue
Block a user