Package follows the classical Scilab declaration 02/3302/2
Sylvestre Ledru [Sun, 27 Feb 2011 17:44:45 +0000 (18:44 +0100)]
Change-Id: Ic0b721947ccd8633bfb6865c010d2a30ffaecdbf

46 files changed:
scilab/modules/helptools/sci_gateway/cpp/sci_buildDocv2.cpp
scilab/modules/helptools/src/java/jflex/c.jflex
scilab/modules/helptools/src/java/jflex/function.jflex
scilab/modules/helptools/src/java/jflex/java.jflex
scilab/modules/helptools/src/java/jflex/scilab.jflex
scilab/modules/helptools/src/java/jflex/xml.jflex
scilab/modules/helptools/src/java/org/scilab/modules/helptools/CHMDocbookTagConverter.java [moved from scilab/modules/helptools/src/java/org/scilab/forge/scidoc/CHMDocbookTagConverter.java with 99% similarity]
scilab/modules/helptools/src/java/org/scilab/modules/helptools/DocbookElement.java [moved from scilab/modules/helptools/src/java/org/scilab/forge/scidoc/DocbookElement.java with 98% similarity]
scilab/modules/helptools/src/java/org/scilab/modules/helptools/DocbookTagConverter.java [moved from scilab/modules/helptools/src/java/org/scilab/forge/scidoc/DocbookTagConverter.java with 99% similarity]
scilab/modules/helptools/src/java/org/scilab/modules/helptools/HTMLDocbookLinkResolver.java [moved from scilab/modules/helptools/src/java/org/scilab/forge/scidoc/HTMLDocbookLinkResolver.java with 99% similarity]
scilab/modules/helptools/src/java/org/scilab/modules/helptools/HTMLDocbookTagConverter.java [moved from scilab/modules/helptools/src/java/org/scilab/forge/scidoc/HTMLDocbookTagConverter.java with 98% similarity]
scilab/modules/helptools/src/java/org/scilab/modules/helptools/JavaHelpDocbookElement.java [moved from scilab/modules/helptools/src/java/org/scilab/forge/scidoc/JavaHelpDocbookElement.java with 97% similarity]
scilab/modules/helptools/src/java/org/scilab/modules/helptools/JavaHelpDocbookTagConverter.java [moved from scilab/modules/helptools/src/java/org/scilab/forge/scidoc/JavaHelpDocbookTagConverter.java with 99% similarity]
scilab/modules/helptools/src/java/org/scilab/modules/helptools/SciDocConfiguration.java [moved from scilab/modules/helptools/src/java/org/scilab/forge/scidoc/SciDocConfiguration.java with 99% similarity]
scilab/modules/helptools/src/java/org/scilab/modules/helptools/SciDocMain.java [moved from scilab/modules/helptools/src/java/org/scilab/forge/scidoc/SciDocMain.java with 97% similarity]
scilab/modules/helptools/src/java/org/scilab/modules/helptools/SynopsisLexer.java [moved from scilab/modules/helptools/src/java/org/scilab/forge/scidoc/SynopsisLexer.java with 99% similarity]
scilab/modules/helptools/src/java/org/scilab/modules/helptools/TemplateFiller.java [moved from scilab/modules/helptools/src/java/org/scilab/forge/scidoc/TemplateFiller.java with 98% similarity]
scilab/modules/helptools/src/java/org/scilab/modules/helptools/TemplateHandler.java [moved from scilab/modules/helptools/src/java/org/scilab/forge/scidoc/TemplateHandler.java with 98% similarity]
scilab/modules/helptools/src/java/org/scilab/modules/helptools/UnhandledDocbookTagException.java [moved from scilab/modules/helptools/src/java/org/scilab/forge/scidoc/UnhandledDocbookTagException.java with 94% similarity]
scilab/modules/helptools/src/java/org/scilab/modules/helptools/XML/AbstractXMLCodeHandler.java [moved from scilab/modules/helptools/src/java/org/scilab/forge/scidoc/XML/AbstractXMLCodeHandler.java with 98% similarity]
scilab/modules/helptools/src/java/org/scilab/modules/helptools/XML/HTMLXMLCodeHandler.java [moved from scilab/modules/helptools/src/java/org/scilab/forge/scidoc/XML/HTMLXMLCodeHandler.java with 99% similarity]
scilab/modules/helptools/src/java/org/scilab/modules/helptools/XML/XMLLexer.java [moved from scilab/modules/helptools/src/java/org/scilab/forge/scidoc/XML/XMLLexer.java with 99% similarity]
scilab/modules/helptools/src/java/org/scilab/modules/helptools/c/AbstractCCodeHandler.java [moved from scilab/modules/helptools/src/java/org/scilab/forge/scidoc/c/AbstractCCodeHandler.java with 98% similarity]
scilab/modules/helptools/src/java/org/scilab/modules/helptools/c/CLexer.java [moved from scilab/modules/helptools/src/java/org/scilab/forge/scidoc/c/CLexer.java with 99% similarity]
scilab/modules/helptools/src/java/org/scilab/modules/helptools/c/HTMLCCodeHandler.java [moved from scilab/modules/helptools/src/java/org/scilab/forge/scidoc/c/HTMLCCodeHandler.java with 98% similarity]
scilab/modules/helptools/src/java/org/scilab/modules/helptools/external/ExternalXMLHandler.java [moved from scilab/modules/helptools/src/java/org/scilab/forge/scidoc/external/ExternalXMLHandler.java with 96% similarity]
scilab/modules/helptools/src/java/org/scilab/modules/helptools/external/HTMLMathMLHandler.java [moved from scilab/modules/helptools/src/java/org/scilab/forge/scidoc/external/HTMLMathMLHandler.java with 95% similarity]
scilab/modules/helptools/src/java/org/scilab/modules/helptools/external/HTMLSVGHandler.java [moved from scilab/modules/helptools/src/java/org/scilab/forge/scidoc/external/HTMLSVGHandler.java with 95% similarity]
scilab/modules/helptools/src/java/org/scilab/modules/helptools/image/ExternalImageConverter.java [moved from scilab/modules/helptools/src/java/org/scilab/forge/scidoc/image/ExternalImageConverter.java with 94% similarity]
scilab/modules/helptools/src/java/org/scilab/modules/helptools/image/Image.java [moved from scilab/modules/helptools/src/java/org/scilab/forge/scidoc/image/Image.java with 94% similarity]
scilab/modules/helptools/src/java/org/scilab/modules/helptools/image/ImageConverter.java [moved from scilab/modules/helptools/src/java/org/scilab/forge/scidoc/image/ImageConverter.java with 99% similarity]
scilab/modules/helptools/src/java/org/scilab/modules/helptools/image/LaTeXImageConverter.java [moved from scilab/modules/helptools/src/java/org/scilab/forge/scidoc/image/LaTeXImageConverter.java with 98% similarity]
scilab/modules/helptools/src/java/org/scilab/modules/helptools/image/MathMLImageConverter.java [moved from scilab/modules/helptools/src/java/org/scilab/forge/scidoc/image/MathMLImageConverter.java with 99% similarity]
scilab/modules/helptools/src/java/org/scilab/modules/helptools/image/SVGImageConverter.java [moved from scilab/modules/helptools/src/java/org/scilab/forge/scidoc/image/SVGImageConverter.java with 98% similarity]
scilab/modules/helptools/src/java/org/scilab/modules/helptools/java/JavaLexer.java [moved from scilab/modules/helptools/src/java/org/scilab/forge/scidoc/java/JavaLexer.java with 99% similarity]
scilab/modules/helptools/src/java/org/scilab/modules/helptools/scilab/AbstractScilabCodeHandler.java [moved from scilab/modules/helptools/src/java/org/scilab/forge/scidoc/scilab/AbstractScilabCodeHandler.java with 98% similarity]
scilab/modules/helptools/src/java/org/scilab/modules/helptools/scilab/HTMLScilabCodeHandler.java [moved from scilab/modules/helptools/src/java/org/scilab/forge/scidoc/scilab/HTMLScilabCodeHandler.java with 99% similarity]
scilab/modules/helptools/src/java/org/scilab/modules/helptools/scilab/HTMLWithStyleScilabCodeHandler.java [moved from scilab/modules/helptools/src/java/org/scilab/forge/scidoc/scilab/HTMLWithStyleScilabCodeHandler.java with 99% similarity]
scilab/modules/helptools/src/java/org/scilab/modules/helptools/scilab/ScilabCodeServer.java [moved from scilab/modules/helptools/src/java/org/scilab/forge/scidoc/scilab/ScilabCodeServer.java with 99% similarity]
scilab/modules/helptools/src/java/org/scilab/modules/helptools/scilab/ScilabLexer.java [moved from scilab/modules/helptools/src/java/org/scilab/forge/scidoc/scilab/ScilabLexer.java with 99% similarity]
scilab/modules/helptools/src/java/org/scilab/modules/helptools/source/ScilabSourceBrowser.java [moved from scilab/modules/helptools/src/java/org/scilab/forge/scidoc/source/ScilabSourceBrowser.java with 96% similarity]
scilab/modules/helptools/src/jni/BuildDocObjectv2.giws.xml
scilab/modules/helptools/src/jni/SciDocMain.cpp
scilab/modules/helptools/src/jni/SciDocMain.hxx
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/HTMLCodeConverter.java

index 3c8b7df..d06c2e2 100644 (file)
@@ -63,7 +63,7 @@ extern "C"
         std::string language;
         std::string styleSheet; /* the CSS */
         //     std::string pathToGenerated;
-        org_scilab_forge_scidoc::SciDocMain *doc = NULL;
+        org_scilab_modules_helptools::SciDocMain *doc = NULL;
         SciErr sciErr;
         int* piAddr = NULL;
         int iRet    = 0;
@@ -213,7 +213,7 @@ extern "C"
 
         try
         {
-            doc = new org_scilab_forge_scidoc::SciDocMain(getScilabJavaVM());
+            doc = new org_scilab_modules_helptools::SciDocMain(getScilabJavaVM());
 
 #ifdef _MSC_VER
             __slashToAntislash(&outputDirectory);
index ca2866d..9569e2a 100644 (file)
@@ -1,6 +1,6 @@
 //CHECKSTYLE:OFF
 
-package org.scilab.forge.scidoc.c;
+package org.scilab.modules.helptools.c;
 
 import java.io.Reader;
 import java.io.StringReader;
index d5ddc03..c89cf97 100644 (file)
@@ -1,6 +1,6 @@
 //CHECKSTYLE:OFF
 
-package org.scilab.forge.scidoc ;
+package org.scilab.modules.helptools ;
 
 import java.io.IOException;
 import java.io.StringReader;
index f32e49c..a62d4db 100644 (file)
@@ -1,12 +1,12 @@
 //CHECKSTYLE:OFF
 
-package org.scilab.forge.scidoc.java;
+package org.scilab.modules.helptools.java;
 
 import java.io.Reader;
 import java.io.StringReader;
 import java.io.IOException;
 
-import org.scilab.forge.scidoc.c.AbstractCCodeHandler;
+import org.scilab.modules.helptools.c.AbstractCCodeHandler;
 
 %%
 
index a72c207..4d26abf 100644 (file)
@@ -1,6 +1,6 @@
 //CHECKSTYLE:OFF
 
-package org.scilab.forge.scidoc.scilab;
+package org.scilab.modules.helptools.scilab;
 
 import java.util.Arrays;
 import java.util.Set;
index 02e127e..0a2d8e2 100644 (file)
@@ -1,6 +1,6 @@
 //CHECKSTYLE:OFF
 
-package org.scilab.forge.scidoc.XML;
+package org.scilab.modules.helptools.XML;
 
 import java.io.Reader;
 import java.io.StringReader;
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.forge.scidoc;
+package org.scilab.modules.helptools;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -39,7 +39,7 @@ import org.xml.sax.Locator;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
 
-import org.scilab.forge.scidoc.external.ExternalXMLHandler;
+import org.scilab.modules.helptools.external.ExternalXMLHandler;
 
 /**
  * Class the convert a DocBook xml file
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.forge.scidoc;
+package org.scilab.modules.helptools;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -32,18 +32,18 @@ import java.util.regex.Pattern;
 
 import org.xml.sax.SAXException;
 
-import org.scilab.forge.scidoc.image.ImageConverter;
-import org.scilab.forge.scidoc.image.LaTeXImageConverter;
-import org.scilab.forge.scidoc.image.MathMLImageConverter;
-import org.scilab.forge.scidoc.image.SVGImageConverter;
-import org.scilab.forge.scidoc.scilab.ScilabLexer;
-import org.scilab.forge.scidoc.scilab.HTMLScilabCodeHandler;
-import org.scilab.forge.scidoc.scilab.AbstractScilabCodeHandler;
-import org.scilab.forge.scidoc.XML.XMLLexer;
-import org.scilab.forge.scidoc.XML.HTMLXMLCodeHandler;
-import org.scilab.forge.scidoc.c.CLexer;
-import org.scilab.forge.scidoc.c.HTMLCCodeHandler;
-import org.scilab.forge.scidoc.java.JavaLexer;
+import org.scilab.modules.helptools.image.ImageConverter;
+import org.scilab.modules.helptools.image.LaTeXImageConverter;
+import org.scilab.modules.helptools.image.MathMLImageConverter;
+import org.scilab.modules.helptools.image.SVGImageConverter;
+import org.scilab.modules.helptools.scilab.ScilabLexer;
+import org.scilab.modules.helptools.scilab.HTMLScilabCodeHandler;
+import org.scilab.modules.helptools.scilab.AbstractScilabCodeHandler;
+import org.scilab.modules.helptools.XML.XMLLexer;
+import org.scilab.modules.helptools.XML.HTMLXMLCodeHandler;
+import org.scilab.modules.helptools.c.CLexer;
+import org.scilab.modules.helptools.c.HTMLCCodeHandler;
+import org.scilab.modules.helptools.java.JavaLexer;
 
 /**
  * Class to convert DocBook to HTML
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.forge.scidoc;
+package org.scilab.modules.helptools;
 
 import java.io.BufferedReader;
 import java.io.FileReader;
@@ -24,8 +24,8 @@ import org.scilab.modules.commons.ScilabConstants;
 import org.scilab.modules.helptools.BuildJavaHelp;
 import org.scilab.modules.helptools.Helpers;
 
-import org.scilab.forge.scidoc.external.HTMLMathMLHandler;
-import org.scilab.forge.scidoc.external.HTMLSVGHandler;
+import org.scilab.modules.helptools.external.HTMLMathMLHandler;
+import org.scilab.modules.helptools.external.HTMLSVGHandler;
 
 /**
  * Class to convert DocBook to HTML
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.forge.scidoc.external;
+package org.scilab.modules.helptools.external;
 
 import java.io.File;
 import java.util.HashMap;
@@ -18,7 +18,7 @@ import java.util.Map;
 
 import org.xml.sax.Attributes;
 
-import org.scilab.forge.scidoc.image.ImageConverter;
+import org.scilab.modules.helptools.image.ImageConverter;
 
 /**
  * Handle the included SVG code
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.forge.scidoc.external;
+package org.scilab.modules.helptools.external;
 
 import java.io.File;
 import java.util.HashMap;
@@ -18,7 +18,7 @@ import java.util.Map;
 
 import org.xml.sax.Attributes;
 
-import org.scilab.forge.scidoc.image.ImageConverter;
+import org.scilab.modules.helptools.image.ImageConverter;
 
 /**
  * Handle the included SVG code
@@ -2,13 +2,13 @@
 
 //CHECKSTYLE:OFF
 
-package org.scilab.forge.scidoc.java;
+package org.scilab.modules.helptools.java;
 
 import java.io.Reader;
 import java.io.StringReader;
 import java.io.IOException;
 
-import org.scilab.forge.scidoc.c.AbstractCCodeHandler;
+import org.scilab.modules.helptools.c.AbstractCCodeHandler;
 
 
 /**
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.forge.scidoc.source;
+package org.scilab.modules.helptools.source;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -26,9 +26,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.scilab.forge.scidoc.scilab.AbstractScilabCodeHandler;
-import org.scilab.forge.scidoc.scilab.HTMLScilabCodeHandler;
-import org.scilab.forge.scidoc.scilab.ScilabLexer;
+import org.scilab.modules.helptools.scilab.AbstractScilabCodeHandler;
+import org.scilab.modules.helptools.scilab.HTMLScilabCodeHandler;
+import org.scilab.modules.helptools.scilab.ScilabLexer;
 
 public class ScilabSourceBrowser extends HTMLScilabCodeHandler {
 
index 0342d33..ca1ad2d 100644 (file)
@@ -1,4 +1,4 @@
-<package name="org.scilab.forge.scidoc">
+<package name="org.scilab.modules.helptools">
   <object name="SciDocMain">
 
     <method name="buildDocumentation" returnType="void">
index fe3bf5f..a97fe31 100644 (file)
@@ -39,7 +39,7 @@ The fact that you are presently reading this means that you have had
 knowledge of the CeCILL-B license and that you accept its terms.
 */
 
-namespace org_scilab_forge_scidoc {
+namespace org_scilab_modules_helptools {
 
 // Returns the current env
 
index 71f5881..5b71c00 100644 (file)
@@ -57,7 +57,7 @@ typedef signed char byte;
 #endif
 #endif
 
-namespace org_scilab_forge_scidoc {
+namespace org_scilab_modules_helptools {
 class SciDocMain {
 
 private:
@@ -146,7 +146,7 @@ char * process(char * sourceDoc, char * styleSheet);
                         
                 static const std::string className()
                 {
-                return "org/scilab/forge/scidoc/SciDocMain";
+                return "org/scilab/modules/helptools/SciDocMain";
                 }
                 
 };
index fc8578f..6519664 100644 (file)
@@ -30,7 +30,7 @@ import javax.xml.transform.stream.StreamSource;
 import org.scilab.modules.commons.ScilabConstants;
 import org.scilab.modules.scinotes.ScilabEditorPane;
 import org.scilab.modules.scinotes.SciNotes;
-import org.scilab.forge.scidoc.scilab.AbstractScilabCodeHandler;
+import org.scilab.modules.helptools.scilab.AbstractScilabCodeHandler;
 import org.scilab.modules.gui.messagebox.ScilabModalDialog;
 
 import org.apache.fop.apps.FopFactory;
index ef601e0..bef6d11 100644 (file)
@@ -22,8 +22,8 @@ import org.scilab.modules.scinotes.ScilabEditorKit;
 import org.scilab.modules.scinotes.ScilabEditorPane;
 import org.scilab.modules.scinotes.ScilabLexerConstants;
 
-import org.scilab.forge.scidoc.scilab.AbstractScilabCodeHandler;
-import org.scilab.forge.scidoc.scilab.ScilabLexer;
+import org.scilab.modules.helptools.scilab.AbstractScilabCodeHandler;
+import org.scilab.modules.helptools.scilab.ScilabLexer;
 
 /**
  * Code converter Class