Changeset 29576 in osm for applications/editors

Timestamp:

2013-05-09T23:29:49+02:00 (12 years ago)

Author:

zverik

Message:

[josm_geochat] fixed some things, added logout and copy

Location:

applications/editors/josm

Files:

• dist/geochat.jar (modified) ( previous)
• plugins/geochat/src/geochat/ChatPaneManager.java (modified) (6 diffs)
• plugins/geochat/src/geochat/ChatServerConnection.java (modified) (5 diffs)
• plugins/geochat/src/geochat/GeoChatPanel.java (modified) (8 diffs)
• plugins/geochat/src/geochat/GeoChatPopupAdapter.java (modified) (3 diffs)
• plugins/geochat/src/geochat/JPanelTextField.java (modified) (2 diffs)

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

@@ -1 +1 @@
 package geochat;
 
+import java.awt.Color;
 import java.awt.Component;
 import java.awt.Font;
@@ -72 +73 @@
     }
 
-    private void addLineToChatPane( String userName, String line, boolean italic ) {
+    public static int MESSAGE_TYPE_DEFAULT = 0;
+    public static int MESSAGE_TYPE_INFORMATION = 1;
+    public static int MESSAGE_TYPE_ATTENTION = 2;
+    private static Color COLOR_ATTENTION = new Color(0, 0, 192);
+
+    private void addLineToChatPane( String userName, String line, int messageType ) {
         if( line.length() == 0 )
             return;
@@ -82 +88 @@
         try {
             SimpleAttributeSet attrs = null;
-            if( italic ) {
+            if( messageType != MESSAGE_TYPE_DEFAULT ) {
                 attrs = new SimpleAttributeSet();
-                StyleConstants.setItalic(attrs, true);
+                if( messageType == MESSAGE_TYPE_INFORMATION )
+                    StyleConstants.setItalic(attrs, true);
+                else if( messageType == MESSAGE_TYPE_ATTENTION )
+                    StyleConstants.setForeground(attrs, COLOR_ATTENTION);
             }
             doc.insertString(doc.getLength(), line, attrs);
@@ -94 +103 @@
 
     public void addLineToChatPane( String userName, String line ) {
-        addLineToChatPane(userName, line, false);
+        addLineToChatPane(userName, line, MESSAGE_TYPE_DEFAULT);
     }
 
@@ -101 +110 @@
     }
 
+    public void addLineToPublic( String line, int messageType ) {
+        addLineToChatPane(PUBLIC_PANE, line, messageType);
+    }
+
     public void clearPublicChatPane() {
         chatPanes.get(PUBLIC_PANE).pane.setText("");
-        showNearbyUsers();
-    }
-
-    private void showNearbyUsers() {
-        if( !panel.users.isEmpty() ) {
-            StringBuilder sb = new StringBuilder(tr("Users mapping nearby:"));
-            boolean first = true;
-            for( String user : panel.users.keySet() ) {
-                sb.append(first ? " " : ", ");
-                sb.append(user);
-            }
-            addLineToPublic(sb.toString());
-        }
     }
 
@@ -192 +192 @@
     }
     
+    public boolean hasSelectedText() {
+        String user = getActiveChatPane();
+        if( user != null ) {
+            JTextPane pane = chatPanes.get(user).pane;
+            return pane.getSelectedText() != null;
+        }
+        return false;
+    }
+
+    public void copySelectedText() {
+        String user = getActiveChatPane();
+        if( user != null )
+            chatPanes.get(user).pane.copy();
+    }
+    
 
     private class ChatTabTitleComponent extends JLabel {

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

@@ -1 +1 @@
 package geochat;
 
+import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.*;
-import javax.swing.SwingUtilities;
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -143 +143 @@
     }
 
+    /**
+     * Unregister the current user and do not call listeners.
+     * Makes synchronous request to the server.
+     */
+    public void bruteLogout() throws IOException {
+        if( isLoggedIn() )
+            JsonQueryUtil.query("logout&uid=" + userId);
+    }
+
     private void fireMessageFailed( String reason ) {
         for( ChatServerConnectionListener listener : listeners )
@@ -248 +257 @@
 
         public void run() {
+//            lastId = Main.pref.getLong("geochat.lastid", 0);
             int interval = Main.pref.getInteger("geochat.interval", 2);
             while( !stopping ) {
@@ -281 +291 @@
                 // reset messages
                 lastId = 0;
+//                Main.pref.put("geochat.lastid", null);
                 needReset = true;
             } else
@@ -322 +333 @@
                         }
                     }
+//                    if( lastId > 0 && Main.pref.getBoolean("geochat.store.lastid", true) )
+//                        Main.pref.putLong("geochat.lastid", lastId);
                 }
             });

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

@@ -52 +52 @@
 
             @Override
-            protected String autoComplete( String word ) {
-                return autoCompleteUser(word);
+            protected String autoComplete( String word, boolean atStart ) {
+                return autoCompleteUser(word, atStart);
             }
         };
@@ -103 +103 @@
     }
 
-    private String autoCompleteUser( String word ) {
+    @Override
+    public void destroy() {
+        try {
+            if( Main.pref.getBoolean("geochat.logout.on.close", true) ) {
+                connection.removeListener(this);
+                connection.bruteLogout();
+            }
+        } catch( Throwable e ) {
+            Main.warn("Failed to logout from geochat server: " + e.getMessage());
+        }
+        super.destroy();
+    }
+
+    private String autoCompleteUser( String word, boolean atStart ) {
         String result = null;
+        boolean singleUser = true;
         for( String user : users.keySet() ) {
             if( user.startsWith(word) ) {
@@ -110 +124 @@
                     result = user;
                 else {
+                    singleUser = false;
                     int i = word.length();
                     while( i < result.length() && i < user.length() && result.charAt(i) == user.charAt(i) )
@@ -118 +133 @@
             }
         }
-        return result;
+        return result == null ? null : !singleUser ? result : atStart ? result + ": " : result + " ";
     }
 
@@ -159 +174 @@
         if( !isDialogInCollapsedView() && alarmLevel > 1 )
             alarmLevel = 1;
-        String name = users.isEmpty() ? tr("GeoChat") :
+        String title = users.isEmpty() ? tr("GeoChat") :
                 trn("GeoChat ({0} user)", "GeoChat ({0} users)", users.size(), users.size());
         String alarm = alarmLevel <= 0 ? "" : alarmLevel == 1 ? "* " : "!!! ";
-        setTitle(alarm + name);
+        setTitle(alarm + title);
     }
 
@@ -218 +233 @@
         for( String uname : this.users.keySet() ) {
             if( !newUsers.containsKey(uname) )
-                chatPanes.addLineToPublic(tr("User {0} has left", uname));
+                chatPanes.addLineToPublic(tr("User {0} has left", uname), ChatPaneManager.MESSAGE_TYPE_INFORMATION);
         }
         for( String uname : newUsers.keySet() ) {
             if( !this.users.containsKey(uname) )
-                chatPanes.addLineToPublic(tr("User {0} is mapping nearby", uname));
+                chatPanes.addLineToPublic(tr("User {0} is mapping nearby", uname), ChatPaneManager.MESSAGE_TYPE_INFORMATION);
         }
         this.users = newUsers;
@@ -254 +269 @@
                     sb.setLength(0);
                     formatMessage(sb, msg);
-                    chatPanes.addLineToPublicEm(sb.toString());
+                    chatPanes.addLineToPublic(sb.toString(), ChatPaneManager.MESSAGE_TYPE_ATTENTION);
                     sb.setLength(0);
                 } else
@@ -262 +277 @@
             if( alarm > 0 )
                 chatPanes.notify(null, alarm);
+        }
+        if( replace )
+            showNearbyUsers();
+    }
+
+    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);
+            }
+            chatPanes.addLineToPublic(sb.toString(), ChatPaneManager.MESSAGE_TYPE_INFORMATION);
         }
     }

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

@@ -43 +43 @@
 
         JPopupMenu menu = new JPopupMenu();
+        if( panel.chatPanes.hasSelectedText() )
+            menu.add(new CopyTextAction());
         menu.add(new JCheckBoxMenuItem(new ToggleUserLayerAction()));
         if( userMenu.getItemCount() > 0 )
@@ -49 +51 @@
             menu.add(new CloseTabAction());
 //        menu.add(new ClearPaneAction());
-//        menu.add(new LogoutAction());
+        menu.add(new LogoutAction());
         return menu;
     }
@@ -118 +120 @@
         }
     }
+
+    private class CopyTextAction extends AbstractAction {
+        public CopyTextAction() {
+            super(tr("Copy"));
+//            putValue(SMALL_ICON, ImageProvider.get("help"));
+        }
+
+        public void actionPerformed( ActionEvent e ) {
+            panel.chatPanes.copySelectedText();
+        }
+    }
 }

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

@@ -37 +37 @@
                     start--;
                 start++;
-                System.out.println("Autocomplete! Word " + start + "-" + caret + " (not inclusive)");
                 if( start < caret ) {
                     String word = text.substring(start, caret);
-                    String complete = word == null ? null : autoComplete(word);
+                    String complete = word == null ? null : autoComplete(word, start == 0);
                     if( complete != null && !complete.equals(word) ) {
                         StringBuilder sb = new StringBuilder();
@@ -75 +74 @@
      * @return The whole word.
      */
-    protected String autoComplete( String word ) {
+    protected String autoComplete( String word, boolean atStart ) {
         return word;
     }