Merge branch 'master' into multiroom

mityada · mityada · commit caccd11d0dab · 2016-12-11T00:48:44.000+03:00
diff --git a/Chat/src/main/java/ru/ifmo/neerc/chat/client/ChannelsPanel.java b/Chat/src/main/java/ru/ifmo/neerc/chat/client/ChannelsPanel.java
@@ -41,7 +41,10 @@ public void mouseClicked(MouseEvent e) {
                 if (e.getClickCount() % 2 != 0)
                     return;
 
-                String channel = (String)list.getSelectedValue();
+                String channel = list.getSelectedValue();
+                if (channel == null)
+                    return;
+
                 if (channelList.isSubscribed(channel))
                     channelList.unsubscribeFrom(channel);
                 else
@@ -102,6 +105,8 @@ public Component getListCellRendererComponent(JList list, Object value, int inde
             setBackground(list.getBackground());
             setForeground(list.getForeground());
             setText(channel);
+
+            setBorderPainted(true);
             setBorder((cellHasFocus) ? UIManager.getBorder("List.focusCellHighlightBorder") : noFocusBorder);
 
             return this;
diff --git a/Chat/src/main/java/ru/ifmo/neerc/chat/client/UsersPanel.java b/Chat/src/main/java/ru/ifmo/neerc/chat/client/UsersPanel.java
@@ -120,7 +120,12 @@ public void userPresenceChanged(UserEntry userEntry) {
 
         private void update() {
             init();
-            fireContentsChanged(this, 0, userEntries.length);
+            SwingUtilities.invokeLater(new Runnable() {
+                @Override
+                public void run() {
+                    fireContentsChanged(this, 0, getSize());
+                }
+            });
         }
     }
 
diff --git a/Chat/src/main/java/ru/ifmo/neerc/chat/xmpp/XmppChat.java b/Chat/src/main/java/ru/ifmo/neerc/chat/xmpp/XmppChat.java
@@ -32,6 +32,7 @@
 import org.jivesoftware.smackx.delay.packet.DelayInformation;
 import org.jivesoftware.smackx.muc.packet.MUCUser;
 import org.jivesoftware.smackx.muc.packet.MUCItem;
+import org.jivesoftware.smackx.ping.PingManager;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -83,6 +84,7 @@ public XmppChat(
         NeercIQProvider.register();
 
         ReconnectionManager.setEnabledPerDefault(true);
+        PingManager.setDefaultPingInterval(5);
     }
 
     public synchronized void disconnect() {
@@ -118,6 +120,11 @@ public synchronized void connect() {
         connection.addConnectionListener(connectionListener);
         connection.addAsyncStanzaListener(new TaskPacketListener(), new StanzaExtensionFilter(new NeercTaskPacketExtension()));
 
+        muc = MultiUserChatManager.getInstanceFor(connection)
+            .getMultiUserChat(ROOM);
+        muc.addMessageListener(new MyMessageListener());
+        muc.addParticipantListener(new MyPresenceListener());
+
         // Connect to the server
         try {
             connection.connect();
@@ -266,11 +273,6 @@ public void queryTasks() throws XMPPException, SmackException {
     private class MyConnectionListener extends AbstractConnectionListener {
         @Override
         public void authenticated(XMPPConnection connection, boolean resumed) {
-            muc = MultiUserChatManager.getInstanceFor(connection)
-                .getMultiUserChat(ROOM);
-            muc.addMessageListener(new MyMessageListener());
-            muc.addParticipantListener(new MyPresenceListener());
-
             join();
 
             debugConnection();
diff --git a/Chat/src/main/resources/ru/ifmo/neerc/chat/client/res/help.html b/Chat/src/main/resources/ru/ifmo/neerc/chat/client/res/help.html
@@ -1,6 +1,6 @@
 <html>
 <body>
-<h2>NEERC Chat 2016.12</h2>
+<h2>NEERC Chat 2016.12a-multiroom</h2>
 Author: Matvey Kazakov<br>
 Contributors:
 <ul>
diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,7 @@ subprojects {
     apply plugin: 'java'
     sourceCompatibility = 1.7
     group "ru.ifmo.neerc"
-    version "2016.12-multiroom-SNAPSHOT"
+    version "2016.12a-multiroom-SNAPSHOT"
     repositories {
       mavenLocal();
       maven {

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,12 @@ public void userPresenceChanged(UserEntry userEntry) {`
`120`	`120`
`121`	`121`	`private void update() {`
`122`	`122`	`init();`
`123`		`- fireContentsChanged(this, 0, userEntries.length);`
	`123`	`+ SwingUtilities.invokeLater(new Runnable() {`
	`124`	`+ @Override`
	`125`	`+ public void run() {`
	`126`	`+ fireContentsChanged(this, 0, getSize());`
	`127`	`+ }`
	`128`	`+ });`
`124`	`129`	`}`
`125`	`130`	`}`
`126`	`131`