[Magicmap-commits] SF.net SVN: magicmap: [695] trunk/magicmapclient/src/net/sf/magicmap/client /gui/dialogs/ConnectServerDialog.java

[<fle...@us...>]

Revision: 695
          http://magicmap.svn.sourceforge.net/magicmap/?rev=695&view=rev
Author:   flederohr
Date:     2007-12-20 04:51:48 -0800 (Thu, 20 Dec 2007)

Log Message:
-----------
improved ServerDialog

Modified Paths:
--------------
    trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/ConnectServerDialog.java

Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/ConnectServerDialog.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/ConnectServerDialog.java	2007-11-30 15:38:32 UTC (rev 694)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/ConnectServerDialog.java	2007-12-20 12:51:48 UTC (rev 695)
@@ -11,7 +11,6 @@
 
 import javax.swing.ButtonGroup;
 import javax.swing.JButton;
-import javax.swing.JCheckBox;
 import javax.swing.JComboBox;
 import javax.swing.JDialog;
 import javax.swing.JLabel;
@@ -54,11 +53,11 @@
 
     private JRadioButton         useServer;
 
-    private JLabel useNoServerLabel;
+    private JLabel               useNoServerLabel;
 
-    private JSeparator seperator;
+    private JSeparator           seperator;
 
-    private ButtonGroup radioButtonGroup;
+    private ButtonGroup          radioButtonGroup;
 
     /**
      * Static method to create and open a ConnectServerDialog 
@@ -114,18 +113,18 @@
         builder.setTopBottomDistance("noserver", "header", 20);
         useNoServer.setActionCommand("USENOSERVER");
         useNoServer.addActionListener(this);
-        
+
         // Label f\xFCr "lokale Verbindung"
         useNoServerLabel = builder.addLabel(GUIUtils.i18n("nonserverconnect"), "noserverlabel");
         builder.setLeftRightDistance("noserverlabel", "noserver", 10);
         builder.setTopTopDistance("noserverlabel", "noserver", 0);
-        
+
         // Trennlinie
         seperator = builder.addSeparator("seperator");
         builder.setLeft("seperator", 3);
         builder.setRightRightDistance("seperator", null, -3);
         builder.setTopBottomDistance("seperator", "noserver,noserverlabel", 10);
-        
+
         // RadioButton f\xFCr "Server-Verbindung"
         useServer = new JRadioButton();
         builder.add(useServer, "server");
@@ -138,7 +137,7 @@
         // Hostname
         hostname = builder.addComboBox(Settings.getDefaultServerList(), "hostcombo");
         builder.addLabel(GUIUtils.i18n("hostname"), "hostlabel", hostname);
-        builder.setLeftLeftDistance("hostlabel","noserverlabel", 0);
+        builder.setLeftLeftDistance("hostlabel", "noserverlabel", 0);
         hostname.setEditable(true);
         builder.setLeftRightDistance("hostcombo", "hostlabel", 15);
         builder.setRightLeftDistance("hostcombo", "hostcombo", 178);
@@ -151,7 +150,7 @@
         // Port
         port = builder.addTextField("portedit");
         builder.addLabel(GUIUtils.i18n("port"), "portlabel", port);
-        builder.setLeftRightDistance("portlabel","hostcombo", 10);
+        builder.setLeftRightDistance("portlabel", "hostcombo", 10);
         builder.setLeftRightDistance("portedit", "portlabel", 5);
         builder.setTopTopDistance("portlabel", "hostlabel,hostcombo", 0);
         builder.setTopTopDistance("portedit", "hostlabel,hostcombo", 0);
@@ -161,8 +160,8 @@
         // Clientname
         clientname = builder.addTextField("clientname");
         builder.addLabel(GUIUtils.i18n("clientname"), "clientlabel", clientname);
-        builder.setLeftLeftDistance("clientlabel","hostlabel", 0);
-        builder.setLeftLeftDistance("clientname","hostcombo", 0);
+        builder.setLeftLeftDistance("clientlabel", "hostlabel", 0);
+        builder.setLeftLeftDistance("clientname", "hostcombo", 0);
         builder.setRightRightDistance("clientname", "hostcombo", 0);
         builder.setTopBottomDistance("clientlabel", "hostlabel,hostcombo", 10);
         builder.setTopBottomDistance("clientname", "hostlabel,hostcombo", 10);
@@ -172,8 +171,8 @@
         password = new JPasswordField();
         builder.add(password, "password");
         builder.addLabel(GUIUtils.i18n("password"), "passwordlabel", password);
-        builder.setLeftLeftDistance("passwordlabel","clientlabel", 0);
-        builder.setLeftLeftDistance("password","clientname", 0);
+        builder.setLeftLeftDistance("passwordlabel", "clientlabel", 0);
+        builder.setLeftLeftDistance("password", "clientname", 0);
         builder.setRightRightDistance("password", "hostcombo", 0);
         builder.setTopBottomDistance("passwordlabel", "clientlabel,clientname", 10);
         builder.setTopBottomDistance("password", "clientlabel,clientname", 10);
@@ -183,7 +182,7 @@
         radioButtonGroup = new ButtonGroup();
         radioButtonGroup.add(useNoServer);
         radioButtonGroup.add(useServer);
-        
+
         // OK / Abbrechen        
         if (info.useNoServer)
             ok = builder.createButton(GUIUtils.i18n("continue"), "OK", this);
@@ -197,7 +196,7 @@
         builder.setBottomBottomDistance("okcancel", null, -10);
 
         // Defaults setzen
-        this.password.setText(serverConnectionInfo.password);
+        //        this.password.setText(serverConnectionInfo.password);
         this.clientname.setText(serverConnectionInfo.name);
         this.hostname.setSelectedItem(serverConnectionInfo.hostname);
         this.port.setText("" + serverConnectionInfo.port);
@@ -222,6 +221,10 @@
             serverConnectionInfo.password = new String(this.password.getPassword());
             serverConnectionInfo.name = this.clientname.getText();
             serverConnectionInfo.useNoServer = this.useNoServer.isSelected();
+            if (useNoServer.isSelected()) {
+                if (serverConnectionInfo.name == "") serverConnectionInfo.name = System.getProperty("user.name");
+                serverConnectionInfo.password = System.getProperty("user.name");
+            }
             try {
                 serverConnectionInfo.port = Integer.parseInt(this.port.getText());
             } catch (NumberFormatException n) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.