You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xap-commits@incubator.apache.org by jm...@apache.org on 2006/08/17 00:06:04 UTC
svn commit: r432080 - in /incubator/xap/trunk/src/xap: bridges/dojo/ macro/
mco/ requestservice/ session/ taghandling/ util/ xml/ xml/dom/
xml/dom/events/ xml/sax/ xml/xmodify/
Author: jmargaris
Date: Wed Aug 16 17:06:01 2006
New Revision: 432080
URL: http://svn.apache.org/viewvc?rev=432080&view=rev
Log:
require/provide fixes
Modified:
incubator/xap/trunk/src/xap/bridges/dojo/DojoButtonBridge.js
incubator/xap/trunk/src/xap/macro/Macro.js
incubator/xap/trunk/src/xap/macro/MacroNamespaceHandler.js
incubator/xap/trunk/src/xap/mco/McoInvocationException.js
incubator/xap/trunk/src/xap/mco/McoNamespaceHandler.js
incubator/xap/trunk/src/xap/requestservice/HttpRequest.js
incubator/xap/trunk/src/xap/requestservice/NetServiceListener.js
incubator/xap/trunk/src/xap/requestservice/RequestService.js
incubator/xap/trunk/src/xap/session/ClientSession.js
incubator/xap/trunk/src/xap/session/Container.js
incubator/xap/trunk/src/xap/session/DeclarativeArgumentParser.js
incubator/xap/trunk/src/xap/session/EventHandler.js
incubator/xap/trunk/src/xap/taghandling/AbstractTagImpl.js
incubator/xap/trunk/src/xap/taghandling/PluginDocumentHandler.js
incubator/xap/trunk/src/xap/taghandling/PluginRegistryImpl.js
incubator/xap/trunk/src/xap/util/Character.js
incubator/xap/trunk/src/xap/util/EscapeSyntaxParser.js
incubator/xap/trunk/src/xap/util/Hashtable.js
incubator/xap/trunk/src/xap/util/HttpUtils.js
incubator/xap/trunk/src/xap/util/MessageFormat.js
incubator/xap/trunk/src/xap/util/Profiler.js
incubator/xap/trunk/src/xap/util/ResourceDictionary.js
incubator/xap/trunk/src/xap/util/XapException.js
incubator/xap/trunk/src/xap/util/XmlUtils.js
incubator/xap/trunk/src/xap/xml/DocumentContainer.js
incubator/xap/trunk/src/xap/xml/InvalidXmlException.js
incubator/xap/trunk/src/xap/xml/InvalidXmlExceptionRes.js
incubator/xap/trunk/src/xap/xml/NamespaceHandlerManager.js
incubator/xap/trunk/src/xap/xml/XalNamespaceHandler.js
incubator/xap/trunk/src/xap/xml/dom/Document.js
incubator/xap/trunk/src/xap/xml/dom/XapElement.js
incubator/xap/trunk/src/xap/xml/dom/XapElementRes.js
incubator/xap/trunk/src/xap/xml/dom/events/AttributeChangeEvent.js
incubator/xap/trunk/src/xap/xml/dom/events/AttributeChangeListener.js
incubator/xap/trunk/src/xap/xml/dom/events/ChangeRejectedException.js
incubator/xap/trunk/src/xap/xml/dom/events/ChangeRejectedExceptionRes.js
incubator/xap/trunk/src/xap/xml/dom/events/DocumentOwnershipListener.js
incubator/xap/trunk/src/xap/xml/dom/events/DomChangeEvent.js
incubator/xap/trunk/src/xap/xml/dom/events/StructureChangeEvent.js
incubator/xap/trunk/src/xap/xml/dom/events/StructureChangeListener.js
incubator/xap/trunk/src/xap/xml/sax/EmptyDocumentException.js
incubator/xap/trunk/src/xap/xml/sax/EmptyDocumentExceptionRes.js
incubator/xap/trunk/src/xap/xml/sax/ParserException.js
incubator/xap/trunk/src/xap/xml/sax/ParserExceptionRes.js
incubator/xap/trunk/src/xap/xml/sax/SaxContentHandler.js
incubator/xap/trunk/src/xap/xml/xmodify/CommandDirective.js
incubator/xap/trunk/src/xap/xml/xmodify/DirectiveSet.js
incubator/xap/trunk/src/xap/xml/xmodify/UpdateDirective.js
incubator/xap/trunk/src/xap/xml/xmodify/Xmodify.js
incubator/xap/trunk/src/xap/xml/xmodify/XmodifyException.js
incubator/xap/trunk/src/xap/xml/xmodify/XmodifyNamespaceHandler.js
Modified: incubator/xap/trunk/src/xap/bridges/dojo/DojoButtonBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/bridges/dojo/DojoButtonBridge.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/bridges/dojo/DojoButtonBridge.js (original)
+++ incubator/xap/trunk/src/xap/bridges/dojo/DojoButtonBridge.js Wed Aug 16 17:06:01 2006
@@ -21,8 +21,12 @@
* A bridge class that controls a dojo Button peer.
*/
+
+Xap.provide("xap.bridges.dojo.DojoButtonBridge");
// Auto-added---o.k.?
Xap.require("xap.util.LogFactory");
+Xap.require("xap.bridges.dojo.DojoWidgetBridge");
+Xap.require("dojo.widget.Button");
@@ -37,10 +41,8 @@
* @author mturyn
*/
-Xap.provide("xap.bridges.dojo.DojoButtonBridge");
-Xap.require("xap.bridges.dojo.DojoWidgetBridge");
-Xap.require("dojo.widget.Button");
+
/**
* @fileoverview
Modified: incubator/xap/trunk/src/xap/macro/Macro.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/macro/Macro.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/macro/Macro.js (original)
+++ incubator/xap/trunk/src/xap/macro/Macro.js Wed Aug 16 17:06:01 2006
@@ -14,14 +14,13 @@
* limitations under the License.
*
*/
+
Xap.provide("xap.macro.Macro");
-// Auto-added---o.k.?
-Xap.require("xap.xml.sax.SaxContentHandler");
-
-// Auto-added---o.k.?
-// TO_DO--make sure this is superfluous: Xap.require("xap.session.ClientSession");
+Xap.require("xap.xml.sax.SaxParser");
+Xap.require("xap.xml.sax.SaxContentHandler");
Xap.require("xap.util.MessageFormat");
+
/**
* @fileoverview A macro is a segment of stored xml that can be run from the client
* as if it came from the server in a retrieveAndProcess()
Modified: incubator/xap/trunk/src/xap/macro/MacroNamespaceHandler.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/macro/MacroNamespaceHandler.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/macro/MacroNamespaceHandler.js (original)
+++ incubator/xap/trunk/src/xap/macro/MacroNamespaceHandler.js Wed Aug 16 17:06:01 2006
@@ -18,6 +18,7 @@
Xap.require("xap.xml.dom.XapElement");
Xap.require("xap.xml.InvalidXmlException");
Xap.require("xap.macro.Macro");
+Xap.require("xap.util.LogFactory");
/**
Modified: incubator/xap/trunk/src/xap/mco/McoInvocationException.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/mco/McoInvocationException.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/mco/McoInvocationException.js (original)
+++ incubator/xap/trunk/src/xap/mco/McoInvocationException.js Wed Aug 16 17:06:01 2006
@@ -16,11 +16,9 @@
*/
-//Let Dojo know what to expect from this file:
Xap.provide('xap.mco.McoInvocationException');
-// Auto-added---o.k.?
-Xap.require("xap.util.XapException");
+Xap.require("xap.util.XapException");
/**
Modified: incubator/xap/trunk/src/xap/mco/McoNamespaceHandler.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/mco/McoNamespaceHandler.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/mco/McoNamespaceHandler.js (original)
+++ incubator/xap/trunk/src/xap/mco/McoNamespaceHandler.js Wed Aug 16 17:06:01 2006
@@ -16,8 +16,10 @@
*/
Xap.provide("xap.mco.McoNamespaceHandler") ;
+
Xap.require("xap.xml.dom.XapElement");
Xap.require("xap.xml.InvalidXmlException");
+Xap.require("xap.util.LogFactory");
/**
* @fileoverview The handler for the mco namespace.
@@ -25,9 +27,7 @@
* @author jmargaris
* @author ikaplansky
*/
-xap.mco.McoNamespaceHandler = function(){
-
-}
+xap.mco.McoNamespaceHandler = function(){}
//-----------------------------------------------------------------------
// Constants.
@@ -62,7 +62,6 @@
* @throws UpdateException
*/
xap.mco.McoNamespaceHandler.prototype.receiveDispatch = function( element ) {
- xap.mco.McoNamespaceHandler.s_log.debug( "receiveDispatch:" + element );
var name = element.getLocalName();
if ( name == xap.mco.McoNamespaceHandler.EXECUTE ) {
Modified: incubator/xap/trunk/src/xap/requestservice/HttpRequest.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/requestservice/HttpRequest.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/requestservice/HttpRequest.js (original)
+++ incubator/xap/trunk/src/xap/requestservice/HttpRequest.js Wed Aug 16 17:06:01 2006
@@ -16,9 +16,7 @@
*/
Xap.provide('xap.requestservice.HttpRequest');
-Xap.require('xap.util.HttpUtils');
-
xap.requestservice.HttpRequest = function(url, method) {
this._url = url;
Modified: incubator/xap/trunk/src/xap/requestservice/NetServiceListener.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/requestservice/NetServiceListener.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/requestservice/NetServiceListener.js (original)
+++ incubator/xap/trunk/src/xap/requestservice/NetServiceListener.js Wed Aug 16 17:06:01 2006
@@ -15,10 +15,8 @@
*
*/
-//Let Dojo know what to expect from this file:
Xap.provide('xap.requestservice.NetServiceListener');
-// Auto-added---o.k.?
-Xap.require("xap.requestservice.RequestService");
+
Modified: incubator/xap/trunk/src/xap/requestservice/RequestService.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/requestservice/RequestService.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/requestservice/RequestService.js (original)
+++ incubator/xap/trunk/src/xap/requestservice/RequestService.js Wed Aug 16 17:06:01 2006
@@ -23,13 +23,13 @@
Xap.provide("xap.requestservice.RequestService");
+
+
Xap.require("xap.xml.sax.SaxContentHandler") ;
Xap.require("xap.xml.sax.SaxParser") ;
-
-// Auto-added---o.k.?
Xap.require("xap.util.HttpUtils");
-
+//IMPORTANT make it clear you can use HttpRequest here, not just urls!
//-----------------------------------------------------------------------
// Constructors.
//-----------------------------------------------------------------------
Modified: incubator/xap/trunk/src/xap/session/ClientSession.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/session/ClientSession.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/session/ClientSession.js (original)
+++ incubator/xap/trunk/src/xap/session/ClientSession.js Wed Aug 16 17:06:01 2006
@@ -19,50 +19,17 @@
Xap.require("xap.xml.sax.SaxContentHandler") ;
Xap.require("xap.xml.sax.SaxParser") ;
-
-// Auto-added---o.k.?
-// TO_DO--make sure this is superfluous: Xap.require("xap.xml.dom.Document");
-
-// Auto-added---o.k.?
Xap.require("xap.xml.NamespaceHandlerManager");
-
-// Auto-added---o.k.?
Xap.require("xap.xml.DocumentContainer");
-
-// Auto-added---o.k.?
Xap.require("xap.util.XapException");
-
-// Auto-added---o.k.?
-Xap.require("xap.util.Profiler");
-
-// Auto-added---o.k.?
Xap.require("xap.util.LogFactory");
-
-// Auto-added---o.k.?
Xap.require("xap.util.Hashtable");
-
-// Auto-added---o.k.?
Xap.require("xap.taghandling.PluginRegistryImpl");
-
-// Auto-added---o.k.?
Xap.require("xap.taghandling.PluginDocumentHandler");
-
-// Auto-added---o.k.?
Xap.require("xap.taghandling.AbstractTagImpl");
-
-// Auto-added---o.k.?
Xap.require("xap.session.EventHandler");
-
-// Auto-added---o.k.?
Xap.require("xap.session.DeclarativeArgumentParser");
-
-// Auto-added---o.k.?
Xap.require("xap.session.Container");
-
-// Auto-added---o.k.?
-// TO_DO--make sure this is superfluous: Xap.require("xap.session.ClientEvent");
-
-// Auto-added---o.k.?
Xap.require("xap.requestservice.RequestService");
Modified: incubator/xap/trunk/src/xap/session/Container.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/session/Container.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/session/Container.js (original)
+++ incubator/xap/trunk/src/xap/session/Container.js Wed Aug 16 17:06:01 2006
@@ -16,20 +16,13 @@
*/
-//Let Dojo know what to expect from this file:
Xap.provide('xap.session.Container');
-// Auto-added---o.k.?
-Xap.require("xap.util.Hashtable");
-
+Xap.require("xap.util.Hashtable");
-//TODO move packages? MCO as a concept needs to be clarified
/**
* @fileoverview A repository that stores objects by name and provides
-// Auto-added---o.k.?
-Xap.require("xap.util.Hashtable");
-
* notification events when objects are added and removed.
*
* @author jmargaris
@@ -40,9 +33,6 @@
* Creates a new xap.session.Container instance.
*
* @class xap.session.Container is a repository that stores objects by name and provides
-// Auto-added---o.k.?
-Xap.require("xap.util.Hashtable");
-
* notification events when objects are added and removed.
*
*/
Modified: incubator/xap/trunk/src/xap/session/DeclarativeArgumentParser.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/session/DeclarativeArgumentParser.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/session/DeclarativeArgumentParser.js (original)
+++ incubator/xap/trunk/src/xap/session/DeclarativeArgumentParser.js Wed Aug 16 17:06:01 2006
@@ -27,15 +27,10 @@
//TODO what package does this belong in?
Xap.provide( "xap.session.DeclarativeArgumentParser" ) ;
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.XapElement");
-// Auto-added---o.k.?
Xap.require("xap.util.Exception");
-
-// Auto-added---o.k.?
-// TO_DO--make sure this is superfluous: Xap.require("xap.session.ClientEvent");
-
+Xap.require("xap.util.Character");
+Xap.require("xap.util.LogFactory");
/**
Modified: incubator/xap/trunk/src/xap/session/EventHandler.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/session/EventHandler.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/session/EventHandler.js (original)
+++ incubator/xap/trunk/src/xap/session/EventHandler.js Wed Aug 16 17:06:01 2006
@@ -15,8 +15,10 @@
*
*/
-//Let Dojo know what to expect from this file:
Xap.provide('xap.session.EventHandler');
+
+Xap.require('xap.util.XapException');
+
Modified: incubator/xap/trunk/src/xap/taghandling/AbstractTagImpl.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/taghandling/AbstractTagImpl.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/taghandling/AbstractTagImpl.js (original)
+++ incubator/xap/trunk/src/xap/taghandling/AbstractTagImpl.js Wed Aug 16 17:06:01 2006
@@ -17,19 +17,19 @@
//Let Dojo know what to expect from this file:
Xap.provide('xap.taghandling.AbstractTagImpl');
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.events.StructureChangeEvent");
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.events.AttributeChangeEvent");
-// Auto-added---o.k.?
+Xap.require("xap.xml.dom.events.StructureChangeEvent");
+Xap.require("xap.xml.dom.events.AttributeChangeEvent");
Xap.require("xap.session.ClientEvent");
+Xap.require("google.*");
+Xap.require("xap.xml.InvalidXmlException");
+
-
//TODO we need to handle qualifying URLs properly based on the request page again
-
-Xap.require("google.*");
+//right now if we have onCommand=../blah that is relative to root rather than
+//where page was loaded from
+
/**
* @fileoverview The base class for all element to peer object
* bridges.
@@ -39,15 +39,6 @@
*/
- // Auto-added---o.k.?
-Xap.require("xap.xml.dom.events.StructureChangeEvent");
-
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.events.AttributeChangeEvent");
-
-// Auto-added---o.k.?
-Xap.require("xap.session.ClientEvent");
-
/**
* Creates a new AbstractTagImpl, this is typically called by the parsing
@@ -132,15 +123,6 @@
/**
* Subclasses should override this method to provide proper initialization
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.events.StructureChangeEvent");
-
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.events.AttributeChangeEvent");
-
-// Auto-added---o.k.?
-Xap.require("xap.session.ClientEvent");
-
* behavior. This is the final call in the tag-handler creation process.
*/
xap.taghandling.AbstractTagImpl.prototype.init = function() {}
@@ -173,15 +155,6 @@
/**
* This method is provided for convenience to deal with elements
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.events.StructureChangeEvent");
-
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.events.AttributeChangeEvent");
-
-// Auto-added---o.k.?
-Xap.require("xap.session.ClientEvent");
-
* that start with a number of attributes when they are added to the
* document. This method will run through all the initial attributes
* and construct an AttributeChangeEvent for each attribute, then
@@ -225,15 +198,6 @@
/**
* This method is provided for convenience to deal with elements
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.events.StructureChangeEvent");
-
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.events.AttributeChangeEvent");
-
-// Auto-added---o.k.?
-Xap.require("xap.session.ClientEvent");
-
* that start with a number of children when they are added to the
* document. For each initial child, this method will call
* UiContentHandler.parseChild() on that child element, which initiates
@@ -782,10 +746,10 @@
if(ex.getMessage){
errStr = ex.getMessage() ;
}
- var exception = new InvalidXmlException(
- InvalidXmlException.BAD_ATTRIBUTE_WITH_ROOT_CAUSE,
- new Array( attributeName, attributeValue, errStr,InvalidXmlException.toString( e ),
- InvalidXmlException.toString( e.getParent() )),
+ var exception = new xap.xml.InvalidXmlException(
+ xap.xml.InvalidXmlException.BAD_ATTRIBUTE_WITH_ROOT_CAUSE,
+ new Array( attributeName, attributeValue, errStr,xap.xml.InvalidXmlException.toString( e ),
+ xap.xml.InvalidXmlException.toString( e.getParent() )),
ex );
return exception;
}
Modified: incubator/xap/trunk/src/xap/taghandling/PluginDocumentHandler.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/taghandling/PluginDocumentHandler.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/taghandling/PluginDocumentHandler.js (original)
+++ incubator/xap/trunk/src/xap/taghandling/PluginDocumentHandler.js Wed Aug 16 17:06:01 2006
@@ -15,27 +15,9 @@
*
*/
Xap.provide( "xap.taghandling.PluginDocumentHandler" ) ;
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.events.StructureChangeListener");
-// Auto-added---o.k.?
Xap.require("xap.xml.dom.events.StructureChangeEvent");
-
-// Auto-added---o.k.?
-// TO_DO--make sure this is superfluous: Xap.require("xap.xml.dom.Document");
-
-// Auto-added---o.k.?
Xap.require("xap.util.Hashtable");
-
-// Auto-added---o.k.?
-Xap.require("xap.taghandling.AbstractTagImpl");
-
-// Auto-added---o.k.?
-// TO_DO--make sure this is superfluous: Xap.require("xap.session.ClientSession");
-
-// Auto-added---o.k.?
-Xap.require("xap.bridges.zimbra.DwtButtonBridge");
-
Xap.require("google.*");
/**
@@ -206,27 +188,6 @@
//DwtButtonBridge.
//TODO remove this attempt once we convert all the bridge
//classes over to use provide/require and fully scoped
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.events.StructureChangeListener");
-
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.events.StructureChangeEvent");
-
-// Auto-added---o.k.?
-// TO_DO--make sure this is superfluous: Xap.require("xap.xml.dom.Document");
-
-// Auto-added---o.k.?
-Xap.require("xap.util.Hashtable");
-
-// Auto-added---o.k.?
-Xap.require("xap.taghandling.AbstractTagImpl");
-
-// Auto-added---o.k.?
-// TO_DO--make sure this is superfluous: Xap.require("xap.session.ClientSession");
-
-// Auto-added---o.k.?
-Xap.require("xap.bridges.zimbra.DwtButtonBridge");
-
//constructors/classes
try{
var lastPeriod = bridgeClass.lastIndexOf(".");
Modified: incubator/xap/trunk/src/xap/taghandling/PluginRegistryImpl.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/taghandling/PluginRegistryImpl.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/taghandling/PluginRegistryImpl.js (original)
+++ incubator/xap/trunk/src/xap/taghandling/PluginRegistryImpl.js Wed Aug 16 17:06:01 2006
@@ -16,21 +16,13 @@
*/
Xap.provide( "xap.taghandling.PluginRegistryImpl" ) ;
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.XapElement");
-// Auto-added---o.k.?
Xap.require("xap.xml.DocumentContainer");
-
-// Auto-added---o.k.?
Xap.require("xap.util.Hashtable");
-
-// Auto-added---o.k.?
-// TO_DO--make sure this is superfluous: Xap.require("xap.taghandling.PluginRegistry");
-
Xap.require("google.xpath");
Xap.require("xap.xml.sax.SaxContentHandler") ;
Xap.require("xap.xml.sax.SaxParser") ;
+
/**
* @fileoverview Work in progress.
*
Modified: incubator/xap/trunk/src/xap/util/Character.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/util/Character.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/util/Character.js (original)
+++ incubator/xap/trunk/src/xap/util/Character.js Wed Aug 16 17:06:01 2006
@@ -73,6 +73,10 @@
return xap.util.Character._reLetterOrDigit.test( c );
}
+xap.util.Character.isWhiteSpaceChar = function ( c ) {
+ return (c==' ' || c=='\n' || c=='\t' || c=='\r');
+}
+
xap.util.Character.isWhiteSpace = function ( str ) {
return xap.util.Character._reWhitespace.test( str );
}
Modified: incubator/xap/trunk/src/xap/util/EscapeSyntaxParser.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/util/EscapeSyntaxParser.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/util/EscapeSyntaxParser.js (original)
+++ incubator/xap/trunk/src/xap/util/EscapeSyntaxParser.js Wed Aug 16 17:06:01 2006
@@ -15,8 +15,10 @@
*
*/
-Xap.require("xap.util.Exception");
+
Xap.provide("xap.util.EscapeSyntaxParser");
+
+Xap.require("xap.util.Exception");
//TODO docs here need help, mostly ported over unchanged.
Modified: incubator/xap/trunk/src/xap/util/Hashtable.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/util/Hashtable.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/util/Hashtable.js (original)
+++ incubator/xap/trunk/src/xap/util/Hashtable.js Wed Aug 16 17:06:01 2006
@@ -15,9 +15,9 @@
*
*/
-//Let Dojo know what to expect from this file:
Xap.provide('xap.util.Hashtable');
+Xap.require('xap.util.Exception');
//TODO like many classes exception handling here needs to be
//more thought out.
Modified: incubator/xap/trunk/src/xap/util/HttpUtils.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/util/HttpUtils.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/util/HttpUtils.js (original)
+++ incubator/xap/trunk/src/xap/util/HttpUtils.js Wed Aug 16 17:06:01 2006
@@ -33,6 +33,8 @@
*/
Xap.provide("xap.util.HttpUtils");
Xap.require("xap.requestservice.HttpRequest");
+
+
xap.util.HttpUtils = function () {
};
xap.util.HttpUtils.s_log = xap.util.LogFactory.getLog("HttpUtils");
Modified: incubator/xap/trunk/src/xap/util/MessageFormat.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/util/MessageFormat.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/util/MessageFormat.js (original)
+++ incubator/xap/trunk/src/xap/util/MessageFormat.js Wed Aug 16 17:06:01 2006
@@ -17,7 +17,8 @@
Xap.provide("xap.util.MessageFormat");
-Xap.require("xap.util.EscapeSyntaxParser")
+
+
/**
* @fileoverview Provides an approximation of Java message format.
Modified: incubator/xap/trunk/src/xap/util/Profiler.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/util/Profiler.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/util/Profiler.js (original)
+++ incubator/xap/trunk/src/xap/util/Profiler.js Wed Aug 16 17:06:01 2006
@@ -15,7 +15,6 @@
*
*/
Xap.provide( "xap.util.Profiler" ) ;
-// Auto-added---o.k.?
Xap.require("xap.util.Hashtable");
@@ -23,7 +22,8 @@
xap.util.Profiler._hashtable = new xap.util.Hashtable();
-xap.util.Profiler.s_log = xap.util.LogFactory.getLog("xap.util.Profiler");
+xap.util.Profiler._totalTimes = new xap.util.Hashtable();
+
xap.util.Profiler.start = function( message ){
var x = xap.util.Profiler._hashtable.get(message);
@@ -43,10 +43,21 @@
if (!x || x.length==0) return;
var startTime = x.pop();
+
+ var delta = now.getTime()-startTime.getTime() ;
+
+ var totalTime = xap.util.Profiler._totalTimes.get(message);
+ if (totalTime){
+ totalTime+= delta;
+ }
+ else{
+ totalTime = delta;
+ }
+ xap.util.Profiler._totalTimes.put(message,totalTime);
- var message = message + "[" + x.length + "] took " + (now.getTime()-startTime.getTime()) + "ms";
- xap.util.Profiler.s_log.debug(message);
+ return delta;
}
+
Modified: incubator/xap/trunk/src/xap/util/ResourceDictionary.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/util/ResourceDictionary.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/util/ResourceDictionary.js (original)
+++ incubator/xap/trunk/src/xap/util/ResourceDictionary.js Wed Aug 16 17:06:01 2006
@@ -16,10 +16,8 @@
*/
Xap.provide( "xap.util.ResourceDictionary" ) ;
-
+Xap.require('xap.util.LogFactory');
Xap.require("xap.util.MessageFormat");
-
-// Auto-added---o.k.?
Xap.require("xap.util.Hashtable");
Modified: incubator/xap/trunk/src/xap/util/XapException.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/util/XapException.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/util/XapException.js (original)
+++ incubator/xap/trunk/src/xap/util/XapException.js Wed Aug 16 17:06:01 2006
@@ -17,12 +17,8 @@
//Let Dojo know what to expect from this file:
Xap.provide('xap.util.XapException');
-// Auto-added---o.k.?
-Xap.require("xap.util.ResourceDictionary");
-
-// Auto-added---o.k.?
-Xap.require("xap.util.Exception");
+Xap.require("xap.util.ResourceDictionary");
Xap.require('xap.util.XapExceptionRes');
Modified: incubator/xap/trunk/src/xap/util/XmlUtils.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/util/XmlUtils.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/util/XmlUtils.js (original)
+++ incubator/xap/trunk/src/xap/util/XmlUtils.js Wed Aug 16 17:06:01 2006
@@ -24,6 +24,8 @@
//Let Dojo know what to expect from this file:
Xap.provide("xap.util.XmlUtils");
+//TODO move packages?
+
Xap.require("xap.util.Character");
Modified: incubator/xap/trunk/src/xap/xml/DocumentContainer.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/xml/DocumentContainer.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/xml/DocumentContainer.js (original)
+++ incubator/xap/trunk/src/xap/xml/DocumentContainer.js Wed Aug 16 17:06:01 2006
@@ -15,18 +15,10 @@
*
*/
-
-//Let Dojo know what to expect from this file:
Xap.provide('xap.xml.DocumentContainer');
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.Document");
-// Auto-added---o.k.?
+Xap.require("xap.xml.dom.Document");
Xap.require("xap.session.Container");
-
-// Auto-added---o.k.?
-// TO_DO--make sure this is superfluous: Xap.require("xap.session.ClientSession");
-
/**
* @fileoverview A xap.session.Container that holds xml documents.
Modified: incubator/xap/trunk/src/xap/xml/InvalidXmlException.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/xml/InvalidXmlException.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/xml/InvalidXmlException.js (original)
+++ incubator/xap/trunk/src/xap/xml/InvalidXmlException.js Wed Aug 16 17:06:01 2006
@@ -15,18 +15,8 @@
*
*/
-//Let Dojo know what to expect from this file:
Xap.provide('xap.xml.InvalidXmlException');
-// Auto-added---o.k.?
-// TO_DO--make sure this is superfluous: Xap.require("xap.xml.dom.events.StructureChangeListener");
-// Auto-added---o.k.?
-// TO_DO--make sure this is superfluous: Xap.require("xap.xml.dom.events.AttributeChangeListener");
-
-// Auto-added---o.k.?
-// TO_DO--make sure this is superfluous: Xap.require("xap.xml.dom.Document");
-
-// Auto-added---o.k.?
Xap.require("xap.util.XapException");
Modified: incubator/xap/trunk/src/xap/xml/InvalidXmlExceptionRes.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/xml/InvalidXmlExceptionRes.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/xml/InvalidXmlExceptionRes.js (original)
+++ incubator/xap/trunk/src/xap/xml/InvalidXmlExceptionRes.js Wed Aug 16 17:06:01 2006
@@ -15,11 +15,7 @@
*
*/
-//Let Dojo know what to expect from this file:
Xap.provide('xap.xml.InvalidXmlExceptionRes');
-// Auto-added---o.k.?
-Xap.require("xap.xml.InvalidXmlException");
-
/**
* @fileoverview The resource file for xap.xml.InvalidXmlException.js
Modified: incubator/xap/trunk/src/xap/xml/NamespaceHandlerManager.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/xml/NamespaceHandlerManager.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/xml/NamespaceHandlerManager.js (original)
+++ incubator/xap/trunk/src/xap/xml/NamespaceHandlerManager.js Wed Aug 16 17:06:01 2006
@@ -14,36 +14,14 @@
* limitations under the License.
*
*/
- Xap.provide( "xap.xml.NamespaceHandlerManager" ) ;
-// Auto-added---o.k.?
-Xap.require("xap.xml.xmodify.XmodifyNamespaceHandler");
-// Auto-added---o.k.?
-Xap.require("xap.xml.sax.ParserException");
+Xap.provide( "xap.xml.NamespaceHandlerManager" ) ;
-// Auto-added---o.k.?
-Xap.require("xap.xml.XalNamespaceHandler");
-// Auto-added---o.k.?
-// TO_DO--make sure this is superfluous: Xap.require("xap.xml.NamespaceHandler");
+Xap.require("xap.xml.sax.ParserException");
-// Auto-added---o.k.?
Xap.require("xap.util.Hashtable");
-
-// Auto-added---o.k.?
Xap.require("xap.util.Exception");
-
-// Auto-added---o.k.?
-// TO_DO--make sure this is superfluous: Xap.require("xap.session.ClientSession");
-
-// Auto-added---o.k.?
-Xap.require("xap.mco.McoNamespaceHandler");
-
-// Auto-added---o.k.?
-Xap.require("xap.macro.MacroNamespaceHandler");
-
-
-
/**
* @fileoverview xap.xml.NamespaceHandlerManager is a registry of namespaces to
Modified: incubator/xap/trunk/src/xap/xml/XalNamespaceHandler.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/xml/XalNamespaceHandler.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/xml/XalNamespaceHandler.js (original)
+++ incubator/xap/trunk/src/xap/xml/XalNamespaceHandler.js Wed Aug 16 17:06:01 2006
@@ -17,7 +17,7 @@
Xap.provide( "xap.xml.XalNamespaceHandler" ) ;
-
+Xap.require( "xap.util.LogFactory" ) ;
/**
* @fileoverview Handles the xal namespace when it is at the first
Modified: incubator/xap/trunk/src/xap/xml/dom/Document.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/xml/dom/Document.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/xml/dom/Document.js (original)
+++ incubator/xap/trunk/src/xap/xml/dom/Document.js Wed Aug 16 17:06:01 2006
@@ -15,51 +15,19 @@
*
*/
-//Let Dojo know what to expect from this file:
Xap.provide('xap.xml.dom.Document');
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.events.StructureChangeListener");
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.events.StructureChangeEvent");
-
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.events.AttributeChangeListener");
-// Auto-added---o.k.?
+Xap.require("xap.xml.dom.events.StructureChangeEvent");
Xap.require("xap.xml.dom.XapElement");
-
-// Auto-added---o.k.?
Xap.require("xap.xml.InvalidXmlException");
-
-// Auto-added---o.k.?
Xap.require("xap.util.UidProvider");
-
-
Xap.require("google.dom");
Xap.require("xap.util.ArrayHelper");
/**
* @fileoverview The xap.xml.dom.Document object represents an entire XML document.
* Conceptually, it is the root of the document tree, and provides the
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.events.StructureChangeListener");
-
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.events.StructureChangeEvent");
-
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.events.AttributeChangeListener");
-
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.XapElement");
-
-// Auto-added---o.k.?
-Xap.require("xap.xml.InvalidXmlException");
-
-// Auto-added---o.k.?
-Xap.require("xap.util.UidProvider");
-
* primary access to the document's data.
*
* @author ikaplansky
@@ -73,24 +41,6 @@
* @extends google.XDocument
* @class The xap.xml.dom.Document object represents an entire XML document. Conceptually, it
* is the root of the document tree, and provides the primary access to the
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.events.StructureChangeListener");
-
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.events.StructureChangeEvent");
-
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.events.AttributeChangeListener");
-
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.XapElement");
-
-// Auto-added---o.k.?
-Xap.require("xap.xml.InvalidXmlException");
-
-// Auto-added---o.k.?
-Xap.require("xap.util.UidProvider");
-
* document's data.
*
* <br><br>
@@ -107,24 +57,6 @@
*
* The xap.xml.dom.Document has a map of id to Element for every Element. Therefore
* it is able to provide efficient hash based element lookup by id.
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.events.StructureChangeListener");
-
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.events.StructureChangeEvent");
-
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.events.AttributeChangeListener");
-
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.XapElement");
-
-// Auto-added---o.k.?
-Xap.require("xap.xml.InvalidXmlException");
-
-// Auto-added---o.k.?
-Xap.require("xap.util.UidProvider");
-
*
* @constructor
* @param rootElement The root Element for the newly created document.
Modified: incubator/xap/trunk/src/xap/xml/dom/XapElement.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/xml/dom/XapElement.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/xml/dom/XapElement.js (original)
+++ incubator/xap/trunk/src/xap/xml/dom/XapElement.js Wed Aug 16 17:06:01 2006
@@ -16,35 +16,12 @@
*/
Xap.provide( "xap.xml.dom.XapElement" ) ;
-// Auto-added---o.k.?
-// TO_DO--make sure this is superfluous: Xap.require("xap.xml.dom.events.StructureChangeListener");
-// Auto-added---o.k.?
Xap.require("xap.xml.dom.events.StructureChangeEvent");
-
-// Auto-added---o.k.?
-// TO_DO--make sure this is superfluous: Xap.require("xap.xml.dom.events.ChangeRejectedException");
-
-// Auto-added---o.k.?
-// TO_DO--make sure this is superfluous: Xap.require("xap.xml.dom.events.AttributeChangeListener");
-
-// Auto-added---o.k.?
Xap.require("xap.xml.dom.events.AttributeChangeEvent");
-
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.Document");
-
-// Auto-added---o.k.?
Xap.require("xap.util.XmlUtils");
-
-// Auto-added---o.k.?
Xap.require("xap.util.UidProvider");
-
-// Auto-added---o.k.?
Xap.require("xap.util.ResourceDictionary");
-
-
-
Xap.require("google.dom");
Xap.require("xap.util.ArrayHelper");
@@ -186,33 +163,6 @@
/**
* Creates a unique i.d., using a provider class.
-// Auto-added---o.k.?
-// TO_DO--make sure this is superfluous: Xap.require("xap.xml.dom.events.StructureChangeListener");
-
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.events.StructureChangeEvent");
-
-// Auto-added---o.k.?
-// TO_DO--make sure this is superfluous: Xap.require("xap.xml.dom.events.ChangeRejectedException");
-
-// Auto-added---o.k.?
-// TO_DO--make sure this is superfluous: Xap.require("xap.xml.dom.events.AttributeChangeListener");
-
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.events.AttributeChangeEvent");
-
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.Document");
-
-// Auto-added---o.k.?
-Xap.require("xap.util.XmlUtils");
-
-// Auto-added---o.k.?
-Xap.require("xap.util.UidProvider");
-
-// Auto-added---o.k.?
-Xap.require("xap.util.ResourceDictionary");
-
* @return a unique i.d.
* @private
**/
@@ -1059,33 +1009,6 @@
// elements for use in XUpdate we need a common scheme for
// generating IDs between the client and the server. So when
// Xupdate clones an element it will provide the parser that
-// Auto-added---o.k.?
-// TO_DO--make sure this is superfluous: Xap.require("xap.xml.dom.events.StructureChangeListener");
-
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.events.StructureChangeEvent");
-
-// Auto-added---o.k.?
-// TO_DO--make sure this is superfluous: Xap.require("xap.xml.dom.events.ChangeRejectedException");
-
-// Auto-added---o.k.?
-// TO_DO--make sure this is superfluous: Xap.require("xap.xml.dom.events.AttributeChangeListener");
-
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.events.AttributeChangeEvent");
-
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.Document");
-
-// Auto-added---o.k.?
-Xap.require("xap.util.XmlUtils");
-
-// Auto-added---o.k.?
-Xap.require("xap.util.UidProvider");
-
-// Auto-added---o.k.?
-Xap.require("xap.util.ResourceDictionary");
-
// originally parsed the XUpdate document, so that we can use
// its logic to synchronize the ID generation between client
// and server.
Modified: incubator/xap/trunk/src/xap/xml/dom/XapElementRes.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/xml/dom/XapElementRes.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/xml/dom/XapElementRes.js (original)
+++ incubator/xap/trunk/src/xap/xml/dom/XapElementRes.js Wed Aug 16 17:06:01 2006
@@ -21,10 +21,10 @@
*/
Xap.provide("xap.xml.dom.XapElementRes") ;
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.XapElement");
-
+
+//TODO these res files have circular dependencies?
+
xap.xml.dom.XapElementRes = function() {
this.messages = new Object();
this.messages[xap.xml.dom.XapElement.CANNOT_SET_ID_ATTRIBUTE_WHEN_PART_OF_DOCUMENT] = "This element is part of a document. The \"id\" attribute cannot be set on an element after it has been added to a document.";
Modified: incubator/xap/trunk/src/xap/xml/dom/events/AttributeChangeEvent.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/xml/dom/events/AttributeChangeEvent.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/xml/dom/events/AttributeChangeEvent.js (original)
+++ incubator/xap/trunk/src/xap/xml/dom/events/AttributeChangeEvent.js Wed Aug 16 17:06:01 2006
@@ -15,13 +15,10 @@
*
*/
-//Let Dojo know what to expect from this file:
+
Xap.provide('xap.xml.dom.events.AttributeChangeEvent');
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.events.DomChangeEvent");
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.events.AttributeChangeListener");
+Xap.require("xap.xml.dom.events.DomChangeEvent");
/**
Modified: incubator/xap/trunk/src/xap/xml/dom/events/AttributeChangeListener.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/xml/dom/events/AttributeChangeListener.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/xml/dom/events/AttributeChangeListener.js (original)
+++ incubator/xap/trunk/src/xap/xml/dom/events/AttributeChangeListener.js Wed Aug 16 17:06:01 2006
@@ -15,20 +15,7 @@
*
*/
-//Let Dojo know what to expect from this file:
Xap.provide('xap.xml.dom.events.AttributeChangeListener');
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.events.ChangeRejectedException");
-
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.events.AttributeChangeEvent");
-
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.XapElement");
-
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.Document");
-
/**
* @fileoverview A listener that is notified of XML attribute changes.
@@ -74,18 +61,6 @@
* @param event The xap.xml.dom.events.AttributeChangeEvent representing the change.
* @exception xap.xml.dom.events.ChangeRejectedException Implementors may throw this
* if they wish to provide a reason that they rejected the change
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.events.ChangeRejectedException");
-
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.events.AttributeChangeEvent");
-
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.XapElement");
-
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.Document");
-
* in the exception message.
*/
xap.xml.dom.events.AttributeChangeListener.prototype.beforeAttributeSet = function( event ) {}
Modified: incubator/xap/trunk/src/xap/xml/dom/events/ChangeRejectedException.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/xml/dom/events/ChangeRejectedException.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/xml/dom/events/ChangeRejectedException.js (original)
+++ incubator/xap/trunk/src/xap/xml/dom/events/ChangeRejectedException.js Wed Aug 16 17:06:01 2006
@@ -15,21 +15,10 @@
*
*/
-//Let Dojo know what to expect from this file:
-Xap.provide('xap.xml.dom.events.ChangeRejectedException');
-// Auto-added---o.k.?
-// TODO--make sure this is superfluous: Xap.require("xap.xml.dom.events.StructureChangeListener");
-
-// Auto-added---o.k.?
-// TODO--make sure this is superfluous: Xap.require("xap.xml.dom.events.DomChangeEvent");
-// Auto-added---o.k.?
-// TODO--make sure this is superfluous: Xap.require("xap.xml.dom.events.AttributeChangeListener");
-
-// Auto-added---o.k.?
-// TODO--make sure this is superfluous: Xap.require("xap.xml.dom.Document");
+Xap.provide('xap.xml.dom.events.ChangeRejectedException');
-// Auto-added---o.k.?
+Xap.require('xap.xml.dom.events.ChangeRejectedExceptionRes');
Xap.require("xap.util.XapException");
Modified: incubator/xap/trunk/src/xap/xml/dom/events/ChangeRejectedExceptionRes.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/xml/dom/events/ChangeRejectedExceptionRes.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/xml/dom/events/ChangeRejectedExceptionRes.js (original)
+++ incubator/xap/trunk/src/xap/xml/dom/events/ChangeRejectedExceptionRes.js Wed Aug 16 17:06:01 2006
@@ -23,11 +23,6 @@
*/
Xap.provide("xap.xml.dom.events.ChangeRejectedExceptionRes") ;
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.events.StructureChangeListeners");
-// Auto-added---o.k.?
-// TO_DO--make sure this is superfluous: Xap.require("xap.xml.dom.events.ChangeRejectedException");
-
xap.xml.dom.events.ChangeRejectedExceptionRes = function() {
this.messages = new Object();
Modified: incubator/xap/trunk/src/xap/xml/dom/events/DocumentOwnershipListener.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/xml/dom/events/DocumentOwnershipListener.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/xml/dom/events/DocumentOwnershipListener.js (original)
+++ incubator/xap/trunk/src/xap/xml/dom/events/DocumentOwnershipListener.js Wed Aug 16 17:06:01 2006
@@ -20,8 +20,10 @@
*
* @author jmargaris
*/
+
+
Xap.provide("xap.xml.dom.DocumentOwnershipListener") ;
-Xap.require("xap.xml.dom.Document");
+
Modified: incubator/xap/trunk/src/xap/xml/dom/events/DomChangeEvent.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/xml/dom/events/DomChangeEvent.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/xml/dom/events/DomChangeEvent.js (original)
+++ incubator/xap/trunk/src/xap/xml/dom/events/DomChangeEvent.js Wed Aug 16 17:06:01 2006
@@ -15,19 +15,11 @@
*
*/
-//Let Dojo know what to expect from this file:
Xap.provide('xap.xml.dom.events.DomChangeEvent');
-// Auto-added---o.k.?
-// TO_DO--make sure this is superfluous: Xap.require("xap.xml.dom.events.StructureChangeEvent");
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.XapElement");
-// Auto-added---o.k.?
-// TO_DO--make sure this is superfluous: Xap.require("xap.xml.dom.Document");
-
-
- /* @fileoverview xap.xml.dom.events.DomChangeEvent is the base class for {@link xap.xml.dom.events.AttributeChangeEvent}
+ /**
+ * @fileoverview xap.xml.dom.events.DomChangeEvent is the base class for {@link xap.xml.dom.events.AttributeChangeEvent}
* and {@link xap.xml.dom.events.StructureChangeEvent}.
*
* @author ikaplansky
Modified: incubator/xap/trunk/src/xap/xml/dom/events/StructureChangeEvent.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/xml/dom/events/StructureChangeEvent.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/xml/dom/events/StructureChangeEvent.js (original)
+++ incubator/xap/trunk/src/xap/xml/dom/events/StructureChangeEvent.js Wed Aug 16 17:06:01 2006
@@ -15,21 +15,16 @@
*
*/
- /* @fileoverview xap.xml.dom.events.StructureChangeEvent objects are passed to the methods of the
+/**
+ * @fileoverview xap.xml.dom.events.StructureChangeEvent objects are passed to the methods of the
* {@link xap.xml.dom.events.StructureChangeListener} class when changes in xap.xml.dom.Document
* structure occur.
*/
-//Let Dojo know what to expect from this file:
Xap.provide("xap.xml.dom.events.StructureChangeEvent");
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.Document");
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.XapElement");
-// Auto-added---o.k.?
+
Xap.require("xap.xml.dom.events.DomChangeEvent");
-
Xap.require("google.dom");
Modified: incubator/xap/trunk/src/xap/xml/dom/events/StructureChangeListener.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/xml/dom/events/StructureChangeListener.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/xml/dom/events/StructureChangeListener.js (original)
+++ incubator/xap/trunk/src/xap/xml/dom/events/StructureChangeListener.js Wed Aug 16 17:06:01 2006
@@ -17,19 +17,7 @@
//Let Dojo know what to expect from this file:
Xap.provide('xap.xml.dom.events.StructureChangeListener');
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.events.StructureChangeEvent");
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.events.ChangeRejectedException");
-
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.XapElement");
-
-// Auto-added---o.k.?
-// TO_DO--make sure this is superfluous: Xap.require("xap.xml.dom.Document");
-
-
/**
* @fileoverview A listener that is notified of XML structure changes.
* @author ikaplansky
Modified: incubator/xap/trunk/src/xap/xml/sax/EmptyDocumentException.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/xml/sax/EmptyDocumentException.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/xml/sax/EmptyDocumentException.js (original)
+++ incubator/xap/trunk/src/xap/xml/sax/EmptyDocumentException.js Wed Aug 16 17:06:01 2006
@@ -16,9 +16,8 @@
*/
-//Let Dojo know what to expect from this file:
Xap.provide('xap.xml.sax.EmptyDocumentException');
-// Auto-added---o.k.?
+
Xap.require("xap.xml.sax.ParserException");
Modified: incubator/xap/trunk/src/xap/xml/sax/EmptyDocumentExceptionRes.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/xml/sax/EmptyDocumentExceptionRes.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/xml/sax/EmptyDocumentExceptionRes.js (original)
+++ incubator/xap/trunk/src/xap/xml/sax/EmptyDocumentExceptionRes.js Wed Aug 16 17:06:01 2006
@@ -15,12 +15,7 @@
*
*/
-
-//Let Dojo know what to expect from this file:
Xap.provide('xap.xml.sax.EmptyDocumentExceptionRes');
-// Auto-added---o.k.?
-// TO_DO--make sure this is superfluous: Xap.require("xap.xml.sax.EmptyDocumentException");
-
/**
* @fileoverview A resource file for the xap.xml.sax.EmptyDocumentException.js.
Modified: incubator/xap/trunk/src/xap/xml/sax/ParserException.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/xml/sax/ParserException.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/xml/sax/ParserException.js (original)
+++ incubator/xap/trunk/src/xap/xml/sax/ParserException.js Wed Aug 16 17:06:01 2006
@@ -15,9 +15,9 @@
*
*/
-//Let Dojo know what to expect from this file:
+
Xap.provide('xap.xml.sax.ParserException');
-// Auto-added---o.k.?
+
Xap.require("xap.util.XapException");
Modified: incubator/xap/trunk/src/xap/xml/sax/ParserExceptionRes.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/xml/sax/ParserExceptionRes.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/xml/sax/ParserExceptionRes.js (original)
+++ incubator/xap/trunk/src/xap/xml/sax/ParserExceptionRes.js Wed Aug 16 17:06:01 2006
@@ -15,13 +15,8 @@
*
*/
-//Let Dojo know what to expect from this file:
Xap.provide('xap.xml.sax.ParserExceptionRes');
-// Auto-added---o.k.?
-// TO_DO--make sure this is superfluous: Xap.require("xap.xml.sax.ParserException");
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.events.ChangeRejectedException");
/**
Modified: incubator/xap/trunk/src/xap/xml/sax/SaxContentHandler.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/xml/sax/SaxContentHandler.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/xml/sax/SaxContentHandler.js (original)
+++ incubator/xap/trunk/src/xap/xml/sax/SaxContentHandler.js Wed Aug 16 17:06:01 2006
@@ -14,16 +14,10 @@
* limitations under the License.
*
*/
-
Xap.provide("xap.xml.sax.SaxContentHandler") ;
-Xap.provide("xap.xml.sax.SaxContentHandler.NamespaceStackFrame ") ;
-// Auto-added---o.k.?
-Xap.require("xap.xml.dom.Document");
-// Auto-added---o.k.?
+Xap.require("xap.xml.dom.Document");
Xap.require("xap.util.Hashtable");
-
-
Xap.require("xap.util.Character") ;
//TODO add an option to not auto-generate IDs
Modified: incubator/xap/trunk/src/xap/xml/xmodify/CommandDirective.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/xml/xmodify/CommandDirective.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/xml/xmodify/CommandDirective.js (original)
+++ incubator/xap/trunk/src/xap/xml/xmodify/CommandDirective.js Wed Aug 16 17:06:01 2006
@@ -15,21 +15,12 @@
*
*/
Xap.provide("xap.xml.xmodify.CommandDirective") ;
-// Auto-added---o.k.?
-Xap.require("xap.xml.xmodify.XmodifyException");
-
-// Auto-added---o.k.?
-Xap.require("xap.xml.xmodify.Xmodify");
-// Auto-added---o.k.?
+Xap.require("xap.xml.xmodify.XmodifyException");
Xap.require("xap.xml.xmodify.UpdateDirective");
-
-// Auto-added---o.k.?
Xap.require("xap.xml.dom.Document");
-
-
-
-Xap.require("google.dom");
+Xap.require("xap.util.LogFactory");
+Xap.require("google.xpath");
/**
* @fileoverview An object embodying a particular operation (e.g., <code>append</code>) to be performed
@@ -88,7 +79,7 @@
}
}
-
+xap.xml.xmodify.CommandDirective.s_log = xap.util.LogFactory.getLog( "xap.xml.xmodify.Xmodify" );
/**
* Executes this command directive against the passed-in context node---
@@ -148,7 +139,7 @@
this._handleClone(uiDocumentNode);
break;
default:
- xap.xml.xmodify.Xmodify.s_log.debug("Unhandled command : "+this._strType);
+ xap.xml.xmodify.UpdateDirective.s_log.debug("Unhandled command : "+this._strType);
} /* end switch */
} /* end execute */
@@ -211,7 +202,7 @@
var targetNodes = this._commandTargets ;
var elemsToAppend = this._commandArguments;
- xap.xml.xmodify.Xmodify.s_log.debug (
+ xap.xml.xmodify.CommandDirective.s_log.debug (
"We have "
+ elemsToAppend.length
+ " children to append to "
@@ -234,7 +225,7 @@
throw new xap.xml.xmodify.XmodifyException(xap.xml.xmodify.XmodifyException.SET_ROOT_ELEMENT_EXPECTS_ONE_ARG);
}
- xap.xml.xmodify.Xmodify.s_log.debug (
+ xap.xml.xmodify.CommandDirective.s_log.debug (
"We have 1 elem to append as new root : "
+ elemsToAppend[0]
);
@@ -257,7 +248,7 @@
}
else
{
- xap.xml.xmodify.Xmodify.s_log.debug ("Exception: " + e + " This could be because of a duplicate id issue despite deepClone"); }
+ xap.xml.xmodify.CommandDirective.s_log.debug ("Exception: " + e + " This could be because of a duplicate id issue despite deepClone"); }
}
} ;/* end for j.. */
@@ -267,7 +258,7 @@
}
} /* end for i < targetNodes.length...*/
- xap.xml.xmodify.Xmodify.s_log.debug("Post Append uIDoc: \n "
+ xap.xml.xmodify.CommandDirective.s_log.debug("Post Append uIDoc: \n "
+ this.formatDocument(uiDocumentNode)
);
@@ -325,7 +316,7 @@
}
}; /* End for */
- xap.xml.xmodify.Xmodify.s_log.debug("Post Set-Attr: \n " + this.formatDocument(uiDocumentNode) );
+ xap.xml.xmodify.CommandDirective.s_log.debug("Post Set-Attr: \n " + this.formatDocument(uiDocumentNode) );
} /* end handleSetAttribute */
@@ -342,7 +333,7 @@
var xpathRemoved = this._selectAttr;
var targetNodes = this._commandTargets ;
- xap.xml.xmodify.Xmodify.s_log.debug('removing the element at XPath : '
+ xap.xml.xmodify.CommandDirective.s_log.debug('removing the element at XPath : '
+ xpathRemoved + " Results: "
+ targetNodes.length
);
@@ -383,7 +374,7 @@
}
else if (elem.nodeType == google.DOM_TEXT_NODE)
{
- xap.xml.xmodify.Xmodify.s_log.debug ("Removing text node: "+elem.nodeValue());
+ xap.xml.xmodify.CommandDirective.s_log.debug ("Removing text node: "+elem.nodeValue());
var parent = elem.parentNode;
if (parent)
{
@@ -397,7 +388,7 @@
}; /* end for */
} catch (e) {alert(e.message);}
- xap.xml.xmodify.Xmodify.s_log.debug("Post Remove: " + this.formatDocument(uiDocumentNode));
+ xap.xml.xmodify.CommandDirective.s_log.debug("Post Remove: " + this.formatDocument(uiDocumentNode));
} /* end handleRemove */
@@ -417,7 +408,7 @@
var parentSelector = this._selectAttr;
var targetNodes = this._commandTargets ;
- xap.xml.xmodify.Xmodify.s_log.debug('Removing the children of nodes for XPath : '
+ xap.xml.xmodify.CommandDirective.s_log.debug('Removing the children of nodes for XPath : '
+ parentSelector + " Results: "
+ targetNodes.length
);
@@ -451,7 +442,7 @@
} catch (e) {
alert(e.message);
}
- xap.xml.xmodify.Xmodify.s_log.debug("Post Remove: " + this.formatDocument(uiDocumentNode));
+ xap.xml.xmodify.CommandDirective.s_log.debug("Post Remove: " + this.formatDocument(uiDocumentNode));
//xap.xml.xmodify.Xmodify.DEBUG=false ;
} /* end _handleRemoveChildren */
@@ -471,7 +462,7 @@
var attrsToRemove = this._commandArguments ;
var targetNodes = this._commandTargets ;
- xap.xml.xmodify.Xmodify.s_log.debug("Pre Remove-Attr: "+this._selectAttr+"\n " + this.formatDocument(uiDocumentNode) );
+ xap.xml.xmodify.CommandDirective.s_log.debug("Pre Remove-Attr: "+this._selectAttr+"\n " + this.formatDocument(uiDocumentNode) );
for (var i = 0; i < targetNodes.length ; i ++){
var currentNode = targetNodes[i];
@@ -503,7 +494,7 @@
}
}; // (End iterating over attribute[s] to remove.)
- xap.xml.xmodify.Xmodify.s_log.debug("Post Remove-Attr: \n " + this.formatDocument(uiDocumentNode) );
+ xap.xml.xmodify.CommandDirective.s_log.debug("Post Remove-Attr: \n " + this.formatDocument(uiDocumentNode) );
} /* end handleRemoveAttribute */
@@ -628,11 +619,11 @@
}
// Do the simple thing, at this point:
- xap.xml.xmodify.Xmodify.s_log.debug("Pre insert-before: <" + currentNode.nodeName+"/>:\n" + this.formatDocument(parent));
+ xap.xml.xmodify.CommandDirective.s_log.debug("Pre insert-before: <" + currentNode.nodeName+"/>:\n" + this.formatDocument(parent));
this._insertCommandArgumentsBefore(parent,currentNode) ;
- xap.xml.xmodify.Xmodify.s_log.debug("Post insert-before: <" + currentNode.nodeName+"/>:\n" + this.formatDocument(parent) );
+ xap.xml.xmodify.CommandDirective.s_log.debug("Post insert-before: <" + currentNode.nodeName+"/>:\n" + this.formatDocument(parent) );
//this.insertCommandArgumentsAt(index, parent, contextNode, i);
@@ -682,11 +673,11 @@
}
// Do the simple thing, at this point:
- xap.xml.xmodify.Xmodify.s_log.debug("Pre insert-after: <" + currentNode.nodeName+"/>:\n" + this.formatDocument(parent));
+ xap.xml.xmodify.CommandDirective.s_log.debug("Pre insert-after: <" + currentNode.nodeName+"/>:\n" + this.formatDocument(parent));
this._insertCommandArgumentsAfter(parent,currentNode) ;
- xap.xml.xmodify.Xmodify.s_log.debug("Post insert-after: <" + currentNode.nodeName+"/>:\n" + this.formatDocument(parent) );
+ xap.xml.xmodify.CommandDirective.s_log.debug("Post insert-after: <" + currentNode.nodeName+"/>:\n" + this.formatDocument(parent) );
//this.insertCommandArgumentsAt(index, parent, contextNode, i);
@@ -790,7 +781,7 @@
/* Throw an exception? Alert? */
}
- xap.xml.xmodify.Xmodify.s_log.debug("Pre replacement:\n" + this.formatDocument(contextNode));
+ xap.xml.xmodify.CommandDirective.s_log.debug("Pre replacement:\n" + this.formatDocument(contextNode));
for (var ii=0; ii<targetNodes.length; ++ii ) {
// unresolved argument: (arbitrary xml | String | CloneDirective |
@@ -798,18 +789,18 @@
var oldChild = targetNodes[ii] ;
// Just try it for XNode and descendants so far:
if (oldChild instanceof google.XNode || this._bHtmlDocument){
- xap.xml.xmodify.Xmodify.s_log.debug("Pre replacing <" + oldChild.nodeName+"/>:\n" + this.formatDocument(oldChild.parentNode));
+ xap.xml.xmodify.CommandDirective.s_log.debug("Pre replacing <" + oldChild.nodeName+"/>:\n" + this.formatDocument(oldChild.parentNode));
this._replaceWithCommandArguments(oldChild) ;
- xap.xml.xmodify.Xmodify.s_log.debug("Post replacing: <" + oldChild.nodeName+"/>:\n" + this.formatDocument(oldChild.parentNode) );
+ xap.xml.xmodify.CommandDirective.s_log.debug("Post replacing: <" + oldChild.nodeName+"/>:\n" + this.formatDocument(oldChild.parentNode) );
} else {
throw new xap.xml.xmodify.XmodifyException(xap.xml.xmodify.XmodifyException.CANNOT_REPLACE__ORIGINAL_INVALID,""+oldChild) ;
}
}
- xap.xml.xmodify.Xmodify.s_log.debug("Post replacement:\n" + this.formatDocument(contextNode));
+ xap.xml.xmodify.CommandDirective.s_log.debug("Post replacement:\n" + this.formatDocument(contextNode));
- //xap.xml.xmodify.Xmodify.s_log.debug("Post replacement: <" + contextNode.nodeName+"/>:\n" + this.formatDocument(contextNode) );
+ //xap.xml.xmodify.CommandDirective.s_log.debug("Post replacement: <" + contextNode.nodeName+"/>:\n" + this.formatDocument(contextNode) );
}
@@ -833,7 +824,7 @@
newChild = arrArguments[ii] ;
// Just try it for XNode and descendants so far:
if (oldChild instanceof google.XNode){
- xap.xml.xmodify.Xmodify.s_log.debug(
+ xap.xml.xmodify.CommandDirective.s_log.debug(
"Pre insertion of " + this.formatDocument(newChild)+"\nbefore\n"
+ this.formatDocument(oldChild)
+ this.formatDocument(parent)
@@ -846,13 +837,13 @@
} catch (insertionException){
throw new xap.xml.xmodify.XmodifyException(xap.xml.xmodify.XmodifyException.CANNOT_REPLACE__INSERTION,newChild.nodeName,""+insertionException);
}
- xap.xml.xmodify.Xmodify.s_log.debug(
+ xap.xml.xmodify.CommandDirective.s_log.debug(
"Post insertion of " + this.formatDocument(newChild) +"\nbefore\n"
+ this.formatDocument(oldChild)
+ this.formatDocument(parent)
) ;
} else if (this._bHtmlDocument){
- xap.xml.xmodify.Xmodify.s_log.debug(
+ xap.xml.xmodify.CommandDirective.s_log.debug(
"Pre insertion of " + this.formatDocument(newChild)+"\nbefore\n"
+ this.formatDocument(oldChild)
+ this.formatDocument(parent)
@@ -867,7 +858,7 @@
} catch (insertionException){
throw new xap.xml.xmodify.XmodifyException(xap.xml.xmodify.XmodifyException.CANNOT_REPLACE__INSERTION,newChild.nodeName,""+insertionException);
}
- xap.xml.xmodify.Xmodify.s_log.debug(
+ xap.xml.xmodify.CommandDirective.s_log.debug(
"Post insertion of " + this.formatDocument(newChild) +"\nbefore\n"
+ this.formatDocument(oldChild)
+ this.formatDocument(parent)
@@ -892,7 +883,7 @@
""+replacementException
);
} finally {
- xap.xml.xmodify.Xmodify.s_log.debug(
+ xap.xml.xmodify.CommandDirective.s_log.debug(
"Post all insertions and removals composited into replacement:"
+ '\n'+ this.formatDocument(parent)
) ;
Modified: incubator/xap/trunk/src/xap/xml/xmodify/DirectiveSet.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/xml/xmodify/DirectiveSet.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/xml/xmodify/DirectiveSet.js (original)
+++ incubator/xap/trunk/src/xap/xml/xmodify/DirectiveSet.js Wed Aug 16 17:06:01 2006
@@ -15,11 +15,9 @@
*
*/
-//Let Dojo know what to expect from this file:
Xap.provide('xap.xml.xmodify.DirectiveSet');
-// Auto-added---o.k.?
-Xap.require("xap.xml.xmodify.CommandDirective");
+Xap.require("xap.xml.xmodify.CommandDirective");
xap.xml.xmodify.DirectiveSet = function( modificationsElement ){
Modified: incubator/xap/trunk/src/xap/xml/xmodify/UpdateDirective.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/xml/xmodify/UpdateDirective.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/xml/xmodify/UpdateDirective.js (original)
+++ incubator/xap/trunk/src/xap/xml/xmodify/UpdateDirective.js Wed Aug 16 17:06:01 2006
@@ -15,15 +15,9 @@
*
*/
-//Let Dojo know what to expect from this file:
Xap.provide('xap.xml.xmodify.UpdateDirective');
-// Auto-added---o.k.?
-Xap.require("xap.xml.xmodify.XmodifyException");
-
-// Auto-added---o.k.?
-// TO_DO--make sure this is superfluous: Xap.require("xap.xml.xmodify.CommandDirective");
-
+Xap.require("xap.xml.xmodify.XmodifyException");
/**
Modified: incubator/xap/trunk/src/xap/xml/xmodify/Xmodify.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/xml/xmodify/Xmodify.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/xml/xmodify/Xmodify.js (original)
+++ incubator/xap/trunk/src/xap/xml/xmodify/Xmodify.js Wed Aug 16 17:06:01 2006
@@ -14,13 +14,14 @@
* limitations under the License.
*
*/
- Xap.provide( "xap.xml.xmodify.Xmodify" ) ;
-// Auto-added---o.k.?
-// TO_DO--make sure this is superfluous: Xap.require("xap.xml.DocumentContainer");
-
+Xap.provide( "xap.xml.xmodify.Xmodify" ) ;
+
+
+Xap.require( "xap.xml.xmodify.DirectiveSet" ) ;
+Xap.require( "xap.util.LogFactory" ) ;
/**
- * XmlUpdate provides a mechanism for performing update operations on an
+ * XModify provides a mechanism for performing update operations on an
// Auto-added---o.k.?
// TO_DO--make sure this is superfluous: Xap.require("xap.xml.DocumentContainer");
Modified: incubator/xap/trunk/src/xap/xml/xmodify/XmodifyException.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/xml/xmodify/XmodifyException.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/xml/xmodify/XmodifyException.js (original)
+++ incubator/xap/trunk/src/xap/xml/xmodify/XmodifyException.js Wed Aug 16 17:06:01 2006
@@ -15,13 +15,8 @@
*
*/
-//Let Dojo know what to expect from this file:
Xap.provide('xap.xml.xmodify.XmodifyException');
-// Auto-added---o.k.?
-Xap.require("xap.xml.xmodify.Xmodify");
-
-
//TODO this entire class needs revamp, for the time being we will leave it as is
/**
Modified: incubator/xap/trunk/src/xap/xml/xmodify/XmodifyNamespaceHandler.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/xml/xmodify/XmodifyNamespaceHandler.js?rev=432080&r1=432079&r2=432080&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/xml/xmodify/XmodifyNamespaceHandler.js (original)
+++ incubator/xap/trunk/src/xap/xml/xmodify/XmodifyNamespaceHandler.js Wed Aug 16 17:06:01 2006
@@ -14,8 +14,10 @@
* limitations under the License.
*
*/
-//Let Dojo know what to expect from this file:
+
+
Xap.provide('xap.xml.xmodify.XmodifyNamespaceHandler');
+
Xap.require("xap.xml.xmodify.Xmodify");