Revision: 9859
Author: unn...@google.com
Date: Wed Mar 16 11:12:59 2011
Log: Make devmode.js have a module specific filename

Review by: j...@google.com
http://code.google.com/p/google-web-toolkit/source/detail?r=9859

Modified:
 /trunk/dev/core/src/com/google/gwt/core/linker/CrossSiteIframeLinker.java

=======================================
--- /trunk/dev/core/src/com/google/gwt/core/linker/CrossSiteIframeLinker.java Fri Mar 11 13:16:30 2011 +++ /trunk/dev/core/src/com/google/gwt/core/linker/CrossSiteIframeLinker.java Wed Mar 16 11:12:59 2011
@@ -121,7 +121,7 @@
     }
     replaceAll(ss, "__MODULE_FUNC__", context.getModuleFunctionName());
     replaceAll(ss, "__MODULE_NAME__", context.getModuleName());
-    replaceAll(ss, "__HOSTED_FILENAME__", getHostedFilename());
+    replaceAll(ss, "__HOSTED_FILENAME__", getHostedFilenameFull(context));

     return ss.toString();
   }
@@ -135,6 +135,10 @@
   protected String getHostedFilename() {
     return "devmode.js";
   }
+
+  protected String getHostedFilenameFull(LinkerContext context) {
+    return context.getModuleName() + "." + getHostedFilename();
+  }

   protected String getJsComputeScriptBase(LinkerContext context) {
     return "com/google/gwt/core/ext/linker/impl/computeScriptBase.js";
@@ -266,7 +270,15 @@

     String outputFilename = filename;
     if (result != null) {
+ // If we're including bootstrap in the primary fragment, we generate a
+      // devmode.js for each permutation, and it's name is XXX.devmode.js,
+      // where XXX is the md5 hash for this permutation
       outputFilename = result.getStrongName() + "." + outputFilename;
+    } else {
+ // If we're not including bootstrap in the primary fragment, we generate + // a devmode.js for this module and it's name is XXX.devmode.js, where
+      // XXX is the module name.
+      outputFilename = getHostedFilenameFull(context);
     }

     String script =

--
http://groups.google.com/group/Google-Web-Toolkit-Contributors

Reply via email to