Attachment #136042 for bug #231448

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 231448
Collapse All | Expand All

Lines 267-272 Link Here

(-)core.ui/src/org/netbeans/core/ui/options/general/Bundle.properties (-2 / +2 lines)
267	General.Options.Export.Category.displayName=General	267	General.Options.Export.Category.displayName=General
268	General.Options.Export.displayName=General	268	General.Options.Export.displayName=General
269	Other.Options.Export.displayName=All Other Unspecified	269	Other.Options.Export.displayName=All Other Unspecified
270	GeneralOptionsPanel.bReloadProxy.text=Reload	270	GeneralOptionsPanel.bReloadProxy.text=Re&load
271	GeneralOptionsPanel.bTestConnection.text=Test connection	271	GeneralOptionsPanel.bTestConnection.text=Test &connection
272	GeneralOptionsPanel.lblTestResult.text=	272	GeneralOptionsPanel.lblTestResult.text=

Lines 170-178 Link Here

(-)core.ui/src/org/netbeans/core/ui/options/general/GeneralOptionsPanel.form (-3 lines)
170	</Border>	170	</Border>
171	</Property>	171	</Property>
172	</Properties>	172	</Properties>
173	<Events>
174	<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="rbNoProxyActionPerformed"/>
175	</Events>
176	</Component>	173	</Component>
177	<Component class="javax.swing.JRadioButton" name="rbUseSystemProxy">	174	<Component class="javax.swing.JRadioButton" name="rbUseSystemProxy">
178	<Properties>	175	<Properties>




            case ProxySettings.DIRECT_CONNECTION:
                rbNoProxy.setSelected (true);
                bReloadProxy.setEnabled(false);
                enableManualProxyControls(false);
                tfProxyPort.setEnabled (false);
                bMoreProxy.setEnabled (false);
                break;
            case ProxySettings.AUTO_DETECT_PROXY:
                rbUseSystemProxy.setSelected (true);
                bReloadProxy.setEnabled(true);
                enableManualProxyControls(false);
                tfProxyPort.setEnabled (false);
                bMoreProxy.setEnabled (false);
                break;
            case ProxySettings.MANUAL_SET_PROXY:
                rbHTTPProxy.setSelected (true);
                bReloadProxy.setEnabled(false);
                enableManualProxyControls(true);
                tfProxyPort.setEnabled (true);
                bMoreProxy.setEnabled (true);
                break;
            case ProxySettings.AUTO_DETECT_PAC:
                rbUseSystemProxy.setSelected (true);
                bReloadProxy.setEnabled(true);
                enableManualProxyControls(false);
                tfProxyPort.setEnabled (false);
                bMoreProxy.setEnabled (false);
                break;
        }
        tfProxyHost.setText (model.getHttpProxyHost ());

        tfProxyHost.setEnabled (rbHTTPProxy.isSelected ());
        tfProxyPort.setEnabled (rbHTTPProxy.isSelected ());
        bMoreProxy.setEnabled (rbHTTPProxy.isSelected ());
        enableManualProxyControls(rbHTTPProxy.isSelected());
        if (rbHTTPProxy.isSelected()){
            //focus textfield when manual proxy is selected
            tfProxyHost.requestFocusInWindow();
        }
        rbUseSystemProxy.setToolTipText (getUseSystemProxyToolTip ());
    }


    private static Preferences getProxyPreferences() {
        return NbPreferences.forModule(ProxySettings.class);
    }

    private void enableManualProxyControls(boolean enabled) {
        lProxyHost.setEnabled(enabled);
        tfProxyHost.setEnabled(enabled);
        lProxyPort.setEnabled(enabled);
        tfProxyPort.setEnabled(enabled);
        bMoreProxy.setEnabled(enabled);
}
}

Return to bug 231448

Lines 650-679 Link Here

(-)core.ui/src/org/netbeans/core/ui/options/general/GeneralOptionsPanel.java (-12 / +17 lines)
650	case ProxySettings.DIRECT_CONNECTION:	650	case ProxySettings.DIRECT_CONNECTION:
651	rbNoProxy.setSelected (true);	651	rbNoProxy.setSelected (true);
652	bReloadProxy.setEnabled(false);	652	bReloadProxy.setEnabled(false);
653	tfProxyHost.setEnabled (false);	653	enableManualProxyControls(false);
654	tfProxyPort.setEnabled (false);
655	bMoreProxy.setEnabled (false);
656	break;	654	break;
657	case ProxySettings.AUTO_DETECT_PROXY:	655	case ProxySettings.AUTO_DETECT_PROXY:
658	rbUseSystemProxy.setSelected (true);	656	rbUseSystemProxy.setSelected (true);
659	bReloadProxy.setEnabled(true);	657	bReloadProxy.setEnabled(true);
660	tfProxyHost.setEnabled (false);	658	enableManualProxyControls(false);
661	tfProxyPort.setEnabled (false);
662	bMoreProxy.setEnabled (false);
663	break;	659	break;
664	case ProxySettings.MANUAL_SET_PROXY:	660	case ProxySettings.MANUAL_SET_PROXY:
665	rbHTTPProxy.setSelected (true);	661	rbHTTPProxy.setSelected (true);
666	bReloadProxy.setEnabled(false);	662	bReloadProxy.setEnabled(false);
667	tfProxyHost.setEnabled (true);	663	enableManualProxyControls(true);
668	tfProxyPort.setEnabled (true);
669	bMoreProxy.setEnabled (true);
670	break;	664	break;
671	case ProxySettings.AUTO_DETECT_PAC:	665	case ProxySettings.AUTO_DETECT_PAC:
672	rbUseSystemProxy.setSelected (true);	666	rbUseSystemProxy.setSelected (true);
673	bReloadProxy.setEnabled(true);	667	bReloadProxy.setEnabled(true);
674	tfProxyHost.setEnabled (false);	668	enableManualProxyControls(false);
675	tfProxyPort.setEnabled (false);
676	bMoreProxy.setEnabled (false);
677	break;	669	break;
678	}	670	}
679	tfProxyHost.setText (model.getHttpProxyHost ());	671	tfProxyHost.setText (model.getHttpProxyHost ());
Lines 791-796 Link Here
791	tfProxyHost.setEnabled (rbHTTPProxy.isSelected ());	783	tfProxyHost.setEnabled (rbHTTPProxy.isSelected ());
792	tfProxyPort.setEnabled (rbHTTPProxy.isSelected ());	784	tfProxyPort.setEnabled (rbHTTPProxy.isSelected ());
793	bMoreProxy.setEnabled (rbHTTPProxy.isSelected ());	785	bMoreProxy.setEnabled (rbHTTPProxy.isSelected ());
		786	enableManualProxyControls(rbHTTPProxy.isSelected());
		787	if (rbHTTPProxy.isSelected()){
		788	//focus textfield when manual proxy is selected
		789	tfProxyHost.requestFocusInWindow();
		790	}
794	rbUseSystemProxy.setToolTipText (getUseSystemProxyToolTip ());	791	rbUseSystemProxy.setToolTipText (getUseSystemProxyToolTip ());
795	}	792	}
796		793
Lines 801-804 Link Here
801	private static Preferences getProxyPreferences() {	798	private static Preferences getProxyPreferences() {
802	return NbPreferences.forModule(ProxySettings.class);	799	return NbPreferences.forModule(ProxySettings.class);
803	}	800	}
		801
		802	private void enableManualProxyControls(boolean enabled) {
		803	lProxyHost.setEnabled(enabled);
		804	tfProxyHost.setEnabled(enabled);
		805	lProxyPort.setEnabled(enabled);
		806	tfProxyPort.setEnabled(enabled);
		807	bMoreProxy.setEnabled(enabled);
804	}	808	}
		809	}