Author: [email protected]
Date: Mon Jan 12 11:54:43 2009
New Revision: 4428
Modified:
releases/1.6/dev/core/src/com/google/gwt/dev/HostedMode.java
Log:
Just do a full link initially; fixes a problem where CSS/scripts was not
being generated into the initial selection script.
Issue: 3264
Modified: releases/1.6/dev/core/src/com/google/gwt/dev/HostedMode.java
==============================================================================
--- releases/1.6/dev/core/src/com/google/gwt/dev/HostedMode.java
(original)
+++ releases/1.6/dev/core/src/com/google/gwt/dev/HostedMode.java Mon Jan
12
11:54:43 2009
@@ -342,7 +342,7 @@
+ "'; add servlet tags to your web.xml instead");
}
- link(loadLogger, module, false);
+ link(loadLogger, module);
} catch (UnableToCompleteException e) {
// Already logged.
return false;
@@ -396,7 +396,7 @@
shouldRefreshPage = true;
module = loadModule(getTopLogger(), module.getCanonicalName(),
false);
}
- link(getTopLogger(), module, true);
+ link(getTopLogger(), module);
return shouldRefreshPage;
} catch (UnableToCompleteException e) {
// Already logged.
@@ -425,8 +425,8 @@
* the link, otherwise do not include them
* @throws UnableToCompleteException
*/
- private void link(TreeLogger logger, ModuleDef module,
- boolean includePublicFiles) throws UnableToCompleteException {
+ private void link(TreeLogger logger, ModuleDef module)
+ throws UnableToCompleteException {
// TODO: move the module-specific computations to a helper function.
File moduleOutDir = new File(options.getWarDir(), module.getName());
File moduleExtraDir = (options.getExtraDir() == null) ? null : new
File(
@@ -436,10 +436,6 @@
StandardLinkerContext linkerStack = new StandardLinkerContext(logger,
module, options);
linkerStacks.put(module.getName(), linkerStack);
-
- if (!includePublicFiles) {
- linkerStack.getArtifacts().clear();
- }
ArtifactSet artifacts = linkerStack.invokeLink(logger);
linkerStack.produceOutputDirectory(logger, artifacts, moduleOutDir,
--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---
