Remove non-api references from AttrsXmlParser.

Change-Id: Ic139e6f942e835dda4b7ef0303556aef014a60d3

2 files changed, 8 insertions, 8 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/resources/platform/AttrsXmlParser.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/resources/platform/AttrsXmlParser.java
index deacd7a..bd79e29 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/resources/platform/AttrsXmlParser.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/resources/platform/AttrsXmlParser.java
@@ -19,8 +19,6 @@ package com.android.ide.common.resources.platform;
 import com.android.ide.common.api.IAttributeInfo.Format;
 import com.android.ide.common.log.ILogger;
 import com.android.ide.common.resources.platform.ViewClassInfo.LayoutParamsInfo;
-import com.android.ide.eclipse.adt.internal.editors.descriptors.DescriptorsUtils;
-import com.android.ide.eclipse.adt.internal.editors.manifest.descriptors.AndroidManifestDescriptors;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
@@ -44,6 +42,8 @@ import javax.xml.parsers.ParserConfigurationException;
  */
 public final class AttrsXmlParser {
 
+    public static final String ANDROID_MANIFEST_STYLEABLE = "AndroidManifest";  //$NON-NLS-1$
+
     private Document mDocument;
     private String mOsAttrsXmlPath;
 
@@ -187,7 +187,7 @@ public final class AttrsXmlParser {
     }
 
     /**
-     * Returns a list of all <code>decleare-styleable</code> found in the XML file.
+     * Returns a list of all <code>declare-styleable</code> found in the XML file.
      */
     public Map<String, DeclareStyleableInfo> getDeclareStyleableList() {
         return Collections.unmodifiableMap(mStyleMap);
@@ -291,8 +291,7 @@ public final class AttrsXmlParser {
                 if (key.startsWith(name) && !key.equals(name)) {
                     // We found a child which name starts with the full name of the
                     // parent. Simplify the children name.
-                    String newName = AndroidManifestDescriptors.ANDROID_MANIFEST_STYLEABLE +
-                        key.substring(name.length());
+                    String newName = ANDROID_MANIFEST_STYLEABLE + key.substring(name.length());
 
                     DeclareStyleableInfo newStyle =
                         new DeclareStyleableInfo(newName, mStyleMap.get(key));
@@ -560,8 +559,7 @@ public final class AttrsXmlParser {
      * Parses the javadoc comment.
      * Only keeps the first sentence.
      * <p/>
-     * This does not remove nor simplify links and references. Such a transformation
-     * is done later at "display" time in {@link DescriptorsUtils#formatTooltip(String)} and co.
+     * This does not remove nor simplify links and references.
      */
     private String parseJavadoc(String comment) {
         if (comment == null) {
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/descriptors/AndroidManifestDescriptors.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/descriptors/AndroidManifestDescriptors.java
index 0a7c8c1..7c69e0b 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/descriptors/AndroidManifestDescriptors.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/descriptors/AndroidManifestDescriptors.java
@@ -19,6 +19,7 @@ package com.android.ide.eclipse.adt.internal.editors.manifest.descriptors;
 import com.android.ide.common.api.IAttributeInfo;
 import com.android.ide.common.api.IAttributeInfo.Format;
 import com.android.ide.common.resources.platform.AttributeInfo;
+import com.android.ide.common.resources.platform.AttrsXmlParser;
 import com.android.ide.common.resources.platform.DeclareStyleableInfo;
 import com.android.ide.eclipse.adt.AdtPlugin;
 import com.android.ide.eclipse.adt.internal.editors.descriptors.AttributeDescriptor;
@@ -53,7 +54,8 @@ import java.util.Map.Entry;
 public final class AndroidManifestDescriptors implements IDescriptorProvider {
 
     private static final String MANIFEST_NODE_NAME = "manifest";                //$NON-NLS-1$
-    public static final String ANDROID_MANIFEST_STYLEABLE = "AndroidManifest";  //$NON-NLS-1$
+    private static final String ANDROID_MANIFEST_STYLEABLE =
+        AttrsXmlParser.ANDROID_MANIFEST_STYLEABLE;
 
     // Public attributes names, attributes descriptors and elements descriptors