Attachment #53234 for bug #122133

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 122133
Collapse All | Expand All




<dd>for direct Mercurial repositories access</dd>\
<dt><tt>http\://hostname/repository_path</tt></dt>\
<dd>for connecting Mercurial repository via WebDAV protocol</dd>\
<dt><tt>https\://hostname/repository_path</tt></dt>\
<dd>for connecting Mercurial repository via WebDAV protocol with SSL encryption</dd>\
<dt><tt>static-http\://hostname/repository_path</tt></dt>\
<dd>for connecting Mercurial repository without requiring a special server on the web host</dd>\
<dt><tt>\ssh://hostname/repository_path</tt></dt>\

            <html><body>IDE directly supports the following Mercurial URL types:\
                <dl><dt><tt>{0}</tt></dt><dd>for direct Mercurial repositories access</dd>\
                    <dt><tt>{1}</tt></dt><dd>for connecting Mercurial repository via WebDAV protocol</dd>\
                    <dt><tt>{2}</tt></dt><dd>for connecting Mercurial repository without requiring a special server on the web host</dd>\
                    <dt><tt>{3}</tt></dt><dd>for connecting Mercurial repository via ssh</dd>\
                    <dt><tt>{4}</tt></dt><dd>for connecting Mercurial repository via ssh</dd>\
                </dl></body></html>

ACSD_RepositoryPanel_Title=Specify Mercurial repository location




            // templates for supported connection methods        
            recentRoots.add(new RepositoryConnection("file:///"));      // NOI18N
            recentRoots.add(new RepositoryConnection("http://"));       // NOI18N
            //recentRoots.add(new RepositoryConnection("https://"));      // NOI18N
            recentRoots.add(new RepositoryConnection("static-http://"));        // NOI18N
            recentRoots.add(new RepositoryConnection("ssh://"));        // NOI18N
        };

            repositoryPanel.tipLabel.setText(HTTP_URL_HELP);
            authFields = true;
            proxyFields = true;
        //} else if(selectedUrlString.startsWith("https:")) {                     // NOI18N
            //repositoryPanel.tipLabel.setText(HTTPS_URL_HELP);
            //authFields = true;
            //proxyFields = true;
        } else if(selectedUrlString.startsWith("static-http:")) {                       // NOI18N
            repositoryPanel.tipLabel.setText(STATIC_HTTP_URL_HELP);
            authFields = true;

            repositoryPanel.tipLabel.setText(LOCAL_URL_HELP);
        } else {
            repositoryPanel.tipLabel.setText(NbBundle.getMessage(Repository.class, "MSG_Repository_Url_Help", new Object [] { // NOI18N
                //LOCAL_URL_HELP, HTTP_URL_HELP, HTTPS_URL_HELP, STATIC_HTTP_URL_HELP, SSH_URL_HELP
                LOCAL_URL_HELP, HTTP_URL_HELP, STATIC_HTTP_URL_HELP, SSH_URL_HELP
            }));
        }

        //repositoryPanel.userPasswordField.setVisible(authFields);
        //repositoryPanel.passwordLabel.setVisible(authFields);          
        //repositoryPanel.userTextField.setVisible(authFields);          
        //repositoryPanel.leaveBlankLabel.setVisible(authFields);        
        //repositoryPanel.userLabel.setVisible(authFields);             
        //repositoryPanel.savePasswordCheckBox.setVisible(authFields);             
        repositoryPanel.userPasswordField.setVisible(false);
        repositoryPanel.passwordLabel.setVisible(false);          
        repositoryPanel.userTextField.setVisible(false);          
        repositoryPanel.leaveBlankLabel.setVisible(false);        
        repositoryPanel.userLabel.setVisible(authFields);             
        repositoryPanel.savePasswordCheckBox.setVisible(false);
        repositoryPanel.proxySettingsButton.setVisible(proxyFields && ((modeMask & FLAG_SHOW_PROXY) != 0));        
        //repositoryPanel.tunnelCommandTextField.setVisible(sshFields);        
        //repositoryPanel.tunnelCommandLabel.setVisible(sshFields);        

    }

    private String getSVNTunnelTip(String urlString) {
        //String tunnelName = getTunnelName(urlString);
        //return MessageFormat.format(SSH_URL_HELP, tunnelName).trim();
        return SSH_URL_HELP;
    }
            
    private String getTunnelName(String urlString) {

Return to bug 122133

Lines 61-68 Link Here

(-)versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/repository/Bundle.properties (-5 / +2 lines)
61	<dd>for direct Mercurial repositories access</dd>\	61	<dd>for direct Mercurial repositories access</dd>\
62	<dt><tt>http\://hostname/repository_path</tt></dt>\	62	<dt><tt>http\://hostname/repository_path</tt></dt>\
63	<dd>for connecting Mercurial repository via WebDAV protocol</dd>\	63	<dd>for connecting Mercurial repository via WebDAV protocol</dd>\
64	<dt><tt>https\://hostname/repository_path</tt></dt>\
65	<dd>for connecting Mercurial repository via WebDAV protocol with SSL encryption</dd>\
66	<dt><tt>static-http\://hostname/repository_path</tt></dt>\	64	<dt><tt>static-http\://hostname/repository_path</tt></dt>\
67	<dd>for connecting Mercurial repository without requiring a special server on the web host</dd>\	65	<dd>for connecting Mercurial repository without requiring a special server on the web host</dd>\
68	<dt><tt>\ssh://hostname/repository_path</tt></dt>\	66	<dt><tt>\ssh://hostname/repository_path</tt></dt>\
Lines 111-119 Link Here
111	<html><body>IDE directly supports the following Mercurial URL types:\	109	<html><body>IDE directly supports the following Mercurial URL types:\
112	<dl><dt><tt>{0}</tt></dt><dd>for direct Mercurial repositories access</dd>\	110	<dl><dt><tt>{0}</tt></dt><dd>for direct Mercurial repositories access</dd>\
113	<dt><tt>{1}</tt></dt><dd>for connecting Mercurial repository via WebDAV protocol</dd>\	111	<dt><tt>{1}</tt></dt><dd>for connecting Mercurial repository via WebDAV protocol</dd>\
114	<dt><tt>{2}</tt></dt><dd>for connecting Mercurial repository via WebDAV protocol with SSL encryption</dd>\	112	<dt><tt>{2}</tt></dt><dd>for connecting Mercurial repository without requiring a special server on the web host</dd>\
115	<dt><tt>{3}</tt></dt><dd>for connecting Mercurial repository without requiring a special server on the web host</dd>\	113	<dt><tt>{3}</tt></dt><dd>for connecting Mercurial repository via ssh</dd>\
116	<dt><tt>{4}</tt></dt><dd>for connecting Mercurial repository via ssh</dd>\
117	</dl></body></html>	114	</dl></body></html>
118		115
119	ACSD_RepositoryPanel_Title=Specify Mercurial repository location	116	ACSD_RepositoryPanel_Title=Specify Mercurial repository location

Lines 197-203 Link Here

(-)versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/repository/Repository.java (-13 / +21 lines)
197	// templates for supported connection methods	197	// templates for supported connection methods
198	recentRoots.add(new RepositoryConnection("file:///")); // NOI18N	198	recentRoots.add(new RepositoryConnection("file:///")); // NOI18N
199	recentRoots.add(new RepositoryConnection("http://")); // NOI18N	199	recentRoots.add(new RepositoryConnection("http://")); // NOI18N
200	recentRoots.add(new RepositoryConnection("https://")); // NOI18N	200	//recentRoots.add(new RepositoryConnection("https://")); // NOI18N
201	recentRoots.add(new RepositoryConnection("static-http://")); // NOI18N	201	recentRoots.add(new RepositoryConnection("static-http://")); // NOI18N
202	recentRoots.add(new RepositoryConnection("ssh://")); // NOI18N	202	recentRoots.add(new RepositoryConnection("ssh://")); // NOI18N
203	};	203	};
Lines 402-411 Link Here
402	repositoryPanel.tipLabel.setText(HTTP_URL_HELP);	402	repositoryPanel.tipLabel.setText(HTTP_URL_HELP);
403	authFields = true;	403	authFields = true;
404	proxyFields = true;	404	proxyFields = true;
405	} else if(selectedUrlString.startsWith("https:")) { // NOI18N	405	//} else if(selectedUrlString.startsWith("https:")) { // NOI18N
406	repositoryPanel.tipLabel.setText(HTTPS_URL_HELP);	406	//repositoryPanel.tipLabel.setText(HTTPS_URL_HELP);
407	authFields = true;	407	//authFields = true;
408	proxyFields = true;	408	//proxyFields = true;
409	} else if(selectedUrlString.startsWith("static-http:")) { // NOI18N	409	} else if(selectedUrlString.startsWith("static-http:")) { // NOI18N
410	repositoryPanel.tipLabel.setText(STATIC_HTTP_URL_HELP);	410	repositoryPanel.tipLabel.setText(STATIC_HTTP_URL_HELP);
411	authFields = true;	411	authFields = true;
Lines 417-432 Link Here
417	repositoryPanel.tipLabel.setText(LOCAL_URL_HELP);	417	repositoryPanel.tipLabel.setText(LOCAL_URL_HELP);
418	} else {	418	} else {
419	repositoryPanel.tipLabel.setText(NbBundle.getMessage(Repository.class, "MSG_Repository_Url_Help", new Object [] { // NOI18N	419	repositoryPanel.tipLabel.setText(NbBundle.getMessage(Repository.class, "MSG_Repository_Url_Help", new Object [] { // NOI18N
420	LOCAL_URL_HELP, HTTP_URL_HELP, HTTPS_URL_HELP, STATIC_HTTP_URL_HELP, SSH_URL_HELP	420	//LOCAL_URL_HELP, HTTP_URL_HELP, HTTPS_URL_HELP, STATIC_HTTP_URL_HELP, SSH_URL_HELP
		421	LOCAL_URL_HELP, HTTP_URL_HELP, STATIC_HTTP_URL_HELP, SSH_URL_HELP
421	}));	422	}));
422	}	423	}
423		424
424	repositoryPanel.userPasswordField.setVisible(authFields);	425	//repositoryPanel.userPasswordField.setVisible(authFields);
425	repositoryPanel.passwordLabel.setVisible(authFields);	426	//repositoryPanel.passwordLabel.setVisible(authFields);
426	repositoryPanel.userTextField.setVisible(authFields);	427	//repositoryPanel.userTextField.setVisible(authFields);
427	repositoryPanel.leaveBlankLabel.setVisible(authFields);	428	//repositoryPanel.leaveBlankLabel.setVisible(authFields);
428	repositoryPanel.userLabel.setVisible(authFields);	429	//repositoryPanel.userLabel.setVisible(authFields);
429	//repositoryPanel.savePasswordCheckBox.setVisible(authFields);	430	//repositoryPanel.savePasswordCheckBox.setVisible(authFields);
		431	repositoryPanel.userPasswordField.setVisible(false);
		432	repositoryPanel.passwordLabel.setVisible(false);
		433	repositoryPanel.userTextField.setVisible(false);
		434	repositoryPanel.leaveBlankLabel.setVisible(false);
		435	repositoryPanel.userLabel.setVisible(authFields);
		436	repositoryPanel.savePasswordCheckBox.setVisible(false);
430	repositoryPanel.proxySettingsButton.setVisible(proxyFields && ((modeMask & FLAG_SHOW_PROXY) != 0));	437	repositoryPanel.proxySettingsButton.setVisible(proxyFields && ((modeMask & FLAG_SHOW_PROXY) != 0));
431	//repositoryPanel.tunnelCommandTextField.setVisible(sshFields);	438	//repositoryPanel.tunnelCommandTextField.setVisible(sshFields);
432	//repositoryPanel.tunnelCommandLabel.setVisible(sshFields);	439	//repositoryPanel.tunnelCommandLabel.setVisible(sshFields);
Lines 440-447 Link Here
440	}	447	}
441		448
442	private String getSVNTunnelTip(String urlString) {	449	private String getSVNTunnelTip(String urlString) {
443	String tunnelName = getTunnelName(urlString);	450	//String tunnelName = getTunnelName(urlString);
444	return MessageFormat.format(SSH_URL_HELP, tunnelName).trim();	451	//return MessageFormat.format(SSH_URL_HELP, tunnelName).trim();
		452	return SSH_URL_HELP;
445	}	453	}
446		454
447	private String getTunnelName(String urlString) {	455	private String getTunnelName(String urlString) {