Merge branch 'exceptionsheritage' of flavien/Projet_JAVA_P2P_STRI2A into etape4

src/clientP2P/ClientDownloadPartTCP.java

@@ -6,22 +6,22 @@ import protocolP2P.ProtocolP2PPacketTCP;
 import protocolP2P.Payload;
 import protocolP2P.LoadRequest;
 import protocolP2P.FilePart;
-import exception.InternalError;
+import localException.InternalError;
 import remoteException.EmptyDirectory;
 import remoteException.EmptyFile;
-import exception.ProtocolError;
+import localException.ProtocolError;
 import remoteException.InternalRemoteError;
 import remoteException.VersionRemoteError;
-import exception.TransmissionError;
+import localException.TransmissionError;
 import remoteException.ProtocolRemoteError;
-import exception.VersionError;
-import exception.SizeError;
+import localException.VersionError;
+import localException.SizeError;
 import remoteException.NotFound;
 import java.nio.file.Files;
 import java.io.File;
 import java.nio.file.Paths;
 import java.io.IOException;
-import exception.SocketClosed;
+import localException.SocketClosed;
 
 /** Class to download file parts on tcp.
 * @author	Louis Royer

src/clientP2P/ClientDownloadPartUDP.java

@@ -6,16 +6,16 @@ import protocolP2P.ProtocolP2PPacketUDP;
 import protocolP2P.Payload;
 import protocolP2P.LoadRequest;
 import protocolP2P.FilePart;
-import exception.InternalError;
+import localException.InternalError;
 import remoteException.EmptyDirectory;
 import remoteException.EmptyFile;
-import exception.ProtocolError;
+import localException.ProtocolError;
 import remoteException.InternalRemoteError;
 import remoteException.VersionRemoteError;
-import exception.TransmissionError;
+import localException.TransmissionError;
 import remoteException.ProtocolRemoteError;
-import exception.VersionError;
-import exception.SizeError;
+import localException.VersionError;
+import localException.SizeError;
 import remoteException.NotFound;
 import java.nio.file.Files;
 import java.io.File;

src/clientP2P/ClientDownloadTCP.java

@@ -16,11 +16,11 @@ import protocolP2P.HashResponse;
 import protocolP2P.HashRequest;
 import protocolP2P.ProtocolP2PPacketTCP;
 import protocolP2P.Payload;
-import exception.ProtocolError;
-import exception.InternalError;
-import exception.TransmissionError;
-import exception.SizeError;
-import exception.VersionError;
+import localException.ProtocolError;
+import localException.InternalError;
+import localException.TransmissionError;
+import localException.SizeError;
+import localException.VersionError;
 import protocolP2P.FilePart;
 import protocolP2P.LoadRequest;
 import java.io.IOException;
@@ -29,7 +29,7 @@ import java.io.File;
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
 import java.nio.file.StandardCopyOption;
-import exception.SocketClosed;
+import localException.SocketClosed;
 
 /** Class to download file from tcp
 * @author	Louis Royer

src/clientP2P/ClientDownloadUDP.java

@@ -16,11 +16,11 @@ import protocolP2P.HashResponse;
 import protocolP2P.HashRequest;
 import protocolP2P.ProtocolP2PPacketUDP;
 import protocolP2P.Payload;
-import exception.ProtocolError;
-import exception.InternalError;
-import exception.TransmissionError;
-import exception.SizeError;
-import exception.VersionError;
+import localException.ProtocolError;
+import localException.InternalError;
+import localException.TransmissionError;
+import localException.SizeError;
+import localException.VersionError;
 import protocolP2P.FilePart;
 import protocolP2P.LoadRequest;
 import java.io.IOException;

src/clientP2P/ClientManagementTCP.java

@@ -1,9 +1,9 @@
 package clientP2P;
-import exception.InternalError;
-import exception.ProtocolError;
-import exception.SizeError;
-import exception.TransmissionError;
-import exception.VersionError;
+import localException.InternalError;
+import localException.ProtocolError;
+import localException.SizeError;
+import localException.TransmissionError;
+import localException.VersionError;
 import remoteException.EmptyFile;
 import remoteException.EmptyDirectory;
 import remoteException.InternalRemoteError;
@@ -32,7 +32,7 @@ import protocolP2P.HashResponse;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import clientP2P.ClientDownloadTCP;
-import exception.SocketClosed;
+import localException.SocketClosed;
 
 /** Implementation of P2P-JAVA-PROJECT CLIENT
  * @author	Louis Royer

src/clientP2P/ClientManagementUDP.java

@@ -1,9 +1,9 @@
 package clientP2P;
-import exception.InternalError;
-import exception.ProtocolError;
-import exception.SizeError;
-import exception.TransmissionError;
-import exception.VersionError;
+import localException.InternalError;
+import localException.ProtocolError;
+import localException.SizeError;
+import localException.TransmissionError;
+import localException.VersionError;
 import remoteException.EmptyFile;
 import remoteException.EmptyDirectory;
 import remoteException.InternalRemoteError;

src/exception/LocalException.java

@@ -1,4 +1,5 @@
 package exception;
-public class InternalError extends Exception {
+
+public class LocalException extends Exception {
 	private static final long serialVersionUID = 12L;
 }

src/exception/RemoteException.java

@@ -1,4 +1,5 @@
 package exception;
-public class ProtocolError extends Exception {
+
+public class RemoteException extends Exception {
 	private static final long serialVersionUID = 12L;
 }

src/exception/SocketClosed.java

@@ -1,4 +0,0 @@
-package exception;
-public class SocketClosed extends Exception {
-	private static final long serialVersionUID = 12L;
-}

src/exception/TransmissionError.java

@@ -1,4 +0,0 @@
-package exception;
-public class TransmissionError extends Exception {
-	private static final long serialVersionUID = 12L;
-}

src/exception/VersionError.java

@@ -1,4 +0,0 @@
-package exception;
-public class VersionError extends Exception {
-	private static final long serialVersionUID = 12L;
-}

src/localException/InternalError.java

@@ -0,0 +1,7 @@
+package localException;
+
+import exception.LocalException;
+
+public class InternalError extends exception.LocalException {
+	private static final long serialVersionUID = 12L;
+}

src/localException/ProtocolError.java

@@ -0,0 +1,7 @@
+package localException;
+
+import exception.LocalException;
+
+public class ProtocolError extends exception.LocalException {
+	private static final long serialVersionUID = 12L;
+}

src/localException/SizeError.java

@@ -1,5 +1,9 @@
-package exception;
+package localException;
+
+import exception.LocalException;
+
+
 /** Used on reception side when size as set in Packet is too big, and we cant store this in a int/long as usual. */
-public class SizeError extends Exception {
+public class SizeError extends exception.LocalException {
 	private static final long serialVersionUID = 12L;
 }

src/localException/SocketClosed.java

@@ -0,0 +1,7 @@
+package localException;
+
+import exception.LocalException;
+
+public class SocketClosed extends exception.LocalException {
+	private static final long serialVersionUID = 12L;
+}

src/localException/TransmissionError.java

@@ -0,0 +1,7 @@
+package localException;
+
+import exception.LocalException;
+
+public class TransmissionError extends exception.LocalException {
+	private static final long serialVersionUID = 12L;
+}

src/localException/VersionError.java

@@ -0,0 +1,7 @@
+package localException;
+
+import exception.LocalException;
+
+public class VersionError extends exception.LocalException {
+	private static final long serialVersionUID = 12L;
+}

src/protocolP2P/FileList.java

@@ -2,10 +2,10 @@ package protocolP2P;
 import java.util.Arrays;
 import protocolP2P.Payload;
 import protocolP2P.RequestResponseCode;
-import exception.TransmissionError;
-import exception.ProtocolError;
-import exception.InternalError;
-import exception.SizeError;
+import localException.TransmissionError;
+import localException.ProtocolError;
+import localException.InternalError;
+import localException.SizeError;
 import java.io.UnsupportedEncodingException;
 import tools.BytesArrayTools;
 

src/protocolP2P/FilePart.java

@@ -1,10 +1,10 @@
 package protocolP2P;
 import protocolP2P.Payload;
 import protocolP2P.RequestResponseCode;
-import exception.ProtocolError;
-import exception.InternalError;
-import exception.SizeError;
-import exception.TransmissionError;
+import localException.ProtocolError;
+import localException.InternalError;
+import localException.SizeError;
+import localException.TransmissionError;
 import tools.BytesArrayTools;
 import java.util.Arrays;
 import java.io.UnsupportedEncodingException;

src/protocolP2P/HashRequest.java

@@ -2,10 +2,10 @@ package protocolP2P;
 import protocolP2P.Payload;
 import protocolP2P.HashAlgorithm;
 import java.io.UnsupportedEncodingException;
-import exception.TransmissionError;
-import exception.SizeError;
-import exception.ProtocolError;
-import exception.InternalError;
+import localException.TransmissionError;
+import localException.SizeError;
+import localException.ProtocolError;
+import localException.InternalError;
 import tools.BytesArrayTools;
 
 

src/protocolP2P/HashResponse.java

@@ -3,10 +3,10 @@ import protocolP2P.Payload;
 import java.util.HashMap;
 import java.util.Map;
 import java.io.UnsupportedEncodingException;
-import exception.TransmissionError;
-import exception.SizeError;
-import exception.ProtocolError;
-import exception.InternalError;
+import localException.TransmissionError;
+import localException.SizeError;
+import localException.ProtocolError;
+import localException.InternalError;
 import tools.BytesArrayTools;
 
 

src/protocolP2P/LoadRequest.java

@@ -1,10 +1,10 @@
 package protocolP2P;
 import protocolP2P.Payload;
 import protocolP2P.RequestResponseCode;
-import exception.TransmissionError;
-import exception.ProtocolError;
-import exception.InternalError;
-import exception.SizeError;
+import localException.TransmissionError;
+import localException.ProtocolError;
+import localException.InternalError;
+import localException.SizeError;
 import tools.BytesArrayTools;
 import java.io.UnsupportedEncodingException;
 

src/protocolP2P/Payload.java

@@ -5,10 +5,10 @@ import protocolP2P.FileList;
 import protocolP2P.LoadRequest;
 import protocolP2P.HashRequest;
 import protocolP2P.HashResponse;
-import exception.ProtocolError;
-import exception.InternalError;
-import exception.TransmissionError;
-import exception.SizeError;
+import localException.ProtocolError;
+import localException.InternalError;
+import localException.TransmissionError;
+import localException.SizeError;
 import tools.BytesArrayTools;
 /** Representation of payload. If payload has a size, use subclasses instead.
  * @author	Louis Royer

src/protocolP2P/ProtocolP2PPacket.java

@@ -1,10 +1,10 @@
 package protocolP2P;
-import exception.InternalError;
-import exception.ProtocolError;
-import exception.SizeError;
-import exception.TransmissionError;
-import exception.VersionError;
-import exception.SocketClosed;
+import localException.InternalError;
+import localException.ProtocolError;
+import localException.SizeError;
+import localException.TransmissionError;
+import localException.VersionError;
+import localException.SocketClosed;
 import remoteException.EmptyDirectory;
 import remoteException.InternalRemoteError;
 import remoteException.NotFound;

src/protocolP2P/ProtocolP2PPacketTCP.java

@@ -1,10 +1,10 @@
 package protocolP2P;
-import exception.InternalError;
-import exception.ProtocolError;
-import exception.SizeError;
-import exception.TransmissionError;
-import exception.VersionError;
-import exception.SocketClosed;
+import localException.InternalError;
+import localException.ProtocolError;
+import localException.SizeError;
+import localException.TransmissionError;
+import localException.VersionError;
+import localException.SocketClosed;
 import remoteException.EmptyDirectory;
 import remoteException.InternalRemoteError;
 import remoteException.NotFound;

src/protocolP2P/ProtocolP2PPacketUDP.java

@@ -1,10 +1,10 @@
 package protocolP2P;
-import exception.InternalError;
-import exception.ProtocolError;
-import exception.SizeError;
-import exception.TransmissionError;
-import exception.VersionError;
-import exception.SocketClosed;
+import localException.InternalError;
+import localException.ProtocolError;
+import localException.SizeError;
+import localException.TransmissionError;
+import localException.VersionError;
+import localException.SocketClosed;
 import remoteException.EmptyDirectory;
 import remoteException.InternalRemoteError;
 import remoteException.NotFound;

src/protocolP2P/RequestResponseCode.java

@@ -1,6 +1,6 @@
 package protocolP2P;
 import protocolP2P.CodeType;
-import exception.ProtocolError;
+import localException.ProtocolError;
 import java.util.HashMap;
 import java.util.Map;
 import java.lang.Byte;
@@ -64,5 +64,3 @@ public enum RequestResponseCode {
 
 
 }
-
-

src/remoteException/EmptyDirectory.java

@@ -1,4 +1,7 @@
 package remoteException;
-public class EmptyDirectory extends Exception {
+
+import exception.RemoteException;
+
+public class EmptyDirectory extends exception.RemoteException {
 	private static final long serialVersionUID = 12L;
 }

src/remoteException/EmptyFile.java

@@ -1,4 +1,7 @@
 package remoteException;
-public class EmptyFile extends Exception {
+
+import exception.RemoteException;
+
+public class EmptyFile extends exception.RemoteException {
 	private static final long serialVersionUID = 12L;
 }

src/remoteException/InternalRemoteError.java

@@ -1,4 +1,7 @@
 package remoteException;
-public class InternalRemoteError extends Exception {
+
+import exception.RemoteException;
+
+public class InternalRemoteError extends exception.RemoteException {
 	private static final long serialVersionUID = 12L;
 }

src/remoteException/NotFound.java

@@ -1,4 +1,7 @@
 package remoteException;
-public class NotFound extends Exception {
+
+import exception.RemoteException;
+
+public class NotFound extends exception.RemoteException {
 	private static final long serialVersionUID = 12L;
 }

src/remoteException/ProtocolRemoteError.java

@@ -1,4 +1,7 @@
 package remoteException;
-public class ProtocolRemoteError extends Exception {
+
+import exception.RemoteException;
+
+public class ProtocolRemoteError extends exception.RemoteException {
 	private static final long serialVersionUID = 12L;
 }

src/remoteException/VersionRemoteError.java

@@ -1,4 +1,7 @@
 package remoteException;
-public class VersionRemoteError extends Exception {
+
+import exception.RemoteException;
+
+public class VersionRemoteError extends exception.RemoteException {
 	private static final long serialVersionUID = 12L;
 }

src/serverP2P/ServerManagementTCP.java

@@ -17,12 +17,12 @@ import protocolP2P.Payload;
 import protocolP2P.LoadRequest;
 import protocolP2P.FileList;
 import protocolP2P.FilePart;
-import exception.InternalError;
-import exception.ProtocolError;
-import exception.SizeError;
-import exception.TransmissionError;
-import exception.VersionError;
-import exception.SocketClosed;
+import localException.InternalError;
+import localException.ProtocolError;
+import localException.SizeError;
+import localException.TransmissionError;
+import localException.VersionError;
+import localException.SocketClosed;
 import remoteException.EmptyDirectory;
 import remoteException.InternalRemoteError;
 import remoteException.NotFound;

src/serverP2P/ServerManagementUDP.java

@@ -16,12 +16,12 @@ import protocolP2P.Payload;
 import protocolP2P.LoadRequest;
 import protocolP2P.FileList;
 import protocolP2P.FilePart;
-import exception.InternalError;
-import exception.ProtocolError;
-import exception.SizeError;
-import exception.TransmissionError;
-import exception.VersionError;
-import exception.SocketClosed;
+import localException.InternalError;
+import localException.ProtocolError;
+import localException.SizeError;
+import localException.TransmissionError;
+import localException.VersionError;
+import localException.SocketClosed;
 import remoteException.EmptyDirectory;
 import remoteException.InternalRemoteError;
 import remoteException.NotFound;
@@ -245,4 +245,3 @@ public class ServerManagementUDP implements Runnable {
 	}
 
 }
-

src/tools/BytesArrayTools.java

@@ -1,6 +1,6 @@
 package tools;
-import exception.SizeError;
-import exception.ProtocolError;
+import localException.SizeError;
+import localException.ProtocolError;
 import java.io.UnsupportedEncodingException;
 import java.util.Arrays;