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

am 37c885e4: Merge change 3763 into donut

Browse Source 
Merge commit '37c885e48e05d5b139b724e75867554a1e97f309'

* commit '37c885e48e05d5b139b724e75867554a1e97f309':
  SDK Updater: Fix the build.
This commit is contained in:
Android (Google) Code Review
2009-06-10 15:33:00 -07:00
committed by The Android Open Source Project
parent e861b46441 37c885e48e
commit 7bc453163d
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tools/sdkmanager/app/src/com/android/sdkmanager/internal/repository/SettingsPage.java
View File

@@ -32,9 +32,12 @@ import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionEvent;
import java.io.File; import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.FileReader; import java.io.FileReader;
import java.io.FileWriter; import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.net.URL; import java.net.URL;
import java.util.Properties; import java.util.Properties;
@@ -152,22 +155,24 @@ public class SettingsPage extends Composite implements ISettingsPage {
props.put(JAVA_HTTP_PROXY_HOST, mProxyServerText.getText()); props.put(JAVA_HTTP_PROXY_HOST, mProxyServerText.getText());
props.put(JAVA_HTTP_PROXY_PORT, mProxyPortText.getText()); props.put(JAVA_HTTP_PROXY_PORT, mProxyPortText.getText());
FileWriter fw = null;
FileOutputStream fos = null;
try { try {
String folder = AndroidLocation.getFolder(); String folder = AndroidLocation.getFolder();
File f = new File(folder, SETTINGS_FILENAME); File f = new File(folder, SETTINGS_FILENAME);
fw = new FileWriter(f);
props.store(fw, "## Settings for SdkManager"); //$NON-NLS-1$ fos = new FileOutputStream(f);
props.store( fos, "## Settings for Android Tool"); //$NON-NLS-1$
} catch (AndroidLocationException e) { } catch (AndroidLocationException e) {
e.printStackTrace(); e.printStackTrace();
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} finally { } finally {
if (fw != null) { if (fos != null) {
try { try {
fw.close(); fos.close();
} catch (IOException e) { } catch (IOException e) {
} }
} }
@@ -178,15 +183,15 @@ public class SettingsPage extends Composite implements ISettingsPage {
* Load settings and puts them in the UI. * Load settings and puts them in the UI.
*/ */
public void loadSettings() { public void loadSettings() {
FileReader fr = null; FileInputStream fis = null;
try { try {
String folder = AndroidLocation.getFolder(); String folder = AndroidLocation.getFolder();
File f = new File(folder, SETTINGS_FILENAME); File f = new File(folder, SETTINGS_FILENAME);
if (f.exists()) { if (f.exists()) {
fr = new FileReader(f); fis = new FileInputStream(f);
Properties props = new Properties(); Properties props = new Properties();
props.load(fr); props.load(fis);
mProxyServerText.setText(props.getProperty(JAVA_HTTP_PROXY_HOST, "")); //$NON-NLS-1$ mProxyServerText.setText(props.getProperty(JAVA_HTTP_PROXY_HOST, "")); //$NON-NLS-1$
mProxyPortText.setText(props.getProperty(JAVA_HTTP_PROXY_PORT, "")); //$NON-NLS-1$ mProxyPortText.setText(props.getProperty(JAVA_HTTP_PROXY_PORT, "")); //$NON-NLS-1$
@@ -197,9 +202,9 @@ public class SettingsPage extends Composite implements ISettingsPage {
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} finally { } finally {
if (fr != null) { if (fis != null) {
try { try {
fr.close(); fis.close();
} catch (IOException e) { } catch (IOException e) {
} }
} }