Skip to content

Commit d46b8aa

Browse files
committed
Adapt to ShellFX changes
1 parent 1490cda commit d46b8aa

12 files changed

Lines changed: 87 additions & 85 deletions

java/ceffx-demo/pom.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -97,28 +97,28 @@
9797
<artifactId>patternfx-mvp</artifactId>
9898
</dependency>
9999
<dependency>
100-
<groupId>com.techsenger.tabshell</groupId>
101-
<artifactId>tabshell-material</artifactId>
100+
<groupId>com.techsenger.shellfx</groupId>
101+
<artifactId>shellfx-material</artifactId>
102102
</dependency>
103103
<dependency>
104-
<groupId>com.techsenger.tabshell</groupId>
105-
<artifactId>tabshell-core</artifactId>
104+
<groupId>com.techsenger.shellfx</groupId>
105+
<artifactId>shellfx-core</artifactId>
106106
</dependency>
107107
<dependency>
108-
<groupId>com.techsenger.tabshell</groupId>
109-
<artifactId>tabshell-icons</artifactId>
108+
<groupId>com.techsenger.shellfx</groupId>
109+
<artifactId>shellfx-icons</artifactId>
110110
</dependency>
111111
<dependency>
112-
<groupId>com.techsenger.tabshell</groupId>
113-
<artifactId>tabshell-shared</artifactId>
112+
<groupId>com.techsenger.shellfx</groupId>
113+
<artifactId>shellfx-shared</artifactId>
114114
</dependency>
115115
<dependency>
116-
<groupId>com.techsenger.tabshell</groupId>
117-
<artifactId>tabshell-layout</artifactId>
116+
<groupId>com.techsenger.shellfx</groupId>
117+
<artifactId>shellfx-layout</artifactId>
118118
</dependency>
119119
<dependency>
120-
<groupId>com.techsenger.tabshell</groupId>
121-
<artifactId>tabshell-devtools</artifactId>
120+
<groupId>com.techsenger.shellfx</groupId>
121+
<artifactId>shellfx-devtools</artifactId>
122122
</dependency>
123123
<dependency>
124124
<groupId>com.techsenger.tabpanepro</groupId>

java/ceffx-demo/src/main/java/com/techsenger/ceffx/demo/Demo.java

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -32,26 +32,27 @@
3232
import com.techsenger.ceffx.demo.tab.BrowserTabPresenter;
3333
import com.techsenger.ceffx.demo.tab.ChangeSource;
3434
import com.techsenger.ceffx.natives.NativeExtractor;
35+
import com.techsenger.shellfx.core.DefaultShellContext;
36+
import com.techsenger.shellfx.core.DefaultShellFxView;
37+
import com.techsenger.shellfx.core.DefaultShellParams;
38+
import com.techsenger.shellfx.core.DefaultShellPresenter;
39+
import com.techsenger.shellfx.core.ShellFxView;
40+
import com.techsenger.shellfx.core.area.AreaParams;
41+
import com.techsenger.shellfx.core.history.InMemoryHistoryManager;
42+
import com.techsenger.shellfx.core.registry.ControlRegistry;
43+
import com.techsenger.shellfx.core.settings.Density;
44+
import com.techsenger.shellfx.core.settings.ShellSettings;
45+
import com.techsenger.shellfx.core.tab.TabContainerFxView;
46+
import com.techsenger.shellfx.icons.IconStylesheetFactory;
47+
import com.techsenger.shellfx.layout.tabhost.TabHostFxView;
48+
import com.techsenger.shellfx.layout.tabhost.TabHostPresenter;
49+
import com.techsenger.shellfx.material.style.StyleClasses;
50+
import com.techsenger.shellfx.material.style.Stylesheet;
51+
import com.techsenger.shellfx.material.theme.AtlantaFxTheme;
3552
import com.techsenger.tabpanepro.core.TabPanePro;
3653
import com.techsenger.tabpanepro.core.skin.TabHeaderAreaPolicy;
3754
import com.techsenger.tabpanepro.core.skin.TabPaneProSkin;
3855
import com.techsenger.tabpanepro.core.skin.TabPaneProSkin.TabHeaderArea;
39-
import com.techsenger.tabshell.core.DefaultShellContext;
40-
import com.techsenger.tabshell.core.DefaultShellFxView;
41-
import com.techsenger.tabshell.core.DefaultShellParams;
42-
import com.techsenger.tabshell.core.DefaultShellPresenter;
43-
import com.techsenger.tabshell.core.ShellFxView;
44-
import com.techsenger.tabshell.core.area.AreaParams;
45-
import com.techsenger.tabshell.core.history.InMemoryHistoryManager;
46-
import com.techsenger.tabshell.core.registry.ControlRegistry;
47-
import com.techsenger.tabshell.core.settings.ShellSettings;
48-
import com.techsenger.tabshell.core.tab.TabContainerFxView;
49-
import com.techsenger.tabshell.icons.IconStylesheetFactory;
50-
import com.techsenger.tabshell.layout.tabhost.TabHostFxView;
51-
import com.techsenger.tabshell.layout.tabhost.TabHostPresenter;
52-
import com.techsenger.tabshell.material.style.StyleClasses;
53-
import com.techsenger.tabshell.material.style.Stylesheet;
54-
import com.techsenger.tabshell.material.theme.AtlantaFxTheme;
5556
import java.io.IOException;
5657
import java.nio.file.Path;
5758
import java.util.ArrayList;
@@ -133,6 +134,7 @@ private static ShellSettings createShellSettings() {
133134
appearance.setRegularFont(Font.font("System", 14));
134135
appearance.setMonospaceFont(Font.font("Monospace", 14));
135136
appearance.setTheme(AtlantaFxTheme.CUPERTINO_DARK);
137+
appearance.setDensity(Density.S);
136138
return settings;
137139
}
138140

@@ -247,7 +249,7 @@ private void createShell(Stage stage) {
247249
var shellParams = new DefaultShellParams(context);
248250
var shellPresenter = new DefaultShellPresenter<>(shellView, shellParams);
249251
shellPresenter.initialize();
250-
shellView.getWindow().getScene().getRoot().getStyleClass().add(StyleClasses.DENSITY_S);
252+
shellView.getStage().getScene().getRoot().getStyleClass().add(StyleClasses.DENSITY_S);
251253
shellPresenter.setTitle("CEFFX Demo");
252254
shellPresenter.setOnCloseRequest(() -> {
253255
if (workspace.getComposer().getTabs().isEmpty()) {

java/ceffx-demo/src/main/java/com/techsenger/ceffx/demo/DemoSettings.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
package com.techsenger.ceffx.demo;
88

9-
import com.techsenger.tabshell.core.settings.AppearanceSettings;
10-
import com.techsenger.tabshell.core.settings.DefaultAppearanceSettings;
11-
import com.techsenger.tabshell.core.settings.ShellSettings;
9+
import com.techsenger.shellfx.core.settings.AppearanceSettings;
10+
import com.techsenger.shellfx.core.settings.DefaultAppearanceSettings;
11+
import com.techsenger.shellfx.core.settings.ShellSettings;
1212

1313
/**
1414
*

java/ceffx-demo/src/main/java/com/techsenger/ceffx/demo/menu/BookmarkMenu.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
package com.techsenger.ceffx.demo.menu;
88

9-
import com.techsenger.tabshell.material.menu.DefaultMenuGroupName;
10-
import com.techsenger.tabshell.material.menu.DefaultMenuName;
11-
import com.techsenger.tabshell.material.menu.MenuGroupName;
12-
import com.techsenger.tabshell.material.menu.MenuName;
9+
import com.techsenger.shellfx.material.menu.DefaultMenuGroupName;
10+
import com.techsenger.shellfx.material.menu.DefaultMenuName;
11+
import com.techsenger.shellfx.material.menu.MenuGroupName;
12+
import com.techsenger.shellfx.material.menu.MenuName;
1313

1414
/**
1515
*

java/ceffx-demo/src/main/java/com/techsenger/ceffx/demo/menu/BookmarkMenuRegistrar.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77
package com.techsenger.ceffx.demo.menu;
88

99
import com.techsenger.ceffx.demo.TabOpener;
10-
import com.techsenger.tabshell.core.ShellFxView;
11-
import com.techsenger.tabshell.core.menu.AbstractMenuItemHandler;
12-
import com.techsenger.tabshell.core.menu.MenuItemHandler;
13-
import com.techsenger.tabshell.core.registry.AbstractControlRegistrar;
14-
import com.techsenger.tabshell.core.registry.ControlFactory;
15-
import com.techsenger.tabshell.core.registry.ControlRegistry;
16-
import com.techsenger.tabshell.material.menu.ManagedMenu;
17-
import com.techsenger.tabshell.material.menu.ManagedMenuGroup;
18-
import com.techsenger.tabshell.material.menu.ManagedMenuItem;
19-
import com.techsenger.tabshell.material.menu.MenuGroupName;
10+
import com.techsenger.shellfx.core.ShellFxView;
11+
import com.techsenger.shellfx.core.menu.AbstractMenuItemHandler;
12+
import com.techsenger.shellfx.core.menu.MenuItemHandler;
13+
import com.techsenger.shellfx.core.registry.AbstractControlRegistrar;
14+
import com.techsenger.shellfx.core.registry.ControlFactory;
15+
import com.techsenger.shellfx.core.registry.ControlRegistry;
16+
import com.techsenger.shellfx.material.menu.ManagedMenu;
17+
import com.techsenger.shellfx.material.menu.ManagedMenuGroup;
18+
import com.techsenger.shellfx.material.menu.ManagedMenuItem;
19+
import com.techsenger.shellfx.material.menu.MenuGroupName;
2020
import java.util.List;
2121
import java.util.stream.IntStream;
2222

java/ceffx-demo/src/main/java/com/techsenger/ceffx/demo/menu/FileMenu.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
package com.techsenger.ceffx.demo.menu;
88

9-
import com.techsenger.tabshell.material.menu.DefaultMenuGroupName;
10-
import com.techsenger.tabshell.material.menu.DefaultMenuName;
11-
import com.techsenger.tabshell.material.menu.MenuGroupName;
12-
import com.techsenger.tabshell.material.menu.MenuName;
9+
import com.techsenger.shellfx.material.menu.DefaultMenuGroupName;
10+
import com.techsenger.shellfx.material.menu.DefaultMenuName;
11+
import com.techsenger.shellfx.material.menu.MenuGroupName;
12+
import com.techsenger.shellfx.material.menu.MenuName;
1313

1414
/**
1515
*

java/ceffx-demo/src/main/java/com/techsenger/ceffx/demo/menu/FileMenuRegistrar.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66

77
package com.techsenger.ceffx.demo.menu;
88

9-
import com.techsenger.tabshell.core.ShellFxView;
10-
import com.techsenger.tabshell.core.menu.AbstractMenuItemHandler;
11-
import com.techsenger.tabshell.core.menu.MenuItemHandler;
12-
import com.techsenger.tabshell.core.registry.AbstractControlRegistrar;
13-
import com.techsenger.tabshell.core.registry.ControlFactory;
14-
import com.techsenger.tabshell.core.registry.ControlRegistry;
15-
import com.techsenger.tabshell.material.menu.ManagedMenu;
16-
import com.techsenger.tabshell.material.menu.ManagedMenuGroup;
17-
import com.techsenger.tabshell.material.menu.ManagedMenuItem;
9+
import com.techsenger.shellfx.core.ShellFxView;
10+
import com.techsenger.shellfx.core.menu.AbstractMenuItemHandler;
11+
import com.techsenger.shellfx.core.menu.MenuItemHandler;
12+
import com.techsenger.shellfx.core.registry.AbstractControlRegistrar;
13+
import com.techsenger.shellfx.core.registry.ControlFactory;
14+
import com.techsenger.shellfx.core.registry.ControlRegistry;
15+
import com.techsenger.shellfx.material.menu.ManagedMenu;
16+
import com.techsenger.shellfx.material.menu.ManagedMenuGroup;
17+
import com.techsenger.shellfx.material.menu.ManagedMenuItem;
1818

1919
/**
2020
*

java/ceffx-demo/src/main/java/com/techsenger/ceffx/demo/tab/BrowserTabFxView.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66

77
package com.techsenger.ceffx.demo.tab;
88

9-
import com.techsenger.tabshell.core.ShellFxView;
10-
import com.techsenger.tabshell.core.history.HistoryManager;
11-
import com.techsenger.tabshell.core.settings.ShellSettings;
12-
import com.techsenger.tabshell.core.tab.AbstractTabFxView;
13-
import com.techsenger.tabshell.devtools.DevToolsHostType;
14-
import com.techsenger.tabshell.devtools.DevToolsTabDockFxView;
15-
import com.techsenger.tabshell.devtools.DevToolsTabDockParams;
16-
import com.techsenger.tabshell.devtools.DevToolsTabDockPresenter;
17-
import com.techsenger.tabshell.material.style.StyleClasses;
9+
import com.techsenger.shellfx.core.ShellFxView;
10+
import com.techsenger.shellfx.core.history.HistoryManager;
11+
import com.techsenger.shellfx.core.settings.ShellSettings;
12+
import com.techsenger.shellfx.core.tab.AbstractTabFxView;
13+
import com.techsenger.shellfx.devtools.DevToolsHostType;
14+
import com.techsenger.shellfx.devtools.DevToolsTabDockFxView;
15+
import com.techsenger.shellfx.devtools.DevToolsTabDockParams;
16+
import com.techsenger.shellfx.devtools.DevToolsTabDockPresenter;
17+
import com.techsenger.shellfx.material.style.StyleClasses;
1818
import com.techsenger.toolkit.fx.utils.NodeUtils;
1919
import javafx.geometry.Orientation;
2020
import javafx.scene.Cursor;

java/ceffx-demo/src/main/java/com/techsenger/ceffx/demo/tab/BrowserTabParams.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
package com.techsenger.ceffx.demo.tab;
88

99
import com.techsenger.ceffx.core.browser.CefBrowserBase;
10-
import com.techsenger.tabshell.core.ShellContext;
11-
import com.techsenger.tabshell.core.tab.TabParams;
10+
import com.techsenger.shellfx.core.ShellContext;
11+
import com.techsenger.shellfx.core.tab.TabParams;
1212

1313
/**
1414
*

java/ceffx-demo/src/main/java/com/techsenger/ceffx/demo/tab/BrowserTabPresenter.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
import com.techsenger.ceffx.core.browser.CefBrowserBase;
1111
import com.techsenger.ceffx.demo.DemoComponents;
1212
import com.techsenger.patternfx.mvp.ComponentDescriptor;
13-
import com.techsenger.tabshell.core.CloseCheckResult;
14-
import com.techsenger.tabshell.core.ClosePreparationResult;
15-
import com.techsenger.tabshell.core.ShellContext;
16-
import com.techsenger.tabshell.core.UiExecutor;
17-
import com.techsenger.tabshell.core.tab.AbstractTabPresenter;
18-
import com.techsenger.tabshell.material.icon.FontIcon;
19-
import com.techsenger.tabshell.material.icon.ImageIcon;
13+
import com.techsenger.shellfx.core.CloseCheckResult;
14+
import com.techsenger.shellfx.core.ClosePreparationResult;
15+
import com.techsenger.shellfx.core.ShellContext;
16+
import com.techsenger.shellfx.core.UiExecutor;
17+
import com.techsenger.shellfx.core.tab.AbstractTabPresenter;
18+
import com.techsenger.shellfx.material.icon.FontIcon;
19+
import com.techsenger.shellfx.material.icon.ImageIcon;
2020
import java.io.IOException;
2121
import java.io.InputStream;
2222
import java.net.URI;

0 commit comments

Comments
 (0)