From 6183584988e1de0cb32e560666c4c275c729e192 Mon Sep 17 00:00:00 2001 From: Raphael Date: Thu, 25 Jun 2009 20:00:05 -0700 Subject: [PATCH] SDK Updater: Cleanup a bunch of todos --- .../src/com/android/sdklib/SdkManager.java | 4 ++- .../internal/repository/PlatformPackage.java | 2 +- .../internal/repository/RepoSources.java | 26 ++++++++++--------- .../repository/RemotePackagesPage.java | 15 ++--------- .../internal/repository/UpdaterData.java | 4 +-- .../repository/UpdaterWindowImpl.java | 4 +-- 6 files changed, 24 insertions(+), 31 deletions(-) diff --git a/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkManager.java b/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkManager.java index b9c3da215..85160a3e2 100644 --- a/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkManager.java +++ b/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkManager.java @@ -180,7 +180,9 @@ public final class SdkManager { writer.write(String.format("0x%04x\n", i)); } } finally { - writer.close(); + if (writer != null) { + writer.close(); + } } } diff --git a/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/PlatformPackage.java b/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/PlatformPackage.java index 622a6f276..85dbbd0e1 100755 --- a/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/PlatformPackage.java +++ b/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/PlatformPackage.java @@ -122,7 +122,7 @@ public class PlatformPackage extends Package { File platforms = new File(osSdkRoot, SdkConstants.FD_PLATFORMS); File folder = new File(platforms, String.format("android-%s", getVersion())); //$NON-NLS-1$ - // TODO find similar existing platform in platforms folder + return folder; } diff --git a/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/RepoSources.java b/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/RepoSources.java index 7a024c464..a15014dd5 100755 --- a/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/RepoSources.java +++ b/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/RepoSources.java @@ -18,6 +18,7 @@ package com.android.sdklib.internal.repository; import com.android.prefs.AndroidLocation; import com.android.prefs.AndroidLocation.AndroidLocationException; +import com.android.sdklib.ISdkLog; import java.io.File; import java.io.FileInputStream; @@ -68,7 +69,7 @@ public class RepoSources { * Loads all user sources. This replaces all existing user sources * by the ones from the property file. */ - public void loadUserSources() { + public void loadUserSources(ISdkLog log) { // Remove all existing user sources for (Iterator it = mSources.iterator(); it.hasNext(); ) { @@ -100,14 +101,14 @@ public class RepoSources { } } catch (NumberFormatException e) { - // TODO print to log - e.printStackTrace(); + log.error(e, null); + } catch (AndroidLocationException e) { - // TODO print to log - e.printStackTrace(); + log.error(e, null); + } catch (IOException e) { - // TODO print to log - e.printStackTrace(); + log.error(e, null); + } finally { if (fis != null) { try { @@ -121,8 +122,9 @@ public class RepoSources { /** * Saves all the user sources. + * @param log */ - public void saveUserSources() { + public void saveUserSources(ISdkLog log) { FileOutputStream fos = null; try { String folder = AndroidLocation.getFolder(); @@ -144,11 +146,11 @@ public class RepoSources { props.store( fos, "## User Sources for Android tool"); //$NON-NLS-1$ } catch (AndroidLocationException e) { - // TODO print to log - e.printStackTrace(); + log.error(e, null); + } catch (IOException e) { - // TODO print to log - e.printStackTrace(); + log.error(e, null); + } finally { if (fos != null) { try { diff --git a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/RemotePackagesPage.java b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/RemotePackagesPage.java index 5e32c5a7c..f5b28ea90 100755 --- a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/RemotePackagesPage.java +++ b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/RemotePackagesPage.java @@ -47,11 +47,6 @@ import org.eclipse.swt.widgets.TreeColumn; import java.util.ArrayList; -/* - * TODO list - * - load add-on sites from pref - * - delete site callback, update pref - */ public class RemotePackagesPage extends Composite implements ISdkListener { @@ -260,18 +255,12 @@ public class RemotePackagesPage extends Composite implements ISdkListener { mTreeViewerSources.setExpandedState(pkg, true); for (Object archive : provider.getChildren(pkg)) { if (archive instanceof Archive) { - if (((Archive) archive).isCompatible()) { - mTreeViewerSources.setChecked(archive, true); - } else { - mTreeViewerSources.setChecked(archive, false); - // TODO change the item image to mark it incompatible - } + mTreeViewerSources.setChecked(archive, ((Archive) archive).isCompatible()); } } } private void onInstallSelectedArchives() { - ArrayList archives = new ArrayList(); for (Object element : mTreeViewerSources.getCheckedElements()) { if (element instanceof Archive) { @@ -292,7 +281,7 @@ public class RemotePackagesPage extends Composite implements ISdkListener { boolean changed = false; ISelection sel = mTreeViewerSources.getSelection(); - if (sel instanceof ITreeSelection) { + if (mUpdaterData != null && sel instanceof ITreeSelection) { for (Object c : ((ITreeSelection) sel).toList()) { if (c instanceof RepoSource && ((RepoSource) c).isUserSource()) { RepoSource source = (RepoSource) c; diff --git a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java index a0b591ee7..109000b02 100755 --- a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java +++ b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java @@ -219,7 +219,7 @@ class UpdaterData { try { mAvdManager.reloadAvds(); } catch (AndroidLocationException e) { - // FIXME + mSdkLog.error(e, null); } } } @@ -236,7 +236,7 @@ class UpdaterData { try { listener.onSdkChange(); } catch (Throwable t) { - // TODO: log error + mSdkLog.error(t, null); } } } diff --git a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterWindowImpl.java b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterWindowImpl.java index 8534b96f7..260541009 100755 --- a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterWindowImpl.java +++ b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterWindowImpl.java @@ -227,7 +227,7 @@ public class UpdaterWindowImpl { * Called by the main loop when the window has been disposed. */ private void dispose() { - mUpdaterData.getSources().saveUserSources(); + mUpdaterData.getSources().saveUserSources(mUpdaterData.getSdkLog()); } // --- page switching --- @@ -325,7 +325,7 @@ public class UpdaterWindowImpl { } // Load user sources - sources.loadUserSources(); + sources.loadUserSources(mUpdaterData.getSdkLog()); mRemotePackagesPage.onSdkChange(); }