Sfoglia il codice sorgente

Merge pull request #107 from csmith/master

Migrate parser events to use new date APIs.
pull/109/head
Shane Mc Cormack 8 anni fa
parent
commit
67a9fa363d
98 ha cambiato i file con 350 aggiunte e 310 eliminazioni
  1. 2
    2
      common/src/com/dmdirc/parser/common/BaseParser.java
  2. 2
    2
      common/src/com/dmdirc/parser/events/AuthNoticeEvent.java
  3. 2
    2
      common/src/com/dmdirc/parser/events/AwayStateEvent.java
  4. 4
    3
      common/src/com/dmdirc/parser/events/ChannelActionEvent.java
  5. 4
    4
      common/src/com/dmdirc/parser/events/ChannelCTCPEvent.java
  6. 4
    4
      common/src/com/dmdirc/parser/events/ChannelCTCPReplyEvent.java
  7. 3
    3
      common/src/com/dmdirc/parser/events/ChannelJoinEvent.java
  8. 2
    2
      common/src/com/dmdirc/parser/events/ChannelKickEvent.java
  9. 3
    3
      common/src/com/dmdirc/parser/events/ChannelListModeEvent.java
  10. 4
    3
      common/src/com/dmdirc/parser/events/ChannelMessageEvent.java
  11. 4
    3
      common/src/com/dmdirc/parser/events/ChannelModeChangeEvent.java
  12. 4
    4
      common/src/com/dmdirc/parser/events/ChannelModeMessageEvent.java
  13. 4
    4
      common/src/com/dmdirc/parser/events/ChannelModeNoticeEvent.java
  14. 3
    2
      common/src/com/dmdirc/parser/events/ChannelNamesEvent.java
  15. 3
    3
      common/src/com/dmdirc/parser/events/ChannelNickChangeEvent.java
  16. 2
    2
      common/src/com/dmdirc/parser/events/ChannelNonUserModeChangeEvent.java
  17. 4
    3
      common/src/com/dmdirc/parser/events/ChannelNoticeEvent.java
  18. 2
    2
      common/src/com/dmdirc/parser/events/ChannelOtherAwayStateEvent.java
  19. 3
    3
      common/src/com/dmdirc/parser/events/ChannelPartEvent.java
  20. 3
    3
      common/src/com/dmdirc/parser/events/ChannelQuitEvent.java
  21. 3
    2
      common/src/com/dmdirc/parser/events/ChannelSelfJoinEvent.java
  22. 2
    2
      common/src/com/dmdirc/parser/events/ChannelSingleModeChangeEvent.java
  23. 3
    3
      common/src/com/dmdirc/parser/events/ChannelTopicEvent.java
  24. 2
    2
      common/src/com/dmdirc/parser/events/ChannelUserModeChangeEvent.java
  25. 2
    2
      common/src/com/dmdirc/parser/events/CompositionStateChangeEvent.java
  26. 3
    2
      common/src/com/dmdirc/parser/events/ConnectErrorEvent.java
  27. 2
    2
      common/src/com/dmdirc/parser/events/DataInEvent.java
  28. 2
    2
      common/src/com/dmdirc/parser/events/DataOutEvent.java
  29. 2
    2
      common/src/com/dmdirc/parser/events/DebugInfoEvent.java
  30. 3
    2
      common/src/com/dmdirc/parser/events/ErrorInfoEvent.java
  31. 2
    2
      common/src/com/dmdirc/parser/events/GroupListEndEvent.java
  32. 2
    2
      common/src/com/dmdirc/parser/events/GroupListEntryEvent.java
  33. 2
    2
      common/src/com/dmdirc/parser/events/GroupListStartEvent.java
  34. 2
    2
      common/src/com/dmdirc/parser/events/InviteEvent.java
  35. 2
    2
      common/src/com/dmdirc/parser/events/MOTDEndEvent.java
  36. 2
    2
      common/src/com/dmdirc/parser/events/MOTDLineEvent.java
  37. 2
    2
      common/src/com/dmdirc/parser/events/MOTDStartEvent.java
  38. 3
    3
      common/src/com/dmdirc/parser/events/NetworkDetectedEvent.java
  39. 2
    2
      common/src/com/dmdirc/parser/events/NickChangeEvent.java
  40. 2
    2
      common/src/com/dmdirc/parser/events/NickInUseEvent.java
  41. 2
    2
      common/src/com/dmdirc/parser/events/NumericEvent.java
  42. 3
    3
      common/src/com/dmdirc/parser/events/OtherAwayStateEvent.java
  43. 3
    2
      common/src/com/dmdirc/parser/events/ParserErrorEvent.java
  44. 4
    4
      common/src/com/dmdirc/parser/events/ParserEvent.java
  45. 2
    2
      common/src/com/dmdirc/parser/events/PasswordRequiredEvent.java
  46. 2
    2
      common/src/com/dmdirc/parser/events/PingFailureEvent.java
  47. 2
    2
      common/src/com/dmdirc/parser/events/PingSentEvent.java
  48. 2
    2
      common/src/com/dmdirc/parser/events/PingSuccessEvent.java
  49. 2
    2
      common/src/com/dmdirc/parser/events/PrivateActionEvent.java
  50. 2
    2
      common/src/com/dmdirc/parser/events/PrivateCTCPEvent.java
  51. 2
    2
      common/src/com/dmdirc/parser/events/PrivateCTCPReplyEvent.java
  52. 2
    2
      common/src/com/dmdirc/parser/events/PrivateMessageEvent.java
  53. 2
    2
      common/src/com/dmdirc/parser/events/PrivateNoticeEvent.java
  54. 2
    2
      common/src/com/dmdirc/parser/events/QuitEvent.java
  55. 2
    2
      common/src/com/dmdirc/parser/events/ServerErrorEvent.java
  56. 2
    2
      common/src/com/dmdirc/parser/events/ServerNoticeEvent.java
  57. 2
    2
      common/src/com/dmdirc/parser/events/ServerReadyEvent.java
  58. 2
    2
      common/src/com/dmdirc/parser/events/SocketCloseEvent.java
  59. 2
    2
      common/src/com/dmdirc/parser/events/UnknownActionEvent.java
  60. 2
    2
      common/src/com/dmdirc/parser/events/UnknownCTCPEvent.java
  61. 2
    2
      common/src/com/dmdirc/parser/events/UnknownCTCPReplyEvent.java
  62. 2
    2
      common/src/com/dmdirc/parser/events/UnknownMessageEvent.java
  63. 2
    2
      common/src/com/dmdirc/parser/events/UnknownNoticeEvent.java
  64. 3
    3
      common/src/com/dmdirc/parser/events/UnknownServerNoticeEvent.java
  65. 2
    2
      common/src/com/dmdirc/parser/events/UserInfoEvent.java
  66. 3
    3
      common/src/com/dmdirc/parser/events/UserModeChangeEvent.java
  67. 3
    3
      common/src/com/dmdirc/parser/events/UserModeDiscoveryEvent.java
  68. 2
    2
      common/src/com/dmdirc/parser/events/WallDesyncEvent.java
  69. 2
    2
      common/src/com/dmdirc/parser/events/WallopEvent.java
  70. 2
    2
      common/src/com/dmdirc/parser/events/WalluserEvent.java
  71. 21
    20
      irc/src/com/dmdirc/parser/irc/IRCParser.java
  72. 6
    4
      irc/src/com/dmdirc/parser/irc/ProcessingManager.java
  73. 2
    2
      irc/src/com/dmdirc/parser/irc/SimpleNickInUseHandler.java
  74. 4
    3
      irc/src/com/dmdirc/parser/irc/TimestampedIRCProcessor.java
  75. 3
    2
      irc/src/com/dmdirc/parser/irc/WhoisResponseHandler.java
  76. 3
    2
      irc/src/com/dmdirc/parser/irc/processors/Process004005.java
  77. 2
    2
      irc/src/com/dmdirc/parser/irc/processors/Process464.java
  78. 2
    2
      irc/src/com/dmdirc/parser/irc/processors/ProcessAway.java
  79. 2
    2
      irc/src/com/dmdirc/parser/irc/processors/ProcessCap.java
  80. 3
    2
      irc/src/com/dmdirc/parser/irc/processors/ProcessInvite.java
  81. 4
    3
      irc/src/com/dmdirc/parser/irc/processors/ProcessJoin.java
  82. 3
    3
      irc/src/com/dmdirc/parser/irc/processors/ProcessKick.java
  83. 5
    5
      irc/src/com/dmdirc/parser/irc/processors/ProcessList.java
  84. 3
    2
      irc/src/com/dmdirc/parser/irc/processors/ProcessListModes.java
  85. 4
    4
      irc/src/com/dmdirc/parser/irc/processors/ProcessMOTD.java
  86. 34
    28
      irc/src/com/dmdirc/parser/irc/processors/ProcessMessage.java
  87. 16
    12
      irc/src/com/dmdirc/parser/irc/processors/ProcessMode.java
  88. 3
    3
      irc/src/com/dmdirc/parser/irc/processors/ProcessNames.java
  89. 5
    3
      irc/src/com/dmdirc/parser/irc/processors/ProcessNick.java
  90. 2
    2
      irc/src/com/dmdirc/parser/irc/processors/ProcessNickInUse.java
  91. 2
    2
      irc/src/com/dmdirc/parser/irc/processors/ProcessNoticeAuth.java
  92. 3
    2
      irc/src/com/dmdirc/parser/irc/processors/ProcessPart.java
  93. 4
    3
      irc/src/com/dmdirc/parser/irc/processors/ProcessQuit.java
  94. 2
    2
      irc/src/com/dmdirc/parser/irc/processors/ProcessTopic.java
  95. 5
    4
      irc/src/com/dmdirc/parser/irc/processors/ProcessWallops.java
  96. 5
    5
      irc/src/com/dmdirc/parser/irc/processors/ProcessWho.java
  97. 2
    2
      xmpp/src/com/dmdirc/parser/xmpp/XmppFakeChannel.java
  98. 26
    19
      xmpp/src/com/dmdirc/parser/xmpp/XmppParser.java

+ 2
- 2
common/src/com/dmdirc/parser/common/BaseParser.java Vedi File

32
 import java.net.SocketAddress;
32
 import java.net.SocketAddress;
33
 import java.net.URI;
33
 import java.net.URI;
34
 import java.net.URISyntaxException;
34
 import java.net.URISyntaxException;
35
-import java.util.Date;
35
+import java.time.LocalDateTime;
36
 import java.util.List;
36
 import java.util.List;
37
 
37
 
38
 import net.engio.mbassy.bus.error.PublicationError;
38
 import net.engio.mbassy.bus.error.PublicationError;
101
         }
101
         }
102
 
102
 
103
         synchronized (errorHandlerLock) {
103
         synchronized (errorHandlerLock) {
104
-            callbackManager.publish(new ParserErrorEvent(this, new Date(), e.getCause()));
104
+            callbackManager.publish(new ParserErrorEvent(this, LocalDateTime.now(), e.getCause()));
105
         }
105
         }
106
     }
106
     }
107
 
107
 

+ 2
- 2
common/src/com/dmdirc/parser/events/AuthNoticeEvent.java Vedi File

24
 
24
 
25
 import com.dmdirc.parser.interfaces.Parser;
25
 import com.dmdirc.parser.interfaces.Parser;
26
 
26
 
27
-import java.util.Date;
27
+import java.time.LocalDateTime;
28
 
28
 
29
 import static com.google.common.base.Preconditions.checkNotNull;
29
 import static com.google.common.base.Preconditions.checkNotNull;
30
 
30
 
35
 
35
 
36
     private final String message;
36
     private final String message;
37
 
37
 
38
-    public AuthNoticeEvent(final Parser parser, final Date date, final String message) {
38
+    public AuthNoticeEvent(final Parser parser, final LocalDateTime date, final String message) {
39
         super(parser, date);
39
         super(parser, date);
40
         this.message = checkNotNull(message);
40
         this.message = checkNotNull(message);
41
     }
41
     }

+ 2
- 2
common/src/com/dmdirc/parser/events/AwayStateEvent.java Vedi File

25
 import com.dmdirc.parser.common.AwayState;
25
 import com.dmdirc.parser.common.AwayState;
26
 import com.dmdirc.parser.interfaces.Parser;
26
 import com.dmdirc.parser.interfaces.Parser;
27
 
27
 
28
-import java.util.Date;
28
+import java.time.LocalDateTime;
29
 
29
 
30
 import javax.annotation.Nullable;
30
 import javax.annotation.Nullable;
31
 
31
 
40
     private final AwayState newState;
40
     private final AwayState newState;
41
     private final String reason;
41
     private final String reason;
42
 
42
 
43
-    public AwayStateEvent(final Parser parser, final Date date, final AwayState oldState,
43
+    public AwayStateEvent(final Parser parser, final LocalDateTime date, final AwayState oldState,
44
             final AwayState newState, @Nullable final String reason) {
44
             final AwayState newState, @Nullable final String reason) {
45
         super(parser, date);
45
         super(parser, date);
46
         this.oldState = checkNotNull(oldState);
46
         this.oldState = checkNotNull(oldState);

+ 4
- 3
common/src/com/dmdirc/parser/events/ChannelActionEvent.java Vedi File

26
 import com.dmdirc.parser.interfaces.ChannelInfo;
26
 import com.dmdirc.parser.interfaces.ChannelInfo;
27
 import com.dmdirc.parser.interfaces.Parser;
27
 import com.dmdirc.parser.interfaces.Parser;
28
 
28
 
29
-import java.util.Date;
29
+import java.time.LocalDateTime;
30
 
30
 
31
 import static com.google.common.base.Preconditions.checkNotNull;
31
 import static com.google.common.base.Preconditions.checkNotNull;
32
 
32
 
40
     private final String message;
40
     private final String message;
41
     private final String host;
41
     private final String host;
42
 
42
 
43
-    public ChannelActionEvent(final Parser parser, final Date date, final ChannelInfo channel,
44
-            final ChannelClientInfo client, final String message, final String host) {
43
+    public ChannelActionEvent(final Parser parser, final LocalDateTime date,
44
+            final ChannelInfo channel, final ChannelClientInfo client, final String message,
45
+            final String host) {
45
         super(parser, date);
46
         super(parser, date);
46
         this.channel = checkNotNull(channel);
47
         this.channel = checkNotNull(channel);
47
         this.client = checkNotNull(client);
48
         this.client = checkNotNull(client);

+ 4
- 4
common/src/com/dmdirc/parser/events/ChannelCTCPEvent.java Vedi File

26
 import com.dmdirc.parser.interfaces.ChannelInfo;
26
 import com.dmdirc.parser.interfaces.ChannelInfo;
27
 import com.dmdirc.parser.interfaces.Parser;
27
 import com.dmdirc.parser.interfaces.Parser;
28
 
28
 
29
-import java.util.Date;
29
+import java.time.LocalDateTime;
30
 
30
 
31
 import static com.google.common.base.Preconditions.checkNotNull;
31
 import static com.google.common.base.Preconditions.checkNotNull;
32
 
32
 
41
     private final String message;
41
     private final String message;
42
     private final String host;
42
     private final String host;
43
 
43
 
44
-    public ChannelCTCPEvent(final Parser parser, final Date date, final ChannelInfo channel,
45
-            final ChannelClientInfo client, final String type, final String message,
46
-            final String host) {
44
+    public ChannelCTCPEvent(final Parser parser, final LocalDateTime date,
45
+            final ChannelInfo channel, final ChannelClientInfo client, final String type,
46
+            final String message, final String host) {
47
         super(parser, date);
47
         super(parser, date);
48
         this.channel = checkNotNull(channel);
48
         this.channel = checkNotNull(channel);
49
         this.client = checkNotNull(client);
49
         this.client = checkNotNull(client);

+ 4
- 4
common/src/com/dmdirc/parser/events/ChannelCTCPReplyEvent.java Vedi File

26
 import com.dmdirc.parser.interfaces.ChannelInfo;
26
 import com.dmdirc.parser.interfaces.ChannelInfo;
27
 import com.dmdirc.parser.interfaces.Parser;
27
 import com.dmdirc.parser.interfaces.Parser;
28
 
28
 
29
-import java.util.Date;
29
+import java.time.LocalDateTime;
30
 
30
 
31
 import static com.google.common.base.Preconditions.checkNotNull;
31
 import static com.google.common.base.Preconditions.checkNotNull;
32
 
32
 
41
     private final String message;
41
     private final String message;
42
     private final String host;
42
     private final String host;
43
 
43
 
44
-    public ChannelCTCPReplyEvent(final Parser parser, final Date date, final ChannelInfo channel,
45
-            final ChannelClientInfo client, final String type, final String message,
46
-            final String host) {
44
+    public ChannelCTCPReplyEvent(final Parser parser, final LocalDateTime date,
45
+            final ChannelInfo channel, final ChannelClientInfo client, final String type,
46
+            final String message, final String host) {
47
         super(parser, date);
47
         super(parser, date);
48
         this.channel = checkNotNull(channel);
48
         this.channel = checkNotNull(channel);
49
         this.client = checkNotNull(client);
49
         this.client = checkNotNull(client);

+ 3
- 3
common/src/com/dmdirc/parser/events/ChannelJoinEvent.java Vedi File

26
 import com.dmdirc.parser.interfaces.ChannelInfo;
26
 import com.dmdirc.parser.interfaces.ChannelInfo;
27
 import com.dmdirc.parser.interfaces.Parser;
27
 import com.dmdirc.parser.interfaces.Parser;
28
 
28
 
29
-import java.util.Date;
29
+import java.time.LocalDateTime;
30
 
30
 
31
 import static com.google.common.base.Preconditions.checkNotNull;
31
 import static com.google.common.base.Preconditions.checkNotNull;
32
 
32
 
38
     private final ChannelInfo channel;
38
     private final ChannelInfo channel;
39
     private final ChannelClientInfo client;
39
     private final ChannelClientInfo client;
40
 
40
 
41
-    public ChannelJoinEvent(final Parser parser, final Date date, final ChannelInfo channel,
42
-            final ChannelClientInfo client) {
41
+    public ChannelJoinEvent(final Parser parser, final LocalDateTime date,
42
+            final ChannelInfo channel, final ChannelClientInfo client) {
43
         super(parser, date);
43
         super(parser, date);
44
         this.channel = checkNotNull(channel);
44
         this.channel = checkNotNull(channel);
45
         this.client = checkNotNull(client);
45
         this.client = checkNotNull(client);

+ 2
- 2
common/src/com/dmdirc/parser/events/ChannelKickEvent.java Vedi File

26
 import com.dmdirc.parser.interfaces.ChannelInfo;
26
 import com.dmdirc.parser.interfaces.ChannelInfo;
27
 import com.dmdirc.parser.interfaces.Parser;
27
 import com.dmdirc.parser.interfaces.Parser;
28
 
28
 
29
-import java.util.Date;
29
+import java.time.LocalDateTime;
30
 
30
 
31
 import static com.google.common.base.Preconditions.checkNotNull;
31
 import static com.google.common.base.Preconditions.checkNotNull;
32
 
32
 
41
     private final String reason;
41
     private final String reason;
42
     private final String host;
42
     private final String host;
43
 
43
 
44
-    public ChannelKickEvent(final Parser parser, final Date date, final ChannelInfo channel,
44
+    public ChannelKickEvent(final Parser parser, final LocalDateTime date, final ChannelInfo channel,
45
             final ChannelClientInfo kickedClient, final ChannelClientInfo client,
45
             final ChannelClientInfo kickedClient, final ChannelClientInfo client,
46
             final String reason, final String host) {
46
             final String reason, final String host) {
47
         super(parser, date);
47
         super(parser, date);

+ 3
- 3
common/src/com/dmdirc/parser/events/ChannelListModeEvent.java Vedi File

25
 import com.dmdirc.parser.interfaces.ChannelInfo;
25
 import com.dmdirc.parser.interfaces.ChannelInfo;
26
 import com.dmdirc.parser.interfaces.Parser;
26
 import com.dmdirc.parser.interfaces.Parser;
27
 
27
 
28
-import java.util.Date;
28
+import java.time.LocalDateTime;
29
 
29
 
30
 import static com.google.common.base.Preconditions.checkNotNull;
30
 import static com.google.common.base.Preconditions.checkNotNull;
31
 
31
 
37
     private final ChannelInfo channel;
37
     private final ChannelInfo channel;
38
     private final char mode;
38
     private final char mode;
39
 
39
 
40
-    public ChannelListModeEvent(final Parser parser, final Date date, final ChannelInfo channel,
41
-            final char mode) {
40
+    public ChannelListModeEvent(final Parser parser, final LocalDateTime date,
41
+            final ChannelInfo channel, final char mode) {
42
         super(parser, date);
42
         super(parser, date);
43
         this.channel = checkNotNull(channel);
43
         this.channel = checkNotNull(channel);
44
         this.mode = mode;
44
         this.mode = mode;

+ 4
- 3
common/src/com/dmdirc/parser/events/ChannelMessageEvent.java Vedi File

26
 import com.dmdirc.parser.interfaces.ChannelInfo;
26
 import com.dmdirc.parser.interfaces.ChannelInfo;
27
 import com.dmdirc.parser.interfaces.Parser;
27
 import com.dmdirc.parser.interfaces.Parser;
28
 
28
 
29
-import java.util.Date;
29
+import java.time.LocalDateTime;
30
 
30
 
31
 import static com.google.common.base.Preconditions.checkNotNull;
31
 import static com.google.common.base.Preconditions.checkNotNull;
32
 
32
 
40
     private final String message;
40
     private final String message;
41
     private final String host;
41
     private final String host;
42
 
42
 
43
-    public ChannelMessageEvent(final Parser parser, final Date date, final ChannelInfo channel,
44
-            final ChannelClientInfo client, final String message, final String host) {
43
+    public ChannelMessageEvent(final Parser parser, final LocalDateTime date,
44
+            final ChannelInfo channel, final ChannelClientInfo client, final String message,
45
+            final String host) {
45
         super(parser, date);
46
         super(parser, date);
46
         this.channel = checkNotNull(channel);
47
         this.channel = checkNotNull(channel);
47
         this.client = checkNotNull(client);
48
         this.client = checkNotNull(client);

+ 4
- 3
common/src/com/dmdirc/parser/events/ChannelModeChangeEvent.java Vedi File

26
 import com.dmdirc.parser.interfaces.ChannelInfo;
26
 import com.dmdirc.parser.interfaces.ChannelInfo;
27
 import com.dmdirc.parser.interfaces.Parser;
27
 import com.dmdirc.parser.interfaces.Parser;
28
 
28
 
29
-import java.util.Date;
29
+import java.time.LocalDateTime;
30
 
30
 
31
 import static com.google.common.base.Preconditions.checkNotNull;
31
 import static com.google.common.base.Preconditions.checkNotNull;
32
 
32
 
40
     private final String host;
40
     private final String host;
41
     private final String modes;
41
     private final String modes;
42
 
42
 
43
-    public ChannelModeChangeEvent(final Parser parser, final Date date, final ChannelInfo channel,
44
-            final ChannelClientInfo client, final String host, final String modes) {
43
+    public ChannelModeChangeEvent(final Parser parser, final LocalDateTime date,
44
+            final ChannelInfo channel, final ChannelClientInfo client, final String host,
45
+            final String modes) {
45
         super(parser, date);
46
         super(parser, date);
46
         this.channel = checkNotNull(channel);
47
         this.channel = checkNotNull(channel);
47
         this.client = checkNotNull(client);
48
         this.client = checkNotNull(client);

+ 4
- 4
common/src/com/dmdirc/parser/events/ChannelModeMessageEvent.java Vedi File

26
 import com.dmdirc.parser.interfaces.ChannelInfo;
26
 import com.dmdirc.parser.interfaces.ChannelInfo;
27
 import com.dmdirc.parser.interfaces.Parser;
27
 import com.dmdirc.parser.interfaces.Parser;
28
 
28
 
29
-import java.util.Date;
29
+import java.time.LocalDateTime;
30
 
30
 
31
 import static com.google.common.base.Preconditions.checkNotNull;
31
 import static com.google.common.base.Preconditions.checkNotNull;
32
 
32
 
41
     private final String message;
41
     private final String message;
42
     private final String host;
42
     private final String host;
43
 
43
 
44
-    public ChannelModeMessageEvent(final Parser parser, final Date date, final ChannelInfo channel,
45
-            final char prefix, final ChannelClientInfo client, final String message,
46
-            final String host) {
44
+    public ChannelModeMessageEvent(final Parser parser, final LocalDateTime date,
45
+            final ChannelInfo channel, final char prefix, final ChannelClientInfo client,
46
+            final String message, final String host) {
47
         super(parser, date);
47
         super(parser, date);
48
         this.channel = checkNotNull(channel);
48
         this.channel = checkNotNull(channel);
49
         this.prefix = checkNotNull(prefix);
49
         this.prefix = checkNotNull(prefix);

+ 4
- 4
common/src/com/dmdirc/parser/events/ChannelModeNoticeEvent.java Vedi File

26
 import com.dmdirc.parser.interfaces.ChannelInfo;
26
 import com.dmdirc.parser.interfaces.ChannelInfo;
27
 import com.dmdirc.parser.interfaces.Parser;
27
 import com.dmdirc.parser.interfaces.Parser;
28
 
28
 
29
-import java.util.Date;
29
+import java.time.LocalDateTime;
30
 
30
 
31
 import static com.google.common.base.Preconditions.checkNotNull;
31
 import static com.google.common.base.Preconditions.checkNotNull;
32
 
32
 
41
     private final String message;
41
     private final String message;
42
     private final String host;
42
     private final String host;
43
 
43
 
44
-    public ChannelModeNoticeEvent(final Parser parser, final Date date, final ChannelInfo channel,
45
-            final char prefix, final ChannelClientInfo client, final String message,
46
-            final String host) {
44
+    public ChannelModeNoticeEvent(final Parser parser, final LocalDateTime date,
45
+            final ChannelInfo channel, final char prefix, final ChannelClientInfo client,
46
+            final String message, final String host) {
47
         super(parser, date);
47
         super(parser, date);
48
         this.channel = checkNotNull(channel);
48
         this.channel = checkNotNull(channel);
49
         this.prefix = checkNotNull(prefix);
49
         this.prefix = checkNotNull(prefix);

+ 3
- 2
common/src/com/dmdirc/parser/events/ChannelNamesEvent.java Vedi File

25
 import com.dmdirc.parser.interfaces.ChannelInfo;
25
 import com.dmdirc.parser.interfaces.ChannelInfo;
26
 import com.dmdirc.parser.interfaces.Parser;
26
 import com.dmdirc.parser.interfaces.Parser;
27
 
27
 
28
-import java.util.Date;
28
+import java.time.LocalDateTime;
29
 
29
 
30
 import static com.google.common.base.Preconditions.checkNotNull;
30
 import static com.google.common.base.Preconditions.checkNotNull;
31
 
31
 
36
 
36
 
37
     private final ChannelInfo channel;
37
     private final ChannelInfo channel;
38
 
38
 
39
-    public ChannelNamesEvent(final Parser parser, final Date date, final ChannelInfo channel) {
39
+    public ChannelNamesEvent(final Parser parser, final LocalDateTime date,
40
+            final ChannelInfo channel) {
40
         super(parser, date);
41
         super(parser, date);
41
         this.channel = checkNotNull(channel);
42
         this.channel = checkNotNull(channel);
42
     }
43
     }

+ 3
- 3
common/src/com/dmdirc/parser/events/ChannelNickChangeEvent.java Vedi File

26
 import com.dmdirc.parser.interfaces.ChannelInfo;
26
 import com.dmdirc.parser.interfaces.ChannelInfo;
27
 import com.dmdirc.parser.interfaces.Parser;
27
 import com.dmdirc.parser.interfaces.Parser;
28
 
28
 
29
-import java.util.Date;
29
+import java.time.LocalDateTime;
30
 
30
 
31
 import static com.google.common.base.Preconditions.checkNotNull;
31
 import static com.google.common.base.Preconditions.checkNotNull;
32
 
32
 
39
     private final ChannelClientInfo client;
39
     private final ChannelClientInfo client;
40
     private final String oldNick;
40
     private final String oldNick;
41
 
41
 
42
-    public ChannelNickChangeEvent(final Parser parser, final Date date, final ChannelInfo channel,
43
-            final ChannelClientInfo client, final String oldNick) {
42
+    public ChannelNickChangeEvent(final Parser parser, final LocalDateTime date,
43
+            final ChannelInfo channel, final ChannelClientInfo client, final String oldNick) {
44
         super(parser, date);
44
         super(parser, date);
45
         this.channel = checkNotNull(channel);
45
         this.channel = checkNotNull(channel);
46
         this.client = checkNotNull(client);
46
         this.client = checkNotNull(client);

+ 2
- 2
common/src/com/dmdirc/parser/events/ChannelNonUserModeChangeEvent.java Vedi File

26
 import com.dmdirc.parser.interfaces.ChannelInfo;
26
 import com.dmdirc.parser.interfaces.ChannelInfo;
27
 import com.dmdirc.parser.interfaces.Parser;
27
 import com.dmdirc.parser.interfaces.Parser;
28
 
28
 
29
-import java.util.Date;
29
+import java.time.LocalDateTime;
30
 
30
 
31
 import static com.google.common.base.Preconditions.checkNotNull;
31
 import static com.google.common.base.Preconditions.checkNotNull;
32
 
32
 
40
     private final String host;
40
     private final String host;
41
     private final String modes;
41
     private final String modes;
42
 
42
 
43
-    public ChannelNonUserModeChangeEvent(final Parser parser, final Date date,
43
+    public ChannelNonUserModeChangeEvent(final Parser parser, final LocalDateTime date,
44
             final ChannelInfo channel, final ChannelClientInfo client, final String host,
44
             final ChannelInfo channel, final ChannelClientInfo client, final String host,
45
             final String modes) {
45
             final String modes) {
46
         super(parser, date);
46
         super(parser, date);

+ 4
- 3
common/src/com/dmdirc/parser/events/ChannelNoticeEvent.java Vedi File

26
 import com.dmdirc.parser.interfaces.ChannelInfo;
26
 import com.dmdirc.parser.interfaces.ChannelInfo;
27
 import com.dmdirc.parser.interfaces.Parser;
27
 import com.dmdirc.parser.interfaces.Parser;
28
 
28
 
29
-import java.util.Date;
29
+import java.time.LocalDateTime;
30
 
30
 
31
 import static com.google.common.base.Preconditions.checkNotNull;
31
 import static com.google.common.base.Preconditions.checkNotNull;
32
 
32
 
40
     private final String message;
40
     private final String message;
41
     private final String host;
41
     private final String host;
42
 
42
 
43
-    public ChannelNoticeEvent(final Parser parser, final Date date, final ChannelInfo channel,
44
-            final ChannelClientInfo client, final String message, final String host) {
43
+    public ChannelNoticeEvent(final Parser parser, final LocalDateTime date,
44
+            final ChannelInfo channel, final ChannelClientInfo client, final String message,
45
+            final String host) {
45
         super(parser, date);
46
         super(parser, date);
46
         this.channel = checkNotNull(channel);
47
         this.channel = checkNotNull(channel);
47
         this.client = checkNotNull(client);
48
         this.client = checkNotNull(client);

+ 2
- 2
common/src/com/dmdirc/parser/events/ChannelOtherAwayStateEvent.java Vedi File

27
 import com.dmdirc.parser.interfaces.ChannelInfo;
27
 import com.dmdirc.parser.interfaces.ChannelInfo;
28
 import com.dmdirc.parser.interfaces.Parser;
28
 import com.dmdirc.parser.interfaces.Parser;
29
 
29
 
30
-import java.util.Date;
30
+import java.time.LocalDateTime;
31
 
31
 
32
 import static com.google.common.base.Preconditions.checkNotNull;
32
 import static com.google.common.base.Preconditions.checkNotNull;
33
 
33
 
41
     private final AwayState oldState;
41
     private final AwayState oldState;
42
     private final AwayState newState;
42
     private final AwayState newState;
43
 
43
 
44
-    public ChannelOtherAwayStateEvent(final Parser parser, final Date date,
44
+    public ChannelOtherAwayStateEvent(final Parser parser, final LocalDateTime date,
45
             final ChannelInfo channel, final ChannelClientInfo client, final AwayState oldState,
45
             final ChannelInfo channel, final ChannelClientInfo client, final AwayState oldState,
46
             final AwayState newState) {
46
             final AwayState newState) {
47
         super(parser, date);
47
         super(parser, date);

+ 3
- 3
common/src/com/dmdirc/parser/events/ChannelPartEvent.java Vedi File

26
 import com.dmdirc.parser.interfaces.ChannelInfo;
26
 import com.dmdirc.parser.interfaces.ChannelInfo;
27
 import com.dmdirc.parser.interfaces.Parser;
27
 import com.dmdirc.parser.interfaces.Parser;
28
 
28
 
29
-import java.util.Date;
29
+import java.time.LocalDateTime;
30
 
30
 
31
 import static com.google.common.base.Preconditions.checkNotNull;
31
 import static com.google.common.base.Preconditions.checkNotNull;
32
 
32
 
39
     private final ChannelClientInfo client;
39
     private final ChannelClientInfo client;
40
     private final String reason;
40
     private final String reason;
41
 
41
 
42
-    public ChannelPartEvent(final Parser parser, final Date date, final ChannelInfo channel,
43
-            final ChannelClientInfo client, final String reason) {
42
+    public ChannelPartEvent(final Parser parser, final LocalDateTime date,
43
+            final ChannelInfo channel, final ChannelClientInfo client, final String reason) {
44
         super(parser, date);
44
         super(parser, date);
45
         this.channel = checkNotNull(channel);
45
         this.channel = checkNotNull(channel);
46
         this.client = checkNotNull(client);
46
         this.client = checkNotNull(client);

+ 3
- 3
common/src/com/dmdirc/parser/events/ChannelQuitEvent.java Vedi File

26
 import com.dmdirc.parser.interfaces.ChannelInfo;
26
 import com.dmdirc.parser.interfaces.ChannelInfo;
27
 import com.dmdirc.parser.interfaces.Parser;
27
 import com.dmdirc.parser.interfaces.Parser;
28
 
28
 
29
-import java.util.Date;
29
+import java.time.LocalDateTime;
30
 
30
 
31
 import static com.google.common.base.Preconditions.checkNotNull;
31
 import static com.google.common.base.Preconditions.checkNotNull;
32
 
32
 
39
     private final ChannelClientInfo client;
39
     private final ChannelClientInfo client;
40
     private final String reason;
40
     private final String reason;
41
 
41
 
42
-    public ChannelQuitEvent(final Parser parser, final Date date, final ChannelInfo channel,
43
-            final ChannelClientInfo client, final String reason) {
42
+    public ChannelQuitEvent(final Parser parser, final LocalDateTime date,
43
+            final ChannelInfo channel, final ChannelClientInfo client, final String reason) {
44
         super(parser, date);
44
         super(parser, date);
45
         this.channel = checkNotNull(channel);
45
         this.channel = checkNotNull(channel);
46
         this.client = checkNotNull(client);
46
         this.client = checkNotNull(client);

+ 3
- 2
common/src/com/dmdirc/parser/events/ChannelSelfJoinEvent.java Vedi File

25
 import com.dmdirc.parser.interfaces.ChannelInfo;
25
 import com.dmdirc.parser.interfaces.ChannelInfo;
26
 import com.dmdirc.parser.interfaces.Parser;
26
 import com.dmdirc.parser.interfaces.Parser;
27
 
27
 
28
-import java.util.Date;
28
+import java.time.LocalDateTime;
29
 
29
 
30
 import static com.google.common.base.Preconditions.checkNotNull;
30
 import static com.google.common.base.Preconditions.checkNotNull;
31
 
31
 
36
 
36
 
37
     private final ChannelInfo channel;
37
     private final ChannelInfo channel;
38
 
38
 
39
-    public ChannelSelfJoinEvent(final Parser parser, final Date date, final ChannelInfo channel) {
39
+    public ChannelSelfJoinEvent(final Parser parser, final LocalDateTime date,
40
+            final ChannelInfo channel) {
40
         super(parser, date);
41
         super(parser, date);
41
         this.channel = checkNotNull(channel);
42
         this.channel = checkNotNull(channel);
42
     }
43
     }

+ 2
- 2
common/src/com/dmdirc/parser/events/ChannelSingleModeChangeEvent.java Vedi File

26
 import com.dmdirc.parser.interfaces.ChannelInfo;
26
 import com.dmdirc.parser.interfaces.ChannelInfo;
27
 import com.dmdirc.parser.interfaces.Parser;
27
 import com.dmdirc.parser.interfaces.Parser;
28
 
28
 
29
-import java.util.Date;
29
+import java.time.LocalDateTime;
30
 
30
 
31
 import static com.google.common.base.Preconditions.checkNotNull;
31
 import static com.google.common.base.Preconditions.checkNotNull;
32
 
32
 
40
     private final String host;
40
     private final String host;
41
     private final String modes;
41
     private final String modes;
42
 
42
 
43
-    public ChannelSingleModeChangeEvent(final Parser parser, final Date date,
43
+    public ChannelSingleModeChangeEvent(final Parser parser, final LocalDateTime date,
44
             final ChannelInfo channel, final ChannelClientInfo client, final String host,
44
             final ChannelInfo channel, final ChannelClientInfo client, final String host,
45
             final String modes) {
45
             final String modes) {
46
         super(parser, date);
46
         super(parser, date);

+ 3
- 3
common/src/com/dmdirc/parser/events/ChannelTopicEvent.java Vedi File

25
 import com.dmdirc.parser.interfaces.ChannelInfo;
25
 import com.dmdirc.parser.interfaces.ChannelInfo;
26
 import com.dmdirc.parser.interfaces.Parser;
26
 import com.dmdirc.parser.interfaces.Parser;
27
 
27
 
28
-import java.util.Date;
28
+import java.time.LocalDateTime;
29
 
29
 
30
 import static com.google.common.base.Preconditions.checkNotNull;
30
 import static com.google.common.base.Preconditions.checkNotNull;
31
 
31
 
37
     private final ChannelInfo channel;
37
     private final ChannelInfo channel;
38
     private final boolean isJoinTopic;
38
     private final boolean isJoinTopic;
39
 
39
 
40
-    public ChannelTopicEvent(final Parser parser, final Date date, final ChannelInfo channel,
41
-            final boolean isJoinTopic) {
40
+    public ChannelTopicEvent(final Parser parser, final LocalDateTime date,
41
+            final ChannelInfo channel, final boolean isJoinTopic) {
42
         super(parser, date);
42
         super(parser, date);
43
         this.channel = checkNotNull(channel);
43
         this.channel = checkNotNull(channel);
44
         this.isJoinTopic = isJoinTopic;
44
         this.isJoinTopic = isJoinTopic;

+ 2
- 2
common/src/com/dmdirc/parser/events/ChannelUserModeChangeEvent.java Vedi File

26
 import com.dmdirc.parser.interfaces.ChannelInfo;
26
 import com.dmdirc.parser.interfaces.ChannelInfo;
27
 import com.dmdirc.parser.interfaces.Parser;
27
 import com.dmdirc.parser.interfaces.Parser;
28
 
28
 
29
-import java.util.Date;
29
+import java.time.LocalDateTime;
30
 
30
 
31
 import static com.google.common.base.Preconditions.checkNotNull;
31
 import static com.google.common.base.Preconditions.checkNotNull;
32
 
32
 
41
     private final String host;
41
     private final String host;
42
     private final String mode;
42
     private final String mode;
43
 
43
 
44
-    public ChannelUserModeChangeEvent(final Parser parser, final Date date,
44
+    public ChannelUserModeChangeEvent(final Parser parser, final LocalDateTime date,
45
             final ChannelInfo channel, final ChannelClientInfo targetClient,
45
             final ChannelInfo channel, final ChannelClientInfo targetClient,
46
             final ChannelClientInfo client, final String host, final String mode) {
46
             final ChannelClientInfo client, final String host, final String mode) {
47
         super(parser, date);
47
         super(parser, date);

+ 2
- 2
common/src/com/dmdirc/parser/events/CompositionStateChangeEvent.java Vedi File

25
 import com.dmdirc.parser.common.CompositionState;
25
 import com.dmdirc.parser.common.CompositionState;
26
 import com.dmdirc.parser.interfaces.Parser;
26
 import com.dmdirc.parser.interfaces.Parser;
27
 
27
 
28
-import java.util.Date;
28
+import java.time.LocalDateTime;
29
 
29
 
30
 import static com.google.common.base.Preconditions.checkNotNull;
30
 import static com.google.common.base.Preconditions.checkNotNull;
31
 
31
 
37
     private final CompositionState state;
37
     private final CompositionState state;
38
     private final String host;
38
     private final String host;
39
 
39
 
40
-    public CompositionStateChangeEvent(final Parser parser, final Date date,
40
+    public CompositionStateChangeEvent(final Parser parser, final LocalDateTime date,
41
             final CompositionState state, final String host) {
41
             final CompositionState state, final String host) {
42
         super(parser, date);
42
         super(parser, date);
43
         this.state = checkNotNull(state);
43
         this.state = checkNotNull(state);

+ 3
- 2
common/src/com/dmdirc/parser/events/ConnectErrorEvent.java Vedi File

25
 import com.dmdirc.parser.common.ParserError;
25
 import com.dmdirc.parser.common.ParserError;
26
 import com.dmdirc.parser.interfaces.Parser;
26
 import com.dmdirc.parser.interfaces.Parser;
27
 
27
 
28
-import java.util.Date;
28
+import java.time.LocalDateTime;
29
 
29
 
30
 import static com.google.common.base.Preconditions.checkNotNull;
30
 import static com.google.common.base.Preconditions.checkNotNull;
31
 
31
 
36
 
36
 
37
     private final ParserError errorInfo;
37
     private final ParserError errorInfo;
38
 
38
 
39
-    public ConnectErrorEvent(final Parser parser, final Date date, final ParserError errorInfo) {
39
+    public ConnectErrorEvent(final Parser parser, final LocalDateTime date,
40
+            final ParserError errorInfo) {
40
         super(parser, date);
41
         super(parser, date);
41
         this.errorInfo = checkNotNull(errorInfo);
42
         this.errorInfo = checkNotNull(errorInfo);
42
     }
43
     }

+ 2
- 2
common/src/com/dmdirc/parser/events/DataInEvent.java Vedi File

24
 
24
 
25
 import com.dmdirc.parser.interfaces.Parser;
25
 import com.dmdirc.parser.interfaces.Parser;
26
 
26
 
27
-import java.util.Date;
27
+import java.time.LocalDateTime;
28
 
28
 
29
 import static com.google.common.base.Preconditions.checkNotNull;
29
 import static com.google.common.base.Preconditions.checkNotNull;
30
 
30
 
35
 
35
 
36
     private final String data;
36
     private final String data;
37
 
37
 
38
-    public DataInEvent(final Parser parser, final Date date, final String data) {
38
+    public DataInEvent(final Parser parser, final LocalDateTime date, final String data) {
39
         super(parser, date);
39
         super(parser, date);
40
         this.data = checkNotNull(data);
40
         this.data = checkNotNull(data);
41
     }
41
     }

+ 2
- 2
common/src/com/dmdirc/parser/events/DataOutEvent.java Vedi File

24
 
24
 
25
 import com.dmdirc.parser.interfaces.Parser;
25
 import com.dmdirc.parser.interfaces.Parser;
26
 
26
 
27
-import java.util.Date;
27
+import java.time.LocalDateTime;
28
 
28
 
29
 import static com.google.common.base.Preconditions.checkNotNull;
29
 import static com.google.common.base.Preconditions.checkNotNull;
30
 
30
 
35
 
35
 
36
     private final String data;
36
     private final String data;
37
 
37
 
38
-    public DataOutEvent(final Parser parser, final Date date, final String data) {
38
+    public DataOutEvent(final Parser parser, final LocalDateTime date, final String data) {
39
         super(parser, date);
39
         super(parser, date);
40
         this.data = checkNotNull(data);
40
         this.data = checkNotNull(data);
41
     }
41
     }

+ 2
- 2
common/src/com/dmdirc/parser/events/DebugInfoEvent.java Vedi File

24
 
24
 
25
 import com.dmdirc.parser.interfaces.Parser;
25
 import com.dmdirc.parser.interfaces.Parser;
26
 
26
 
27
-import java.util.Date;
27
+import java.time.LocalDateTime;
28
 
28
 
29
 import static com.google.common.base.Preconditions.checkNotNull;
29
 import static com.google.common.base.Preconditions.checkNotNull;
30
 
30
 
36
     private final int level;
36
     private final int level;
37
     private final String data;
37
     private final String data;
38
 
38
 
39
-    public DebugInfoEvent(final Parser parser, final Date date, final int level,
39
+    public DebugInfoEvent(final Parser parser, final LocalDateTime date, final int level,
40
             final String data) {
40
             final String data) {
41
         super(parser, date);
41
         super(parser, date);
42
         this.level = level;
42
         this.level = level;

+ 3
- 2
common/src/com/dmdirc/parser/events/ErrorInfoEvent.java Vedi File

25
 import com.dmdirc.parser.common.ParserError;
25
 import com.dmdirc.parser.common.ParserError;
26
 import com.dmdirc.parser.interfaces.Parser;
26
 import com.dmdirc.parser.interfaces.Parser;
27
 
27
 
28
-import java.util.Date;
28
+import java.time.LocalDateTime;
29
 
29
 
30
 import static com.google.common.base.Preconditions.checkNotNull;
30
 import static com.google.common.base.Preconditions.checkNotNull;
31
 
31
 
36
 
36
 
37
     private final ParserError errorInfo;
37
     private final ParserError errorInfo;
38
 
38
 
39
-    public ErrorInfoEvent(final Parser parser, final Date date, final ParserError errorInfo) {
39
+    public ErrorInfoEvent(final Parser parser, final LocalDateTime date,
40
+            final ParserError errorInfo) {
40
         super(parser, date);
41
         super(parser, date);
41
         this.errorInfo = checkNotNull(errorInfo);
42
         this.errorInfo = checkNotNull(errorInfo);
42
     }
43
     }

+ 2
- 2
common/src/com/dmdirc/parser/events/GroupListEndEvent.java Vedi File

24
 
24
 
25
 import com.dmdirc.parser.interfaces.Parser;
25
 import com.dmdirc.parser.interfaces.Parser;
26
 
26
 
27
-import java.util.Date;
27
+import java.time.LocalDateTime;
28
 
28
 
29
 /**
29
 /**
30
  * Callback interface for when the parser receives the end of a group list response.
30
  * Callback interface for when the parser receives the end of a group list response.
31
  */
31
  */
32
 public class GroupListEndEvent extends ParserEvent {
32
 public class GroupListEndEvent extends ParserEvent {
33
 
33
 
34
-    public GroupListEndEvent(final Parser parser, final Date date) {
34
+    public GroupListEndEvent(final Parser parser, final LocalDateTime date) {
35
         super(parser, date);
35
         super(parser, date);
36
     }
36
     }
37
 }
37
 }

+ 2
- 2
common/src/com/dmdirc/parser/events/GroupListEntryEvent.java Vedi File

24
 
24
 
25
 import com.dmdirc.parser.interfaces.Parser;
25
 import com.dmdirc.parser.interfaces.Parser;
26
 
26
 
27
-import java.util.Date;
27
+import java.time.LocalDateTime;
28
 
28
 
29
 import static com.google.common.base.Preconditions.checkNotNull;
29
 import static com.google.common.base.Preconditions.checkNotNull;
30
 
30
 
37
     private final int users;
37
     private final int users;
38
     private final String topic;
38
     private final String topic;
39
 
39
 
40
-    public GroupListEntryEvent(final Parser parser, final Date date, final String name,
40
+    public GroupListEntryEvent(final Parser parser, final LocalDateTime date, final String name,
41
             final int users, final String topic) {
41
             final int users, final String topic) {
42
         super(parser, date);
42
         super(parser, date);
43
         this.name = checkNotNull(name);
43
         this.name = checkNotNull(name);

+ 2
- 2
common/src/com/dmdirc/parser/events/GroupListStartEvent.java Vedi File

24
 
24
 
25
 import com.dmdirc.parser.interfaces.Parser;
25
 import com.dmdirc.parser.interfaces.Parser;
26
 
26
 
27
-import java.util.Date;
27
+import java.time.LocalDateTime;
28
 
28
 
29
 /**
29
 /**
30
  * Callback interface for when the parser receives the start of a group list response.
30
  * Callback interface for when the parser receives the start of a group list response.
31
  */
31
  */
32
 public class GroupListStartEvent extends ParserEvent {
32
 public class GroupListStartEvent extends ParserEvent {
33
 
33
 
34
-    public GroupListStartEvent(final Parser parser, final Date date) {
34
+    public GroupListStartEvent(final Parser parser, final LocalDateTime date) {
35
         super(parser, date);
35
         super(parser, date);
36
     }
36
     }
37
 }
37
 }

+ 2
- 2
common/src/com/dmdirc/parser/events/InviteEvent.java Vedi File

24
 
24
 
25
 import com.dmdirc.parser.interfaces.Parser;
25
 import com.dmdirc.parser.interfaces.Parser;
26
 
26
 
27
-import java.util.Date;
27
+import java.time.LocalDateTime;
28
 
28
 
29
 import static com.google.common.base.Preconditions.checkNotNull;
29
 import static com.google.common.base.Preconditions.checkNotNull;
30
 
30
 
36
     private final String userHost;
36
     private final String userHost;
37
     private final String channel;
37
     private final String channel;
38
 
38
 
39
-    public InviteEvent(final Parser parser, final Date date, final String userHost,
39
+    public InviteEvent(final Parser parser, final LocalDateTime date, final String userHost,
40
             final String channel) {
40
             final String channel) {
41
         super(parser, date);
41
         super(parser, date);
42
         this.userHost = checkNotNull(userHost);
42
         this.userHost = checkNotNull(userHost);

+ 2
- 2
common/src/com/dmdirc/parser/events/MOTDEndEvent.java Vedi File

24
 
24
 
25
 import com.dmdirc.parser.interfaces.Parser;
25
 import com.dmdirc.parser.interfaces.Parser;
26
 
26
 
27
-import java.util.Date;
27
+import java.time.LocalDateTime;
28
 
28
 
29
 import static com.google.common.base.Preconditions.checkNotNull;
29
 import static com.google.common.base.Preconditions.checkNotNull;
30
 
30
 
36
     private final boolean noMOTD;
36
     private final boolean noMOTD;
37
     private final String data;
37
     private final String data;
38
 
38
 
39
-    public MOTDEndEvent(final Parser parser, final Date date, final boolean noMOTD,
39
+    public MOTDEndEvent(final Parser parser, final LocalDateTime date, final boolean noMOTD,
40
             final String data) {
40
             final String data) {
41
         super(parser, date);
41
         super(parser, date);
42
         this.noMOTD = noMOTD;
42
         this.noMOTD = noMOTD;

+ 2
- 2
common/src/com/dmdirc/parser/events/MOTDLineEvent.java Vedi File

24
 
24
 
25
 import com.dmdirc.parser.interfaces.Parser;
25
 import com.dmdirc.parser.interfaces.Parser;
26
 
26
 
27
-import java.util.Date;
27
+import java.time.LocalDateTime;
28
 
28
 
29
 import static com.google.common.base.Preconditions.checkNotNull;
29
 import static com.google.common.base.Preconditions.checkNotNull;
30
 
30
 
35
 
35
 
36
     private final String data;
36
     private final String data;
37
 
37
 
38
-    public MOTDLineEvent(final Parser parser, final Date date, final String data) {
38
+    public MOTDLineEvent(final Parser parser, final LocalDateTime date, final String data) {
39
         super(parser, date);
39
         super(parser, date);
40
         this.data = checkNotNull(data);
40
         this.data = checkNotNull(data);
41
     }
41
     }

+ 2
- 2
common/src/com/dmdirc/parser/events/MOTDStartEvent.java Vedi File

24
 
24
 
25
 import com.dmdirc.parser.interfaces.Parser;
25
 import com.dmdirc.parser.interfaces.Parser;
26
 
26
 
27
-import java.util.Date;
27
+import java.time.LocalDateTime;
28
 
28
 
29
 import static com.google.common.base.Preconditions.checkNotNull;
29
 import static com.google.common.base.Preconditions.checkNotNull;
30
 
30
 
35
 
35
 
36
     private final String data;
36
     private final String data;
37
 
37
 
38
-    public MOTDStartEvent(final Parser parser, final Date date, final String data) {
38
+    public MOTDStartEvent(final Parser parser, final LocalDateTime date, final String data) {
39
         super(parser, date);
39
         super(parser, date);
40
         this.data = checkNotNull(data);
40
         this.data = checkNotNull(data);
41
     }
41
     }

+ 3
- 3
common/src/com/dmdirc/parser/events/NetworkDetectedEvent.java Vedi File

24
 
24
 
25
 import com.dmdirc.parser.interfaces.Parser;
25
 import com.dmdirc.parser.interfaces.Parser;
26
 
26
 
27
-import java.util.Date;
27
+import java.time.LocalDateTime;
28
 
28
 
29
 import static com.google.common.base.Preconditions.checkNotNull;
29
 import static com.google.common.base.Preconditions.checkNotNull;
30
 
30
 
37
     private final String ircdVersion;
37
     private final String ircdVersion;
38
     private final String ircdType;
38
     private final String ircdType;
39
 
39
 
40
-    public NetworkDetectedEvent(final Parser parser, final Date date, final String networkName,
41
-            final String ircdVersion, final String ircdType) {
40
+    public NetworkDetectedEvent(final Parser parser, final LocalDateTime date,
41
+            final String networkName, final String ircdVersion, final String ircdType) {
42
         super(parser, date);
42
         super(parser, date);
43
         this.networkName = checkNotNull(networkName);
43
         this.networkName = checkNotNull(networkName);
44
         this.ircdVersion = checkNotNull(ircdVersion);
44
         this.ircdVersion = checkNotNull(ircdVersion);

+ 2
- 2
common/src/com/dmdirc/parser/events/NickChangeEvent.java Vedi File

25
 import com.dmdirc.parser.interfaces.ClientInfo;
25
 import com.dmdirc.parser.interfaces.ClientInfo;
26
 import com.dmdirc.parser.interfaces.Parser;
26
 import com.dmdirc.parser.interfaces.Parser;
27
 
27
 
28
-import java.util.Date;
28
+import java.time.LocalDateTime;
29
 
29
 
30
 import static com.google.common.base.Preconditions.checkNotNull;
30
 import static com.google.common.base.Preconditions.checkNotNull;
31
 
31
 
37
     private final ClientInfo client;
37
     private final ClientInfo client;
38
     private final String oldNick;
38
     private final String oldNick;
39
 
39
 
40
-    public NickChangeEvent(final Parser parser, final Date date, final ClientInfo client,
40
+    public NickChangeEvent(final Parser parser, final LocalDateTime date, final ClientInfo client,
41
             final String oldNick) {
41
             final String oldNick) {
42
         super(parser, date);
42
         super(parser, date);
43
         this.client = checkNotNull(client);
43
         this.client = checkNotNull(client);

+ 2
- 2
common/src/com/dmdirc/parser/events/NickInUseEvent.java Vedi File

24
 
24
 
25
 import com.dmdirc.parser.interfaces.Parser;
25
 import com.dmdirc.parser.interfaces.Parser;
26
 
26
 
27
-import java.util.Date;
27
+import java.time.LocalDateTime;
28
 
28
 
29
 import static com.google.common.base.Preconditions.checkNotNull;
29
 import static com.google.common.base.Preconditions.checkNotNull;
30
 
30
 
35
 
35
 
36
     private final String nickname;
36
     private final String nickname;
37
 
37
 
38
-    public NickInUseEvent(final Parser parser, final Date date, final String nickname) {
38
+    public NickInUseEvent(final Parser parser, final LocalDateTime date, final String nickname) {
39
         super(parser, date);
39
         super(parser, date);
40
         this.nickname = checkNotNull(nickname);
40
         this.nickname = checkNotNull(nickname);
41
     }
41
     }

+ 2
- 2
common/src/com/dmdirc/parser/events/NumericEvent.java Vedi File

24
 
24
 
25
 import com.dmdirc.parser.interfaces.Parser;
25
 import com.dmdirc.parser.interfaces.Parser;
26
 
26
 
27
-import java.util.Date;
27
+import java.time.LocalDateTime;
28
 
28
 
29
 import static com.google.common.base.Preconditions.checkNotNull;
29
 import static com.google.common.base.Preconditions.checkNotNull;
30
 
30
 
36
     private final int numeric;
36
     private final int numeric;
37
     private final String[] token;
37
     private final String[] token;
38
 
38
 
39
-    public NumericEvent(final Parser parser, final Date date, final int numeric,
39
+    public NumericEvent(final Parser parser, final LocalDateTime date, final int numeric,
40
             final String[] token) {
40
             final String[] token) {
41
         super(parser, date);
41
         super(parser, date);
42
         this.numeric = checkNotNull(numeric);
42
         this.numeric = checkNotNull(numeric);

+ 3
- 3
common/src/com/dmdirc/parser/events/OtherAwayStateEvent.java Vedi File

26
 import com.dmdirc.parser.interfaces.ClientInfo;
26
 import com.dmdirc.parser.interfaces.ClientInfo;
27
 import com.dmdirc.parser.interfaces.Parser;
27
 import com.dmdirc.parser.interfaces.Parser;
28
 
28
 
29
-import java.util.Date;
29
+import java.time.LocalDateTime;
30
 
30
 
31
 import static com.google.common.base.Preconditions.checkNotNull;
31
 import static com.google.common.base.Preconditions.checkNotNull;
32
 
32
 
39
     private final AwayState oldState;
39
     private final AwayState oldState;
40
     private final AwayState newState;
40
     private final AwayState newState;
41
 
41
 
42
-    public OtherAwayStateEvent(final Parser parser, final Date date, final ClientInfo client,
43
-            final AwayState oldState, final AwayState newState) {
42
+    public OtherAwayStateEvent(final Parser parser, final LocalDateTime date,
43
+            final ClientInfo client, final AwayState oldState, final AwayState newState) {
44
         super(parser, date);
44
         super(parser, date);
45
         this.client = checkNotNull(client);
45
         this.client = checkNotNull(client);
46
         this.oldState = checkNotNull(oldState);
46
         this.oldState = checkNotNull(oldState);

+ 3
- 2
common/src/com/dmdirc/parser/events/ParserErrorEvent.java Vedi File

24
 
24
 
25
 import com.dmdirc.parser.interfaces.Parser;
25
 import com.dmdirc.parser.interfaces.Parser;
26
 
26
 
27
-import java.util.Date;
27
+import java.time.LocalDateTime;
28
 
28
 
29
 import static com.google.common.base.Preconditions.checkNotNull;
29
 import static com.google.common.base.Preconditions.checkNotNull;
30
 
30
 
35
 
35
 
36
     private final Throwable throwable;
36
     private final Throwable throwable;
37
 
37
 
38
-    public ParserErrorEvent(final Parser parser, final Date date, final Throwable throwable) {
38
+    public ParserErrorEvent(final Parser parser, final LocalDateTime date,
39
+            final Throwable throwable) {
39
         super(parser, date);
40
         super(parser, date);
40
         this.throwable = checkNotNull(throwable);
41
         this.throwable = checkNotNull(throwable);
41
     }
42
     }

+ 4
- 4
common/src/com/dmdirc/parser/events/ParserEvent.java Vedi File

24
 
24
 
25
 import com.dmdirc.parser.interfaces.Parser;
25
 import com.dmdirc.parser.interfaces.Parser;
26
 
26
 
27
-import java.util.Date;
27
+import java.time.LocalDateTime;
28
 
28
 
29
 import static com.google.common.base.Preconditions.checkNotNull;
29
 import static com.google.common.base.Preconditions.checkNotNull;
30
 
30
 
34
 public abstract class ParserEvent {
34
 public abstract class ParserEvent {
35
 
35
 
36
     private final Parser parser;
36
     private final Parser parser;
37
-    private final Date date;
37
+    private final LocalDateTime date;
38
 
38
 
39
-    public ParserEvent(final Parser parser, final Date date) {
39
+    public ParserEvent(final Parser parser, final LocalDateTime date) {
40
         this.parser = checkNotNull(parser);
40
         this.parser = checkNotNull(parser);
41
         this.date = checkNotNull(date);
41
         this.date = checkNotNull(date);
42
     }
42
     }
45
         return parser;
45
         return parser;
46
     }
46
     }
47
 
47
 
48
-    public Date getDate() {
48
+    public LocalDateTime getDate() {
49
         return date;
49
         return date;
50
     }
50
     }
51
 
51
 

+ 2
- 2
common/src/com/dmdirc/parser/events/PasswordRequiredEvent.java Vedi File

24
 
24
 
25
 import com.dmdirc.parser.interfaces.Parser;
25
 import com.dmdirc.parser.interfaces.Parser;
26
 
26
 
27
-import java.util.Date;
27
+import java.time.LocalDateTime;
28
 
28
 
29
 /**
29
 /**
30
  * Interface Used when a raw 464 is recieved.
30
  * Interface Used when a raw 464 is recieved.
31
  */
31
  */
32
 public class PasswordRequiredEvent extends ParserEvent {
32
 public class PasswordRequiredEvent extends ParserEvent {
33
 
33
 
34
-    public PasswordRequiredEvent(final Parser parser, final Date date) {
34
+    public PasswordRequiredEvent(final Parser parser, final LocalDateTime date) {
35
         super(parser, date);
35
         super(parser, date);
36
     }
36
     }
37
 }
37
 }

+ 2
- 2
common/src/com/dmdirc/parser/events/PingFailureEvent.java Vedi File

24
 
24
 
25
 import com.dmdirc.parser.interfaces.Parser;
25
 import com.dmdirc.parser.interfaces.Parser;
26
 
26
 
27
-import java.util.Date;
27
+import java.time.LocalDateTime;
28
 
28
 
29
 /**
29
 /**
30
  * Called when a Ping Failed.
30
  * Called when a Ping Failed.
31
  */
31
  */
32
 public class PingFailureEvent extends ParserEvent {
32
 public class PingFailureEvent extends ParserEvent {
33
 
33
 
34
-    public PingFailureEvent(final Parser parser, final Date date) {
34
+    public PingFailureEvent(final Parser parser, final LocalDateTime date) {
35
         super(parser, date);
35
         super(parser, date);
36
     }
36
     }
37
 }
37
 }

+ 2
- 2
common/src/com/dmdirc/parser/events/PingSentEvent.java Vedi File

24
 
24
 
25
 import com.dmdirc.parser.interfaces.Parser;
25
 import com.dmdirc.parser.interfaces.Parser;
26
 
26
 
27
-import java.util.Date;
27
+import java.time.LocalDateTime;
28
 
28
 
29
 /**
29
 /**
30
  * Called when a Ping was Sent.
30
  * Called when a Ping was Sent.
31
  */
31
  */
32
 public class PingSentEvent extends ParserEvent {
32
 public class PingSentEvent extends ParserEvent {
33
 
33
 
34
-    public PingSentEvent(final Parser parser, final Date date) {
34
+    public PingSentEvent(final Parser parser, final LocalDateTime date) {
35
         super(parser, date);
35
         super(parser, date);
36
     }
36
     }
37
 }
37
 }

+ 2
- 2
common/src/com/dmdirc/parser/events/PingSuccessEvent.java Vedi File

24
 
24
 
25
 import com.dmdirc.parser.interfaces.Parser;
25
 import com.dmdirc.parser.interfaces.Parser;
26
 
26
 
27
-import java.util.Date;
27
+import java.time.LocalDateTime;
28
 
28
 
29
 /**
29
 /**
30
  * Called when a Ping was a Success.
30
  * Called when a Ping was a Success.
31
  */
31
  */
32
 public class PingSuccessEvent extends ParserEvent {
32
 public class PingSuccessEvent extends ParserEvent {
33
 
33
 
34
-    public PingSuccessEvent(final Parser parser, final Date date) {
34
+    public PingSuccessEvent(final Parser parser, final LocalDateTime date) {
35
         super(parser, date);
35
         super(parser, date);
36
     }
36
     }
37
 }
37
 }

+ 2
- 2
common/src/com/dmdirc/parser/events/PrivateActionEvent.java Vedi File

24
 
24
 
25
 import com.dmdirc.parser.interfaces.Parser;
25
 import com.dmdirc.parser.interfaces.Parser;
26
 
26
 
27
-import java.util.Date;
27
+import java.time.LocalDateTime;
28
 
28
 
29
 import static com.google.common.base.Preconditions.checkNotNull;
29
 import static com.google.common.base.Preconditions.checkNotNull;
30
 
30
 
36
     private final String message;
36
     private final String message;
37
     private final String host;
37
     private final String host;
38
 
38
 
39
-    public PrivateActionEvent(final Parser parser, final Date date, final String message,
39
+    public PrivateActionEvent(final Parser parser, final LocalDateTime date, final String message,
40
             final String host) {
40
             final String host) {
41
         super(parser, date);
41
         super(parser, date);
42
         this.message = checkNotNull(message);
42
         this.message = checkNotNull(message);

+ 2
- 2
common/src/com/dmdirc/parser/events/PrivateCTCPEvent.java Vedi File

24
 
24
 
25
 import com.dmdirc.parser.interfaces.Parser;
25
 import com.dmdirc.parser.interfaces.Parser;
26
 
26
 
27
-import java.util.Date;
27
+import java.time.LocalDateTime;
28
 
28
 
29
 import static com.google.common.base.Preconditions.checkNotNull;
29
 import static com.google.common.base.Preconditions.checkNotNull;
30
 
30
 
37
     private final String message;
37
     private final String message;
38
     private final String host;
38
     private final String host;
39
 
39
 
40
-    public PrivateCTCPEvent(final Parser parser, final Date date, final String type,
40
+    public PrivateCTCPEvent(final Parser parser, final LocalDateTime date, final String type,
41
             final String message, final String host) {
41
             final String message, final String host) {
42
         super(parser, date);
42
         super(parser, date);
43
         this.type = checkNotNull(type);
43
         this.type = checkNotNull(type);

+ 2
- 2
common/src/com/dmdirc/parser/events/PrivateCTCPReplyEvent.java Vedi File

24
 
24
 
25
 import com.dmdirc.parser.interfaces.Parser;
25
 import com.dmdirc.parser.interfaces.Parser;
26
 
26
 
27
-import java.util.Date;
27
+import java.time.LocalDateTime;
28
 
28
 
29
 import static com.google.common.base.Preconditions.checkNotNull;
29
 import static com.google.common.base.Preconditions.checkNotNull;
30
 
30
 
37
     private final String message;
37
     private final String message;
38
     private final String host;
38
     private final String host;
39
 
39
 
40
-    public PrivateCTCPReplyEvent(final Parser parser, final Date date, final String type,
40
+    public PrivateCTCPReplyEvent(final Parser parser, final LocalDateTime date, final String type,
41
             final String message, final String host) {
41
             final String message, final String host) {
42
         super(parser, date);
42
         super(parser, date);
43
         this.type = checkNotNull(type);
43
         this.type = checkNotNull(type);

+ 2
- 2
common/src/com/dmdirc/parser/events/PrivateMessageEvent.java Vedi File

24
 
24
 
25
 import com.dmdirc.parser.interfaces.Parser;
25
 import com.dmdirc.parser.interfaces.Parser;
26
 
26
 
27
-import java.util.Date;
27
+import java.time.LocalDateTime;
28
 
28
 
29
 import static com.google.common.base.Preconditions.checkNotNull;
29
 import static com.google.common.base.Preconditions.checkNotNull;
30
 
30
 
36
     private final String message;
36
     private final String message;
37
     private final String host;
37
     private final String host;
38
 
38
 
39
-    public PrivateMessageEvent(final Parser parser, final Date date, final String message,
39
+    public PrivateMessageEvent(final Parser parser, final LocalDateTime date, final String message,
40
             final String host) {
40
             final String host) {
41
         super(parser, date);
41
         super(parser, date);
42
         this.message = checkNotNull(message);
42
         this.message = checkNotNull(message);

+ 2
- 2
common/src/com/dmdirc/parser/events/PrivateNoticeEvent.java Vedi File

24
 
24
 
25
 import com.dmdirc.parser.interfaces.Parser;
25
 import com.dmdirc.parser.interfaces.Parser;
26
 
26
 
27
-import java.util.Date;
27
+import java.time.LocalDateTime;
28
 
28
 
29
 import static com.google.common.base.Preconditions.checkNotNull;
29
 import static com.google.common.base.Preconditions.checkNotNull;
30
 
30
 
36
     private final String message;
36
     private final String message;
37
     private final String host;
37
     private final String host;
38
 
38
 
39
-    public PrivateNoticeEvent(final Parser parser, final Date date, final String message,
39
+    public PrivateNoticeEvent(final Parser parser, final LocalDateTime date, final String message,
40
             final String host) {
40
             final String host) {
41
         super(parser, date);
41
         super(parser, date);
42
         this.message = checkNotNull(message);
42
         this.message = checkNotNull(message);

+ 2
- 2
common/src/com/dmdirc/parser/events/QuitEvent.java Vedi File

25
 import com.dmdirc.parser.interfaces.ClientInfo;
25
 import com.dmdirc.parser.interfaces.ClientInfo;
26
 import com.dmdirc.parser.interfaces.Parser;
26
 import com.dmdirc.parser.interfaces.Parser;
27
 
27
 
28
-import java.util.Date;
28
+import java.time.LocalDateTime;
29
 
29
 
30
 import static com.google.common.base.Preconditions.checkNotNull;
30
 import static com.google.common.base.Preconditions.checkNotNull;
31
 
31
 
37
     private final ClientInfo client;
37
     private final ClientInfo client;
38
     private final String reason;
38
     private final String reason;
39
 
39
 
40
-    public QuitEvent(final Parser parser, final Date date, final ClientInfo client,
40
+    public QuitEvent(final Parser parser, final LocalDateTime date, final ClientInfo client,
41
             final String reason) {
41
             final String reason) {
42
         super(parser, date);
42
         super(parser, date);
43
         this.client = checkNotNull(client);
43
         this.client = checkNotNull(client);

+ 2
- 2
common/src/com/dmdirc/parser/events/ServerErrorEvent.java Vedi File

24
 
24
 
25
 import com.dmdirc.parser.interfaces.Parser;
25
 import com.dmdirc.parser.interfaces.Parser;
26
 
26
 
27
-import java.util.Date;
27
+import java.time.LocalDateTime;
28
 
28
 
29
 import static com.google.common.base.Preconditions.checkNotNull;
29
 import static com.google.common.base.Preconditions.checkNotNull;
30
 
30
 
35
 
35
 
36
     private final String message;
36
     private final String message;
37
 
37
 
38
-    public ServerErrorEvent(final Parser parser, final Date date, final String message) {
38
+    public ServerErrorEvent(final Parser parser, final LocalDateTime date, final String message) {
39
         super(parser, date);
39
         super(parser, date);
40
         this.message = checkNotNull(message);
40
         this.message = checkNotNull(message);
41
     }
41
     }

+ 2
- 2
common/src/com/dmdirc/parser/events/ServerNoticeEvent.java Vedi File

24
 
24
 
25
 import com.dmdirc.parser.interfaces.Parser;
25
 import com.dmdirc.parser.interfaces.Parser;
26
 
26
 
27
-import java.util.Date;
27
+import java.time.LocalDateTime;
28
 
28
 
29
 import static com.google.common.base.Preconditions.checkNotNull;
29
 import static com.google.common.base.Preconditions.checkNotNull;
30
 
30
 
36
     private final String message;
36
     private final String message;
37
     private final String host;
37
     private final String host;
38
 
38
 
39
-    public ServerNoticeEvent(final Parser parser, final Date date, final String message,
39
+    public ServerNoticeEvent(final Parser parser, final LocalDateTime date, final String message,
40
             final String host) {
40
             final String host) {
41
         super(parser, date);
41
         super(parser, date);
42
         this.message = checkNotNull(message);
42
         this.message = checkNotNull(message);

+ 2
- 2
common/src/com/dmdirc/parser/events/ServerReadyEvent.java Vedi File

24
 
24
 
25
 import com.dmdirc.parser.interfaces.Parser;
25
 import com.dmdirc.parser.interfaces.Parser;
26
 
26
 
27
-import java.util.Date;
27
+import java.time.LocalDateTime;
28
 
28
 
29
 /**
29
 /**
30
  * Called after 001.
30
  * Called after 001.
31
  */
31
  */
32
 public class ServerReadyEvent extends ParserEvent {
32
 public class ServerReadyEvent extends ParserEvent {
33
 
33
 
34
-    public ServerReadyEvent(final Parser parser, final Date date) {
34
+    public ServerReadyEvent(final Parser parser, final LocalDateTime date) {
35
         super(parser, date);
35
         super(parser, date);
36
     }
36
     }
37
 }
37
 }

+ 2
- 2
common/src/com/dmdirc/parser/events/SocketCloseEvent.java Vedi File

24
 
24
 
25
 import com.dmdirc.parser.interfaces.Parser;
25
 import com.dmdirc.parser.interfaces.Parser;
26
 
26
 
27
-import java.util.Date;
27
+import java.time.LocalDateTime;
28
 
28
 
29
 /**
29
 /**
30
  * Called when the socket is closed.
30
  * Called when the socket is closed.
31
  */
31
  */
32
 public class SocketCloseEvent extends ParserEvent {
32
 public class SocketCloseEvent extends ParserEvent {
33
 
33
 
34
-    public SocketCloseEvent(final Parser parser, final Date date) {
34
+    public SocketCloseEvent(final Parser parser, final LocalDateTime date) {
35
         super(parser, date);
35
         super(parser, date);
36
     }
36
     }
37
 }
37
 }

+ 2
- 2
common/src/com/dmdirc/parser/events/UnknownActionEvent.java Vedi File

24
 
24
 
25
 import com.dmdirc.parser.interfaces.Parser;
25
 import com.dmdirc.parser.interfaces.Parser;
26
 
26
 
27
-import java.util.Date;
27
+import java.time.LocalDateTime;
28
 
28
 
29
 import static com.google.common.base.Preconditions.checkNotNull;
29
 import static com.google.common.base.Preconditions.checkNotNull;
30
 
30
 
37
     private final String target;
37
     private final String target;
38
     private final String host;
38
     private final String host;
39
 
39
 
40
-    public UnknownActionEvent(final Parser parser, final Date date, final String message,
40
+    public UnknownActionEvent(final Parser parser, final LocalDateTime date, final String message,
41
             final String target, final String host) {
41
             final String target, final String host) {
42
         super(parser, date);
42
         super(parser, date);
43
         this.message = checkNotNull(message);
43
         this.message = checkNotNull(message);

+ 2
- 2
common/src/com/dmdirc/parser/events/UnknownCTCPEvent.java Vedi File

24
 
24
 
25
 import com.dmdirc.parser.interfaces.Parser;
25
 import com.dmdirc.parser.interfaces.Parser;
26
 
26
 
27
-import java.util.Date;
27
+import java.time.LocalDateTime;
28
 
28
 
29
 import static com.google.common.base.Preconditions.checkNotNull;
29
 import static com.google.common.base.Preconditions.checkNotNull;
30
 
30
 
38
     private final String target;
38
     private final String target;
39
     private final String host;
39
     private final String host;
40
 
40
 
41
-    public UnknownCTCPEvent(final Parser parser, final Date date, final String type,
41
+    public UnknownCTCPEvent(final Parser parser, final LocalDateTime date, final String type,
42
             final String message, final String target, final String host) {
42
             final String message, final String target, final String host) {
43
         super(parser, date);
43
         super(parser, date);
44
         this.type = checkNotNull(type);
44
         this.type = checkNotNull(type);

+ 2
- 2
common/src/com/dmdirc/parser/events/UnknownCTCPReplyEvent.java Vedi File

24
 
24
 
25
 import com.dmdirc.parser.interfaces.Parser;
25
 import com.dmdirc.parser.interfaces.Parser;
26
 
26
 
27
-import java.util.Date;
27
+import java.time.LocalDateTime;
28
 
28
 
29
 import static com.google.common.base.Preconditions.checkNotNull;
29
 import static com.google.common.base.Preconditions.checkNotNull;
30
 
30
 
38
     private final String target;
38
     private final String target;
39
     private final String host;
39
     private final String host;
40
 
40
 
41
-    public UnknownCTCPReplyEvent(final Parser parser, final Date date, final String type,
41
+    public UnknownCTCPReplyEvent(final Parser parser, final LocalDateTime date, final String type,
42
             final String message, final String target, final String host) {
42
             final String message, final String target, final String host) {
43
         super(parser, date);
43
         super(parser, date);
44
         this.type = checkNotNull(type);
44
         this.type = checkNotNull(type);

+ 2
- 2
common/src/com/dmdirc/parser/events/UnknownMessageEvent.java Vedi File

24
 
24
 
25
 import com.dmdirc.parser.interfaces.Parser;
25
 import com.dmdirc.parser.interfaces.Parser;
26
 
26
 
27
-import java.util.Date;
27
+import java.time.LocalDateTime;
28
 
28
 
29
 import static com.google.common.base.Preconditions.checkNotNull;
29
 import static com.google.common.base.Preconditions.checkNotNull;
30
 
30
 
37
     private final String target;
37
     private final String target;
38
     private final String host;
38
     private final String host;
39
 
39
 
40
-    public UnknownMessageEvent(final Parser parser, final Date date,
40
+    public UnknownMessageEvent(final Parser parser, final LocalDateTime date,
41
             final String message, final String target, final String host) {
41
             final String message, final String target, final String host) {
42
         super(parser, date);
42
         super(parser, date);
43
         this.message = checkNotNull(message);
43
         this.message = checkNotNull(message);

+ 2
- 2
common/src/com/dmdirc/parser/events/UnknownNoticeEvent.java Vedi File

24
 
24
 
25
 import com.dmdirc.parser.interfaces.Parser;
25
 import com.dmdirc.parser.interfaces.Parser;
26
 
26
 
27
-import java.util.Date;
27
+import java.time.LocalDateTime;
28
 
28
 
29
 import static com.google.common.base.Preconditions.checkNotNull;
29
 import static com.google.common.base.Preconditions.checkNotNull;
30
 
30
 
37
     private final String target;
37
     private final String target;
38
     private final String host;
38
     private final String host;
39
 
39
 
40
-    public UnknownNoticeEvent(final Parser parser, final Date date,
40
+    public UnknownNoticeEvent(final Parser parser, final LocalDateTime date,
41
             final String message, final String target, final String host) {
41
             final String message, final String target, final String host) {
42
         super(parser, date);
42
         super(parser, date);
43
         this.message = checkNotNull(message);
43
         this.message = checkNotNull(message);

+ 3
- 3
common/src/com/dmdirc/parser/events/UnknownServerNoticeEvent.java Vedi File

24
 
24
 
25
 import com.dmdirc.parser.interfaces.Parser;
25
 import com.dmdirc.parser.interfaces.Parser;
26
 
26
 
27
-import java.util.Date;
27
+import java.time.LocalDateTime;
28
 
28
 
29
 import static com.google.common.base.Preconditions.checkNotNull;
29
 import static com.google.common.base.Preconditions.checkNotNull;
30
 
30
 
37
     private final String target;
37
     private final String target;
38
     private final String host;
38
     private final String host;
39
 
39
 
40
-    public UnknownServerNoticeEvent(final Parser parser, final Date date, final String message,
41
-            final String target, final String host) {
40
+    public UnknownServerNoticeEvent(final Parser parser, final LocalDateTime date,
41
+            final String message, final String target, final String host) {
42
         super(parser, date);
42
         super(parser, date);
43
         this.message = checkNotNull(message);
43
         this.message = checkNotNull(message);
44
         this.target = checkNotNull(target);
44
         this.target = checkNotNull(target);

+ 2
- 2
common/src/com/dmdirc/parser/events/UserInfoEvent.java Vedi File

25
 import com.dmdirc.parser.interfaces.ClientInfo;
25
 import com.dmdirc.parser.interfaces.ClientInfo;
26
 import com.dmdirc.parser.interfaces.Parser;
26
 import com.dmdirc.parser.interfaces.Parser;
27
 
27
 
28
+import java.time.LocalDateTime;
28
 import java.util.Collections;
29
 import java.util.Collections;
29
-import java.util.Date;
30
 import java.util.EnumMap;
30
 import java.util.EnumMap;
31
 import java.util.Map;
31
 import java.util.Map;
32
 import java.util.Optional;
32
 import java.util.Optional;
39
     private final ClientInfo client;
39
     private final ClientInfo client;
40
     private final Map<UserInfoType, String> info;
40
     private final Map<UserInfoType, String> info;
41
 
41
 
42
-    public UserInfoEvent(final Parser parser, final Date date, final ClientInfo client,
42
+    public UserInfoEvent(final Parser parser, final LocalDateTime date, final ClientInfo client,
43
             final Map<UserInfoType, String> info) {
43
             final Map<UserInfoType, String> info) {
44
         super(parser, date);
44
         super(parser, date);
45
         this.client = client;
45
         this.client = client;

+ 3
- 3
common/src/com/dmdirc/parser/events/UserModeChangeEvent.java Vedi File

25
 import com.dmdirc.parser.interfaces.ClientInfo;
25
 import com.dmdirc.parser.interfaces.ClientInfo;
26
 import com.dmdirc.parser.interfaces.Parser;
26
 import com.dmdirc.parser.interfaces.Parser;
27
 
27
 
28
-import java.util.Date;
28
+import java.time.LocalDateTime;
29
 
29
 
30
 import static com.google.common.base.Preconditions.checkNotNull;
30
 import static com.google.common.base.Preconditions.checkNotNull;
31
 
31
 
38
     private final String host;
38
     private final String host;
39
     private final String modes;
39
     private final String modes;
40
 
40
 
41
-    public UserModeChangeEvent(final Parser parser, final Date date, final ClientInfo client,
42
-            final String host, final String modes) {
41
+    public UserModeChangeEvent(final Parser parser, final LocalDateTime date,
42
+            final ClientInfo client, final String host, final String modes) {
43
         super(parser, date);
43
         super(parser, date);
44
         this.client = checkNotNull(client);
44
         this.client = checkNotNull(client);
45
         this.host = checkNotNull(host);
45
         this.host = checkNotNull(host);

+ 3
- 3
common/src/com/dmdirc/parser/events/UserModeDiscoveryEvent.java Vedi File

25
 import com.dmdirc.parser.interfaces.ClientInfo;
25
 import com.dmdirc.parser.interfaces.ClientInfo;
26
 import com.dmdirc.parser.interfaces.Parser;
26
 import com.dmdirc.parser.interfaces.Parser;
27
 
27
 
28
-import java.util.Date;
28
+import java.time.LocalDateTime;
29
 
29
 
30
 import static com.google.common.base.Preconditions.checkNotNull;
30
 import static com.google.common.base.Preconditions.checkNotNull;
31
 
31
 
37
     private final ClientInfo client;
37
     private final ClientInfo client;
38
     private final String modes;
38
     private final String modes;
39
 
39
 
40
-    public UserModeDiscoveryEvent(final Parser parser, final Date date, final ClientInfo client,
41
-            final String modes) {
40
+    public UserModeDiscoveryEvent(final Parser parser, final LocalDateTime date,
41
+            final ClientInfo client, final String modes) {
42
         super(parser, date);
42
         super(parser, date);
43
         this.client = checkNotNull(client);
43
         this.client = checkNotNull(client);
44
         this.modes = checkNotNull(modes);
44
         this.modes = checkNotNull(modes);

+ 2
- 2
common/src/com/dmdirc/parser/events/WallDesyncEvent.java Vedi File

24
 
24
 
25
 import com.dmdirc.parser.interfaces.Parser;
25
 import com.dmdirc.parser.interfaces.Parser;
26
 
26
 
27
-import java.util.Date;
27
+import java.time.LocalDateTime;
28
 
28
 
29
 import static com.google.common.base.Preconditions.checkNotNull;
29
 import static com.google.common.base.Preconditions.checkNotNull;
30
 
30
 
36
     private final String message;
36
     private final String message;
37
     private final String host;
37
     private final String host;
38
 
38
 
39
-    public WallDesyncEvent(final Parser parser, final Date date, final String message,
39
+    public WallDesyncEvent(final Parser parser, final LocalDateTime date, final String message,
40
             final String host) {
40
             final String host) {
41
         super(parser, date);
41
         super(parser, date);
42
         this.message = checkNotNull(message);
42
         this.message = checkNotNull(message);

+ 2
- 2
common/src/com/dmdirc/parser/events/WallopEvent.java Vedi File

24
 
24
 
25
 import com.dmdirc.parser.interfaces.Parser;
25
 import com.dmdirc.parser.interfaces.Parser;
26
 
26
 
27
-import java.util.Date;
27
+import java.time.LocalDateTime;
28
 
28
 
29
 import static com.google.common.base.Preconditions.checkNotNull;
29
 import static com.google.common.base.Preconditions.checkNotNull;
30
 
30
 
36
     private final String message;
36
     private final String message;
37
     private final String host;
37
     private final String host;
38
 
38
 
39
-    public WallopEvent(final Parser parser, final Date date, final String message,
39
+    public WallopEvent(final Parser parser, final LocalDateTime date, final String message,
40
             final String host) {
40
             final String host) {
41
         super(parser, date);
41
         super(parser, date);
42
         this.message = checkNotNull(message);
42
         this.message = checkNotNull(message);

+ 2
- 2
common/src/com/dmdirc/parser/events/WalluserEvent.java Vedi File

24
 
24
 
25
 import com.dmdirc.parser.interfaces.Parser;
25
 import com.dmdirc.parser.interfaces.Parser;
26
 
26
 
27
-import java.util.Date;
27
+import java.time.LocalDateTime;
28
 
28
 
29
 import static com.google.common.base.Preconditions.checkNotNull;
29
 import static com.google.common.base.Preconditions.checkNotNull;
30
 
30
 
36
     private final String message;
36
     private final String message;
37
     private final String host;
37
     private final String host;
38
 
38
 
39
-    public WalluserEvent(final Parser parser, final Date date, final String message,
39
+    public WalluserEvent(final Parser parser, final LocalDateTime date, final String message,
40
             final String host) {
40
             final String host) {
41
         super(parser, date);
41
         super(parser, date);
42
         this.message = checkNotNull(message);
42
         this.message = checkNotNull(message);

+ 21
- 20
irc/src/com/dmdirc/parser/irc/IRCParser.java Vedi File

58
 import java.security.KeyManagementException;
58
 import java.security.KeyManagementException;
59
 import java.security.NoSuchAlgorithmException;
59
 import java.security.NoSuchAlgorithmException;
60
 import java.security.SecureRandom;
60
 import java.security.SecureRandom;
61
-import java.text.ParseException;
62
-import java.text.SimpleDateFormat;
61
+import java.time.LocalDateTime;
62
+import java.time.ZoneOffset;
63
+import java.time.format.DateTimeFormatter;
64
+import java.time.format.DateTimeParseException;
63
 import java.util.ArrayList;
65
 import java.util.ArrayList;
64
 import java.util.Arrays;
66
 import java.util.Arrays;
65
 import java.util.Collection;
67
 import java.util.Collection;
66
 import java.util.Collections;
68
 import java.util.Collections;
67
-import java.util.Date;
68
 import java.util.HashMap;
69
 import java.util.HashMap;
69
 import java.util.LinkedList;
70
 import java.util.LinkedList;
70
 import java.util.List;
71
 import java.util.List;
527
      * @param message The error message
528
      * @param message The error message
528
      */
529
      */
529
     protected void callServerError(final String message) {
530
     protected void callServerError(final String message) {
530
-        getCallbackManager().publish(new ServerErrorEvent(this, new Date(), message));
531
+        getCallbackManager().publish(new ServerErrorEvent(this, LocalDateTime.now(), message));
531
     }
532
     }
532
 
533
 
533
     /**
534
     /**
536
      * @param data Incoming Line.
537
      * @param data Incoming Line.
537
      */
538
      */
538
     protected void callDataIn(final String data) {
539
     protected void callDataIn(final String data) {
539
-        getCallbackManager().publish(new DataInEvent(this, new Date(), data));
540
+        getCallbackManager().publish(new DataInEvent(this, LocalDateTime.now(), data));
540
     }
541
     }
541
 
542
 
542
     /**
543
     /**
546
      * @param fromParser True if parser sent the data, false if sent using .sendLine
547
      * @param fromParser True if parser sent the data, false if sent using .sendLine
547
      */
548
      */
548
     protected void callDataOut(final String data, final boolean fromParser) {
549
     protected void callDataOut(final String data, final boolean fromParser) {
549
-        getCallbackManager().publish(new DataOutEvent(this, new Date(), data));
550
+        getCallbackManager().publish(new DataOutEvent(this, LocalDateTime.now(), data));
550
     }
551
     }
551
 
552
 
552
     /**
553
     /**
567
      * @param data Debugging Information
568
      * @param data Debugging Information
568
      */
569
      */
569
     protected void callDebugInfo(final int level, final String data) {
570
     protected void callDebugInfo(final int level, final String data) {
570
-        getCallbackManager().publish(new DebugInfoEvent(this, new Date(), level, data));
571
+        getCallbackManager().publish(new DebugInfoEvent(this, LocalDateTime.now(), level, data));
571
     }
572
     }
572
 
573
 
573
     /**
574
     /**
576
      * @param errorInfo ParserError object representing the error.
577
      * @param errorInfo ParserError object representing the error.
577
      */
578
      */
578
     public void callErrorInfo(final ParserError errorInfo) {
579
     public void callErrorInfo(final ParserError errorInfo) {
579
-        getCallbackManager().publish(new ErrorInfoEvent(this, new Date(), errorInfo));
580
+        getCallbackManager().publish(new ErrorInfoEvent(this, LocalDateTime.now(), errorInfo));
580
     }
581
     }
581
 
582
 
582
     /**
583
     /**
585
      * @param errorInfo ParserError object representing the error.
586
      * @param errorInfo ParserError object representing the error.
586
      */
587
      */
587
     protected void callConnectError(final ParserError errorInfo) {
588
     protected void callConnectError(final ParserError errorInfo) {
588
-        getCallbackManager().publish(new ConnectErrorEvent(this, new Date(), errorInfo));
589
+        getCallbackManager().publish(new ConnectErrorEvent(this, LocalDateTime.now(), errorInfo));
589
     }
590
     }
590
 
591
 
591
     /**
592
     /**
595
         // Don't allow state resetting whilst there may be handlers requiring
596
         // Don't allow state resetting whilst there may be handlers requiring
596
         // state.
597
         // state.
597
         synchronized (resetStateSync) {
598
         synchronized (resetStateSync) {
598
-            getCallbackManager().publish(new SocketCloseEvent(this, new Date()));
599
+            getCallbackManager().publish(new SocketCloseEvent(this, LocalDateTime.now()));
599
         }
600
         }
600
     }
601
     }
601
 
602
 
603
      * Callback to all objects implementing the PingFailed Callback.
604
      * Callback to all objects implementing the PingFailed Callback.
604
      */
605
      */
605
     protected void callPingFailed() {
606
     protected void callPingFailed() {
606
-        getCallbackManager().publish(new PingFailureEvent(this, new Date()));
607
+        getCallbackManager().publish(new PingFailureEvent(this, LocalDateTime.now()));
607
     }
608
     }
608
 
609
 
609
     /**
610
     /**
610
      * Callback to all objects implementing the PingSent Callback.
611
      * Callback to all objects implementing the PingSent Callback.
611
      */
612
      */
612
     protected void callPingSent() {
613
     protected void callPingSent() {
613
-        getCallbackManager().publish(new PingSentEvent(this, new Date()));
614
+        getCallbackManager().publish(new PingSentEvent(this, LocalDateTime.now()));
614
     }
615
     }
615
 
616
 
616
     /**
617
     /**
617
      * Callback to all objects implementing the PingSuccess Callback.
618
      * Callback to all objects implementing the PingSuccess Callback.
618
      */
619
      */
619
     protected void callPingSuccess() {
620
     protected void callPingSuccess() {
620
-        getCallbackManager().publish(new PingSuccessEvent(this, new Date()));
621
+        getCallbackManager().publish(new PingSuccessEvent(this, LocalDateTime.now()));
621
     }
622
     }
622
 
623
 
623
     /**
624
     /**
641
         }
642
         }
642
 
643
 
643
         whoisHandler.start();
644
         whoisHandler.start();
644
-        getCallbackManager().publish(new ServerReadyEvent(this, new Date()));
645
+        getCallbackManager().publish(new ServerReadyEvent(this, LocalDateTime.now()));
645
     }
646
     }
646
 
647
 
647
     //---------------------------------------------------------------------------
648
     //---------------------------------------------------------------------------
1085
     protected void processLine(final ReadLine line) {
1086
     protected void processLine(final ReadLine line) {
1086
         callDataIn(line.getLine());
1087
         callDataIn(line.getLine());
1087
         final String[] token = line.getTokens();
1088
         final String[] token = line.getTokens();
1088
-        Date lineTS = new Date();
1089
+        LocalDateTime lineTS = LocalDateTime.now();
1089
 
1090
 
1090
         if (line.getTags().containsKey("tsirc date")) {
1091
         if (line.getTags().containsKey("tsirc date")) {
1091
             try {
1092
             try {
1092
-                final long ts = Long.parseLong(line.getTags().get("tsirc date"));
1093
-                lineTS = new Date(ts - tsdiff);
1093
+                final long ts = Long.parseLong(line.getTags().get("tsirc date")) - tsdiff;
1094
+                lineTS = LocalDateTime.ofEpochSecond(ts / 1000L, (int) (ts % 1000L), ZoneOffset.UTC);
1094
             } catch (final NumberFormatException nfe) { /* Do nothing. */ }
1095
             } catch (final NumberFormatException nfe) { /* Do nothing. */ }
1095
         } else if (line.getTags().containsKey("time")) {
1096
         } else if (line.getTags().containsKey("time")) {
1096
-            final SimpleDateFormat servertime = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
1097
             try {
1097
             try {
1098
-                lineTS = servertime.parse(line.getTags().get("time"));
1099
-            } catch (final ParseException pe) { /* Do nothing. */ }
1098
+                lineTS = LocalDateTime.parse(line.getTags().get("time"),
1099
+                        DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"));
1100
+            } catch (final DateTimeParseException pe) { /* Do nothing. */ }
1100
         }
1101
         }
1101
 
1102
 
1102
         setPingNeeded(false);
1103
         setPingNeeded(false);

+ 6
- 4
irc/src/com/dmdirc/parser/irc/ProcessingManager.java Vedi File

26
 import com.dmdirc.parser.events.NumericEvent;
26
 import com.dmdirc.parser.events.NumericEvent;
27
 import com.dmdirc.parser.irc.processors.IRCProcessor;
27
 import com.dmdirc.parser.irc.processors.IRCProcessor;
28
 
28
 
29
-import java.util.Date;
29
+import java.time.LocalDateTime;
30
 import java.util.HashMap;
30
 import java.util.HashMap;
31
 import java.util.Map;
31
 import java.util.Map;
32
 import java.util.Set;
32
 import java.util.Set;
133
      * @throws ProcessorNotFoundException exception if no processors exists to handle the line
133
      * @throws ProcessorNotFoundException exception if no processors exists to handle the line
134
      */
134
      */
135
     public void process(final String sParam, final String... token) throws ProcessorNotFoundException {
135
     public void process(final String sParam, final String... token) throws ProcessorNotFoundException {
136
-        process(new Date(), sParam, token);
136
+        process(LocalDateTime.now(), sParam, token);
137
     }
137
     }
138
 
138
 
139
     /**
139
     /**
144
      * @param token IRCTokenised line to process
144
      * @param token IRCTokenised line to process
145
      * @throws ProcessorNotFoundException exception if no processors exists to handle the line
145
      * @throws ProcessorNotFoundException exception if no processors exists to handle the line
146
      */
146
      */
147
-    public void process(final Date date, final String sParam, final String... token) throws ProcessorNotFoundException {
147
+    public void process(final LocalDateTime date, final String sParam, final String... token)
148
+            throws ProcessorNotFoundException {
148
         IRCProcessor messageProcessor = null;
149
         IRCProcessor messageProcessor = null;
149
         try {
150
         try {
150
             messageProcessor = getProcessor(sParam);
151
             messageProcessor = getProcessor(sParam);
178
      * @param token IRC Tokenised line
179
      * @param token IRC Tokenised line
179
      */
180
      */
180
     protected void callNumeric(final int numeric, final String... token) {
181
     protected void callNumeric(final int numeric, final String... token) {
181
-        parser.getCallbackManager().publish(new NumericEvent(parser, new Date(), numeric, token));
182
+        parser.getCallbackManager().publish(new NumericEvent(parser, LocalDateTime.now(), numeric,
183
+                token));
182
     }
184
     }
183
 }
185
 }

+ 2
- 2
irc/src/com/dmdirc/parser/irc/SimpleNickInUseHandler.java Vedi File

26
 import com.dmdirc.parser.events.NickInUseEvent;
26
 import com.dmdirc.parser.events.NickInUseEvent;
27
 import com.dmdirc.parser.interfaces.Parser;
27
 import com.dmdirc.parser.interfaces.Parser;
28
 
28
 
29
-import java.util.Date;
29
+import java.time.LocalDateTime;
30
 
30
 
31
 import net.engio.mbassy.listener.Handler;
31
 import net.engio.mbassy.listener.Handler;
32
 import net.engio.mbassy.listener.Listener;
32
 import net.engio.mbassy.listener.Listener;
73
 
73
 
74
     private void callDebugInfo(final Parser parser, final int level, final String data) {
74
     private void callDebugInfo(final Parser parser, final int level, final String data) {
75
         parser.getCallbackManager().publish(
75
         parser.getCallbackManager().publish(
76
-                new DebugInfoEvent(parser, new Date(), level, data));
76
+                new DebugInfoEvent(parser, LocalDateTime.now(), level, data));
77
     }
77
     }
78
 
78
 
79
     /**
79
     /**

+ 4
- 3
irc/src/com/dmdirc/parser/irc/TimestampedIRCProcessor.java Vedi File

24
 
24
 
25
 import com.dmdirc.parser.irc.processors.IRCProcessor;
25
 import com.dmdirc.parser.irc.processors.IRCProcessor;
26
 
26
 
27
-import java.util.Date;
27
+import java.time.LocalDateTime;
28
 
28
 
29
 /**
29
 /**
30
  * TimestampedIRCProcessor.
30
  * TimestampedIRCProcessor.
45
 
45
 
46
     @Override
46
     @Override
47
     public final void process(final String sParam, final String... token) {
47
     public final void process(final String sParam, final String... token) {
48
-        process(new Date(), sParam, token);
48
+        process(LocalDateTime.now(), sParam, token);
49
     }
49
     }
50
 
50
 
51
     /**
51
     /**
55
      * @param sParam Type of line to process ("005", "PRIVMSG" etc)
55
      * @param sParam Type of line to process ("005", "PRIVMSG" etc)
56
      * @param token IRCTokenised line to process
56
      * @param token IRCTokenised line to process
57
      */
57
      */
58
-    public abstract void process(final Date date, final String sParam, final String... token);
58
+    public abstract void process(final LocalDateTime date, final String sParam,
59
+            final String... token);
59
 
60
 
60
 
61
 
61
 }
62
 }

+ 3
- 2
irc/src/com/dmdirc/parser/irc/WhoisResponseHandler.java Vedi File

28
 import com.dmdirc.parser.events.UserInfoEvent.UserInfoType;
28
 import com.dmdirc.parser.events.UserInfoEvent.UserInfoType;
29
 import com.dmdirc.parser.interfaces.Parser;
29
 import com.dmdirc.parser.interfaces.Parser;
30
 
30
 
31
-import java.util.Date;
31
+import java.time.LocalDateTime;
32
 import java.util.EnumMap;
32
 import java.util.EnumMap;
33
 import java.util.Map;
33
 import java.util.Map;
34
 
34
 
113
     }
113
     }
114
 
114
 
115
     private void sendEvent() {
115
     private void sendEvent() {
116
-        manager.publish(new UserInfoEvent(parser, new Date(), parser.getClient(client), info));
116
+        manager.publish(new UserInfoEvent(parser, LocalDateTime.now(),
117
+                parser.getClient(client), info));
117
     }
118
     }
118
 
119
 
119
 }
120
 }

+ 3
- 2
irc/src/com/dmdirc/parser/irc/processors/Process004005.java Vedi File

30
 import com.dmdirc.parser.irc.IRCParser;
30
 import com.dmdirc.parser.irc.IRCParser;
31
 import com.dmdirc.parser.irc.ProcessorNotFoundException;
31
 import com.dmdirc.parser.irc.ProcessorNotFoundException;
32
 
32
 
33
-import java.util.Date;
33
+import java.time.LocalDateTime;
34
 import java.util.regex.Matcher;
34
 import java.util.regex.Matcher;
35
 import java.util.regex.Pattern;
35
 import java.util.regex.Pattern;
36
 
36
 
85
         final String ircdType = parser.getServerSoftwareType();
85
         final String ircdType = parser.getServerSoftwareType();
86
 
86
 
87
         getCallbackManager().publish(
87
         getCallbackManager().publish(
88
-                new NetworkDetectedEvent(parser, new Date(), networkName, ircdVersion, ircdType));
88
+                new NetworkDetectedEvent(parser, LocalDateTime.now(), networkName, ircdVersion,
89
+                        ircdType));
89
     }
90
     }
90
 
91
 
91
     /**
92
     /**

+ 2
- 2
irc/src/com/dmdirc/parser/irc/processors/Process464.java Vedi File

25
 import com.dmdirc.parser.events.PasswordRequiredEvent;
25
 import com.dmdirc.parser.events.PasswordRequiredEvent;
26
 import com.dmdirc.parser.irc.IRCParser;
26
 import com.dmdirc.parser.irc.IRCParser;
27
 
27
 
28
-import java.util.Date;
28
+import java.time.LocalDateTime;
29
 
29
 
30
 import javax.inject.Inject;
30
 import javax.inject.Inject;
31
 
31
 
59
      * Callback to all objects implementing the PasswordRequired Callback.
59
      * Callback to all objects implementing the PasswordRequired Callback.
60
      */
60
      */
61
     protected void callPasswordRequired() {
61
     protected void callPasswordRequired() {
62
-        getCallbackManager().publish(new PasswordRequiredEvent(parser, new Date()));
62
+        getCallbackManager().publish(new PasswordRequiredEvent(parser, LocalDateTime.now()));
63
     }
63
     }
64
 }
64
 }

+ 2
- 2
irc/src/com/dmdirc/parser/irc/processors/ProcessAway.java Vedi File

26
 import com.dmdirc.parser.irc.IRCClientInfo;
26
 import com.dmdirc.parser.irc.IRCClientInfo;
27
 import com.dmdirc.parser.irc.IRCParser;
27
 import com.dmdirc.parser.irc.IRCParser;
28
 
28
 
29
-import java.util.Date;
29
+import java.time.LocalDateTime;
30
 
30
 
31
 import javax.inject.Inject;
31
 import javax.inject.Inject;
32
 
32
 
93
     protected void callAwayState(final AwayState oldState, final AwayState currentState,
93
     protected void callAwayState(final AwayState oldState, final AwayState currentState,
94
             final String reason) {
94
             final String reason) {
95
         getCallbackManager().publish(
95
         getCallbackManager().publish(
96
-                new AwayStateEvent(parser, new Date(), oldState, currentState, reason));
96
+                new AwayStateEvent(parser, LocalDateTime.now(), oldState, currentState, reason));
97
     }
97
     }
98
 
98
 
99
 }
99
 }

+ 2
- 2
irc/src/com/dmdirc/parser/irc/processors/ProcessCap.java Vedi File

26
 import com.dmdirc.parser.irc.IRCParser;
26
 import com.dmdirc.parser.irc.IRCParser;
27
 import com.dmdirc.parser.irc.TimestampedIRCProcessor;
27
 import com.dmdirc.parser.irc.TimestampedIRCProcessor;
28
 
28
 
29
+import java.time.LocalDateTime;
29
 import java.util.ArrayList;
30
 import java.util.ArrayList;
30
 import java.util.Collection;
31
 import java.util.Collection;
31
-import java.util.Date;
32
 
32
 
33
 import javax.inject.Inject;
33
 import javax.inject.Inject;
34
 
34
 
81
      * @param token IRCTokenised line to process
81
      * @param token IRCTokenised line to process
82
      */
82
      */
83
     @Override
83
     @Override
84
-    public void process(final Date date, final String sParam, final String... token) {
84
+    public void process(final LocalDateTime date, final String sParam, final String... token) {
85
         // We will only automatically handle the first ever pre-001 CAP LS
85
         // We will only automatically handle the first ever pre-001 CAP LS
86
         // response.
86
         // response.
87
         // After that, the user may be sending stuff themselves so we do
87
         // After that, the user may be sending stuff themselves so we do

+ 3
- 2
irc/src/com/dmdirc/parser/irc/processors/ProcessInvite.java Vedi File

25
 import com.dmdirc.parser.events.InviteEvent;
25
 import com.dmdirc.parser.events.InviteEvent;
26
 import com.dmdirc.parser.irc.IRCParser;
26
 import com.dmdirc.parser.irc.IRCParser;
27
 
27
 
28
-import java.util.Date;
28
+import java.time.LocalDateTime;
29
 
29
 
30
 import javax.inject.Inject;
30
 import javax.inject.Inject;
31
 
31
 
65
      * @param channel The name of the channel we were invited to
65
      * @param channel The name of the channel we were invited to
66
      */
66
      */
67
     protected void callInvite(final String userHost, final String channel) {
67
     protected void callInvite(final String userHost, final String channel) {
68
-        getCallbackManager().publish(new InviteEvent(parser, new Date(), userHost, channel));
68
+        getCallbackManager().publish(new InviteEvent(
69
+                parser, LocalDateTime.now(), userHost, channel));
69
     }
70
     }
70
 
71
 
71
 }
72
 }

+ 4
- 3
irc/src/com/dmdirc/parser/irc/processors/ProcessJoin.java Vedi File

37
 import com.dmdirc.parser.irc.PrefixModeManager;
37
 import com.dmdirc.parser.irc.PrefixModeManager;
38
 import com.dmdirc.parser.irc.ProcessorNotFoundException;
38
 import com.dmdirc.parser.irc.ProcessorNotFoundException;
39
 
39
 
40
+import java.time.LocalDateTime;
40
 import java.util.Arrays;
41
 import java.util.Arrays;
41
-import java.util.Date;
42
 
42
 
43
 import javax.inject.Inject;
43
 import javax.inject.Inject;
44
 import javax.inject.Named;
44
 import javax.inject.Named;
185
     protected void callChannelJoin(final ChannelInfo cChannel,
185
     protected void callChannelJoin(final ChannelInfo cChannel,
186
             final ChannelClientInfo cChannelClient) {
186
             final ChannelClientInfo cChannelClient) {
187
         getCallbackManager().publish(
187
         getCallbackManager().publish(
188
-                new ChannelJoinEvent(parser, new Date(), cChannel, cChannelClient));
188
+                new ChannelJoinEvent(parser, LocalDateTime.now(), cChannel, cChannelClient));
189
     }
189
     }
190
 
190
 
191
     /**
191
     /**
194
      * @param cChannel Channel Object
194
      * @param cChannel Channel Object
195
      */
195
      */
196
     protected void callChannelSelfJoin(final ChannelInfo cChannel) {
196
     protected void callChannelSelfJoin(final ChannelInfo cChannel) {
197
-        getCallbackManager().publish(new ChannelSelfJoinEvent(parser, new Date(), cChannel));
197
+        getCallbackManager().publish(new ChannelSelfJoinEvent(
198
+                parser, LocalDateTime.now(), cChannel));
198
     }
199
     }
199
 
200
 
200
 }
201
 }

+ 3
- 3
irc/src/com/dmdirc/parser/irc/processors/ProcessKick.java Vedi File

31
 import com.dmdirc.parser.irc.IRCClientInfo;
31
 import com.dmdirc.parser.irc.IRCClientInfo;
32
 import com.dmdirc.parser.irc.IRCParser;
32
 import com.dmdirc.parser.irc.IRCParser;
33
 
33
 
34
+import java.time.LocalDateTime;
34
 import java.util.Arrays;
35
 import java.util.Arrays;
35
-import java.util.Date;
36
 
36
 
37
 import javax.inject.Inject;
37
 import javax.inject.Inject;
38
 
38
 
122
             final ChannelClientInfo cKickedClient, final ChannelClientInfo cKickedByClient,
122
             final ChannelClientInfo cKickedClient, final ChannelClientInfo cKickedByClient,
123
             final String sReason, final String sKickedByHost) {
123
             final String sReason, final String sKickedByHost) {
124
         getCallbackManager().publish(
124
         getCallbackManager().publish(
125
-                new ChannelKickEvent(parser, new Date(), cChannel, cKickedClient, cKickedByClient,
126
-                        sReason, sKickedByHost));
125
+                new ChannelKickEvent(parser, LocalDateTime.now(), cChannel, cKickedClient,
126
+                        cKickedByClient, sReason, sKickedByHost));
127
     }
127
     }
128
 
128
 
129
 }
129
 }

+ 5
- 5
irc/src/com/dmdirc/parser/irc/processors/ProcessList.java Vedi File

27
 import com.dmdirc.parser.events.GroupListStartEvent;
27
 import com.dmdirc.parser.events.GroupListStartEvent;
28
 import com.dmdirc.parser.irc.IRCParser;
28
 import com.dmdirc.parser.irc.IRCParser;
29
 
29
 
30
-import java.util.Date;
30
+import java.time.LocalDateTime;
31
 
31
 
32
 import javax.inject.Inject;
32
 import javax.inject.Inject;
33
 
33
 
59
         // :port80b.se.quakenet.org 323 MD87 :End of /LIST
59
         // :port80b.se.quakenet.org 323 MD87 :End of /LIST
60
         switch (sParam) {
60
         switch (sParam) {
61
             case "321":
61
             case "321":
62
-                getCallbackManager().publish(new GroupListStartEvent(parser, new Date()));
62
+                getCallbackManager().publish(new GroupListStartEvent(parser, LocalDateTime.now()));
63
                 break;
63
                 break;
64
             case "322":
64
             case "322":
65
-                getCallbackManager().publish(new GroupListEntryEvent(parser, new Date(), token[3],
66
-                        Integer.parseInt(token[4]), token[5]));
65
+                getCallbackManager().publish(new GroupListEntryEvent(parser, LocalDateTime.now(),
66
+                        token[3], Integer.parseInt(token[4]), token[5]));
67
                 break;
67
                 break;
68
             case "323":
68
             case "323":
69
-                getCallbackManager().publish(new GroupListEndEvent(parser, new Date()));
69
+                getCallbackManager().publish(new GroupListEndEvent(parser, LocalDateTime.now()));
70
                 break;
70
                 break;
71
         }
71
         }
72
     }
72
     }

+ 3
- 2
irc/src/com/dmdirc/parser/irc/processors/ProcessListModes.java Vedi File

30
 import com.dmdirc.parser.irc.ServerType;
30
 import com.dmdirc.parser.irc.ServerType;
31
 import com.dmdirc.parser.irc.ServerTypeGroup;
31
 import com.dmdirc.parser.irc.ServerTypeGroup;
32
 
32
 
33
+import java.time.LocalDateTime;
33
 import java.util.Arrays;
34
 import java.util.Arrays;
34
 import java.util.Collection;
35
 import java.util.Collection;
35
-import java.util.Date;
36
 import java.util.Queue;
36
 import java.util.Queue;
37
 
37
 
38
 import javax.inject.Inject;
38
 import javax.inject.Inject;
286
      * @param mode the mode that we got list modes for.
286
      * @param mode the mode that we got list modes for.
287
      */
287
      */
288
     protected void callChannelGotListModes(final ChannelInfo cChannel, final char mode) {
288
     protected void callChannelGotListModes(final ChannelInfo cChannel, final char mode) {
289
-        getCallbackManager().publish(new ChannelListModeEvent(parser, new Date(), cChannel, mode));
289
+        getCallbackManager().publish(new ChannelListModeEvent(parser, LocalDateTime.now(), cChannel,
290
+                mode));
290
     }
291
     }
291
 }
292
 }

+ 4
- 4
irc/src/com/dmdirc/parser/irc/processors/ProcessMOTD.java Vedi File

27
 import com.dmdirc.parser.events.MOTDStartEvent;
27
 import com.dmdirc.parser.events.MOTDStartEvent;
28
 import com.dmdirc.parser.irc.IRCParser;
28
 import com.dmdirc.parser.irc.IRCParser;
29
 
29
 
30
-import java.util.Date;
30
+import java.time.LocalDateTime;
31
 
31
 
32
 import javax.inject.Inject;
32
 import javax.inject.Inject;
33
 
33
 
74
      * @param data The contents of the line (incase of language changes or so)
74
      * @param data The contents of the line (incase of language changes or so)
75
      */
75
      */
76
     protected void callMOTDEnd(final boolean noMOTD, final String data) {
76
     protected void callMOTDEnd(final boolean noMOTD, final String data) {
77
-        getCallbackManager().publish(new MOTDEndEvent(parser, new Date(), noMOTD, data));
77
+        getCallbackManager().publish(new MOTDEndEvent(parser, LocalDateTime.now(), noMOTD, data));
78
     }
78
     }
79
 
79
 
80
     /**
80
     /**
83
      * @param data Incomming Line.
83
      * @param data Incomming Line.
84
      */
84
      */
85
     protected void callMOTDLine(final String data) {
85
     protected void callMOTDLine(final String data) {
86
-        getCallbackManager().publish(new MOTDLineEvent(parser, new Date(), data));
86
+        getCallbackManager().publish(new MOTDLineEvent(parser, LocalDateTime.now(), data));
87
     }
87
     }
88
 
88
 
89
     /**
89
     /**
92
      * @param data Incomming Line.
92
      * @param data Incomming Line.
93
      */
93
      */
94
     protected void callMOTDStart(final String data) {
94
     protected void callMOTDStart(final String data) {
95
-        getCallbackManager().publish(new MOTDStartEvent(parser, new Date(), data));
95
+        getCallbackManager().publish(new MOTDStartEvent(parser, LocalDateTime.now(), data));
96
     }
96
     }
97
 
97
 
98
 }
98
 }

+ 34
- 28
irc/src/com/dmdirc/parser/irc/processors/ProcessMessage.java Vedi File

52
 import com.dmdirc.parser.irc.ProcessorNotFoundException;
52
 import com.dmdirc.parser.irc.ProcessorNotFoundException;
53
 import com.dmdirc.parser.irc.TimestampedIRCProcessor;
53
 import com.dmdirc.parser.irc.TimestampedIRCProcessor;
54
 
54
 
55
+import java.time.LocalDateTime;
55
 import java.util.Date;
56
 import java.util.Date;
56
 import java.util.regex.PatternSyntaxException;
57
 import java.util.regex.PatternSyntaxException;
57
 
58
 
94
      * @param token IRCTokenised line to process
95
      * @param token IRCTokenised line to process
95
      */
96
      */
96
     @Override
97
     @Override
97
-    public void process(final Date date, final String sParam, final String... token) {
98
+    public void process(final LocalDateTime date, final String sParam, final String... token) {
98
         // Ignore people!
99
         // Ignore people!
99
         String sMessage;
100
         String sMessage;
100
         if (token[0].charAt(0) == ':') {
101
         if (token[0].charAt(0) == ':') {
296
      * @param sMessage action contents
297
      * @param sMessage action contents
297
      * @param sHost Hostname of sender (or servername)
298
      * @param sHost Hostname of sender (or servername)
298
      */
299
      */
299
-    protected void callChannelAction(final Date date, final ChannelInfo cChannel,
300
+    protected void callChannelAction(final LocalDateTime date, final ChannelInfo cChannel,
300
             final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
301
             final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
301
         getCallbackManager().publish(
302
         getCallbackManager().publish(
302
                 new ChannelActionEvent(parser, date, cChannel, cChannelClient, sMessage, sHost));
303
                 new ChannelActionEvent(parser, date, cChannel, cChannelClient, sMessage, sHost));
312
      * @param sMessage Additional contents
313
      * @param sMessage Additional contents
313
      * @param sHost Hostname of sender (or servername)
314
      * @param sHost Hostname of sender (or servername)
314
      */
315
      */
315
-    protected void callChannelCTCP(final Date date, final ChannelInfo cChannel,
316
+    protected void callChannelCTCP(final LocalDateTime date, final ChannelInfo cChannel,
316
             final ChannelClientInfo cChannelClient, final String sType, final String sMessage,
317
             final ChannelClientInfo cChannelClient, final String sType, final String sMessage,
317
             final String sHost) {
318
             final String sHost) {
318
         getCallbackManager().publish(
319
         getCallbackManager().publish(
330
      * @param sMessage Reply Contents
331
      * @param sMessage Reply Contents
331
      * @param sHost Hostname of sender (or servername)
332
      * @param sHost Hostname of sender (or servername)
332
      */
333
      */
333
-    protected void callChannelCTCPReply(final Date date, final ChannelInfo cChannel,
334
+    protected void callChannelCTCPReply(final LocalDateTime date, final ChannelInfo cChannel,
334
             final ChannelClientInfo cChannelClient, final String sType, final String sMessage,
335
             final ChannelClientInfo cChannelClient, final String sType, final String sMessage,
335
             final String sHost) {
336
             final String sHost) {
336
         getCallbackManager().publish(
337
         getCallbackManager().publish(
347
      * @param sMessage Message contents
348
      * @param sMessage Message contents
348
      * @param sHost Hostname of sender (or servername)
349
      * @param sHost Hostname of sender (or servername)
349
      */
350
      */
350
-    protected void callChannelMessage(final Date date, final ChannelInfo cChannel,
351
+    protected void callChannelMessage(final LocalDateTime date, final ChannelInfo cChannel,
351
             final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
352
             final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
352
         getCallbackManager().publish(
353
         getCallbackManager().publish(
353
                 new ChannelMessageEvent(parser, date, cChannel, cChannelClient, sMessage, sHost));
354
                 new ChannelMessageEvent(parser, date, cChannel, cChannelClient, sMessage, sHost));
362
      * @param sMessage notice contents
363
      * @param sMessage notice contents
363
      * @param sHost Hostname of sender (or servername)
364
      * @param sHost Hostname of sender (or servername)
364
      */
365
      */
365
-    protected void callChannelNotice(final Date date, final ChannelInfo cChannel,
366
+    protected void callChannelNotice(final LocalDateTime date, final ChannelInfo cChannel,
366
             final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
367
             final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
367
         getCallbackManager().publish(
368
         getCallbackManager().publish(
368
                 new ChannelNoticeEvent(parser, date, cChannel, cChannelClient, sMessage, sHost));
369
                 new ChannelNoticeEvent(parser, date, cChannel, cChannelClient, sMessage, sHost));
378
      * @param sMessage notice contents
379
      * @param sMessage notice contents
379
      * @param sHost Hostname of sender (or servername)
380
      * @param sHost Hostname of sender (or servername)
380
      */
381
      */
381
-    protected void callChannelModeNotice(final Date date, final char prefix,
382
+    protected void callChannelModeNotice(final LocalDateTime date, final char prefix,
382
             final ChannelInfo cChannel, final ChannelClientInfo cChannelClient,
383
             final ChannelInfo cChannel, final ChannelClientInfo cChannelClient,
383
             final String sMessage, final String sHost) {
384
             final String sMessage, final String sHost) {
384
         getCallbackManager().publish(
385
         getCallbackManager().publish(
396
      * @param sMessage message contents
397
      * @param sMessage message contents
397
      * @param sHost Hostname of sender (or servername)
398
      * @param sHost Hostname of sender (or servername)
398
      */
399
      */
399
-    protected void callChannelModeMessage(final Date date, final char prefix,
400
+    protected void callChannelModeMessage(final LocalDateTime date, final char prefix,
400
             final ChannelInfo cChannel, final ChannelClientInfo cChannelClient,
401
             final ChannelInfo cChannel, final ChannelClientInfo cChannelClient,
401
             final String sMessage, final String sHost) {
402
             final String sMessage, final String sHost) {
402
         getCallbackManager().publish(
403
         getCallbackManager().publish(
411
      * @param sMessage action contents
412
      * @param sMessage action contents
412
      * @param sHost Hostname of sender (or servername)
413
      * @param sHost Hostname of sender (or servername)
413
      */
414
      */
414
-    protected void callPrivateAction(final Date date, final String sMessage, final String sHost) {
415
+    protected void callPrivateAction(final LocalDateTime date, final String sMessage,
416
+            final String sHost) {
415
         getCallbackManager().publish(new PrivateActionEvent(parser, date, sMessage, sHost));
417
         getCallbackManager().publish(new PrivateActionEvent(parser, date, sMessage, sHost));
416
     }
418
     }
417
 
419
 
423
      * @param sMessage Additional contents
425
      * @param sMessage Additional contents
424
      * @param sHost Hostname of sender (or servername)
426
      * @param sHost Hostname of sender (or servername)
425
      */
427
      */
426
-    protected void callPrivateCTCP(final Date date, final String sType, final String sMessage,
427
-            final String sHost) {
428
+    protected void callPrivateCTCP(final LocalDateTime date, final String sType,
429
+            final String sMessage, final String sHost) {
428
         getCallbackManager().publish(new PrivateCTCPEvent(parser, date, sType, sMessage, sHost));
430
         getCallbackManager().publish(new PrivateCTCPEvent(parser, date, sType, sMessage, sHost));
429
     }
431
     }
430
 
432
 
436
      * @param sMessage Reply Contents
438
      * @param sMessage Reply Contents
437
      * @param sHost Hostname of sender (or servername)
439
      * @param sHost Hostname of sender (or servername)
438
      */
440
      */
439
-    protected void callPrivateCTCPReply(final Date date, final String sType, final String sMessage,
440
-            final String sHost) {
441
+    protected void callPrivateCTCPReply(final LocalDateTime date, final String sType,
442
+            final String sMessage, final String sHost) {
441
         getCallbackManager().publish(
443
         getCallbackManager().publish(
442
                 new PrivateCTCPReplyEvent(parser, date, sType, sMessage, sHost));
444
                 new PrivateCTCPReplyEvent(parser, date, sType, sMessage, sHost));
443
     }
445
     }
449
      * @param sMessage Message contents
451
      * @param sMessage Message contents
450
      * @param sHost Hostname of sender (or servername)
452
      * @param sHost Hostname of sender (or servername)
451
      */
453
      */
452
-    protected void callPrivateMessage(final Date date, final String sMessage, final String sHost) {
454
+    protected void callPrivateMessage(final LocalDateTime date, final String sMessage,
455
+            final String sHost) {
453
         getCallbackManager().publish(new PrivateMessageEvent(parser, date, sMessage, sHost));
456
         getCallbackManager().publish(new PrivateMessageEvent(parser, date, sMessage, sHost));
454
     }
457
     }
455
 
458
 
460
      * @param sMessage Notice contents
463
      * @param sMessage Notice contents
461
      * @param sHost Hostname of sender (or servername)
464
      * @param sHost Hostname of sender (or servername)
462
      */
465
      */
463
-    protected void callPrivateNotice(final Date date, final String sMessage, final String sHost) {
466
+    protected void callPrivateNotice(final LocalDateTime date, final String sMessage,
467
+            final String sHost) {
464
         getCallbackManager().publish(new PrivateNoticeEvent(parser, date, sMessage, sHost));
468
         getCallbackManager().publish(new PrivateNoticeEvent(parser, date, sMessage, sHost));
465
     }
469
     }
466
 
470
 
471
      * @param sMessage Notice contents
475
      * @param sMessage Notice contents
472
      * @param sHost Hostname of sender (or servername)
476
      * @param sHost Hostname of sender (or servername)
473
      */
477
      */
474
-    protected void callServerNotice(final Date date, final String sMessage, final String sHost) {
478
+    protected void callServerNotice(final LocalDateTime date, final String sMessage,
479
+            final String sHost) {
475
         getCallbackManager().publish(new ServerNoticeEvent(parser, date, sMessage, sHost));
480
         getCallbackManager().publish(new ServerNoticeEvent(parser, date, sMessage, sHost));
476
     }
481
     }
477
 
482
 
483
      * @param sTarget Actual target of action
488
      * @param sTarget Actual target of action
484
      * @param sHost Hostname of sender (or servername)
489
      * @param sHost Hostname of sender (or servername)
485
      */
490
      */
486
-    protected void callUnknownAction(final Date date, final String sMessage, final String sTarget,
487
-            final String sHost) {
491
+    protected void callUnknownAction(final LocalDateTime date, final String sMessage,
492
+            final String sTarget, final String sHost) {
488
         getCallbackManager().publish(new UnknownActionEvent(parser, date, sMessage, sTarget, sHost));
493
         getCallbackManager().publish(new UnknownActionEvent(parser, date, sMessage, sTarget, sHost));
489
     }
494
     }
490
 
495
 
497
      * @param sTarget Actual Target of CTCP
502
      * @param sTarget Actual Target of CTCP
498
      * @param sHost Hostname of sender (or servername)
503
      * @param sHost Hostname of sender (or servername)
499
      */
504
      */
500
-    protected void callUnknownCTCP(final Date date, final String sType, final String sMessage,
501
-            final String sTarget, final String sHost) {
505
+    protected void callUnknownCTCP(final LocalDateTime date, final String sType,
506
+            final String sMessage, final String sTarget, final String sHost) {
502
         getCallbackManager().publish(
507
         getCallbackManager().publish(
503
                 new UnknownCTCPEvent(parser, date, sType, sMessage, sTarget, sHost));
508
                 new UnknownCTCPEvent(parser, date, sType, sMessage, sTarget, sHost));
504
     }
509
     }
512
      * @param sTarget Actual Target of CTCPReply
517
      * @param sTarget Actual Target of CTCPReply
513
      * @param sHost Hostname of sender (or servername)
518
      * @param sHost Hostname of sender (or servername)
514
      */
519
      */
515
-    protected void callUnknownCTCPReply(final Date date, final String sType, final String sMessage,
516
-            final String sTarget, final String sHost) {
520
+    protected void callUnknownCTCPReply(final LocalDateTime date, final String sType,
521
+            final String sMessage, final String sTarget, final String sHost) {
517
         getCallbackManager().publish(
522
         getCallbackManager().publish(
518
                 new UnknownCTCPReplyEvent(parser, date, sType, sMessage, sTarget, sHost));
523
                 new UnknownCTCPReplyEvent(parser, date, sType, sMessage, sTarget, sHost));
519
     }
524
     }
526
      * @param sTarget Actual target of message
531
      * @param sTarget Actual target of message
527
      * @param sHost Hostname of sender (or servername)
532
      * @param sHost Hostname of sender (or servername)
528
      */
533
      */
529
-    protected void callUnknownMessage(final Date date, final String sMessage, final String sTarget,
530
-            final String sHost) {
534
+    protected void callUnknownMessage(final LocalDateTime date, final String sMessage,
535
+            final String sTarget, final String sHost) {
531
         getCallbackManager().publish(
536
         getCallbackManager().publish(
532
                 new UnknownMessageEvent(parser, date, sMessage, sTarget, sHost));
537
                 new UnknownMessageEvent(parser, date, sMessage, sTarget, sHost));
533
     }
538
     }
540
      * @param sTarget Actual target of notice
545
      * @param sTarget Actual target of notice
541
      * @param sHost Hostname of sender (or servername)
546
      * @param sHost Hostname of sender (or servername)
542
      */
547
      */
543
-    protected void callUnknownNotice(final Date date, final String sMessage, final String sTarget,
544
-            final String sHost) {
545
-        getCallbackManager().publish(new UnknownNoticeEvent(parser, date, sMessage, sTarget, sHost));
548
+    protected void callUnknownNotice(final LocalDateTime date, final String sMessage,
549
+            final String sTarget, final String sHost) {
550
+        getCallbackManager().publish(new UnknownNoticeEvent(parser, date, sMessage, sTarget,
551
+                sHost));
546
     }
552
     }
547
 
553
 
548
     /**
554
     /**
553
      * @param sTarget Actual target of notice
559
      * @param sTarget Actual target of notice
554
      * @param sHost Hostname of sender (or servername)
560
      * @param sHost Hostname of sender (or servername)
555
      */
561
      */
556
-    protected void callUnknownServerNotice(final Date date, final String sMessage,
562
+    protected void callUnknownServerNotice(final LocalDateTime date, final String sMessage,
557
             final String sTarget, final String sHost) {
563
             final String sTarget, final String sHost) {
558
         getCallbackManager().publish(
564
         getCallbackManager().publish(
559
                 new UnknownServerNoticeEvent(parser, date, sMessage, sTarget, sHost));
565
                 new UnknownServerNoticeEvent(parser, date, sMessage, sTarget, sHost));

+ 16
- 12
irc/src/com/dmdirc/parser/irc/processors/ProcessMode.java Vedi File

40
 import com.dmdirc.parser.irc.ModeManager;
40
 import com.dmdirc.parser.irc.ModeManager;
41
 import com.dmdirc.parser.irc.PrefixModeManager;
41
 import com.dmdirc.parser.irc.PrefixModeManager;
42
 
42
 
43
+import java.time.LocalDateTime;
43
 import java.util.Calendar;
44
 import java.util.Calendar;
44
-import java.util.Date;
45
 
45
 
46
 import javax.inject.Inject;
46
 import javax.inject.Inject;
47
 import javax.inject.Named;
47
 import javax.inject.Named;
232
                         callDebugInfo(IRCParser.DEBUG_INFO, "List Mode: %c [%s] {Positive: %b}", cMode, sModeParam, bPositive);
232
                         callDebugInfo(IRCParser.DEBUG_INFO, "List Mode: %c [%s] {Positive: %b}", cMode, sModeParam, bPositive);
233
                         if (!"324".equals(sParam)) {
233
                         if (!"324".equals(sParam)) {
234
                             getCallbackManager().publish(
234
                             getCallbackManager().publish(
235
-                                    new ChannelSingleModeChangeEvent(parser, new Date(), iChannel,
235
+                                    new ChannelSingleModeChangeEvent(
236
+                                            parser, LocalDateTime.now(), iChannel,
236
                                             setterCCI, token[0], cPositive + cMode + " " +
237
                                             setterCCI, token[0], cPositive + cMode + " " +
237
                                             sModeParam));
238
                                             sModeParam));
238
                         }
239
                         }
246
                             iChannel.setModeParam(cMode, sModeParam);
247
                             iChannel.setModeParam(cMode, sModeParam);
247
                             if (!"324".equals(sParam)) {
248
                             if (!"324".equals(sParam)) {
248
                                 getCallbackManager().publish(
249
                                 getCallbackManager().publish(
249
-                                        new ChannelSingleModeChangeEvent(parser, new Date(),
250
+                                        new ChannelSingleModeChangeEvent(
251
+                                                parser, LocalDateTime.now(),
250
                                                 iChannel, setterCCI, token[0],
252
                                                 iChannel, setterCCI, token[0],
251
                                                 cPositive + cMode + " " +
253
                                                 cPositive + cMode + " " +
252
                                                         sModeParam));
254
                                                         sModeParam));
263
                             iChannel.setModeParam(cMode, "");
265
                             iChannel.setModeParam(cMode, "");
264
                             if (!"324".equals(sParam)) {
266
                             if (!"324".equals(sParam)) {
265
                                 getCallbackManager().publish(
267
                                 getCallbackManager().publish(
266
-                                        new ChannelSingleModeChangeEvent(parser, new Date(),
268
+                                        new ChannelSingleModeChangeEvent(
269
+                                                parser, LocalDateTime.now(),
267
                                                 iChannel, setterCCI, token[0],
270
                                                 iChannel, setterCCI, token[0],
268
                                                 trim(cPositive + cMode + " " + sModeParam)));
271
                                                 trim(cPositive + cMode + " " + sModeParam)));
269
                             }
272
                             }
284
         } else {
287
         } else {
285
             callChannelModeChanged(iChannel, setterCCI, token[0], sFullModeStr.toString().trim());
288
             callChannelModeChanged(iChannel, setterCCI, token[0], sFullModeStr.toString().trim());
286
             getCallbackManager().publish(
289
             getCallbackManager().publish(
287
-                    new ChannelNonUserModeChangeEvent(parser, new Date(), iChannel, setterCCI,
288
-                            token[0], trim(sNonUserModeStr.toString() + sNonUserModeStrParams)));
290
+                    new ChannelNonUserModeChangeEvent(parser, LocalDateTime.now(), iChannel,
291
+                            setterCCI, token[0],
292
+                            trim(sNonUserModeStr.toString() + sNonUserModeStrParams)));
289
         }
293
         }
290
     }
294
     }
291
 
295
 
353
     protected void callChannelModeChanged(final ChannelInfo cChannel,
357
     protected void callChannelModeChanged(final ChannelInfo cChannel,
354
             final ChannelClientInfo cChannelClient, final String sHost, final String sModes) {
358
             final ChannelClientInfo cChannelClient, final String sHost, final String sModes) {
355
         getCallbackManager().publish(
359
         getCallbackManager().publish(
356
-                new ChannelModeChangeEvent(parser, new Date(), cChannel, cChannelClient, sHost,
357
-                        sModes));
360
+                new ChannelModeChangeEvent(parser, LocalDateTime.now(), cChannel, cChannelClient,
361
+                        sHost, sModes));
358
     }
362
     }
359
 
363
 
360
     /**
364
     /**
370
             final ChannelClientInfo cChangedClient, final ChannelClientInfo cSetByClient,
374
             final ChannelClientInfo cChangedClient, final ChannelClientInfo cSetByClient,
371
             final String sHost, final String sMode) {
375
             final String sHost, final String sMode) {
372
         getCallbackManager().publish(
376
         getCallbackManager().publish(
373
-                new ChannelUserModeChangeEvent(parser, new Date(), cChannel, cChangedClient,
374
-                        cSetByClient, sHost, sMode));
377
+                new ChannelUserModeChangeEvent(parser, LocalDateTime.now(), cChannel,
378
+                        cChangedClient, cSetByClient, sHost, sMode));
375
     }
379
     }
376
 
380
 
377
     /**
381
     /**
384
     protected void callUserModeChanged(final ClientInfo cClient, final String sSetby,
388
     protected void callUserModeChanged(final ClientInfo cClient, final String sSetby,
385
             final String sModes) {
389
             final String sModes) {
386
         getCallbackManager().publish(
390
         getCallbackManager().publish(
387
-                new UserModeChangeEvent(parser, new Date(), cClient, sSetby, sModes));
391
+                new UserModeChangeEvent(parser, LocalDateTime.now(), cClient, sSetby, sModes));
388
     }
392
     }
389
 
393
 
390
     /**
394
     /**
395
      */
399
      */
396
     protected void callUserModeDiscovered(final ClientInfo cClient, final String sModes) {
400
     protected void callUserModeDiscovered(final ClientInfo cClient, final String sModes) {
397
         getCallbackManager().publish(
401
         getCallbackManager().publish(
398
-                new UserModeDiscoveryEvent(parser, new Date(), cClient, sModes));
402
+                new UserModeDiscoveryEvent(parser, LocalDateTime.now(), cClient, sModes));
399
     }
403
     }
400
 
404
 
401
 }
405
 }

+ 3
- 3
irc/src/com/dmdirc/parser/irc/processors/ProcessNames.java Vedi File

32
 import com.dmdirc.parser.irc.ModeManager;
32
 import com.dmdirc.parser.irc.ModeManager;
33
 import com.dmdirc.parser.irc.PrefixModeManager;
33
 import com.dmdirc.parser.irc.PrefixModeManager;
34
 
34
 
35
-import java.util.Date;
35
+import java.time.LocalDateTime;
36
 
36
 
37
 import javax.inject.Inject;
37
 import javax.inject.Inject;
38
 import javax.inject.Named;
38
 import javax.inject.Named;
149
     protected void callChannelTopic(final ChannelInfo cChannel, final boolean bIsJoinTopic) {
149
     protected void callChannelTopic(final ChannelInfo cChannel, final boolean bIsJoinTopic) {
150
         ((IRCChannelInfo) cChannel).setHadTopic();
150
         ((IRCChannelInfo) cChannel).setHadTopic();
151
         getCallbackManager().publish(
151
         getCallbackManager().publish(
152
-                new ChannelTopicEvent(parser, new Date(), cChannel, bIsJoinTopic));
152
+                new ChannelTopicEvent(parser, LocalDateTime.now(), cChannel, bIsJoinTopic));
153
     }
153
     }
154
 
154
 
155
     /**
155
     /**
158
      * @param cChannel Channel which the names reply is for
158
      * @param cChannel Channel which the names reply is for
159
      */
159
      */
160
     protected void callChannelGotNames(final ChannelInfo cChannel) {
160
     protected void callChannelGotNames(final ChannelInfo cChannel) {
161
-        getCallbackManager().publish(new ChannelNamesEvent(parser, new Date(), cChannel));
161
+        getCallbackManager().publish(new ChannelNamesEvent(parser, LocalDateTime.now(), cChannel));
162
     }
162
     }
163
 
163
 
164
 }
164
 }

+ 5
- 3
irc/src/com/dmdirc/parser/irc/processors/ProcessNick.java Vedi File

33
 import com.dmdirc.parser.irc.IRCClientInfo;
33
 import com.dmdirc.parser.irc.IRCClientInfo;
34
 import com.dmdirc.parser.irc.IRCParser;
34
 import com.dmdirc.parser.irc.IRCParser;
35
 
35
 
36
-import java.util.Date;
36
+import java.time.LocalDateTime;
37
 
37
 
38
 import javax.inject.Inject;
38
 import javax.inject.Inject;
39
 
39
 
110
     protected void callChannelNickChanged(final ChannelInfo cChannel,
110
     protected void callChannelNickChanged(final ChannelInfo cChannel,
111
             final ChannelClientInfo cChannelClient, final String sOldNick) {
111
             final ChannelClientInfo cChannelClient, final String sOldNick) {
112
         getCallbackManager().publish(
112
         getCallbackManager().publish(
113
-                new ChannelNickChangeEvent(parser, new Date(), cChannel, cChannelClient, sOldNick));
113
+                new ChannelNickChangeEvent(parser, LocalDateTime.now(), cChannel, cChannelClient,
114
+                        sOldNick));
114
     }
115
     }
115
 
116
 
116
     /**
117
     /**
120
      * @param sOldNick Nickname before change
121
      * @param sOldNick Nickname before change
121
      */
122
      */
122
     protected void callNickChanged(final ClientInfo cClient, final String sOldNick) {
123
     protected void callNickChanged(final ClientInfo cClient, final String sOldNick) {
123
-        getCallbackManager().publish(new NickChangeEvent(parser, new Date(), cClient, sOldNick));
124
+        getCallbackManager().publish(new NickChangeEvent(parser, LocalDateTime.now(), cClient,
125
+                sOldNick));
124
     }
126
     }
125
 
127
 
126
 }
128
 }

+ 2
- 2
irc/src/com/dmdirc/parser/irc/processors/ProcessNickInUse.java Vedi File

25
 import com.dmdirc.parser.events.NickInUseEvent;
25
 import com.dmdirc.parser.events.NickInUseEvent;
26
 import com.dmdirc.parser.irc.IRCParser;
26
 import com.dmdirc.parser.irc.IRCParser;
27
 
27
 
28
-import java.util.Date;
28
+import java.time.LocalDateTime;
29
 
29
 
30
 import javax.inject.Inject;
30
 import javax.inject.Inject;
31
 
31
 
73
      * @param nickname Nickname that was wanted.
73
      * @param nickname Nickname that was wanted.
74
      */
74
      */
75
     protected void callNickInUse(final String nickname) {
75
     protected void callNickInUse(final String nickname) {
76
-        getCallbackManager().publish(new NickInUseEvent(parser, new Date(), nickname));
76
+        getCallbackManager().publish(new NickInUseEvent(parser, LocalDateTime.now(), nickname));
77
     }
77
     }
78
 
78
 
79
 }
79
 }

+ 2
- 2
irc/src/com/dmdirc/parser/irc/processors/ProcessNoticeAuth.java Vedi File

25
 import com.dmdirc.parser.events.AuthNoticeEvent;
25
 import com.dmdirc.parser.events.AuthNoticeEvent;
26
 import com.dmdirc.parser.irc.IRCParser;
26
 import com.dmdirc.parser.irc.IRCParser;
27
 
27
 
28
-import java.util.Date;
28
+import java.time.LocalDateTime;
29
 
29
 
30
 import javax.inject.Inject;
30
 import javax.inject.Inject;
31
 
31
 
61
      * @param data Incomming Line.
61
      * @param data Incomming Line.
62
      */
62
      */
63
     protected void callNoticeAuth(final String data) {
63
     protected void callNoticeAuth(final String data) {
64
-        getCallbackManager().publish(new AuthNoticeEvent(parser, new Date(), data));
64
+        getCallbackManager().publish(new AuthNoticeEvent(parser, LocalDateTime.now(), data));
65
     }
65
     }
66
 
66
 
67
 }
67
 }

+ 3
- 2
irc/src/com/dmdirc/parser/irc/processors/ProcessPart.java Vedi File

31
 import com.dmdirc.parser.irc.IRCClientInfo;
31
 import com.dmdirc.parser.irc.IRCClientInfo;
32
 import com.dmdirc.parser.irc.IRCParser;
32
 import com.dmdirc.parser.irc.IRCParser;
33
 
33
 
34
-import java.util.Date;
34
+import java.time.LocalDateTime;
35
 
35
 
36
 import javax.inject.Inject;
36
 import javax.inject.Inject;
37
 
37
 
115
     protected void callChannelPart(final ChannelInfo cChannel,
115
     protected void callChannelPart(final ChannelInfo cChannel,
116
             final ChannelClientInfo cChannelClient, final String sReason) {
116
             final ChannelClientInfo cChannelClient, final String sReason) {
117
         getCallbackManager().publish(
117
         getCallbackManager().publish(
118
-                new ChannelPartEvent(parser, new Date(), cChannel, cChannelClient, sReason));
118
+                new ChannelPartEvent(parser, LocalDateTime.now(), cChannel, cChannelClient,
119
+                        sReason));
119
     }
120
     }
120
 
121
 
121
 }
122
 }

+ 4
- 3
irc/src/com/dmdirc/parser/irc/processors/ProcessQuit.java Vedi File

32
 import com.dmdirc.parser.irc.IRCClientInfo;
32
 import com.dmdirc.parser.irc.IRCClientInfo;
33
 import com.dmdirc.parser.irc.IRCParser;
33
 import com.dmdirc.parser.irc.IRCParser;
34
 
34
 
35
+import java.time.LocalDateTime;
35
 import java.util.ArrayList;
36
 import java.util.ArrayList;
36
-import java.util.Date;
37
 
37
 
38
 import javax.inject.Inject;
38
 import javax.inject.Inject;
39
 
39
 
122
     protected void callChannelQuit(final ChannelInfo cChannel,
122
     protected void callChannelQuit(final ChannelInfo cChannel,
123
             final ChannelClientInfo cChannelClient, final String sReason) {
123
             final ChannelClientInfo cChannelClient, final String sReason) {
124
         getCallbackManager().publish(
124
         getCallbackManager().publish(
125
-                new ChannelQuitEvent(parser, new Date(), cChannel, cChannelClient, sReason));
125
+                new ChannelQuitEvent(parser, LocalDateTime.now(), cChannel, cChannelClient,
126
+                        sReason));
126
     }
127
     }
127
 
128
 
128
     /**
129
     /**
132
      * @param sReason Reason for quitting (may be "")
133
      * @param sReason Reason for quitting (may be "")
133
      */
134
      */
134
     protected void callQuit(final ClientInfo cClient, final String sReason) {
135
     protected void callQuit(final ClientInfo cClient, final String sReason) {
135
-        getCallbackManager().publish(new QuitEvent(parser, new Date(), cClient, sReason));
136
+        getCallbackManager().publish(new QuitEvent(parser, LocalDateTime.now(), cClient, sReason));
136
     }
137
     }
137
 
138
 
138
 }
139
 }

+ 2
- 2
irc/src/com/dmdirc/parser/irc/processors/ProcessTopic.java Vedi File

28
 import com.dmdirc.parser.irc.IRCClientInfo;
28
 import com.dmdirc.parser.irc.IRCClientInfo;
29
 import com.dmdirc.parser.irc.IRCParser;
29
 import com.dmdirc.parser.irc.IRCParser;
30
 
30
 
31
-import java.util.Date;
31
+import java.time.LocalDateTime;
32
 
32
 
33
 import javax.inject.Inject;
33
 import javax.inject.Inject;
34
 
34
 
105
     protected void callChannelTopic(final ChannelInfo cChannel, final boolean bIsJoinTopic) {
105
     protected void callChannelTopic(final ChannelInfo cChannel, final boolean bIsJoinTopic) {
106
         ((IRCChannelInfo) cChannel).setHadTopic();
106
         ((IRCChannelInfo) cChannel).setHadTopic();
107
         getCallbackManager().publish(
107
         getCallbackManager().publish(
108
-                new ChannelTopicEvent(parser, new Date(), cChannel, bIsJoinTopic));
108
+                new ChannelTopicEvent(parser, LocalDateTime.now(), cChannel, bIsJoinTopic));
109
     }
109
     }
110
 
110
 
111
 }
111
 }

+ 5
- 4
irc/src/com/dmdirc/parser/irc/processors/ProcessWallops.java Vedi File

27
 import com.dmdirc.parser.events.WalluserEvent;
27
 import com.dmdirc.parser.events.WalluserEvent;
28
 import com.dmdirc.parser.irc.IRCParser;
28
 import com.dmdirc.parser.irc.IRCParser;
29
 
29
 
30
-import java.util.Date;
30
+import java.time.LocalDateTime;
31
 
31
 
32
 import javax.inject.Inject;
32
 import javax.inject.Inject;
33
 
33
 
84
      * @param host Host of the user who sent the wallop
84
      * @param host Host of the user who sent the wallop
85
      */
85
      */
86
     protected void callWallop(final String message, final String host) {
86
     protected void callWallop(final String message, final String host) {
87
-        getCallbackManager().publish(new WallopEvent(parser, new Date(), message, host));
87
+        getCallbackManager().publish(new WallopEvent(parser, LocalDateTime.now(), message, host));
88
     }
88
     }
89
 
89
 
90
     /**
90
     /**
94
      * @param host Host of the user who sent the walluser
94
      * @param host Host of the user who sent the walluser
95
      */
95
      */
96
     protected void callWalluser(final String message, final String host) {
96
     protected void callWalluser(final String message, final String host) {
97
-        getCallbackManager().publish(new WalluserEvent(parser, new Date(), message, host));
97
+        getCallbackManager().publish(new WalluserEvent(parser, LocalDateTime.now(), message, host));
98
     }
98
     }
99
 
99
 
100
     /**
100
     /**
104
      * @param host Host of the user who sent the WallDesync
104
      * @param host Host of the user who sent the WallDesync
105
      */
105
      */
106
     protected void callWallDesync(final String message, final String host) {
106
     protected void callWallDesync(final String message, final String host) {
107
-        getCallbackManager().publish(new WallDesyncEvent(parser, new Date(), message, host));
107
+        getCallbackManager().publish(new WallDesyncEvent(
108
+                parser, LocalDateTime.now(), message, host));
108
     }
109
     }
109
 
110
 
110
 }
111
 }

+ 5
- 5
irc/src/com/dmdirc/parser/irc/processors/ProcessWho.java Vedi File

32
 import com.dmdirc.parser.irc.IRCClientInfo;
32
 import com.dmdirc.parser.irc.IRCClientInfo;
33
 import com.dmdirc.parser.irc.IRCParser;
33
 import com.dmdirc.parser.irc.IRCParser;
34
 
34
 
35
-import java.util.Date;
35
+import java.time.LocalDateTime;
36
 
36
 
37
 import javax.inject.Inject;
37
 import javax.inject.Inject;
38
 
38
 
109
     protected void callAwayState(final AwayState oldState, final AwayState currentState,
109
     protected void callAwayState(final AwayState oldState, final AwayState currentState,
110
             final String reason) {
110
             final String reason) {
111
         getCallbackManager().publish(
111
         getCallbackManager().publish(
112
-                new AwayStateEvent(parser, new Date(), oldState, currentState, reason));
112
+                new AwayStateEvent(parser, LocalDateTime.now(), oldState, currentState, reason));
113
     }
113
     }
114
 
114
 
115
     /**
115
     /**
122
     protected void callAwayStateOther(final ClientInfo client, final AwayState oldState,
122
     protected void callAwayStateOther(final ClientInfo client, final AwayState oldState,
123
             final AwayState state) {
123
             final AwayState state) {
124
         getCallbackManager().publish(
124
         getCallbackManager().publish(
125
-                new OtherAwayStateEvent(parser, new Date(), client, oldState, state));
125
+                new OtherAwayStateEvent(parser, LocalDateTime.now(), client, oldState, state));
126
     }
126
     }
127
 
127
 
128
     /**
128
     /**
136
     protected void callChannelAwayStateOther(final ChannelInfo channel,
136
     protected void callChannelAwayStateOther(final ChannelInfo channel,
137
             final ChannelClientInfo channelClient, final AwayState oldState, final AwayState state) {
137
             final ChannelClientInfo channelClient, final AwayState oldState, final AwayState state) {
138
         getCallbackManager().publish(
138
         getCallbackManager().publish(
139
-                new ChannelOtherAwayStateEvent(parser, new Date(), channel, channelClient, oldState,
140
-                        state));
139
+                new ChannelOtherAwayStateEvent(parser, LocalDateTime.now(), channel, channelClient,
140
+                        oldState, state));
141
     }
141
     }
142
 
142
 
143
 }
143
 }

+ 2
- 2
xmpp/src/com/dmdirc/parser/xmpp/XmppFakeChannel.java Vedi File

29
 import com.dmdirc.parser.interfaces.ClientInfo;
29
 import com.dmdirc.parser.interfaces.ClientInfo;
30
 import com.dmdirc.parser.interfaces.Parser;
30
 import com.dmdirc.parser.interfaces.Parser;
31
 
31
 
32
+import java.time.LocalDateTime;
32
 import java.util.Collection;
33
 import java.util.Collection;
33
-import java.util.Date;
34
 
34
 
35
 /**
35
 /**
36
  * A 'fake' local channel used to display buddy lists.
36
  * A 'fake' local channel used to display buddy lists.
135
 
135
 
136
         // TODO: Delete old contacts, don't needlessly create new objects
136
         // TODO: Delete old contacts, don't needlessly create new objects
137
         getParser().getCallbackManager().publish(
137
         getParser().getCallbackManager().publish(
138
-                new ChannelNamesEvent(getParser(), new Date(), this));
138
+                new ChannelNamesEvent(getParser(), LocalDateTime.now(), this));
139
     }
139
     }
140
 
140
 
141
 }
141
 }

+ 26
- 19
xmpp/src/com/dmdirc/parser/xmpp/XmppParser.java Vedi File

48
 import com.dmdirc.parser.interfaces.StringConverter;
48
 import com.dmdirc.parser.interfaces.StringConverter;
49
 
49
 
50
 import java.net.URI;
50
 import java.net.URI;
51
+import java.time.LocalDateTime;
51
 import java.util.Collection;
52
 import java.util.Collection;
52
 import java.util.Collections;
53
 import java.util.Collections;
53
-import java.util.Date;
54
 import java.util.HashMap;
54
 import java.util.HashMap;
55
 import java.util.List;
55
 import java.util.List;
56
 import java.util.Map;
56
 import java.util.Map;
241
         newArgs[2] = getLocalClient().getNickname();
241
         newArgs[2] = getLocalClient().getNickname();
242
         System.arraycopy(args, 0, newArgs, 3, args.length);
242
         System.arraycopy(args, 0, newArgs, 3, args.length);
243
 
243
 
244
-        getCallbackManager().publish(new NumericEvent(this, new Date(), numeric, newArgs));
244
+        getCallbackManager().publish(new NumericEvent(this, LocalDateTime.now(), numeric, newArgs));
245
     }
245
     }
246
 
246
 
247
     @Override
247
     @Override
407
     @Override
407
     @Override
408
     public void run() {
408
     public void run() {
409
         if (getURI().getUserInfo() == null || !getURI().getUserInfo().contains(":")) {
409
         if (getURI().getUserInfo() == null || !getURI().getUserInfo().contains(":")) {
410
-            getCallbackManager().publish(new ConnectErrorEvent(this, new Date(),
410
+            getCallbackManager().publish(new ConnectErrorEvent(this, LocalDateTime.now(),
411
                     new ParserError(ParserError.ERROR_USER,
411
                     new ParserError(ParserError.ERROR_USER,
412
                             "User name and password must be specified in URI", "")));
412
                             "User name and password must be specified in URI", "")));
413
             return;
413
             return;
439
             try {
439
             try {
440
                 connection.login(userInfoParts[0], userInfoParts[1], "DMDirc.");
440
                 connection.login(userInfoParts[0], userInfoParts[1], "DMDirc.");
441
             } catch (XMPPException ex) {
441
             } catch (XMPPException ex) {
442
-                getCallbackManager().publish(new ConnectErrorEvent(this, new Date(),
442
+                getCallbackManager().publish(new ConnectErrorEvent(this, LocalDateTime.now(),
443
                         new ParserError(ParserError.ERROR_USER, ex.getMessage(), "")));
443
                         new ParserError(ParserError.ERROR_USER, ex.getMessage(), "")));
444
                 return;
444
                 return;
445
             }
445
             }
452
 
452
 
453
             setServerName(connection.getServiceName());
453
             setServerName(connection.getServiceName());
454
 
454
 
455
-            getCallbackManager().publish(new ServerReadyEvent(this, new Date()));
455
+            getCallbackManager().publish(new ServerReadyEvent(this, LocalDateTime.now()));
456
 
456
 
457
             for (RosterEntry contact : connection.getRoster().getEntries()) {
457
             for (RosterEntry contact : connection.getRoster().getEntries()) {
458
                 getClient(contact.getUser()).setRosterEntry(contact);
458
                 getClient(contact.getUser()).setRosterEntry(contact);
465
 
465
 
466
                 contacts.values().stream().filter(XmppClientInfo::isAway).forEach(client ->
466
                 contacts.values().stream().filter(XmppClientInfo::isAway).forEach(client ->
467
                         getCallbackManager().publish(
467
                         getCallbackManager().publish(
468
-                                new OtherAwayStateEvent(this, new Date(), client, AwayState.UNKNOWN,
469
-                                        AwayState.AWAY)));
468
+                                new OtherAwayStateEvent(this, LocalDateTime.now(), client,
469
+                                        AwayState.UNKNOWN, AwayState.AWAY)));
470
             }
470
             }
471
         } catch (XMPPException ex) {
471
         } catch (XMPPException ex) {
472
             LOG.debug("Go an XMPP exception", ex);
472
             LOG.debug("Go an XMPP exception", ex);
484
                 error.setException(ex);
484
                 error.setException(ex);
485
             }
485
             }
486
 
486
 
487
-            getCallbackManager().publish(new ConnectErrorEvent(this, new Date(), error));
487
+            getCallbackManager().publish(new ConnectErrorEvent(this, LocalDateTime.now(), error));
488
         }
488
         }
489
     }
489
     }
490
 
490
 
499
 
499
 
500
         if (useFakeChannel) {
500
         if (useFakeChannel) {
501
             getCallbackManager().publish(new OtherAwayStateEvent(
501
             getCallbackManager().publish(new OtherAwayStateEvent(
502
-                    this, new Date(), client, isBack ? AwayState.AWAY : AwayState.HERE,
502
+                    this, LocalDateTime.now(), client, isBack ? AwayState.AWAY : AwayState.HERE,
503
                     isBack ? AwayState.HERE : AwayState.AWAY));
503
                     isBack ? AwayState.HERE : AwayState.AWAY));
504
         }
504
         }
505
     }
505
     }
514
                 priority, Presence.Mode.away));
514
                 priority, Presence.Mode.away));
515
 
515
 
516
         getCallbackManager().publish(
516
         getCallbackManager().publish(
517
-                new AwayStateEvent(this, new Date(), AwayState.HERE, AwayState.AWAY, reason));
517
+                new AwayStateEvent(this, LocalDateTime.now(), AwayState.HERE, AwayState.AWAY,
518
+                        reason));
518
     }
519
     }
519
 
520
 
520
     /**
521
     /**
525
                 priority, Presence.Mode.available));
526
                 priority, Presence.Mode.available));
526
 
527
 
527
         getCallbackManager().publish(
528
         getCallbackManager().publish(
528
-                new AwayStateEvent(this, new Date(), AwayState.AWAY, AwayState.HERE, null));
529
+                new AwayStateEvent(this, LocalDateTime.now(), AwayState.AWAY, AwayState.HERE,
530
+                        null));
529
     }
531
     }
530
 
532
 
531
     @Override
533
     @Override
568
 
570
 
569
         @Override
571
         @Override
570
         public void connectionClosed() {
572
         public void connectionClosed() {
571
-            getCallbackManager().publish(new SocketCloseEvent(XmppParser.this, new Date()));
573
+            getCallbackManager().publish(new SocketCloseEvent(XmppParser.this,
574
+                    LocalDateTime.now()));
572
         }
575
         }
573
 
576
 
574
         @Override
577
         @Override
575
         public void connectionClosedOnError(final Exception excptn) {
578
         public void connectionClosedOnError(final Exception excptn) {
576
             // TODO: Handle exception
579
             // TODO: Handle exception
577
-            getCallbackManager().publish(new SocketCloseEvent(XmppParser.this, new Date()));
580
+            getCallbackManager().publish(new SocketCloseEvent(XmppParser.this,
581
+                    LocalDateTime.now()));
578
         }
582
         }
579
 
583
 
580
         @Override
584
         @Override
636
         @Override
640
         @Override
637
         public void processMessage(final Chat chat, final Message msg) {
641
         public void processMessage(final Chat chat, final Message msg) {
638
             if (msg.getType() == Message.Type.error) {
642
             if (msg.getType() == Message.Type.error) {
639
-                getCallbackManager().publish(new NumericEvent(XmppParser.this, new Date(), 404,
643
+                getCallbackManager().publish(new NumericEvent(XmppParser.this, LocalDateTime.now(),
644
+                        404,
640
                         new String[]{":xmpp", "404", getLocalClient().getNickname(), msg.getFrom(),
645
                         new String[]{":xmpp", "404", getLocalClient().getNickname(), msg.getFrom(),
641
                                 "Cannot send message: " + msg.getError().toString()}));
646
                                 "Cannot send message: " + msg.getError().toString()}));
642
                 return;
647
                 return;
644
 
649
 
645
             if (msg.getBody() != null) {
650
             if (msg.getBody() != null) {
646
                 if (msg.getBody().startsWith("/me ")) {
651
                 if (msg.getBody().startsWith("/me ")) {
647
-                    getCallbackManager().publish(new PrivateActionEvent(XmppParser.this, new Date(),
652
+                    getCallbackManager().publish(new PrivateActionEvent(XmppParser.this,
653
+                            LocalDateTime.now(),
648
                             msg.getBody().substring(4), msg.getFrom()));
654
                             msg.getBody().substring(4), msg.getFrom()));
649
                 } else {
655
                 } else {
650
                     getCallbackManager().publish(
656
                     getCallbackManager().publish(
651
-                            new PrivateMessageEvent(XmppParser.this, new Date(), msg.getBody(),
657
+                            new PrivateMessageEvent(XmppParser.this,
658
+                                    LocalDateTime.now(), msg.getBody(),
652
                                     msg.getFrom()));
659
                                     msg.getFrom()));
653
                 }
660
                 }
654
             }
661
             }
674
             }
681
             }
675
 
682
 
676
             getCallbackManager().publish(
683
             getCallbackManager().publish(
677
-                    new CompositionStateChangeEvent(XmppParser.this, new Date(), state,
684
+                    new CompositionStateChangeEvent(XmppParser.this, LocalDateTime.now(), state,
678
                             chat.getParticipant()));
685
                             chat.getParticipant()));
679
         }
686
         }
680
 
687
 
692
         public void processPacket(final Packet packet) {
699
         public void processPacket(final Packet packet) {
693
             if (dataOut) {
700
             if (dataOut) {
694
                 getCallbackManager().publish(
701
                 getCallbackManager().publish(
695
-                        new DataOutEvent(XmppParser.this, new Date(), packet.toXML()));
702
+                        new DataOutEvent(XmppParser.this, LocalDateTime.now(), packet.toXML()));
696
             } else {
703
             } else {
697
                 getCallbackManager().publish(
704
                 getCallbackManager().publish(
698
-                        new DataInEvent(XmppParser.this, new Date(), packet.toXML()));
705
+                        new DataInEvent(XmppParser.this, LocalDateTime.now(), packet.toXML()));
699
             }
706
             }
700
         }
707
         }
701
 
708
 

Loading…
Annulla
Salva