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

changing .getEnabled() to .getSelected()

This commit is contained in:
Joakim Erdfelt 2014-11-20 16:24:56 -07:00
parent 9ea0b74f73
commit 1d12decce7
6 changed files with 11 additions and 11 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/BaseBuilder.java
View File

@ -105,7 +105,7 @@ public class BaseBuilder
else
{
Licensing licensing = new Licensing();
for (Module module : startArgs.getAllModules().getEnabled())
for (Module module : startArgs.getAllModules().getSelected())
{
licensing.addModule(module);
}

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

@ -310,7 +310,7 @@ public class Main
modules.buildGraph();
args.setAllModules(modules);
List<Module> activeModules = modules.getEnabled();
List<Module> activeModules = modules.getSelected();
// ------------------------------------------------------------
// 5) Lib & XML Expansion / Resolution

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

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

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

@ -51,7 +51,7 @@ public class Modules extends Graph<Module>
ordered.addAll(getNodes());
Collections.sort(ordered,new Module.NameComparator());
List<Module> active = getEnabled();
List<Module> active = getSelected();
for (Module module : ordered)
{

6
jetty-start/src/main/java/org/eclipse/jetty/start/graph/Graph.java
View File

@ -188,7 +188,7 @@ public abstract class Graph<T extends Node<T>> implements Iterable<T>
ordered.addAll(nodes.values());
Collections.sort(ordered,new NodeDepthComparator());
List<T> active = getEnabled();
List<T> active = getSelected();
for (T module : ordered)
{
@ -208,7 +208,7 @@ public abstract class Graph<T extends Node<T>> implements Iterable<T>
ordered.addAll(nodes.values());
Collections.sort(ordered,new NodeDepthComparator());
List<T> active = getEnabled();
List<T> active = getSelected();
for (T module : ordered)
{
@ -265,7 +265,7 @@ public abstract class Graph<T extends Node<T>> implements Iterable<T>
/**
* Get the list of Selected nodes.
*/
public List<T> getEnabled()
public List<T> getSelected()
{
return getMatching(new AnySelectionPredicate());
}

8
jetty-start/src/test/java/org/eclipse/jetty/start/ModulesTest.java
View File

@ -214,7 +214,7 @@ public class ModulesTest
expected.add("jsp-impl");
List<String> resolved = new ArrayList<>();
for (Module module : modules.getEnabled())
for (Module module : modules.getSelected())
{
resolved.add(module.getName());
}
@ -254,7 +254,7 @@ public class ModulesTest
modules.buildGraph();
// Collect active module list
List<Module> active = modules.getEnabled();
List<Module> active = modules.getSelected();
// Assert names are correct, and in the right order
List<String> expectedNames = new ArrayList<>();
@ -327,7 +327,7 @@ public class ModulesTest
// modules.dump();
// Collect active module list
List<Module> active = modules.getEnabled();
List<Module> active = modules.getSelected();
// Assert names are correct, and in the right order
List<String> expectedNames = new ArrayList<>();
@ -420,7 +420,7 @@ public class ModulesTest
// modules.dump();
// Collect active module list
List<Module> active = modules.getEnabled();
List<Module> active = modules.getSelected();
// Assert names are correct, and in the right order
List<String> expectedNames = new ArrayList<>();