Author: chatellier Date: 2009-12-14 16:26:56 +0000 (Mon, 14 Dec 2009) New Revision: 2831 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java Log: Search for java files in a folders set since searching into simulations take a huge time. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-12-14 15:51:18 UTC (rev 2830) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-12-14 16:26:56 UTC (rev 2831) @@ -27,6 +27,7 @@ import java.io.File; import java.io.IOException; import java.text.SimpleDateFormat; +import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; @@ -177,8 +178,23 @@ */ protected static void doNuitonMigration() { + // Search in a set of directories + // Searching throw simulations/* can take a huge time... + File[] folders = new File[]{ + AnalysePlanStorage.getAnalysePlanDirectory(), + ExportStorage.getExportDirectory(), + RuleStorage.getRuleDirectory(), + ScriptStorage.getScriptDirectory(), + SensitivityStorage.getSensitivityDirectory(), + SensitivityExportStorage.getSensitivityExportDirectory(), + SimulatorStorage.getSimulatorDirectory() + }; + try { - Map<File, List<CharSequence>> filesToMigrate = FileUtil.grep("org\\.codelutin\\.", IsisFish.config.getDatabaseDirectory(), ".*\\.java", "ISO-8859-1"); + Map<File, List<CharSequence>> filesToMigrate = new HashMap<File, List<CharSequence>>(); + for (File folder : folders) { + filesToMigrate.putAll(FileUtil.grep("org\\.codelutin\\.", folder, ".*\\.java", "ISO-8859-1")); + } if (filesToMigrate != null && !filesToMigrate.isEmpty()) {