diff options
author | Lyubomir Marinov <lyubomir.marinov@jitsi.org> | 2013-05-23 18:50:35 +0300 |
---|---|---|
committer | Lyubomir Marinov <lyubomir.marinov@jitsi.org> | 2013-05-23 18:50:35 +0300 |
commit | b211c26d6c8f51a75d3b64b6092284c3847a3a8a (patch) | |
tree | a51b7d816a27f8db492cf9c44f998e2da8176635 /src/net/java/sip/communicator/plugin/sshaccregwizz | |
parent | 24e81b82808681c6b5741b14048ef58c4e665e37 (diff) | |
download | jitsi-b211c26d6c8f51a75d3b64b6092284c3847a3a8a.zip jitsi-b211c26d6c8f51a75d3b64b6092284c3847a3a8a.tar.gz jitsi-b211c26d6c8f51a75d3b64b6092284c3847a3a8a.tar.bz2 |
Fixes warnings, removes trailing whitespace, adds @Override annotations.
Diffstat (limited to 'src/net/java/sip/communicator/plugin/sshaccregwizz')
4 files changed, 36 insertions, 21 deletions
diff --git a/src/net/java/sip/communicator/plugin/sshaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/sshaccregwizz/FirstWizardPage.java index c04e313..9880f20 100644 --- a/src/net/java/sip/communicator/plugin/sshaccregwizz/FirstWizardPage.java +++ b/src/net/java/sip/communicator/plugin/sshaccregwizz/FirstWizardPage.java @@ -215,10 +215,10 @@ public class FirstWizardPage public void actionPerformed(ActionEvent event) { identityFileChooser = GenericFileDialog.create( - null, "Select Identify File", + null, "Select Identify File", SipCommFileChooser.LOAD_FILE_OPERATION); File f = identityFileChooser.getFileFromDialog(); - + if(f != null) identityFileField.setText(f.getAbsolutePath()); } @@ -233,7 +233,7 @@ public class FirstWizardPage null, "Select SSH Known Hosts File", SipCommFileChooser.LOAD_FILE_OPERATION); File f = knownHostsFileChooser.getFileFromDialog(); - + if(f != null) knownHostsFileField.setText(f.getAbsolutePath()); } diff --git a/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccRegWizzActivator.java b/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccRegWizzActivator.java index e317fc7..f9a267c 100644 --- a/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccRegWizzActivator.java +++ b/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccRegWizzActivator.java @@ -89,7 +89,7 @@ public class SSHAccRegWizzActivator public void stop(BundleContext bundleContext) throws Exception { } - + /** * Returns the <tt>ProtocolProviderFactory</tt> for the SSH protocol. * @return the <tt>ProtocolProviderFactory</tt> for the SSH protocol @@ -130,7 +130,7 @@ public class SSHAccRegWizzActivator /** * Returns the <tt>UIService</tt>. - * + * * @return the <tt>UIService</tt> */ public static UIService getUIService() diff --git a/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistration.java b/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistration.java index 5e70603..8948612 100644 --- a/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistration.java +++ b/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistration.java @@ -23,18 +23,18 @@ package net.java.sip.communicator.plugin.sshaccregwizz; public class SSHAccountRegistration { private String accountID; - + /** * Stored public keys[SSH] of remote server */ private String knownHostsFile; - + /** - * Identity file is a private[default] key of the user which is one + * Identity file is a private[default] key of the user which is one * of the methods of authentication */ private String identityFile; - + /** * Returns the Account ID of the ssh registration account. * @return accountID @@ -43,37 +43,37 @@ public class SSHAccountRegistration { return accountID; } - + /** * Sets the Account ID of the ssh registration account. - * + * * @param accountID the accountID of the ssh registration account. */ public void setUserID(String accountID) { this.accountID = accountID; } - + /** * Returns the Known Hosts of the ssh registration account. - * + * * @return knownHostsFile */ public String getKnownHostsFile() { return knownHostsFile; } - + /** * Sets the Known Hosts of the ssh registration account. - * + * * @param knownHostsFile */ public void setKnownHostsFile(String knownHostsFile) { this.knownHostsFile = knownHostsFile; } - + /** * Returns the Identity File of the ssh registration account. * @@ -83,10 +83,10 @@ public class SSHAccountRegistration { return identityFile; } - + /** * Sets the Machine Port of the ssh registration account. - * + * * @param machinePort */ public void setIdentityFile(String machinePort) diff --git a/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java index 7e3f4a6..ed45a84 100644 --- a/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java @@ -69,6 +69,7 @@ public class SSHAccountRegistrationWizard * Returns the icon to be used for this wizard. * @return byte[] */ + @Override public byte[] getIcon() { return Resources.getImage(Resources.SSH_LOGO); @@ -81,6 +82,7 @@ public class SSHAccountRegistrationWizard * * @return byte[] the image used to decorate the wizard page */ + @Override public byte[] getPageImage() { return Resources.getImage(Resources.PAGE_IMAGE); @@ -91,6 +93,7 @@ public class SSHAccountRegistrationWizard * method. Returns the protocol name for this wizard. * @return String */ + @Override public String getProtocolName() { return Resources.getString("plugin.sshaccregwizz.PROTOCOL_NAME"); @@ -101,6 +104,7 @@ public class SSHAccountRegistrationWizard * </code> method. Returns the description of the protocol for this wizard. * @return String */ + @Override public String getProtocolDescription() { return Resources.getString("plugin.sshaccregwizz.PROTOCOL_DESCRIPTION"); @@ -110,6 +114,7 @@ public class SSHAccountRegistrationWizard * Returns the set of pages contained in this wizard. * @return Iterator */ + @Override public Iterator<WizardPage> getPages() { java.util.List<WizardPage> pages = new ArrayList<WizardPage>(); @@ -125,12 +130,13 @@ public class SSHAccountRegistrationWizard * Returns the set of data that user has entered through this wizard. * @return Iterator */ + @Override public Iterator<Map.Entry<String, String>> getSummary() { Hashtable<String, String> summaryTable = new Hashtable<String, String>(); /* - * Hashtable arranges the entries alphabetically so the order + * Hashtable arranges the entries alphabetically so the order * of appearance is * - Computer Name / IP * - Port @@ -150,6 +156,7 @@ public class SSHAccountRegistrationWizard * new account * @throws OperationFailedException if the operation didn't succeed */ + @Override public ProtocolProviderService signin() throws OperationFailedException { @@ -168,6 +175,7 @@ public class SSHAccountRegistrationWizard * new account * @throws OperationFailedException if the operation didn't succeed */ + @Override public ProtocolProviderService signin(String userName, String password) throws OperationFailedException { @@ -239,13 +247,14 @@ public class SSHAccountRegistrationWizard return protocolProvider; } - + /** * Fills the UserID and Password fields in this panel with the data comming * from the given protocolProvider. * @param protocolProvider The <tt>ProtocolProviderService</tt> to load the * data from. */ + @Override public void loadAccount(ProtocolProviderService protocolProvider) { this.protocolProvider = protocolProvider; @@ -259,6 +268,7 @@ public class SSHAccountRegistrationWizard * Returns the size of this wizard. * @return the size of this wizard */ + @Override public Dimension getSize() { return new Dimension(600, 500); @@ -271,11 +281,13 @@ public class SSHAccountRegistrationWizard * * @return the identifier of the first account registration wizard page */ + @Override public Object getFirstPageIdentifier() { return firstWizardPage.getIdentifier(); } + @Override public Object getLastPageIdentifier() { return firstWizardPage.getIdentifier(); @@ -287,6 +299,7 @@ public class SSHAccountRegistrationWizard * @return an example string, which should indicate to the user how the * user name should look like. */ + @Override public String getUserNameExample() { return null; @@ -301,6 +314,7 @@ public class SSHAccountRegistrationWizard * @return <code>true</code> if the simple "Sign in" form is enabled or * <code>false</code> otherwise. */ + @Override public boolean isSimpleFormEnabled() { return false; @@ -311,10 +325,11 @@ public class SSHAccountRegistrationWizard * shown to the user. Only if the user needs more settings she'll choose * to open the advanced wizard, consisted by all pages. * - * @param isCreateAccount indicates if the simple form should be opened as + * @param isCreateAccount indicates if the simple form should be opened as * a create account form or as a login form * @return a simple account registration form */ + @Override public Object getSimpleForm(boolean isCreateAccount) { firstWizardPage = new FirstWizardPage(registration, getWizardContainer()); |