modif data + Ajouts Ports

src/IRC/Server.java

@@ -0,0 +1,74 @@
+package IRC;
+
+import java.util.List;
+
+public class Server {
+	private String address;
+	private int port;
+	private List<String> chan;
+	
+	
+	public Server(String address, int port, List<String> chan) {
+		super();
+		this.address = address;
+		this.port = port;
+		this.chan = chan;
+	}
+	
+	public Server(String gen) {
+		String serv = gen;
+		if(gen.substring(0, 7).equals("irc://")) {
+			
+			if(serv.contains(":")) {
+				String val = serv.
+				port = Integer.parseInt();
+			}else {
+				port = 6667;
+			}
+		}else {
+			throw new IllegalArgumentException("Le serveur "+gen+" n'est pas un serveur IRC valide");
+		}
+		
+		
+	}
+	private int getSrvPort(String s) {
+		int res;
+		if(s.contains(":")) {
+			int idx = s.indexOf(':');
+			idx++;
+			String val = "";
+			while(s.charAt(idx)<=9 || s.charAt(idx)>=0) {
+				val += s.charAt(idx);
+				idx++;
+			}
+			res = Integer.parseInt(val);
+		}else {
+			res = 6667; 
+		}
+		return res;
+		
+	}
+	
+	public String getAddress() {
+		return address;
+	}
+	public void setAddress(String address) {
+		this.address = address;
+	}
+	public int getPort() {
+		return port;
+	}
+	public void setPort(int port) {
+		this.port = port;
+	}
+	public List<String> getChan() {
+		return chan;
+	}
+	public void setChan(List<String> chan) {
+		this.chan = chan;
+	}
+	
+	
+	
+
+}

src/data/ISPdata.java

@@ -5,12 +5,14 @@ import java.util.Iterator;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
+import IRC.Server;
+
 public class ISPdata {
 
 	private ISP ISP;
 	private String website;
 	private String description;
-	private String [] chatrooms;
+	private Server [] ircChan;
 	private int progressStatus;
 	private int membersCount;
 	private int subscribersCount;
@@ -19,13 +21,13 @@ public class ISPdata {
 	
 	
 
-	public ISPdata(data.ISP ISP, String website, String description, String[] chatrooms, int progressStatus,
+	public ISPdata(data.ISP ISP, String website, String description, Server[] chatrooms, int progressStatus,
 			int membersCount, int subscribersCount) {
 		super();
 		this.ISP = ISP;
 		this.website = website;
 		this.description = description;
-		this.chatrooms = chatrooms;
+		this.ircChan = chatrooms;
 		this.progressStatus = progressStatus;
 		this.membersCount = membersCount;
 		this.subscribersCount = subscribersCount;
@@ -36,8 +38,6 @@ public class ISPdata {
 		this.website = jo.getString("website");
 		isp.setName(jo.getString("name"));
 		JSONArray chatrooms = jo.getJSONArray("chatrooms");
-		
-		
 	}
 
 	public String getWebsite() {
@@ -50,7 +50,7 @@ public class ISPdata {
 	}
 
 	public String[] getChatrooms() {
-		return chatrooms;
+		return ircChan;
 	}