projects
/
xudocci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f3cc380
)
Use map and set creators from Guava.
author
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Tue, 9 Apr 2013 21:46:15 +0000
(23:46 +0200)
committer
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Tue, 9 Apr 2013 21:46:15 +0000
(23:46 +0200)
src/main/java/net/pterodactylus/irc/Connection.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/xdcc/core/Core.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/xdcc/data/Bot.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/xdcc/data/Network.java
patch
|
blob
|
history
diff --git
a/src/main/java/net/pterodactylus/irc/Connection.java
b/src/main/java/net/pterodactylus/irc/Connection.java
index
2619204
..
d127363
100644
(file)
--- a/
src/main/java/net/pterodactylus/irc/Connection.java
+++ b/
src/main/java/net/pterodactylus/irc/Connection.java
@@
-51,9
+51,9
@@
import net.pterodactylus.irc.event.PrivateMessageReceived;
import net.pterodactylus.irc.event.UnknownReplyReceived;
import net.pterodactylus.irc.util.RandomNickname;
import net.pterodactylus.irc.event.UnknownReplyReceived;
import net.pterodactylus.irc.util.RandomNickname;
-import com.beust.jcommander.internal.Maps;
-import com.beust.jcommander.internal.Sets;
import com.google.common.base.Optional;
import com.google.common.base.Optional;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
import com.google.common.eventbus.EventBus;
import com.google.common.io.Closeables;
import com.google.common.util.concurrent.AbstractExecutionThreadService;
import com.google.common.eventbus.EventBus;
import com.google.common.io.Closeables;
import com.google.common.util.concurrent.AbstractExecutionThreadService;
diff --git
a/src/main/java/net/pterodactylus/xdcc/core/Core.java
b/src/main/java/net/pterodactylus/xdcc/core/Core.java
index
2691526
..
5df7f42
100644
(file)
--- a/
src/main/java/net/pterodactylus/xdcc/core/Core.java
+++ b/
src/main/java/net/pterodactylus/xdcc/core/Core.java
@@
-40,11
+40,11
@@
import net.pterodactylus.xdcc.data.Network;
import net.pterodactylus.xdcc.data.Pack;
import net.pterodactylus.xdcc.data.Server;
import net.pterodactylus.xdcc.data.Pack;
import net.pterodactylus.xdcc.data.Server;
-import com.beust.jcommander.internal.Maps;
-import com.beust.jcommander.internal.Sets;
import com.google.common.base.Optional;
import com.google.common.collect.HashBasedTable;
import com.google.common.collect.Lists;
import com.google.common.base.Optional;
import com.google.common.collect.HashBasedTable;
import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
import com.google.common.collect.Table;
import com.google.common.eventbus.EventBus;
import com.google.common.eventbus.Subscribe;
import com.google.common.collect.Table;
import com.google.common.eventbus.EventBus;
import com.google.common.eventbus.Subscribe;
diff --git
a/src/main/java/net/pterodactylus/xdcc/data/Bot.java
b/src/main/java/net/pterodactylus/xdcc/data/Bot.java
index
46bca18
..
724f0e0
100644
(file)
--- a/
src/main/java/net/pterodactylus/xdcc/data/Bot.java
+++ b/
src/main/java/net/pterodactylus/xdcc/data/Bot.java
@@
-21,7
+21,7
@@
import java.util.Collection;
import java.util.Iterator;
import java.util.Map;
import java.util.Iterator;
import java.util.Map;
-import com.
beust.jcommander.internal
.Maps;
+import com.
google.common.collect
.Maps;
/**
* A bot is a client in a {@link Network} that carries {@link Pack}s which are
/**
* A bot is a client in a {@link Network} that carries {@link Pack}s which are
diff --git
a/src/main/java/net/pterodactylus/xdcc/data/Network.java
b/src/main/java/net/pterodactylus/xdcc/data/Network.java
index
b13df61
..
2b13478
100644
(file)
--- a/
src/main/java/net/pterodactylus/xdcc/data/Network.java
+++ b/
src/main/java/net/pterodactylus/xdcc/data/Network.java
@@
-21,7
+21,7
@@
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Collection;
import java.util.Collection;
-import com.
beust.jcommander.internal
.Sets;
+import com.
google.common.collect
.Sets;
/**
* Defines a network.
/**
* Defines a network.