mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-08 16:55:38 +02:00
Code Issues Wiki Activity

Clarify usage of SystemView.shell

Browse source
This commit is contained in:
Martin Oberhuber 2007-08-07 10:09:30 +00:00
parent 66367ff7a3
commit 3e702b2a94
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java
View file

@ -201,7 +201,7 @@ public class SystemView extends SafeTreeViewer
ISelectionChangedListener, ITreeViewerListener ISelectionChangedListener, ITreeViewerListener
{ {
protected Shell shell; // shell hosting this viewer protected Shell shell; // shell hosting this viewer: TODO can be removed
protected ISystemViewInputProvider inputProvider; // who is supplying our tree root elements? protected ISystemViewInputProvider inputProvider; // who is supplying our tree root elements?
protected ISystemViewInputProvider previousInputProvider; // who is supplying our tree root elements? protected ISystemViewInputProvider previousInputProvider; // who is supplying our tree root elements?
protected Object previousInput; protected Object previousInput;
@ -281,6 +281,7 @@ public class SystemView extends SafeTreeViewer
*/ */
public SystemView(Shell shell, Composite parent, ISystemViewInputProvider inputProvider, ISystemMessageLine msgLine) { public SystemView(Shell shell, Composite parent, ISystemViewInputProvider inputProvider, ISystemMessageLine msgLine) {
super(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL); // DKM - putting style here to avoid SWT.BORDER (defect 168972) super(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL); // DKM - putting style here to avoid SWT.BORDER (defect 168972)
assert shell == parent.getShell();
this.shell = shell; this.shell = shell;
this.inputProvider = inputProvider; this.inputProvider = inputProvider;
this.inputProvider.setShell(shell); // DY: defect 44544 this.inputProvider.setShell(shell); // DY: defect 44544
@ -299,6 +300,7 @@ public class SystemView extends SafeTreeViewer
*/ */
public SystemView(Shell shell, Composite parent, int style, ISystemViewInputProvider inputProvider, ISystemMessageLine msgLine) { public SystemView(Shell shell, Composite parent, int style, ISystemViewInputProvider inputProvider, ISystemMessageLine msgLine) {
super(parent, style); super(parent, style);
assert shell == parent.getShell();
this.shell = shell; this.shell = shell;
this.inputProvider = inputProvider; this.inputProvider = inputProvider;
this.inputProvider.setShell(shell); // DY: defect 44544 this.inputProvider.setShell(shell); // DY: defect 44544
@ -318,6 +320,7 @@ public class SystemView extends SafeTreeViewer
*/ */
public SystemView(Shell shell, Composite parent, int style, ISystemViewInputProvider inputProvider, ISystemMessageLine msgLine, ViewerFilter[] initViewerFilters) { public SystemView(Shell shell, Composite parent, int style, ISystemViewInputProvider inputProvider, ISystemMessageLine msgLine, ViewerFilter[] initViewerFilters) {
super(parent, style); super(parent, style);
assert shell == parent.getShell();
this.shell = shell; this.shell = shell;
this.inputProvider = inputProvider; this.inputProvider = inputProvider;
this.inputProvider.setShell(shell); // DY: defect 44544 this.inputProvider.setShell(shell); // DY: defect 44544
@ -336,6 +339,7 @@ public class SystemView extends SafeTreeViewer
*/ */
public SystemView(Shell shell, Tree tree, ISystemViewInputProvider inputProvider, ISystemMessageLine msgLine) { public SystemView(Shell shell, Tree tree, ISystemViewInputProvider inputProvider, ISystemMessageLine msgLine) {
super(tree); super(tree);
assert shell == tree.getShell();
this.shell = shell; this.shell = shell;
this.inputProvider = inputProvider; this.inputProvider = inputProvider;
this.inputProvider.setShell(shell); // DY: defect 44544 this.inputProvider.setShell(shell); // DY: defect 44544
@ -352,7 +356,7 @@ public class SystemView extends SafeTreeViewer
inputProvider.setViewer(this); inputProvider.setViewer(this);
inputProvider.setShell(getShell()); // DY: Defect 44544, shell was not being set for Test dialogs, when they inputProvider.setShell(getShell()); // DY: Defect 44544, shell was not being set for Test dialogs, when they
// tried to connect there was not shell for the password prompt // tried to connect there was not shell for the password prompt
// and an error message (expand failed) occured. // and an error message (expand failed) occurred.
setInput(inputProvider); setInput(inputProvider);
} }
@ -1147,6 +1151,10 @@ public class SystemView extends SafeTreeViewer
* Convenience method for returning the shell of this viewer. * Convenience method for returning the shell of this viewer.
*/ */
public Shell getShell() { public Shell getShell() {
////getShell() can lead to "widget is disposed" errors, but avoiding them here does not really help
//if (!getTree().isDisposed()) {
// return getTree().getShell();
//}
//return shell; //return shell;
return getTree().getShell(); return getTree().getShell();
} }