Browse Source

Merge pull request #141 from csmith/master

Minor style fixes.
pull/142/head
Greg Holmes 7 years ago
parent
commit
e8f69ca57d

+ 1
- 1
common/src/main/java/com/dmdirc/parser/interfaces/ClientInfo.java View File

82
      *
82
      *
83
      * @return int with the count of known channels
83
      * @return int with the count of known channels
84
      */
84
      */
85
-    public List<ChannelClientInfo> getChannelClients();
85
+    List<ChannelClientInfo> getChannelClients();
86
 
86
 
87
     /**
87
     /**
88
      * Get the away state of a user.
88
      * Get the away state of a user.

+ 1
- 5
irc/src/main/java/com/dmdirc/parser/irc/IRCParser.java View File

1532
 
1532
 
1533
         for (ChannelJoinRequest channel : channels) {
1533
         for (ChannelJoinRequest channel : channels) {
1534
             // Make sure we have a list to put stuff in.
1534
             // Make sure we have a list to put stuff in.
1535
-            StringBuffer list = joinMap.get(channel.getPassword());
1536
-            if (list == null) {
1537
-                list = new StringBuffer();
1538
-                joinMap.put(channel.getPassword(), list);
1539
-            }
1535
+            StringBuffer list = joinMap.computeIfAbsent(channel.getPassword(), k -> new StringBuffer());
1540
 
1536
 
1541
             // Add the channel to the list. If the name is invalid and
1537
             // Add the channel to the list. If the name is invalid and
1542
             // autoprefix is off we will just skip this channel.
1538
             // autoprefix is off we will just skip this channel.

+ 0
- 1
irc/src/main/java/com/dmdirc/parser/irc/events/IRCDataInEvent.java View File

23
 package com.dmdirc.parser.irc.events;
23
 package com.dmdirc.parser.irc.events;
24
 
24
 
25
 import com.dmdirc.parser.events.DataInEvent;
25
 import com.dmdirc.parser.events.DataInEvent;
26
-import com.dmdirc.parser.interfaces.Parser;
27
 import com.dmdirc.parser.irc.IRCParser;
26
 import com.dmdirc.parser.irc.IRCParser;
28
 import com.dmdirc.parser.irc.IRCReader.ReadLine;
27
 import com.dmdirc.parser.irc.IRCReader.ReadLine;
29
 
28
 

+ 0
- 2
irc/src/main/java/com/dmdirc/parser/irc/processors/ProcessJoin.java View File

26
 import com.dmdirc.parser.common.QueuePriority;
26
 import com.dmdirc.parser.common.QueuePriority;
27
 import com.dmdirc.parser.events.ChannelJoinEvent;
27
 import com.dmdirc.parser.events.ChannelJoinEvent;
28
 import com.dmdirc.parser.events.ChannelSelfJoinEvent;
28
 import com.dmdirc.parser.events.ChannelSelfJoinEvent;
29
-import com.dmdirc.parser.events.DataOutEvent;
30
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
29
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
31
 import com.dmdirc.parser.interfaces.ChannelInfo;
30
 import com.dmdirc.parser.interfaces.ChannelInfo;
32
 import com.dmdirc.parser.irc.CapabilityState;
31
 import com.dmdirc.parser.irc.CapabilityState;
39
 import com.dmdirc.parser.irc.ProcessorNotFoundException;
38
 import com.dmdirc.parser.irc.ProcessorNotFoundException;
40
 import com.dmdirc.parser.irc.events.IRCDataOutEvent;
39
 import com.dmdirc.parser.irc.events.IRCDataOutEvent;
41
 import net.engio.mbassy.listener.Handler;
40
 import net.engio.mbassy.listener.Handler;
42
-import net.engio.mbassy.listener.Invoke;
43
 
41
 
44
 import java.time.LocalDateTime;
42
 import java.time.LocalDateTime;
45
 import java.util.Arrays;
43
 import java.util.Arrays;

+ 0
- 1
irc/src/main/java/com/dmdirc/parser/irc/processors/ProcessMessage.java View File

53
 import com.dmdirc.parser.irc.TimestampedIRCProcessor;
53
 import com.dmdirc.parser.irc.TimestampedIRCProcessor;
54
 
54
 
55
 import java.time.LocalDateTime;
55
 import java.time.LocalDateTime;
56
-import java.util.Date;
57
 import java.util.regex.PatternSyntaxException;
56
 import java.util.regex.PatternSyntaxException;
58
 
57
 
59
 import javax.inject.Inject;
58
 import javax.inject.Inject;

Loading…
Cancel
Save