209 } |
209 } |
210 } |
210 } |
211 |
211 |
212 // Now that user has answered to confirmation dialog, take into |
212 // Now that user has answered to confirmation dialog, take into |
213 // use user selections: driveId and retainData. |
213 // use user selections: driveId and retainData. |
214 int oldInstallationDrive = ball.iInstallationDrive; |
|
215 ball.iInstallationDrive = installInfo.getDriveId(); |
214 ball.iInstallationDrive = installInfo.getDriveId(); |
216 if (ball.iUpgradeData == null) |
215 if (ball.iUpgradeData == null) |
217 { |
216 { |
218 // Get RetainData flag. |
217 // Get RetainData flag. |
219 ball.iUpgradeData = installInfo.getRetainData(); |
218 ball.iUpgradeData = installInfo.getRetainData(); |
220 } |
219 } |
221 Log.log("UserConfirmation: " + ball.iUserConfirmation); |
220 Log.log("UserConfirmation: " + ball.iUserConfirmation); |
222 Log.log("InstallationDrive: " + ball.iInstallationDrive); |
221 Log.log("InstallationDrive: " + ball.iInstallationDrive); |
223 Log.log("UpgradeData: " + ball.iUpgradeData); |
222 Log.log("UpgradeData: " + ball.iUpgradeData); |
224 if (oldInstallationDrive != ball.iInstallationDrive) |
|
225 { |
|
226 try |
|
227 { |
|
228 // Save user selection. |
|
229 SysUtil.setRepositoryStringValue( |
|
230 SysUtil.REPO_ID_JAVA_INST_VARIATION, |
|
231 SysUtil.REPO_KEY_JAVA_INST_DEF_INST_DRIVE, |
|
232 FileUtils.getDriveName(ball.iInstallationDrive)); |
|
233 Log.log("Updated user chosen drive to repository: " + |
|
234 ball.iInstallationDrive); |
|
235 } |
|
236 catch (Throwable t) |
|
237 { |
|
238 Log.log("Updating user chosen drive to repository failed", t); |
|
239 } |
|
240 } |
|
241 |
223 |
242 // Log all suite info. |
224 // Log all suite info. |
243 //ball.log(ball.iSuite.toString()); |
225 //ball.log(ball.iSuite.toString()); |
244 } |
226 } |
245 |
227 |