Skip to content

Commit bb03a10

Browse files
kamil-sitakamil-sita
committed
Move ModuleFX code to its module
1 parent 2a4de57 commit bb03a10

35 files changed

+105
-64
lines changed

‎gui-local/pom.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,17 @@
217217
<scope>test</scope>
218218
</dependency>
219219

220+
<dependency>
221+
<groupId>place.sita.labelle</groupId>
222+
<artifactId>module-fx</artifactId>
223+
<version>0.0.1-SNAPSHOT</version>
224+
</dependency>
225+
226+
<dependency>
227+
<groupId>place.sita.labelle</groupId>
228+
<artifactId>module-fx-spring-boot</artifactId>
229+
<version>0.0.1-SNAPSHOT</version>
230+
</dependency>
220231

221232
</dependencies>
222233

‎gui-local/src/main/java/place/sita/labelle/gui/local/GuiConfig.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
import org.springframework.context.annotation.Import;
55
import org.springframework.scheduling.annotation.EnableScheduling;
66
import place.sita.labelle.core.CoreAppConfig;
7+
import place.sita.modulefx.SpringChildrenFactory;
78

8-
@Import(CoreAppConfig.class)
9+
@Import({CoreAppConfig.class, SpringChildrenFactory.class})
910
@EnableScheduling
1011
@SpringBootApplication
1112
public class GuiConfig {

‎gui-local/src/main/java/place/sita/labelle/gui/local/StageConfiguration.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
import org.springframework.context.ConfigurableApplicationContext;
1313
import org.springframework.stereotype.Component;
1414
import place.sita.labelle.core.shutdown.ShutdownRegistry;
15-
import place.sita.labelle.gui.local.fx.UnstableSceneReporter;
16-
import place.sita.labelle.gui.local.fx.modulefx.ChildrenFactory;
17-
import place.sita.labelle.gui.local.fx.modulefx.FxControllerLoader;
18-
import place.sita.labelle.gui.local.fx.modulefx.FxSceneBuilderProcessors;
19-
import place.sita.labelle.gui.local.fx.threading.ThreadingSupportSupplier;
15+
import place.sita.modulefx.UnstableSceneReporter;
16+
import place.sita.modulefx.ChildrenFactory;
17+
import place.sita.modulefx.FxControllerLoader;
18+
import place.sita.modulefx.FxSceneBuilderProcessors;
19+
import place.sita.modulefx.threading.ThreadingSupportSupplier;
2020
import place.sita.labelle.gui.local.menu.Menu;
2121

2222
import java.util.*;

‎gui-local/src/main/java/place/sita/labelle/gui/local/fx/LabPaginatorFactory.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import javafx.scene.control.Pagination;
88
import javafx.scene.control.ProgressIndicator;
99
import javafx.scene.layout.StackPane;
10-
import place.sita.labelle.gui.local.fx.threading.Threading;
11-
import place.sita.labelle.gui.local.fx.threading.Threading.KeyStone;
10+
import place.sita.modulefx.threading.Threading;
11+
import place.sita.modulefx.threading.Threading.KeyStone;
1212

1313
import java.util.List;
1414
import java.util.function.BiFunction;

‎gui-local/src/main/java/place/sita/labelle/gui/local/fx/modulefx/LabelleModuleFxConfig.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package place.sita.labelle.gui.local.fx.modulefx;
2+
3+
import org.springframework.stereotype.Component;
4+
import place.sita.modulefx.ModuleFxConfig;
5+
6+
@Component
7+
public class LabelleModuleFxConfig implements ModuleFxConfig {
8+
@Override
9+
public String getPackage() {
10+
return "place.sita.labelle";
11+
}
12+
}

‎gui-local/src/main/java/place/sita/labelle/gui/local/fx/threading/ThreadingSupportSupplierShutdownable.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import org.springframework.stereotype.Component;
44
import place.sita.labelle.core.shutdown.Shutdownable;
5+
import place.sita.modulefx.threading.ThreadingSupportSupplier;
56

67
@Component
78
public class ThreadingSupportSupplierShutdownable implements Shutdownable {

‎gui-local/src/main/java/place/sita/labelle/gui/local/menu/Menu.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@
77
import org.slf4j.Logger;
88
import org.slf4j.LoggerFactory;
99
import org.springframework.context.annotation.Scope;
10-
import org.springframework.context.event.EventListener;
1110
import org.springframework.stereotype.Component;
1211
import place.sita.magicscheduler.scheduler.events.TaskExecutionCompleteEvent;
1312
import place.sita.magicscheduler.scheduler.events.TaskPickedUpEvent;
14-
import place.sita.labelle.gui.local.fx.threading.Threading;
13+
import place.sita.modulefx.threading.Threading;
1514
import place.sita.modulefx.annotations.FxInjectTabs;
1615

1716
import java.util.concurrent.atomic.AtomicInteger;

‎gui-local/src/main/java/place/sita/labelle/gui/local/repositoryfx/RepositoryTab.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import place.sita.labelle.gui.local.fx.ButtonCell;
2323
import place.sita.labelle.gui.local.fx.LabPaginatorFactory;
2424
import place.sita.labelle.gui.local.fx.LabPaginatorFactory.LabPaginator;
25-
import place.sita.labelle.gui.local.fx.threading.Threading;
25+
import place.sita.modulefx.threading.Threading;
2626
import place.sita.labelle.core.filtering.LogicalExpr;
2727
import place.sita.labelle.core.images.loading.ImageCachingLoader;
2828
import place.sita.labelle.core.repository.inrepository.image.ImageResponse;
@@ -31,7 +31,7 @@
3131
import place.sita.labelle.core.repository.repositories.Repository;
3232
import place.sita.labelle.core.repository.repositories.RepositoryService;
3333
import place.sita.labelle.core.utils.Result2;
34-
import place.sita.labelle.gui.local.fx.threading.Threading.KeyStone;
34+
import place.sita.modulefx.threading.Threading.KeyStone;
3535
import place.sita.labelle.gui.local.menu.MainMenuTab;
3636
import place.sita.modulefx.annotations.FxChild;
3737
import place.sita.modulefx.annotations.FxTab;

‎gui-local/src/main/java/place/sita/labelle/gui/local/repositoryfx/TagDeltasComponentController.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@
44
import javafx.collections.FXCollections;
55
import javafx.collections.ObservableList;
66
import org.springframework.context.annotation.Scope;
7-
import org.springframework.context.event.EventListener;
87
import org.springframework.stereotype.Component;
98
import place.sita.labelle.core.repository.inrepository.InRepositoryService;
109
import place.sita.labelle.core.repository.inrepository.delta.DeltaService;
1110
import place.sita.labelle.core.repository.inrepository.delta.TagDeltaType;
1211
import place.sita.labelle.core.repository.inrepository.image.ImageResponse;
1312
import place.sita.labelle.gui.local.fx.ButtonCell;
14-
import place.sita.labelle.gui.local.fx.threading.Threading;
13+
import place.sita.modulefx.threading.Threading;
1514
import place.sita.modulefx.annotations.FxNode;
1615
import javafx.event.ActionEvent;
1716
import javafx.fxml.FXML;

‎gui-local/src/main/java/place/sita/labelle/gui/local/schedulerexecutionsfx/SchedulerExecutionViewConfigurationFx.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.springframework.context.annotation.Scope;
88
import org.springframework.stereotype.Component;
99
import place.sita.labelle.gui.local.fx.Alerts;
10-
import place.sita.labelle.gui.local.fx.threading.Threading;
10+
import place.sita.modulefx.threading.Threading;
1111
import place.sita.magicscheduler.ExecutionsService;
1212
import place.sita.modulefx.annotations.FxNode;
1313
import place.sita.modulefx.annotations.PostFxConstruct;

‎gui-local/src/test/java/place/sita/labelle/GuiTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import org.springframework.beans.factory.annotation.Autowired;
77
import org.testfx.framework.junit5.ApplicationExtension;
88
import place.sita.labelle.core.cache.CacheRegistry;
9-
import place.sita.labelle.gui.local.fx.UnstableSceneReporter;
9+
import place.sita.modulefx.UnstableSceneReporter;
1010
import place.sita.labelle.jooq.Tables;
1111

1212
@ExtendWith(ApplicationExtension.class)

‎module-fx-spring-boot/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@
6060
<version>22</version>
6161
</dependency>
6262

63+
<dependency>
64+
<groupId>org.springframework.boot</groupId>
65+
<artifactId>spring-boot-starter</artifactId>
66+
</dependency>
6367
</dependencies>
6468

6569

‎module-fx-spring-boot/src/main/java/place/sita/modulefx/ModuleFxConfig.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package place.sita.modulefx;
2+
3+
public interface ModuleFxConfig {
4+
5+
String getPackage();
6+
7+
}

‎gui-local/src/main/java/place/sita/labelle/gui/local/fx/modulefx/SpringChildrenFactory.java renamed to ‎module-fx-spring-boot/src/main/java/place/sita/modulefx/SpringChildrenFactory.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package place.sita.labelle.gui.local.fx.modulefx;
1+
package place.sita.modulefx;
22

33
import org.springframework.beans.factory.config.BeanDefinition;
44
import org.springframework.context.ApplicationContext;
@@ -13,9 +13,11 @@
1313
public class SpringChildrenFactory implements ChildrenFactory {
1414

1515
private final ApplicationContext context;
16+
private final ModuleFxConfig moduleFxConfig;
1617

17-
public SpringChildrenFactory(ApplicationContext context) {
18+
public SpringChildrenFactory(ApplicationContext context, ModuleFxConfig moduleFxConfig) {
1819
this.context = context;
20+
this.moduleFxConfig = moduleFxConfig;
1921
}
2022

2123
@Override
@@ -31,7 +33,7 @@ public <T> List<Class<?>> getClasses(Class<T> clazz) {
3133

3234
List<Class<?>> classes = new ArrayList<>();
3335

34-
for (BeanDefinition beanDef : provider.findCandidateComponents("place.sita.labelle")) {
36+
for (BeanDefinition beanDef : provider.findCandidateComponents(moduleFxConfig.getPackage())) {
3537
try {
3638
// let's hope that this is the actual class, and not something else.
3739
// as it doesn't have to be, see javadoc

‎module-fx/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@
5454
<version>22</version>
5555
</dependency>
5656

57+
<dependency>
58+
<groupId>org.slf4j</groupId>
59+
<artifactId>slf4j-api</artifactId>
60+
</dependency>
5761
</dependencies>
5862

5963

‎gui-local/src/main/java/place/sita/labelle/gui/local/fx/modulefx/ChildrenFactory.java renamed to ‎module-fx/src/main/java/place/sita/modulefx/ChildrenFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package place.sita.labelle.gui.local.fx.modulefx;
1+
package place.sita.modulefx;
22

33
import java.util.List;
44

‎gui-local/src/main/java/place/sita/labelle/gui/local/fx/modulefx/FxControllerLoader.java renamed to ‎module-fx/src/main/java/place/sita/modulefx/FxControllerLoader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package place.sita.labelle.gui.local.fx.modulefx;
1+
package place.sita.modulefx;
22

33
import javafx.scene.Node;
44

‎gui-local/src/main/java/place/sita/labelle/gui/local/fx/modulefx/FxSceneBuilder.java renamed to ‎module-fx/src/main/java/place/sita/modulefx/FxSceneBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package place.sita.labelle.gui.local.fx.modulefx;
1+
package place.sita.modulefx;
22

33
import javafx.fxml.FXMLLoader;
44
import javafx.scene.Node;

‎gui-local/src/main/java/place/sita/labelle/gui/local/fx/modulefx/FxSceneBuilderProcessor.java renamed to ‎module-fx/src/main/java/place/sita/modulefx/FxSceneBuilderProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package place.sita.labelle.gui.local.fx.modulefx;
1+
package place.sita.modulefx;
22

33
public interface FxSceneBuilderProcessor {
44

‎gui-local/src/main/java/place/sita/labelle/gui/local/fx/modulefx/FxSceneBuilderProcessors.java renamed to ‎module-fx/src/main/java/place/sita/modulefx/FxSceneBuilderProcessors.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
package place.sita.labelle.gui.local.fx.modulefx;
1+
package place.sita.modulefx;
22

3-
import place.sita.labelle.gui.local.fx.UnstableSceneReporter;
4-
import place.sita.labelle.gui.local.fx.modulefx.processors.*;
5-
import place.sita.labelle.gui.local.fx.modulefx.processors.tabs.InjectTabsProcessor;
3+
import place.sita.modulefx.processors.*;
4+
import place.sita.modulefx.processors.tabs.InjectTabsProcessor;
65

76
import java.util.ArrayList;
87
import java.util.List;

‎gui-local/src/main/java/place/sita/labelle/gui/local/fx/modulefx/FxSetupContext.java renamed to ‎module-fx/src/main/java/place/sita/modulefx/FxSetupContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package place.sita.labelle.gui.local.fx.modulefx;
1+
package place.sita.modulefx;
22

33
import javafx.scene.Node;
44

‎gui-local/src/main/java/place/sita/labelle/gui/local/fx/UnstableSceneReporter.java renamed to ‎module-fx/src/main/java/place/sita/modulefx/UnstableSceneReporter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package place.sita.labelle.gui.local.fx;
1+
package place.sita.modulefx;
22

33
import org.slf4j.Logger;
44
import org.slf4j.LoggerFactory;

‎gui-local/src/main/java/place/sita/labelle/gui/local/fx/modulefx/processors/CheckSetHeightCorrelationProcessor.java renamed to ‎module-fx/src/main/java/place/sita/modulefx/processors/CheckSetHeightCorrelationProcessor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package place.sita.labelle.gui.local.fx.modulefx.processors;
1+
package place.sita.modulefx.processors;
22

33
import javafx.scene.Node;
44
import javafx.scene.layout.Region;
5-
import place.sita.labelle.gui.local.fx.modulefx.FxSceneBuilderProcessor;
6-
import place.sita.labelle.gui.local.fx.modulefx.FxSetupContext;
5+
import place.sita.modulefx.FxSceneBuilderProcessor;
6+
import place.sita.modulefx.FxSetupContext;
77
import place.sita.modulefx.annotations.FxDictatesHeight;
88

99
public class CheckSetHeightCorrelationProcessor implements FxSceneBuilderProcessor {

‎gui-local/src/main/java/place/sita/labelle/gui/local/fx/modulefx/processors/InjectChildrenProcessor.java renamed to ‎module-fx/src/main/java/place/sita/modulefx/processors/InjectChildrenProcessor.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
package place.sita.labelle.gui.local.fx.modulefx.processors;
1+
package place.sita.modulefx.processors;
22

33
import javafx.scene.Node;
44
import javafx.scene.layout.AnchorPane;
55
import javafx.scene.layout.Pane;
6-
import org.springframework.util.ReflectionUtils;
7-
import place.sita.labelle.gui.local.fx.modulefx.ChildrenFactory;
8-
import place.sita.labelle.gui.local.fx.modulefx.FxSceneBuilderProcessor;
9-
import place.sita.labelle.gui.local.fx.modulefx.FxSetupContext;
6+
import place.sita.modulefx.ChildrenFactory;
7+
import place.sita.modulefx.FxSceneBuilderProcessor;
8+
import place.sita.modulefx.FxSetupContext;
109
import place.sita.modulefx.annotations.FxChild;
1110
import place.sita.modulefx.annotations.FxNode;
1211

@@ -61,7 +60,10 @@ private static Node getParentNode(Object parentController, Class<?> parentContro
6160
// should hold many children, we should throw an exception
6261

6362
String fieldToPatchName = childConfig.patchNode();
64-
Field fieldToPatch = ReflectionUtils.findField(parentControllerClass, fieldToPatchName);
63+
Field fieldToPatch = Arrays.stream(parentControllerClass.getDeclaredFields())
64+
.filter(field -> field.getName().equals(fieldToPatchName))
65+
.findFirst()
66+
.orElse(null);
6567
if (fieldToPatch == null) {
6668
throw new RuntimeException("Cannot find field to patch: " + fieldToPatchName + " in " + classType.getName());
6769
}

‎gui-local/src/main/java/place/sita/labelle/gui/local/fx/modulefx/processors/InjectParentFieldProcessor.java renamed to ‎module-fx/src/main/java/place/sita/modulefx/processors/InjectParentFieldProcessor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package place.sita.labelle.gui.local.fx.modulefx.processors;
1+
package place.sita.modulefx.processors;
22

3-
import place.sita.labelle.gui.local.fx.modulefx.FxSceneBuilderProcessor;
4-
import place.sita.labelle.gui.local.fx.modulefx.FxSetupContext;
3+
import place.sita.modulefx.FxSceneBuilderProcessor;
4+
import place.sita.modulefx.FxSetupContext;
55
import place.sita.modulefx.annotations.Parent;
66

77
import java.util.Arrays;

‎gui-local/src/main/java/place/sita/labelle/gui/local/fx/modulefx/processors/PostFxInjectProcessor.java renamed to ‎module-fx/src/main/java/place/sita/modulefx/processors/PostFxInjectProcessor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package place.sita.labelle.gui.local.fx.modulefx.processors;
1+
package place.sita.modulefx.processors;
22

3-
import place.sita.labelle.gui.local.fx.modulefx.FxSceneBuilderProcessor;
4-
import place.sita.labelle.gui.local.fx.modulefx.FxSetupContext;
3+
import place.sita.modulefx.FxSceneBuilderProcessor;
4+
import place.sita.modulefx.FxSetupContext;
55
import place.sita.modulefx.annotations.PostFxConstruct;
66

77
import java.lang.reflect.InvocationTargetException;

‎gui-local/src/main/java/place/sita/labelle/gui/local/fx/modulefx/processors/tabs/FxSmartTab.java renamed to ‎module-fx/src/main/java/place/sita/modulefx/processors/tabs/FxSmartTab.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package place.sita.labelle.gui.local.fx.modulefx.processors.tabs;
1+
package place.sita.modulefx.processors.tabs;
22

33
import javafx.scene.control.Tab;
4-
import place.sita.labelle.gui.local.fx.UnstableSceneReporter;
4+
import place.sita.modulefx.UnstableSceneReporter;
55

66
public interface FxSmartTab {
77

‎gui-local/src/main/java/place/sita/labelle/gui/local/fx/modulefx/processors/tabs/FxSmartTabFactory.java renamed to ‎module-fx/src/main/java/place/sita/modulefx/processors/tabs/FxSmartTabFactory.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
package place.sita.labelle.gui.local.fx.modulefx.processors.tabs;
1+
package place.sita.modulefx.processors.tabs;
22

33
import javafx.application.Platform;
44
import javafx.scene.Node;
55
import javafx.scene.control.ProgressIndicator;
66
import javafx.scene.control.Tab;
77
import javafx.scene.layout.AnchorPane;
88
import javafx.scene.layout.Region;
9-
import place.sita.labelle.gui.local.fx.UnstableSceneReporter;
10-
import place.sita.labelle.gui.local.fx.modulefx.ChildrenFactory;
11-
import place.sita.labelle.gui.local.fx.modulefx.FxSetupContext;
9+
import place.sita.modulefx.ChildrenFactory;
10+
import place.sita.modulefx.FxSetupContext;
11+
import place.sita.modulefx.UnstableSceneReporter;
1212
import place.sita.modulefx.annotations.FxTab;
1313

1414
import java.util.UUID;

‎gui-local/src/main/java/place/sita/labelle/gui/local/fx/modulefx/processors/tabs/FxSmartTabManager.java renamed to ‎module-fx/src/main/java/place/sita/modulefx/processors/tabs/FxSmartTabManager.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package place.sita.labelle.gui.local.fx.modulefx.processors.tabs;
1+
package place.sita.modulefx.processors.tabs;
22

33
import javafx.scene.control.Tab;
44
import javafx.scene.control.TabPane;
5-
import place.sita.labelle.gui.local.fx.UnstableSceneReporter;
6-
import place.sita.labelle.gui.local.fx.threading.Threading;
5+
import place.sita.modulefx.UnstableSceneReporter;
6+
import place.sita.modulefx.threading.Threading;
77

88
import java.util.LinkedHashMap;
99
import java.util.Map;

‎gui-local/src/main/java/place/sita/labelle/gui/local/fx/modulefx/processors/tabs/InjectTabsProcessor.java renamed to ‎module-fx/src/main/java/place/sita/modulefx/processors/tabs/InjectTabsProcessor.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package place.sita.labelle.gui.local.fx.modulefx.processors.tabs;
1+
package place.sita.modulefx.processors.tabs;
22

33
import javafx.scene.control.TabPane;
4-
import place.sita.labelle.gui.local.fx.UnstableSceneReporter;
5-
import place.sita.labelle.gui.local.fx.modulefx.ChildrenFactory;
6-
import place.sita.labelle.gui.local.fx.modulefx.FxSceneBuilderProcessor;
7-
import place.sita.labelle.gui.local.fx.modulefx.FxSetupContext;
4+
import place.sita.modulefx.ChildrenFactory;
5+
import place.sita.modulefx.FxSceneBuilderProcessor;
6+
import place.sita.modulefx.FxSetupContext;
7+
import place.sita.modulefx.UnstableSceneReporter;
88
import place.sita.modulefx.annotations.FxInjectTabs;
99
import place.sita.modulefx.annotations.FxTab;
1010

‎gui-local/src/main/java/place/sita/labelle/gui/local/fx/threading/Cancellable.java renamed to ‎module-fx/src/main/java/place/sita/modulefx/threading/Cancellable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package place.sita.labelle.gui.local.fx.threading;
1+
package place.sita.modulefx.threading;
22

33
public interface Cancellable {
44
void cancelPropagation();

‎gui-local/src/main/java/place/sita/labelle/gui/local/fx/threading/Threading.java renamed to ‎module-fx/src/main/java/place/sita/modulefx/threading/Threading.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package place.sita.labelle.gui.local.fx.threading;
1+
package place.sita.modulefx.threading;
22

33
import javafx.application.Platform;
4-
import place.sita.labelle.core.utils.Either;
4+
import place.sita.modulefx.util.Either;
55

66
public class Threading {
77

‎gui-local/src/main/java/place/sita/labelle/gui/local/fx/threading/ThreadingSupportSupplier.java renamed to ‎module-fx/src/main/java/place/sita/modulefx/threading/ThreadingSupportSupplier.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package place.sita.labelle.gui.local.fx.threading;
1+
package place.sita.modulefx.threading;
22

33
import java.util.concurrent.ExecutorService;
44
import java.util.concurrent.Executors;

‎core-common/src/main/java/place/sita/labelle/core/utils/Either.java renamed to ‎module-fx/src/main/java/place/sita/modulefx/util/Either.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package place.sita.labelle.core.utils;
1+
package place.sita.modulefx.util;
22

33
import java.util.Objects;
44

0 commit comments

Comments
 (0)