commit 6608fd321f76f5bd2c60431d24a6dde8a90715f8
author Tor Norbye <tnorbye@google.com> Mon Jul 16 16:07:44 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Mon Jul 16 16:07:45 2012 -0700
tree 9e6fca1aa7619cf91a62e6a9a7b168f00eb4067a
parent 530e589fbdc4c29c3e9be98ec481836286084989
parent 6e615b0473e4d59dd6bc951d8b63310f54a01027

Merge "Remove unused locale info"

propertysheet/src/org/eclipse/wb/internal/core/model/property/editor/AbstractTextPropertyEditor.java

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 @@
    * @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)) {