diff options
Diffstat (limited to 'bundles/org.eclipse.jsch.ui/src/org/eclipse')
6 files changed, 40 insertions, 62 deletions
diff --git a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/JSchUIPlugin.java b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/JSchUIPlugin.java index 9c54a6e36..8345362fb 100644 --- a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/JSchUIPlugin.java +++ b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/JSchUIPlugin.java @@ -21,7 +21,6 @@ import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IExtension; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Plugin; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jsch.core.IJSchService; @@ -93,9 +92,6 @@ public class JSchUIPlugin extends AbstractUIPlugin{ createImageDescriptor(IUIConstants.IMG_KEY_LOCK); } - /** - * @see Plugin#start(BundleContext) - */ @Override public void start(BundleContext context) throws Exception { super.start(context); diff --git a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/KeyboardInteractiveDialog.java b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/KeyboardInteractiveDialog.java index 028908ce3..85f6dcd07 100644 --- a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/KeyboardInteractiveDialog.java +++ b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/KeyboardInteractiveDialog.java @@ -14,10 +14,10 @@ *******************************************************************************/ package org.eclipse.jsch.internal.ui; -import org.eclipse.jface.dialogs.*; import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.jface.dialogs.TrayDialog; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.window.Window; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; @@ -25,7 +25,12 @@ import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.*; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Text; import org.eclipse.ui.PlatformUI; /** @@ -91,9 +96,8 @@ public class KeyboardInteractiveDialog extends TrayDialog { isPasswordAuth=true; } } - /** - * @see Window#configureShell - */ + + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); if (isPasswordAuth) { @@ -106,9 +110,8 @@ public class KeyboardInteractiveDialog extends TrayDialog { PlatformUI.getWorkbench().getHelpSystem().setHelp(newShell, IHelpContextIds.KEYBOARD_INTERACTIVE_DIALOG); } - /** - * @see Window#create - */ + + @Override public void create() { super.create(); @@ -121,10 +124,8 @@ public class KeyboardInteractiveDialog extends TrayDialog { texts[0].setFocus(); } } - /** - * @see Dialog#createDialogArea - */ - protected Control createDialogArea(Composite parent) { + @Override +protected Control createDialogArea(Composite parent) { Composite top = new Composite(parent, SWT.NONE); GridLayout layout = new GridLayout(); layout.numColumns = 2; @@ -200,6 +201,7 @@ public class KeyboardInteractiveDialog extends TrayDialog { data.horizontalSpan = 3; allowCachingButton.setLayoutData(data); allowCachingButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { allowCaching = allowCachingButton.getSelection(); } @@ -277,7 +279,8 @@ public class KeyboardInteractiveDialog extends TrayDialog { * and closes the dialog. Subclasses may override. * </p> */ - protected void okPressed() { + @Override +protected void okPressed() { result=new String[prompt.length]; for(int i=0; i<texts.length; i++){ result[i]=texts[i].getText(); @@ -292,7 +295,8 @@ public class KeyboardInteractiveDialog extends TrayDialog { * and closes the dialog. Subclasses may override. * </p> */ - protected void cancelPressed() { + @Override +protected void cancelPressed() { result=null; super.cancelPressed(); } diff --git a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/UserValidationDialog.java b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/UserValidationDialog.java index 08578c2b3..1859876b3 100644 --- a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/UserValidationDialog.java +++ b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/UserValidationDialog.java @@ -18,7 +18,6 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.TrayDialog; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.window.Window; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -68,9 +67,6 @@ public class UserValidationDialog extends TrayDialog { this.domain = location; this.message = message; } - /** - * @see Window#configureShell - */ @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); @@ -78,9 +74,6 @@ public class UserValidationDialog extends TrayDialog { // set F1 help PlatformUI.getWorkbench().getHelpSystem().setHelp(newShell, IHelpContextIds.USER_VALIDATION_DIALOG); } - /** - * @see Window#create - */ @Override public void create() { super.create(); @@ -97,9 +90,6 @@ public class UserValidationDialog extends TrayDialog { } } - /** - * @see Dialog#createDialogArea - */ @Override protected Control createDialogArea(Composite parent) { Composite top = new Composite(parent, SWT.NONE); diff --git a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/authenticator/KeyboardInteractiveDialog.java b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/authenticator/KeyboardInteractiveDialog.java index 2a0a1f5aa..40a6d82cc 100644 --- a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/authenticator/KeyboardInteractiveDialog.java +++ b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/authenticator/KeyboardInteractiveDialog.java @@ -18,7 +18,6 @@ package org.eclipse.jsch.internal.ui.authenticator; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.TrayDialog; -import org.eclipse.jface.window.Window; import org.eclipse.jsch.internal.ui.IUIConstants; import org.eclipse.jsch.internal.ui.JSchUIPlugin; import org.eclipse.jsch.internal.ui.Messages; @@ -99,9 +98,6 @@ public class KeyboardInteractiveDialog extends TrayDialog{ } - /** - * @see Window#configureShell - */ @Override protected void configureShell(Shell newShell){ super.configureShell(newShell); @@ -116,9 +112,6 @@ protected void configureShell(Shell newShell){ IHelpContextIds.KEYBOARD_INTERACTIVE_DIALOG); } - /** - * @see Window#create - */ @Override public void create(){ super.create(); @@ -133,9 +126,6 @@ public void create(){ } } - /** - * @see Dialog#createDialogArea - */ @Override protected Control createDialogArea(Composite parent){ Composite top=new Composite(parent, SWT.NONE); diff --git a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/authenticator/UserValidationDialog.java b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/authenticator/UserValidationDialog.java index e9aa300b6..ea035fb83 100644 --- a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/authenticator/UserValidationDialog.java +++ b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/authenticator/UserValidationDialog.java @@ -14,9 +14,12 @@ *******************************************************************************/ package org.eclipse.jsch.internal.ui.authenticator; -import org.eclipse.jface.dialogs.*; import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.window.Window; +import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.jface.dialogs.TrayDialog; +import org.eclipse.jsch.internal.ui.IUIConstants; +import org.eclipse.jsch.internal.ui.JSchUIPlugin; +import org.eclipse.jsch.internal.ui.Messages; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; @@ -24,13 +27,14 @@ import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.*; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Text; import org.eclipse.ui.PlatformUI; -import org.eclipse.jsch.internal.ui.IUIConstants; -import org.eclipse.jsch.internal.ui.JSchUIPlugin; -import org.eclipse.jsch.internal.ui.Messages; - /** * A dialog for prompting for a user name and password * @since 1.1 @@ -77,9 +81,7 @@ public class UserValidationDialog extends TrayDialog{ this.isAllowCaching=isAllowCaching; } - /** - * @see Window#configureShell - */ + @Override protected void configureShell(Shell newShell){ super.configureShell(newShell); newShell.setText(Messages.UserValidationDialog_required); @@ -88,10 +90,9 @@ public class UserValidationDialog extends TrayDialog{ IHelpContextIds.USER_VALIDATION_DIALOG); } - /** - * @see Window#create - */ - public void create(){ + + @Override +public void create(){ super.create(); // add some default values usernameField.setText(defaultUsername); @@ -107,10 +108,8 @@ public class UserValidationDialog extends TrayDialog{ } } - /** - * @see Dialog#createDialogArea - */ - protected Control createDialogArea(Composite parent){ + @Override +protected Control createDialogArea(Composite parent){ Composite top=new Composite(parent, SWT.NONE); GridLayout layout=new GridLayout(); layout.numColumns=2; @@ -170,7 +169,8 @@ public class UserValidationDialog extends TrayDialog{ data.horizontalSpan=3; allowCachingButton.setLayoutData(data); allowCachingButton.addSelectionListener(new SelectionAdapter(){ - public void widgetSelected(SelectionEvent e){ + @Override + public void widgetSelected(SelectionEvent e){ allowCaching=allowCachingButton.getSelection(); } }); @@ -249,7 +249,8 @@ public class UserValidationDialog extends TrayDialog{ * may override. * </p> */ - protected void okPressed(){ + @Override +protected void okPressed(){ password=passwordField.getText(); username=usernameField.getText(); 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 111bef09b..1276044b2 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 @@ -43,9 +43,6 @@ public class WorkbenchUserAuthenticator implements IUserAuthenticator{ super(); } - /** - * @see IUserAuthenticator#promptForUserInfo(IJSchLocation, IUserInfo, String) - */ @Override public void promptForUserInfo(final IJSchLocation location, final IUserInfo userinfo, final String message){ |