LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am d9d3891b: am 90b60a39: am c9b04450: Merge change I4151529e into eclair-sdk

Browse Source 
Merge commit 'd9d3891bf5f4922520783f2fbb1ff4ec61403ba0' into eclair-mr2-plus-aosp

* commit 'd9d3891bf5f4922520783f2fbb1ff4ec61403ba0':
  Fix potential NPE in manifest editor when switching SDKs
This commit is contained in:
Raphael
2009-10-21 22:31:00 -07:00
committed by Android Git Automerger
parent 736393ef2c d9d3891bf5
commit b62c420829
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/model/UiManifestElementNode.java
View File

@@ -21,6 +21,7 @@ import com.android.ide.eclipse.adt.internal.editors.manifest.descriptors.Android
import com.android.ide.eclipse.adt.internal.editors.manifest.descriptors.ManifestElementDescriptor; import com.android.ide.eclipse.adt.internal.editors.manifest.descriptors.ManifestElementDescriptor;
import com.android.ide.eclipse.adt.internal.editors.uimodel.UiAttributeNode; import com.android.ide.eclipse.adt.internal.editors.uimodel.UiAttributeNode;
import com.android.ide.eclipse.adt.internal.editors.uimodel.UiElementNode; import com.android.ide.eclipse.adt.internal.editors.uimodel.UiElementNode;
import com.android.ide.eclipse.adt.internal.sdk.AndroidTargetData;
import com.android.sdklib.SdkConstants; import com.android.sdklib.SdkConstants;
import org.w3c.dom.Element; import org.w3c.dom.Element;
@@ -41,10 +42,10 @@ import org.w3c.dom.Element;
* {@link ElementDescriptor}. * {@link ElementDescriptor}.
*/ */
public final class UiManifestElementNode extends UiElementNode { public final class UiManifestElementNode extends UiElementNode {
/** /**
* Creates a new {@link UiElementNode} described by a given {@link ElementDescriptor}. * Creates a new {@link UiElementNode} described by a given {@link ElementDescriptor}.
* *
* @param elementDescriptor The {@link ElementDescriptor} for the XML node. Cannot be null. * @param elementDescriptor The {@link ElementDescriptor} for the XML node. Cannot be null.
*/ */
public UiManifestElementNode(ManifestElementDescriptor elementDescriptor) { public UiManifestElementNode(ManifestElementDescriptor elementDescriptor) {
@@ -55,18 +56,23 @@ public final class UiManifestElementNode extends UiElementNode {
* Computes a short string describing the UI node suitable for tree views. * Computes a short string describing the UI node suitable for tree views.
* Uses the element's attribute "android:name" if present, or the "android:label" one * Uses the element's attribute "android:name" if present, or the "android:label" one
* followed by the element's name. * followed by the element's name.
* *
* @return A short string describing the UI node suitable for tree views. * @return A short string describing the UI node suitable for tree views.
*/ */
@Override @Override
public String getShortDescription() { public String getShortDescription() {
if (getXmlNode() != null && AndroidTargetData target = getAndroidTarget();
AndroidManifestDescriptors manifestDescriptors = null;
if (target != null) {
manifestDescriptors = target.getManifestDescriptors();
}
if (manifestDescriptors != null &&
getXmlNode() != null &&
getXmlNode() instanceof Element && getXmlNode() instanceof Element &&
getXmlNode().hasAttributes()) { getXmlNode().hasAttributes()) {
AndroidManifestDescriptors manifestDescriptors =
getAndroidTarget().getManifestDescriptors();
// Application and Manifest nodes have a special treatment: they are unique nodes // Application and Manifest nodes have a special treatment: they are unique nodes
// so we don't bother trying to differentiate their strings and we fall back to // so we don't bother trying to differentiate their strings and we fall back to
// just using the UI name below. // just using the UI name below.