projects
/
xudocci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Return unmodifiable view of packs
[xudocci.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
xdcc
/
data
/
Bot.java
diff --git
a/src/main/java/net/pterodactylus/xdcc/data/Bot.java
b/src/main/java/net/pterodactylus/xdcc/data/Bot.java
index
96d91b6
..
c9e2a9b
100644
(file)
--- a/
src/main/java/net/pterodactylus/xdcc/data/Bot.java
+++ b/
src/main/java/net/pterodactylus/xdcc/data/Bot.java
@@
-20,6
+20,7
@@
package net.pterodactylus.xdcc.data;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Collection;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Collection;
+import java.util.Collections;
import java.util.Iterator;
import java.util.Map;
import java.util.Iterator;
import java.util.Map;
@@
-35,23
+36,18
@@
public class Bot implements Iterable<Pack> {
/** The network this bot is on. */
private final Network network;
/** The network this bot is on. */
private final Network network;
+ private final String channel;
/** The packs this bot carries. */
private final Map<String, Pack> packs = Maps.newHashMap();
/** The packs this bot carries. */
private final Map<String, Pack> packs = Maps.newHashMap();
+ private final Map<String, Pack> packsByName = Maps.newHashMap();
/** The current name of the bot. */
private String name;
/** The current name of the bot. */
private String name;
- /**
- * Creates a new bot.
- *
- * @param network
- * The network the bot is on
- * @param name
- * The name of the bot
- */
- public Bot(Network network, String name) {
+ public Bot(Network network, String channel, String name) {
this.network = checkNotNull(network, "network must not be null");
this.network = checkNotNull(network, "network must not be null");
+ this.channel = checkNotNull(channel, "channel must not be null");
this.name = checkNotNull(name, "name must not be null");
}
this.name = checkNotNull(name, "name must not be null");
}
@@
-68,6
+64,10
@@
public class Bot implements Iterable<Pack> {
return network;
}
return network;
}
+ public String channel() {
+ return channel;
+ }
+
/**
* Returns the current name of this bot.
*
/**
* Returns the current name of this bot.
*
@@
-83,7
+83,9
@@
public class Bot implements Iterable<Pack> {
* @return The packs this bot carries
*/
public Collection<Pack> packs() {
* @return The packs this bot carries
*/
public Collection<Pack> packs() {
- return packs.values();
+ synchronized (packs) {
+ return Collections.unmodifiableCollection(packs.values());
+ }
}
//
}
//
@@
-113,7
+115,14
@@
public class Bot implements Iterable<Pack> {
* The pack to add
*/
public void addPack(Pack pack) {
* The pack to add
*/
public void addPack(Pack pack) {
- packs.put(pack.id(), pack);
+ synchronized (this) {
+ if (packsByName.containsKey(pack.name())) {
+ Pack oldPack = packsByName.remove(pack.name());
+ packs.remove(oldPack.id());
+ }
+ packs.put(pack.id(), pack);
+ packsByName.put(pack.name(), pack);
+ }
}
//
}
//
@@
-122,7
+131,7
@@
public class Bot implements Iterable<Pack> {
@Override
public Iterator<Pack> iterator() {
@Override
public Iterator<Pack> iterator() {
- return packs
.values
().iterator();
+ return packs().iterator();
}
//
}
//