Skip to content

Prepare for localization #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kerner1000 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Prepare for localization #21

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
326da34
Prepare for localization
kerner1000 Sep 23, 2022
b5c0e48
Prepare for localization
kerner1000 Sep 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions .../main/java/net/rgielen/fxweaver/spring/InjectionPointLazyFxControllerAndViewResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import org.springframework.core.ResolvableType;

import java.util.Optional;
import java.util.ResourceBundle;

/**
* This class helps to create a generic {@link FxControllerAndView} bean factory that can be used for direct injection
Expand Down Expand Up @@ -48,10 +49,17 @@
*/
public class InjectionPointLazyFxControllerAndViewResolver {

private final FxWeaver fxWeaver;
protected final FxWeaver fxWeaver;

public InjectionPointLazyFxControllerAndViewResolver(FxWeaver fxWeaver) {
protected final ResourceBundle resourceBundle;

public InjectionPointLazyFxControllerAndViewResolver(FxWeaver fxWeaver, ResourceBundle resourceBundle) {
this.fxWeaver = fxWeaver;
this.resourceBundle = resourceBundle;
}

public InjectionPointLazyFxControllerAndViewResolver(FxWeaver fxWeaver) {
this(fxWeaver, null);
}

/**
Expand All @@ -69,14 +77,14 @@ public <C, V extends Node> FxControllerAndView<C, V> resolve(InjectionPoint inje
}
try {
Class<C> controllerClass = (Class<C>) resolvableType.getGenerics()[0].resolve();
return new LazyFxControllerAndView<>(() -> fxWeaver.load(controllerClass));
return new LazyFxControllerAndView<>(() -> fxWeaver.load(controllerClass, resourceBundle));
} catch (Exception e) {
throw new IllegalArgumentException(
"Generic controller type not resolvable for injection point " + injectionPoint, e);
}
}

private ResolvableType findResolvableType(InjectionPoint injectionPoint) {
protected ResolvableType findResolvableType(InjectionPoint injectionPoint) {
return Optional.ofNullable(injectionPoint.getMethodParameter())
.map(ResolvableType::forMethodParameter)
// TODO: Refactor the following to use .or() when dropping Java 8 support
Expand Down