Skip to content

Commit 2ea8317

Browse files
committed
Move composer interface to view interface in demo
1 parent fd6b9cc commit 2ea8317

4 files changed

Lines changed: 16 additions & 27 deletions

File tree

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

Lines changed: 0 additions & 22 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
*/
3838
public class BrowserTabFxView extends AbstractTabFxView<BrowserTabPresenter> implements BrowserTabView {
3939

40-
public class Composer extends AbstractTabFxView<BrowserTabPresenter>.Composer implements BrowserTabComposer {
40+
public class Composer extends AbstractTabFxView<BrowserTabPresenter>.Composer implements BrowserTabView.Composer {
4141

4242
private final BrowserTabFxView view = BrowserTabFxView.this;
4343

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@
3636
*
3737
* @author Pavel Castornii
3838
*/
39-
public class BrowserTabPresenter extends AbstractTabPresenter<BrowserTabView, BrowserTabComposer>
40-
implements BrowserTabPort {
39+
public class BrowserTabPresenter extends AbstractTabPresenter<BrowserTabView> implements BrowserTabPort {
4140

4241
private enum FavIconType {
4342
ICO, PNG
@@ -200,11 +199,11 @@ protected void onAddressSubmitted() {
200199
}
201200

202201
protected void openDevTools() {
203-
getComposer().addDevTools(this.shellContext.getSettings(), this.shellContext.getHistoryManager());
202+
getView().getComposer().addDevTools(this.shellContext.getSettings(), this.shellContext.getHistoryManager());
204203
}
205204

206205
protected void closeDevTools() {
207-
getComposer().removeDevTools();
206+
getView().getComposer().removeDevTools();
208207
}
209208

210209
protected void onBrowserDevTools() {

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

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

9+
import com.techsenger.tabshell.core.history.HistoryManager;
10+
import com.techsenger.tabshell.core.settings.Settings;
911
import com.techsenger.tabshell.core.tab.TabView;
1012
import javafx.scene.Cursor;
1113

@@ -15,6 +17,16 @@
1517
*/
1618
public interface BrowserTabView extends TabView {
1719

20+
interface Composer extends TabView.Composer {
21+
22+
void addDevTools(Settings settings, HistoryManager historyManager);
23+
24+
void removeDevTools();
25+
}
26+
27+
@Override
28+
Composer getComposer();
29+
1830
void setAddress(String url);
1931

2032
void transferFocusFromBrowser();

0 commit comments

Comments
 (0)