diff options
author | Carolyn MacLeod <Carolyn_MacLeod@ca.ibm.com> | 2013-05-30 12:00:07 -0400 |
---|---|---|
committer | Carolyn MacLeod <Carolyn_MacLeod@ca.ibm.com> | 2013-05-30 12:00:07 -0400 |
commit | 4bb2ca6348a67690b9b157a6e3e3042c7abef6ff (patch) | |
tree | e6bcdac11a8c30842e33326d67c7b3f2e2aa3b8d /bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org | |
parent | 5db676d32485d409bd6752d94158940ce4f8df6e (diff) | |
download | eclipse.platform.swt-4bb2ca6348a67690b9b157a6e3e3042c7abef6ff.tar.gz eclipse.platform.swt-4bb2ca6348a67690b9b157a6e3e3042c7abef6ff.tar.xz eclipse.platform.swt-4bb2ca6348a67690b9b157a6e3e3042c7abef6ff.zip |
Bug 407270 - Miss NPE check in org.eclipse.swt.accessibility.Accessible
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org')
-rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java | 66 |
1 files changed, 44 insertions, 22 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java index 4df42f2b4d..7b047b08e5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java @@ -941,8 +941,10 @@ public class Accessible { public void removeAccessibleListener(AccessibleListener listener) { checkWidget(); if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - if (accessibleListeners != null) accessibleListeners.removeElement(listener); - if (accessibleListeners.isEmpty()) accessibleListeners = null; + if (accessibleListeners != null) { + accessibleListeners.removeElement(listener); + if (accessibleListeners.isEmpty()) accessibleListeners = null; + } } /** @@ -967,8 +969,10 @@ public class Accessible { public void removeAccessibleControlListener(AccessibleControlListener listener) { checkWidget(); if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - if (accessibleControlListeners != null) accessibleControlListeners.removeElement(listener); - if (accessibleControlListeners.isEmpty()) accessibleControlListeners = null; + if (accessibleControlListeners != null) { + accessibleControlListeners.removeElement(listener); + if (accessibleControlListeners.isEmpty()) accessibleControlListeners = null; + } } /** @@ -997,11 +1001,15 @@ public class Accessible { checkWidget (); if (listener == null) SWT.error (SWT.ERROR_NULL_ARGUMENT); if (listener instanceof AccessibleTextExtendedListener) { - if (accessibleTextExtendedListeners != null) accessibleTextExtendedListeners.removeElement (listener); - if (accessibleTextExtendedListeners.isEmpty()) accessibleTextExtendedListeners = null; + if (accessibleTextExtendedListeners != null) { + accessibleTextExtendedListeners.removeElement (listener); + if (accessibleTextExtendedListeners.isEmpty()) accessibleTextExtendedListeners = null; + } } else { - if (accessibleTextListeners != null) accessibleTextListeners.removeElement (listener); - if (accessibleTextListeners.isEmpty()) accessibleTextListeners = null; + if (accessibleTextListeners != null) { + accessibleTextListeners.removeElement (listener); + if (accessibleTextListeners.isEmpty()) accessibleTextListeners = null; + } } } @@ -1029,8 +1037,10 @@ public class Accessible { public void removeAccessibleActionListener(AccessibleActionListener listener) { checkWidget(); if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - if (accessibleActionListeners != null) accessibleActionListeners.removeElement(listener); - if (accessibleActionListeners.isEmpty()) accessibleActionListeners = null; + if (accessibleActionListeners != null) { + accessibleActionListeners.removeElement(listener); + if (accessibleActionListeners.isEmpty()) accessibleActionListeners = null; + } } /** @@ -1057,8 +1067,10 @@ public class Accessible { public void removeAccessibleEditableTextListener(AccessibleEditableTextListener listener) { checkWidget(); if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - if (accessibleEditableTextListeners != null) accessibleEditableTextListeners.removeElement(listener); - if (accessibleEditableTextListeners.isEmpty()) accessibleEditableTextListeners = null; + if (accessibleEditableTextListeners != null) { + accessibleEditableTextListeners.removeElement(listener); + if (accessibleEditableTextListeners.isEmpty()) accessibleEditableTextListeners = null; + } } /** @@ -1085,8 +1097,10 @@ public class Accessible { public void removeAccessibleHyperlinkListener(AccessibleHyperlinkListener listener) { checkWidget(); if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - if (accessibleHyperlinkListeners != null) accessibleHyperlinkListeners.removeElement(listener); - if (accessibleHyperlinkListeners.isEmpty()) accessibleHyperlinkListeners = null; + if (accessibleHyperlinkListeners != null) { + accessibleHyperlinkListeners.removeElement(listener); + if (accessibleHyperlinkListeners.isEmpty()) accessibleHyperlinkListeners = null; + } } /** @@ -1113,8 +1127,10 @@ public class Accessible { public void removeAccessibleTableListener(AccessibleTableListener listener) { checkWidget(); if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - if (accessibleTableListeners != null) accessibleTableListeners.removeElement(listener); - if (accessibleTableListeners.isEmpty()) accessibleTableListeners = null; + if (accessibleTableListeners != null) { + accessibleTableListeners.removeElement(listener); + if (accessibleTableListeners.isEmpty()) accessibleTableListeners = null; + } } /** @@ -1141,8 +1157,10 @@ public class Accessible { public void removeAccessibleTableCellListener(AccessibleTableCellListener listener) { checkWidget(); if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - if (accessibleTableCellListeners != null) accessibleTableCellListeners.removeElement(listener); - if (accessibleTableCellListeners.isEmpty()) accessibleTableCellListeners = null; + if (accessibleTableCellListeners != null) { + accessibleTableCellListeners.removeElement(listener); + if (accessibleTableCellListeners.isEmpty()) accessibleTableCellListeners = null; + } } /** @@ -1169,8 +1187,10 @@ public class Accessible { public void removeAccessibleValueListener(AccessibleValueListener listener) { checkWidget(); if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - if (accessibleValueListeners != null) accessibleValueListeners.removeElement(listener); - if (accessibleValueListeners.isEmpty()) accessibleValueListeners = null; + if (accessibleValueListeners != null) { + accessibleValueListeners.removeElement(listener); + if (accessibleValueListeners.isEmpty()) accessibleValueListeners = null; + } } /** @@ -1197,8 +1217,10 @@ public class Accessible { public void removeAccessibleAttributeListener(AccessibleAttributeListener listener) { checkWidget(); if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - if (accessibleAttributeListeners != null) accessibleAttributeListeners.removeElement(listener); - if (accessibleAttributeListeners.isEmpty()) accessibleAttributeListeners = null; + if (accessibleAttributeListeners != null) { + accessibleAttributeListeners.removeElement(listener); + if (accessibleAttributeListeners.isEmpty()) accessibleAttributeListeners = null; + } } /** |