Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt2014-11-20 23:24:56 +0000
committerJoakim Erdfelt2014-11-20 23:25:00 +0000
commit1d12decce7c2c8c832adc122a54a9cdc7b034b55 (patch)
tree43e9b611db3cdf5fdf931c7f79f977e086d89835 /jetty-start
parent9ea0b74f73e446ce7ce00677c1c716ec2b6a077e (diff)
downloadorg.eclipse.jetty.project-1d12decce7c2c8c832adc122a54a9cdc7b034b55.tar.gz
org.eclipse.jetty.project-1d12decce7c2c8c832adc122a54a9cdc7b034b55.tar.xz
org.eclipse.jetty.project-1d12decce7c2c8c832adc122a54a9cdc7b034b55.zip
changing .getEnabled() to .getSelected()
Diffstat (limited to 'jetty-start')
-rw-r--r--jetty-start/src/main/java/org/eclipse/jetty/start/BaseBuilder.java2
-rw-r--r--jetty-start/src/main/java/org/eclipse/jetty/start/Main.java2
-rw-r--r--jetty-start/src/main/java/org/eclipse/jetty/start/ModuleGraphWriter.java2
-rw-r--r--jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java2
-rw-r--r--jetty-start/src/main/java/org/eclipse/jetty/start/graph/Graph.java6
-rw-r--r--jetty-start/src/test/java/org/eclipse/jetty/start/ModulesTest.java8
6 files changed, 11 insertions, 11 deletions
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/BaseBuilder.java b/jetty-start/src/main/java/org/eclipse/jetty/start/BaseBuilder.java
index eaf4011e7d..75a11deed3 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/BaseBuilder.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/BaseBuilder.java
@@ -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);
}
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java b/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
index a3360f123e..b0f1de7ba2 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
@@ -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
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/ModuleGraphWriter.java b/jetty-start/src/main/java/org/eclipse/jetty/start/ModuleGraphWriter.java
index 029b299e44..1c49a78454 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/ModuleGraphWriter.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/ModuleGraphWriter.java
@@ -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);
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java b/jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java
index ba2a3efdc1..88d0a1f608 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java
@@ -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)
{
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/graph/Graph.java b/jetty-start/src/main/java/org/eclipse/jetty/start/graph/Graph.java
index e6a73eec0c..ed278b1a61 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/graph/Graph.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/graph/Graph.java
@@ -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());
}
diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/ModulesTest.java b/jetty-start/src/test/java/org/eclipse/jetty/start/ModulesTest.java
index a4daa2616a..e4612ff754 100644
--- a/jetty-start/src/test/java/org/eclipse/jetty/start/ModulesTest.java
+++ b/jetty-start/src/test/java/org/eclipse/jetty/start/ModulesTest.java
@@ -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<>();

Back to the top