incubator-xap-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmarga...@apache.org
Subject svn commit: r476366 - in /incubator/xap/trunk/src/xap/data: DataFramework.js bridge/DataFrameworkBridge.js bridge/DataSourceBridge.js bridge/JavascriptDataSourceBridge.js bridge/ObjectDataSourceBridge.js bridge/SimpleDocumentDataSourceBridge.js
Date Fri, 17 Nov 2006 23:31:15 GMT
Author: jmargaris
Date: Fri Nov 17 15:31:13 2006
New Revision: 476366

URL: http://svn.apache.org/viewvc?view=rev&rev=476366
Log:
iterating over a documentdatasource with initial xml was not working

Modified:
    incubator/xap/trunk/src/xap/data/DataFramework.js
    incubator/xap/trunk/src/xap/data/bridge/DataFrameworkBridge.js
    incubator/xap/trunk/src/xap/data/bridge/DataSourceBridge.js
    incubator/xap/trunk/src/xap/data/bridge/JavascriptDataSourceBridge.js
    incubator/xap/trunk/src/xap/data/bridge/ObjectDataSourceBridge.js
    incubator/xap/trunk/src/xap/data/bridge/SimpleDocumentDataSourceBridge.js

Modified: incubator/xap/trunk/src/xap/data/DataFramework.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/data/DataFramework.js?view=diff&rev=476366&r1=476365&r2=476366
==============================================================================
--- incubator/xap/trunk/src/xap/data/DataFramework.js (original)
+++ incubator/xap/trunk/src/xap/data/DataFramework.js Fri Nov 17 15:31:13 2006
@@ -51,7 +51,6 @@
  *
 **/
 xap.data.DataFramework = function(sess) {
-	// alert("created data framework") ;
 	this._session = sess;
 	this._dataSourceContainer = new xap.data.datasource.DataSourceContainerImpl(sess);
 	this._bindingContainer = new xap.session.Container(sess);

Modified: incubator/xap/trunk/src/xap/data/bridge/DataFrameworkBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/data/bridge/DataFrameworkBridge.js?view=diff&rev=476366&r1=476365&r2=476366
==============================================================================
--- incubator/xap/trunk/src/xap/data/bridge/DataFrameworkBridge.js (original)
+++ incubator/xap/trunk/src/xap/data/bridge/DataFrameworkBridge.js Fri Nov 17 15:31:13 2006
@@ -28,9 +28,7 @@
  * @author JMargaris
  */
 xap.data.bridge.DataFrameworkBridge = function () {
-//alert("DataFrameworkBridge start") ;
 	xap.taghandling.AbstractTagImpl.call(this);
-//alert("DataFrameworkBridge stop") ;	
 };
 Xap.setupClassAsSubclassOf("xap.data.bridge.DataFrameworkBridge", "xap.taghandling.AbstractTagImpl");
 	

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=476366&r1=476365&r2=476366
==============================================================================
--- incubator/xap/trunk/src/xap/data/bridge/DataSourceBridge.js (original)
+++ incubator/xap/trunk/src/xap/data/bridge/DataSourceBridge.js Fri Nov 17 15:31:13 2006
@@ -48,9 +48,7 @@
  * @author dgennaco
  */
 xap.data.bridge.DataSourceBridge = function () {
-	//alert("DataSourceBridge start") ;
 	xap.data.bridge.DataFrameworkBridge.call(this);
-	//alert("DataSourceBridge stop") ;
 };
 Xap.setupClassAsSubclassOf("xap.data.bridge.DataSourceBridge", "xap.data.bridge.DataFrameworkBridge");
 xap.data.bridge.DataSourceBridge.SOURCE_ATTRIBUTE = "source";

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=476366&r1=476365&r2=476366
==============================================================================
--- incubator/xap/trunk/src/xap/data/bridge/JavascriptDataSourceBridge.js (original)
+++ incubator/xap/trunk/src/xap/data/bridge/JavascriptDataSourceBridge.js Fri Nov 17 15:31:13
2006
@@ -43,9 +43,7 @@
  * @author mturyn 
  */
 xap.data.bridge.JavascriptDataSourceBridge = function(){
-	//alert("JavascriptDataSourceBridge() start");
 	xap.data.bridge.DataSourceBridge.call(this);
-	//alert("JavascriptDataSourceBridge() end");
 };
 
 Xap.setupClassAsSubclassOf("xap.data.bridge.JavascriptDataSourceBridge", "xap.data.bridge.DataSourceBridge");

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=476366&r1=476365&r2=476366
==============================================================================
--- incubator/xap/trunk/src/xap/data/bridge/ObjectDataSourceBridge.js (original)
+++ incubator/xap/trunk/src/xap/data/bridge/ObjectDataSourceBridge.js Fri Nov 17 15:31:13
2006
@@ -39,9 +39,7 @@
  * @author ikaplansky
  */
 xap.data.bridge.ObjectDataSourceBridge = function () {
-//	alert("ObjectDataSourceBridge() start") ;
 	xap.data.bridge.DataSourceBridge.call(this) ;
-//	alert("ObjectDataSourceBridge() end") ;
 };
  
 Xap.setupClassAsSubclassOf("xap.data.bridge.ObjectDataSourceBridge","xap.data.bridge.DataSourceBridge")
;

Modified: incubator/xap/trunk/src/xap/data/bridge/SimpleDocumentDataSourceBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/data/bridge/SimpleDocumentDataSourceBridge.js?view=diff&rev=476366&r1=476365&r2=476366
==============================================================================
--- incubator/xap/trunk/src/xap/data/bridge/SimpleDocumentDataSourceBridge.js (original)
+++ incubator/xap/trunk/src/xap/data/bridge/SimpleDocumentDataSourceBridge.js Fri Nov 17 15:31:13
2006
@@ -44,17 +44,10 @@
 	
 //protected DataSource
 xap.data.bridge.SimpleDocumentDataSourceBridge.prototype.createDataSource = function () {
-	/*String*/
-	var uri = this.getElement().getAttribute(xap.data.bridge.DataSourceBridge.SOURCE_ATTRIBUTE);
 	/*DataSource*/
 	var dataSource = null;
 	try {
 		dataSource = new xap.data.datasource.SimpleDocumentDataSource(this);
-		if (uri){
-			
-			//IMPORTANT handle a case like mco:myMco.getDocument()
-			dataSource.loadSourceFromServer(uri);
-		}
 	}
 	catch (e) { //AttributeConversionException
 //		this.reportInvalidXmlException( xap.data.bridge.XmlDataTokens.CLASS, className,
@@ -63,5 +56,17 @@
 		throw new xap.util.XapException("Error creating a SimpleDocumentDataSource instance:\n"
+ e);
 	}
 	return dataSource;
+};
+
+xap.data.bridge.SimpleDocumentDataSourceBridge.prototype.processConfigurationElement = function(){
+	//IMPORTANT overridden for now because superclass logic is strange
+}
+
+xap.data.bridge.SimpleDocumentDataSourceBridge.prototype.initializeDataSource = function
() {
+	xap.data.bridge.JavascriptDataSourceBridge.prototype.initializeDataSource.call(this);
+	var uri = this.getElement().getAttribute(xap.data.bridge.DataSourceBridge.SOURCE_ATTRIBUTE);
+	if (uri){
+		this._dataSource.loadSourceFromServer(uri);
+	}
 };
 



Mime
View raw message