#781 Enabled Dim. Trans. to work on offline servers.

This commit is contained in:
CrazyPants committed 2014-07-05 20:34:40 +08:00
1 parent 9040a64dd0
commit 296bd08514
9 files changed
+24 -24

No files matched your search

@@ -33,7 +33,7 @@ public class HyperCubeConfig {
private final List<Channel> publicChannels = new ArrayList<Channel>();
private final Map<UUID, List<Channel>> userChannels = new HashMap<UUID, List<Channel>>();
private final Map<String, List<Channel>> userChannels = new HashMap<String, List<Channel>>();
private final File file;
@@ -53,11 +53,11 @@ public class HyperCubeConfig {
publicChannels.addAll(chans);
}
public Map<UUID, List<Channel>> getUserChannels() {
public Map<String, List<Channel>> getUserChannels() {
return userChannels;
}
public void setUserChannels(Map<UUID, List<Channel>> channels) {
public void setUserChannels(Map<String, List<Channel>> channels) {
userChannels.clear();
userChannels.putAll(channels);
}
@@ -68,10 +68,10 @@ public class HyperCubeConfig {
setChannelListProperty(KEY_PUBLIC_CHANNELS, publicChannels);
StringBuilder userListStr = new StringBuilder();
Iterator<Entry<UUID, List<Channel>>> itr = userChannels.entrySet().iterator();
Iterator<Entry<String, List<Channel>>> itr = userChannels.entrySet().iterator();
while (itr.hasNext()) {
Entry<UUID, List<Channel>> entry = itr.next();
UUID user = entry.getKey();
Entry<String, List<Channel>> entry = itr.next();
String user = entry.getKey();
List<Channel> channels = entry.getValue();
if(user != null && channels != null && !channels.isEmpty()) {
@@ -134,15 +134,15 @@ public class HyperCubeConfig {
loadChannelList(KEY_PUBLIC_CHANNELS, null, publicChannels);
userChannels.clear();
List<UUID> users = new ArrayList<UUID>();
List<String> users = new ArrayList<String>();
String usersStr = props.getProperty(KEY_USERS, "");
String[] usersSplit = usersStr.split(DELIM);
for (String user : usersSplit) {
if(user != null) {
users.add(UUID.fromString(user));
users.add(user);
}
}
for (UUID user : users) {
for (String user : users) {
List<Channel> channels = new ArrayList<Channel>();
loadChannelList(user + KEY_USER_CHANNEL, user, channels);
if(!channels.isEmpty()) {
@@ -152,7 +152,7 @@ public class HyperCubeConfig {
}
private void loadChannelList(String key, UUID user, List<Channel> channels) {
private void loadChannelList(String key, String user, List<Channel> channels) {
String chans = props.getProperty(key, "");
//chans = chans.replaceAll(DELIM_ESC, DELIM);
String[] chanSplit = chans.split(DELIM);