You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2010/04/29 20:19:19 UTC
svn commit: r939423 -
/tuscany/sca-java-2.x/trunk/modules/implementation-widget-runtime-dojo/src/main/java/org/apache/tuscany/sca/implementation/widget/dojo/DojoJavaScriptComponentGeneratorImpl.java
Author: lresende
Date: Thu Apr 29 18:19:19 2010
New Revision: 939423
URL: http://svn.apache.org/viewvc?rev=939423&view=rev
Log:
Reverting changes from #939029 to avoid issues with implementation widget and making store sample working again
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-widget-runtime-dojo/src/main/java/org/apache/tuscany/sca/implementation/widget/dojo/DojoJavaScriptComponentGeneratorImpl.java
Modified: tuscany/sca-java-2.x/trunk/modules/implementation-widget-runtime-dojo/src/main/java/org/apache/tuscany/sca/implementation/widget/dojo/DojoJavaScriptComponentGeneratorImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-widget-runtime-dojo/src/main/java/org/apache/tuscany/sca/implementation/widget/dojo/DojoJavaScriptComponentGeneratorImpl.java?rev=939423&r1=939422&r2=939423&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/implementation-widget-runtime-dojo/src/main/java/org/apache/tuscany/sca/implementation/widget/dojo/DojoJavaScriptComponentGeneratorImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/implementation-widget-runtime-dojo/src/main/java/org/apache/tuscany/sca/implementation/widget/dojo/DojoJavaScriptComponentGeneratorImpl.java Thu Apr 29 18:19:19 2010
@@ -183,10 +183,10 @@ public class DojoJavaScriptComponentGene
pw.println("if (!window.tuscany) { \n" +
"window.tuscany = {}; \n" +
"}");
- pw.println("var tuscany = window.tuscany;");
+ pw.println("var __tuscany = window.tuscany;");
- pw.println("if (!tuscany.sca) { \n" +
- "tuscany.sca = {}; \n" +
+ pw.println("if (!__tuscany .sca) { \n" +
+ "__tuscany .sca = {}; \n" +
"}");
}
@@ -197,15 +197,15 @@ public class DojoJavaScriptComponentGene
* @throws IOException
*/
private static void generateJavaScriptPropertyFunction(RuntimeComponent component, PrintWriter pw) throws IOException {
- pw.println("tuscany.sca.propertyMap = {};");
+ pw.println("__tuscany.sca.propertyMap = {};");
for(ComponentProperty property : component.getProperties()) {
String propertyName = property.getName();
- pw.println("tuscany.sca.propertyMap." + propertyName + " = new String(\"" + getPropertyValue(property) + "\");");
+ pw.println("__tuscany.sca.propertyMap." + propertyName + " = new String(\"" + getPropertyValue(property) + "\");");
}
pw.println("tuscany.sca.Property = function (name) {");
- pw.println(" return tuscany.sca.propertyMap[name];");
+ pw.println(" return __tuscany.sca.propertyMap[name];");
pw.println("}");
}
@@ -238,7 +238,7 @@ public class DojoJavaScriptComponentGene
*/
private static void generateJavaScriptReferenceFunction (RuntimeComponent component, JavascriptProxyFactoryExtensionPoint javascriptProxyFactories, PrintWriter pw) throws IOException {
- pw.println("tuscany.sca.referenceMap = {};");
+ pw.println("__tuscany.sca.referenceMap = {};");
for(ComponentReference reference : component.getReferences()) {
for(EndpointReference epr : reference.getEndpointReferences()) {
Endpoint targetEndpoint = epr.getTargetEndpoint();
@@ -254,13 +254,13 @@ public class DojoJavaScriptComponentGene
String referenceName = reference.getName();
JavascriptProxyFactory jsProxyFactory = javascriptProxyFactories.getProxyFactory(binding.getClass());
- pw.println("tuscany.sca.referenceMap." + referenceName + " = new " + jsProxyFactory.createJavascriptReference(reference) + ";");
+ pw.println("__tuscany.sca.referenceMap." + referenceName + " = new " + jsProxyFactory.createJavascriptReference(reference) + ";");
}
}
}
pw.println("tuscany.sca.Reference = function (name) {");
- pw.println(" return tuscany.sca.referenceMap[name];");
+ pw.println(" return __tuscany.sca.referenceMap[name];");
pw.println("}");
}