Refactor a bit more

mbax · mbax · commit 468281df1cd2 · 2019-03-10T12:39:31.000-04:00
diff --git a/src/main/java/org/kitteh/irc/client/library/defaults/DefaultClient.java b/src/main/java/org/kitteh/irc/client/library/defaults/DefaultClient.java
@@ -45,9 +45,9 @@
 import org.kitteh.irc.client.library.element.mode.ModeStatus;
 import org.kitteh.irc.client.library.element.mode.ModeStatusList;
 import org.kitteh.irc.client.library.element.mode.UserMode;
-import org.kitteh.irc.client.library.event.client.ClientBatchEndEvent;
-import org.kitteh.irc.client.library.event.client.ClientBatchMessageEvent;
-import org.kitteh.irc.client.library.event.client.ClientBatchStartEvent;
+import org.kitteh.irc.client.library.event.batch.ClientBatchEndEvent;
+import org.kitteh.irc.client.library.event.batch.ClientBatchMessageEvent;
+import org.kitteh.irc.client.library.event.batch.ClientBatchStartEvent;
 import org.kitteh.irc.client.library.event.client.ClientReceiveCommandEvent;
 import org.kitteh.irc.client.library.event.client.ClientReceiveNumericEvent;
 import org.kitteh.irc.client.library.event.helper.ClientReceiveServerMessageEvent;
diff --git a/src/main/java/org/kitteh/irc/client/library/defaults/feature/DefaultEventManager.java b/src/main/java/org/kitteh/irc/client/library/defaults/feature/DefaultEventManager.java
@@ -31,7 +31,7 @@
 import net.engio.mbassy.listener.Handler;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.kitteh.irc.client.library.Client;
-import org.kitteh.irc.client.library.event.client.ClientConnectionEndedEvent;
+import org.kitteh.irc.client.library.event.connection.ClientConnectionEndedEvent;
 import org.kitteh.irc.client.library.event.helper.ClientEvent;
 import org.kitteh.irc.client.library.exception.KittehEventException;
 import org.kitteh.irc.client.library.exception.KittehNagException;
diff --git a/src/main/java/org/kitteh/irc/client/library/defaults/feature/network/NettyConnection.java b/src/main/java/org/kitteh/irc/client/library/defaults/feature/network/NettyConnection.java
@@ -46,9 +46,9 @@
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.kitteh.irc.client.library.Client;
-import org.kitteh.irc.client.library.event.client.ClientConnectionClosedEvent;
-import org.kitteh.irc.client.library.event.client.ClientConnectionEstablishedEvent;
-import org.kitteh.irc.client.library.event.client.ClientConnectionFailedEvent;
+import org.kitteh.irc.client.library.event.connection.ClientConnectionClosedEvent;
+import org.kitteh.irc.client.library.event.connection.ClientConnectionEstablishedEvent;
+import org.kitteh.irc.client.library.event.connection.ClientConnectionFailedEvent;
 import org.kitteh.irc.client.library.exception.KittehConnectionException;
 import org.kitteh.irc.client.library.exception.KittehNagException;
 import org.kitteh.irc.client.library.exception.KittehStsException;
diff --git a/src/main/java/org/kitteh/irc/client/library/event/batch/ClientBatchEndEvent.java b/src/main/java/org/kitteh/irc/client/library/event/batch/ClientBatchEndEvent.java
@@ -21,7 +21,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.kitteh.irc.client.library.event.client;
+package org.kitteh.irc.client.library.event.batch;
 
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.kitteh.irc.client.library.Client;
diff --git a/src/main/java/org/kitteh/irc/client/library/event/batch/ClientBatchMessageEvent.java b/src/main/java/org/kitteh/irc/client/library/event/batch/ClientBatchMessageEvent.java
@@ -21,7 +21,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.kitteh.irc.client.library.event.client;
+package org.kitteh.irc.client.library.event.batch;
 
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.kitteh.irc.client.library.Client;
diff --git a/src/main/java/org/kitteh/irc/client/library/event/batch/ClientBatchStartEvent.java b/src/main/java/org/kitteh/irc/client/library/event/batch/ClientBatchStartEvent.java
@@ -21,7 +21,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.kitteh.irc.client.library.event.client;
+package org.kitteh.irc.client.library.event.batch;
 
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.kitteh.irc.client.library.Client;
diff --git a/src/main/java/org/kitteh/irc/client/library/event/batch/package-info.java b/src/main/java/org/kitteh/irc/client/library/event/batch/package-info.java
@@ -0,0 +1,27 @@
+/*
+ * * Copyright (C) 2013-2019 Matt Baxter https://kitteh.org
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+/**
+ * Events related to batched messages.
+ */
+package org.kitteh.irc.client.library.event.batch;
diff --git a/src/main/java/org/kitteh/irc/client/library/event/connection/ClientConnectionClosedEvent.java b/src/main/java/org/kitteh/irc/client/library/event/connection/ClientConnectionClosedEvent.java
@@ -21,7 +21,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.kitteh.irc.client.library.event.client;
+package org.kitteh.irc.client.library.event.connection;
 
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
diff --git a/src/main/java/org/kitteh/irc/client/library/event/connection/ClientConnectionEndedEvent.java b/src/main/java/org/kitteh/irc/client/library/event/connection/ClientConnectionEndedEvent.java
@@ -21,7 +21,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.kitteh.irc.client.library.event.client;
+package org.kitteh.irc.client.library.event.connection;
 
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
diff --git a/src/main/java/org/kitteh/irc/client/library/event/connection/ClientConnectionEstablishedEvent.java b/src/main/java/org/kitteh/irc/client/library/event/connection/ClientConnectionEstablishedEvent.java
@@ -21,7 +21,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.kitteh.irc.client.library.event.client;
+package org.kitteh.irc.client.library.event.connection;
 
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.kitteh.irc.client.library.Client;
diff --git a/src/main/java/org/kitteh/irc/client/library/event/connection/ClientConnectionFailedEvent.java b/src/main/java/org/kitteh/irc/client/library/event/connection/ClientConnectionFailedEvent.java
@@ -21,7 +21,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.kitteh.irc.client.library.event.client;
+package org.kitteh.irc.client.library.event.connection;
 
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
diff --git a/src/main/java/org/kitteh/irc/client/library/event/connection/package-info.java b/src/main/java/org/kitteh/irc/client/library/event/connection/package-info.java
@@ -0,0 +1,27 @@
+/*
+ * * Copyright (C) 2013-2019 Matt Baxter https://kitteh.org
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+/**
+ * Events related to network connectivity.
+ */
+package org.kitteh.irc.client.library.event.connection;
diff --git a/src/main/java/org/kitteh/irc/client/library/event/helper/ActorEvent.java b/src/main/java/org/kitteh/irc/client/library/event/helper/ActorEvent.java
@@ -29,7 +29,7 @@
 /**
  * An event involving an {@link Actor}.
  */
-public interface ActorEvent<A extends Actor> extends ServerMessageEvent {
+public interface ActorEvent<A extends Actor> extends ClientEvent {
     /**
      * Gets the actor responsible for this event.
      *
diff --git a/src/main/java/org/kitteh/irc/client/library/event/helper/BatchEvent.java b/src/main/java/org/kitteh/irc/client/library/event/helper/BatchEvent.java
@@ -29,7 +29,7 @@
 /**
  * An event involving batched messages.
  */
-public interface BatchEvent extends ServerMessageEvent {
+public interface BatchEvent extends ClientEvent {
     /**
      * Gets the reference tag.
      *
diff --git a/src/main/java/org/kitteh/irc/client/library/feature/sts/StsHandler.java b/src/main/java/org/kitteh/irc/client/library/feature/sts/StsHandler.java
@@ -29,7 +29,7 @@
 import org.kitteh.irc.client.library.element.ServerMessage;
 import org.kitteh.irc.client.library.event.capabilities.CapabilitiesNewSupportedEvent;
 import org.kitteh.irc.client.library.event.capabilities.CapabilitiesSupportedListEvent;
-import org.kitteh.irc.client.library.event.client.ClientConnectionEndedEvent;
+import org.kitteh.irc.client.library.event.connection.ClientConnectionEndedEvent;
 import org.kitteh.irc.client.library.exception.KittehServerMessageException;
 import org.kitteh.irc.client.library.util.HostWithPort;
 import org.kitteh.irc.client.library.util.StsUtil;
