Author: chatellier Date: 2010-01-11 17:08:36 +0000 (Mon, 11 Jan 2010) New Revision: 2904 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Exclude simulations/*, formules/* form javadoc generation. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2010-01-11 16:06:36 UTC (rev 2903) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2010-01-11 17:08:36 UTC (rev 2904) @@ -1119,8 +1119,7 @@ if (ok == 0) { scriptUI.getActionLogArea().setText( - _("isisfish.script.compilation.ok", output - .toString())); + _("isisfish.script.javadoc.ok", output.toString())); // vert leger scriptUI.getActionLogArea().setBackground(COLOR_SUCCESS); } else { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java 2010-01-11 16:06:36 UTC (rev 2903) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java 2010-01-11 17:08:36 UTC (rev 2904) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Ifremer, Code Lutin + * Copyright (C) 2009-2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -19,6 +19,7 @@ package fr.ifremer.isisfish.util; import java.io.File; +import java.io.FileFilter; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Collection; @@ -33,7 +34,9 @@ import com.sun.tools.javadoc.Main; import fr.ifremer.isisfish.IsisFish; +import fr.ifremer.isisfish.datastore.FormuleStorage; import fr.ifremer.isisfish.datastore.JavaSourceStorage; +import fr.ifremer.isisfish.datastore.SimulationStorage; /** * Helper for javadoc. @@ -87,8 +90,20 @@ * @return le resulat de sortie de l'executable javadoc (0 si ok) */ public static int generateJavadoc(File rootSrc, File dest, PrintWriter out) { - - List<File> javaFiles = FileUtil.find(rootSrc, ".*\\.java", true); + // use specific filter to add more condition than FileUtil#find + List<File> javaFiles = FileUtil.getFilteredElements(rootSrc, new FileFilter() { + @Override + public boolean accept(File f) { + boolean result = true; + // seulement sur les fichiers java + result &= f.getAbsolutePath().endsWith(".java"); + // don't do javadoc in "formules" directory (fail) + result &= !f.getAbsolutePath().startsWith(FormuleStorage.getFormuleDirectory().getAbsolutePath()); + // don't do javadoc for simulations too (useless) + result &= !f.getAbsolutePath().startsWith(SimulationStorage.getSimulationDirectory().getAbsolutePath()); + return result; + } + }, true); int result = generateJavadoc(rootSrc, javaFiles, dest, out); return result; Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2010-01-11 16:06:36 UTC (rev 2903) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2010-01-11 17:08:36 UTC (rev 2904) @@ -839,6 +839,7 @@ isisfish.script.import.labelAdd=Following files will be added. Confirm adding. isisfish.script.import.labelOverwrite=Following files already exists. Confirm overridding. isisfish.script.import.tooltip.checkAll=(Un)Check all scripts +isisfish.script.javadoc.ok=Javadoc generated-----------------\n\n%s isisfish.script.menu.checkSyntax=Check syntax isisfish.script.menu.code=Code isisfish.script.menu.commit=Commit script to server Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-01-11 16:06:36 UTC (rev 2903) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-01-11 17:08:36 UTC (rev 2904) @@ -839,6 +839,7 @@ isisfish.script.import.labelAdd=Le(s) fichier(s) suivant(s) sera(ont) ajout\u00E9(s), Confirmer l'ajout isisfish.script.import.labelOverwrite=Le(s) fichier(s) suivant(s) existe(nt) d\u00E9j\u00E0, Confirmer pour l'\u00E9crasement isisfish.script.import.tooltip.checkAll=(D\u00E9-)S\u00E9lectionner tous les scripts \u00E0 importer +isisfish.script.javadoc.ok=Javadoc g\u00E9n\u00E9r\u00E9e avec succ\u00E8s\n---------------------------\n\n%s isisfish.script.menu.checkSyntax=V\u00E9rifier la syntaxe isisfish.script.menu.code=Code isisfish.script.menu.commit=Commiter des scripts sur le serveur