Changeset 29571 in osm for applications/editors/josm/plugins/geochat/src/geochat/ChatPaneManager.java

Timestamp:

2013-05-09T21:00:19+02:00 (11 years ago)

Author:

zverik

Message:

[josm_geochat] autocomplete works, notification was redone slightly

File:

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

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

@@ -7 +7 @@
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import javax.swing.text.BadLocationException;
-import javax.swing.text.DefaultCaret;
-import javax.swing.text.Document;
+import javax.swing.text.*;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -53 +51 @@
         int alarm = 0;
         for( ChatPane entry : chatPanes.values() ) {
-            if( entry.notify ) {
-                if( entry.isPublic && alarm < 1 )
-                    alarm = 1;
-                else if( !entry.isPublic )
-                    alarm = 2;
-            }
+            if( entry.notify > alarm )
+                alarm = entry.notify;
         }
         return alarm;
@@ -68 +62 @@
     }
 
-    public void notify( String user, boolean really ) {
-//        if( user == null && !really && !collapsed )
-//            return;
-        if( !hasUser(user) )
+    public void notify( String user, int alarmLevel ) {
+        if( alarmLevel <= 0 || !hasUser(user) )
             return;
         ChatPane entry = chatPanes.get(user == null ? PUBLIC_PANE : user);
-        System.out.println("Notifying " + user);
-        entry.notify = true;
+        entry.notify = alarmLevel;
         int idx = tabs.indexOfComponent(entry.component);
         if( idx >= 0 )
@@ -82 +73 @@
 
     public void addLineToChatPane( String userName, String line ) {
+        if( line.length() == 0 )
+            return;
         if( !chatPanes.containsKey(userName) )
             createChatPane(userName);
@@ -98 +91 @@
     }
 
+    /**
+     * Special case: the line contains username, so it must be highlighted.
+     */
+    public void addLineToPublicEm( String line ) {
+        if( !line.startsWith("\n") )
+            line = "\n" + line;
+        Document doc = chatPanes.get(PUBLIC_PANE).pane.getDocument();
+        try {
+            SimpleAttributeSet attrs = new SimpleAttributeSet();
+            StyleConstants.setItalic(attrs, true);
+            doc.insertString(doc.getLength(), line, attrs);
+        } catch( BadLocationException ex ) {
+            // whatever
+        }
+    }
+
     public void clearPublicChatPane() {
         chatPanes.get(PUBLIC_PANE).pane.setText("");
@@ -139 +148 @@
         entry.pane = chatPane;
         entry.component = scrollPane;
-        entry.notify = false;
+        entry.notify = 0;
         entry.userName = userName;
         entry.isPublic = userName == null;
@@ -207 +216 @@
                 boldFont = getFont().deriveFont(Font.BOLD);
             }
-            System.out.println("clauses: collapsed=" + collapsed + ", tabs:" + tabs.getSelectedIndex() + "=" + tabs.indexOfComponent(entry.component));
-            if( entry.notify && !collapsed && tabs.getSelectedIndex() == tabs.indexOfComponent(entry.component) )
-                entry.notify = false;
-            setFont(entry.notify ? boldFont : normalFont);
+            if( entry.notify > 0 && !collapsed && tabs.getSelectedIndex() == tabs.indexOfComponent(entry.component) )
+                entry.notify = 0;
+            setFont(entry.notify > 0 ? boldFont : normalFont);
             panel.updateTitleAlarm();
         }
@@ -220 +228 @@
         public JTextPane pane;
         public JScrollPane component;
-        public boolean notify;
+        public int notify;
 
     }