Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,25 @@

import javafx.fxml.FXML;
import javafx.scene.control.Button;
import javafx.scene.layout.VBox;
import net.rgielen.fxweaver.core.FxControllerAndView;
import net.rgielen.fxweaver.core.FxmlView;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

@Component
@FxmlView
public class MainWindow {

private final FxControllerAndView<SomeDialog, VBox> someDialog;
@Autowired
private SomeDialog someDialog;

@FXML
public Button openDialogButton;

public MainWindow(FxControllerAndView<SomeDialog, VBox> someDialog) {
this.someDialog = someDialog;
}

@FXML
public void initialize() {
openDialogButton.setOnAction(
actionEvent -> someDialog.getController().show()
actionEvent -> this.someDialog.show()
);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
package net.rgielen.fxweaver.samples.springboot.starter.controller;

import javafx.application.Platform;
import javafx.fxml.FXML;
import javafx.scene.Scene;
import javafx.scene.control.Button;
import javafx.scene.layout.VBox;
import javafx.stage.Stage;
import net.rgielen.fxweaver.core.FxControllerAndView;
import net.rgielen.fxweaver.core.FxWeaver;
import net.rgielen.fxweaver.core.FxmlView;
import org.springframework.beans.factory.InjectionPoint;
import org.springframework.stereotype.Component;


Expand All @@ -31,12 +29,14 @@ public class SomeDialog {

@FXML
public void initialize() {
this.stage = new Stage();
stage.setScene(new Scene(dialog));
Platform.runLater(() -> {
this.stage = new Stage();
stage.setScene(new Scene(dialog));

closeButton.setOnAction(
closeButton.setOnAction(
actionEvent -> stage.close()
);
);
});
}

public void show() {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
fxweaver.autoscan.basepackages=net.rgielen.fxweaver.samples.springboot.starter

Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,27 @@
import javafx.fxml.FXMLLoader;
import javafx.scene.Node;
import net.rgielen.fxweaver.core.FxControllerAndView;
import net.rgielen.fxweaver.core.FxLoadException;
import net.rgielen.fxweaver.core.FxWeaver;
import net.rgielen.fxweaver.core.FxmlView;
import net.rgielen.fxweaver.spring.InjectionPointLazyFxControllerAndViewResolver;
import net.rgielen.fxweaver.spring.SpringFxWeaver;

import java.util.Arrays;
import java.util.Optional;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InjectionPoint;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Scope;
import org.springframework.core.type.filter.AnnotationTypeFilter;

/**
* FxWeaverAutoConfiguration.
Expand All @@ -27,11 +37,32 @@
SpringFxWeaver.class
})
public class FxWeaverAutoConfiguration {

private static final Logger LOG = LoggerFactory.getLogger(FxWeaverAutoConfiguration.class);

@Value("${fxweaver.autoscan.basepackages:#{null}}")
private Optional<String[]> autoScanBasePackages;

@Bean
@ConditionalOnMissingBean(FxWeaver.class)
public FxWeaver fxWeaver(ConfigurableApplicationContext applicationContext) {
return new SpringFxWeaver(applicationContext);
SpringFxWeaver springFxWeaver = new SpringFxWeaver(applicationContext);
if (this.autoScanBasePackages.isPresent()) {
ClassPathScanningCandidateComponentProvider scanner = new ClassPathScanningCandidateComponentProvider(false);
scanner.addIncludeFilter(new AnnotationTypeFilter(FxmlView.class));
Arrays.stream(this.autoScanBasePackages.get()).forEach(autoScanBasePackage -> {
scanner.findCandidateComponents(autoScanBasePackage).forEach(beanDefinition -> {
try {
LOG.info("Initializing fxmlview annnotated bean '{}'...", beanDefinition.getBeanClassName());
springFxWeaver.load(Class.forName(beanDefinition.getBeanClassName()));
} catch (ClassNotFoundException cnfe) {
throw new FxLoadException(String.format("Class '%s' not found!", beanDefinition.getBeanClassName()), cnfe);
}
});
});
} else {
LOG.info("Config property 'fxweaver.autoscan.basepackages' not set, skipping auto fxmlview annotated bean registration.");
}
return springFxWeaver;
}

@Bean
Expand Down