From: bdemsky <bdemsky>
Date: Sat, 4 Nov 2006 09:35:35 +0000 (+0000)
Subject: Use a hashmap to map strings to rooms.  So now we can have an unbounded number of... 
X-Git-Tag: preEdgeChange~764
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=e017e0127bdbb389cba864a3766a892224c6026f;p=IRC.git

Use a hashmap to map strings to rooms.  So now we can have an unbounded number of rooms and they can have names
---

diff --git a/Robust/src/Benchmarks/Chat/ChatSocket.java b/Robust/src/Benchmarks/Chat/ChatSocket.java
index f278c10b..e7252f3b 100644
--- a/Robust/src/Benchmarks/Chat/ChatSocket.java
+++ b/Robust/src/Benchmarks/Chat/ChatSocket.java
@@ -25,7 +25,6 @@ public class ChatSocket extends Socket {
         return false;
     }
     public void processRoom(RoomObject ro) {
-	int i=Integer.parseInt(roomrequest);
-	ro.getChatRoom(i).addParticipant(this);
+	ro.getChatRoom(roomrequest).addParticipant(this);
     }
 }
diff --git a/Robust/src/Benchmarks/Chat/Room.java b/Robust/src/Benchmarks/Chat/Room.java
index c644b523..938137c2 100644
--- a/Robust/src/Benchmarks/Chat/Room.java
+++ b/Robust/src/Benchmarks/Chat/Room.java
@@ -1,8 +1,8 @@
 public class Room {
     String name;
     HashSet participants;
-    public Room(int i) {
-	name=String.valueOf(i);
+    public Room(String n) {
+	name=n;
 	participants=new HashSet();
     }
     
diff --git a/Robust/src/Benchmarks/Chat/RoomObject.java b/Robust/src/Benchmarks/Chat/RoomObject.java
index 9844d3f6..dd002813 100644
--- a/Robust/src/Benchmarks/Chat/RoomObject.java
+++ b/Robust/src/Benchmarks/Chat/RoomObject.java
@@ -1,13 +1,15 @@
 public class RoomObject {
     flag Initialized;
-    Room[] rooms;
+    HashMap rooms;
     public RoomObject() {
-	rooms=new Room[10];
-	for(int i=0;i<rooms.length;i++)
-	    rooms[i]=new Room(i);
+	rooms=new HashMap();
     }
 
-    Room getChatRoom(int i) {
-	return rooms[i];
+    Room getChatRoom(String name) {
+	if (rooms.containsKey(name))
+	    return (Room) rooms.get(name);
+	Room r=new Room(name);
+	rooms.put(name, r);
+	return r;
     }
 }