Change password prompt to a modal dialog box.

Signed-off-by: Norman James <nkskjames@gmail.com>

2 files changed, 13 insertions, 7 deletions

diff --git a/src/com/ibm/ServerWizard2/view/GitDialog.java b/src/com/ibm/ServerWizard2/view/GitDialog.java
index f82cabe..7297afa 100644
--- a/src/com/ibm/ServerWizard2/view/GitDialog.java
+++ b/src/com/ibm/ServerWizard2/view/GitDialog.java
@@ -174,18 +174,19 @@ public class GitDialog extends Dialog {
 						g.cloneRepository();

 					}

 					org.eclipse.jgit.api.Status status = g.status();

+					

 					if (!status.isClean()) {

-						boolean reset = MessageDialog.openConfirm(null, "Repository is Modified",

+						boolean reset = MessageDialog.openQuestion(null, "Repository is Modified",

 								"The local repository for:\n" + g.getRemoteUrl() + "\n"

-										+ "has been modified. Would you like to ignore changes and reset");

+										+ "has been modified. Would you like to ignore changes and reset?");

 						if (reset) {

-							g.fetch(true);

-							MessageDialog.openInformation(null, "Refresh Complete", "Refresh Complete");

+							String r = g.fetch(true);

+							MessageDialog.openInformation(null, "Refresh Complete", "Reset Successful");

 

 						}

 					} else {

-						g.fetch(false);

-						MessageDialog.openInformation(null, "Refresh Complete", "Refresh Complete");

+						String r = g.fetch(false);

+						MessageDialog.openInformation(null, "Refresh Complete", "Message: "+r);

 					}

 				} catch (Exception e) {

 					MessageDialog.openError(null, "Git Refresh: "+g.getRemoteUrl(), e.getMessage());

@@ -270,6 +271,7 @@ public class GitDialog extends Dialog {
 					return;

 				}

 				GithubRepository g = new GithubRepository(repo, git.getLocation(), btnNeedsPassword.getSelection());

+				g.setShell(getShell());

 				if (git.isRepository(g)) {

 					MessageDialog.openError(null, "Error", "Repository already exists");

 					return;

@@ -371,6 +373,7 @@ public class GitDialog extends Dialog {
 					n = true;

 				}

 				GithubRepository g = new GithubRepository(repo[i],ServerWizard2.GIT_LOCATION,n);

+				g.setShell(getShell());

 				git.getRepositories().add(g);

 			}

 		} catch (Exception e) {

diff --git a/src/com/ibm/ServerWizard2/view/PasswordPrompt.java b/src/com/ibm/ServerWizard2/view/PasswordPrompt.java
index b01d70c..aed5f7f 100644
--- a/src/com/ibm/ServerWizard2/view/PasswordPrompt.java
+++ b/src/com/ibm/ServerWizard2/view/PasswordPrompt.java
@@ -17,6 +17,7 @@ public class PasswordPrompt extends Dialog {
 	private Text text;

 	public char passwd[];

 	private String label;

+	Button btnOk;

 

 	/**

 	 * Create the dialog.

@@ -24,6 +25,7 @@ public class PasswordPrompt extends Dialog {
 	 */

 	public PasswordPrompt(Shell parentShell,String label) {

 		super(parentShell);

+		setShellStyle(SWT.APPLICATION_MODAL);

 		this.label = label;

 	}

 

@@ -58,7 +60,7 @@ public class PasswordPrompt extends Dialog {
 		text = new Text(composite_1, SWT.BORDER | SWT.PASSWORD);

 		text.setBounds(10, 10, 115, 21);

 		

-		Button btnOk = new Button(composite_1, SWT.NONE);

+		btnOk = new Button(composite_1, SWT.NONE);

 		btnOk.addSelectionListener(new SelectionAdapter() {

 			@Override

 			public void widgetSelected(SelectionEvent arg0) {

@@ -68,6 +70,7 @@ public class PasswordPrompt extends Dialog {
 		});

 		btnOk.setBounds(143, 6, 75, 25);

 		btnOk.setText("Ok");

+		this.getShell().setDefaultButton(btnOk);

 

 		return container;

 	}