Changeset 29558 in osm for applications/editors/josm/plugins

Timestamp:

2013-05-05T11:36:55+02:00 (11 years ago)

Author:

zverik

Message:

private chat should work

Location:

applications/editors/josm/plugins/geochat

Files:

• images/dialogs (added)
• images/dialogs/geochat.png (added)
• src/geochat/ChatMessage.java (modified) (3 diffs)
• src/geochat/ChatServerConnection.java (modified) (6 diffs)
• src/geochat/ChatServerConnectionListener.java (modified) (2 diffs)
• src/geochat/GeoChatPanel.java (modified) (10 diffs)
• src/geochat/JsonQueryUtil.java (modified) (1 diff)

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

@@ -13 +13 @@
     private Date time;
     private String author;
+    private String recipient;
     private String message;
     private long id;
@@ -24 +25 @@
         this.time = time;
         this.priv = false;
+        this.recipient = null;
+    }
+
+    public void setRecipient( String recipient ) {
+        this.recipient = recipient;
     }
 
@@ -32 +38 @@
     public String getAuthor() {
         return author;
+    }
+
+    /**
+     * Is only set when the message is not incoming, that is, author is the current user.
+     */
+    public String getRecipient() {
+        return recipient;
     }
 

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

@@ -4 +4 @@
 import java.net.URLEncoder;
 import java.util.*;
+import javax.swing.SwingUtilities;
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -113 +114 @@
     }
 
+    private void logoutIntl() {
+        ChatServerConnection.this.userId = 0;
+        ChatServerConnection.this.userName = null;
+        Main.pref.put("geochat.lastuid", null);
+        for( ChatServerConnectionListener listener : listeners )
+            listener.notLoggedIn(null);
+    }
+
     private void fireLoginFailed( String reason ) {
         for( ChatServerConnectionListener listener : listeners )
@@ -128 +137 @@
             public void processJson( JSONObject json ) {
                 if( json != null && json.has("message") ) {
-                    ChatServerConnection.this.userId = 0;
-                    ChatServerConnection.this.userName = null;
-                    Main.pref.put("geochat.lastuid", null);
+                    logoutIntl();
                 }
             }
@@ -279 +286 @@
             lastUserId = userId;
             lastPosition = pos;
-
+            
             String query = "get&lat=" + pos.latToString(CoordinateFormat.DECIMAL_DEGREES)
                     + "&lon=" + pos.lonToString(CoordinateFormat.DECIMAL_DEGREES)
@@ -285 +292 @@
             JsonQueryUtil.queryAsync(query, new JsonQueryCallback() {
                 public void processJson( JSONObject json ) {
-                    if( json == null )
-                        fireLoginFailed(tr("Could not get server response, check logs"));
-                    else if( json.has("error") )
-                        fireLoginFailed(tr("Failed to login as {0}:", userName) + "\n" + json.getString("error"));
-                    else {
+                    if( json == null ) {
+                        // do nothing?
+//                        fireLoginFailed(tr("Could not get server response, check logs"));
+//                        logoutIntl(); // todo: uncomment?
+                    } else if( json.has("error") ) {
+                        fireLoginFailed(tr("Failed to get messages as {0}:", userName) + "\n" + json.getString("error"));
+                        logoutIntl();
+                    } else {
                         if( json.has("users") ) {
                             Map<String, LatLon> users = parseUsers(json.getJSONArray("users"));
@@ -329 +339 @@
                     ChatMessage cm = new ChatMessage(id, new LatLon(lat, lon), author, message, new Date(timeStamp * 1000));
                     cm.setPrivate(priv);
+                    if( msg.has("recipient") && !msg.getBoolean("incoming") )
+                        cm.setRecipient(msg.getString("recipient"));
                     result.add(cm);
                 } catch( JSONException e ) {

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

@@ -18 +18 @@
     /**
      * User tried to log in, but failed.
-     * @param reason Why.
+     * @param reason Why. <tt>null</tt> if it is intended logout.
      */
     void notLoggedIn( String reason );
@@ -50 +50 @@
      * New private messages were received. See {@link #receivedMessages(boolean, java.util.List)}.
      * Note that the array of messages can be reset, for example, when user has changed.
+     * Also, private messages go both way: check the recipient field.
      * @param replace if set, remove all old messages.
      * @param messages list of new private messages.

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

@@ -1 +1 @@
 package geochat;
 
-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.awt.*;
+import java.awt.event.*;
+import java.awt.geom.Rectangle2D;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.logging.*;
+import java.util.List;
 import javax.swing.*;
 import javax.swing.text.BadLocationException;
+import javax.swing.text.DefaultCaret;
 import javax.swing.text.Document;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.gui.JosmUserIdentityManager;
+import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
+import org.openstreetmap.josm.gui.layer.MapViewPaintable;
+import org.openstreetmap.josm.tools.GBC;
 import static org.openstreetmap.josm.tools.I18n.tr;
 import static org.openstreetmap.josm.tools.I18n.trn;
+import org.openstreetmap.josm.tools.ImageProvider;
 
 /**
@@ -23 +27 @@
  * @author zverik
  */
-public class GeoChatPanel extends ToggleDialog implements ChatServerConnectionListener {
-
-    private JTextPane chatPane;
+public class GeoChatPanel extends ToggleDialog implements ChatServerConnectionListener, MapViewPaintable {
+    private static final String PUBLIC_PANE = "Public Pane";
+
     private JTextField input;
     private JTabbedPane tabs;
@@ -33 +37 @@
     private ChatServerConnection connection;
     private Map<String, LatLon> users;
+    private Map<String, ChatLogEntry> chatPanes;
     
     public GeoChatPanel() {
         super(tr("GeoChat"), "geochat", tr("Open GeoChat panel"), null, 200, true);
 
-        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);
 
+        chatPanes = new HashMap<String, ChatLogEntry>();
         tabs = new JTabbedPane();
-        tabs.addTab(tr("Public"), new JScrollPane(chatPane, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER));
+        createChatPane(null);
+
+        tabs.addMouseListener(new MouseAdapter() {
+            @Override public void mousePressed( MouseEvent e ) { check(e); }
+            @Override public void mouseReleased( MouseEvent e ) { check(e); }
+
+            private void check( MouseEvent e ) {
+                if( e.isPopupTrigger() ) {
+                    createPopupMenu().show(tabs, e.getX(), e.getY());
+                }
+            }
+        });
 
         input = new JPanelTextField() {
             @Override
             protected void processEnter( String text ) {
-                connection.postMessage(text);
+                connection.postMessage(text, getRecipient());
             }
 
@@ -78 +90 @@
             }
         });
-
-        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);
+        nameField.setPreferredSize(new Dimension(nameField.getPreferredSize().width, loginButton.getPreferredSize().height));
+
+//        loginPanel = new JPanel(new BorderLayout());
+//        loginPanel.add(nameField, BorderLayout.CENTER);
+//        loginPanel.add(loginButton, BorderLayout.EAST);
+        loginPanel = new JPanel(new GridBagLayout());
+        loginPanel.add(nameField, GBC.std().fill(GridBagConstraints.HORIZONTAL).insets(15, 0, 5, 0));
+        loginPanel.add(loginButton, GBC.std().fill(GridBagConstraints.NONE).insets(0, 0, 15, 0));
 
         gcPanel = new JPanel(new BorderLayout());
@@ -89 +103 @@
         createLayout(gcPanel, false, null);
 
-        users = new HashMap<String, LatLon>();
+        users = new TreeMap<String, LatLon>();
         // Start threads
         connection = ChatServerConnection.getInstance();
@@ -95 +109 @@
         connection.checkLogin();
     }
-
-    private void addLineToPublic( String line ) {
-        Document doc = chatPane.getDocument();
+    
+    private JPopupMenu createPopupMenu() {
+        JMenu userMenu = new JMenu(tr("Private chat"));
+        for( String user : users.keySet() ) {
+            if( !chatPanes.containsKey(user) )
+                userMenu.add(new PrivateChatAction(user));
+        }
+
+        JPopupMenu menu = new JPopupMenu();
+        menu.add(new JCheckBoxMenuItem(new ToggleUserLayerAction()));
+        if( userMenu.getComponentCount() > 0 )
+            menu.add(userMenu);
+        if( getRecipient() != null )
+            menu.add(new CloseTabAction());
+        menu.add(new ClearPaneAction());
+        menu.add(new LogoutAction());
+        return menu;
+    }
+
+    private void addLineToChatPane( String userName, String line ) {
+        if( !chatPanes.containsKey(userName) )
+            createChatPane(userName);
+        if( !line.startsWith("\n") )
+            line = "\n" + line;
+        Document doc = chatPanes.get(userName).pane.getDocument();
         try {
             doc.insertString(doc.getLength(), line, null);
@@ -105 +141 @@
     }
 
+    private void addLineToPublic( String line ) {
+        addLineToChatPane(PUBLIC_PANE, line);
+    }
+
+    private void clearPublicChatPane() {
+        chatPanes.get(PUBLIC_PANE).pane.setText("");
+        showNearbyUsers();
+    }
+
+    private void clearChatPane( String userName) {
+        if( userName == null || userName.equals(PUBLIC_PANE) )
+            clearPublicChatPane();
+        else
+            chatPanes.get(userName).pane.setText("");
+    }
+
+    private ChatLogEntry createChatPane( String userName ) {
+        JTextPane chatPane = new JTextPane();
+        chatPane.setEditable(false);
+        Font font = chatPane.getFont();
+        chatPane.setFont(font.deriveFont(font.getSize2D() - 2));
+        DefaultCaret caret = (DefaultCaret)chatPane.getCaret();
+        caret.setUpdatePolicy(DefaultCaret.ALWAYS_UPDATE);
+        JScrollPane scrollPane = new JScrollPane(chatPane, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+
+        ChatLogEntry entry = new ChatLogEntry();
+        entry.pane = chatPane;
+        entry.component = scrollPane;
+        entry.notify = false;
+        entry.userName = userName;
+        entry.isPublic = userName == null;
+        chatPanes.put(userName == null ? PUBLIC_PANE : userName, entry);
+
+        tabs.addTab(userName == null ? tr("Public") : userName, scrollPane);
+        tabs.setSelectedComponent(scrollPane);
+        return entry;
+    }
+
+    /**
+     * Returns key in chatPanes hash map for the currently active
+     * chat pane, or null in case of an error.
+     */
+    private String getActiveChatPane() {
+        Component c = tabs.getSelectedComponent();
+        if( c == null )
+            return null;
+        for( String user : chatPanes.keySet() )
+            if( c.equals(chatPanes.get(user).component) )
+                return user;
+        return null;
+    }
+
+    private String getRecipient() {
+        String user = getActiveChatPane();
+        return user == null || user.equals(PUBLIC_PANE) ? null : user;
+    }
+
+    private void closeChatPane( String user ) {
+        if( user == null || user.equals(PUBLIC_PANE) || !chatPanes.containsKey(user) )
+            return;
+        tabs.remove(chatPanes.get(user).component);
+        chatPanes.remove(user);
+    }
+
+    private void closePrivateChatPanes() {
+        List<String> entries = new ArrayList<String>(chatPanes.keySet());
+        for( String user : entries )
+            if( !user.equals(PUBLIC_PANE) )
+                closeChatPane(user);
+    }
+
     private String cachedTitle = "";
     private int cachedAlarm = 0;
 
+    @Override
     public void setTitle( String title ) {
         setTitle(title, -1);
@@ -125 +233 @@
     }
 
+    public void paint( Graphics2D g, MapView mv, Bounds bbox ) {
+        Graphics2D g2d = (Graphics2D)g.create();
+        g2d.setColor(Color.yellow);
+        g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.3f));
+
+        int zoom = ChatServerConnection.getCurrentZoom();
+        int radius = Math.max(zoom, 1) * 10;
+        if( zoom < 14 )
+            radius /= 2;
+
+        Font font = g2d.getFont().deriveFont(Math.min(zoom * 2, 8));
+        g2d.setFont(font);
+        FontMetrics fm = g2d.getFontMetrics();
+
+        for( String user : users.keySet() ) {
+            Point p = mv.getPoint(users.get(user));
+            g2d.setColor(Color.yellow);
+            g2d.fillOval(p.x - radius, p.y - radius, radius * 2 + 1, radius * 2 + 1);
+
+            g2d.setColor(Color.black);
+            Rectangle2D rect = fm.getStringBounds(user, g2d);
+            g2d.drawString(user, p.x - Math.round(rect.getWidth() / 2), p.y);
+        }
+    }
+
     public void loggedIn( String userName ) {
         if( gcPanel.getComponentCount() == 1 ) {
@@ -133 +266 @@
     }
 
-    public void notLoggedIn( String reason ) {
-        JOptionPane.showMessageDialog(Main.parent, reason);
-    }
-
-    public void messageSendFailed( String reason ) {
+    public void notLoggedIn( final String reason ) {
+        if( reason != null ) {
+            SwingUtilities.invokeLater(new Runnable() {
+                public void run() {
+                    JOptionPane.showMessageDialog(Main.parent, reason);
+                }
+            });
+        } else {
+            // regular logout
+            if( gcPanel.getComponentCount() > 1 ) {
+                gcPanel.removeAll();
+                gcPanel.add(loginPanel, BorderLayout.CENTER);
+            }
+        }
+    }
+
+    public void messageSendFailed( final String reason ) {
+        SwingUtilities.invokeLater(new Runnable() {
+            public void run() {
+                JOptionPane.showMessageDialog(Main.parent, reason);
+            }
+        });
     }
 
     public void statusChanged( boolean active ) {
-        tabs.setComponentAt(0, active ? chatPane : noData);
+        // only the public tab, because private chats don't rely on coordinates
+        tabs.setComponentAt(0, active ? chatPanes.get(PUBLIC_PANE).component : noData);
         repaint();
     }
 
-    public void updateUsers( Map<String, LatLon> users ) {
-        for( String name : this.users.keySet() ) {
-            if( !users.containsKey(name) )
-                addLineToPublic(tr("User {0} has left", name));
-        }
-        for( String name : users.keySet() ) {
-            if( !this.users.containsKey(name) )
-                addLineToPublic(tr("User {0} is mapping nearby", name));
-        }
-        // todo: update header with user count
-        setTitle(trn("GeoChat ({0} user)", "GeoChat ({0} users)", users.size(), users.size()));
+    public void updateUsers( Map<String, LatLon> newUsers ) {
+        for( String uname : this.users.keySet() ) {
+            if( !newUsers.containsKey(uname) )
+                addLineToPublic(tr("User {0} has left", uname));
+        }
+        for( String uname : newUsers.keySet() ) {
+            if( !this.users.containsKey(uname) )
+                addLineToPublic(tr("User {0} is mapping nearby", uname));
+        }
+        setTitle(trn("GeoChat ({0} user)", "GeoChat ({0} users)", newUsers.size(), newUsers.size()));
         // todo: update users location
-        this.users = users;
+        this.users = newUsers;
+    }
+
+    private void showNearbyUsers() {
+        if( !users.isEmpty() ) {
+            StringBuilder sb = new StringBuilder(tr("Users mapping nearby:"));
+            boolean first = true;
+            for( String user : users.keySet() ) {
+                sb.append(first ? " " : ", ");
+                sb.append(user);
+            }
+            addLineToPublic(sb.toString());
+        }
     }
 
     private final SimpleDateFormat TIME_FORMAT = new SimpleDateFormat("HH:mm");
+
+    private void formatMessage( StringBuilder sb, ChatMessage msg ) {
+        sb.append("\n");
+        sb.append('[').append(TIME_FORMAT.format(msg.getTime())).append("] ");
+        sb.append(msg.getAuthor()).append(": ").append(msg.getMessage());
+    }
+
     public void receivedMessages( boolean replace, List<ChatMessage> messages ) {
-        if( replace ) {
-            chatPane.setText("");
-        }
-        StringBuilder sb = new StringBuilder();
+        if( replace )
+            clearPublicChatPane();
+        if( !messages.isEmpty() ) {
+            StringBuilder sb = new StringBuilder();
+            for( ChatMessage msg : messages )
+                formatMessage(sb, msg);
+            addLineToPublic(sb.toString());
+        }
+    }
+
+    public void receivedPrivateMessages( boolean replace, List<ChatMessage> messages ) {
+        if( replace )
+            closePrivateChatPanes();
         for( ChatMessage msg : messages ) {
-            sb.append('\n');
-            sb.append('[').append(TIME_FORMAT.format(msg.getTime())).append("] ");
-            sb.append(msg.getAuthor()).append(": ").append(msg.getMessage());
-        }
-        addLineToPublic(sb.toString());
-    }
-
-    public void receivedPrivateMessages( boolean replace, List<ChatMessage> messages ) {
+            StringBuilder sb = new StringBuilder();
+            formatMessage(sb, msg);
+            addLineToChatPane(msg.getRecipient() != null ? msg.getRecipient() : msg.getAuthor(), sb.toString());
+        }
     }
 
@@ -206 +380 @@
         protected String autoComplete( String word ) { return word; }
     }
+
+    private class ChatLogEntry {
+        public String userName;
+        public boolean isPublic;
+        public JTextPane pane;
+        public JScrollPane component;
+        public boolean notify;
+    }
+
+    private class PrivateChatAction extends AbstractAction {
+        private String userName;
+
+        public PrivateChatAction( String userName ) {
+            super(userName);
+            this.userName = userName;
+        }
+
+        public void actionPerformed( ActionEvent e ) {
+            if( !chatPanes.containsKey(userName) ) {
+                ChatLogEntry entry = createChatPane(userName);
+            }
+        }
+    }
+
+    private class CloseTabAction extends AbstractAction {
+        public CloseTabAction() {
+            super(tr("Close tab"));
+            putValue(SMALL_ICON, ImageProvider.get("help"));
+        }
+
+        public void actionPerformed( ActionEvent e ) {
+            String pane = getActiveChatPane();
+            if( pane != null && !pane.equals(PUBLIC_PANE) )
+                closeChatPane(pane);
+        }
+    }
+
+    private class LogoutAction extends AbstractAction {
+        public LogoutAction() {
+            super(tr("Logout"));
+            putValue(SMALL_ICON, ImageProvider.get("help"));
+        }
+
+        public void actionPerformed( ActionEvent e ) {
+            connection.logout();
+        }
+    }
+
+    private class ClearPaneAction extends AbstractAction {
+        public ClearPaneAction() {
+            super(tr("Clear log"));
+            putValue(SMALL_ICON, ImageProvider.get("help"));
+        }
+
+        public void actionPerformed( ActionEvent e ) {
+            clearChatPane(getActiveChatPane());
+        }
+    }
+
+    private class ToggleUserLayerAction extends AbstractAction {
+        public ToggleUserLayerAction() {
+            super(tr("Show users on map"));
+            putValue(SMALL_ICON, ImageProvider.get("help"));
+        }
+
+        public void actionPerformed( ActionEvent e ) {
+            if( Main.map == null || Main.map.mapView == null )
+                return;
+            boolean wasAdded = Main.map.mapView.addTemporaryLayer(GeoChatPanel.this);
+            if( !wasAdded )
+                Main.map.mapView.removeTemporaryLayer(GeoChatPanel.this);
+            Main.map.mapView.repaint();
+            if( e.getSource() != null )
+                System.out.println("toggle source: " + e.getSource().getClass().getName());
+            if( e.getSource() instanceof JCheckBoxMenuItem )
+                ((JCheckBoxMenuItem)e.getSource()).setSelected(wasAdded);
+        }
+    }
 }

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

@@ -29 +29 @@
             String serverURL = Main.pref.get("geochat.server", "http://zverik.dev.openstreetmap.org/osmochat.php?action=");
             URL url = new URL(serverURL + query);
-//            System.out.println("GeoChat URL = " + url.toString());
+            System.out.println("GeoChat URL = " + url.toString());
             HttpURLConnection connection = (HttpURLConnection)url.openConnection();
             connection.connect();