Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleaning up resolveEnabled() deprecation

This commit is contained in:
Joakim Erdfelt 2014-11-19 10:27:25 -07:00
parent aeccef2154
commit 1561de0f81
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-start/src/main/java/org/eclipse/jetty/start/ModuleGraphWriter.java
View File

@ -103,7 +103,7 @@ public class ModuleGraphWriter
out.println(" ssize = \"20,40\""); out.println(" ssize = \"20,40\"");
out.println(" ];"); out.println(" ];");
List<Module> enabled = modules.resolveEnabled(); List<Module> enabled = modules.getEnabled();
// Module Nodes // Module Nodes
writeModules(out,modules,enabled); writeModules(out,modules,enabled);

3
jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java
View File

@ -386,7 +386,7 @@ public class Modules implements Iterable<Module>
ordered.addAll(modules.values()); ordered.addAll(modules.values());
Collections.sort(ordered,new Module.DepthComparator()); Collections.sort(ordered,new Module.DepthComparator());
List<Module> active = resolveEnabled(); List<Module> active = getEnabled();
for (Module module : ordered) for (Module module : ordered)
{ {
@ -729,6 +729,7 @@ public class Modules implements Iterable<Module>
* Resolve the execution order of the enabled modules, and all dependent modules, based on depth first transitive reduction. * Resolve the execution order of the enabled modules, and all dependent modules, based on depth first transitive reduction.
* *
* @return the list of active modules (plus dependent modules), in execution order. * @return the list of active modules (plus dependent modules), in execution order.
* @deprecated use {@link #getEnabled()} and {@link #assertModulesValid(Collection)} instead.
*/ */
@Deprecated @Deprecated
public List<Module> resolveEnabled() public List<Module> resolveEnabled()