Move sdklib.internal.io.* into sdklib.io

Some other "public" API (AndroidManifest) depends on it
so it should be public too.

Change-Id: I88cd299bbd60df8f4dac5fe029bb52c0c0c2f16c

20 files changed, 44 insertions, 30 deletions

diff --git a/anttasks/src/com/android/ant/SetupTask.java b/anttasks/src/com/android/ant/SetupTask.java
index ed93c7e..2b371a6 100644
--- a/anttasks/src/com/android/ant/SetupTask.java
+++ b/anttasks/src/com/android/ant/SetupTask.java
@@ -22,9 +22,9 @@ import com.android.sdklib.ISdkLog;
 import com.android.sdklib.SdkConstants;
 import com.android.sdklib.SdkManager;
 import com.android.sdklib.IAndroidTarget.IOptionalLibrary;
-import com.android.sdklib.internal.io.FileWrapper;
 import com.android.sdklib.internal.project.ProjectProperties;
 import com.android.sdklib.internal.project.ProjectProperties.PropertyType;
+import com.android.sdklib.io.FileWrapper;
 import com.android.sdklib.xml.AndroidManifest;
 import com.android.sdklib.xml.AndroidXPathFactory;
 
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF
index 9a1b9cd..5e8197e 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF
@@ -98,9 +98,9 @@ Export-Package: com.android.ide.eclipse.adt;x-friends:="com.android.ide.eclipse.
  com.android.prefs;x-friends:="com.android.ide.eclipse.tests",
  com.android.sdklib;x-friends:="com.android.ide.eclipse.tests",
  com.android.sdklib.internal.avd;x-friends:="com.android.ide.eclipse.tests",
- com.android.sdklib.internal.io;x-friends:="com.android.ide.eclipse.tests",
  com.android.sdklib.internal.project;x-friends:="com.android.ide.eclipse.tests",
  com.android.sdklib.internal.repository;x-friends:="com.android.ide.eclipse.tests",
+ com.android.sdklib.io;x-friends:="com.android.ide.eclipse.tests",
  com.android.sdklib.repository;x-friends:="com.android.ide.eclipse.tests",
  com.android.sdklib.xml;x-friends:="com.android.ide.eclipse.tests",
  com.android.sdkstats;x-friends:="com.android.ide.eclipse.tests",
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/MultiResourceFile.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/MultiResourceFile.java
index 047834d..012f3dd 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/MultiResourceFile.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/MultiResourceFile.java
@@ -21,8 +21,8 @@ import com.android.layoutlib.api.IResourceValue;
 import com.android.layoutlib.utils.ResourceValue;
 import com.android.layoutlib.utils.ValueResourceParser;
 import com.android.layoutlib.utils.ValueResourceParser.IValueResourceRepository;
-import com.android.sdklib.internal.io.IAbstractFile;
-import com.android.sdklib.internal.io.StreamException;
+import com.android.sdklib.io.IAbstractFile;
+import com.android.sdklib.io.StreamException;
 
 import org.xml.sax.SAXException;
 
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ProjectResources.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ProjectResources.java
index cb05653..3a3128b 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ProjectResources.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ProjectResources.java
@@ -26,7 +26,7 @@ import com.android.ide.eclipse.adt.internal.resources.configurations.ResourceQua
 import com.android.ide.eclipse.adt.internal.resources.manager.files.IFolderWrapper;
 import com.android.layoutlib.api.IResourceValue;
 import com.android.layoutlib.utils.ResourceValue;
-import com.android.sdklib.internal.io.IAbstractFolder;
+import com.android.sdklib.io.IAbstractFolder;
 
 import org.eclipse.core.resources.IFolder;
 
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ResourceFile.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ResourceFile.java
index 82f73f7..1543abc 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ResourceFile.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ResourceFile.java
@@ -19,7 +19,7 @@ package com.android.ide.eclipse.adt.internal.resources.manager;
 import com.android.ide.eclipse.adt.internal.resources.ResourceType;
 import com.android.ide.eclipse.adt.internal.resources.configurations.FolderConfiguration;
 import com.android.layoutlib.api.IResourceValue;
-import com.android.sdklib.internal.io.IAbstractFile;
+import com.android.sdklib.io.IAbstractFile;
 
 import java.util.Collection;
 
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ResourceFolder.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ResourceFolder.java
index 7cb6605..c814f4b 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ResourceFolder.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ResourceFolder.java
@@ -20,8 +20,8 @@ import com.android.ide.eclipse.adt.internal.resources.ResourceItem;
 import com.android.ide.eclipse.adt.internal.resources.ResourceType;
 import com.android.ide.eclipse.adt.internal.resources.configurations.FolderConfiguration;
 import com.android.ide.eclipse.adt.internal.resources.manager.files.IFileWrapper;
-import com.android.sdklib.internal.io.IAbstractFile;
-import com.android.sdklib.internal.io.IAbstractFolder;
+import com.android.sdklib.io.IAbstractFile;
+import com.android.sdklib.io.IAbstractFolder;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ResourceManager.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ResourceManager.java
index 66e055b..ab1e464 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ResourceManager.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ResourceManager.java
@@ -28,10 +28,10 @@ import com.android.ide.eclipse.adt.internal.resources.manager.files.IFileWrapper
 import com.android.ide.eclipse.adt.internal.resources.manager.files.IFolderWrapper;
 import com.android.sdklib.IAndroidTarget;
 import com.android.sdklib.SdkConstants;
-import com.android.sdklib.internal.io.FolderWrapper;
-import com.android.sdklib.internal.io.IAbstractFile;
-import com.android.sdklib.internal.io.IAbstractFolder;
-import com.android.sdklib.internal.io.IAbstractResource;
+import com.android.sdklib.io.FolderWrapper;
+import com.android.sdklib.io.IAbstractFile;
+import com.android.sdklib.io.IAbstractFolder;
+import com.android.sdklib.io.IAbstractResource;
 
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/SingleResourceFile.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/SingleResourceFile.java
index 8af3f53..074180b 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/SingleResourceFile.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/SingleResourceFile.java
@@ -21,7 +21,7 @@ import com.android.ide.eclipse.adt.internal.resources.configurations.PixelDensit
 import com.android.layoutlib.api.IResourceValue;
 import com.android.layoutlib.utils.DensityBasedResourceValue;
 import com.android.layoutlib.utils.ResourceValue;
-import com.android.sdklib.internal.io.IAbstractFile;
+import com.android.sdklib.io.IAbstractFile;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/files/IFileWrapper.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/files/IFileWrapper.java
index 81f1500..5073367 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/files/IFileWrapper.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/files/IFileWrapper.java
@@ -16,8 +16,8 @@
 
 package com.android.ide.eclipse.adt.internal.resources.manager.files;
 
-import com.android.sdklib.internal.io.IAbstractFile;
-import com.android.sdklib.internal.io.StreamException;
+import com.android.sdklib.io.IAbstractFile;
+import com.android.sdklib.io.StreamException;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/files/IFolderWrapper.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/files/IFolderWrapper.java
index b910b83..2c386c5 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/files/IFolderWrapper.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/files/IFolderWrapper.java
@@ -16,9 +16,9 @@
 
 package com.android.ide.eclipse.adt.internal.resources.manager.files;
 
-import com.android.sdklib.internal.io.IAbstractFile;
-import com.android.sdklib.internal.io.IAbstractFolder;
-import com.android.sdklib.internal.io.IAbstractResource;
+import com.android.sdklib.io.IAbstractFile;
+import com.android.sdklib.io.IAbstractFolder;
+import com.android.sdklib.io.IAbstractResource;
 
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/ui/ResourceExplorerView.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/ui/ResourceExplorerView.java
index ddf3f36..1cb023b 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/ui/ResourceExplorerView.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/ui/ResourceExplorerView.java
@@ -24,7 +24,7 @@ import com.android.ide.eclipse.adt.internal.resources.manager.ResourceFile;
 import com.android.ide.eclipse.adt.internal.resources.manager.ResourceManager;
 import com.android.ide.eclipse.adt.internal.resources.manager.GlobalProjectMonitor.IResourceEventListener;
 import com.android.ide.eclipse.adt.internal.resources.manager.files.IFileWrapper;
-import com.android.sdklib.internal.io.IAbstractFile;
+import com.android.sdklib.io.IAbstractFile;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/tests/functests/layoutRendering/ApiDemosRenderingTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/tests/functests/layoutRendering/ApiDemosRenderingTest.java
index a3afb6d..ee74a55 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/tests/functests/layoutRendering/ApiDemosRenderingTest.java
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/tests/functests/layoutRendering/ApiDemosRenderingTest.java
@@ -46,7 +46,7 @@ import com.android.layoutlib.api.IResourceValue;
 import com.android.layoutlib.api.IXmlPullParser;
 import com.android.sdklib.IAndroidTarget;
 import com.android.sdklib.SdkConstants;
-import com.android.sdklib.internal.io.FolderWrapper;
+import com.android.sdklib.io.FolderWrapper;
 
 import org.kxml2.io.KXmlParser;
 import org.xmlpull.v1.XmlPullParser;
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/resources/manager/ConfigMatchTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/resources/manager/ConfigMatchTest.java
index a09b82f..05a47e5 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/resources/manager/ConfigMatchTest.java
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/resources/manager/ConfigMatchTest.java
@@ -34,7 +34,7 @@ import com.android.ide.eclipse.adt.internal.resources.manager.files.IFolderWrapp
 import com.android.ide.eclipse.mock.FileMock;
 import com.android.ide.eclipse.mock.FolderMock;
 import com.android.sdklib.IAndroidTarget;
-import com.android.sdklib.internal.io.IAbstractFolder;
+import com.android.sdklib.io.IAbstractFolder;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/io/FileWrapper.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/io/FileWrapper.java
index 0fe8902..13dea12 100644
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/io/FileWrapper.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/io/FileWrapper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.sdklib.internal.io;
+package com.android.sdklib.io;
 
 
 import java.io.File;
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/io/FolderWrapper.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/io/FolderWrapper.java
index 1496216..97cfad2 100644
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/io/FolderWrapper.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/io/FolderWrapper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.sdklib.internal.io;
+package com.android.sdklib.io;
 
 
 import java.io.File;
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/io/IAbstractFile.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/io/IAbstractFile.java
index 3c9ffd3..569e4be 100644
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/io/IAbstractFile.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/io/IAbstractFile.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.sdklib.internal.io;
+package com.android.sdklib.io;
 
 import java.io.InputStream;
 
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/io/IAbstractFolder.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/io/IAbstractFolder.java
index 7751767..80a6f84 100644
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/io/IAbstractFolder.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/io/IAbstractFolder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.sdklib.internal.io;
+package com.android.sdklib.io;
 
 
 /**
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/io/IAbstractResource.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/io/IAbstractResource.java
index b34a404..ccc4988 100644
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/io/IAbstractResource.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/io/IAbstractResource.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.sdklib.internal.io;
+package com.android.sdklib.io;
 
 /**
  * Base representation of a file system resource.<p/>
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/io/StreamException.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/io/StreamException.java
index 70b1c8e..2088864 100644
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/io/StreamException.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/io/StreamException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.sdklib.internal.io;
+package com.android.sdklib.io;
 
 /**
  * Exception thrown when {@link IAbstractFile#getContents()} fails.
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/xml/AndroidManifest.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/xml/AndroidManifest.java
index ae61a32..01d3590 100644
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/xml/AndroidManifest.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/xml/AndroidManifest.java
@@ -17,9 +17,9 @@
 package com.android.sdklib.xml;
 
 import com.android.sdklib.SdkConstants;
-import com.android.sdklib.internal.io.IAbstractFile;
-import com.android.sdklib.internal.io.IAbstractFolder;
-import com.android.sdklib.internal.io.StreamException;
+import com.android.sdklib.io.IAbstractFile;
+import com.android.sdklib.io.IAbstractFolder;
+import com.android.sdklib.io.StreamException;
 
 import org.xml.sax.InputSource;
 
@@ -53,12 +53,26 @@ public final class AndroidManifest {
     public final static String ATTRIBUTE_TARGET_PACKAGE = "targetPackage"; //$NON-NLS-1$
     public final static String ATTRIBUTE_EXPORTED = "exported"; //$NON-NLS-1$
 
+    /**
+     * Returns the package for a given project.
+     * @param projectFolder the folder of the project.
+     * @return the package info or null (or empty) if not found.
+     * @throws XPathExpressionException
+     * @throws StreamException If any error happens when reading the manifest.
+     */
     public static String getPackage(IAbstractFolder projectFolder)
             throws XPathExpressionException, StreamException {
         IAbstractFile file = projectFolder.getFile(SdkConstants.FN_ANDROID_MANIFEST_XML);
         return getPackage(file);
     }
 
+    /**
+     * Returns the package for a given manifest.
+     * @param manifestFile the manifest to parse.
+     * @return the package info or null (or empty) if not found.
+     * @throws XPathExpressionException
+     * @throws StreamException If any error happens when reading the manifest.
+     */
     public static String getPackage(IAbstractFile manifestFile)
             throws XPathExpressionException, StreamException {
         XPath xPath = AndroidXPathFactory.newXPath();