Lines 186-191
Link Here
|
186 |
listener = new ActionListenerImpl(); |
186 |
listener = new ActionListenerImpl(); |
187 |
comIndex.addActionListener(listener); |
187 |
comIndex.addActionListener(listener); |
188 |
completer = new TextValueCompleter(getGlobalOptions(), txtOptions, " "); //NOI18N |
188 |
completer = new TextValueCompleter(getGlobalOptions(), txtOptions, " "); //NOI18N |
|
|
189 |
txtOptions.setVisible(false); |
189 |
} |
190 |
} |
190 |
|
191 |
|
191 |
/** XXX update for M3 from {@link org.apache.maven.cli.CLIManager#CLIManager} */ |
192 |
/** XXX update for M3 from {@link org.apache.maven.cli.CLIManager#CLIManager} */ |
Lines 322-327
Link Here
|
322 |
lblIndex = new javax.swing.JLabel(); |
323 |
lblIndex = new javax.swing.JLabel(); |
323 |
comIndex = new javax.swing.JComboBox(); |
324 |
comIndex = new javax.swing.JComboBox(); |
324 |
btnIndex = new javax.swing.JButton(); |
325 |
btnIndex = new javax.swing.JButton(); |
|
|
326 |
jLabel2 = new javax.swing.JLabel(); |
327 |
jLabel4 = new javax.swing.JLabel(); |
328 |
cbProjectNodeNameMode = new javax.swing.JComboBox(); |
329 |
txtProjectNodeNameCustomPattern = new javax.swing.JTextField(); |
325 |
|
330 |
|
326 |
org.openide.awt.Mnemonics.setLocalizedText(lblCommandLine, org.openide.util.NbBundle.getMessage(SettingsPanel.class, "SettingsPanel.lblCommandLine.text")); // NOI18N |
331 |
org.openide.awt.Mnemonics.setLocalizedText(lblCommandLine, org.openide.util.NbBundle.getMessage(SettingsPanel.class, "SettingsPanel.lblCommandLine.text")); // NOI18N |
327 |
|
332 |
|
Lines 368-373
Link Here
|
368 |
} |
373 |
} |
369 |
}); |
374 |
}); |
370 |
|
375 |
|
|
|
376 |
org.openide.awt.Mnemonics.setLocalizedText(jLabel2, org.openide.util.NbBundle.getMessage(SettingsPanel.class, "SettingsPanel.jLabel2.text")); // NOI18N |
377 |
|
378 |
org.openide.awt.Mnemonics.setLocalizedText(jLabel4, org.openide.util.NbBundle.getMessage(SettingsPanel.class, "SettingsPanel.jLabel4.text")); // NOI18N |
379 |
|
380 |
cbProjectNodeNameMode.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Default", "${project.artifactId}", "${project.artifactId}-TRUNK", "${project.artifactId}-${project.version}", "${project.groupId}.${project.artifactId}", "${project.groupId}.${project.artifactId}-${project.version}", "Custom..." })); |
381 |
cbProjectNodeNameMode.addItemListener(new java.awt.event.ItemListener() { |
382 |
public void itemStateChanged(java.awt.event.ItemEvent evt) { |
383 |
cbProjectNodeNameModeItemStateChanged(evt); |
384 |
} |
385 |
}); |
386 |
cbProjectNodeNameMode.addActionListener(new java.awt.event.ActionListener() { |
387 |
public void actionPerformed(java.awt.event.ActionEvent evt) { |
388 |
cbProjectNodeNameModeActionPerformed(evt); |
389 |
} |
390 |
}); |
391 |
|
392 |
txtProjectNodeNameCustomPattern.setText(org.openide.util.NbBundle.getMessage(SettingsPanel.class, "SettingsPanel.txtProjectNodeNameCustomPattern.text")); // NOI18N |
393 |
txtProjectNodeNameCustomPattern.setToolTipText(org.openide.util.NbBundle.getMessage(SettingsPanel.class, "SettingsPanel.txtProjectNodeNameCustomPattern.toolTipText")); // NOI18N |
394 |
|
371 |
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); |
395 |
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); |
372 |
this.setLayout(layout); |
396 |
this.setLayout(layout); |
373 |
layout.setHorizontalGroup( |
397 |
layout.setHorizontalGroup( |
Lines 419-425
Link Here
|
419 |
.addGroup(layout.createSequentialGroup() |
443 |
.addGroup(layout.createSequentialGroup() |
420 |
.addComponent(cbSkipTests) |
444 |
.addComponent(cbSkipTests) |
421 |
.addGap(0, 0, Short.MAX_VALUE))) |
445 |
.addGap(0, 0, Short.MAX_VALUE))) |
422 |
.addContainerGap()))) |
446 |
.addContainerGap()) |
|
|
447 |
.addGroup(layout.createSequentialGroup() |
448 |
.addComponent(jLabel2) |
449 |
.addGap(0, 0, Short.MAX_VALUE)))) |
450 |
.addGroup(layout.createSequentialGroup() |
451 |
.addGap(30, 30, 30) |
452 |
.addComponent(jLabel4) |
453 |
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) |
454 |
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) |
455 |
.addComponent(txtProjectNodeNameCustomPattern) |
456 |
.addComponent(cbProjectNodeNameMode, 0, 1, Short.MAX_VALUE)) |
457 |
.addContainerGap()) |
423 |
); |
458 |
); |
424 |
|
459 |
|
425 |
layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {btnIndex, btnOptions}); |
460 |
layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {btnIndex, btnOptions}); |
Lines 465-471
Link Here
|
465 |
.addComponent(btnIndex) |
500 |
.addComponent(btnIndex) |
466 |
.addComponent(lblIndex) |
501 |
.addComponent(lblIndex) |
467 |
.addComponent(comIndex, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) |
502 |
.addComponent(comIndex, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) |
468 |
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) |
503 |
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) |
|
|
504 |
.addComponent(jLabel2) |
505 |
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) |
506 |
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) |
507 |
.addComponent(jLabel4) |
508 |
.addComponent(cbProjectNodeNameMode, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) |
509 |
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) |
510 |
.addComponent(txtProjectNodeNameCustomPattern, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) |
511 |
.addContainerGap(29, Short.MAX_VALUE)) |
469 |
); |
512 |
); |
470 |
}// </editor-fold>//GEN-END:initComponents |
513 |
}// </editor-fold>//GEN-END:initComponents |
471 |
|
514 |
|
Lines 515-526
Link Here
|
515 |
} |
558 |
} |
516 |
|
559 |
|
517 |
}//GEN-LAST:event_btnOptionsActionPerformed |
560 |
}//GEN-LAST:event_btnOptionsActionPerformed |
|
|
561 |
|
562 |
private void cbProjectNodeNameModeActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cbProjectNodeNameModeActionPerformed |
563 |
txtProjectNodeNameCustomPattern.setVisible(cbProjectNodeNameMode.getSelectedIndex()==cbProjectNodeNameMode.getItemCount()-1); |
564 |
}//GEN-LAST:event_cbProjectNodeNameModeActionPerformed |
565 |
|
566 |
private void cbProjectNodeNameModeItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_cbProjectNodeNameModeItemStateChanged |
567 |
}//GEN-LAST:event_cbProjectNodeNameModeItemStateChanged |
518 |
|
568 |
|
519 |
|
569 |
|
520 |
// Variables declaration - do not modify//GEN-BEGIN:variables |
570 |
// Variables declaration - do not modify//GEN-BEGIN:variables |
521 |
private javax.swing.JButton btnGoals; |
571 |
private javax.swing.JButton btnGoals; |
522 |
private javax.swing.JButton btnIndex; |
572 |
private javax.swing.JButton btnIndex; |
523 |
private javax.swing.JButton btnOptions; |
573 |
private javax.swing.JButton btnOptions; |
|
|
574 |
private javax.swing.JComboBox cbProjectNodeNameMode; |
524 |
private javax.swing.JCheckBox cbSkipTests; |
575 |
private javax.swing.JCheckBox cbSkipTests; |
525 |
private javax.swing.JComboBox comBinaries; |
576 |
private javax.swing.JComboBox comBinaries; |
526 |
private javax.swing.JComboBox comIndex; |
577 |
private javax.swing.JComboBox comIndex; |
Lines 528-534
Link Here
|
528 |
private javax.swing.JComboBox comMavenHome; |
579 |
private javax.swing.JComboBox comMavenHome; |
529 |
private javax.swing.JComboBox comSource; |
580 |
private javax.swing.JComboBox comSource; |
530 |
private javax.swing.JLabel jLabel1; |
581 |
private javax.swing.JLabel jLabel1; |
|
|
582 |
private javax.swing.JLabel jLabel2; |
531 |
private javax.swing.JLabel jLabel3; |
583 |
private javax.swing.JLabel jLabel3; |
|
|
584 |
private javax.swing.JLabel jLabel4; |
532 |
private javax.swing.JLabel lblBinaries; |
585 |
private javax.swing.JLabel lblBinaries; |
533 |
private javax.swing.JLabel lblCommandLine; |
586 |
private javax.swing.JLabel lblCommandLine; |
534 |
private javax.swing.JLabel lblExternalVersion; |
587 |
private javax.swing.JLabel lblExternalVersion; |
Lines 537-542
Link Here
|
537 |
private javax.swing.JLabel lblOptions; |
590 |
private javax.swing.JLabel lblOptions; |
538 |
private javax.swing.JLabel lblSource; |
591 |
private javax.swing.JLabel lblSource; |
539 |
private javax.swing.JTextField txtOptions; |
592 |
private javax.swing.JTextField txtOptions; |
|
|
593 |
private javax.swing.JTextField txtProjectNodeNameCustomPattern; |
540 |
// End of variables declaration//GEN-END:variables |
594 |
// End of variables declaration//GEN-END:variables |
541 |
|
595 |
|
542 |
private void browseAddNewRuntime() { |
596 |
private void browseAddNewRuntime() { |
Lines 623-628
Link Here
|
623 |
comSource.setSelectedItem(MavenSettings.getDefault().getSourceDownloadStrategy()); |
677 |
comSource.setSelectedItem(MavenSettings.getDefault().getSourceDownloadStrategy()); |
624 |
cbSkipTests.setSelected(MavenSettings.getDefault().isSkipTests()); |
678 |
cbSkipTests.setSelected(MavenSettings.getDefault().isSkipTests()); |
625 |
|
679 |
|
|
|
680 |
final String pattern = MavenSettings.getDefault().getProjectNodeNamePattern(); |
681 |
txtProjectNodeNameCustomPattern.setText(""); |
682 |
if (null == pattern || pattern.isEmpty()) { |
683 |
//default |
684 |
cbProjectNodeNameMode.setSelectedIndex(0); |
685 |
} else { |
686 |
//ignore the "default" entry |
687 |
//ignore the "custom..." entry |
688 |
final int start = 1; |
689 |
final int end = cbProjectNodeNameMode.getItemCount() - 1; |
690 |
|
691 |
boolean foundPredefinedPattern = false; |
692 |
for (int i = start; i < end; i++) { |
693 |
final Object itemAt = cbProjectNodeNameMode.getItemAt(i); |
694 |
if (pattern.equals(itemAt)) { |
695 |
cbProjectNodeNameMode.setSelectedIndex(i); |
696 |
foundPredefinedPattern = true; |
697 |
break; |
698 |
} |
699 |
} |
700 |
if (!foundPredefinedPattern) { |
701 |
//set mode to custom |
702 |
cbProjectNodeNameMode.setSelectedIndex(cbProjectNodeNameMode.getItemCount() - 1); |
703 |
txtProjectNodeNameCustomPattern.setText(pattern); |
704 |
} |
705 |
} |
706 |
|
626 |
changed = false; //#163955 - do not fire change events on load |
707 |
changed = false; //#163955 - do not fire change events on load |
627 |
} |
708 |
} |
628 |
|
709 |
|
Lines 656-661
Link Here
|
656 |
MavenSettings.getDefault().setJavadocDownloadStrategy((MavenSettings.DownloadStrategy) comJavadoc.getSelectedItem()); |
737 |
MavenSettings.getDefault().setJavadocDownloadStrategy((MavenSettings.DownloadStrategy) comJavadoc.getSelectedItem()); |
657 |
MavenSettings.getDefault().setSourceDownloadStrategy((MavenSettings.DownloadStrategy) comSource.getSelectedItem()); |
738 |
MavenSettings.getDefault().setSourceDownloadStrategy((MavenSettings.DownloadStrategy) comSource.getSelectedItem()); |
658 |
MavenSettings.getDefault().setSkipTests(cbSkipTests.isSelected()); |
739 |
MavenSettings.getDefault().setSkipTests(cbSkipTests.isSelected()); |
|
|
740 |
if (0 == cbProjectNodeNameMode.getSelectedIndex()) { |
741 |
//selected "default" entry |
742 |
MavenSettings.getDefault().setProjectNodeNamePattern(null); |
743 |
} else if (cbProjectNodeNameMode.getSelectedIndex() == cbProjectNodeNameMode.getItemCount() - 1) { |
744 |
//selected "custom..." entry |
745 |
MavenSettings.getDefault().setProjectNodeNamePattern(txtProjectNodeNameCustomPattern.getText()); |
746 |
} else { |
747 |
//a predefined pattern entry was selected |
748 |
MavenSettings.getDefault().setProjectNodeNamePattern(cbProjectNodeNameMode.getSelectedItem().toString()); |
749 |
} |
659 |
changed = false; |
750 |
changed = false; |
660 |
} |
751 |
} |
661 |
|
752 |
|