RESOLVED - bug 295050: [api] request enhanced support of client-certificates

https://bugs.eclipse.org/bugs/show_bug.cgi?id=295050

3 files changed, 51 insertions, 3 deletions

diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/dialogs/Messages.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/dialogs/Messages.java
index 231de57a2..58127b488 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/dialogs/Messages.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/dialogs/Messages.java
@@ -43,8 +43,12 @@ public class Messages extends NLS {
 
 	public static String TaskListSortDialog_Title;
 
+	public static String TaskRepositoryCredentialsDialog_ChooseCertificateFile;
+
 	public static String TaskRepositoryCredentialsDialog_Enter_Credentials;
 
+	public static String TaskRepositoryCredentialsDialog_Enter_repository_certificate;
+
 	public static String TaskRepositoryCredentialsDialog_Enter_repository_credentials;
 
 	public static String TaskRepositoryCredentialsDialog_HTML_Open_Repository_Properties;
@@ -61,6 +65,8 @@ public class Messages extends NLS {
 
 	public static String TaskRepositoryCredentialsDialog_User_ID;
 
+	public static String TaskRepositoryCredentialsDialog_Filename;
+
 	public static String UiLegendControl_Active_task;
 
 	public static String UiLegendControl_Adjust_Colors_and_Fonts_;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/dialogs/TaskRepositoryCredentialsDialog.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/dialogs/TaskRepositoryCredentialsDialog.java
index 90c58e001..911cf89f9 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/dialogs/TaskRepositoryCredentialsDialog.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/dialogs/TaskRepositoryCredentialsDialog.java
@@ -8,6 +8,7 @@
  * Contributors:
  *     Frank Becker - initial API and implementation
  *     Tasktop Technologies - improvements
+ *     BREDEX GmbH - fix for bug 295050
  *******************************************************************************/
 
 package org.eclipse.mylyn.internal.tasks.ui.dialogs;
@@ -34,6 +35,7 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.FileDialog;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Link;
 import org.eclipse.swt.widgets.Shell;
@@ -43,6 +45,7 @@ import org.eclipse.ui.plugin.AbstractUIPlugin;
 /**
  * @author Frank Becker
  * @author Steffen Pingel
+ * @author Torsten Kalix
  */
 public class TaskRepositoryCredentialsDialog extends TitleAreaDialog {
 
@@ -72,6 +75,10 @@ public class TaskRepositoryCredentialsDialog extends TitleAreaDialog {
 
 	private String username = ""; //$NON-NLS-1$
 
+	private Button certBrowseButton;
+
+	private boolean isFileDialog;
+
 	private TaskRepositoryCredentialsDialog(Shell parentShell) {
 		super(parentShell);
 	}
@@ -112,7 +119,7 @@ public class TaskRepositoryCredentialsDialog extends TitleAreaDialog {
 
 	private void createCenterArea(Composite parent) {
 		Composite composite = new Composite(parent, SWT.NONE);
-		composite.setLayout(new GridLayout(2, false));
+		composite.setLayout(new GridLayout(3, false));
 		composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
 		if (taskRepository != null) {
@@ -137,7 +144,11 @@ public class TaskRepositoryCredentialsDialog extends TitleAreaDialog {
 			label.setText(taskRepository.getRepositoryLabel());
 		}
 
-		new Label(composite, SWT.NONE).setText(Messages.TaskRepositoryCredentialsDialog_User_ID);
+		if (isFileDialog) {
+			new Label(composite, SWT.NONE).setText(Messages.TaskRepositoryCredentialsDialog_Filename);
+		} else {
+			new Label(composite, SWT.NONE).setText(Messages.TaskRepositoryCredentialsDialog_User_ID);
+		}
 
 		final Text usernameField = new Text(composite, SWT.BORDER);
 		usernameField.addModifyListener(new ModifyListener() {
@@ -155,6 +166,25 @@ public class TaskRepositoryCredentialsDialog extends TitleAreaDialog {
 				.grab(true, false)
 				.applyTo(usernameField);
 
+		if (isFileDialog) {
+			certBrowseButton = new Button(composite, SWT.PUSH);
+			certBrowseButton.setText(Messages.TaskRepositoryCredentialsDialog_ChooseCertificateFile);
+			certBrowseButton.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					FileDialog fileDialog = new FileDialog(getShell(), SWT.OPEN);
+					fileDialog.setFilterPath(System.getProperty("user.home", ".")); //$NON-NLS-1$ //$NON-NLS-2$
+					String returnFile = fileDialog.open();
+					if (returnFile != null) {
+						username = returnFile;
+						usernameField.setText(returnFile);
+					}
+				}
+			});
+		} else {
+			new Label(composite, SWT.NONE).setText(""); //$NON-NLS-1$
+		}
+
 		new Label(composite, SWT.NONE).setText(Messages.TaskRepositoryCredentialsDialog_Password);
 
 		final Text passwordField = new Text(composite, SWT.BORDER | SWT.PASSWORD);
@@ -302,4 +332,13 @@ public class TaskRepositoryCredentialsDialog extends TitleAreaDialog {
 		this.username = username;
 	}
 
+	/**
+	 * switch from asking for username / password to asking for certificate-file / password
+	 * 
+	 * @param isFileDialog
+	 */
+	public void setFileDialog(boolean isFileDialog) {
+		this.isFileDialog = isFileDialog;
+	}
+
 }
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/dialogs/messages.properties b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/dialogs/messages.properties
index 3d9e86cf6..49c06ea12 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/dialogs/messages.properties
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/dialogs/messages.properties
@@ -18,15 +18,18 @@ TaskListSortDialog_Queries_and_Categories=Queries and Categories
 TaskListSortDialog_Grouped_by=Group by:
 TaskListSortDialog_Title=Task List Sorting
 
+TaskRepositoryCredentialsDialog_ChooseCertificateFile=Browse...
 TaskRepositoryCredentialsDialog_Enter_Credentials=Enter Credentials
 TaskRepositoryCredentialsDialog_Enter_repository_credentials=Enter repository credentials
+TaskRepositoryCredentialsDialog_Enter_repository_certificate=Enter certificate details
 TaskRepositoryCredentialsDialog_HTML_Open_Repository_Properties=<a href="properties">Open Repository Properties</a> to disable background synchronization by disconnecting the repository.
 TaskRepositoryCredentialsDialog_Password=&Password:
 TaskRepositoryCredentialsDialog_Repository_Authentication=Repository Authentication
 TaskRepositoryCredentialsDialog_Save_Password=&Save Password
 TaskRepositoryCredentialsDialog_Saved_passwords_are_stored_that_is_difficult=Saved passwords are stored on your computer in a file that is difficult, but not impossible, for an intruder to read.
 TaskRepositoryCredentialsDialog_Task_Repository=Task Repository\:
-TaskRepositoryCredentialsDialog_User_ID=&User ID:
+TaskRepositoryCredentialsDialog_User_ID=&User ID: 
+TaskRepositoryCredentialsDialog_Filename=&Filename: 
 
 UiLegendControl_Active_task=Active task
 UiLegendControl_Adjust_Colors_and_Fonts_=Adjust Colors and Fonts...