diff options
| author | Roberto Sanchez | 2013-10-22 14:23:15 +0000 |
|---|---|---|
| committer | Roberto Sanchez | 2013-10-22 14:23:15 +0000 |
| commit | 9eacae57ffac99cd41eff839cdd32049fad4d528 (patch) | |
| tree | 8f48d234d7000b7e7431f5f74175864744d213dd | |
| parent | e0aa4207f2b42c2f2f0bcaa4f620179892a152d5 (diff) | |
| download | webtools.common-9eacae57ffac99cd41eff839cdd32049fad4d528.tar.gz webtools.common-9eacae57ffac99cd41eff839cdd32049fad4d528.tar.xz webtools.common-9eacae57ffac99cd41eff839cdd32049fad4d528.zip | |
[419999] Eclipse hangs when trying to activate or deactivate validations in the preference dialogv201310221500
2 files changed, 8 insertions, 2 deletions
diff --git a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/preferences/ValidationPreferencePage.java b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/preferences/ValidationPreferencePage.java index 2f1da246e..5f9683fcc 100644 --- a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/preferences/ValidationPreferencePage.java +++ b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/preferences/ValidationPreferencePage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2001, 2009 IBM Corporation and others. + * Copyright (c) 2001, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -508,6 +508,9 @@ public class ValidationPreferencePage extends PreferencePage implements IWorkben IStructuredSelection selection = (IStructuredSelection) _validatorList.getSelection(); ValidatorMutable val = (ValidatorMutable) selection.getFirstElement(); + // In Mac OS, val can be null (see bugs 397349 and 412826) + if (val == null) return; + switch (columnToEdit) { case 1: _changeCount++; diff --git a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/preferences/ValidationPropertyPage.java b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/preferences/ValidationPropertyPage.java index 53c574aca..87efe7228 100644 --- a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/preferences/ValidationPropertyPage.java +++ b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/preferences/ValidationPropertyPage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2001, 2009 IBM Corporation and others. + * Copyright (c) 2001, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -568,6 +568,9 @@ public class ValidationPropertyPage extends PropertyPage { protected void columnClicked(int columnToEdit) { IStructuredSelection selection = (IStructuredSelection) _validatorList.getSelection(); ValidatorMutable val = (ValidatorMutable) selection.getFirstElement(); + + // In Mac OS, val can be null (see bugs 397349 and 412826) + if (val == null) return; switch (columnToEdit) { case 1: |