From 2a47902cce2f39981bbdebce3d8ed484f37fb1d5 Mon Sep 17 00:00:00 2001 From: "axel%pike.org" Date: Fri, 26 May 2000 15:04:52 +0000 Subject: [PATCH] Not part of the build, a=leaf Bringing Makefiles uptodate with String changes Get testcase going into new chrome structure. git-svn-id: svn://10.0.0.236/trunk@70916 18797224-902f-48f8-a5cc-f745e15eee43 --- .../extensions/transformiix/build/Makefile.in | 4 +- .../transformiix/source/Makefile.in | 2 + .../transformiix/source/base/Makefile.in | 6 +- .../transformiix/source/examples/Makefile.in | 4 +- .../source/examples/mozilla/Makefile.in | 4 +- .../examples/mozilla/Transformiix/Makefile.in | 40 +++++++++ .../mozilla/Transformiix/content/MANIFEST | 4 + .../mozilla/Transformiix/content/Makefile.in | 12 ++- .../Transformiix/content/transformiix.js | 81 ++++++++++--------- .../Transformiix/content/transformiix.xul | 12 +-- .../mozilla/Transformiix/manifest.rdf | 20 +++++ .../mozilla/Transformiix/skin/MANIFEST | 1 + .../mozilla/Transformiix/skin/Makefile.in | 12 ++- 13 files changed, 147 insertions(+), 55 deletions(-) create mode 100644 mozilla/extensions/transformiix/source/examples/mozilla/Transformiix/Makefile.in create mode 100644 mozilla/extensions/transformiix/source/examples/mozilla/Transformiix/content/MANIFEST create mode 100644 mozilla/extensions/transformiix/source/examples/mozilla/Transformiix/manifest.rdf create mode 100644 mozilla/extensions/transformiix/source/examples/mozilla/Transformiix/skin/MANIFEST diff --git a/mozilla/extensions/transformiix/build/Makefile.in b/mozilla/extensions/transformiix/build/Makefile.in index f44558056bd..a3a27c17cc3 100644 --- a/mozilla/extensions/transformiix/build/Makefile.in +++ b/mozilla/extensions/transformiix/build/Makefile.in @@ -49,7 +49,7 @@ OBJS =../source/base/ArrayList.o \ ../source/base/StringComparator.o \ ../source/base/StringList.o \ ../source/base/Tokenizer.o \ - ../source/base/TxString.o \ + ../source/base/MozillaString.o \ ../source/net/URIUtils.o \ ../source/xml/dom/mozImpl/MozillaAttr.o \ ../source/xml/dom/mozImpl/MozillaCDATASection.o \ @@ -111,8 +111,6 @@ OBJS =../source/base/ArrayList.o \ ../source/xml/parser/xmlrole.o \ ../source/xml/parser/xmlparse.o \ ../source/xml/parser/xmltok.o \ - ../source/xml/printer/XMLPrinter.o \ - ../source/xml/printer/HTMLPrinter.o \ ../source/xslt/OutputFormat.o \ ../source/xslt/Names.o \ ../source/xslt/Numbering.o \ diff --git a/mozilla/extensions/transformiix/source/Makefile.in b/mozilla/extensions/transformiix/source/Makefile.in index 7e4af069c47..0c0e62522f7 100644 --- a/mozilla/extensions/transformiix/source/Makefile.in +++ b/mozilla/extensions/transformiix/source/Makefile.in @@ -30,6 +30,8 @@ DIRS = base net xml xpath xslt ifndef MOZ_XSL DIRS += main +else +DIRS += examples endif include $(topsrcdir)/config/rules.mk diff --git a/mozilla/extensions/transformiix/source/base/Makefile.in b/mozilla/extensions/transformiix/source/base/Makefile.in index c63400becf4..e1cf8360d3f 100644 --- a/mozilla/extensions/transformiix/source/base/Makefile.in +++ b/mozilla/extensions/transformiix/source/base/Makefile.in @@ -38,11 +38,15 @@ CPPSRCS = ArrayList.cpp \ NamedMap.cpp \ SimpleErrorObserver.cpp \ Stack.cpp \ - TxString.cpp \ StringComparator.cpp \ StringList.cpp \ Tokenizer.cpp +ifdef MOZ_XSL + CPPSRCS += MozillaString.cpp +else + CPPSRCS += TxString.cpp +endif include $(topsrcdir)/config/rules.mk ifdef MOZ_XSL diff --git a/mozilla/extensions/transformiix/source/examples/Makefile.in b/mozilla/extensions/transformiix/source/examples/Makefile.in index 2a628199d84..7333e01aacd 100644 --- a/mozilla/extensions/transformiix/source/examples/Makefile.in +++ b/mozilla/extensions/transformiix/source/examples/Makefile.in @@ -19,13 +19,13 @@ # Axel Hecht # -DEPTH = .. +DEPTH = ../../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = junksss +DIRS = mozilla include $(topsrcdir)/config/rules.mk diff --git a/mozilla/extensions/transformiix/source/examples/mozilla/Makefile.in b/mozilla/extensions/transformiix/source/examples/mozilla/Makefile.in index 2a628199d84..0da2323d367 100644 --- a/mozilla/extensions/transformiix/source/examples/mozilla/Makefile.in +++ b/mozilla/extensions/transformiix/source/examples/mozilla/Makefile.in @@ -19,13 +19,13 @@ # Axel Hecht # -DEPTH = .. +DEPTH = ../../../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = junksss +DIRS = Transformiix include $(topsrcdir)/config/rules.mk diff --git a/mozilla/extensions/transformiix/source/examples/mozilla/Transformiix/Makefile.in b/mozilla/extensions/transformiix/source/examples/mozilla/Transformiix/Makefile.in new file mode 100644 index 00000000000..29ed576099e --- /dev/null +++ b/mozilla/extensions/transformiix/source/examples/mozilla/Transformiix/Makefile.in @@ -0,0 +1,40 @@ +# +# 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 Transformiix XSLT Processor. +# +# The Initial Developer of the Original Code is Axel Hecht. +# Portions created by Axel Hecht are Copyright (C) Axel Hecht. +# All Rights Reserved. +# +# Contributor(s): +# Axel Hecht +# + +DEPTH = ../../../../../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(DEPTH)/config/autoconf.mk + +DIRS = content + +CHROME_DIR = packages/transformiix +CHROME_MISC_DIR = . +CHROME_TYPE = content skin + +CHROME_MISC = \ + manifest.rdf \ + $(NULL) + + +include $(topsrcdir)/config/rules.mk diff --git a/mozilla/extensions/transformiix/source/examples/mozilla/Transformiix/content/MANIFEST b/mozilla/extensions/transformiix/source/examples/mozilla/Transformiix/content/MANIFEST new file mode 100644 index 00000000000..722f9b8d471 --- /dev/null +++ b/mozilla/extensions/transformiix/source/examples/mozilla/Transformiix/content/MANIFEST @@ -0,0 +1,4 @@ +simple.xml +simplexsl.xml +transformiix.js +transformiix.xul diff --git a/mozilla/extensions/transformiix/source/examples/mozilla/Transformiix/content/Makefile.in b/mozilla/extensions/transformiix/source/examples/mozilla/Transformiix/content/Makefile.in index 2a628199d84..952edb95b6e 100644 --- a/mozilla/extensions/transformiix/source/examples/mozilla/Transformiix/content/Makefile.in +++ b/mozilla/extensions/transformiix/source/examples/mozilla/Transformiix/content/Makefile.in @@ -19,13 +19,21 @@ # Axel Hecht # -DEPTH = .. +DEPTH = ../../../../../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = junksss +CHROME_DIR=packages/transformiix +CHROME_CONTENT_DIR=transformiix/content + +CHROME_CONTENT = \ + transformiix.xul \ + transformiix.js \ + simple.xml \ + simplexsl.xml \ + $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/extensions/transformiix/source/examples/mozilla/Transformiix/content/transformiix.js b/mozilla/extensions/transformiix/source/examples/mozilla/Transformiix/content/transformiix.js index e8d3670eceb..fa55dad70f2 100755 --- a/mozilla/extensions/transformiix/source/examples/mozilla/Transformiix/content/transformiix.js +++ b/mozilla/extensions/transformiix/source/examples/mozilla/Transformiix/content/transformiix.js @@ -25,32 +25,34 @@ var xmlLoaded, xslLoaded; var xmlDocument, xslDocument, resultDocument; +var theXMLURL = "chrome://transformiix/content/simple.xml"; +var theXSLURL = "chrome://transformiix/content/simplexsl.xml"; function onLoadTransformiix() { - var theXMLURL = "chrome://Transformiix/content/simple.xml"; - var theXSLURL = "chrome://Transformiix/content/simplexsl.xml"; + onTransform(); +} - var docShellElement = document.getElementById("xml-source"); - var docShell = docShellElement.docShell; - docShell.viewMode = Components.interfaces.nsIDocShell.viewSource; - var webNav = docShell.QueryInterface(Components.interfaces.nsIWebNavigation); - webNav.loadURI(theXMLURL); - - docShellElement = document.getElementById("xsl-source"); - docShell = docShellElement.docShell; - docShell.viewMode = Components.interfaces.nsIDocShell.viewSource; - webNav = docShell.QueryInterface(Components.interfaces.nsIWebNavigation); - webNav.loadURI(theXSLURL); - - docShellElement = document.getElementById("result-doc"); - resultDocument = docShellElement.contentDocument; - xmlDocument = resultDocument.implementation.createDocument("", "", null); - xmlDocument.addEventListener("load", xmlDocumentLoaded, false); - xmlDocument.load(theXMLURL, "text/xml"); - xslDocument = resultDocument.implementation.createDocument("", "", null); - xslDocument.addEventListener("load", xslDocumentLoaded, false); - xslDocument.load(theXSLURL, "text/xml"); +function onTransform() +{ + var docShellElement = document.getElementById("xml-source"); + var docShell = docShellElement.docShell; + docShell.viewMode = Components.interfaces.nsIDocShell.viewSource; + var webNav = docShell.QueryInterface(Components.interfaces.nsIWebNavigation); + webNav.loadURI(theXMLURL); + docShellElement = document.getElementById("xsl-source"); + docShell = docShellElement.docShell; + docShell.viewMode = Components.interfaces.nsIDocShell.viewSource; + webNav = docShell.QueryInterface(Components.interfaces.nsIWebNavigation); + webNav.loadURI(theXSLURL); + docShellElement = document.getElementById("result-doc"); + resultDocument = webNav.document; + xmlDocument = resultDocument.implementation.createDocument("", "", null); + xmlDocument.addEventListener("load", xmlDocumentLoaded, false); + xmlDocument.load(theXMLURL, "text/xml"); + xslDocument = resultDocument.implementation.createDocument("", "", null); + xslDocument.addEventListener("load", xslDocumentLoaded, false); + xslDocument.load(theXSLURL, "text/xml"); } function xmlDocumentLoaded(e) { @@ -64,20 +66,23 @@ function xslDocumentLoaded(e) { } function tryToTransform() { - if (xmlLoaded && xslLoaded) { - try { - var xsltProcessor = null; - var xmlDocumentNode = xmlDocument.documentElement; - var xslDocumentNode = xslDocument.documentElement; - - xsltProcessor = Components.classes["component://netscape/document-transformer?type=text/xsl"].getService(); - if (xsltProcessor) xsltProcessor = xsltProcessor.QueryInterface(Components.interfaces.nsIDocumentTransformer); - } - catch (ex) { - dump("failed to get transformiix service!\n"); - xsltProcessor = null; - } - var newDocument = resultDocument.implementation.createDocument("", "", null); - xsltProcessor.transformDocument(xmlDocumentNode, xslDocumentNode, newDocument, null); - } + if (xmlLoaded && xslLoaded) { + try { + var xsltProcessor = null; + var xmlDocumentNode = xmlDocument.documentElement; + var xslDocumentNode = xslDocument.documentElement; + + xsltProcessor = Components.classes["component://netscape/document-transformer?type=text/xsl"].getService(); + if (xsltProcessor) xsltProcessor = xsltProcessor.QueryInterface(Components.interfaces.nsIDocumentTransformer); + } + catch (ex) { + dump("failed to get transformiix service!\n"); + xsltProcessor = null; + } + dump("Mal sehen, "+xsltProcessor+"\n"); + var outDocument = resultDocument.implementation.createDocument("", "", null); + xsltProcessor.TransformDocument(xmlDocumentNode, xslDocumentNode, outDocument, null); + DumpDOM(outDocument.documentElement); + DumpDOM(xmlDocument.documentElement); + } } diff --git a/mozilla/extensions/transformiix/source/examples/mozilla/Transformiix/content/transformiix.xul b/mozilla/extensions/transformiix/source/examples/mozilla/Transformiix/content/transformiix.xul index c55ea4c6a6e..9cc027b9ed7 100755 --- a/mozilla/extensions/transformiix/source/examples/mozilla/Transformiix/content/transformiix.xul +++ b/mozilla/extensions/transformiix/source/examples/mozilla/Transformiix/content/transformiix.xul @@ -21,20 +21,22 @@ Contributor(s): Peter Van der Beken, peter.vanderbeken@pandora.be - -- original author. + - original author. --> + - - +