Skip to content

Commit eac188b

Browse files
committed
Adapt to TabShell changes
1 parent fef90ae commit eac188b

6 files changed

Lines changed: 12 additions & 11 deletions

File tree

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@
4141
import com.techsenger.tabshell.core.DefaultShellPresenter;
4242
import com.techsenger.tabshell.core.ShellFxView;
4343
import com.techsenger.tabshell.core.history.InMemoryHistoryManager;
44-
import com.techsenger.tabshell.core.settings.Settings;
44+
import com.techsenger.tabshell.core.registry.ControlRegistry;
45+
import com.techsenger.tabshell.core.settings.ShellSettings;
4546
import com.techsenger.tabshell.core.tab.TabContainerFxView;
4647
import com.techsenger.tabshell.icons.IconStylesheetFactory;
4748
import com.techsenger.tabshell.layout.tabhost.TabHostFxView;
@@ -126,7 +127,7 @@ private static CefSettings createCefSettings() {
126127
return settings;
127128
}
128129

129-
private static Settings createShellSettings() {
130+
private static ShellSettings createShellSettings() {
130131
var settings = new DemoSettings();
131132
var appearance = settings.getAppearance();
132133
appearance.setRegularFont(Font.font("System", 14));
@@ -239,7 +240,7 @@ public void onPrintSettings(CefBrowser browser, CefPrintSettings settings, boole
239240
private void createShell(Stage stage) {
240241
var stylesheets = new ArrayList<>(IconStylesheetFactory.forAll());
241242
stylesheets.add(new Stylesheet(Demo.class.getResource("demo.css")));
242-
var shellView = new DefaultShellFxView<>(this, stage, stylesheets);
243+
var shellView = new DefaultShellFxView<>(this, stage, stylesheets, new ControlRegistry());
243244
this.shell = shellView;
244245
var settings = createShellSettings();
245246
var context = new DefaultShellContext(settings, new InMemoryHistoryManager(), getHostServices());

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88

99
import com.techsenger.tabshell.core.settings.AppearanceSettings;
1010
import com.techsenger.tabshell.core.settings.DefaultAppearanceSettings;
11-
import com.techsenger.tabshell.core.settings.Settings;
11+
import com.techsenger.tabshell.core.settings.ShellSettings;
1212

1313
/**
1414
*
1515
* @author Pavel Castornii
1616
*/
17-
public class DemoSettings implements Settings {
17+
public class DemoSettings implements ShellSettings {
1818

1919
private final AppearanceSettings appearance = new DefaultAppearanceSettings();
2020

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ protected void registerMenu() {
6565
var menu = new ManagedMenu(BookmarkMenu.NAME, "_Bookmarks", 100);
6666
return menu;
6767
};
68-
addRegistration(getRegistry().mainMenu().registerMenu(null, f));
68+
addRegistration(getRegistry().mainMenu().registerMenu(f));
6969
}
7070

7171
protected void registerGroups() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ protected void registerMenu() {
4141
var menu = new ManagedMenu(FileMenu.NAME, "_File", 0);
4242
return menu;
4343
};
44-
addRegistration(getRegistry().mainMenu().registerMenu(null, f));
44+
addRegistration(getRegistry().mainMenu().registerMenu(f));
4545
}
4646

4747
protected void registerGroup() {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import com.techsenger.tabshell.core.ShellFxView;
1010
import com.techsenger.tabshell.core.history.HistoryManager;
11-
import com.techsenger.tabshell.core.settings.Settings;
11+
import com.techsenger.tabshell.core.settings.ShellSettings;
1212
import com.techsenger.tabshell.core.tab.AbstractTabFxView;
1313
import com.techsenger.tabshell.devtools.DevToolsHostType;
1414
import com.techsenger.tabshell.devtools.DevToolsTabDockFxView;
@@ -44,7 +44,7 @@ public class Composer extends AbstractTabFxView<BrowserTabPresenter>.Composer im
4444

4545
private DevToolsTabDockFxView<?> devTools;
4646

47-
public void addDevTools(Settings settings, HistoryManager historyManager) {
47+
public void addDevTools(ShellSettings settings, HistoryManager historyManager) {
4848
if (devTools != null) {
4949
return;
5050
}

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

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

99
import com.techsenger.tabshell.core.history.HistoryManager;
10-
import com.techsenger.tabshell.core.settings.Settings;
10+
import com.techsenger.tabshell.core.settings.ShellSettings;
1111
import com.techsenger.tabshell.core.tab.TabView;
1212
import javafx.scene.Cursor;
1313

@@ -19,7 +19,7 @@ public interface BrowserTabView extends TabView {
1919

2020
interface Composer extends TabView.Composer {
2121

22-
void addDevTools(Settings settings, HistoryManager historyManager);
22+
void addDevTools(ShellSettings settings, HistoryManager historyManager);
2323

2424
void removeDevTools();
2525
}

0 commit comments

Comments
 (0)