Lines 72-88
Link Here
|
72 |
locationValue.setText(ModuleUISettings.getDefault().getLastUsedModuleLocation()); |
72 |
locationValue.setText(ModuleUISettings.getDefault().getLastUsedModuleLocation()); |
73 |
} else if (wizardType == NewNbModuleWizardIterator.TYPE_MODULE) { |
73 |
} else if (wizardType == NewNbModuleWizardIterator.TYPE_MODULE) { |
74 |
if (moduleSuiteValue.getItemCount() > 0) { |
74 |
if (moduleSuiteValue.getItemCount() > 0) { |
75 |
suiteModule.setSelected(true); |
75 |
restoreSelectedSuite(); |
76 |
locationValue.setText((String) moduleSuiteValue.getSelectedItem()); |
76 |
suiteModule.setSelected(suiteModuleWasSelected); |
|
|
77 |
if (suiteModuleWasSelected) { |
78 |
locationValue.setText((String) moduleSuiteValue.getSelectedItem()); |
79 |
} else { |
80 |
locationValue.setText(ModuleUISettings.getDefault().getLastUsedModuleLocation()); |
81 |
} |
77 |
} else { |
82 |
} else { |
78 |
locationValue.setText(ModuleUISettings.getDefault().getLastUsedModuleLocation()); |
83 |
locationValue.setText(ModuleUISettings.getDefault().getLastUsedModuleLocation()); |
79 |
} |
84 |
} |
80 |
} else if (wizardType == NewNbModuleWizardIterator.TYPE_LIBRARY_MODULE) { |
85 |
} else if (wizardType == NewNbModuleWizardIterator.TYPE_LIBRARY_MODULE) { |
81 |
moduleSuite.setText("Add to Module Suite:"); // XXX I18N! |
86 |
moduleSuite.setText("Add to Module Suite:"); // XXX I18N! |
82 |
suiteModule.setSelected(true); |
87 |
suiteModule.setSelected(suiteModuleWasSelected); |
83 |
suiteModule.setVisible(false); |
88 |
suiteModule.setVisible(false); |
84 |
if (moduleSuiteValue.getItemCount() > 0) { |
89 |
if (moduleSuiteValue.getItemCount() > 0) { |
85 |
locationValue.setText((String) moduleSuiteValue.getSelectedItem()); |
90 |
restoreSelectedSuite(); |
|
|
91 |
if (suiteModuleWasSelected) { |
92 |
locationValue.setText((String) moduleSuiteValue.getSelectedItem()); |
93 |
} |
86 |
} |
94 |
} |
87 |
platform.setVisible(false); |
95 |
platform.setVisible(false); |
88 |
platformValue.setVisible(false); |
96 |
platformValue.setVisible(false); |
Lines 97-103
Link Here
|
97 |
updateEnabled(); |
105 |
updateEnabled(); |
98 |
} |
106 |
} |
99 |
|
107 |
|
|
|
108 |
private void restoreSelectedSuite() { |
109 |
if (lastSelectedSuite != null) { |
110 |
int max = moduleSuiteValue.getModel().getSize(); |
111 |
for (int i=0; i < max; i++) { |
112 |
if (lastSelectedSuite.equals(moduleSuiteValue.getModel().getElementAt(i))) { |
113 |
moduleSuiteValue.setSelectedItem(lastSelectedSuite); |
114 |
break; |
115 |
} |
116 |
} |
117 |
} |
118 |
} |
100 |
|
119 |
|
|
|
120 |
private static boolean suiteModuleWasSelected = true; |
101 |
|
121 |
|
102 |
private String getNameValue() { |
122 |
private String getNameValue() { |
103 |
return nameValue.getText().trim(); |
123 |
return nameValue.getText().trim(); |
Lines 539-550
Link Here
|
539 |
|
559 |
|
540 |
private void moduleSuiteChosen(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_moduleSuiteChosen |
560 |
private void moduleSuiteChosen(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_moduleSuiteChosen |
541 |
if (!wasLocationUpdate) { |
561 |
if (!wasLocationUpdate) { |
542 |
locationValue.setText((String) moduleSuiteValue.getSelectedItem()); |
562 |
String suite = (String) moduleSuiteValue.getSelectedItem(); |
|
|
563 |
locationValue.setText(suite); |
564 |
lastSelectedSuite = suite; |
543 |
wasLocationUpdate = false; |
565 |
wasLocationUpdate = false; |
544 |
} |
566 |
} |
545 |
checkModuleSuite(); |
567 |
checkModuleSuite(); |
546 |
}//GEN-LAST:event_moduleSuiteChosen |
568 |
}//GEN-LAST:event_moduleSuiteChosen |
547 |
|
569 |
|
|
|
570 |
private static String lastSelectedSuite = null; |
571 |
|
548 |
private void browseModuleSuite(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_browseModuleSuite |
572 |
private void browseModuleSuite(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_browseModuleSuite |
549 |
JFileChooser chooser = ProjectChooser.projectChooser(); |
573 |
JFileChooser chooser = ProjectChooser.projectChooser(); |
550 |
int option = chooser.showOpenDialog(this); |
574 |
int option = chooser.showOpenDialog(this); |
Lines 574-580
Link Here
|
574 |
|
598 |
|
575 |
private void typeChanged(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_typeChanged |
599 |
private void typeChanged(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_typeChanged |
576 |
updateEnabled(); |
600 |
updateEnabled(); |
577 |
if (suiteModule.isSelected()) { |
601 |
suiteModuleWasSelected = suiteModule.isSelected(); |
|
|
602 |
if (suiteModuleWasSelected) { |
578 |
checkModuleSuite(); |
603 |
checkModuleSuite(); |
579 |
} else { // standalone module |
604 |
} else { // standalone module |
580 |
checkNbPlatform(); |
605 |
checkNbPlatform(); |