Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removing use of HashTable (bug #69091). Removing CommandLineUtils from module build. Not part of default build. r=Pike.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@91129 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
peterv%netscape.com
2001-04-03 12:30:50 +00:00
parent 0f3fae5540
commit 0eb10aa694
10 changed files with 20 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
mozilla/extensions/transformiix/source/xml/util/DOMHelper.cpp
View File

@@ -19,13 +19,13 @@
* Keith Visco, kvisco@ziplink.net
* -- original author.
*
* $Id: DOMHelper.cpp,v 1.6 2001-01-12 20:06:29 axel%pike.org Exp $
* $Id: DOMHelper.cpp,v 1.7 2001-04-03 12:30:26 peterv%netscape.com Exp $
*/
/**
* A class used to overcome DOM 1.0 deficiencies
* @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
* @version $Revision: 1.6 $ $Date: 2001-01-12 20:06:29 $
* @version $Revision: 1.7 $ $Date: 2001-04-03 12:30:26 $
**/
#include "DOMHelper.h"
@@ -115,17 +115,12 @@ Node* DOMHelper::getParentNode(Node* node) {
if (node->getNodeType() != Node::ATTRIBUTE_NODE)
return node->getParentNode();
#ifdef MOZ_XSL
void* key = node->getNSObj();
#else
Int32 key = (Int32)node;
#endif
MITREObjectWrapper* wrapper = 0;
wrapper = (MITREObjectWrapper*) parents.retrieve(key);
wrapper = (MITREObjectWrapper*) parents.get(node);
if (!wrapper) {
continueIndexing(node);
wrapper = (MITREObjectWrapper*) parents.retrieve(key);
wrapper = (MITREObjectWrapper*) parents.get(node);
}
if (wrapper) return (Node*)wrapper->object;
@@ -142,16 +137,10 @@ Node* DOMHelper::getParentNode(Node* node) {
* Adds the given child/parent mapping
**/
void DOMHelper::addParentReference(Node* child, Node* parent) {
#ifdef MOZ_XSL
void* key = child->getNSObj();
#else
Int32 key = (Int32)child;
#endif
MITREObjectWrapper* wrapper = (MITREObjectWrapper*) parents.retrieve(key);
MITREObjectWrapper* wrapper = (MITREObjectWrapper*) parents.get(child);
if (!wrapper) {
wrapper = new MITREObjectWrapper();
parents.add(wrapper, key);
parents.put(wrapper, child);
}
wrapper->object = parent;
@@ -273,12 +262,7 @@ OrderInfo* DOMHelper::getDocumentOrder(Node* node) {
if (!node) return 0;
#ifdef MOZ_XSL
void* key = node->getNSObj();
#else
Int32 key = (Int32)node;
#endif
OrderInfo* orderInfo = (OrderInfo*)orders.retrieve(key);
OrderInfo* orderInfo = (OrderInfo*)orders.get(node);
if (!orderInfo) {
if (node->getNodeType() == Node::DOCUMENT_NODE) {
@@ -306,7 +290,7 @@ OrderInfo* DOMHelper::getDocumentOrder(Node* node) {
orderInfo->order[0] = 0;
}
}
orders.add(orderInfo, key);
orders.put(orderInfo, node);
}
return orderInfo;

10
mozilla/extensions/transformiix/source/xml/util/DOMHelper.h
View File

@@ -19,7 +19,7 @@
* Keith Visco, kvisco@ziplink.net
* -- original author.
*
* $Id: DOMHelper.h,v 1.4 2000-06-11 11:42:23 Peter.VanderBeken%pandora.be Exp $
* $Id: DOMHelper.h,v 1.5 2001-04-03 12:30:43 peterv%netscape.com Exp $
*/
#ifndef TRANSFRMX_DOMHELPER_H
@@ -29,7 +29,7 @@
#include "TxString.h"
#include "List.h"
#include "dom.h"
#include "HashTable.h"
#include "Map.h"
#include "MITREObject.h"
#include "primitives.h"
@@ -59,7 +59,7 @@ class OrderInfo : public MITREObject {
/**
* A class used to overcome DOM 1.0 deficiencies
* @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
* @version $Revision: 1.4 $ $Date: 2000-06-11 11:42:23 $
* @version $Revision: 1.5 $ $Date: 2001-04-03 12:30:43 $
**/
class DOMHelper {
@@ -137,12 +137,12 @@ private:
/**
* A Hashtable of attribute's parent nodes
**/
HashTable parents;
Map parents;
/**
* A Hashtable of Node/OrderInfo mappings
**/
HashTable orders;
Map orders;
/**
* A list of IndexState objects (one for each Document)