incubator-xap-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmarga...@apache.org
Subject svn commit: r463853 - in /incubator/xap/trunk/src/xap/data: bridge/ controller/
Date Fri, 13 Oct 2006 22:22:46 GMT
Author: jmargaris
Date: Fri Oct 13 15:22:45 2006
New Revision: 463853

URL: http://svn.apache.org/viewvc?view=rev&rev=463853
Log:
fixes for wrong path to XmlDataTokens

Modified:
    incubator/xap/trunk/src/xap/data/bridge/BindingBridge.js
    incubator/xap/trunk/src/xap/data/bridge/DataAttributeConverter.js
    incubator/xap/trunk/src/xap/data/bridge/DataSourceBridge.js
    incubator/xap/trunk/src/xap/data/bridge/DecimalFormatterBridge.js
    incubator/xap/trunk/src/xap/data/bridge/FormatterChainBridge.js
    incubator/xap/trunk/src/xap/data/bridge/JavascriptDataSourceBridge.js
    incubator/xap/trunk/src/xap/data/bridge/JsonDataSourceBridge.js
    incubator/xap/trunk/src/xap/data/bridge/MessageFormatterBridge.js
    incubator/xap/trunk/src/xap/data/bridge/ObjectDataSourceBridge.js
    incubator/xap/trunk/src/xap/data/controller/BindingResolver.js

Modified: incubator/xap/trunk/src/xap/data/bridge/BindingBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/data/bridge/BindingBridge.js?view=diff&rev=463853&r1=463852&r2=463853
==============================================================================
--- incubator/xap/trunk/src/xap/data/bridge/BindingBridge.js (original)
+++ incubator/xap/trunk/src/xap/data/bridge/BindingBridge.js Fri Oct 13 15:22:45 2006
@@ -24,7 +24,7 @@
 Xap.require("xap.data.datasource.DataSourceImpl");
 Xap.require("xap.data.formatter.JsFormatterImpl");
 Xap.require("xap.xml.dom.XapElement");
-Xap.require("xap.data.XmlDataTokens") ;
+Xap.require("xap.data.bridge.XmlDataTokens") ;
 Xap.require("xap.data.bridge.DataAttributeConverter") ;
 
 
@@ -46,17 +46,17 @@
 
 	//get all the relevant strings
 	/*String*/
-	var select = me.getAttribute(xap.data.XmlDataTokens.SELECT);
+	var select = me.getAttribute(xap.data.bridge.XmlDataTokens.SELECT);
 	/*String*/
-	var id = me.getAttribute(xap.data.XmlDataTokens.ID);
+	var id = me.getAttribute(xap.data.bridge.XmlDataTokens.ID);
 	/*String*/
-	var dataSourceId = me.getAttribute(xap.data.XmlDataTokens.DATA_SOURCE);
+	var dataSourceId = me.getAttribute(xap.data.bridge.XmlDataTokens.DATA_SOURCE);
 	/*String*/
-	var formatter = me.getAttribute(xap.data.XmlDataTokens.FORMATTER);
+	var formatter = me.getAttribute(xap.data.bridge.XmlDataTokens.FORMATTER);
 	/*String*/
-	var bindingTypeString = me.getAttribute(xap.data.XmlDataTokens.BINDING_TYPE);
+	var bindingTypeString = me.getAttribute(xap.data.bridge.XmlDataTokens.BINDING_TYPE);
 	/*String*/
-	var defaultValue = me.getAttribute(xap.data.XmlDataTokens.DEFAULT_VALUE);
+	var defaultValue = me.getAttribute(xap.data.bridge.XmlDataTokens.DEFAULT_VALUE);
 	if (defaultValue == null) {
 		defaultValue = "";
 	}
@@ -70,7 +70,7 @@
 			bindingType = xap.data.DataAQttributeConverter.toBindingType(bindingTypeString);
 		}
 		catch (e) {//AttributeConversionException 
-			this.reportInvalidXmlException(xap.data.XmlDataTokens.BINDING_TYPE, bindingTypeString,
me, e);
+			this.reportInvalidXmlException(xap.data.bridge.XmlDataTokens.BINDING_TYPE, bindingTypeString,
me, e);
 		}
 	}
 	/*Binding*/
@@ -86,7 +86,7 @@
 		(this.getDataService()).getBindingContainer().addBinding(id, binding);
 	}
 	catch (e) { //AttributeConversionException 
-		this.reportInvalidXmlException(xap.data.XmlDataTokens.DATA_SOURCE, dataSourceId, me, e);
+		this.reportInvalidXmlException(xap.data.bridge.XmlDataTokens.DATA_SOURCE, dataSourceId,
me, e);
 	}
 
 	//if we got to this point OK, add the formatter
@@ -115,7 +115,7 @@
 		binding.setFormatter(f);
 	}
 	catch (e) { //AttributeConversionException
-		this.reportInvalidXmlException(xap.data.XmlDataTokens.FORMATTER, formatter, this.getElement(),
e);
+		this.reportInvalidXmlException(xap.data.bridge.XmlDataTokens.FORMATTER, formatter, this.getElement(),
e);
 	}
 };
 

Modified: incubator/xap/trunk/src/xap/data/bridge/DataAttributeConverter.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/data/bridge/DataAttributeConverter.js?view=diff&rev=463853&r1=463852&r2=463853
==============================================================================
--- incubator/xap/trunk/src/xap/data/bridge/DataAttributeConverter.js (original)
+++ incubator/xap/trunk/src/xap/data/bridge/DataAttributeConverter.js Fri Oct 13 15:22:45
2006
@@ -21,7 +21,7 @@
 Xap.require("xap.data.DataServiceImpl");
 Xap.require("xap.data.controller.BindingType");
 Xap.require("xap.data.datasource.DataSourceImpl");
-Xap.require("xap.data.XmlDataTokens");
+Xap.require("xap.data.bridge.XmlDataTokens");
 Xap.require("xap.data.formatter.JsFormatterImpl") 
 
 
@@ -59,7 +59,7 @@
 		dataSource = dataService.getDataSourceContainer().getDataSource(s);
 	}
 	if (!dataSource) {
-		throw new xap.taghandling.AttributeConversionException(s, xap.data.XmlDataTokens.DATA_SOURCE,
null);
+		throw new xap.taghandling.AttributeConversionException(s, xap.data.bridge.XmlDataTokens.DATA_SOURCE,
null);
 	}
 	return dataSource;
 };
@@ -80,7 +80,7 @@
 		formatter = dataService.getFormatterContainer().getFormatter(s);
 	}
 	if (formatter == null) {
-		throw new xap.taghandling.AttributeConversionException(s, xap.data.XmlDataTokens.FORMATTER,
null);
+		throw new xap.taghandling.AttributeConversionException(s, xap.data.bridge.XmlDataTokens.FORMATTER,
null);
 	}
 	return formatter;
 };

Modified: incubator/xap/trunk/src/xap/data/bridge/DataSourceBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/data/bridge/DataSourceBridge.js?view=diff&rev=463853&r1=463852&r2=463853
==============================================================================
--- incubator/xap/trunk/src/xap/data/bridge/DataSourceBridge.js (original)
+++ incubator/xap/trunk/src/xap/data/bridge/DataSourceBridge.js Fri Oct 13 15:22:45 2006
@@ -30,7 +30,7 @@
 Xap.require("xap.util.LogFactory"); 
 //Xap.require("xap.util.ResourceDictionary") ; 
 Xap.require("xap.util.UidProvider");
-Xap.require("xap.data.XmlDataTokens") ;
+Xap.require("xap.data.bridge.XmlDataTokens") ;
 
 
 /**
@@ -126,7 +126,7 @@
  * @throws InitializationException
  */
 xap.data.bridge.DataSourceBridge.prototype.initializeDataSource = function () {
-	//							   xap.data.XmlDataTokens.ID
+	//							   xap.data.bridge.XmlDataTokens.ID
 	var id = this.getElement().getAttribute("id");
 	
 //	if ( id.startsWith( xap.util.UidProvider.XAP_ID_PREFIX )) {
@@ -149,7 +149,7 @@
  * to return their own dataSource implementations.
  */
 xap.data.bridge.DataSourceBridge.prototype.createDataSource = function () {
-	var className = this.getElement().getAttribute( xap.data.XmlDataTokens.CLASS );
+	var className = this.getElement().getAttribute( xap.data.bridge.XmlDataTokens.CLASS );
 	/*DataSource*/
 	var dataSource = null;
 	try {
@@ -159,7 +159,7 @@
 	}
 	catch (e) {
 	//		AttributeConversionException
-	//		reportInvalidXmlException(xap.data.XmlDataTokens.CLASS,
+	//		reportInvalidXmlException(xap.data.bridge.XmlDataTokens.CLASS,
 	//		className,getElement(),e);
 		throw new xap.util.Exception(e);
 	}

Modified: incubator/xap/trunk/src/xap/data/bridge/DecimalFormatterBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/data/bridge/DecimalFormatterBridge.js?view=diff&rev=463853&r1=463852&r2=463853
==============================================================================
--- incubator/xap/trunk/src/xap/data/bridge/DecimalFormatterBridge.js (original)
+++ incubator/xap/trunk/src/xap/data/bridge/DecimalFormatterBridge.js Fri Oct 13 15:22:45
2006
@@ -48,7 +48,7 @@
 **/
 xap.data.bridge.DecimalFormatterBridge.prototype.createFormatter = function () {
 	/*String*/
-	var className = this.getElement().getAttribute(xap.data.XmlDataTokens.CLASS);
+	var className = this.getElement().getAttribute(xap.data.bridge.XmlDataTokens.CLASS);
 
 	/*DecimalFormatter*/
 	var formatter = null;

Modified: incubator/xap/trunk/src/xap/data/bridge/FormatterChainBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/data/bridge/FormatterChainBridge.js?view=diff&rev=463853&r1=463852&r2=463853
==============================================================================
--- incubator/xap/trunk/src/xap/data/bridge/FormatterChainBridge.js (original)
+++ incubator/xap/trunk/src/xap/data/bridge/FormatterChainBridge.js Fri Oct 13 15:22:45 2006
@@ -67,7 +67,7 @@
 //			}
 	}
 	catch (e) { // AttributeConversionException
-		this.reportInvalidXmlException(xap.data.XmlDataTokens.CLASS, className, this.getElement(),
e);
+		this.reportInvalidXmlException(xap.data.bridge.XmlDataTokens.CLASS, className, this.getElement(),
e);
 	}
 	return formatter;
 };

Modified: incubator/xap/trunk/src/xap/data/bridge/JavascriptDataSourceBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/data/bridge/JavascriptDataSourceBridge.js?view=diff&rev=463853&r1=463852&r2=463853
==============================================================================
--- incubator/xap/trunk/src/xap/data/bridge/JavascriptDataSourceBridge.js (original)
+++ incubator/xap/trunk/src/xap/data/bridge/JavascriptDataSourceBridge.js Fri Oct 13 15:22:45
2006
@@ -32,7 +32,7 @@
 // /Xap.require("xap.util.ResourceDictionary") ; 
 Xap.require("xap.xml.dom.XapElement");
 Xap.require("xap.data.bridge.DataSourceBridge");
-Xap.require("xap.data.XmlDataTokens") ;
+Xap.require("xap.data.bridge.XmlDataTokens") ;
 
 
 
@@ -87,7 +87,7 @@
 		dataSource = this.createNewDataSource() ;		
 	}
 	catch (e) { //AttributeConversionException
-//		this.reportInvalidXmlException( xap.data.XmlDataTokens.CLASS, className,
+//		this.reportInvalidXmlException( xap.data.bridge.XmlDataTokens.CLASS, className,
 //								  this.getElement(), e );
 			// TODO: Restore better exception handling
 		throw new xap.util.XapException(e);

Modified: incubator/xap/trunk/src/xap/data/bridge/JsonDataSourceBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/data/bridge/JsonDataSourceBridge.js?view=diff&rev=463853&r1=463852&r2=463853
==============================================================================
--- incubator/xap/trunk/src/xap/data/bridge/JsonDataSourceBridge.js (original)
+++ incubator/xap/trunk/src/xap/data/bridge/JsonDataSourceBridge.js Fri Oct 13 15:22:45 2006
@@ -31,7 +31,7 @@
 // /Xap.require("xap.util.ResourceDictionary") ; 
 Xap.require("xap.xml.dom.XapElement");
 Xap.require("xap.data.bridge.DataSourceBridge");
-Xap.require("xap.data.XmlDataTokens") ;
+Xap.require("xap.data.bridge.XmlDataTokens") ;
 
 
 

Modified: incubator/xap/trunk/src/xap/data/bridge/MessageFormatterBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/data/bridge/MessageFormatterBridge.js?view=diff&rev=463853&r1=463852&r2=463853
==============================================================================
--- incubator/xap/trunk/src/xap/data/bridge/MessageFormatterBridge.js (original)
+++ incubator/xap/trunk/src/xap/data/bridge/MessageFormatterBridge.js Fri Oct 13 15:22:45
2006
@@ -48,7 +48,7 @@
 **/
 xap.data.bridge.MessageFormatterBridge.prototype.createFormatter = function () {
 	/*String*/
-	var className = this.getElement().getAttribute(xap.data.XmlDataTokens.CLASS);
+	var className = this.getElement().getAttribute(xap.data.bridge.XmlDataTokens.CLASS);
 
 	/*MessageFormatter*/
 	var formatter = null;

Modified: incubator/xap/trunk/src/xap/data/bridge/ObjectDataSourceBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/data/bridge/ObjectDataSourceBridge.js?view=diff&rev=463853&r1=463852&r2=463853
==============================================================================
--- incubator/xap/trunk/src/xap/data/bridge/ObjectDataSourceBridge.js (original)
+++ incubator/xap/trunk/src/xap/data/bridge/ObjectDataSourceBridge.js Fri Oct 13 15:22:45
2006
@@ -29,7 +29,7 @@
 // /Xap.require("xap.util.ResourceDictionary") ; 
 Xap.require("xap.xml.dom.XapElement") ; 
 Xap.require("xap.data.bridge.DataSourceBridge") ;
-Xap.require("xap.data.XmlDataTokens") ;
+Xap.require("xap.data.bridge.XmlDataTokens") ;
 
 
 /**
@@ -65,7 +65,7 @@
 //protected DataSource
 xap.data.bridge.ObjectDataSourceBridge.prototype.createDataSource = function() {
     /*String*/
-    var className =this.getElement().getAttribute( xap.data.XmlDataTokens.CLASS );
+    var className =this.getElement().getAttribute( xap.data.bridge.XmlDataTokens.CLASS );
     /*DataSource*/
     var dataSource = null;
     try {
@@ -77,7 +77,7 @@
             dataSource = null ; //new ObjectDataSource();
 //        }
     } catch (e) { //AttributeConversionException
-//        this.reportInvalidXmlException( xap.data.XmlDataTokens.CLASS, className,
+//        this.reportInvalidXmlException( xap.data.bridge.XmlDataTokens.CLASS, className,
 //                                  this.getElement(), e );
 			// TODO: Restore better exception handling
 			throw new xap.util.XapException(e) ;

Modified: incubator/xap/trunk/src/xap/data/controller/BindingResolver.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/data/controller/BindingResolver.js?view=diff&rev=463853&r1=463852&r2=463853
==============================================================================
--- incubator/xap/trunk/src/xap/data/controller/BindingResolver.js (original)
+++ incubator/xap/trunk/src/xap/data/controller/BindingResolver.js Fri Oct 13 15:22:45 2006
@@ -153,12 +153,12 @@
 						parameterValue = curToken.toString().trim();
 					}
 				}
-				if (xap.data.XmlDataTokens.FORMATTER == parameterName ) {
+				if (xap.data.bridge.XmlDataTokens.FORMATTER == parameterName ) {
 					if (parameterValue != null) {
 						formatter = dataService.getFormatterContainer().getFormatter(parameterValue);
 					}
 				} else {
-					if (xap.data.XmlDataTokens.BINDING_TYPE == parameterName ) {
+					if (xap.data.bridge.XmlDataTokens.BINDING_TYPE == parameterName ) {
 						if (parameterValue != null) {
 							bindType = xap.data.controller.BindingType.getBindingType(parameterValue);
 							if (bindType == null) {
@@ -168,15 +168,15 @@
 							}
 						}
 					} else {
-						if (xap.data.XmlDataTokens.SELECT == parameterName ) {
+						if (xap.data.bridge.XmlDataTokens.SELECT == parameterName ) {
 							select = parameterValue;
 						} else {
-							if (xap.data.XmlDataTokens.DATA_SOURCE == parameterName ) {
+							if (xap.data.bridge.XmlDataTokens.DATA_SOURCE == parameterName ) {
 								if (parameterValue != null) {
 									dataSource = parameterValue;
 								}
 							} else {
-								if (xap.data.XmlDataTokens.DEFAULT_VALUE == parameterName ) {
+								if (xap.data.bridge.XmlDataTokens.DEFAULT_VALUE == parameterName ) {
 									defaultValue = parameterValue;
 								}
 							}



Mime
View raw message