diff options
| author | Raphael <raphael@google.com> | 2010-03-17 16:35:49 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-17 16:35:49 -0700 |
| commit | b7a3a24e83def966c9c3709fccdcd2246c974eca (patch) | |
| tree | 6e7238bf5f54b4947bf8f12912824b56bc16088e | |
| parent | 01593451e9e9b36938be51a189d7cb3b70d199b3 (diff) | |
| parent | 5d80a3ac4a1b9035a87e41ffb65ff7abcfd57c73 (diff) | |
| download | sdk-b7a3a24e83def966c9c3709fccdcd2246c974eca.zip sdk-b7a3a24e83def966c9c3709fccdcd2246c974eca.tar.gz sdk-b7a3a24e83def966c9c3709fccdcd2246c974eca.tar.bz2 | |
Merge "ADT: Fix minor NPE in UI Node/descriptors when no SDK is loaded yet."
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/uimodel/UiViewElementNode.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/uimodel/UiViewElementNode.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/uimodel/UiViewElementNode.java index 0d3f339..4af0233 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/uimodel/UiViewElementNode.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/uimodel/UiViewElementNode.java @@ -71,13 +71,15 @@ public class UiViewElementNode extends UiElementNode { IProject project = getEditor().getProject(); if (project != null) { Sdk currentSdk = Sdk.getCurrent(); - IAndroidTarget target = currentSdk.getTarget(project); - if (target != null) { - AndroidTargetData data = currentSdk.getTargetData(target); - layoutDescriptors = data.getLayoutDescriptors().getLayoutDescriptors(); + if (currentSdk != null) { + IAndroidTarget target = currentSdk.getTarget(project); + if (target != null) { + AndroidTargetData data = currentSdk.getTargetData(target); + layoutDescriptors = data.getLayoutDescriptors().getLayoutDescriptors(); + } } } - + if (layoutDescriptors != null) { for (ElementDescriptor desc : layoutDescriptors) { if (desc instanceof ViewElementDescriptor && @@ -116,7 +118,7 @@ public class UiViewElementNode extends UiElementNode { return mCachedAttributeDescriptors; } - + /** * Sets the parent of this UI node. * <p/> |