Merge "Omaha #3323 fixed collaboration disposed font issue" into omaha_14.4.1

Former-commit-id: 7bae4ec8c0 [formerly 5a74a3cf99] [formerly bcffac8875] [formerly bcffac8875 [formerly 706409b459]] [formerly 7bae4ec8c0 [formerly 5a74a3cf99] [formerly bcffac8875] [formerly bcffac8875 [formerly 706409b459]] [formerly f4cdd661fe [formerly bcffac8875 [formerly 706409b459] [formerly f4cdd661fe [formerly f81ae068eca41eeae5d785668f4c1d7cf59ae9df]]]]]
Former-commit-id: f4cdd661fe
Former-commit-id: 5117322ec1 [formerly 570bf42f89] [formerly b94dc3b045] [formerly f8274dfd7d9671d940339d92689c6f4c82d0d4f8 [formerly 9e7fc0b82ae20bc6493ceddb6809f83261c06966] [formerly b94dc3b045 [formerly e3c3d55883]]]
Former-commit-id: ad1a50f316aa3e8c270c757520be528573cd8dcd [formerly 731bb0268edd89c419ea3b8bb57b91ea5afc516a] [formerly 50fdb66cb4 [formerly 25dd598b55]]
Former-commit-id: 50fdb66cb4
Former-commit-id: c2835d25ac
This commit is contained in:
Richard Peter 2014-06-27 16:52:39 -05:00 committed by Gerrit Code Review
commit f0f5e8a823

View file

@ -92,6 +92,7 @@ import com.raytheon.viz.ui.views.CaveFloatingView;
* running in an asynchronous thread.
* Mar 11, 2014 #2865 lvenable Added null checks for msgArchive.
* Jun 20, 2014 3281 bclement made sendErrorMessage() public
* Jun 27, 2014 3323 bclement fixed disposed font issue
* </pre>
*
* @author rferrel
@ -572,11 +573,12 @@ public abstract class AbstractSessionView<T extends IUser> extends
@Subscribe
public void changeFont(FontData data) {
if (messagesTextFont != null) {
messagesTextFont.dispose();
}
Font oldFont = messagesTextFont;
messagesTextFont = new Font(Display.getCurrent(), data);
messagesText.setFont(messagesTextFont);
if (oldFont != null) {
oldFont.dispose();
}
}
public void setAlertWords(List<AlertWord> words) {