File tree Expand file tree Collapse file tree 4 files changed +7
-18
lines changed
src/processing/mode/android Expand file tree Collapse file tree 4 files changed +7
-18
lines changed Original file line number Diff line number Diff line change @@ -259,6 +259,8 @@ sdk_downloader.error_cannot_find_emulator = Cannot find the emulator
259
259
sdk_downloader.error.cannot_unpack_platform = Error unpacking platform to "%s"
260
260
sdk_downloader.download_title = SDK download
261
261
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
262
264
263
265
# ---------------------------------------
264
266
# System image downloader
Original file line number Diff line number Diff line change @@ -183,22 +183,6 @@ public void actionPerformed(ActionEvent e) {
183
183
});
184
184
androidMenu .add (item );
185
185
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
-
202
186
androidMenu .addSeparator ();
203
187
204
188
fragmentItem = new JCheckBoxMenuItem (AndroidMode .getTextString ("menu.android.app" ));
Original file line number Diff line number Diff line change @@ -171,8 +171,8 @@ public void checkSDK(Editor editor) {
171
171
}
172
172
}
173
173
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 );
176
176
} else {
177
177
Devices devices = Devices .getInstance ();
178
178
devices .setSDK (sdk );
Original file line number Diff line number Diff line change 26
26
import org .w3c .dom .NodeList ;
27
27
import org .w3c .dom .ProcessingInstruction ;
28
28
import org .xml .sax .SAXException ;
29
+ import processing .app .Messages ;
29
30
import processing .app .Platform ;
30
31
import processing .app .Preferences ;
31
32
import processing .app .ui .Toolkit ;
@@ -205,6 +206,8 @@ protected Object doInBackground() throws Exception {
205
206
} catch (IOException e ) {
206
207
// TODO Handle exceptions here somehow (ie show error message)
207
208
// 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 ()));
208
211
e .printStackTrace ();
209
212
}
210
213
return null ;
You can’t perform that action at this time.
0 commit comments