--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/gui/ConnectionView.java	Wed Apr 30 18:07:20 2014 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/gui/ConnectionView.java	Wed Apr 30 18:19:44 2014 +0900
@@ -33,6 +33,7 @@
 import javax.swing.*;
 import javax.swing.border.Border;
 import javax.swing.border.EmptyBorder;
+
 import java.awt.*;
 import java.awt.event.*;
 import java.util.LinkedList;
@@ -51,7 +52,7 @@
 	private final boolean hasSshSupport;
     private final JTextField serverPortField;
 	private JCheckBox useSshTunnelingCheckbox;
-	private final JComboBox serverNameCombo;
+	private final JComboBox<ConnectionParams> serverNameCombo;
     private JTextField sshUserField;
     private JTextField sshHostField;
     private JTextField sshPortField;
@@ -82,7 +83,7 @@
 
 		int gridRow = 0;
 
-        serverNameCombo = new JComboBox();
+        serverNameCombo = new JComboBox<ConnectionParams>();
         initConnectionsHistoryCombo();
         serverNameCombo.addItemListener(new ItemListener() {
             @Override
@@ -129,7 +130,8 @@
     private void initConnectionsHistoryCombo() {
         serverNameCombo.setEditable(true);
 
-        new AutoCompletionComboEditorDocument(serverNameCombo); // use autocompletion feature for ComboBox
+        JComboBox<Void> s = (JComboBox)serverNameCombo;
+        new AutoCompletionComboEditorDocument(s);   // use autocompletion feature for ComboBox
         serverNameCombo.setRenderer(new HostnameComboboxRenderer());
 
         ConnectionParams prototypeDisplayValue = new ConnectionParams();
@@ -307,38 +309,32 @@
         statusBar.setMessage(message);
     }
 
-    @SuppressWarnings("UnusedDeclaration")
     public void setPortNumber(int portNumber) {
         serverPortField.setText(String.valueOf(portNumber));
     }
 
-    @SuppressWarnings("UnusedDeclaration")
     public String getPortNumber() {
         return serverPortField.getText();
     }
 
-    @SuppressWarnings("UnusedDeclaration")
     public void setSshHostName(String sshHostName) {
         if (hasSshSupport) {
             sshHostField.setText(sshHostName);
         }
     }
 
-    @SuppressWarnings("UnusedDeclaration")
     public String getSshHostName() {
         if (hasSshSupport) {
             return sshHostField.getText();
         } else { return ""; }
     }
 
-    @SuppressWarnings("UnusedDeclaration")
     public void setSshPortNumber(int sshPortNumber) {
         if (hasSshSupport) {
             sshPortField.setText(String.valueOf(sshPortNumber));
         }
     }
 
-    @SuppressWarnings("UnusedDeclaration")
     public String getSshPortNumber() {
         if (hasSshSupport) {
             return sshPortField.getText();