RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr24S08CUAsignacionGrupoRecursosAPlanificacionItEr23S10: Improving cobertura.

Browse source
This commit is contained in:
Óscar González Fernández 2009-09-01 11:30:02 +02:00
parent 88e1470d8c
commit fc432fedce
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ganttzk/src/main/java/org/zkoss/ganttz/util/script/ScriptDependenciesSorter.java
View file

@ -40,15 +40,14 @@ public class ScriptDependenciesSorter implements IScriptsRegister {
private List<ScriptDependency> extract(Set<ScriptDependency> alreadyAdded,
ScriptDependency scriptDependency) {
List<ScriptDependency> result = new ArrayList<ScriptDependency>();
if (alreadyAdded.contains(scriptDependency)) {
return result;
}
for (ScriptDependency d : scriptDependency.getDependsOn()) {
if (!alreadyAdded.contains(d)) {
result.addAll(extract(alreadyAdded, d));
}
}
if (!alreadyAdded.contains(scriptDependency)) {
result.add(scriptDependency);
alreadyAdded.add(scriptDependency);
result.addAll(extract(alreadyAdded, d));
}
result.add(scriptDependency);
alreadyAdded.add(scriptDependency);
return result;
}

3
ganttzk/src/test/java/org/zkoss/ganttz/util/script/ScriptDependenciesSorterTest.java
View file

@ -52,8 +52,9 @@ public class ScriptDependenciesSorterTest {
.asList(new ScriptDependency("B"))));
scriptDependenciesSorter.add(new ScriptDependency("C", Arrays
.asList(new ScriptDependency("B"))));
scriptDependenciesSorter.add(new ScriptDependency("D"));
assertThat(scriptDependenciesSorter.getScriptDependenciesOrderered(),
scriptsReturnedAre("B", "A", "C"));
scriptsReturnedAre("B", "A", "C", "D"));
}
private Matcher<List<ScriptDependency>> scriptsReturnedAre(String... urls) {