Changeset 29541 in osm for applications/editors/josm/plugins/geochat/src/geochat/GeoChatPanel.java

Timestamp:

2013-04-28T22:52:00+02:00 (12 years ago)

Author:

zverik

Message:

updates

File:

• applications/editors/josm/plugins/geochat/src/geochat/GeoChatPanel.java (modified) (8 diffs)

applications/editors/josm/plugins/geochat/src/geochat/GeoChatPanel.java

@@ -2 +2 @@
 
 import java.awt.BorderLayout;
+import java.awt.Font;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -25 +27 @@
     private JTextField input;
     private JTabbedPane tabs;
-    private JPanel chatPanel;
     private JComponent noData;
     private JPanel loginPanel;
@@ -36 +37 @@
         chatPane = new JTextPane();
         chatPane.setEditable(false);
+        Font font = chatPane.getFont();
+        chatPane.setFont(font.deriveFont(font.getSize2D() - 2));
 
         noData = new JLabel(tr("Zoom in to see messages"), SwingConstants.CENTER);
 
         tabs = new JTabbedPane();
-        tabs.addTab(tr("Public"), noData);
+        tabs.addTab(tr("Public"), chatPane);
 
-        input = new JTextField();
+        input = new JTextField() {
+            @Override
+            protected void processKeyEvent( KeyEvent e ) {
+                if( e.getID() == KeyEvent.KEY_PRESSED ) {
+                    int code = e.getKeyCode();
+                    if( code == KeyEvent.VK_ENTER ) {
+                        String text = input.getText();
+                        if( text.length() > 0 ) {
+                            connection.postMessage(text);
+                            input.setText("");
+                        }
+                    } else if( code == KeyEvent.VK_TAB ) {
+                        // todo: autocomplete name
+                    } else if( code == KeyEvent.VK_ESCAPE ) {
+                        if( Main.map != null && Main.map.mapView != null )
+                            Main.map.mapView.requestFocus();
+                    }
+                    // Do not pass other events to JOSM
+                    if( code != KeyEvent.VK_LEFT && code != KeyEvent.VK_HOME && code != KeyEvent.VK_RIGHT
+                            && code != KeyEvent.VK_END && code != KeyEvent.VK_BACK_SPACE && code != KeyEvent.VK_DELETE )
+                        e.consume();
+                }
+                super.processKeyEvent(e);
+            }
 
-        gcPanel = new JPanel(new BorderLayout());
-        gcPanel.add(tabs, BorderLayout.CENTER);
-        gcPanel.add(input, BorderLayout.SOUTH);
+        };
 
-        loginPanel = new JPanel(new BorderLayout());
         final JTextField nameField = new JTextField();
         String userName = JosmUserIdentityManager.getInstance().getUserName();
@@ -55 +78 @@
         if( userName.contains("@") )
             userName = userName.substring(0, userName.indexOf('@'));
-        nameField.setText(name);
+        nameField.setText(userName);
 
         JButton loginButton = new JButton(tr("Login"));
@@ -64 +87 @@
         });
 
+        loginPanel = new JPanel(new BorderLayout());
         loginPanel.add(nameField, BorderLayout.CENTER);
         loginPanel.add(loginButton, BorderLayout.EAST);
+        loginPanel.add(Box.createVerticalGlue(), BorderLayout.NORTH);
+        loginPanel.add(Box.createVerticalGlue(), BorderLayout.SOUTH);
 
         gcPanel = new JPanel(new BorderLayout());
@@ -73 +99 @@
         // Start threads
         connection = ChatServerConnection.getInstance();
+        connection.addListener(this);
+        connection.checkLogin();
     }
 
     public void loggedIn( String userName ) {
-        gcPanel.remove(0);
-        gcPanel.add(tabs, 0);
+        if( gcPanel.getComponentCount() == 1 ) {
+            gcPanel.remove(0);
+            gcPanel.add(tabs, BorderLayout.CENTER);
+            gcPanel.add(input, BorderLayout.SOUTH);
+        }
     }
 
@@ -89 +120 @@
     public void statusChanged( boolean active ) {
         tabs.setComponentAt(0, active ? chatPane : noData);
+        repaint();
     }
 
@@ -99 +131 @@
             chatPane.setText("");
         }
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         for( ChatMessage msg : messages ) {
             sb.append('\n');