From 40ced904cfdaf5fcd813112f7c72106fa77c4c46 Mon Sep 17 00:00:00 2001 From: lresende Date: Thu, 29 Apr 2010 18:19:19 +0000 Subject: Reverting changes from #939029 to avoid issues with implementation widget and making store sample working again git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@939423 13f79535-47bb-0310-9956-ffa450edef68 --- .../dojo/DojoJavaScriptComponentGeneratorImpl.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'sca-java-2.x/trunk/modules/implementation-widget-runtime-dojo/src/main/java/org/apache') diff --git a/sca-java-2.x/trunk/modules/implementation-widget-runtime-dojo/src/main/java/org/apache/tuscany/sca/implementation/widget/dojo/DojoJavaScriptComponentGeneratorImpl.java b/sca-java-2.x/trunk/modules/implementation-widget-runtime-dojo/src/main/java/org/apache/tuscany/sca/implementation/widget/dojo/DojoJavaScriptComponentGeneratorImpl.java index 3a14c99030..84c138bef7 100644 --- a/sca-java-2.x/trunk/modules/implementation-widget-runtime-dojo/src/main/java/org/apache/tuscany/sca/implementation/widget/dojo/DojoJavaScriptComponentGeneratorImpl.java +++ b/sca-java-2.x/trunk/modules/implementation-widget-runtime-dojo/src/main/java/org/apache/tuscany/sca/implementation/widget/dojo/DojoJavaScriptComponentGeneratorImpl.java @@ -183,10 +183,10 @@ public class DojoJavaScriptComponentGeneratorImpl implements ComponentJavaScript 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 DojoJavaScriptComponentGeneratorImpl implements ComponentJavaScript * @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 DojoJavaScriptComponentGeneratorImpl implements ComponentJavaScript */ 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 DojoJavaScriptComponentGeneratorImpl implements ComponentJavaScript 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("}"); } -- cgit v1.2.3