From 293a2626f262d8048c6667b56ca6348a83aefc91 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Tue, 30 Oct 2018 09:29:54 +0200 Subject: Lambda conversions. Change-Id: I82abbfbcfd6d7485cf76711d685f79030f5b7306 Signed-off-by: Alexander Kurtakov --- .../authenticator/WorkbenchUserAuthenticator.java | 53 +++----- .../internal/ui/preference/PreferencePage.java | 142 ++++++++++++--------- .../src/org/eclipse/jsch/ui/UserInfoPrompter.java | 49 +++---- 3 files changed, 131 insertions(+), 113 deletions(-) (limited to 'bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch') diff --git a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/authenticator/WorkbenchUserAuthenticator.java b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/authenticator/WorkbenchUserAuthenticator.java index 2c6964335..bbbedc72b 100644 --- a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/authenticator/WorkbenchUserAuthenticator.java +++ b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/authenticator/WorkbenchUserAuthenticator.java @@ -17,14 +17,15 @@ package org.eclipse.jsch.internal.ui.authenticator; import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.jface.dialogs.*; -import org.eclipse.osgi.util.NLS; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Shell; +import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jsch.core.IJSchLocation; import org.eclipse.jsch.internal.core.IUserAuthenticator; import org.eclipse.jsch.internal.core.IUserInfo; import org.eclipse.jsch.internal.ui.Messages; +import org.eclipse.osgi.util.NLS; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Shell; /** * An authenticator that prompts the user for authentication info, @@ -42,7 +43,8 @@ public class WorkbenchUserAuthenticator implements IUserAuthenticator{ /** * @see IUserAuthenticator#promptForUserInfo(IJSchLocation, IUserInfo, String) */ - public void promptForUserInfo(final IJSchLocation location, + @Override +public void promptForUserInfo(final IJSchLocation location, final IUserInfo userinfo, final String message){ // ask the user for a password @@ -55,12 +57,8 @@ public class WorkbenchUserAuthenticator implements IUserAuthenticator{ } else{ // sync exec in default thread - Display.getDefault().syncExec(new Runnable(){ - public void run(){ - allowCaching[0]=promptForPassword(location, userinfo.getUsername(), - message, userinfo.isUsernameMutable(), result); - } - }); + Display.getDefault().syncExec(() -> allowCaching[0] = promptForPassword(location, userinfo.getUsername(), + message, userinfo.isUsernameMutable(), result)); } if(result[0]==null){ @@ -124,7 +122,8 @@ public class WorkbenchUserAuthenticator implements IUserAuthenticator{ * @param echo '*' should be used or not * @return the entered values, or null if user canceled. */ - public String[] promptForKeyboradInteractive( + @Override +public String[] promptForKeyboradInteractive( final IJSchLocation location, final String destination, final String name, final String instruction, final String[] prompt, final boolean[] echo){ @@ -137,12 +136,8 @@ public class WorkbenchUserAuthenticator implements IUserAuthenticator{ } else{ // sync exec in default thread - Display.getDefault().syncExec(new Runnable(){ - public void run(){ - result[0]=_promptForUserInteractive(location, destination, name, - instruction, prompt, echo, allowCaching); - } - }); + Display.getDefault().syncExec(() -> result[0] = _promptForUserInteractive(location, destination, name, + instruction, prompt, echo, allowCaching)); } if(result[0]!=null && location!=null && prompt!=null && prompt.length==1 && prompt[0].trim().equalsIgnoreCase("password:")){ //$NON-NLS-1$ @@ -177,7 +172,8 @@ public class WorkbenchUserAuthenticator implements IUserAuthenticator{ /* (non-Javadoc) * @see org.eclipse.team.internal.ccvs.core.IUserAuthenticator#prompt(org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation, int, java.lang.String, java.lang.String, int[], int) */ - public int prompt(IJSchLocation location, final int promptType, + @Override +public int prompt(IJSchLocation location, final int promptType, final String title, final String message, final int[] promptResponses, final int defaultResponse){ final Display display=getStandardDisplay(); @@ -201,27 +197,20 @@ public class WorkbenchUserAuthenticator implements IUserAuthenticator{ } } - display.syncExec(new Runnable(){ - public void run(){ + display.syncExec(() -> { final MessageDialog dialog=new MessageDialog(new Shell(display), title, null, message, promptType, buttons, 1); retval[0]=dialog.open(); - } - }); + }); return retval[0]; } - public boolean promptForHostKeyChange(final IJSchLocation location){ + @Override +public boolean promptForHostKeyChange(final IJSchLocation location){ final boolean[] openConfirm=new boolean[] {false}; final Display display=getStandardDisplay(); - display.syncExec(new Runnable(){ - public void run(){ - openConfirm[0]=MessageDialog.openConfirm(null, - Messages.WorkbenchUserAuthenticator_1, NLS.bind( - Messages.WorkbenchUserAuthenticator_2, new String[] {location - .getHost()})); // - } - }); + display.syncExec(() -> openConfirm[0] = MessageDialog.openConfirm(null, Messages.WorkbenchUserAuthenticator_1, + NLS.bind(Messages.WorkbenchUserAuthenticator_2, new String[] { location.getHost() }))); if(!openConfirm[0]){ throw new OperationCanceledException(); } diff --git a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/preference/PreferencePage.java b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/preference/PreferencePage.java index 09038d03e..cd208f6ac 100644 --- a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/preference/PreferencePage.java +++ b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/preference/PreferencePage.java @@ -125,7 +125,8 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage setDescription(Messages.CVSSSH2PreferencePage_18); } - protected Control createContents(Composite parent){ + @Override +protected Control createContents(Composite parent){ Composite container=new Composite(parent, SWT.NULL); GridLayout layout=new GridLayout(); container.setLayout(layout); @@ -216,7 +217,8 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage privateKeyAdd.setLayoutData(gd); ssh2HomeBrowse.addSelectionListener(new SelectionAdapter(){ - public void widgetSelected(SelectionEvent e){ + @Override + public void widgetSelected(SelectionEvent e){ String home=ssh2HomeText.getText(); if(!new File(home).exists()){ @@ -242,7 +244,8 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage }); privateKeyAdd.addSelectionListener(new SelectionAdapter(){ - public void widgetSelected(SelectionEvent e){ + @Override + public void widgetSelected(SelectionEvent e){ String home=ssh2HomeText.getText(); FileDialog fd=new FileDialog(getShell(), SWT.OPEN|SWT.MULTI); @@ -340,7 +343,8 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage keyCommentText.setLayoutData(gd); keyCommentText.addModifyListener(new ModifyListener(){ - public void modifyText(ModifyEvent e){ + @Override + public void modifyText(ModifyEvent e){ if(kpair==null) return; try{ @@ -375,7 +379,8 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage keyPassphrase2Text.setLayoutData(gd); keyPassphrase1Text.addModifyListener(new ModifyListener(){ - public void modifyText(ModifyEvent e){ + @Override + public void modifyText(ModifyEvent e){ String pass1=keyPassphrase1Text.getText(); String pass2=keyPassphrase2Text.getText(); if(kpair!=null&&pass1.equals(pass2)){ @@ -398,7 +403,8 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage }); keyPassphrase2Text.addModifyListener(new ModifyListener(){ - public void modifyText(ModifyEvent e){ + @Override + public void modifyText(ModifyEvent e){ String pass1=keyPassphrase1Text.getText(); String pass2=keyPassphrase2Text.getText(); if(kpair!=null&&pass1.equals(pass2)){ @@ -426,7 +432,8 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage }); keyPassphrase2Text.addFocusListener(new FocusListener(){ - public void focusGained(FocusEvent e){ + @Override + public void focusGained(FocusEvent e){ String pass1=keyPassphrase1Text.getText(); String pass2=keyPassphrase2Text.getText(); if(pass2.length() { + try { + _kpair[0] = KeyPair.genKeyPair(getJSch(), __type); + } catch (JSchException e1) { + _e[0] = e1; + } + }); if(_e[0]!=null){ throw _e[0]; } @@ -543,7 +549,8 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage keyGenerateRSA.addSelectionListener(keygenadapter); keyLoad.addSelectionListener(new SelectionAdapter(){ - public void widgetSelected(SelectionEvent e){ + @Override + public void widgetSelected(SelectionEvent e){ boolean ok=true; String home=ssh2HomeText.getText(); FileDialog fd=new FileDialog(getShell(), SWT.OPEN); @@ -642,7 +649,8 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage }); keyExport.addSelectionListener(new SelectionAdapter(){ - public void widgetSelected(SelectionEvent e){ + @Override + public void widgetSelected(SelectionEvent e){ if(kpair==null) return; @@ -650,20 +658,18 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage final String[] target=new String[1]; final String title=Messages.CVSSSH2PreferencePage_106; - final String message=Messages.CVSSSH2PreferencePage_107; - Display.getDefault().syncExec(new Runnable(){ - public void run(){ - Display display=Display.getCurrent(); - Shell shell=new Shell(display); - ExportDialog dialog=new ExportDialog(shell, title, message); - dialog.open(); - shell.dispose(); - target[0]=dialog.getTarget(); - } - }); - if(target[0]==null){ - return; - } + final String message = Messages.CVSSSH2PreferencePage_107; + Display.getDefault().syncExec(() -> { + Display display = Display.getCurrent(); + Shell shell = new Shell(display); + ExportDialog dialog = new ExportDialog(shell, title, message); + dialog.open(); + shell.dispose(); + target[0] = dialog.getTarget(); + }); + if (target[0] == null) { + return; + } String user=""; //$NON-NLS-1$ String host=""; //$NON-NLS-1$ int port=22; @@ -713,7 +719,8 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage }); saveKeyPair.addSelectionListener(new SelectionAdapter(){ - public void widgetSelected(SelectionEvent e){ + @Override + public void widgetSelected(SelectionEvent e){ if(kpair==null) return; @@ -834,7 +841,8 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage Button mac_down; class TableLabelProvider extends LabelProvider implements ITableLabelProvider{ - public String getColumnText(Object element, int columnIndex){ + @Override + public String getColumnText(Object element, int columnIndex){ HostKey entry=(HostKey)element; switch(columnIndex){ case 0: @@ -848,7 +856,8 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage } } - public Image getColumnImage(Object element, int columnIndex){ + @Override + public Image getColumnImage(Object element, int columnIndex){ return null; } } @@ -889,7 +898,8 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage gd.heightHint=100; table.setLayoutData(gd); table.addListener(SWT.Selection, new Listener(){ - public void handleEvent(Event e){ + @Override + public void handleEvent(Event e){ handleSelection(); } }); @@ -907,15 +917,18 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage Messages.CVSSSH2PreferencePage_136}); viewer.setLabelProvider(new TableLabelProvider()); viewer.setContentProvider(new IStructuredContentProvider(){ - public void dispose(){ + @Override + public void dispose(){ // nothing to do } - public void inputChanged(Viewer viewer, Object oldInput, Object newInput){ + @Override + public void inputChanged(Viewer viewer, Object oldInput, Object newInput){ // nothing to do } - public Object[] getElements(Object inputElement){ + @Override + public Object[] getElements(Object inputElement){ if(inputElement==null) return null; return (Object[])inputElement; @@ -943,7 +956,8 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage SWT.DEFAULT, SWT.END, SWT.CENTER, false, false)); removeHostKeyButton.setEnabled(false); removeHostKeyButton.addListener(SWT.Selection, new Listener(){ - public void handleEvent(Event e){ + @Override + public void handleEvent(Event e){ removeHostKey(); } }); @@ -995,7 +1009,8 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage preferedAuthMethodTable.addSelectionListener(new SelectionAdapter(){ - public void widgetSelected(SelectionEvent e){ + @Override + public void widgetSelected(SelectionEvent e){ boolean anySelected = false; for(int i = 0; i < preferedAuthMethodTable.getItemCount(); i++){ anySelected |= preferedAuthMethodTable.getItem(i).getChecked(); @@ -1018,7 +1033,8 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage }); up.addSelectionListener(new SelectionAdapter(){ - public void widgetSelected(SelectionEvent e){ + @Override + public void widgetSelected(SelectionEvent e){ int selectedIndex=preferedAuthMethodTable.getSelectionIndex(); if(selectedIndex == 1){ //this is the last possible swap up.setEnabled(false); @@ -1043,7 +1059,8 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage down.addSelectionListener(new SelectionAdapter(){ - public void widgetSelected(SelectionEvent e){ + @Override + public void widgetSelected(SelectionEvent e){ int selectedIndex=preferedAuthMethodTable.getSelectionIndex(); if(selectedIndex == preferedAuthMethodTable.getItemCount()-2){ //this is the last possible swap down.setEnabled(false); @@ -1121,7 +1138,8 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage preferedKeyExchangeMethodTable.addSelectionListener(new SelectionAdapter(){ - public void widgetSelected(SelectionEvent e){ + @Override + public void widgetSelected(SelectionEvent e){ boolean anySelected = false; for(int i = 0; i < preferedKeyExchangeMethodTable.getItemCount(); i++){ anySelected |= preferedKeyExchangeMethodTable.getItem(i).getChecked(); @@ -1144,7 +1162,8 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage }); kex_up.addSelectionListener(new SelectionAdapter(){ - public void widgetSelected(SelectionEvent e){ + @Override + public void widgetSelected(SelectionEvent e){ int selectedIndex=preferedKeyExchangeMethodTable.getSelectionIndex(); if(selectedIndex == 1){ //this is the last possible swap kex_up.setEnabled(false); @@ -1169,7 +1188,8 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage kex_down.addSelectionListener(new SelectionAdapter(){ - public void widgetSelected(SelectionEvent e){ + @Override + public void widgetSelected(SelectionEvent e){ int selectedIndex=preferedKeyExchangeMethodTable.getSelectionIndex(); if(selectedIndex == preferedKeyExchangeMethodTable.getItemCount()-2){ //this is the last possible swap kex_down.setEnabled(false); @@ -1247,7 +1267,8 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage preferedMACMethodTable.addSelectionListener(new SelectionAdapter(){ - public void widgetSelected(SelectionEvent e){ + @Override + public void widgetSelected(SelectionEvent e){ boolean anySelected = false; for(int i = 0; i < preferedMACMethodTable.getItemCount(); i++){ anySelected |= preferedMACMethodTable.getItem(i).getChecked(); @@ -1270,7 +1291,8 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage }); mac_up.addSelectionListener(new SelectionAdapter(){ - public void widgetSelected(SelectionEvent e){ + @Override + public void widgetSelected(SelectionEvent e){ int selectedIndex=preferedMACMethodTable.getSelectionIndex(); if(selectedIndex == 1){ //this is the last possible swap mac_up.setEnabled(false); @@ -1295,7 +1317,8 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage mac_down.addSelectionListener(new SelectionAdapter(){ - public void widgetSelected(SelectionEvent e){ + @Override + public void widgetSelected(SelectionEvent e){ int selectedIndex=preferedMACMethodTable.getSelectionIndex(); if(selectedIndex == preferedMACMethodTable.getItemCount()-2){ //this is the last possible swap mac_down.setEnabled(false); @@ -1505,7 +1528,8 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage mac_down.setEnabled(false); } - public void init(IWorkbench workbench){ + @Override +public void init(IWorkbench workbench){ // super.init(workbench); // initControls(); } @@ -1523,7 +1547,8 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage updateControls(); } - public boolean performOk(){ + @Override +public boolean performOk(){ boolean result=super.performOk(); storeAuthenticationMethodSettings(); storeSSHAgentSettings(); @@ -1641,11 +1666,13 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage Utils.setEnabledPreferredMACMethods(selected, order); } - public void performApply(){ + @Override +public void performApply(){ performOk(); } - protected void performDefaults(){ + @Override +protected void performDefaults(){ super.performDefaults(); Utils.setEnabledPreferredAuthMethods(Utils.getDefaultAuthMethods(), Utils .getDefaultAuthMethods()); @@ -1678,7 +1705,8 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage this.message=message; } - public void run(){ + @Override + public void run(){ Display display=Display.getCurrent(); Shell shell=new Shell(display); PassphraseDialog dialog=new PassphraseDialog(shell, message); diff --git a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/ui/UserInfoPrompter.java b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/ui/UserInfoPrompter.java index 71017e650..4504fb848 100644 --- a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/ui/UserInfoPrompter.java +++ b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/ui/UserInfoPrompter.java @@ -17,11 +17,15 @@ import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jsch.core.IJSchService; -import org.eclipse.jsch.internal.ui.*; +import org.eclipse.jsch.internal.ui.KeyboardInteractiveDialog; +import org.eclipse.jsch.internal.ui.Messages; +import org.eclipse.jsch.internal.ui.UserValidationDialog; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; -import com.jcraft.jsch.*; +import com.jcraft.jsch.Session; +import com.jcraft.jsch.UIKeyboardInteractive; +import com.jcraft.jsch.UserInfo; /** * A {@link UserInfo} prompter implementation that can be used when connecting a @@ -68,7 +72,8 @@ public class UserInfoPrompter implements UserInfo, UIKeyboardInteractive{ * * @see com.jcraft.jsch.UserInfo#getPassphrase() */ - public String getPassphrase(){ + @Override +public String getPassphrase(){ return passphrase; } @@ -77,7 +82,8 @@ public class UserInfoPrompter implements UserInfo, UIKeyboardInteractive{ * * @see com.jcraft.jsch.UserInfo#getPassword() */ - public String getPassword(){ + @Override +public String getPassword(){ return password; } @@ -110,7 +116,8 @@ public class UserInfoPrompter implements UserInfo, UIKeyboardInteractive{ * * @see com.jcraft.jsch.UserInfo#promptPassphrase(java.lang.String) */ - public boolean promptPassphrase(String message){ + @Override +public boolean promptPassphrase(String message){ String _passphrase=promptSecret(message); if(_passphrase!=null){ setPassphrase(_passphrase); @@ -123,7 +130,8 @@ public class UserInfoPrompter implements UserInfo, UIKeyboardInteractive{ * * @see com.jcraft.jsch.UserInfo#promptPassword(java.lang.String) */ - public boolean promptPassword(String message){ + @Override +public boolean promptPassword(String message){ String _password=promptSecret(message); if(_password!=null){ setPassword(_password); @@ -140,11 +148,7 @@ public class UserInfoPrompter implements UserInfo, UIKeyboardInteractive{ } else{ // sync exec in default thread - Display.getDefault().syncExec(new Runnable(){ - public void run(){ - result[0]=promptForPassword(message); - } - }); + Display.getDefault().syncExec(() -> result[0] = promptForPassword(message)); } if(result[0]==null){ @@ -168,7 +172,8 @@ public class UserInfoPrompter implements UserInfo, UIKeyboardInteractive{ * @see com.jcraft.jsch.UIKeyboardInteractive#promptKeyboardInteractive(java.lang.String, * java.lang.String, java.lang.String, java.lang.String[], boolean[]) */ - public String[] promptKeyboardInteractive(String destination, String name, + @Override +public String[] promptKeyboardInteractive(String destination, String name, String instruction, String[] prompt, boolean[] echo){ if(prompt.length==0){ // No need to prompt, just return an empty String array @@ -209,12 +214,8 @@ public class UserInfoPrompter implements UserInfo, UIKeyboardInteractive{ } else{ // sync exec in default thread - Display.getDefault().syncExec(new Runnable(){ - public void run(){ - result[0]=internalPromptForUserInteractive(destination, name, - instruction, prompt, echo); - } - }); + Display.getDefault().syncExec( + () -> result[0] = internalPromptForUserInteractive(destination, name, instruction, prompt, echo)); } return result[0]; } @@ -235,7 +236,8 @@ public class UserInfoPrompter implements UserInfo, UIKeyboardInteractive{ * * @see com.jcraft.jsch.UserInfo#promptYesNo(java.lang.String) */ - public boolean promptYesNo(String question){ + @Override +public boolean promptYesNo(String question){ int prompt=prompt(MessageDialog.QUESTION, Messages.UserInfoPrompter_0, question, new int[] {IDialogConstants.YES_ID, IDialogConstants.NO_ID}, 0 // yes @@ -250,7 +252,8 @@ public class UserInfoPrompter implements UserInfo, UIKeyboardInteractive{ * * @see com.jcraft.jsch.UserInfo#showMessage(java.lang.String) */ - public void showMessage(String message){ + @Override +public void showMessage(String message){ prompt(MessageDialog.INFORMATION, Messages.UserInfoPrompter_1, message, new int[] {IDialogConstants.OK_ID}, 0); } @@ -279,14 +282,12 @@ public class UserInfoPrompter implements UserInfo, UIKeyboardInteractive{ } } - display.syncExec(new Runnable(){ - public void run(){ + display.syncExec(() -> { final MessageDialog dialog=new MessageDialog(new Shell(display), title, null /* title image */, message, promptType, buttons, defaultResponse); retval[0]=dialog.open(); - } - }); + }); return retval[0]; } -- cgit v1.2.3