Author: bdonlan
Date: 2005-05-23 22:00:16 -0400 (Mon, 23 May 2005)
New Revision: 725
Added:
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/AlreadyThereJoin.java
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/ChannelNotFound.java
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/Forbidden.java
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/InternalCommandException.java
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/MissingMessageType.java
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/NotPresentPart.java
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/PropagatedException.java
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/SimplePropagatedException.java
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/UnknownClientCommandException.java
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/UserAlreadyExists.java
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/UserNotFound.java
Removed:
trunk/clients/Javer2/src/org/haverdev/haver/server/AlreadyThereJoin.java
trunk/clients/Javer2/src/org/haverdev/haver/server/InternalCommandException.java
trunk/clients/Javer2/src/org/haverdev/haver/server/NotPresentPart.java
trunk/clients/Javer2/src/org/haverdev/haver/server/PropagatedException.java
trunk/clients/Javer2/src/org/haverdev/haver/server/SimplePropagatedException.java
trunk/clients/Javer2/src/org/haverdev/haver/server/UnknownClientCommandException.java
trunk/clients/Javer2/src/org/haverdev/haver/server/UserAlreadyExists.java
Modified:
trunk/clients/Javer2/src/org/haverdev/haver/server/UserConnection.java
Log:
Move exceptions into a seperate package
Deleted:
trunk/clients/Javer2/src/org/haverdev/haver/server/AlreadyThereJoin.java
===================================================================
--- trunk/clients/Javer2/src/org/haverdev/haver/server/AlreadyThereJoin.java
2005-05-24 01:55:15 UTC (rev 724)
+++ trunk/clients/Javer2/src/org/haverdev/haver/server/AlreadyThereJoin.java
2005-05-24 02:00:16 UTC (rev 725)
@@ -1,7 +0,0 @@
-package org.haverdev.haver.server;
-
-public final class AlreadyThereJoin extends SimplePropagatedException {
- public AlreadyThereJoin(String name) {
- super("JOIN", "join.already", name);
- }
-}
\ No newline at end of file
Deleted:
trunk/clients/Javer2/src/org/haverdev/haver/server/InternalCommandException.java
===================================================================
---
trunk/clients/Javer2/src/org/haverdev/haver/server/InternalCommandException.java
2005-05-24 01:55:15 UTC (rev 724)
+++
trunk/clients/Javer2/src/org/haverdev/haver/server/InternalCommandException.java
2005-05-24 02:00:16 UTC (rev 725)
@@ -1,20 +0,0 @@
-package org.haverdev.haver.server;
-
-public final class InternalCommandException extends PropagatedException {
- String cmd, reason;
- public InternalCommandException(String cmd, String reason) {
- super("Command " + cmd + " failed: " + reason);
- this.cmd = cmd;
- this.reason = reason;
- }
-
- public InternalCommandException(String cmd, Throwable t) {
- this(cmd, t.getMessage());
- initCause(t);
- }
-
- public String[] clientReport() {
- String[] fail = {"FAIL", cmd, "internal.error", "Internal exception: "
+ reason};
- return fail;
- }
-}
Deleted: trunk/clients/Javer2/src/org/haverdev/haver/server/NotPresentPart.java
===================================================================
--- trunk/clients/Javer2/src/org/haverdev/haver/server/NotPresentPart.java
2005-05-24 01:55:15 UTC (rev 724)
+++ trunk/clients/Javer2/src/org/haverdev/haver/server/NotPresentPart.java
2005-05-24 02:00:16 UTC (rev 725)
@@ -1,7 +0,0 @@
-package org.haverdev.haver.server;
-
-public final class NotPresentPart extends SimplePropagatedException {
- public NotPresentPart(String name) {
- super("PART", "part.notthere", name);
- }
-}
Deleted:
trunk/clients/Javer2/src/org/haverdev/haver/server/PropagatedException.java
===================================================================
--- trunk/clients/Javer2/src/org/haverdev/haver/server/PropagatedException.java
2005-05-24 01:55:15 UTC (rev 724)
+++ trunk/clients/Javer2/src/org/haverdev/haver/server/PropagatedException.java
2005-05-24 02:00:16 UTC (rev 725)
@@ -1,8 +0,0 @@
-package org.haverdev.haver.server;
-
-public abstract class PropagatedException extends Exception {
- public abstract String[] clientReport();
- public PropagatedException(String reason) {
- super(reason);
- }
-}
Deleted:
trunk/clients/Javer2/src/org/haverdev/haver/server/SimplePropagatedException.java
===================================================================
---
trunk/clients/Javer2/src/org/haverdev/haver/server/SimplePropagatedException.java
2005-05-24 01:55:15 UTC (rev 724)
+++
trunk/clients/Javer2/src/org/haverdev/haver/server/SimplePropagatedException.java
2005-05-24 02:00:16 UTC (rev 725)
@@ -1,21 +0,0 @@
-package org.haverdev.haver.server;
-
-public abstract class SimplePropagatedException extends PropagatedException {
- String cmd, code, detail;
- public SimplePropagatedException(String cmd, String code, String detail) {
- super(detail == null ? "Error " + code + " in command " + cmd :
detail);
- this.cmd = cmd;
- this.code = code;
- this.detail = detail;
- }
-
- public String[] clientReport() {
- if (detail != null) {
- String[] fail = { "FAIL", cmd, code, this.getMessage() };
- return fail;
- } else {
- String[] fail = { "FAIL", cmd, code };
- return fail;
- }
- }
-}
Deleted:
trunk/clients/Javer2/src/org/haverdev/haver/server/UnknownClientCommandException.java
===================================================================
---
trunk/clients/Javer2/src/org/haverdev/haver/server/UnknownClientCommandException.java
2005-05-24 01:55:15 UTC (rev 724)
+++
trunk/clients/Javer2/src/org/haverdev/haver/server/UnknownClientCommandException.java
2005-05-24 02:00:16 UTC (rev 725)
@@ -1,14 +0,0 @@
-package org.haverdev.haver.server;
-
-public final class UnknownClientCommandException extends PropagatedException {
- String cmd;
- public UnknownClientCommandException(String[] cmd) {
- super("Unknown command " + cmd[0]);
- this.cmd = cmd[0];
- }
-
- public String[] clientReport() {
- String[] fail = {"FAIL", cmd, "unknown.cmd"};
- return fail;
- }
-}
Deleted:
trunk/clients/Javer2/src/org/haverdev/haver/server/UserAlreadyExists.java
===================================================================
--- trunk/clients/Javer2/src/org/haverdev/haver/server/UserAlreadyExists.java
2005-05-24 01:55:15 UTC (rev 724)
+++ trunk/clients/Javer2/src/org/haverdev/haver/server/UserAlreadyExists.java
2005-05-24 02:00:16 UTC (rev 725)
@@ -1,7 +0,0 @@
-package org.haverdev.haver.server;
-
-public final class UserAlreadyExists extends SimplePropagatedException {
- public UserAlreadyExists(String name) {
- super("IDENT", "exists.user", name);
- }
-}
Modified: trunk/clients/Javer2/src/org/haverdev/haver/server/UserConnection.java
===================================================================
--- trunk/clients/Javer2/src/org/haverdev/haver/server/UserConnection.java
2005-05-24 01:55:15 UTC (rev 724)
+++ trunk/clients/Javer2/src/org/haverdev/haver/server/UserConnection.java
2005-05-24 02:00:16 UTC (rev 725)
@@ -11,6 +11,7 @@
import java.util.*;
import java.net.Socket;
import java.lang.reflect.*;
+import org.haverdev.haver.server.exceptions.*;
/**
*
Added:
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/AlreadyThereJoin.java
===================================================================
---
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/AlreadyThereJoin.java
2005-05-24 01:55:15 UTC (rev 724)
+++
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/AlreadyThereJoin.java
2005-05-24 02:00:16 UTC (rev 725)
@@ -0,0 +1,7 @@
+package org.haverdev.haver.server.exceptions;
+
+public final class AlreadyThereJoin extends SimplePropagatedException {
+ public AlreadyThereJoin(String name) {
+ super("JOIN", "join.already", name);
+ }
+}
\ No newline at end of file
Property changes on:
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/AlreadyThereJoin.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added:
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/ChannelNotFound.java
===================================================================
---
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/ChannelNotFound.java
2005-05-24 01:55:15 UTC (rev 724)
+++
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/ChannelNotFound.java
2005-05-24 02:00:16 UTC (rev 725)
@@ -0,0 +1,20 @@
+/*
+ * ChannelNotFound.java
+ *
+ * Created on May 23, 2005, 9:27 PM
+ */
+
+package org.haverdev.haver.server.exceptions;
+
+/**
+ *
+ * @author bdonlan
+ */
+public class ChannelNotFound extends SimplePropagatedException {
+
+ /** Creates a new instance of ChannelNotFound */
+ public ChannelNotFound(String cmd, String channel) {
+ super(cmd, "notfound.channel", channel);
+ }
+
+}
Property changes on:
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/ChannelNotFound.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added:
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/Forbidden.java
===================================================================
---
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/Forbidden.java
2005-05-24 01:55:15 UTC (rev 724)
+++
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/Forbidden.java
2005-05-24 02:00:16 UTC (rev 725)
@@ -0,0 +1,20 @@
+/*
+ * Forbidden.java
+ *
+ * Created on May 23, 2005, 9:28 PM
+ */
+
+package org.haverdev.haver.server.exceptions;
+
+/**
+ *
+ * @author bdonlan
+ */
+public class Forbidden extends SimplePropagatedException {
+
+ /** Creates a new instance of Forbidden */
+ public Forbidden(String cmd, String detail) {
+ super(cmd, "forbidden", detail);
+ }
+
+}
Property changes on:
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/Forbidden.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added:
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/InternalCommandException.java
===================================================================
---
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/InternalCommandException.java
2005-05-24 01:55:15 UTC (rev 724)
+++
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/InternalCommandException.java
2005-05-24 02:00:16 UTC (rev 725)
@@ -0,0 +1,20 @@
+package org.haverdev.haver.server.exceptions;
+
+public final class InternalCommandException extends PropagatedException {
+ String cmd, reason;
+ public InternalCommandException(String cmd, String reason) {
+ super("Command " + cmd + " failed: " + reason);
+ this.cmd = cmd;
+ this.reason = reason;
+ }
+
+ public InternalCommandException(String cmd, Throwable t) {
+ this(cmd, t.getMessage());
+ initCause(t);
+ }
+
+ public String[] clientReport() {
+ String[] fail = {"FAIL", cmd, "internal.error", "Internal exception: "
+ reason};
+ return fail;
+ }
+}
Property changes on:
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/InternalCommandException.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added:
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/MissingMessageType.java
===================================================================
---
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/MissingMessageType.java
2005-05-24 01:55:15 UTC (rev 724)
+++
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/MissingMessageType.java
2005-05-24 02:00:16 UTC (rev 725)
@@ -0,0 +1,20 @@
+/*
+ * MissingMessageType.java
+ *
+ * Created on May 23, 2005, 9:38 PM
+ */
+
+package org.haverdev.haver.server.exceptions;
+
+/**
+ *
+ * @author bdonlan
+ */
+public class MissingMessageType extends SimplePropagatedException {
+
+ /** Creates a new instance of MissingMessageType */
+ public MissingMessageType(String cmd) {
+ super(cmd, "missing.type", null);
+ }
+
+}
Property changes on:
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/MissingMessageType.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added:
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/NotPresentPart.java
===================================================================
---
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/NotPresentPart.java
2005-05-24 01:55:15 UTC (rev 724)
+++
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/NotPresentPart.java
2005-05-24 02:00:16 UTC (rev 725)
@@ -0,0 +1,7 @@
+package org.haverdev.haver.server.exceptions;
+
+public final class NotPresentPart extends SimplePropagatedException {
+ public NotPresentPart(String name) {
+ super("PART", "part.notthere", name);
+ }
+}
Property changes on:
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/NotPresentPart.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added:
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/PropagatedException.java
===================================================================
---
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/PropagatedException.java
2005-05-24 01:55:15 UTC (rev 724)
+++
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/PropagatedException.java
2005-05-24 02:00:16 UTC (rev 725)
@@ -0,0 +1,8 @@
+package org.haverdev.haver.server.exceptions;
+
+public abstract class PropagatedException extends Exception {
+ public abstract String[] clientReport();
+ public PropagatedException(String reason) {
+ super(reason);
+ }
+}
Property changes on:
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/PropagatedException.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added:
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/SimplePropagatedException.java
===================================================================
---
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/SimplePropagatedException.java
2005-05-24 01:55:15 UTC (rev 724)
+++
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/SimplePropagatedException.java
2005-05-24 02:00:16 UTC (rev 725)
@@ -0,0 +1,21 @@
+package org.haverdev.haver.server.exceptions;
+
+public abstract class SimplePropagatedException extends PropagatedException {
+ String cmd, code, detail;
+ public SimplePropagatedException(String cmd, String code, String detail) {
+ super(detail == null ? "Error " + code + " in command " + cmd :
detail);
+ this.cmd = cmd;
+ this.code = code;
+ this.detail = detail;
+ }
+
+ public String[] clientReport() {
+ if (detail != null) {
+ String[] fail = { "FAIL", cmd, code, this.getMessage() };
+ return fail;
+ } else {
+ String[] fail = { "FAIL", cmd, code };
+ return fail;
+ }
+ }
+}
Property changes on:
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/SimplePropagatedException.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added:
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/UnknownClientCommandException.java
===================================================================
---
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/UnknownClientCommandException.java
2005-05-24 01:55:15 UTC (rev 724)
+++
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/UnknownClientCommandException.java
2005-05-24 02:00:16 UTC (rev 725)
@@ -0,0 +1,14 @@
+package org.haverdev.haver.server.exceptions;
+
+public final class UnknownClientCommandException extends PropagatedException {
+ String cmd;
+ public UnknownClientCommandException(String[] cmd) {
+ super("Unknown command " + cmd[0]);
+ this.cmd = cmd[0];
+ }
+
+ public String[] clientReport() {
+ String[] fail = {"FAIL", cmd, "unknown.cmd"};
+ return fail;
+ }
+}
Property changes on:
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/UnknownClientCommandException.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added:
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/UserAlreadyExists.java
===================================================================
---
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/UserAlreadyExists.java
2005-05-24 01:55:15 UTC (rev 724)
+++
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/UserAlreadyExists.java
2005-05-24 02:00:16 UTC (rev 725)
@@ -0,0 +1,7 @@
+package org.haverdev.haver.server.exceptions;
+
+public final class UserAlreadyExists extends SimplePropagatedException {
+ public UserAlreadyExists(String name) {
+ super("IDENT", "exists.user", name);
+ }
+}
Property changes on:
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/UserAlreadyExists.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added:
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/UserNotFound.java
===================================================================
---
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/UserNotFound.java
2005-05-24 01:55:15 UTC (rev 724)
+++
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/UserNotFound.java
2005-05-24 02:00:16 UTC (rev 725)
@@ -0,0 +1,20 @@
+/*
+ * UserNotFound.java
+ *
+ * Created on May 23, 2005, 9:25 PM
+ */
+
+package org.haverdev.haver.server.exceptions;
+
+/**
+ *
+ * @author bdonlan
+ */
+public class UserNotFound extends SimplePropagatedException {
+
+ /** Creates a new instance of UserNotFound */
+ public UserNotFound(String cmd, String name) {
+ super(cmd, "notfound.user", name);
+ }
+
+}
Property changes on:
trunk/clients/Javer2/src/org/haverdev/haver/server/exceptions/UserNotFound.java
___________________________________________________________________
Name: svn:eol-style
+ native
