commit 92480a82899e4f0bacfacf6c538d0a56ce3bad3e
author jlabanca@google.com <jlabanca@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Wed Jun 23 12:41:41 2010 +0000
committer jlabanca@google.com <jlabanca@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Wed Jun 23 12:41:41 2010 +0000
tree 310d5e760200b6455bbcf298aa366cd489cedb41
parent 91815ba90d17329cf02420bce05cf8fe8bce0421

Adding a null check to ShowcaseGenerator so that we don't try to write to a public resource that has already been created.  This fixes a bug when multiple examples reference the same raw source files.

Review at http://gwt-code-reviews.appspot.com/646802

Review by: jgw@google.com

git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@8304 8db76d5a-ed1c-0410-87a9-c151d255dfc7

samples/showcase/src/com/google/gwt/sample/showcase/generator/ShowcaseGenerator.java

diff --git a/samples/showcase/src/com/google/gwt/sample/showcase/generator/ShowcaseGenerator.java b/samples/showcase/src/com/google/gwt/sample/showcase/generator/ShowcaseGenerator.java
index 2d5b079..9115bb7 100644
--- a/samples/showcase/src/com/google/gwt/sample/showcase/generator/ShowcaseGenerator.java
+++ b/samples/showcase/src/com/google/gwt/sample/showcase/generator/ShowcaseGenerator.java
@@ -33,8 +33,10 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
+import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * Generate the source code, css styles, and raw source used in the Showcase
@@ -66,6 +68,12 @@
    */
   private TreeLogger logger = null;
 
+  /**
+   * The set of raw files that have already been generated. Raw files can be
+   * reused by different examples, but we only generate them once.
+   */
+  private Set<String> rawFiles = new HashSet<String>();
+
   @Override
   public String generate(TreeLogger logger, GeneratorContext context,
       String typeName) throws UnableToCompleteException {
@@ -115,15 +123,22 @@
    * @param partialPath the path to the file relative to the public directory
    * @param contents the file contents
    */
-  private void createPublicResource(String partialPath, String contents) {
+  private void createPublicResource(String partialPath, String contents)
+      throws UnableToCompleteException {
     try {
       OutputStream outStream = context.tryCreateResource(logger, partialPath);
+      if (outStream == null) {
+        String message = "Attempting to generate duplicate public resource: "
+            + partialPath
+            + ".\nAll generated source files must have unique names.";
+        logger.log(TreeLogger.ERROR, message);
+        throw new UnableToCompleteException();
+      }
       outStream.write(contents.getBytes());
       context.commitResource(logger, outStream);
-    } catch (UnableToCompleteException e) {
-      logger.log(TreeLogger.ERROR, "Failed while writing", e);
     } catch (IOException e) {
-      logger.log(TreeLogger.ERROR, "Failed while writing", e);
+      logger.log(TreeLogger.ERROR, "Error writing file: " + partialPath, e);
+      throw new UnableToCompleteException();
     }
   }
 
@@ -146,6 +161,13 @@
     // Generate each raw source file
     String[] filenames = type.getAnnotation(ShowcaseRaw.class).value();
     for (String filename : filenames) {
+      // Check if the file has already been generated.
+      String path = pkgName + filename;
+      if (rawFiles.contains(path)) {
+        continue;
+      }
+      rawFiles.add(path);
+
       // Get the file contents
       String fileContents = getResourceContents(pkgPath + filename);
 
@@ -230,7 +252,7 @@
    * @param outDir the output directory
    */
   private void generateStyleFiles(JClassType type, String styleDefs,
-      String outDir) {
+      String outDir) throws UnableToCompleteException {
     // Look for annotation
     if (!type.isAnnotationPresent(ShowcaseStyle.class)) {
       return;