Skip to content

Commit 60780dc

Browse files
[Fix]Error Handling,Remove test code
1 parent c02efb0 commit 60780dc

File tree

4 files changed

+7
-18
lines changed

4 files changed

+7
-18
lines changed

mode/languages/mode.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,8 @@ sdk_downloader.error_cannot_find_emulator = Cannot find the emulator
259259
sdk_downloader.error.cannot_unpack_platform = Error unpacking platform to "%s"
260260
sdk_downloader.download_title = SDK download
261261
sdk_downloader.download_sdk_label = Downloading Android SDK...
262+
sdk_downloader.download_error_title = Incomplete download
263+
sdk_downloader.download_error_message = SDK Installation is incomplete due to: \n%s
262264

263265
# ---------------------------------------
264266
# System image downloader

mode/src/processing/mode/android/AndroidEditor.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -183,22 +183,6 @@ public void actionPerformed(ActionEvent e) {
183183
});
184184
androidMenu.add(item);
185185

186-
//For testing SDK Downloader - Remove Later. --------------------------------------
187-
item = new JMenuItem("SDK Downloader");
188-
item.addActionListener(new ActionListener() {
189-
public void actionPerformed(ActionEvent e) {
190-
try {
191-
AndroidSDK.download(null,androidMode);
192-
} catch (AndroidSDK.BadSDKException ex) {
193-
ex.printStackTrace();
194-
} catch (AndroidSDK.CancelException ex) {
195-
ex.printStackTrace();
196-
}
197-
}
198-
});
199-
androidMenu.add(item);
200-
//--------------------------------------------------------------------
201-
202186
androidMenu.addSeparator();
203187

204188
fragmentItem = new JCheckBoxMenuItem(AndroidMode.getTextString("menu.android.app"));

mode/src/processing/mode/android/AndroidMode.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,8 @@ public void checkSDK(Editor editor) {
171171
}
172172
}
173173
if (sdk == null) {
174-
Messages.showWarning(AndroidMode.getTextString("android_mode.warn.cannot_load_sdk_title"),
175-
AndroidMode.getTextString("android_mode.warn.cannot_load_sdk_body"), tr);
174+
Messages.showWarning(AndroidMode.getTextString("android_mode.warn.cannot_load_sdk_title"),
175+
AndroidMode.getTextString("android_mode.warn.cannot_load_sdk_body"), tr);
176176
} else {
177177
Devices devices = Devices.getInstance();
178178
devices.setSDK(sdk);

mode/src/processing/mode/android/SDKDownloader.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.w3c.dom.NodeList;
2727
import org.w3c.dom.ProcessingInstruction;
2828
import org.xml.sax.SAXException;
29+
import processing.app.Messages;
2930
import processing.app.Platform;
3031
import processing.app.Preferences;
3132
import processing.app.ui.Toolkit;
@@ -205,6 +206,8 @@ protected Object doInBackground() throws Exception {
205206
} catch (IOException e) {
206207
// TODO Handle exceptions here somehow (ie show error message)
207208
// and handle at least mkdir() results (above)
209+
Messages.showWarning(AndroidMode.getTextString("sdk_downloader.download_error_title"),
210+
AndroidMode.getTextString("sdk_downloader.download_error_message",e.getMessage()));
208211
e.printStackTrace();
209212
}
210213
return null;

0 commit comments

Comments
 (0)