Attachment #124346 for bug #242445

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 112-118 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/wizards/messages.properties (-1 / +1 lines)
112	AbstractRepositorySettingsPage_Character_encoding=Character encoding\:	112	AbstractRepositorySettingsPage_Character_encoding=Character encoding\:
113	AbstractRepositorySettingsPage_Create_new_account=Create new account	113	AbstractRepositorySettingsPage_Create_new_account=Create new account
114	AbstractRepositorySettingsPage_Default__=Default (	114	AbstractRepositorySettingsPage_Default__=Default (
115	AbstractRepositorySettingsPage_Disconnected=Disconnected	115	AbstractRepositorySettingsPage_Disconnected=Disconnected Mode
116	AbstractRepositorySettingsPage_Enable_proxy_authentication=Enable proxy authentication	116	AbstractRepositorySettingsPage_Enable_proxy_authentication=Enable proxy authentication
117	AbstractRepositorySettingsPage_Enabled=Enabled	117	AbstractRepositorySettingsPage_Enabled=Enabled
118	AbstractRepositorySettingsPage_Enter_a_valid_server_url=Enter a valid server url	118	AbstractRepositorySettingsPage_Enter_a_valid_server_url=Enter a valid server url




import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;

		}

		compositeContainer = new Composite(parent, SWT.NULL);
		GridLayout layout = new GridLayout(3, false);
		compositeContainer.setLayout(layout);

		new Label(compositeContainer, SWT.NONE).setText(LABEL_SERVER);

			}
		});

		GridDataFactory.fillDefaults().hint(300, SWT.DEFAULT).grab(true, false).span(2, SWT.DEFAULT).applyTo(
				serverUrlCombo);

		repositoryLabelEditor = new StringFieldEditor("", LABEL_REPOSITORY_LABEL, StringFieldEditor.UNLIMITED, //$NON-NLS-1$
				compositeContainer) {

					getWizard().getContainer().updateButtons();
				}
			}

			@Override
			public int getNumberOfControls() {
				return 3;
			}
		};
		// repositoryLabelEditor.setErrorMessage("error");

		if (needsAnonymousLogin()) {
			anonymousButton = new Button(compositeContainer, SWT.CHECK);
			GridDataFactory.fillDefaults().span(2, SWT.DEFAULT).applyTo(anonymousButton);

			anonymousButton.setText(Messages.AbstractRepositorySettingsPage_Anonymous_Access);
			anonymousButton.addSelectionListener(new SelectionAdapter() {
				@Override
				public void widgetSelected(SelectionEvent e) {
					setAnonymous(anonymousButton.getSelection());
					isPageComplete();
				}
			});
		}

		repositoryUserNameEditor = new StringFieldEditor("", LABEL_USER, StringFieldEditor.UNLIMITED, //$NON-NLS-1$
				compositeContainer) {


					getWizard().getContainer().updateButtons();
				}
			}

			@Override
			public int getNumberOfControls() {
				// if will have anonymous checkbox on same line, make this control only span 2 columns
				return needsAnonymousLogin() ? 2 : 3;
			}
		};
		if (needsAnonymousLogin()) {
			// need to increase column number here, because above string editor will use them if declared beforehand
			((GridLayout) (compositeContainer.getLayout())).numColumns++;
			anonymousButton = new Button(compositeContainer, SWT.CHECK);

			anonymousButton.setText(Messages.AbstractRepositorySettingsPage_Anonymous_Access);
			anonymousButton.addSelectionListener(new SelectionAdapter() {
				@Override
				public void widgetSelected(SelectionEvent e) {
					setAnonymous(anonymousButton.getSelection());
					isPageComplete();
				}
			});
		}

		repositoryPasswordEditor = new RepositoryStringFieldEditor("", LABEL_PASSWORD, StringFieldEditor.UNLIMITED, //$NON-NLS-1$
				compositeContainer) {

					getWizard().getContainer().updateButtons();
				}
			}

			@Override
			public int getNumberOfControls() {
				return 2;
			}
		};

		// need to increase column number here, because above string editor will use them if declared beforehand
		((GridLayout) (compositeContainer.getLayout())).numColumns++;
		savePasswordButton = new Button(compositeContainer, SWT.CHECK);
		GridDataFactory.fillDefaults().span(2, SWT.DEFAULT).applyTo(savePasswordButton);
		savePasswordButton.setText(Messages.AbstractRepositorySettingsPage_Save_Password);

		if (repository != null) {

				StatusHandler.log(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, "Could not set field value", t)); //$NON-NLS-1$
			}
		}
		addStatusSection();

		if (needsAnonymousLogin()) {
			if (repository != null) {

				}
			});

			GridDataFactory.fillDefaults().span(3, SWT.DEFAULT).applyTo(advancedExpComposite);

			advancedComp = toolkit.createComposite(advancedExpComposite, SWT.NONE);
			GridLayout gridLayout2 = new GridLayout();

				}
			});

			GridDataFactory.fillDefaults().span(3, SWT.DEFAULT).applyTo(httpAuthExpComposite);

			httpAuthComp = toolkit.createComposite(httpAuthExpComposite, SWT.NONE);
			GridLayout gridLayout2 = new GridLayout();
			gridLayout2.numColumns = 3;
			gridLayout2.verticalSpacing = 0;
			httpAuthComp.setLayout(gridLayout2);
			httpAuthComp.setBackground(compositeContainer.getBackground());
			GridDataFactory.fillDefaults().span(3, SWT.DEFAULT).applyTo(httpAuthComp);
			httpAuthExpComposite.setClient(httpAuthComp);

			httpAuthButton = new Button(httpAuthComp, SWT.CHECK);
			GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.TOP).span(2, SWT.DEFAULT).applyTo(httpAuthButton);

			httpAuthButton.setText(Messages.AbstractRepositorySettingsPage_Enabled);

			httpAuthButton.addSelectionListener(new SelectionListener() {
				public void widgetSelected(SelectionEvent e) {
					setHttpAuth(httpAuthButton.getSelection());
				}

				public void widgetDefaultSelected(SelectionEvent e) {
					// ignore
				}
			});

			httpAuthUserNameEditor = new StringFieldEditor(
					"", Messages.AbstractRepositorySettingsPage_User_ID_, StringFieldEditor.UNLIMITED, httpAuthComp) { //$NON-NLS-1$


						getWizard().getContainer().updateButtons();
					}
				}

				@Override
				public int getNumberOfControls() {
					return 2;
				}
			};
			// need to increase column number here, because above string editor will use them if declared beforehand
			((GridLayout) (httpAuthComp.getLayout())).numColumns++;
			httpAuthButton = new Button(httpAuthComp, SWT.CHECK);

			httpAuthButton.setText(Messages.AbstractRepositorySettingsPage_Enabled);

			httpAuthButton.addSelectionListener(new SelectionListener() {
				public void widgetSelected(SelectionEvent e) {
					setHttpAuth(httpAuthButton.getSelection());
				}

				public void widgetDefaultSelected(SelectionEvent e) {
					// ignore
				}
			});

			httpAuthPasswordEditor = new RepositoryStringFieldEditor(
					"", Messages.AbstractRepositorySettingsPage_Password_, StringFieldEditor.UNLIMITED, //$NON-NLS-1$
					httpAuthComp) {
				@Override
				public int getNumberOfControls() {
					return 2;
				}
			};
			((RepositoryStringFieldEditor) httpAuthPasswordEditor).getTextControl().setEchoChar('*');

			// need to increase column number here, because above string editor will use them if declared beforehand
			((GridLayout) (httpAuthComp.getLayout())).numColumns++;

			saveHttpPasswordButton = new Button(httpAuthComp, SWT.CHECK);
//			GridDataFactory.fillDefaults().span(3, SWT.DEFAULT).applyTo(saveHttpPasswordButton);
			saveHttpPasswordButton.setText(Messages.AbstractRepositorySettingsPage_Save_Http_Password);

			httpAuthUserNameEditor.setEnabled(httpAuthButton.getSelection(), httpAuthComp);

			addProxySection();
		}

		addStatusSection();

		addContributionSection();

		Composite managementComposite = new Composite(compositeContainer, SWT.NULL);

			}
		});

		GridDataFactory.fillDefaults().span(3, SWT.DEFAULT).applyTo(proxyExpComposite);

		proxyAuthComp = toolkit.createComposite(proxyExpComposite, SWT.NONE);
		GridLayout gridLayout2 = new GridLayout();
		gridLayout2.numColumns = 2;
		gridLayout2.verticalSpacing = 0;
		gridLayout2.numColumns = 3;
		proxyAuthComp.setLayout(gridLayout2);
		proxyAuthComp.setBackground(compositeContainer.getBackground());
		proxyExpComposite.setClient(proxyAuthComp);

		Composite settingsComposite = new Composite(proxyAuthComp, SWT.NULL);
		GridLayout gridLayout3 = new GridLayout();
		gridLayout3.numColumns = 2;
		gridLayout3.verticalSpacing = 0;
		gridLayout3.numColumns = 2;
		settingsComposite.setLayout(gridLayout3);

		systemProxyButton = new Button(settingsComposite, SWT.CHECK);
		GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.TOP).span(3, SWT.DEFAULT).applyTo(settingsComposite);

		systemProxyButton.setText(Messages.AbstractRepositorySettingsPage_Use_global_Network_Connections_preferences);
		Hyperlink changeProxySettingsLink = toolkit.createHyperlink(settingsComposite,

					getWizard().getContainer().updateButtons();
				}
			}

			@Override
			public int getNumberOfControls() {
				return 2;
			}
		};
		proxyHostnameEditor.setStringValue(oldProxyHostname);
		((GridLayout) (proxyAuthComp.getLayout())).numColumns++;
		proxyPortEditor = new RepositoryStringFieldEditor(
				"", Messages.AbstractRepositorySettingsPage_Proxy_host_port_, StringFieldEditor.UNLIMITED, //$NON-NLS-1$
				proxyAuthComp);

		proxyPortEditor.setStringValue(oldProxyPort);

		proxyHostnameEditor.setEnabled(systemProxyButton.getSelection(), proxyAuthComp);
		proxyPortEditor.setEnabled(systemProxyButton.getSelection(), proxyAuthComp);

		// ************* PROXY AUTHENTICATION **************

		proxyAuthButton = new Button(proxyAuthComp, SWT.CHECK);
		GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.TOP).span(2, SWT.DEFAULT).applyTo(proxyAuthButton);

		proxyAuthButton.setText(Messages.AbstractRepositorySettingsPage_Enable_proxy_authentication);
		proxyAuthButton.addSelectionListener(new SelectionListener() {

			}
		});

		proxyPortEditor = new RepositoryStringFieldEditor(
				"", Messages.AbstractRepositorySettingsPage_Proxy_host_port_, StringFieldEditor.UNLIMITED, //$NON-NLS-1$
				proxyAuthComp) {

			@Override
			public int getNumberOfControls() {
				return 3;
			}
		};

		proxyPortEditor.setStringValue(oldProxyPort);

		proxyHostnameEditor.setEnabled(systemProxyButton.getSelection(), proxyAuthComp);
		proxyPortEditor.setEnabled(systemProxyButton.getSelection(), proxyAuthComp);

		// ************* PROXY AUTHENTICATION **************

		proxyUserNameEditor = new StringFieldEditor(
				"", Messages.AbstractRepositorySettingsPage_User_ID_, StringFieldEditor.UNLIMITED, proxyAuthComp) { //$NON-NLS-1$


					getWizard().getContainer().updateButtons();
				}
			}

			@Override
			public int getNumberOfControls() {
				return 3;
			}
		};

		proxyPasswordEditor = new RepositoryStringFieldEditor(
				"", Messages.AbstractRepositorySettingsPage_Password_, StringFieldEditor.UNLIMITED, //$NON-NLS-1$
				proxyAuthComp) {
			@Override
			public int getNumberOfControls() {
				return 2;
			}
		};
		((RepositoryStringFieldEditor) proxyPasswordEditor).getTextControl().setEchoChar('*');

		// proxyPasswordEditor.setEnabled(httpAuthButton.getSelection(),

		// httpAuthPasswordEditor).setEnabled(httpAuthButton.getSelection(),
		// advancedComp);

		// need to increase column number here, because above string editor will use them if declared beforehand
		((GridLayout) (proxyAuthComp.getLayout())).numColumns++;
		saveProxyPasswordButton = new Button(proxyAuthComp, SWT.CHECK);
		GridDataFactory.fillDefaults().span(2, SWT.DEFAULT).applyTo(saveProxyPasswordButton);
		saveProxyPasswordButton.setText(Messages.AbstractRepositorySettingsPage_Save_Proxy_Password);
		saveProxyPasswordButton.setEnabled(proxyAuthButton.getSelection());



	private void addContributionSection() {
		Composite composite = toolkit.createComposite(compositeContainer);
		GridDataFactory.fillDefaults().grab(true, false).span(3, SWT.DEFAULT).applyTo(composite);

		GridLayout layout = new GridLayout(1, false);
		layout.marginWidth = 0;

	}

	private void addStatusSection() {
		disconnectedButton = new Button(compositeContainer, SWT.CHECK);
				ExpandableComposite.COMPACT | ExpandableComposite.TWISTIE | ExpandableComposite.TITLE_BAR);
		statusComposite.clientVerticalSpacing = 0;
		GridData gd = new GridData(SWT.FILL, SWT.FILL, true, false);
		gd.horizontalIndent = -5;
		statusComposite.setLayoutData(gd);
		statusComposite.setFont(compositeContainer.getFont());
		statusComposite.setBackground(compositeContainer.getBackground());
		statusComposite.setText(Messages.AbstractRepositorySettingsPage_Status);
		statusComposite.addExpansionListener(new ExpansionAdapter() {
			@Override
			public void expansionStateChanged(ExpansionEvent e) {
				getControl().getShell().pack();
			}
		});
		GridDataFactory.fillDefaults().span(2, SWT.DEFAULT).applyTo(statusComposite);

		Composite composite = toolkit.createComposite(statusComposite, SWT.NONE);
		GridLayout layout = new GridLayout();
		layout.numColumns = 2;
		layout.verticalSpacing = 0;
		composite.setLayout(layout);
		composite.setBackground(compositeContainer.getBackground());
		statusComposite.setClient(composite);

		disconnectedButton = new Button(composite, SWT.CHECK);
		disconnectedButton.setText(Messages.AbstractRepositorySettingsPage_Disconnected);
		GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.TOP).span(3, SWT.DEFAULT).applyTo(disconnectedButton);
		disconnectedButton.setSelection(repository != null ? repository.isOffline() : false);
		statusComposite.setExpanded(disconnectedButton.getSelection());
	}

	protected void setEncoding(String encoding) {

Return to bug 242445

Lines 50-56 Link Here

(-)src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java (-88 / +115 lines)
50	import org.eclipse.swt.events.SelectionAdapter;	50	import org.eclipse.swt.events.SelectionAdapter;
51	import org.eclipse.swt.events.SelectionEvent;	51	import org.eclipse.swt.events.SelectionEvent;
52	import org.eclipse.swt.events.SelectionListener;	52	import org.eclipse.swt.events.SelectionListener;
53	import org.eclipse.swt.layout.FillLayout;
54	import org.eclipse.swt.layout.GridData;	53	import org.eclipse.swt.layout.GridData;
55	import org.eclipse.swt.layout.GridLayout;	54	import org.eclipse.swt.layout.GridLayout;
56	import org.eclipse.swt.widgets.Button;	55	import org.eclipse.swt.widgets.Button;
Lines 289-295 Link Here
289	}	288	}
290		289
291	compositeContainer = new Composite(parent, SWT.NULL);	290	compositeContainer = new Composite(parent, SWT.NULL);
292	FillLayout layout = new FillLayout();	291	GridLayout layout = new GridLayout(3, false);
293	compositeContainer.setLayout(layout);	292	compositeContainer.setLayout(layout);
294		293
295	new Label(compositeContainer, SWT.NONE).setText(LABEL_SERVER);	294	new Label(compositeContainer, SWT.NONE).setText(LABEL_SERVER);
Lines 317-323 Link Here
317	}	316	}
318	});	317	});
319		318
320	GridDataFactory.fillDefaults().hint(300, SWT.DEFAULT).grab(true, false).applyTo(serverUrlCombo);	319	GridDataFactory.fillDefaults().hint(300, SWT.DEFAULT).grab(true, false).span(2, SWT.DEFAULT).applyTo(
		320	serverUrlCombo);
321		321
322	repositoryLabelEditor = new StringFieldEditor("", LABEL_REPOSITORY_LABEL, StringFieldEditor.UNLIMITED, //$NON-NLS-1$	322	repositoryLabelEditor = new StringFieldEditor("", LABEL_REPOSITORY_LABEL, StringFieldEditor.UNLIMITED, //$NON-NLS-1$
323	compositeContainer) {	323	compositeContainer) {
Lines 335-357 Link Here
335	getWizard().getContainer().updateButtons();	335	getWizard().getContainer().updateButtons();
336	}	336	}
337	}	337	}
		338
		339	@Override
		340	public int getNumberOfControls() {
		341	return 3;
		342	}
338	};	343	};
339	// repositoryLabelEditor.setErrorMessage("error");	344	// repositoryLabelEditor.setErrorMessage("error");
340		345
341	if (needsAnonymousLogin()) {
342	anonymousButton = new Button(compositeContainer, SWT.CHECK);
343	GridDataFactory.fillDefaults().span(2, SWT.DEFAULT).applyTo(anonymousButton);
344
345	anonymousButton.setText(Messages.AbstractRepositorySettingsPage_Anonymous_Access);
346	anonymousButton.addSelectionListener(new SelectionAdapter() {
347	@Override
348	public void widgetSelected(SelectionEvent e) {
349	setAnonymous(anonymousButton.getSelection());
350	isPageComplete();
351	}
352	});
353	}
354
355	repositoryUserNameEditor = new StringFieldEditor("", LABEL_USER, StringFieldEditor.UNLIMITED, //$NON-NLS-1$	346	repositoryUserNameEditor = new StringFieldEditor("", LABEL_USER, StringFieldEditor.UNLIMITED, //$NON-NLS-1$
356	compositeContainer) {	347	compositeContainer) {
357		348
Lines 368-374 Link Here
368	getWizard().getContainer().updateButtons();	359	getWizard().getContainer().updateButtons();
369	}	360	}
370	}	361	}
		362
		363	@Override
		364	public int getNumberOfControls() {
		365	// if will have anonymous checkbox on same line, make this control only span 2 columns
		366	return needsAnonymousLogin() ? 2 : 3;
		367	}
371	};	368	};
		369	if (needsAnonymousLogin()) {
		370	// need to increase column number here, because above string editor will use them if declared beforehand
		371	((GridLayout) (compositeContainer.getLayout())).numColumns++;
		372	anonymousButton = new Button(compositeContainer, SWT.CHECK);
		373
		374	anonymousButton.setText(Messages.AbstractRepositorySettingsPage_Anonymous_Access);
		375	anonymousButton.addSelectionListener(new SelectionAdapter() {
		376	@Override
		377	public void widgetSelected(SelectionEvent e) {
		378	setAnonymous(anonymousButton.getSelection());
		379	isPageComplete();
		380	}
		381	});
		382	}
372		383
373	repositoryPasswordEditor = new RepositoryStringFieldEditor("", LABEL_PASSWORD, StringFieldEditor.UNLIMITED, //$NON-NLS-1$	384	repositoryPasswordEditor = new RepositoryStringFieldEditor("", LABEL_PASSWORD, StringFieldEditor.UNLIMITED, //$NON-NLS-1$
374	compositeContainer) {	385	compositeContainer) {
Lines 386-395 Link Here
386	getWizard().getContainer().updateButtons();	397	getWizard().getContainer().updateButtons();
387	}	398	}
388	}	399	}
		400
		401	@Override
		402	public int getNumberOfControls() {
		403	return 2;
		404	}
389	};	405	};
390		406
		407	// need to increase column number here, because above string editor will use them if declared beforehand
		408	((GridLayout) (compositeContainer.getLayout())).numColumns++;
391	savePasswordButton = new Button(compositeContainer, SWT.CHECK);	409	savePasswordButton = new Button(compositeContainer, SWT.CHECK);
392	GridDataFactory.fillDefaults().span(2, SWT.DEFAULT).applyTo(savePasswordButton);
393	savePasswordButton.setText(Messages.AbstractRepositorySettingsPage_Save_Password);	410	savePasswordButton.setText(Messages.AbstractRepositorySettingsPage_Save_Password);
394		411
395	if (repository != null) {	412	if (repository != null) {
Lines 413-418 Link Here
413	StatusHandler.log(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, "Could not set field value", t)); //$NON-NLS-1$	430	StatusHandler.log(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, "Could not set field value", t)); //$NON-NLS-1$
414	}	431	}
415	}	432	}
		433	addStatusSection();
416		434
417	if (needsAnonymousLogin()) {	435	if (needsAnonymousLogin()) {
418	if (repository != null) {	436	if (repository != null) {
Lines 468-474 Link Here
468	}	486	}
469	});	487	});
470		488
471	GridDataFactory.fillDefaults().span(2, SWT.DEFAULT).applyTo(advancedExpComposite);	489	GridDataFactory.fillDefaults().span(3, SWT.DEFAULT).applyTo(advancedExpComposite);
472		490
473	advancedComp = toolkit.createComposite(advancedExpComposite, SWT.NONE);	491	advancedComp = toolkit.createComposite(advancedExpComposite, SWT.NONE);
474	GridLayout gridLayout2 = new GridLayout();	492	GridLayout gridLayout2 = new GridLayout();
Lines 574-604 Link Here
574	}	592	}
575	});	593	});
576		594
577	GridDataFactory.fillDefaults().span(2, SWT.DEFAULT).applyTo(httpAuthExpComposite);	595	GridDataFactory.fillDefaults().span(3, SWT.DEFAULT).applyTo(httpAuthExpComposite);
578		596
579	httpAuthComp = toolkit.createComposite(httpAuthExpComposite, SWT.NONE);	597	httpAuthComp = toolkit.createComposite(httpAuthExpComposite, SWT.NONE);
580	GridLayout gridLayout2 = new GridLayout();	598	GridLayout gridLayout2 = new GridLayout();
581	gridLayout2.numColumns = 2;	599	gridLayout2.numColumns = 3;
582	gridLayout2.verticalSpacing = 0;	600	gridLayout2.verticalSpacing = 0;
583	httpAuthComp.setLayout(gridLayout2);	601	httpAuthComp.setLayout(gridLayout2);
584	httpAuthComp.setBackground(compositeContainer.getBackground());	602	httpAuthComp.setBackground(compositeContainer.getBackground());
		603	GridDataFactory.fillDefaults().span(3, SWT.DEFAULT).applyTo(httpAuthComp);
585	httpAuthExpComposite.setClient(httpAuthComp);	604	httpAuthExpComposite.setClient(httpAuthComp);
586		605
587	httpAuthButton = new Button(httpAuthComp, SWT.CHECK);
588	GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.TOP).span(2, SWT.DEFAULT).applyTo(httpAuthButton);
589
590	httpAuthButton.setText(Messages.AbstractRepositorySettingsPage_Enabled);
591
592	httpAuthButton.addSelectionListener(new SelectionListener() {
593	public void widgetSelected(SelectionEvent e) {
594	setHttpAuth(httpAuthButton.getSelection());
595	}
596
597	public void widgetDefaultSelected(SelectionEvent e) {
598	// ignore
599	}
600	});
601
602	httpAuthUserNameEditor = new StringFieldEditor(	606	httpAuthUserNameEditor = new StringFieldEditor(
603	"", Messages.AbstractRepositorySettingsPage_User_ID_, StringFieldEditor.UNLIMITED, httpAuthComp) { //$NON-NLS-1$	607	"", Messages.AbstractRepositorySettingsPage_User_ID_, StringFieldEditor.UNLIMITED, httpAuthComp) { //$NON-NLS-1$
604		608
Lines 614-627 Link Here
614	getWizard().getContainer().updateButtons();	618	getWizard().getContainer().updateButtons();
615	}	619	}
616	}	620	}
		621
		622	@Override
		623	public int getNumberOfControls() {
		624	return 2;
		625	}
617	};	626	};
		627	// need to increase column number here, because above string editor will use them if declared beforehand
		628	((GridLayout) (httpAuthComp.getLayout())).numColumns++;
		629	httpAuthButton = new Button(httpAuthComp, SWT.CHECK);
		630
		631	httpAuthButton.setText(Messages.AbstractRepositorySettingsPage_Enabled);
		632
		633	httpAuthButton.addSelectionListener(new SelectionListener() {
		634	public void widgetSelected(SelectionEvent e) {
		635	setHttpAuth(httpAuthButton.getSelection());
		636	}
		637
		638	public void widgetDefaultSelected(SelectionEvent e) {
		639	// ignore
		640	}
		641	});
		642
618	httpAuthPasswordEditor = new RepositoryStringFieldEditor(	643	httpAuthPasswordEditor = new RepositoryStringFieldEditor(
619	"", Messages.AbstractRepositorySettingsPage_Password_, StringFieldEditor.UNLIMITED, //$NON-NLS-1$	644	"", Messages.AbstractRepositorySettingsPage_Password_, StringFieldEditor.UNLIMITED, //$NON-NLS-1$
620	httpAuthComp);	645	httpAuthComp) {
		646	@Override
		647	public int getNumberOfControls() {
		648	return 2;
		649	}
		650	};
621	((RepositoryStringFieldEditor) httpAuthPasswordEditor).getTextControl().setEchoChar('*');	651	((RepositoryStringFieldEditor) httpAuthPasswordEditor).getTextControl().setEchoChar('*');
622		652
		653	// need to increase column number here, because above string editor will use them if declared beforehand
		654	((GridLayout) (httpAuthComp.getLayout())).numColumns++;
		655
623	saveHttpPasswordButton = new Button(httpAuthComp, SWT.CHECK);	656	saveHttpPasswordButton = new Button(httpAuthComp, SWT.CHECK);
624	GridDataFactory.fillDefaults().span(2, SWT.DEFAULT).applyTo(saveHttpPasswordButton);	657	// GridDataFactory.fillDefaults().span(3, SWT.DEFAULT).applyTo(saveHttpPasswordButton);
625	saveHttpPasswordButton.setText(Messages.AbstractRepositorySettingsPage_Save_Http_Password);	658	saveHttpPasswordButton.setText(Messages.AbstractRepositorySettingsPage_Save_Http_Password);
626		659
627	httpAuthUserNameEditor.setEnabled(httpAuthButton.getSelection(), httpAuthComp);	660	httpAuthUserNameEditor.setEnabled(httpAuthButton.getSelection(), httpAuthComp);
Lines 641-648 Link Here
641	addProxySection();	674	addProxySection();
642	}	675	}
643		676
644	addStatusSection();
645
646	addContributionSection();	677	addContributionSection();
647		678
648	Composite managementComposite = new Composite(compositeContainer, SWT.NULL);	679	Composite managementComposite = new Composite(compositeContainer, SWT.NULL);
Lines 727-750 Link Here
727	}	758	}
728	});	759	});
729		760
730	GridDataFactory.fillDefaults().span(2, SWT.DEFAULT).applyTo(proxyExpComposite);	761	GridDataFactory.fillDefaults().span(3, SWT.DEFAULT).applyTo(proxyExpComposite);
731		762
732	proxyAuthComp = toolkit.createComposite(proxyExpComposite, SWT.NONE);	763	proxyAuthComp = toolkit.createComposite(proxyExpComposite, SWT.NONE);
733	GridLayout gridLayout2 = new GridLayout();	764	GridLayout gridLayout2 = new GridLayout();
734	gridLayout2.numColumns = 2;
735	gridLayout2.verticalSpacing = 0;	765	gridLayout2.verticalSpacing = 0;
		766	gridLayout2.numColumns = 3;
736	proxyAuthComp.setLayout(gridLayout2);	767	proxyAuthComp.setLayout(gridLayout2);
737	proxyAuthComp.setBackground(compositeContainer.getBackground());	768	proxyAuthComp.setBackground(compositeContainer.getBackground());
738	proxyExpComposite.setClient(proxyAuthComp);	769	proxyExpComposite.setClient(proxyAuthComp);
739		770
740	Composite settingsComposite = new Composite(proxyAuthComp, SWT.NULL);	771	Composite settingsComposite = new Composite(proxyAuthComp, SWT.NULL);
741	GridLayout gridLayout3 = new GridLayout();	772	GridLayout gridLayout3 = new GridLayout();
742	gridLayout3.numColumns = 2;
743	gridLayout3.verticalSpacing = 0;	773	gridLayout3.verticalSpacing = 0;
		774	gridLayout3.numColumns = 2;
744	settingsComposite.setLayout(gridLayout3);	775	settingsComposite.setLayout(gridLayout3);
745		776
746	systemProxyButton = new Button(settingsComposite, SWT.CHECK);	777	systemProxyButton = new Button(settingsComposite, SWT.CHECK);
747	GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.TOP).span(2, SWT.DEFAULT).applyTo(settingsComposite);	778	GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.TOP).span(3, SWT.DEFAULT).applyTo(settingsComposite);
748		779
749	systemProxyButton.setText(Messages.AbstractRepositorySettingsPage_Use_global_Network_Connections_preferences);	780	systemProxyButton.setText(Messages.AbstractRepositorySettingsPage_Use_global_Network_Connections_preferences);
750	Hyperlink changeProxySettingsLink = toolkit.createHyperlink(settingsComposite,	781	Hyperlink changeProxySettingsLink = toolkit.createHyperlink(settingsComposite,
Lines 793-814 Link Here
793	getWizard().getContainer().updateButtons();	824	getWizard().getContainer().updateButtons();
794	}	825	}
795	}	826	}
		827
		828	@Override
		829	public int getNumberOfControls() {
		830	return 2;
		831	}
796	};	832	};
797	proxyHostnameEditor.setStringValue(oldProxyHostname);	833	proxyHostnameEditor.setStringValue(oldProxyHostname);
798		834	((GridLayout) (proxyAuthComp.getLayout())).numColumns++;
799	proxyPortEditor = new RepositoryStringFieldEditor(
800	"", Messages.AbstractRepositorySettingsPage_Proxy_host_port_, StringFieldEditor.UNLIMITED, //$NON-NLS-1$
801	proxyAuthComp);
802
803	proxyPortEditor.setStringValue(oldProxyPort);
804
805	proxyHostnameEditor.setEnabled(systemProxyButton.getSelection(), proxyAuthComp);
806	proxyPortEditor.setEnabled(systemProxyButton.getSelection(), proxyAuthComp);
807
808	// *********** PROXY AUTHENTICATION ************
809
810	proxyAuthButton = new Button(proxyAuthComp, SWT.CHECK);	835	proxyAuthButton = new Button(proxyAuthComp, SWT.CHECK);
811	GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.TOP).span(2, SWT.DEFAULT).applyTo(proxyAuthButton);
812		836
813	proxyAuthButton.setText(Messages.AbstractRepositorySettingsPage_Enable_proxy_authentication);	837	proxyAuthButton.setText(Messages.AbstractRepositorySettingsPage_Enable_proxy_authentication);
814	proxyAuthButton.addSelectionListener(new SelectionListener() {	838	proxyAuthButton.addSelectionListener(new SelectionListener() {
Lines 821-826 Link Here
821	}	845	}
822	});	846	});
823		847
		848	proxyPortEditor = new RepositoryStringFieldEditor(
		849	"", Messages.AbstractRepositorySettingsPage_Proxy_host_port_, StringFieldEditor.UNLIMITED, //$NON-NLS-1$
		850	proxyAuthComp) {
		851
		852	@Override
		853	public int getNumberOfControls() {
		854	return 3;
		855	}
		856	};
		857
		858	proxyPortEditor.setStringValue(oldProxyPort);
		859
		860	proxyHostnameEditor.setEnabled(systemProxyButton.getSelection(), proxyAuthComp);
		861	proxyPortEditor.setEnabled(systemProxyButton.getSelection(), proxyAuthComp);
		862
		863	// *********** PROXY AUTHENTICATION ************
		864
824	proxyUserNameEditor = new StringFieldEditor(	865	proxyUserNameEditor = new StringFieldEditor(
825	"", Messages.AbstractRepositorySettingsPage_User_ID_, StringFieldEditor.UNLIMITED, proxyAuthComp) { //$NON-NLS-1$	866	"", Messages.AbstractRepositorySettingsPage_User_ID_, StringFieldEditor.UNLIMITED, proxyAuthComp) { //$NON-NLS-1$
826		867
Lines 836-845 Link Here
836	getWizard().getContainer().updateButtons();	877	getWizard().getContainer().updateButtons();
837	}	878	}
838	}	879	}
		880
		881	@Override
		882	public int getNumberOfControls() {
		883	return 3;
		884	}
839	};	885	};
		886
840	proxyPasswordEditor = new RepositoryStringFieldEditor(	887	proxyPasswordEditor = new RepositoryStringFieldEditor(
841	"", Messages.AbstractRepositorySettingsPage_Password_, StringFieldEditor.UNLIMITED, //$NON-NLS-1$	888	"", Messages.AbstractRepositorySettingsPage_Password_, StringFieldEditor.UNLIMITED, //$NON-NLS-1$
842	proxyAuthComp);	889	proxyAuthComp) {
		890	@Override
		891	public int getNumberOfControls() {
		892	return 2;
		893	}
		894	};
843	((RepositoryStringFieldEditor) proxyPasswordEditor).getTextControl().setEchoChar('*');	895	((RepositoryStringFieldEditor) proxyPasswordEditor).getTextControl().setEchoChar('*');
844		896
845	// proxyPasswordEditor.setEnabled(httpAuthButton.getSelection(),	897	// proxyPasswordEditor.setEnabled(httpAuthButton.getSelection(),
Lines 848-855 Link Here
848	// httpAuthPasswordEditor).setEnabled(httpAuthButton.getSelection(),	900	// httpAuthPasswordEditor).setEnabled(httpAuthButton.getSelection(),
849	// advancedComp);	901	// advancedComp);
850		902
		903	// need to increase column number here, because above string editor will use them if declared beforehand
		904	((GridLayout) (proxyAuthComp.getLayout())).numColumns++;
851	saveProxyPasswordButton = new Button(proxyAuthComp, SWT.CHECK);	905	saveProxyPasswordButton = new Button(proxyAuthComp, SWT.CHECK);
852	GridDataFactory.fillDefaults().span(2, SWT.DEFAULT).applyTo(saveProxyPasswordButton);
853	saveProxyPasswordButton.setText(Messages.AbstractRepositorySettingsPage_Save_Proxy_Password);	906	saveProxyPasswordButton.setText(Messages.AbstractRepositorySettingsPage_Save_Proxy_Password);
854	saveProxyPasswordButton.setEnabled(proxyAuthButton.getSelection());	907	saveProxyPasswordButton.setEnabled(proxyAuthButton.getSelection());
855		908
Lines 867-873 Link Here
867		920
868	private void addContributionSection() {	921	private void addContributionSection() {
869	Composite composite = toolkit.createComposite(compositeContainer);	922	Composite composite = toolkit.createComposite(compositeContainer);
870	GridDataFactory.fillDefaults().grab(true, false).span(2, SWT.DEFAULT).applyTo(composite);	923	GridDataFactory.fillDefaults().grab(true, false).span(3, SWT.DEFAULT).applyTo(composite);
871		924
872	GridLayout layout = new GridLayout(1, false);	925	GridLayout layout = new GridLayout(1, false);
873	layout.marginWidth = 0;	926	layout.marginWidth = 0;
Lines 880-915 Link Here
880	}	933	}
881		934
882	private void addStatusSection() {	935	private void addStatusSection() {
883	ExpandableComposite statusComposite = toolkit.createExpandableComposite(compositeContainer,	936	disconnectedButton = new Button(compositeContainer, SWT.CHECK);
884	ExpandableComposite.COMPACT \| ExpandableComposite.TWISTIE \| ExpandableComposite.TITLE_BAR);
885	statusComposite.clientVerticalSpacing = 0;
886	GridData gd = new GridData(SWT.FILL, SWT.FILL, true, false);
887	gd.horizontalIndent = -5;
888	statusComposite.setLayoutData(gd);
889	statusComposite.setFont(compositeContainer.getFont());
890	statusComposite.setBackground(compositeContainer.getBackground());
891	statusComposite.setText(Messages.AbstractRepositorySettingsPage_Status);
892	statusComposite.addExpansionListener(new ExpansionAdapter() {
893	@Override
894	public void expansionStateChanged(ExpansionEvent e) {
895	getControl().getShell().pack();
896	}
897	});
898	GridDataFactory.fillDefaults().span(2, SWT.DEFAULT).applyTo(statusComposite);
899
900	Composite composite = toolkit.createComposite(statusComposite, SWT.NONE);
901	GridLayout layout = new GridLayout();
902	layout.numColumns = 2;
903	layout.verticalSpacing = 0;
904	composite.setLayout(layout);
905	composite.setBackground(compositeContainer.getBackground());
906	statusComposite.setClient(composite);
907
908	disconnectedButton = new Button(composite, SWT.CHECK);
909	disconnectedButton.setText(Messages.AbstractRepositorySettingsPage_Disconnected);	937	disconnectedButton.setText(Messages.AbstractRepositorySettingsPage_Disconnected);
910	GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.TOP).span(2, SWT.DEFAULT).applyTo(disconnectedButton);	938	GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.TOP).span(3, SWT.DEFAULT).applyTo(disconnectedButton);
911	disconnectedButton.setSelection(repository != null ? repository.isOffline() : false);	939	disconnectedButton.setSelection(repository != null ? repository.isOffline() : false);
912	statusComposite.setExpanded(disconnectedButton.getSelection());
913	}	940	}
914		941
915	protected void setEncoding(String encoding) {	942	protected void setEncoding(String encoding) {