r1720 - trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin - Jaxx-commits

19 Jan 2010

Author: tchemit
Date: 2010-01-19 18:50:08 +0100 (Tue, 19 Jan 2010)
New Revision: 1720

Modified:
   trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractGenerateHelpMojo.java
   trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractJaxxMojo.java
   trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpFilesMojo.java
   trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java
   trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpMojo.java
   trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpSearchMojo.java
   trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java
   trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/XmlHelper.java
Log:
clean code + debut de resolution de Anomalie #236: La generation de l'index de l'aide n'est pas correct

Modified: trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractGenerateHelpMojo.java
===================================================================

--- trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractGenerateHelpMojo.java	2010-01-19 17:33:41 UTC (rev 1719)
+++ trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractGenerateHelpMojo.java	2010-01-19 17:50:08 UTC (rev 1720)
@@ -107,7 +107,6 @@
 
     @Override
     protected void init() throws Exception {
-//    protected boolean init() throws Exception {
 
         if (StringUtils.isEmpty(locales)) {
             throw new MojoFailureException("You must set the 'locales' property properly (was " + locales + ").");
@@ -132,8 +131,6 @@
         defaultLocale = localesToTreate[0];
 
         createDirectoryIfNecessary(getTargetDirectory());
-
-//        return true;
     }
 
     @Override
@@ -148,10 +145,6 @@
     @Override
     protected void doAction() throws Exception {
 
-//        if (skipAction()) {
-//            return;
-//        }
-
         for (Locale locale : localesToTreate) {
 
             boolean isDefaultLocale = locale == defaultLocale;
@@ -171,14 +164,6 @@
         postDoAction();
     }
 
-//    protected boolean skipAction() {
-//        if (!generateHelp) {
-//            getLog().info("generateHelp flag is off, will skip goal.");
-//            return true;
-//        }
-//        return false;
-//    }
-
     public File getOutputHelpIds() {
         return outputHelpIds;
     }

Modified: trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractJaxxMojo.java
===================================================================
--- trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractJaxxMojo.java	2010-01-19 17:33:41 UTC (rev 1719)
+++ trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractJaxxMojo.java	2010-01-19 17:50:08 UTC (rev 1720)
@@ -81,7 +81,6 @@
     protected boolean checkPackaging() {
         // not accept pom modules
         return !acceptPackaging(Packaging.pom);
-//        return project != null && !"pom".equals(project.getPackaging()) && !"site".equals(project.getPackaging());
     }
 
     @Override

Modified: trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpFilesMojo.java
===================================================================
--- trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpFilesMojo.java	2010-01-19 17:33:41 UTC (rev 1719)
+++ trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpFilesMojo.java	2010-01-19 17:50:08 UTC (rev 1720)
@@ -134,10 +134,8 @@
 
     @Override
     public void init() throws Exception {
-//    public boolean init() throws Exception {
         if (!generateHelp) {
             return;
-//            return true;
         }
 
         // check ressources
@@ -154,31 +152,12 @@
 
         super.init();
 
-//        boolean b = super.init();
-//        if (!b) {
-//            return false;
-//        }
-
         // load ids from idsStore file
 
-//        File idsFile;
-
         if (isForce()) {
             idsFile = getMergeHelpIdsStoreFile();
-//            if (!idsFile.exists()) {
-//                if (isVerbose()) {
-//                    getLog().info("Force flag is on, but no helpIdStore-all to react at " + idsFile);
-//                }
-//                return true;
-//            }
         } else {
             idsFile = getHelpIdsStoreFile();
-//            if (!idsFile.exists()) {
-//                if (isVerbose()) {
-//                    getLog().info("no helpIdStore to react at " + idsFile);
-//                }
-//                return true;
-//            }
         }
 
         if (!idsFile.exists()) {
@@ -190,21 +169,10 @@
         // loading all ids
         Set<String> ids = loadHelpIds(idsFile);
 
-//        if (ids.isEmpty()) {
-//
-//            // no ids detected
-//            if (isVerbose()) {
-//                getLog().info("No helpIds detected, will skip.");
-//            }
-//            return true;
-//        }
-
         for (String id : ids) {
             String path = id.replaceAll("\\.", File.separator) + ".html";
             helpIds.put(id, path);
         }
-
-//        return true;
     }
 
     @Override
@@ -229,33 +197,6 @@
         return b;
     }
 
-//    @Override
-//    protected boolean skipAction() {
-//        boolean b = super.skipAction();
-//        if (!b) {
-//            if (helpIds == null || helpIds.isEmpty()) {
-//                getLog().info("No help ids to treate.");
-//                return true;
-//            }
-//        }
-//        return false;
-//    }
-
-//    @Override
-//    public void doAction() throws Exception {
-//
-//        if (skipAction()) {
-//            return;
-//        }
-//
-//        if (helpIds == null || helpIds.isEmpty()) {
-//            getLog().info("No help ids to treate.");
-//            return;
-//        }
-//
-//        super.doAction();
-//    }
-
     protected void postDoAction() {
         getLog().info(touchedFiles + " file(s) treated.");
     }

Modified: trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java
===================================================================
--- trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java	2010-01-19 17:33:41 UTC (rev 1719)
+++ trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java	2010-01-19 17:50:08 UTC (rev 1720)
@@ -32,19 +32,13 @@
 
     @Override
     public void init() throws Exception {
-//    public boolean init() throws Exception {
         if (!generateHelp) {
 
             return;
-//            return true;
         }
 
         super.init();
 
-//        if (!super.init()) {
-//            return false;
-//        }
-
         // check there is some bundle
         if (getHelpIdsFilename() == null) {
             throw new MojoFailureException("you must set the 'helpIdStore' property.");
@@ -58,7 +52,6 @@
         // always clean helpIdsStore before all
         cleanHelpIdsStore();
 
-//        return true;
     }
 
     @Override
@@ -80,21 +73,6 @@
     @Override
     public void doAction() throws Exception {
 
-//        if (skipAction()) {
-//            return;
-//        }
-
-//        Set<String> helpIds = HelpRootCompiledObjectDecorator.getHelpIds();
-//
-//        if (helpIds.isEmpty()) {
-////            if (isVerbose()) {
-//            // no ids detected in this compilation round
-//            getLog().info("No helpIds detected.");
-////            }
-//            cleanHelpIdsStore();
-//            return;
-//        }
-
         // store current jaxx session detected help ids
 
         File idsStore = getHelpIdsStoreFile();

Modified: trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpMojo.java
===================================================================
--- trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpMojo.java	2010-01-19 17:33:41 UTC (rev 1719)
+++ trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpMojo.java	2010-01-19 17:50:08 UTC (rev 1720)
@@ -45,19 +45,12 @@
     public void setTargetDirectory(File targetDirectory) {
     }
 
-//    @Override
-//    public boolean init() throws Exception {
-//
-//        return true;
-//    }
-
     @Override
     public void doAction() throws Exception {
 
     }
 
     protected void postDoAction() {
-        //getLog().info(touchedFiles + " file(s) treated.");
     }
 
     protected void doActionForLocale(Locale locale, boolean isDefaultLocale, File localizedTarget, String localePath) throws Exception {

Modified: trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpSearchMojo.java
===================================================================
--- trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpSearchMojo.java	2010-01-19 17:33:41 UTC (rev 1719)
+++ trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpSearchMojo.java	2010-01-19 17:50:08 UTC (rev 1720)
@@ -19,9 +19,7 @@
 package org.nuiton.jaxx.plugin;
 
 import com.sun.java.help.search.Indexer;
-import org.codehaus.plexus.util.DirectoryScanner;
 import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.StringUtils;
 import org.nuiton.plugin.PluginHelper;
 
 import java.io.File;
@@ -56,25 +54,26 @@
      */
     protected File outputHelpSearch;
 
+    /**
+     * The directory where to pick content files to generate the index.
+     *
+     * @parameter expression="${jaxx.inputHelp}" default-value="${project.basedir}/src/main/help"
+     * @required
+     * @since 2.0.0
+     */
+    protected File inputHelp;
+
     protected String timestamp;
 
     @Override
     public void init() throws Exception {
-//    public boolean init() throws Exception {
         if (!generateHelp || !generateSearch) {
 
             return;
-//            return true;
         }
 
-//        if (!generateSearch) {
-////            getLog().info("Do not generate search.");
-//            return true;
-//        }
-
         timestamp = "-" + System.currentTimeMillis();
         super.init();
-//        return super.init();
     }
 
     @Override
@@ -92,32 +91,23 @@
         boolean b = super.checkSkip();
         if (b) {
             if (!generateSearch) {
-                getLog().info("generateHelpsearch flag is off, will skip goal.");
+                getLog().info("generateSearch flag is off, will skip goal.");
                 return false;
             }
         }
         return b;
     }
 
-//    protected boolean skipAction() {
-//        if (!generateHelp) {
-//            getLog().info("generateHelp flag is off, generate nothing.");
-//            return true;
-//        }
-//        if (!generateSearch) {
-//            getLog().info("generateHelpsearch flag is off, generate nothing.");
-//            return true;
-//        }
-//        return false;
-//    }
-
     @Override
-    protected void doActionForLocale(Locale locale, boolean isDefaultLocale, File source, String localePath) throws Exception {
+    protected void doActionForLocale(Locale locale, boolean isDefaultLocale, File localizedTarget, String localePath) throws Exception {
 
         String language = locale.getLanguage();
 
-        File target = new File(getTargetDirectory(), localePath + File.separator + "JavaHelpSearch");
+        File source = new File(inputHelp, localePath);
 
+        File target = new File(localizedTarget, "JavaHelpSearch");
+//        File target = new File(getTargetDirectory(), localePath + File.separator + "JavaHelpSearch");
+
         // detect if need to generate
 
         boolean generate = false;
@@ -167,6 +157,7 @@
         }
 
         createDirectoryIfNecessary(source);
+//        createDirectoryIfNecessary(localizedTarget);
         createDirectoryIfNecessary(target);
 
         // ---------------------------------------------------------------
@@ -197,7 +188,8 @@
         if (isVerbose()) {
             getLog().info("copy files to " + tmpDir + " for indexing them.");
         }
-        FileUtils.copyDirectory(source, tmpDir, "**/*", StringUtils.join(DirectoryScanner.DEFAULTEXCLUDES, ","));
+        FileUtils.copyDirectoryStructure(source, tmpDir);
+//        FileUtils.copyDirectory(source, tmpDir, "**/*", StringUtils.join(DirectoryScanner.DEFAULTEXCLUDES, ",")+",**/*.jpg");
 
         // prepare arguments of Indexer.main calling
         List<String> params = new ArrayList<String>();

Modified: trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java
===================================================================
--- trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java	2010-01-19 17:33:41 UTC (rev 1719)
+++ trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java	2010-01-19 17:50:08 UTC (rev 1720)
@@ -290,7 +290,6 @@
     @SuppressWarnings("unchecked")
     @Override
     public void init() throws Exception {
-//    public boolean init() throws Exception {
 
         fixCompileSourceRoots();
 
@@ -308,7 +307,6 @@
         nofiles = files == null || files.length == 0;
         if (nofiles) {
             return;
-//            return true;
         }
 
         cl = initClassLoader(getProject(),
@@ -361,7 +359,6 @@
                 getLog().info("will parse " + file);
             }
         }
-//        return true;
     }
 
     @Override
@@ -376,11 +373,6 @@
     @Override
     public void doAction() throws Exception {
 
-//        if (nofiles) {
-//            getLog().info("Nothing to generate - all files are uo to date.");
-//            return;
-//        }
-
         getLog().info("Detects " + files.length + " modified jaxx file(s). ");
 
         if (showBinding) {

Modified: trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/XmlHelper.java
===================================================================
--- trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/XmlHelper.java	2010-01-19 17:33:41 UTC (rev 1719)
+++ trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/XmlHelper.java	2010-01-19 17:50:08 UTC (rev 1720)
@@ -68,8 +68,9 @@
             }
         });
 
-        InputStream s = new FileInputStream(file);
+        InputStream s=null;
         try {
+            s = new FileInputStream(file);
             parser.parse(new InputSource(s));
         } finally {
             if (s != null) {

    

r1720 - trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin

tchemit＠users.nuiton.org

tags

participants (1)