diff --git a/src/net/java/sip/communicator/impl/gui/main/account/AccountRegFirstPage.java b/src/net/java/sip/communicator/impl/gui/main/account/AccountRegFirstPage.java index 1c70ce1e3..9cf5d5a5d 100644 --- a/src/net/java/sip/communicator/impl/gui/main/account/AccountRegFirstPage.java +++ b/src/net/java/sip/communicator/impl/gui/main/account/AccountRegFirstPage.java @@ -59,7 +59,7 @@ public AccountRegFirstPage(AccountRegWizardContainerImpl container) { this.tableModel = new ExtendedTableModel(); - this.setPreferredSize(new Dimension(500, 320)); + this.setPreferredSize(new Dimension(500, 350)); this.accountRegsTable.setSelectionMode( ListSelectionModel.SINGLE_SELECTION); diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/FirstWizardPage.java index e2943b2a4..221a55720 100644 --- a/src/net/java/sip/communicator/plugin/sipaccregwizz/FirstWizardPage.java +++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/FirstWizardPage.java @@ -62,7 +62,9 @@ public class FirstWizardPage extends JPanel private JLabel proxyLabel = new JLabel(Resources.getString("proxy")); - private JLabel portLabel = new JLabel(Resources.getString("port")); + private JLabel serverPortLabel = new JLabel(Resources.getString("serverPort")); + + private JLabel proxyPortLabel = new JLabel(Resources.getString("proxyPort")); private JLabel transportLabel = new JLabel(Resources.getString("preferredTransport")); @@ -71,7 +73,9 @@ public class FirstWizardPage extends JPanel private JTextField proxyField = new JTextField(); - private JTextField portField = new JTextField(defaultPortValue); + private JTextField serverPortField = new JTextField(defaultPortValue); + + private JTextField proxyPortField = new JTextField(defaultPortValue); private JComboBox transportCombo = new JComboBox( new Object[]{"UDP", "TLS", "TCP"}); @@ -131,8 +135,9 @@ private void init() { mainPanel.add(uinPassPanel); serverField.setEditable(false); - portField.setEditable(false); + serverPortField.setEditable(false); proxyField.setEditable(false); + proxyPortField.setEditable(false); transportCombo.setEnabled(false); enableAdvOpButton.addActionListener(new ActionListener(){ @@ -141,22 +146,25 @@ public void actionPerformed(ActionEvent evt) { JCheckBox cb = (JCheckBox)evt.getSource(); serverField.setEditable(cb.isSelected()); - portField.setEditable(cb.isSelected()); + serverPortField.setEditable(cb.isSelected()); proxyField.setEditable(cb.isSelected()); - transportCombo.setEnabled(cb.isSelected()); + proxyPortField.setEditable(cb.isSelected()); + transportCombo.setEnabled(cb.isSelected()); }}); transportCombo.setSelectedItem("UDP"); labelsAdvOpPanel.add(serverLabel); + labelsAdvOpPanel.add(serverPortLabel); labelsAdvOpPanel.add(proxyLabel); + labelsAdvOpPanel.add(proxyPortLabel); labelsAdvOpPanel.add(transportLabel); - labelsAdvOpPanel.add(portLabel); valuesAdvOpPanel.add(serverField); - valuesAdvOpPanel.add(proxyField); + valuesAdvOpPanel.add(serverPortField); + valuesAdvOpPanel.add(proxyField); + valuesAdvOpPanel.add(proxyPortField); valuesAdvOpPanel.add(transportCombo); - valuesAdvOpPanel.add(portField); advancedOpPanel.add(enableAdvOpButton, BorderLayout.NORTH); advancedOpPanel.add(labelsAdvOpPanel, BorderLayout.WEST); @@ -219,8 +227,10 @@ public void pageNext() { registration.setRememberPassword(rememberPassBox.isSelected()); registration.setServerAddress(serverField.getText()); + registration.setServerPort(serverPortField.getText()); registration.setProxy(proxyField.getText()); - registration.setPort(portField.getText()); + registration.setProxyPort(proxyPortField.getText()); + System.out.println("TRANSPORT=================" + transportCombo.getSelectedItem().toString()); registration.setPreferredTransport( transportCombo.getSelectedItem().toString()); } @@ -281,12 +291,33 @@ public void loadAccount(ProtocolProviderService protocolProvider) { String password = (String)accountID.getAccountProperties() .get(ProtocolProviderFactory.PASSWORD); + String serverAddress = (String)accountID.getAccountProperties() + .get(ProtocolProviderFactory.SERVER_ADDRESS); + + String serverPort = (String)accountID.getAccountProperties() + .get(ProtocolProviderFactory.SERVER_PORT); + + String proxyAddress = (String)accountID.getAccountProperties() + .get(ProtocolProviderFactory.PROXY_ADDRESS); + + String proxyPort = (String)accountID.getAccountProperties() + .get(ProtocolProviderFactory.PROXY_PORT); + + String preferredTransport = (String)accountID.getAccountProperties() + .get(ProtocolProviderFactory.PREFERRED_TRANSPORT); + this.uinField.setText(accountID.getUserID()); if(password != null) { this.passField.setText(password); this.rememberPassBox.setSelected(true); } + + serverField.setText(serverAddress); + serverPortField.setText(serverPort); + proxyField.setText(proxyAddress); + proxyPortField.setText(proxyPort); + transportCombo.setSelectedItem(preferredTransport); } /** @@ -329,10 +360,12 @@ public void itemStateChanged(ItemEvent e) if(e.getStateChange() == ItemEvent.SELECTED && e.getItem().equals("TLS")) { - portField.setText("5061"); + serverPortField.setText("5061"); + proxyPortField.setText("5061"); } else { - portField.setText("5060"); + serverPortField.setText("5060"); + proxyPortField.setText("5060"); } } } diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistration.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistration.java index 6c10a73af..1229b15cb 100755 --- a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistration.java +++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistration.java @@ -22,7 +22,9 @@ public class SIPAccountRegistration { private String serverAddress; - private String port; + private String serverPort; + + private String proxyPort; private String proxy; @@ -102,9 +104,18 @@ public String getServerAddress() * The port on the specified server * @return int */ - public String getPort() + public String getServerPort() + { + return serverPort; + } + + /** + * The port on the specified proxy + * @return int + */ + public String getProxyPort() { - return port; + return proxyPort; } /** @@ -116,7 +127,7 @@ public void setUin(String uin) { } /** - * Setting the server + * Sets the server * @param serverAddress String */ public void setServerAddress(String serverAddress) @@ -125,11 +136,20 @@ public void setServerAddress(String serverAddress) } /** - * Setting the port + * Sets the server port. + * @param port int + */ + public void setServerPort(String port) + { + this.serverPort = port; + } + + /** + * Sets the proxy port. * @param port int */ - public void setPort(String port) + public void setProxyPort(String port) { - this.port = port; + this.proxyPort = port; } } diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java index 2315d2c21..f7546201d 100644 --- a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java @@ -132,11 +132,14 @@ public ProtocolProviderService installAccount( accountProperties.put(ProtocolProviderFactory.SERVER_ADDRESS, registration.getServerAddress()); + accountProperties.put(ProtocolProviderFactory.SERVER_PORT, + registration.getServerPort()); + accountProperties.put(ProtocolProviderFactory.PROXY_ADDRESS, registration.getProxy()); - accountProperties.put(ProtocolProviderFactory.SERVER_PORT, - registration.getPort()); + accountProperties.put(ProtocolProviderFactory.PROXY_PORT, + registration.getProxyPort()); accountProperties.put(ProtocolProviderFactory.PREFERRED_TRANSPORT, registration.getPreferredTransport()); diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/resources.properties b/src/net/java/sip/communicator/plugin/sipaccregwizz/resources.properties index c850118b5..f67937fd0 100755 --- a/src/net/java/sip/communicator/plugin/sipaccregwizz/resources.properties +++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/resources.properties @@ -7,8 +7,9 @@ uinAndPassword=ID and Password advancedOptions=Advanced Options ovverideServerOps=Override server default options server=Connect Server -port=Port +serverPort=Server port proxy=Proxy +proxyPort=Proxy port preferredTransport=Preferred transport protocolIcon=net/java/sip/communicator/plugin/sipaccregwizz/resources/sip.png