Skip to content

Minor prep for Channel->GroupChat change. #321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 13, 2015
Merged

Minor prep for Channel->GroupChat change. #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ui_swing/src/com/dmdirc/addons/ui_swing/components/modes/ChannelModesPane.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,18 +49,18 @@ public ChannelModesPane(final Channel channel, final IconManager iconManager) {

@Override
public boolean hasModeValue(final String mode) {
return channel.getConfigManager().hasOptionString("server", "mode" + mode);
return channel.getWindowModel().getConfigManager().hasOptionString("server", "mode" + mode);
}

@Override
public String getModeValue(final String mode) {
return channel.getConfigManager().getOption("server", "mode" + mode);
return channel.getWindowModel().getConfigManager().getOption("server", "mode" + mode);
}

@Override
public boolean isModeEnabled(final String mode) {
return !channel.getConfigManager().hasOptionString("server",
"enablemode" + mode) || channel.getConfigManager()
return !channel.getWindowModel().getConfigManager().hasOptionString("server",
"enablemode" + mode) || channel.getWindowModel().getConfigManager()
.getOptionBool("server", "enablemode" + mode);
}

Expand Down
8 changes: 4 additions & 4 deletions ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelSettingsDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ private void initComponents(final TabCompleterUtils tabCompleterUtils) {

initSettingsTab();

tabbedPane.setSelectedIndex(channel.getConfigManager().
tabbedPane.setSelectedIndex(channel.getWindowModel().getConfigManager().
getOptionInt("dialogstate", "channelsettingsdialog"));
}

Expand All @@ -198,8 +198,8 @@ private void initIrcTab() {

/** Initialises the IRC Settings tab. */
private void initListModesTab() {
channelListModesPane = new ChannelListModesPane(channel.getConfigManager(), userConfig,
iconManager, channel, this);
channelListModesPane = new ChannelListModesPane(channel.getWindowModel().getConfigManager(),
userConfig, iconManager, channel, this);
tabbedPane.addTab("List Modes", channelListModesPane);
}

Expand All @@ -216,7 +216,7 @@ private void initSettingsPanel() {
"These settings are specific to this channel on this network,"
+ " any settings specified here will overwrite global settings");
channelSettingsPane.addOption(preferencesManager.getChannelSettings(
channel.getConfigManager(), identity));
channel.getWindowModel().getConfigManager(), identity));
}

/** Initialises listeners for this dialog. */
Expand Down