diff options
| author | Leif Åstrand <legioth@gmail.com> | 2017-05-18 13:36:11 +0300 |
|---|---|---|
| committer | Aleksi Hietanen <aleksi@vaadin.com> | 2017-05-18 13:36:11 +0300 |
| commit | 548650bfe02f6e2582f06cecee2333099d951718 (patch) | |
| tree | ff091b44e1ee9470e95be4d199611d65eb23d1b0 /server | |
| parent | 4792d7620a0366dea0663b2c3aad57dae7e65f68 (diff) | |
| download | vaadin-framework-548650bfe02f6e2582f06cecee2333099d951718.tar.gz vaadin-framework-548650bfe02f6e2582f06cecee2333099d951718.zip | |
Rename findAndFilterDependencies to findDependencies (#9366)
The old findDependencies method is made private since it's only an
implementation detail and should not be used from outside the class.
At the same time, the new findAndFilterDependencies method is renamed to
findDependencies since there's no longer necessary to have a name that
distinguishes it from the variant that doesn't do any filtering.
Diffstat (limited to 'server')
3 files changed, 8 insertions, 8 deletions
diff --git a/server/src/main/java/com/vaadin/server/BootstrapHandler.java b/server/src/main/java/com/vaadin/server/BootstrapHandler.java index bd091c6cc1..01fd2bf880 100644 --- a/server/src/main/java/com/vaadin/server/BootstrapHandler.java +++ b/server/src/main/java/com/vaadin/server/BootstrapHandler.java @@ -577,10 +577,10 @@ public abstract class BootstrapHandler extends SynchronizedRequestHandler { .attr("href", themeUri + "/favicon.ico"); } - Collection<? extends Dependency> deps = Dependency - .findAndFilterDependencies(Collections.singletonList(uiClass), - context.getSession().getCommunicationManager(), - new FilterContext(context.getSession())); + Collection<? extends Dependency> deps = Dependency.findDependencies( + Collections.singletonList(uiClass), + context.getSession().getCommunicationManager(), + new FilterContext(context.getSession())); for (Dependency dependency : deps) { Type type = dependency.getType(); String url = context.getUriResolver() diff --git a/server/src/main/java/com/vaadin/server/communication/UidlWriter.java b/server/src/main/java/com/vaadin/server/communication/UidlWriter.java index ee25a95f8a..c6c2d77fcb 100644 --- a/server/src/main/java/com/vaadin/server/communication/UidlWriter.java +++ b/server/src/main/java/com/vaadin/server/communication/UidlWriter.java @@ -285,8 +285,8 @@ public class UidlWriter implements Serializable { List<Dependency> dependencies = new ArrayList<>(); dependencies.addAll(ui.getPage().getPendingDependencies()); - dependencies.addAll(Dependency.findAndFilterDependencies( - newConnectorTypes, manager, new FilterContext(session))); + dependencies.addAll(Dependency.findDependencies(newConnectorTypes, + manager, new FilterContext(session))); // Include dependencies in output if there are any if (!dependencies.isEmpty()) { diff --git a/server/src/main/java/com/vaadin/ui/Dependency.java b/server/src/main/java/com/vaadin/ui/Dependency.java index 537887a9f2..6557590c08 100644 --- a/server/src/main/java/com/vaadin/ui/Dependency.java +++ b/server/src/main/java/com/vaadin/ui/Dependency.java @@ -158,7 +158,7 @@ public class Dependency implements Serializable { * @return the list of found dependencies */ @SuppressWarnings("deprecation") - public static List<Dependency> findDependencies( + private static List<Dependency> findDependencies( List<Class<? extends ClientConnector>> connectorTypes, LegacyCommunicationManager manager) { List<Dependency> dependencies = new ArrayList<>(); @@ -191,7 +191,7 @@ public class Dependency implements Serializable { * the context information for the filtering operation * @return the list of found and filtered dependencies */ - public static List<Dependency> findAndFilterDependencies( + public static List<Dependency> findDependencies( List<Class<? extends ClientConnector>> connectorTypes, LegacyCommunicationManager manager, FilterContext context) { List<Dependency> dependencies = findDependencies(connectorTypes, |