From 0eb10aa694be99f18cb496dfa5af0070bc885d5c Mon Sep 17 00:00:00 2001 From: "peterv%netscape.com" Date: Tue, 3 Apr 2001 12:30:50 +0000 Subject: [PATCH] Removing use of HashTable (bug #69091). Removing CommandLineUtils from module build. Not part of default build. r=Pike. git-svn-id: svn://10.0.0.236/trunk@91129 18797224-902f-48f8-a5cc-f745e15eee43 --- .../extensions/transformiix/build/Makefile.in | 2 -- .../transformiix/build/makefile.win | 2 -- .../transformiix/macbuild/transformiix.mcp | Bin 87720 -> 87720 bytes .../transformiix/source/base/Makefile | 4 --- .../transformiix/source/base/Makefile.in | 4 +-- .../transformiix/source/base/makefile.win | 12 +++---- .../transformiix/source/main/Makefile.in | 1 - .../transformiix/source/main/makefile.win | 1 - .../source/xml/util/DOMHelper.cpp | 32 +++++------------- .../transformiix/source/xml/util/DOMHelper.h | 10 +++--- 10 files changed, 20 insertions(+), 48 deletions(-) diff --git a/mozilla/extensions/transformiix/build/Makefile.in b/mozilla/extensions/transformiix/build/Makefile.in index efd614789da..2225d21dae3 100644 --- a/mozilla/extensions/transformiix/build/Makefile.in +++ b/mozilla/extensions/transformiix/build/Makefile.in @@ -34,10 +34,8 @@ IS_COMPONENT = 1 CPPSRCS = XSLTProcessorModule.cpp OBJS =../source/base/ArrayList.o \ - ../source/base/CommandLineUtils.o \ ../source/base/DefaultStringComparator.o \ ../source/base/Double.o \ - ../source/base/HashTable.o \ ../source/base/Integer.o \ ../source/base/List.o \ ../source/base/MITREObjectWrapper.o \ diff --git a/mozilla/extensions/transformiix/build/makefile.win b/mozilla/extensions/transformiix/build/makefile.win index 651ef20754e..d5f1bcd8521 100644 --- a/mozilla/extensions/transformiix/build/makefile.win +++ b/mozilla/extensions/transformiix/build/makefile.win @@ -35,10 +35,8 @@ CPPSRCS= \ CPP_OBJS= \ ..\source\base\$(OBJDIR)\ArrayList.obj \ - ..\source\base\$(OBJDIR)\CommandLineUtils.obj \ ..\source\base\$(OBJDIR)\DefaultStringComparator.obj \ ..\source\base\$(OBJDIR)\Double.obj \ - ..\source\base\$(OBJDIR)\HashTable.obj \ ..\source\base\$(OBJDIR)\Integer.obj \ ..\source\base\$(OBJDIR)\List.obj \ ..\source\base\$(OBJDIR)\MITREObjectWrapper.obj \ diff --git a/mozilla/extensions/transformiix/macbuild/transformiix.mcp b/mozilla/extensions/transformiix/macbuild/transformiix.mcp index 4cf8d8d67262874191a93896719be52fccbef309..1e16241b12be99a6b28570e654a5be37e9f03a89 100755 GIT binary patch delta 1034 zcmZ9~OGs2v9LMo<=H--{W~r&AW9BP+Sf-X{spT_m)CiiL6BHH%5wt3rmMsdEyU;da zWMQNj#jjz4JU9E zN3au_NJ9Wks73*HVVf~AvztXd_Ms3($ifC}M+rJmgTvT^{pds&4x$))(Tzrwq82?k zfI|pj2R5PtCsD4EH?!D;eCSZ)V(U#Mp0<`rMxLQ`& z+Lmfv1<+Y)i}rKszg|_6!rNjegNelso9PSc%c=L{O}ziC$Hx4D$VG~ppQsJnSN2Zg PN7#;fx!yiwtGs^zUFVY$ delta 686 zcmY+>$!n8A7{~E>lDti9)HW`yU2Nl$npl^*B-NO@bW81)G+tZ?G!~=^1re*BY(ey7 zkvNAQyeN7ILNzkrdlJ3W+Jb^NkNyemO`=f0@9W8d&u^Z0W?*=qDJ@u~1*_aHU2m0A zpOgxYDYcPOIp0cIl{^`kxP9xYSE*@gCij3lzb}WT*4KZnnn|hmL?+m}?;)`4gitfw zb&CQk=9TwFQ!%|_YQocPI{vh^nAI;6X)(!xKT^#4bYig4Uk)8nYHH4e9{v`c8?IyF zvQk$bxeF%dyCeE%=CjF9#zZfTHS0IyLne`%^_xmz*(;X5myhaF{_c!>y&K2K2z)q? z00vQm&F~|PEl6SrCvXaTkwO>F;55$SBob)F1~@Hoe!mlKsB`Y$h3(jfqi9Dxb|46+ zFAZo$H=>9mh6Ct9FAk##`_YHvXu(1B;}B??+KEO~VPp?+4!f}l)z}7SIFGXxIiwLn zEu7cyzyO9Zf>C7j4J%IDXLQSWr}=O_CHiZjL0`L+rR(39%-Z5ya6S;1FZOehiu}uB zw%5Lxlm{NYwivO0q~uvZzxx)kZ}v&8@Bf4ScJ-))rK<4SY07*@Mn1}8do?3Zyv(x~ HBKeith Visco - * @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; diff --git a/mozilla/extensions/transformiix/source/xml/util/DOMHelper.h b/mozilla/extensions/transformiix/source/xml/util/DOMHelper.h index cb72f63fd10..e2790a4e1b5 100644 --- a/mozilla/extensions/transformiix/source/xml/util/DOMHelper.h +++ b/mozilla/extensions/transformiix/source/xml/util/DOMHelper.h @@ -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 Keith Visco - * @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)