am 6dcf421: resolved conflicts for merge of 0da4f15 to eclair

Merge commit '6dcf42149b183e2a2a062c90d60a2803cf01523a' into eclair-mr2

* commit '6dcf42149b183e2a2a062c90d60a2803cf01523a':
  SDK Manager: phase 1 of support for future schemas

Author: Raphael

tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/AddonPackage.java

@@ -143,12 +143,13 @@ private Lib[] parseLibs(Node libsNode) {
         ArrayList<Lib> libs = new ArrayList<Lib>();
 
         if (libsNode != null) {
+            String nsUri = libsNode.getNamespaceURI();
             for(Node child = libsNode.getFirstChild();
                 child != null;
                 child = child.getNextSibling()) {
 
                 if (child.getNodeType() == Node.ELEMENT_NODE &&
-                        SdkRepository.NS_SDK_REPOSITORY.equals(child.getNamespaceURI()) &&
+                        nsUri.equals(child.getNamespaceURI()) &&
                         SdkRepository.NODE_LIB.equals(child.getLocalName())) {
                     libs.add(parseLib(child));
                 }

tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/Archive.java

@@ -96,6 +96,11 @@ public String getUiName() {
             return mUiName;
         }
 
+        /** Returns the XML name of the OS. */
+        public String getXmlName() {
+            return toString().toLowerCase();
+        }
+
         /**
          * Returns the current OS as one of the {@link Os} enum values or null.
          */
@@ -113,6 +118,16 @@ public static Os getCurrentOs() {
 
             return null;
         }
+
+        /** Returns true if this OS is compatible with the current one. */
+        public boolean isCompatible() {
+            if (this == ANY) {
+                return true;
+            }
+
+            Os os = getCurrentOs();
+            return this == os;
+        }
     }
 
     /** The Architecture that this archive can be downloaded on. */
@@ -133,6 +148,11 @@ public String getUiName() {
             return mUiName;
         }
 
+        /** Returns the XML name of the architecture. */
+        public String getXmlName() {
+            return toString().toLowerCase();
+        }
+
         /**
          * Returns the current architecture as one of the {@link Arch} enum values or null.
          */
@@ -154,6 +174,16 @@ public static Arch getCurrentArch() {
 
             return null;
         }
+
+        /** Returns true if this architecture is compatible with the current one. */
+        public boolean isCompatible() {
+            if (this == ANY) {
+                return true;
+            }
+
+            Arch arch = getCurrentArch();
+            return this == arch;
+        }
     }
 
     private final Os     mOs;
@@ -324,27 +354,7 @@ public String getLongDescription() {
      * Returns true if this archive can be installed on the current platform.
      */
     public boolean isCompatible() {
-        // Check OS
-        Os os = getOs();
-
-        if (os != Os.ANY) {
-            Os os2 = Os.getCurrentOs();
-            if (os2 != os) {
-                return false;
-            }
-        }
-
-        // Check Arch
-        Arch arch = getArch();
-
-        if (arch != Arch.ANY) {
-            Arch arch2 = Arch.getCurrentArch();
-            if (arch2 != arch) {
-                return false;
-            }
-        }
-
-        return true;
+        return getOs().isCompatible() && getArch().isCompatible();
     }
 
     /**
@@ -1053,8 +1063,7 @@ private boolean generateSourceProperties(File unzipDestFolder) {
     /**
      * Sets the executable Unix permission (0777) on a file or folder.
      * @param file The file to set permissions on.
-     * @param unixMode the permissions as received from {@link ZipArchiveEntry#getUnixMode()}.
-     * @throws IOException
+     * @throws IOException If an I/O error occurs
      */
     private void setExecutablePermission(File file) throws IOException {
         Runtime.getRuntime().exec(new String[] {

tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/Package.java

@@ -211,12 +211,13 @@ private Archive[] parseArchives(Node archivesNode) {
         ArrayList<Archive> archives = new ArrayList<Archive>();
 
         if (archivesNode != null) {
+            String nsUri = archivesNode.getNamespaceURI();
             for(Node child = archivesNode.getFirstChild();
                 child != null;
                 child = child.getNextSibling()) {
 
                 if (child.getNodeType() == Node.ELEMENT_NODE &&
-                        SdkRepository.NS_SDK_REPOSITORY.equals(child.getNamespaceURI()) &&
+                        nsUri.equals(child.getNamespaceURI()) &&
                         SdkRepository.NODE_ARCHIVE.equals(child.getLocalName())) {
                     archives.add(parseArchive(child));
                 }