svn commit: r1494996 - /cxf/web/src/main/java/org/apache/cxf/cwiki/Page.java

[dkulp]

Author: dkulp
Date: Thu Jun 20 13:48:35 2013
New Revision: 1494996

URL: http://svn.apache.org/r1494996
Log:
If the page has includes, we have to check those for code blocks as well

Modified:
    cxf/web/src/main/java/org/apache/cxf/cwiki/Page.java

Modified: cxf/web/src/main/java/org/apache/cxf/cwiki/Page.java
URL: 
http://svn.apache.org/viewvc/cxf/web/src/main/java/org/apache/cxf/cwiki/Page.java?rev=1494996&r1=1494995&r2=1494996&view=diff
==============================================================================
--- cxf/web/src/main/java/org/apache/cxf/cwiki/Page.java (original)
+++ cxf/web/src/main/java/org/apache/cxf/cwiki/Page.java Thu Jun 20 13:48:35 
2013
@@ -22,8 +22,8 @@ package org.apache.cxf.cwiki;
 
 import java.io.Serializable;
 import java.io.StringReader;
-import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -347,8 +347,8 @@ public class Page extends AbstractPage i
         return codeTypes == null ? false : !codeTypes.isEmpty();
     }
     
-    public List<String> getCodeScripts() {
-        List<String> scripts = new ArrayList<String>();
+    public Set<String> getCodeScripts() throws Exception {
+        Set<String> scripts = new HashSet<String>();
         if (codeTypes != null) {
             for (String s : codeTypes) {
                 String sc = CODE_TYPE_MAP.get(s);
@@ -362,6 +362,18 @@ public class Page extends AbstractPage i
             scripts.add(CODE_TYPE_MAP.get("java"));
             scripts.add(CODE_TYPE_MAP.get("plain"));
         }
+        if (includes != null) {
+            for (String i : includes) {
+                try {
+                    Page p = exporter.findPage(i);
+                    if (p != null && p.hasCode()) {
+                        scripts.addAll(p.getCodeScripts());
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
         return scripts;
     }