Skip to content

Commit 964a1c2

Browse files
authored
Merge pull request #17653 from iterate-ch/bugfix/GH-17632
Remove instance variable.
2 parents 16f2838 + 9db0f01 commit 964a1c2

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

binding/src/main/java/ch/cyberduck/binding/WindowController.java

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,6 @@ public abstract class WindowController extends BundleController implements NSWin
5757
@Outlet
5858
protected NSWindow window;
5959

60-
/**
61-
* Main content view of window
62-
*/
63-
protected NSView view;
64-
6560
public WindowController() {
6661
super();
6762
}
@@ -91,7 +86,6 @@ public void removeListener(final WindowListener listener) {
9186

9287
public void setWindow(final NSWindow window) {
9388
this.window = window;
94-
this.view = window.contentView();
9589
this.window.recalculateKeyViewLoop();
9690
this.window.setReleasedWhenClosed(true);
9791
this.window.setDelegate(this.id());
@@ -103,7 +97,7 @@ public NSWindow window() {
10397

10498
@Override
10599
public NSView view() {
106-
return view;
100+
return window.contentView();
107101
}
108102

109103
/**
@@ -252,14 +246,14 @@ protected double getMinWindowWidth() {
252246

253247
protected double toolbarHeightForWindow() {
254248
final NSRect windowFrame = NSWindow.contentRectForFrameRect_styleMask(window.frame(), window.styleMask());
255-
return windowFrame.size.height.doubleValue() - view.frame().size.height.doubleValue();
249+
return windowFrame.size.height.doubleValue() - window.contentView().frame().size.height.doubleValue();
256250
}
257251

258252
/**
259253
* @return Minimum size to fit content view of currently selected tab.
260254
*/
261255
protected NSRect getContentRect() {
262-
return view.frame();
256+
return window.contentView().frame();
263257
}
264258

265259
/**

0 commit comments

Comments
 (0)