Fixed possible NullPointerException during link-calculation

[maven-thymeleaf-skin] / src / main / resources / META-INF / maven / site.vm
diff --git a/src/main/resources/META-INF/maven/site.vm b/src/main/resources/META-INF/maven/site.vm

index 8083a30..ca508d4 100644 (file)
--- a/src/main/resources/META-INF/maven/site.vm
+++ b/src/main/resources/META-INF/maven/site.vm
@@ -7,7 +7,11 @@
  #set ( $stack = $project.getClass().forName('java.util.LinkedList').newInstance() )
  #macro ( buildPages $menu )
  
-  #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
+  #if ( $menu.href )
+    #set ( $currentItemHref = $PathTool.calculateLink( $menu.href, $relativePath ) )
+  #else
+    #set ( $currentItemHref = '' )
+  #end
    #set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
  
    #if ($currentItemHref)
@@ -56,10 +60,10 @@
        #set ( $childs = $pages.get($page.uri).childs )
        #set ( $sinkhole = $page.put("childs", $childs) )
  
-      <!-- OVERWRITING PAGE - uri: $page.uri, path: $crumbs, name: "$page.name", childs: $page.childs -->
+      <!-- OVERWRITING PAGE - uri: $page.uri -->
      #else
  
-      <!-- NEW PAGE - - - - - uri: $page.uri, path: $crumbs, name: "$page.name", childs: $page.childs -->
+      <!-- NEW PAGE - - - - - uri: $page.uri -->
      #end
  
      #set ( $sinkhole = $pages.put($page.uri, $page) )
@@ -70,6 +74,7 @@
        #set( $siteTitle = $menu.title )
        #set( $siteAlt = $menu.alt )
        #set( $siteImg = $menu.img )
+      #set( $sinkhole = $pages.get("index.html").put("childs", $page.childs) )
      #end
  
    #end
@@ -101,6 +106,7 @@
  #end
  #set ( $siteCrumbs = $decoration.custom.getChild( 'thymeproxy' ).getChild( 'crumbs' ).getValue() )
  
+<!-- name: $pages.get($alignedFileName).name -->
  <!-- title: $title -->
  <!-- short title: $shortTitle -->
  <!-- current page: $alignedFileName -->
@@ -114,10 +120,13 @@
      xmlns="http://www.w3.org/1999/xhtml"
      xmlns:layout="http://www.thymeleaf.org"
      layout:decorator="templates/layout"
-    th:with="uri='$sitePath$alignedFileName'"
+    th:with="
+      uri='$sitePath$alignedFileName',
+      json='merge:{&quot;pages&quot;:{#set($sep = "")#foreach($page in $pages)$sep&quot;$sitePath$page.uri&quot;:{&quot;name&quot;:&quot;$page.name&quot;,#if(!$page.childs.isEmpty())&quot;childs&quot;:{#set($csep = "")#foreach($child in $page.childs.entrySet())$csep&quot;$sitePath$child.key&quot;:&quot;$child.value&quot;#set($csep = ",")#end},#end&quot;crumbs&quot;:[#set($csep = "")#if($siteCrumbs)$siteCrumbs#set($csep = ",")#end#foreach($crumb in $page.crumbs)$csep{&quot;uri&quot;:&quot;$sitePath$crumb.uri&quot;,&quot;name&quot;:&quot;$crumb.name&quot;}#set($csep = ",")#end]#if($page.title),&quot;title&quot;:&quot;$page.title&quot;#end#if($page.alt),&quot;alt&quot;:&quot;$page.alt&quot;#end#if($page.img),&quot;img&quot;:&quot;$page.img&quot;#end}#set($sep = ",")#end}#if($siteTitle),&quot;site_title&quot;:&quot;$siteTitle&quot;#end#if($siteAlt),&quot;site_alt&quot;:&quot;$siteAlt&quot;#end#if($siteImg),&quot;site_img&quot;:&quot;$siteImg&quot;#end}'
+      "
      >
    <head>
-    <title>juplo - $title</title>
+    <title>#if($shortTitle and $shortTitle != '')$title#else$project.name &mdash; $pages.get($alignedFileName).name#end</title>
      <meta http-equiv="Content-Type" content="text/html; charset=${outputEncoding}" />
      <link rel="canonical" href="$sitePath$alignedFileName"/>
    </head>
@@ -129,8 +138,7 @@
        </ol>
      </p>
      <hr />
-    <article class="main" layout:fragment="maincontent" juplo:variables='merge:{"pages":{#set($sep = "")#foreach($page in $pages)$sep"$sitePath$page.uri":{"name":"$page.name",#if(!$page.childs.isEmpty())"childs":{#set($csep = "")#foreach($child in $page.childs.entrySet())$csep"$sitePath$child.key":"$child.value"#set($csep = ",")#end},#end"crumbs":[#set($csep = "")#if($siteCrumbs)$siteCrumbs#set($csep = ",")#end#foreach($crumb in $page.crumbs)$csep{"uri":"$sitePath$crumb.uri","name":"$crumb.name"}#set($csep = ",")#end]#if($page.title),"title":"$page.title"#end#if($page.alt),"alt":"$page.alt"#end#if($page.img),"img":"$page.img"#end}#set($sep = ",")#end}#if($siteTitle),"site_title":"$siteTitle"#end#if($siteAlt),"site_alt":"$siteAlt"#end#if($siteImg),"site_img":"$siteImg"#end}'>
-      <header><h1>$shortTitle</h1></header>
+    <article class="main" layout:fragment="maincontent">
        $bodyContent
      </article>
      <hr />