--- old/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMManagerDefault.java 2016-11-16 12:14:17.000000000 +0100 +++ new/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMManagerDefault.java 2016-11-16 12:14:15.000000000 +0100 @@ -1,13 +1,13 @@ /* - * reserved comment block - * DO NOT REMOVE OR ALTER! + * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved. */ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (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.apache.org/licenses/LICENSE-2.0 * @@ -17,19 +17,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* - * $Id: DTMManagerDefault.java,v 1.2.4.1 2005/09/15 08:15:02 suresh_emailid Exp $ - */ package com.sun.org.apache.xml.internal.dtm.ref; import com.sun.org.apache.xalan.internal.utils.FactoryImpl; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.transform.Source; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.sax.SAXSource; -import javax.xml.transform.stream.StreamSource; - import com.sun.org.apache.xml.internal.dtm.DTM; import com.sun.org.apache.xml.internal.dtm.DTMException; import com.sun.org.apache.xml.internal.dtm.DTMFilter; @@ -45,10 +35,14 @@ import com.sun.org.apache.xml.internal.utils.SystemIDResolver; import com.sun.org.apache.xml.internal.utils.XMLReaderManager; import com.sun.org.apache.xml.internal.utils.XMLStringFactory; - +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.transform.Source; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.sax.SAXSource; +import javax.xml.transform.stream.StreamSource; import org.w3c.dom.Document; import org.w3c.dom.Node; - import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.SAXNotRecognizedException; @@ -73,15 +67,7 @@ * would be a greater delay before the DTM's storage is actually released * for reuse. * */ -public class DTMManagerDefault extends DTMManager -{ - //static final boolean JKESS_XNI_EXPERIMENT=true; - - /** Set this to true if you want a dump of the DTM after creation. */ - private static final boolean DUMPTREE = false; - - /** Set this to true if you want a basic diagnostics. */ - private static final boolean DEBUG = false; +public class DTMManagerDefault extends DTMManager { /** * Map from DTM identifier numbers to DTM objects that this manager manages. @@ -130,8 +116,9 @@ * @param dtm Should be a valid reference to a DTM. * @param id Integer DTM ID to be bound to this DTM */ - synchronized public void addDTM(DTM dtm, int id) { addDTM(dtm,id,0); } - + synchronized public void addDTM(DTM dtm, int id) { + addDTM(dtm,id,0); + } /** * Add a DTM to the DTM table. @@ -143,72 +130,63 @@ * public DTM Handle. For the first DTM ID accessing each DTM, this is 0; * for overflow addressing it will be a multiple of 1<=IDENT_MAX_DTMS) - { - // TODO: %REVIEW% Not really the right error message. - throw new DTMException(XMLMessages.createXMLMessage(XMLErrorResources.ER_NO_DTMIDS_AVAIL, null)); //"No more DTM IDs are available!"); - } - - // We used to just allocate the array size to IDENT_MAX_DTMS. - // But we expect to increase that to 16 bits, and I'm not willing - // to allocate that much space unless needed. We could use one of our - // handy-dandy Fast*Vectors, but this will do for now. - // %REVIEW% - int oldlen=m_dtms.length; - if(oldlen<=id) - { - // Various growth strategies are possible. I think we don't want - // to over-allocate excessively, and I'm willing to reallocate - // more often to get that. See also Fast*Vector classes. - // - // %REVIEW% Should throw a more diagnostic error if we go over the max... - int newlen=Math.min((id+256),IDENT_MAX_DTMS); - - DTM new_m_dtms[] = new DTM[newlen]; - System.arraycopy(m_dtms,0,new_m_dtms,0,oldlen); - m_dtms=new_m_dtms; - int new_m_dtm_offsets[] = new int[newlen]; - System.arraycopy(m_dtm_offsets,0,new_m_dtm_offsets,0,oldlen); - m_dtm_offsets=new_m_dtm_offsets; - } + synchronized public void addDTM(DTM dtm, int id, int offset) { + if (id >= IDENT_MAX_DTMS) { + // TODO: %REVIEW% Not really the right error message. + throw new DTMException(XMLMessages.createXMLMessage(XMLErrorResources.ER_NO_DTMIDS_AVAIL, null)); //"No more DTM IDs are available!"); + } + + // We used to just allocate the array size to IDENT_MAX_DTMS. + // But we expect to increase that to 16 bits, and I'm not willing + // to allocate that much space unless needed. We could use one of our + // handy-dandy Fast*Vectors, but this will do for now. + // %REVIEW% + int oldlen = m_dtms.length; + if(oldlen <= id) { + // Various growth strategies are possible. I think we don't want + // to over-allocate excessively, and I'm willing to reallocate + // more often to get that. See also Fast*Vector classes. + // + // %REVIEW% Should throw a more diagnostic error if we go over the max... + int newlen = Math.min((id+256),IDENT_MAX_DTMS); + DTM new_m_dtms[] = new DTM[newlen]; + System.arraycopy(m_dtms,0,new_m_dtms,0,oldlen); + m_dtms=new_m_dtms; + int new_m_dtm_offsets[] = new int[newlen]; + System.arraycopy(m_dtm_offsets,0,new_m_dtm_offsets,0,oldlen); + m_dtm_offsets=new_m_dtm_offsets; + } m_dtms[id] = dtm; - m_dtm_offsets[id]=offset; + m_dtm_offsets[id]=offset; dtm.documentRegistration(); - // The DTM should have been told who its manager was when we created it. - // Do we need to allow for adopting DTMs _not_ created by this manager? + // The DTM should have been told who its manager was when we created it. + // Do we need to allow for adopting DTMs _not_ created by this manager? } /** * Get the first free DTM ID available. %OPT% Linear search is inefficient! */ - synchronized public int getFirstFreeDTMID() - { + synchronized public int getFirstFreeDTMID() { int n = m_dtms.length; - for (int i = 1; i < n; i++) - { - if(null == m_dtms[i]) - { + for (int i = 1; i < n; i++) { + if(null == m_dtms[i]) { return i; } } - return n; // count on addDTM() to throw exception if out of range + return n; // count on addDTM() to throw exception if out of range } /** * The default table for exandedNameID lookups. */ - private ExpandedNameTable m_expandedNameTable = - new ExpandedNameTable(); + private ExpandedNameTable m_expandedNameTable = new ExpandedNameTable(); /** * Constructor DTMManagerDefault * */ - public DTMManagerDefault(){} - + public DTMManagerDefault() {} /** * Get an instance of a DTM, loaded with the content from the @@ -240,37 +218,32 @@ DTMWSFilter whiteSpaceFilter, boolean incremental, boolean doIndexing) { - - if(DEBUG && null != source) - System.out.println("Starting "+ - (unique ? "UNIQUE" : "shared")+ - " source: "+source.getSystemId() - ); + /* Uncomment for debugging + if (null != source) { + System.out.println("Starting " + + (unique ? "UNIQUE" : "shared") + + " source: " + source.getSystemId()); + } + */ XMLStringFactory xstringFactory = m_xsf; int dtmPos = getFirstFreeDTMID(); int documentID = dtmPos << IDENT_DTM_NODE_BITS; - if ((null != source) && source instanceof DOMSource) - { + if ((null != source) && source instanceof DOMSource) { DOM2DTM dtm = new DOM2DTM(this, (DOMSource) source, documentID, whiteSpaceFilter, xstringFactory, doIndexing); addDTM(dtm, dtmPos, 0); - // if (DUMPTREE) - // { - // dtm.dumpDTM(); - // } + /* Uncomment for debugging + dtm.dumpDTM(); + */ return dtm; - } - else - { - boolean isSAXSource = (null != source) - ? (source instanceof SAXSource) : true; - boolean isStreamSource = (null != source) - ? (source instanceof StreamSource) : false; + } else { + boolean isSAXSource = (null != source) ? (source instanceof SAXSource) : true; + boolean isStreamSource = (null != source) ? (source instanceof StreamSource) : false; if (isSAXSource || isStreamSource) { XMLReader reader = null; @@ -309,16 +282,8 @@ // we need to consider architectural improvements. dtm = new SAX2RTFDTM(this, source, documentID, whiteSpaceFilter, xstringFactory, doIndexing); - } - /************************************************************** - // EXPERIMENTAL 3/22/02 - else if(JKESS_XNI_EXPERIMENT && m_incremental) { - dtm = new XNI2DTM(this, source, documentID, whiteSpaceFilter, - xstringFactory, doIndexing); - } - **************************************************************/ - // Create the basic SAX2DTM. - else { + } else { + // Create the basic SAX2DTM. dtm = new SAX2DTM(this, source, documentID, whiteSpaceFilter, xstringFactory, doIndexing); } @@ -328,12 +293,11 @@ // created a new DTM. addDTM(dtm, dtmPos, 0); - boolean haveXercesParser = (null != reader) && (reader.getClass() .getName() - .equals("com.sun.org.apache.xerces.internal.parsers.SAXParser") ); + .equals("com.sun.org.apache.xerces.internal.parsers.SAXParser")); if (haveXercesParser) { incremental = true; // No matter what. %REVIEW% @@ -341,8 +305,7 @@ // If the reader is null, but they still requested an incremental // build, then we still want to set up the IncrementalSAXSource stuff. - if (m_incremental && incremental - /* || ((null == reader) && incremental) */) { + if (m_incremental && incremental) { IncrementalSAXSource coParser=null; if (haveXercesParser) { @@ -367,30 +330,10 @@ } } - - /************************************************************** - // EXPERIMENTAL 3/22/02 - if (JKESS_XNI_EXPERIMENT && m_incremental && - dtm instanceof XNI2DTM && - coParser instanceof IncrementalSAXSource_Xerces) { - com.sun.org.apache.xerces.internal.xni.parser.XMLPullParserConfiguration xpc= - ((IncrementalSAXSource_Xerces)coParser) - .getXNIParserConfiguration(); - if (xpc!=null) { - // Bypass SAX; listen to the XNI stream - ((XNI2DTM)dtm).setIncrementalXNISource(xpc); - } else { - // Listen to the SAX stream (will fail, diagnostically...) - dtm.setIncrementalSAXSource(coParser); - } - } else - ***************************************************************/ - // Have the DTM set itself up as IncrementalSAXSource's listener. dtm.setIncrementalSAXSource(coParser); if (null == xmlSource) { - // Then the user will construct it themselves. return dtm; } @@ -406,19 +349,14 @@ coParser.startParse(xmlSource); } catch (RuntimeException re) { - dtm.clearCoRoutine(); - throw re; } catch (Exception e) { - dtm.clearCoRoutine(); - throw new com.sun.org.apache.xml.internal.utils.WrappedRuntimeException(e); } } else { if (null == reader) { - // Then the user will construct it themselves. return dtm; } @@ -431,29 +369,25 @@ } try { - reader.setProperty( - "http://xml.org/sax/properties/lexical-handler", - dtm); - } catch (SAXNotRecognizedException e){} - catch (SAXNotSupportedException e){} - + reader.setProperty("http://xml.org/sax/properties/lexical-handler", dtm); + } catch (SAXNotRecognizedException e) { + } catch (SAXNotSupportedException e) { + } try { reader.parse(xmlSource); } catch (RuntimeException re) { dtm.clearCoRoutine(); - throw re; } catch (Exception e) { dtm.clearCoRoutine(); - throw new com.sun.org.apache.xml.internal.utils.WrappedRuntimeException(e); } } - if (DUMPTREE) { - System.out.println("Dumping SAX2DOM"); - dtm.dumpDTM(System.err); - } + /* Uncomment for debugging + System.out.println("Dumping SAX2DOM"); + dtm.dumpDTM(System.err); + */ return dtm; } finally { @@ -473,7 +407,6 @@ releaseXMLReader(reader); } } else { - // It should have been handled by a derived class or the caller // made a mistake. throw new DTMException(XMLMessages.createXMLMessage(XMLErrorResources.ER_NOT_SUPPORTED, new Object[]{source})); //"Not supported: " + source); @@ -492,14 +425,13 @@ */ synchronized public int getDTMHandleFromNode(org.w3c.dom.Node node) { - if(null == node) + if (node == null) { throw new IllegalArgumentException(XMLMessages.createXMLMessage(XMLErrorResources.ER_NODE_NON_NULL, null)); //"node must be non-null for getDTMHandleFromNode!"); + } - if (node instanceof com.sun.org.apache.xml.internal.dtm.ref.DTMNodeProxy) + if (node instanceof com.sun.org.apache.xml.internal.dtm.ref.DTMNodeProxy) { return ((com.sun.org.apache.xml.internal.dtm.ref.DTMNodeProxy) node).getDTMNodeNumber(); - - else - { + } else { // Find the DOM2DTMs wrapped around this Document (if any) // and check whether they contain the Node in question. // @@ -514,68 +446,66 @@ // subtree, but that's going to entail additional work // checking more DTMs... and getHandleOfNode is not a // cheap operation in most implementations. - // - // TODO: %REVIEW% If overflow addressing, we may recheck a DTM - // already examined. Ouch. But with the increased number of DTMs, - // scanning back to check this is painful. - // POSSIBLE SOLUTIONS: - // Generate a list of _unique_ DTM objects? - // Have each DTM cache last DOM node search? - int max = m_dtms.length; - for(int i = 0; i < max; i++) - { - DTM thisDTM=m_dtms[i]; - if((null != thisDTM) && thisDTM instanceof DOM2DTM) - { - int handle=((DOM2DTM)thisDTM).getHandleOfNode(node); - if(handle!=DTM.NULL) return handle; + // + // TODO: %REVIEW% If overflow addressing, we may recheck a DTM + // already examined. Ouch. But with the increased number of DTMs, + // scanning back to check this is painful. + // POSSIBLE SOLUTIONS: + // Generate a list of _unique_ DTM objects? + // Have each DTM cache last DOM node search? + int max = m_dtms.length; + for (int i = 0; i < max; i++) { + DTM thisDTM=m_dtms[i]; + if ((null != thisDTM) && thisDTM instanceof DOM2DTM) { + int handle=((DOM2DTM)thisDTM).getHandleOfNode(node); + if (handle!=DTM.NULL) { + return handle; } - } + } + } - // Not found; generate a new DTM. - // - // %REVIEW% Is this really desirable, or should we return null - // and make folks explicitly instantiate from a DOMSource? The - // latter is more work but gives the caller the opportunity to - // explicitly add the DTM to a DTMManager... and thus to know when - // it can be discarded again, which is something we need to pay much - // more attention to. (Especially since only DTMs which are assigned - // to a manager can use the overflow addressing scheme.) - // - // %BUG% If the source node was a DOM2DTM$defaultNamespaceDeclarationNode - // and the DTM wasn't registered with this DTMManager, we will create - // a new DTM and _still_ not be able to find the node (since it will - // be resynthesized). Another reason to push hard on making all DTMs - // be managed DTMs. + // Not found; generate a new DTM. + // + // %REVIEW% Is this really desirable, or should we return null + // and make folks explicitly instantiate from a DOMSource? The + // latter is more work but gives the caller the opportunity to + // explicitly add the DTM to a DTMManager... and thus to know when + // it can be discarded again, which is something we need to pay much + // more attention to. (Especially since only DTMs which are assigned + // to a manager can use the overflow addressing scheme.) + // + // %BUG% If the source node was a DOM2DTM$defaultNamespaceDeclarationNode + // and the DTM wasn't registered with this DTMManager, we will create + // a new DTM and _still_ not be able to find the node (since it will + // be resynthesized). Another reason to push hard on making all DTMs + // be managed DTMs. - // Since the real root of our tree may be a DocumentFragment, we need to + // Since the real root of our tree may be a DocumentFragment, we need to // use getParent to find the root, instead of getOwnerDocument. Otherwise // DOM2DTM#getHandleOfNode will be very unhappy. Node root = node; Node p = (root.getNodeType() == Node.ATTRIBUTE_NODE) ? ((org.w3c.dom.Attr)root).getOwnerElement() : root.getParentNode(); - for (; p != null; p = p.getParentNode()) - { + for (; p != null; p = p.getParentNode()) { root = p; } - DOM2DTM dtm = (DOM2DTM) getDTM(new javax.xml.transform.dom.DOMSource(root), - false, null, true, true); + DOM2DTM dtm = (DOM2DTM) getDTM(new javax.xml.transform.dom.DOMSource(root), false, null, true, true); int handle; - if(node instanceof com.sun.org.apache.xml.internal.dtm.ref.dom2dtm.DOM2DTMdefaultNamespaceDeclarationNode) - { - // Can't return the same node since it's unique to a specific DTM, - // but can return the equivalent node -- find the corresponding - // Document Element, then ask it for the xml: namespace decl. - handle=dtm.getHandleOfNode(((org.w3c.dom.Attr)node).getOwnerElement()); - handle=dtm.getAttributeNode(handle,node.getNamespaceURI(),node.getLocalName()); + if (node instanceof com.sun.org.apache.xml.internal.dtm.ref.dom2dtm.DOM2DTMdefaultNamespaceDeclarationNode) { + // Can't return the same node since it's unique to a specific DTM, + // but can return the equivalent node -- find the corresponding + // Document Element, then ask it for the xml: namespace decl. + handle=dtm.getHandleOfNode(((org.w3c.dom.Attr)node).getOwnerElement()); + handle=dtm.getAttributeNode(handle,node.getNamespaceURI(),node.getLocalName()); + } else { + handle = ((DOM2DTM)dtm).getHandleOfNode(node); } - else - handle = ((DOM2DTM)dtm).getHandleOfNode(node); - if(DTM.NULL == handle) + if (DTM.NULL == handle) { throw new RuntimeException(XMLMessages.createXMLMessage(XMLErrorResources.ER_COULD_NOT_RESOLVE_NODE, null)); //"Could not resolve the node to a handle!"); + } return handle; } @@ -595,11 +525,8 @@ * * @return non-null XMLReader reference ready to parse. */ - synchronized public XMLReader getXMLReader(Source inputSource) - { - - try - { + synchronized public XMLReader getXMLReader(Source inputSource) { + try { XMLReader reader = (inputSource instanceof SAXSource) ? ((SAXSource) inputSource).getXMLReader() : null; @@ -613,7 +540,6 @@ } return reader; - } catch (SAXException se) { throw new DTMException(se.getMessage(), se); } @@ -642,19 +568,15 @@ * * @return a reference to the DTM object containing this node. */ - synchronized public DTM getDTM(int nodeHandle) - { - try - { + synchronized public DTM getDTM(int nodeHandle) { + try { // Performance critical function. return m_dtms[nodeHandle >>> IDENT_DTM_NODE_BITS]; - } - catch(java.lang.ArrayIndexOutOfBoundsException e) - { - if(nodeHandle==DTM.NULL) - return null; // Accept as a special case. + } catch(java.lang.ArrayIndexOutOfBoundsException e) { + if (nodeHandle==DTM.NULL) + return null; // Accept as a special case. else - throw e; // Programming error; want to know about it. + throw e; // Programming error; want to know about it. } } @@ -668,23 +590,20 @@ * @return The DTM ID (as the high bits of a NodeHandle, not as our * internal index), or -1 if the DTM doesn't belong to this manager. */ - synchronized public int getDTMIdentity(DTM dtm) - { - // Shortcut using DTMDefaultBase's extension hooks - // %REVIEW% Should the lookup be part of the basic DTM API? - if(dtm instanceof DTMDefaultBase) - { - DTMDefaultBase dtmdb=(DTMDefaultBase)dtm; - if(dtmdb.getManager()==this) - return dtmdb.getDTMIDs().elementAt(0); - else - return -1; - } + synchronized public int getDTMIdentity(DTM dtm) { + // Shortcut using DTMDefaultBase's extension hooks + // %REVIEW% Should the lookup be part of the basic DTM API? + if (dtm instanceof DTMDefaultBase) { + DTMDefaultBase dtmdb = (DTMDefaultBase)dtm; + if (dtmdb.getManager() == this) + return dtmdb.getDTMIDs().elementAt(0); + else + return -1; + } int n = m_dtms.length; - for (int i = 0; i < n; i++) - { + for (int i = 0; i < n; i++) { DTM tdtm = m_dtms[i]; if (tdtm == dtm && m_dtm_offsets[i]==0) @@ -709,46 +628,39 @@ * @return true if the DTM was released, false if shouldHardDelete was set * and we decided not to. */ - synchronized public boolean release(DTM dtm, boolean shouldHardDelete) - { - if(DEBUG) - { - System.out.println("Releasing "+ - (shouldHardDelete ? "HARD" : "soft")+ - " dtm="+ - // Following shouldn't need a nodeHandle, but does... - // and doesn't seem to report the intended value - dtm.getDocumentBaseURI() - ); - } - - if (dtm instanceof SAX2DTM) - { - ((SAX2DTM) dtm).clearCoRoutine(); - } - - // Multiple DTM IDs may be assigned to a single DTM. - // The Right Answer is to ask which (if it supports - // extension, the DTM will need a list anyway). The - // Wrong Answer, applied if the DTM can't help us, - // is to linearly search them all; this may be very - // painful. - // - // %REVIEW% Should the lookup move up into the basic DTM API? - if(dtm instanceof DTMDefaultBase) - { - com.sun.org.apache.xml.internal.utils.SuballocatedIntVector ids=((DTMDefaultBase)dtm).getDTMIDs(); - for(int i=ids.size()-1;i>=0;--i) - m_dtms[ids.elementAt(i)>>>DTMManager.IDENT_DTM_NODE_BITS]=null; - } - else - { - int i = getDTMIdentity(dtm); - if (i >= 0) - { - m_dtms[i >>> DTMManager.IDENT_DTM_NODE_BITS] = null; - } - } + synchronized public boolean release(DTM dtm, boolean shouldHardDelete) { + /* Uncomment for debugging + System.out.println("Releasing "+ + (shouldHardDelete ? "HARD" : "soft") + + " dtm=" + + // Following shouldn't need a nodeHandle, but does... + // and doesn't seem to report the intended value + dtm.getDocumentBaseURI()); + */ + + if (dtm instanceof SAX2DTM) { + ((SAX2DTM)dtm).clearCoRoutine(); + } + + // Multiple DTM IDs may be assigned to a single DTM. + // The Right Answer is to ask which (if it supports + // extension, the DTM will need a list anyway). The + // Wrong Answer, applied if the DTM can't help us, + // is to linearly search them all; this may be very + // painful. + // + // %REVIEW% Should the lookup move up into the basic DTM API? + if (dtm instanceof DTMDefaultBase) { + com.sun.org.apache.xml.internal.utils.SuballocatedIntVector ids=((DTMDefaultBase)dtm).getDTMIDs(); + for (int i=ids.size() - 1; i >= 0; --i) { + m_dtms[ids.elementAt(i)>>>DTMManager.IDENT_DTM_NODE_BITS] = null; + } + } else { + int i = getDTMIdentity(dtm); + if (i >= 0) { + m_dtms[i >>> DTMManager.IDENT_DTM_NODE_BITS] = null; + } + } dtm.documentRelease(); return true; @@ -760,11 +672,8 @@ * * NEEDSDOC (createDocumentFragment) @return */ - synchronized public DTM createDocumentFragment() - { - - try - { + synchronized public DTM createDocumentFragment() { + try { DocumentBuilderFactory dbf = FactoryImpl.getDOMFactory(super.useServicesMechnism()); dbf.setNamespaceAware(true); @@ -773,9 +682,7 @@ Node df = doc.createDocumentFragment(); return getDTM(new DOMSource(df), true, null, false, false); - } - catch (Exception e) - { + } catch (Exception e) { throw new DTMException(e); } } @@ -791,9 +698,7 @@ * NEEDSDOC (createDTMIterator) @return */ synchronized public DTMIterator createDTMIterator(int whatToShow, DTMFilter filter, - boolean entityReferenceExpansion) - { - + boolean entityReferenceExpansion) { /** @todo: implement this com.sun.org.apache.xml.internal.dtm.DTMManager abstract method */ return null; } @@ -808,9 +713,7 @@ * NEEDSDOC (createDTMIterator) @return */ synchronized public DTMIterator createDTMIterator(String xpathString, - PrefixResolver presolver) - { - + PrefixResolver presolver) { /** @todo: implement this com.sun.org.apache.xml.internal.dtm.DTMManager abstract method */ return null; } @@ -823,9 +726,7 @@ * * NEEDSDOC (createDTMIterator) @return */ - synchronized public DTMIterator createDTMIterator(int node) - { - + synchronized public DTMIterator createDTMIterator(int node) { /** @todo: implement this com.sun.org.apache.xml.internal.dtm.DTMManager abstract method */ return null; } @@ -839,9 +740,7 @@ * * NEEDSDOC (createDTMIterator) @return */ - synchronized public DTMIterator createDTMIterator(Object xpathCompiler, int pos) - { - + synchronized public DTMIterator createDTMIterator(Object xpathCompiler, int pos) { /** @todo: implement this com.sun.org.apache.xml.internal.dtm.DTMManager abstract method */ return null; } @@ -853,8 +752,7 @@ * * NEEDSDOC ($objectName$) @return */ - public ExpandedNameTable getExpandedNameTable(DTM dtm) - { + public ExpandedNameTable getExpandedNameTable(DTM dtm) { return m_expandedNameTable; } }