Revision: 9161
Author: [email protected]
Date: Thu Oct 28 08:33:32 2010
Log: Fix issue with SSSS not getting stylesheets
Review at http://gwt-code-reviews.appspot.com/1059801
http://code.google.com/p/google-web-toolkit/source/detail?r=9161
Modified:
/trunk/dev/core/src/com/google/gwt/core/ext/linker/impl/SelectionScriptLinker.java
/trunk/dev/core/src/com/google/gwt/core/linker/CrossSiteIframeLinker.java
/trunk/dev/core/src/com/google/gwt/core/linker/IFrameLinker.java
/trunk/dev/core/src/com/google/gwt/core/linker/SingleScriptLinker.java
=======================================
---
/trunk/dev/core/src/com/google/gwt/core/ext/linker/impl/SelectionScriptLinker.java
Tue Oct 12 16:00:43 2010
+++
/trunk/dev/core/src/com/google/gwt/core/ext/linker/impl/SelectionScriptLinker.java
Thu Oct 28 08:33:32 2010
@@ -115,7 +115,7 @@
* called from the legacy link method.
*/
for (CompilationResult compilation :
toReturn.find(CompilationResult.class)) {
- toReturn.addAll(doEmitCompilation(logger, context, compilation));
+ toReturn.addAll(doEmitCompilation(logger, context, compilation,
artifacts));
}
return toReturn;
} else {
@@ -137,11 +137,11 @@
}
protected Collection<Artifact<?>> doEmitCompilation(TreeLogger logger,
- LinkerContext context, CompilationResult result)
+ LinkerContext context, CompilationResult result, ArtifactSet
artifacts)
throws UnableToCompleteException {
String[] js = result.getJavaScript();
byte[][] bytes = new byte[js.length][];
- bytes[0] = generatePrimaryFragment(logger, context, result, js);
+ bytes[0] = generatePrimaryFragment(logger, context, result, js,
artifacts);
for (int i = 1; i < js.length; i++) {
bytes[i] = Util.getBytes(generateDeferredFragment(logger, context, i,
js[i]));
@@ -227,22 +227,23 @@
* {...@link #getModuleSuffix(TreeLogger, LinkerContext)}.
*/
protected byte[] generatePrimaryFragment(TreeLogger logger,
- LinkerContext context, CompilationResult result, String[] js)
- throws UnableToCompleteException {
+ LinkerContext context, CompilationResult result, String[] js,
+ ArtifactSet artifacts) throws UnableToCompleteException {
TextOutput to = new DefaultTextOutput(context.isOutputCompact());
to.print(generatePrimaryFragmentString(
- logger, context, result.getStrongName(), js[0], js.length));
+ logger, context, result.getStrongName(), js[0], js.length,
artifacts));
return Util.getBytes(to.toString());
}
protected String generatePrimaryFragmentString(TreeLogger logger,
- LinkerContext context, String strongName, String js, int length)
+ LinkerContext context, String strongName, String js, int length,
+ ArtifactSet artifacts)
throws UnableToCompleteException {
StringBuffer b = new StringBuffer();
b.append(getModulePrefix(logger, context, strongName, length));
b.append(js);
b.append(getModuleSuffix(logger, context));
- return wrapPrimaryFragment(logger, context, b.toString());
+ return wrapPrimaryFragment(logger, context, b.toString(), artifacts);
}
protected String generateSelectionScript(TreeLogger logger,
@@ -358,7 +359,7 @@
}
protected String wrapPrimaryFragment(TreeLogger logger,
- LinkerContext context, String script) {
+ LinkerContext context, String script, ArtifactSet artifacts) {
return script;
}
=======================================
---
/trunk/dev/core/src/com/google/gwt/core/linker/CrossSiteIframeLinker.java
Wed Oct 27 13:37:45 2010
+++
/trunk/dev/core/src/com/google/gwt/core/linker/CrossSiteIframeLinker.java
Thu Oct 28 08:33:32 2010
@@ -211,7 +211,7 @@
"com/google/gwt/core/ext/linker/impl/" + filename, logger);
String script = generatePrimaryFragmentString(
- logger, context, "", buffer.toString(), 1);
+ logger, context, "", buffer.toString(), 1, artifacts);
EmittedArtifact devArtifact =
emitString(logger, script, filename, lastModified);
@@ -261,11 +261,11 @@
@Override
protected String wrapPrimaryFragment(TreeLogger logger,
- LinkerContext context, String script) {
+ LinkerContext context, String script, ArtifactSet artifacts) {
StringBuffer out = new StringBuffer();
if (shouldIncludeBootstrapInPrimaryFragment(context)) {
try {
- out.append(generateSelectionScript(logger, context, null));
+ out.append(generateSelectionScript(logger, context, artifacts));
} catch (UnableToCompleteException e) {
logger.log(TreeLogger.ERROR, "Problem setting up selection
script", e);
e.printStackTrace();
=======================================
--- /trunk/dev/core/src/com/google/gwt/core/linker/IFrameLinker.java Wed
Aug 18 11:12:36 2010
+++ /trunk/dev/core/src/com/google/gwt/core/linker/IFrameLinker.java Thu
Oct 28 08:33:32 2010
@@ -18,12 +18,13 @@
import com.google.gwt.core.ext.LinkerContext;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
+import com.google.gwt.core.ext.linker.ArtifactSet;
import com.google.gwt.core.ext.linker.CompilationResult;
import com.google.gwt.core.ext.linker.ConfigurationProperty;
import com.google.gwt.core.ext.linker.LinkerOrder;
+import com.google.gwt.core.ext.linker.LinkerOrder.Order;
import com.google.gwt.core.ext.linker.Shardable;
import com.google.gwt.core.ext.linker.StatementRanges;
-import com.google.gwt.core.ext.linker.LinkerOrder.Order;
import com.google.gwt.core.ext.linker.impl.SelectionScriptLinker;
import com.google.gwt.dev.About;
import com.google.gwt.dev.util.DefaultTextOutput;
@@ -120,8 +121,8 @@
*/
@Override
protected byte[] generatePrimaryFragment(TreeLogger logger,
- LinkerContext context, CompilationResult result, String[] js)
- throws UnableToCompleteException {
+ LinkerContext context, CompilationResult result, String[] js,
+ ArtifactSet artifacts) throws UnableToCompleteException {
StringBuffer b = new StringBuffer();
b.append(getModulePrefix(logger, context, result.getStrongName(),
js.length));
b.append(splitPrimaryJavaScript(result.getStatementRanges()[0], js[0],
=======================================
--- /trunk/dev/core/src/com/google/gwt/core/linker/SingleScriptLinker.java
Tue Oct 12 16:00:43 2010
+++ /trunk/dev/core/src/com/google/gwt/core/linker/SingleScriptLinker.java
Thu Oct 28 08:33:32 2010
@@ -61,7 +61,7 @@
@Override
protected Collection<Artifact<?>> doEmitCompilation(TreeLogger logger,
- LinkerContext context, CompilationResult result)
+ LinkerContext context, CompilationResult result, ArtifactSet
artifacts)
throws UnableToCompleteException {
if (result.getJavaScript().length != 1) {
logger.branch(TreeLogger.ERROR,
@@ -69,7 +69,7 @@
+ getDescription() + " Linker.", null);
throw new UnableToCompleteException();
}
- return super.doEmitCompilation(logger, context, result);
+ return super.doEmitCompilation(logger, context, result, artifacts);
}
@Override
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
