From d90a3f96f56a8da4603b3adb7c1b06837ce081dc Mon Sep 17 00:00:00 2001 From: Laszlo Kishalmi Date: Wed, 6 Dec 2023 15:37:18 -0800 Subject: [PATCH] Fix Swaped proxy and exec combo in Gradle Options --- .../modules/gradle/options/SettingsPanel.form | 43 +++++++++++-------- .../modules/gradle/options/SettingsPanel.java | 29 +++++++------ 2 files changed, 42 insertions(+), 30 deletions(-) diff --git a/extide/gradle/src/org/netbeans/modules/gradle/options/SettingsPanel.form b/extide/gradle/src/org/netbeans/modules/gradle/options/SettingsPanel.form index 773803e7d5a3..0023442f088c 100644 --- a/extide/gradle/src/org/netbeans/modules/gradle/options/SettingsPanel.form +++ b/extide/gradle/src/org/netbeans/modules/gradle/options/SettingsPanel.form @@ -41,7 +41,7 @@ - + @@ -137,7 +137,7 @@ - + @@ -154,7 +154,7 @@ - + @@ -194,7 +194,7 @@ - + @@ -381,9 +381,9 @@ - + @@ -417,14 +417,14 @@ - + - + - + @@ -470,6 +470,9 @@ + + + @@ -483,6 +486,9 @@ + + + @@ -495,16 +501,14 @@ + + + - - - - - @@ -515,6 +519,11 @@ + + + + + @@ -636,7 +645,7 @@ - + @@ -744,7 +753,7 @@ - + @@ -886,7 +895,7 @@ - + @@ -965,7 +974,7 @@ - + diff --git a/extide/gradle/src/org/netbeans/modules/gradle/options/SettingsPanel.java b/extide/gradle/src/org/netbeans/modules/gradle/options/SettingsPanel.java index 2e13025137dd..8d12f60b7df6 100644 --- a/extide/gradle/src/org/netbeans/modules/gradle/options/SettingsPanel.java +++ b/extide/gradle/src/org/netbeans/modules/gradle/options/SettingsPanel.java @@ -138,8 +138,8 @@ private void initComponents() { lbAllowExecution = new javax.swing.JLabel(); cbAllowExecution = new javax.swing.JComboBox<>(); lbNetworkProxy = new javax.swing.JLabel(); - cbNetworkProxy = new javax.swing.JComboBox<>(); btManageRuntimes = new javax.swing.JButton(); + cbNetworkProxy = new javax.swing.JComboBox<>(); pnlAppearance = new javax.swing.JPanel(); javax.swing.JPanel jPanel4 = new javax.swing.JPanel(); cbDisplayDescription = new javax.swing.JCheckBox(); @@ -275,7 +275,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { .addComponent(btUseCustomGradle, javax.swing.GroupLayout.DEFAULT_SIZE, 102, Short.MAX_VALUE)) .addGroup(distributionPanelLayout.createSequentialGroup() .addComponent(rbPreferWrapper) - .addGap(0, 13, Short.MAX_VALUE)))) + .addGap(0, 0, Short.MAX_VALUE)))) .addGroup(distributionPanelLayout.createSequentialGroup() .addComponent(lblGradleUserHome) .addGap(9, 9, 9) @@ -330,11 +330,14 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { org.openide.awt.Mnemonics.setLocalizedText(cbSkipTest, org.openide.util.NbBundle.getMessage(SettingsPanel.class, "SettingsPanel.cbSkipTest.text")); // NOI18N + lbJavaRuntime.setLabelFor(cbJavaRuntime); org.openide.awt.Mnemonics.setLocalizedText(lbJavaRuntime, org.openide.util.NbBundle.getMessage(SettingsPanel.class, "SettingsPanel.lbJavaRuntime.text")); // NOI18N lbAllowExecution.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING); + lbAllowExecution.setLabelFor(cbAllowExecution); org.openide.awt.Mnemonics.setLocalizedText(lbAllowExecution, org.openide.util.NbBundle.getMessage(SettingsPanel.class, "SettingsPanel.lbAllowExecution.text")); // NOI18N + lbNetworkProxy.setLabelFor(cbNetworkProxy); org.openide.awt.Mnemonics.setLocalizedText(lbNetworkProxy, org.openide.util.NbBundle.getMessage(SettingsPanel.class, "SettingsPanel.lbNetworkProxy.text")); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(btManageRuntimes, org.openide.util.NbBundle.getMessage(SettingsPanel.class, "SettingsPanel.btManageRuntimes.text")); // NOI18N @@ -368,9 +371,9 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { .addComponent(lbNetworkProxy, javax.swing.GroupLayout.PREFERRED_SIZE, 142, javax.swing.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addGroup(executionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(cbNetworkProxy, javax.swing.GroupLayout.Alignment.LEADING, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(cbAllowExecution, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(cbJavaRuntime, javax.swing.GroupLayout.Alignment.LEADING, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addComponent(cbJavaRuntime, javax.swing.GroupLayout.Alignment.LEADING, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(cbNetworkProxy, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(btManageRuntimes))) .addContainerGap()) @@ -399,19 +402,19 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { .addGap(6, 6, 6) .addGroup(executionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(lbAllowExecution) - .addComponent(cbNetworkProxy, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(cbAllowExecution, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addGap(5, 5, 5) .addGroup(executionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(lbNetworkProxy) - .addComponent(cbAllowExecution, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGap(18, 18, Short.MAX_VALUE)) + .addComponent(cbNetworkProxy, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGap(9, 9, Short.MAX_VALUE)) ); javax.swing.GroupLayout pnlExecutionLayout = new javax.swing.GroupLayout(pnlExecution); pnlExecution.setLayout(pnlExecutionLayout); pnlExecutionLayout.setHorizontalGroup( pnlExecutionLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, pnlExecutionLayout.createSequentialGroup() + .addGroup(pnlExecutionLayout.createSequentialGroup() .addContainerGap() .addGroup(pnlExecutionLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) .addComponent(distributionPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) @@ -425,7 +428,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { .addComponent(distributionPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(executionPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap(69, Short.MAX_VALUE)) + .addContainerGap(66, Short.MAX_VALUE)) ); pnlCards.add(pnlExecution, "Execution"); @@ -476,7 +479,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { .addGroup(jPanel5Layout.createSequentialGroup() .addContainerGap() .addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(cbReuseEditorOnStackTrace, javax.swing.GroupLayout.DEFAULT_SIZE, 501, Short.MAX_VALUE) + .addComponent(cbReuseEditorOnStackTrace, javax.swing.GroupLayout.DEFAULT_SIZE, 525, Short.MAX_VALUE) .addComponent(cbReuseOutputTabs, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(cbAlwaysShowOutput, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addContainerGap()) @@ -546,7 +549,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { .addComponent(lbDownloadLibs, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addGroup(jPanel8Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(cbDownloadSources, 0, 198, Short.MAX_VALUE) + .addComponent(cbDownloadSources, 0, 195, Short.MAX_VALUE) .addComponent(cbDownloadLibs, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(cbDownloadJavadoc, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addContainerGap()) @@ -599,7 +602,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { .addGroup(jPanel3Layout.createSequentialGroup() .addContainerGap() .addComponent(cbPreferMaven) - .addContainerGap(191, Short.MAX_VALUE)) + .addContainerGap(185, Short.MAX_VALUE)) ); jPanel3Layout.setVerticalGroup( jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -649,7 +652,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { .addComponent(cbOpenLazy) .addComponent(cbEnableCache) .addComponent(cbBundledLoading)) - .addContainerGap(249, Short.MAX_VALUE)) + .addContainerGap(254, Short.MAX_VALUE)) ); jPanel7Layout.setVerticalGroup( jPanel7Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)