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 4cf8d8d6726..1e16241b12b 100755
Binary files a/mozilla/extensions/transformiix/macbuild/transformiix.mcp and b/mozilla/extensions/transformiix/macbuild/transformiix.mcp differ
diff --git a/mozilla/extensions/transformiix/source/base/Makefile b/mozilla/extensions/transformiix/source/base/Makefile
index 70ac9f04632..f3f7fc1fe47 100644
--- a/mozilla/extensions/transformiix/source/base/Makefile
+++ b/mozilla/extensions/transformiix/source/base/Makefile
@@ -6,7 +6,6 @@ BASE_OBJS = ArrayList.o \
CommandLineUtils.o \
DefaultStringComparator.o \
Double.o \
- HashTable.o \
Integer.o \
List.o \
Map.o \
@@ -33,9 +32,6 @@ DefaultStringComparator.o: StringComparator.h DefaultStringComparator.cpp
Double.o: primitives.h Double.cpp
$(CC) -c Double.cpp
-HashTable.o: HashTable.h HashTable.cpp
- $(CC) -c HashTable.cpp
-
Integer.o: primitives.h Integer.cpp
$(CC) -c Integer.cpp
diff --git a/mozilla/extensions/transformiix/source/base/Makefile.in b/mozilla/extensions/transformiix/source/base/Makefile.in
index 980a9aed740..a4b37745a79 100644
--- a/mozilla/extensions/transformiix/source/base/Makefile.in
+++ b/mozilla/extensions/transformiix/source/base/Makefile.in
@@ -27,7 +27,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
CPPSRCS = ArrayList.cpp \
- CommandLineUtils.cpp \
DefaultStringComparator.cpp \
Double.cpp \
HashTable.cpp \
@@ -45,7 +44,8 @@ CPPSRCS = ArrayList.cpp \
ifdef MOZ_XSL
CPPSRCS += MozillaString.cpp
else
- CPPSRCS += TxString.cpp
+ CPPSRCS += CommandLineUtils.cpp \
+ TxString.cpp
endif
include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/extensions/transformiix/source/base/makefile.win b/mozilla/extensions/transformiix/source/base/makefile.win
index e4bbbaa99c4..440f5c235c4 100644
--- a/mozilla/extensions/transformiix/source/base/makefile.win
+++ b/mozilla/extensions/transformiix/source/base/makefile.win
@@ -27,10 +27,8 @@ DEFINES= $(DEFINES) -DMOZ_XSL
CPPSRCS= \
ArrayList.cpp \
- CommandLineUtils.cpp \
DefaultStringComparator.cpp \
Double.cpp \
- HashTable.cpp \
Integer.cpp \
List.cpp \
MITREObjectWrapper.cpp \
@@ -47,17 +45,16 @@ CPPSRCS = $(CPPSRCS) \
MozillaString.cpp \
$(NULL)
!else
-CPPSRCS = $(CPPSRCS) \
+CPPSRCS = $(CPPSRCS) \
+ CommandLineUtils.cpp \
TxString.cpp \
$(NULL)
!endif
CPP_OBJS= \
.\$(OBJDIR)\ArrayList.obj \
- .\$(OBJDIR)\CommandLineUtils.obj \
.\$(OBJDIR)\DefaultStringComparator.obj \
.\$(OBJDIR)\Double.obj \
- .\$(OBJDIR)\HashTable.obj \
.\$(OBJDIR)\Integer.obj \
.\$(OBJDIR)\List.obj \
.\$(OBJDIR)\MITREObjectWrapper.obj \
@@ -74,8 +71,9 @@ CPP_OBJS = $(CPP_OBJS) \
.\$(OBJDIR)\MozillaString.obj \
$(NULL)
!else
-CPP_OBJS = $(CPP_OBJS) \
- .\$(OBJDIR)\TxString.obj \
+CPP_OBJS = $(CPP_OBJS) \
+ .\$(OBJDIR)\CommandLineUtils.obj \
+ .\$(OBJDIR)\TxString.obj \
$(NULL)
!endif
diff --git a/mozilla/extensions/transformiix/source/main/Makefile.in b/mozilla/extensions/transformiix/source/main/Makefile.in
index 5a75943d4aa..ac22f35a3fd 100644
--- a/mozilla/extensions/transformiix/source/main/Makefile.in
+++ b/mozilla/extensions/transformiix/source/main/Makefile.in
@@ -32,7 +32,6 @@ OBJS =../base/ArrayList.o \
../base/CommandLineUtils.o \
../base/DefaultStringComparator.o \
../base/Double.o \
- ../base/HashTable.o \
../base/Integer.o \
../base/List.o \
../base/MITREObjectWrapper.o \
diff --git a/mozilla/extensions/transformiix/source/main/makefile.win b/mozilla/extensions/transformiix/source/main/makefile.win
index 81605c71ac1..478f3417705 100644
--- a/mozilla/extensions/transformiix/source/main/makefile.win
+++ b/mozilla/extensions/transformiix/source/main/makefile.win
@@ -29,7 +29,6 @@ CPP_OBJS= \
../base/$(OBJDIR)/CommandLineUtils.obj \
../base/$(OBJDIR)/DefaultStringComparator.obj \
../base/$(OBJDIR)/Double.obj \
- ../base/$(OBJDIR)/HashTable.obj \
../base/$(OBJDIR)/Integer.obj \
../base/$(OBJDIR)/List.obj \
../base/$(OBJDIR)/MITREObjectWrapper.obj \
diff --git a/mozilla/extensions/transformiix/source/xml/util/DOMHelper.cpp b/mozilla/extensions/transformiix/source/xml/util/DOMHelper.cpp
index c4d621726bb..845521a9118 100644
--- a/mozilla/extensions/transformiix/source/xml/util/DOMHelper.cpp
+++ b/mozilla/extensions/transformiix/source/xml/util/DOMHelper.cpp
@@ -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 Keith 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)