diff options
| author | Tor Norbye <tnorbye@google.com> | 2012-07-16 09:32:34 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-07-16 09:32:35 -0700 |
| commit | 530e589fbdc4c29c3e9be98ec481836286084989 (patch) | |
| tree | dd0691601e0908e068663f23fdba32b5b50959db | |
| parent | aeaf3d42f74a302bafedf68ce4f687d5b6171c25 (diff) | |
| parent | f38ceabb9b297d5fec04b992695424853967ba74 (diff) | |
| download | eclipse-windowbuilder-530e589fbdc4c29c3e9be98ec481836286084989.tar.gz | |
Merge "Prevent NPE in Property Sheet code"
| -rw-r--r-- | propertysheet/src/org/eclipse/wb/internal/core/model/property/editor/AbstractTextPropertyEditor.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/propertysheet/src/org/eclipse/wb/internal/core/model/property/editor/AbstractTextPropertyEditor.java b/propertysheet/src/org/eclipse/wb/internal/core/model/property/editor/AbstractTextPropertyEditor.java index dd651af..8b07c4d 100644 --- a/propertysheet/src/org/eclipse/wb/internal/core/model/property/editor/AbstractTextPropertyEditor.java +++ b/propertysheet/src/org/eclipse/wb/internal/core/model/property/editor/AbstractTextPropertyEditor.java @@ -317,6 +317,11 @@ public abstract class AbstractTextPropertyEditor extends TextDisplayPropertyEdit * @return <code>true</code> if transfer was successful. */ private boolean toProperty(Property property) throws Exception { + // BEGIN ADT MODIFICATIONS + if (m_textControl == null) { + return false; + } + // END ADT MODIFICATIONS String text = m_textControl.getText(); // change property only if text was changed if (!m_currentText.equals(text)) { |