1.1 --- a/ada.platform/src/org/netbeans/modules/ada/platform/ui/PlatformsCustomizer.java Wed Sep 23 02:06:44 2009 +0200
1.2 +++ b/ada.platform/src/org/netbeans/modules/ada/platform/ui/PlatformsCustomizer.java Sun Aug 22 23:37:11 2010 +0200
1.3 @@ -98,6 +98,8 @@
1.4 platformInfoTextField = new javax.swing.JTextField();
1.5 autoDetectLabel = new javax.swing.JLabel();
1.6 autoDetectProgress = new javax.swing.JProgressBar();
1.7 + jvmCompilerCommand = new javax.swing.JTextField();
1.8 + jvmCompilerCommandLabel = new javax.swing.JLabel();
1.9 adaPathPanel = new javax.swing.JPanel();
1.10 jLabel5 = new javax.swing.JLabel();
1.11 jScrollPane2 = new javax.swing.JScrollPane();
1.12 @@ -164,37 +166,44 @@
1.13
1.14 autoDetectProgress.setIndeterminate(true);
1.15
1.16 + jvmCompilerCommand.setEditable(false);
1.17 + jvmCompilerCommand.setText(org.openide.util.NbBundle.getMessage(PlatformsCustomizer.class, "PlatformsCustomizer.jvmCompilerCommand.text")); // NOI18N
1.18 +
1.19 + jvmCompilerCommandLabel.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
1.20 + jvmCompilerCommandLabel.setText(org.openide.util.NbBundle.getMessage(PlatformsCustomizer.class, "PlatformsCustomizer.jvmCompilerCommandLabel.text")); // NOI18N
1.21 +
1.22 org.jdesktop.layout.GroupLayout mainPanelLayout = new org.jdesktop.layout.GroupLayout(mainPanel);
1.23 mainPanel.setLayout(mainPanelLayout);
1.24 mainPanelLayout.setHorizontalGroup(
1.25 mainPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
1.26 .add(mainPanelLayout.createSequentialGroup()
1.27 .add(mainPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
1.28 - .add(mainPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
1.29 - .add(mainPanelLayout.createSequentialGroup()
1.30 - .addContainerGap()
1.31 - .add(compilerCommandLabel))
1.32 - .add(org.jdesktop.layout.GroupLayout.TRAILING, mainPanelLayout.createSequentialGroup()
1.33 - .addContainerGap()
1.34 - .add(platfromNameLabel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 91, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
1.35 .add(mainPanelLayout.createSequentialGroup()
1.36 - .addContainerGap()
1.37 - .add(otherInfoLabel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 91, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
1.38 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
1.39 - .add(mainPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
1.40 - .add(mainPanelLayout.createSequentialGroup()
1.41 - .add(compilerCommand, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 392, Short.MAX_VALUE)
1.42 - .addContainerGap())
1.43 + .add(10, 10, 10)
1.44 + .add(mainPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
1.45 + .add(otherInfoLabel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 91, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
1.46 + .add(mainPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
1.47 + .add(mainPanelLayout.createSequentialGroup()
1.48 + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
1.49 + .add(compilerCommandLabel))
1.50 + .add(org.jdesktop.layout.GroupLayout.TRAILING, mainPanelLayout.createSequentialGroup()
1.51 + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
1.52 + .add(platfromNameLabel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 91, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))))
1.53 + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
1.54 + .add(mainPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
1.55 + .add(compilerCommand, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 324, Short.MAX_VALUE)
1.56 + .add(platformName, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 324, Short.MAX_VALUE)
1.57 + .add(org.jdesktop.layout.GroupLayout.TRAILING, platformInfoTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 324, Short.MAX_VALUE)))
1.58 .add(org.jdesktop.layout.GroupLayout.TRAILING, mainPanelLayout.createSequentialGroup()
1.59 - .add(mainPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
1.60 - .add(org.jdesktop.layout.GroupLayout.LEADING, platformName, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 392, Short.MAX_VALUE)
1.61 - .add(platformInfoTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 392, Short.MAX_VALUE))
1.62 - .addContainerGap())))
1.63 - .add(org.jdesktop.layout.GroupLayout.TRAILING, mainPanelLayout.createSequentialGroup()
1.64 - .addContainerGap(230, Short.MAX_VALUE)
1.65 - .add(autoDetectLabel)
1.66 - .add(5, 5, 5)
1.67 - .add(autoDetectProgress, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
1.68 + .addContainerGap(192, Short.MAX_VALUE)
1.69 + .add(autoDetectLabel)
1.70 + .add(5, 5, 5)
1.71 + .add(autoDetectProgress, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
1.72 + .add(org.jdesktop.layout.GroupLayout.TRAILING, mainPanelLayout.createSequentialGroup()
1.73 + .add(19, 19, 19)
1.74 + .add(jvmCompilerCommandLabel)
1.75 + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
1.76 + .add(jvmCompilerCommand, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 323, Short.MAX_VALUE)))
1.77 .addContainerGap())
1.78 );
1.79 mainPanelLayout.setVerticalGroup(
1.80 @@ -212,7 +221,11 @@
1.81 .add(mainPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
1.82 .add(compilerCommandLabel)
1.83 .add(compilerCommand, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
1.84 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 175, Short.MAX_VALUE)
1.85 + .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
1.86 + .add(mainPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
1.87 + .add(jvmCompilerCommand, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
1.88 + .add(jvmCompilerCommandLabel))
1.89 + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 144, Short.MAX_VALUE)
1.90 .add(mainPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
1.91 .add(autoDetectLabel)
1.92 .add(autoDetectProgress, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
1.93 @@ -263,7 +276,7 @@
1.94 .addContainerGap()
1.95 .add(adaPathPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
1.96 .add(adaPathPanelLayout.createSequentialGroup()
1.97 - .add(jScrollPane2, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 392, Short.MAX_VALUE)
1.98 + .add(jScrollPane2, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 354, Short.MAX_VALUE)
1.99 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
1.100 .add(adaPathPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
1.101 .add(moveDownPath, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
1.102 @@ -307,16 +320,16 @@
1.103 .add(layout.createSequentialGroup()
1.104 .addContainerGap()
1.105 .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
1.106 - .add(org.jdesktop.layout.GroupLayout.LEADING, makeDefaultButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 130, Short.MAX_VALUE)
1.107 - .add(org.jdesktop.layout.GroupLayout.LEADING, autoDetectButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 130, Short.MAX_VALUE)
1.108 + .add(org.jdesktop.layout.GroupLayout.LEADING, makeDefaultButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 168, Short.MAX_VALUE)
1.109 + .add(org.jdesktop.layout.GroupLayout.LEADING, autoDetectButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 168, Short.MAX_VALUE)
1.110 .add(org.jdesktop.layout.GroupLayout.LEADING, layout.createSequentialGroup()
1.111 - .add(newButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
1.112 + .add(newButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 73, Short.MAX_VALUE)
1.113 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
1.114 - .add(removeButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
1.115 + .add(removeButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 89, Short.MAX_VALUE))
1.116 .add(org.jdesktop.layout.GroupLayout.LEADING, paltformsListTitleLabel)
1.117 - .add(org.jdesktop.layout.GroupLayout.LEADING, platformsListScrollPanel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 130, Short.MAX_VALUE))
1.118 + .add(org.jdesktop.layout.GroupLayout.LEADING, platformsListScrollPanel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 168, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
1.119 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
1.120 - .add(tabbedPane, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 512, Short.MAX_VALUE)
1.121 + .add(tabbedPane, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 474, Short.MAX_VALUE)
1.122 .addContainerGap())
1.123 );
1.124 layout.setVerticalGroup(
1.125 @@ -350,8 +363,9 @@
1.126 private void loadPlatform() {
1.127 platformName.setText(adaPlatform.getName());
1.128 platformInfoTextField.setText(adaPlatform.getInfo());
1.129 - compilerCommand.setText(adaPlatform.getInterpreterCommand());
1.130 - // TODO: add in main tab the commands list for ada platform
1.131 + compilerCommand.setText(adaPlatform.getGnatCompilerCommand());
1.132 + jvmCompilerCommand.setText(adaPlatform.getJvmGnatCompilerCommand());
1.133 + // TODO: add in main tab the commands list for ada platform
1.134 // adaPathModel.setModel(adaPlatform.getCompilerPath());
1.135 }
1.136
1.137 @@ -410,9 +424,11 @@
1.138 if (fo != null) {
1.139 try {
1.140 adaPlatform = adaPlatformManager.findPlatformProperties(fo);
1.141 - loadPlatform();
1.142 - platformListModel.refresh();
1.143 - platformName.setEditable(true);
1.144 + if (adaPlatform != null) {
1.145 + loadPlatform();
1.146 + platformListModel.refresh();
1.147 + platformName.setEditable(true);
1.148 + }
1.149 } catch (AdaException ex) {
1.150 Exceptions.printStackTrace(ex);
1.151 }
1.152 @@ -434,14 +450,15 @@
1.153 }//GEN-LAST:event_PlatformListValueChanged
1.154
1.155 private void removeButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_removeButtonActionPerformed
1.156 - int selectedIndex = PlatformList.getSelectedIndex();
1.157 - if (selectedIndex != -1) {
1.158 - adaPlatformManager.removePlatform(
1.159 - (String) platformListModel.getElementAt(
1.160 - PlatformList.getSelectedIndex()));
1.161 - platformListModel.refresh();
1.162 - adaPlatform = null;
1.163 - clearPlatform();
1.164 + if (platformListModel.getSize() > 0) {
1.165 + int selectedIndex = PlatformList.getSelectedIndex();
1.166 + if (selectedIndex != -1) {
1.167 + adaPlatformManager.removePlatform(
1.168 + (String) platformListModel.getElementAt(selectedIndex));
1.169 + platformListModel.refresh();
1.170 + adaPlatform = null;
1.171 + clearPlatform();
1.172 + }
1.173 }
1.174 }//GEN-LAST:event_removeButtonActionPerformed
1.175
1.176 @@ -479,9 +496,11 @@
1.177 private void autoDetectButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_autoDetectButtonActionPerformed
1.178 setAutoDetecting(true);
1.179 RequestProcessor.getDefault().post(new Runnable() {
1.180 +
1.181 public void run() {
1.182 adaPlatformManager.autoDetect();
1.183 EventQueue.invokeLater(new Runnable() {
1.184 +
1.185 public void run() {
1.186 platformListModel.refresh();
1.187 setAutoDetecting(false);
1.188 @@ -490,7 +509,6 @@
1.189 }
1.190 });
1.191 }//GEN-LAST:event_autoDetectButtonActionPerformed
1.192 -
1.193 // Variables declaration - do not modify//GEN-BEGIN:variables
1.194 private javax.swing.JList PlatformList;
1.195 private javax.swing.JList adaPath;
1.196 @@ -504,6 +522,8 @@
1.197 private javax.swing.JLabel jLabel5;
1.198 private javax.swing.JLabel jLabel6;
1.199 private javax.swing.JScrollPane jScrollPane2;
1.200 + private javax.swing.JTextField jvmCompilerCommand;
1.201 + private javax.swing.JLabel jvmCompilerCommandLabel;
1.202 private javax.swing.JPanel mainPanel;
1.203 private javax.swing.JButton makeDefaultButton;
1.204 private javax.swing.JButton moveDownPath;
1.205 @@ -556,7 +576,7 @@
1.206 }
1.207
1.208 adaPlatform.setInfo(platformInfoTextField.getText());
1.209 - adaPlatform.setCompilerCommand(compilerCommand.getText());
1.210 + adaPlatform.setGnatCompilerCommand(compilerCommand.getText());
1.211 // TODO: add in main tab the commands list for ada platform
1.212 // adaPlatform.setCompilerPath(adaPathModel.getModel());
1.213 adaPlatformManager.addPlatform(adaPlatform);
1.214 @@ -566,5 +586,4 @@
1.215 String defaultPlatform = adaPlatformManager.getDefaultPlatform();
1.216 return defaultPlatform != null && !defaultPlatform.equals(platform);
1.217 }
1.218 -
1.219 }