debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/ConnectToDeviceDialog.java
equal
deleted
inserted
replaced
39 import org.eclipse.jface.viewers.SelectionChangedEvent; |
39 import org.eclipse.jface.viewers.SelectionChangedEvent; |
40 import org.eclipse.jface.viewers.StructuredSelection; |
40 import org.eclipse.jface.viewers.StructuredSelection; |
41 import org.eclipse.swt.SWT; |
41 import org.eclipse.swt.SWT; |
42 import org.eclipse.swt.events.ControlAdapter; |
42 import org.eclipse.swt.events.ControlAdapter; |
43 import org.eclipse.swt.events.ControlEvent; |
43 import org.eclipse.swt.events.ControlEvent; |
|
44 import org.eclipse.swt.events.DisposeEvent; |
|
45 import org.eclipse.swt.events.DisposeListener; |
44 import org.eclipse.swt.events.SelectionAdapter; |
46 import org.eclipse.swt.events.SelectionAdapter; |
45 import org.eclipse.swt.events.SelectionEvent; |
47 import org.eclipse.swt.events.SelectionEvent; |
46 import org.eclipse.swt.graphics.FontMetrics; |
48 import org.eclipse.swt.graphics.FontMetrics; |
47 import org.eclipse.swt.graphics.GC; |
49 import org.eclipse.swt.graphics.GC; |
48 import org.eclipse.swt.graphics.Point; |
50 import org.eclipse.swt.graphics.Point; |
116 if (getDialogArea() != null) |
118 if (getDialogArea() != null) |
117 connectionSelected(getConnectionFromSelection(event.getSelection())); |
119 connectionSelected(getConnectionFromSelection(event.getSelection())); |
118 } |
120 } |
119 }); |
121 }); |
120 manager.addConnectionListener(this); |
122 manager.addConnectionListener(this); |
|
123 |
|
124 parent.addDisposeListener(new DisposeListener() { |
|
125 public void widgetDisposed(DisposeEvent e) { |
|
126 manager.removeConnectionListener(ConnectToDeviceDialog.this); |
|
127 |
|
128 if (currentServiceListener != null) |
|
129 currentServiceListener.removeStatusChangedListener(ConnectToDeviceDialog.this); |
|
130 } |
|
131 }); |
121 |
132 |
122 final Composite buttonGroup = new Composite(viewerGroup, SWT.NONE); |
133 final Composite buttonGroup = new Composite(viewerGroup, SWT.NONE); |
123 int w = Dialog.convertHorizontalDLUsToPixels(fm, IDialogConstants.HORIZONTAL_MARGIN); |
134 int w = Dialog.convertHorizontalDLUsToPixels(fm, IDialogConstants.HORIZONTAL_MARGIN); |
124 int h = Dialog.convertVerticalDLUsToPixels(fm, IDialogConstants.VERTICAL_MARGIN); |
135 int h = Dialog.convertVerticalDLUsToPixels(fm, IDialogConstants.VERTICAL_MARGIN); |
125 int hs = Dialog.convertHorizontalDLUsToPixels(fm, IDialogConstants.HORIZONTAL_SPACING); |
136 int hs = Dialog.convertHorizontalDLUsToPixels(fm, IDialogConstants.HORIZONTAL_SPACING); |
321 setViewerInput(connectionToSet); |
332 setViewerInput(connectionToSet); |
322 } |
333 } |
323 } |
334 } |
324 }); |
335 }); |
325 } |
336 } |
326 |
|
327 @Override |
|
328 public boolean close() { |
|
329 manager.addConnectionListener(this); |
|
330 return super.close(); |
|
331 } |
|
332 |
|
333 } |
337 } |
334 |
338 |