|
Lines 257-269
Link Here
|
| 257 |
FileSystem existing = repository.findFileSystem(jarFileSystem.getSystemName()); |
257 |
FileSystem existing = repository.findFileSystem(jarFileSystem.getSystemName()); |
| 258 |
|
258 |
|
| 259 |
if(existing == null) { |
259 |
if(existing == null) { |
| 260 |
if(TopManager.getDefault().notify(new NotifyDescriptor.Confirmation (SettingsBeanInfo.getString ("MSG_mountArchiveConfirm", file), |
260 |
// have commented out (issue #23223) |
| 261 |
SettingsBeanInfo.getString ("LBL_mountArchiveConfirm"))).equals (NotifyDescriptor.OK_OPTION)) { |
261 |
// if(TopManager.getDefault().notify(new NotifyDescriptor.Confirmation (SettingsBeanInfo.getString ("MSG_mountArchiveConfirm", file), |
|
|
262 |
// SettingsBeanInfo.getString ("LBL_mountArchiveConfirm"))).equals (NotifyDescriptor.OK_OPTION)) { |
| 262 |
repository.addFileSystem(jarFileSystem); |
263 |
repository.addFileSystem(jarFileSystem); |
| 263 |
existing = jarFileSystem; |
264 |
existing = jarFileSystem; |
| 264 |
} else { |
265 |
// } else { |
| 265 |
return null; |
266 |
// return null; |
| 266 |
} |
267 |
// } |
| 267 |
} |
268 |
} |
| 268 |
|
269 |
|
| 269 |
// The root folder will be displayed in the Explorer: |
270 |
// The root folder will be displayed in the Explorer: |
|
Lines 543-573
Link Here
|
| 543 |
// If no guess, always show full dialog. |
544 |
// If no guess, always show full dialog. |
| 544 |
if (pkgLevel != -1) { |
545 |
if (pkgLevel != -1) { |
| 545 |
String guessed = (String) pkgs.get(pkgLevel); |
546 |
String guessed = (String) pkgs.get(pkgLevel); |
| 546 |
Object yesOption = new JButton (SettingsBeanInfo.getString ("LBL_quickMountYes")); |
547 |
|
| 547 |
((JButton)yesOption).getAccessibleContext().setAccessibleDescription(SettingsBeanInfo.getString ("ACS_LBL_quickMountYes")); |
548 |
// have commented out (issue #23223) |
| 548 |
Object noOption = new JButton (SettingsBeanInfo.getString ("LBL_quickMountNo")); |
549 |
// Object yesOption = new JButton (SettingsBeanInfo.getString ("LBL_quickMountYes")); |
| 549 |
((JButton)noOption).setMnemonic((SettingsBeanInfo.getString ("LBL_quickMountNo_Mnem")).charAt(0)); |
550 |
// ((JButton)yesOption).getAccessibleContext().setAccessibleDescription(SettingsBeanInfo.getString ("ACS_LBL_quickMountYes")); |
| 550 |
((JButton)noOption).getAccessibleContext().setAccessibleDescription(SettingsBeanInfo.getString ("ACS_LBL_quickMountNo")); |
551 |
// Object noOption = new JButton (SettingsBeanInfo.getString ("LBL_quickMountNo")); |
| 551 |
Object cancelOption = new JButton(SettingsBeanInfo.getString("LBL_cancelButton")); |
552 |
// ((JButton)noOption).setMnemonic((SettingsBeanInfo.getString ("LBL_quickMountNo_Mnem")).charAt(0)); |
| 552 |
((JButton)cancelOption).getAccessibleContext().setAccessibleDescription(SettingsBeanInfo.getString ("ACS_LBL_cancelButton")); |
553 |
// ((JButton)noOption).getAccessibleContext().setAccessibleDescription(SettingsBeanInfo.getString ("ACS_LBL_quickMountNo")); |
| 553 |
Object result = TopManager.getDefault ().notify (new NotifyDescriptor |
554 |
// Object cancelOption = new JButton(SettingsBeanInfo.getString("LBL_cancelButton")); |
| 554 |
("".equals (guessed) ? // NOI18N |
555 |
// ((JButton)cancelOption).getAccessibleContext().setAccessibleDescription(SettingsBeanInfo.getString ("ACS_LBL_cancelButton")); |
| 555 |
SettingsBeanInfo.getString ("MSG_quickMountDefault", f.getName ()) : |
556 |
// Object result = TopManager.getDefault ().notify (new NotifyDescriptor |
| 556 |
SettingsBeanInfo.getString ("MSG_quickMount", f.getName (), guessed), // message |
557 |
// ("".equals (guessed) ? // NOI18N |
| 557 |
SettingsBeanInfo.getString ("LBL_quickMountTitle"), // title |
558 |
// SettingsBeanInfo.getString ("MSG_quickMountDefault", f.getName ()) : |
| 558 |
NotifyDescriptor.YES_NO_OPTION, // optionType |
559 |
// SettingsBeanInfo.getString ("MSG_quickMount", f.getName (), guessed), // message |
| 559 |
NotifyDescriptor.QUESTION_MESSAGE, // messageType |
560 |
// SettingsBeanInfo.getString ("LBL_quickMountTitle"), // title |
| 560 |
new Object[] { yesOption, noOption, cancelOption }, // options |
561 |
// NotifyDescriptor.YES_NO_OPTION, // optionType |
| 561 |
yesOption // initialValue |
562 |
// NotifyDescriptor.QUESTION_MESSAGE, // messageType |
| 562 |
)); |
563 |
// new Object[] { yesOption, noOption, cancelOption }, // options |
| 563 |
if (result.equals (yesOption)) { |
564 |
// yesOption // initialValue |
|
|
565 |
// )); |
| 566 |
// if (result.equals (yesOption)) { |
| 564 |
dirToMount[0] = (File) dirs.get(pkgLevel); |
567 |
dirToMount[0] = (File) dirs.get(pkgLevel); |
| 565 |
mountPackage[0] = guessed; |
568 |
mountPackage[0] = guessed; |
| 566 |
return; |
569 |
return; |
| 567 |
} else if (! result.equals (noOption)) { |
570 |
// } else if (! result.equals (noOption)) { |
| 568 |
// Dialog closed--just stop everything. |
571 |
// // Dialog closed--just stop everything. |
| 569 |
return; |
572 |
// return; |
| 570 |
} |
573 |
// } |
| 571 |
} |
574 |
} |
| 572 |
|
575 |
|
| 573 |
final PackagePanel panel = new PackagePanel(f, pkgLevel, dirs, pkgs); |
576 |
final PackagePanel panel = new PackagePanel(f, pkgLevel, dirs, pkgs); |
|
Lines 602-608
Link Here
|
| 602 |
} |
605 |
} |
| 603 |
})); |
606 |
})); |
| 604 |
dialog[0].show (); |
607 |
dialog[0].show (); |
| 605 |
|
|
|
| 606 |
} |
608 |
} |
| 607 |
|
609 |
|
| 608 |
/** Filtered reader for Java sources - it simply excludes |
610 |
/** Filtered reader for Java sources - it simply excludes |