Author: echatellier Date: 2014-12-04 11:39:33 +0000 (Thu, 04 Dec 2014) New Revision: 4142 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4142 Log: Remove inner class from dependencies Modified: trunk/src/main/java/fr/ifremer/isisfish/util/DependencyUtil.java trunk/src/test/java/fr/ifremer/isisfish/util/DependencyUtilTest.java Modified: trunk/src/main/java/fr/ifremer/isisfish/util/DependencyUtil.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/DependencyUtil.java 2014-12-03 16:23:03 UTC (rev 4141) +++ trunk/src/main/java/fr/ifremer/isisfish/util/DependencyUtil.java 2014-12-04 11:39:33 UTC (rev 4142) @@ -241,6 +241,7 @@ * @param type type to add */ protected static void registerType(Set<String> types, String type) { + //System.out.println("==> " + type); if (StringUtils.startsWithAny(type, ExportStorage.EXPORT_PATH, @@ -253,8 +254,12 @@ SensitivityExportStorage.SENSITIVITY_EXPORT_PATH, SimulationPlanStorage.SIMULATION_PLAN_PATH, SimulatorStorage.SIMULATOR_PATH)) { - String dotType = type.replace('/', '.'); - types.add(dotType); + + // exclude inner types + if (!type.contains("$")) { + String dotType = type.replace('/', '.'); + types.add(dotType); + } } } Modified: trunk/src/test/java/fr/ifremer/isisfish/util/DependencyUtilTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/util/DependencyUtilTest.java 2014-12-03 16:23:03 UTC (rev 4141) +++ trunk/src/test/java/fr/ifremer/isisfish/util/DependencyUtilTest.java 2014-12-04 11:39:33 UTC (rev 4142) @@ -159,4 +159,17 @@ Set<String> deps = extractDependencies(script); Assert.assertTrue(deps.contains("scripts.ObjectiveFunction")); } + + /** + * Test que les inners types (anonyme $1) ne sont pas extrait. + * + * @throws IsisFishException + * @throws IOException + */ + @Test + public void testExtractDependencies7() throws IsisFishException, IOException { + RuleStorage script = RuleStorage.getRule("GraviteVPUE1"); + Set<String> deps = extractDependencies(script); + Assert.assertFalse(deps.contains("rules.GraviteVPUE1$1")); + } }