Bug 9439 fixed: There was no entry 'Scilab Home' in help toc list

Change-Id: I87ff422d6e415ab1340f83f9abeb7f3c8ea32e55

3 files changed, 14 insertions, 4 deletions

diff --git a/scilab/modules/helptools/src/java/org/scilab/modules/helptools/HTMLDocbookTagConverter.java b/scilab/modules/helptools/src/java/org/scilab/modules/helptools/HTMLDocbookTagConverter.java
index 07533a3..52f08ce 100644
--- a/scilab/modules/helptools/src/java/org/scilab/modules/helptools/HTMLDocbookTagConverter.java
+++ b/scilab/modules/helptools/src/java/org/scilab/modules/helptools/HTMLDocbookTagConverter.java
@@ -91,6 +91,8 @@ public class HTMLDocbookTagConverter extends DocbookTagConverter implements Temp
     protected String currentId;
     protected String indexFilename = "index" /*UUID.randomUUID().toString()*/ + ".html";
 
+    protected boolean isToolbox;
+
     /**
      * Constructor
      * @param inName the name of the input stream
@@ -118,6 +120,7 @@ public class HTMLDocbookTagConverter extends DocbookTagConverter implements Temp
         scilabLexer = new ScilabLexer(primConf, macroConf);
         this.urlBase = urlBase;
         this.linkToTheWeb = urlBase != null && !urlBase.equals("scilab://");
+        this.isToolbox = isToolbox;
         if (isToolbox) {// we generate a toolbox's help
             HTMLScilabCodeHandler.setLinkWriter(new AbstractScilabCodeHandler.LinkWriter() {
                     public String getLink(String id) {
diff --git a/scilab/modules/helptools/src/java/org/scilab/modules/helptools/JavaHelpDocbookTagConverter.java b/scilab/modules/helptools/src/java/org/scilab/modules/helptools/JavaHelpDocbookTagConverter.java
index cb9cd95..0ddedc1 100644
--- a/scilab/modules/helptools/src/java/org/scilab/modules/helptools/JavaHelpDocbookTagConverter.java
+++ b/scilab/modules/helptools/src/java/org/scilab/modules/helptools/JavaHelpDocbookTagConverter.java
@@ -38,6 +38,7 @@ import org.xml.sax.SAXException;
 public class JavaHelpDocbookTagConverter extends HTMLDocbookTagConverter {
 
     private static final String XMLSTRING = "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"no\"?>\n";
+    private static final String WHATSNEW = "What's new ?";
 
     private StringBuilder buffer = new StringBuilder(8192);
 
@@ -118,6 +119,9 @@ public class JavaHelpDocbookTagConverter extends HTMLDocbookTagConverter {
     private String convertMapId() {
         buffer.setLength(0);
         buffer.append("<map version=\"1.0\">\n<mapID target=\"index\" url=\"index.html\"/>\n");
+        if (!isToolbox) {
+            buffer.append("<mapID target=\"whatsnew\" url=\"ScilabHomePage.html\"/>\n");
+        }
         Iterator<String> iter = mapId.keySet().iterator();
         while (iter.hasNext()) {
             String id = iter.next();
@@ -153,6 +157,9 @@ public class JavaHelpDocbookTagConverter extends HTMLDocbookTagConverter {
     private String convertTocItem() {
         buffer.setLength(0);
         buffer.append("<toc version=\"1.0\">\n<tocitem target=\"index\" text=\"" + bookTitle + "\">\n");
+        if (!isToolbox) {
+            buffer.append("<tocitem target=\"whatsnew\" text=\"Scilab Home\"/>\n");
+        }
         convertTreeId(tree);
         buffer.append("</tocitem>\n</toc>");
 
diff --git a/scilab/modules/helptools/src/java/org/scilab/modules/helptools/SciDocMain.java b/scilab/modules/helptools/src/java/org/scilab/modules/helptools/SciDocMain.java
index bf4a704..efe2412 100644
--- a/scilab/modules/helptools/src/java/org/scilab/modules/helptools/SciDocMain.java
+++ b/scilab/modules/helptools/src/java/org/scilab/modules/helptools/SciDocMain.java
@@ -137,14 +137,14 @@ public final class SciDocMain {
             if (format.equalsIgnoreCase("javahelp")) {
                 if (!isToolbox) {
                     Helpers.copyFile(new File(SCI + "/modules/helptools/data/pages/error.html"), new File(outputDirectory + "/ScilabErrorPage.html"));
-                    File homepage = new File(SCI + "/modules/helptools/data/pages/homepage-"+language+".html");
+                    File homepage = new File(SCI + "/modules/helptools/data/pages/homepage-" + language + ".html");
                     if (!homepage.isFile()) {
                         /* could not find the localized homepage. Switch to english */
-                        homepage=new File(SCI + "/modules/helptools/data/pages/homepage-en_US.html");
-                    } 
+                        homepage = new File(SCI + "/modules/helptools/data/pages/homepage-en_US.html");
+                    }
                     Helpers.copyFile(homepage, new File(outputDirectory + "/ScilabHomePage.html"));
 
-                    File homepageImage = new File(SCI + "/modules/helptools/data/pages/ban-"+language+".png");
+                    File homepageImage = new File(SCI + "/modules/helptools/data/pages/ban-" + language + ".png");
                     if (!homepageImage.isFile()) {
                         homepageImage = new File(SCI + "/modules/helptools/data/pages/ban-en_US.png");
                     }