From 2892e4609ebd9d7e52a520b723952e3a02945e9d Mon Sep 17 00:00:00 2001 From: denny Date: Sat, 6 Feb 2016 08:24:46 -0500 Subject: [PATCH] Removes the 'No Tuner' color change sub-menu from the decoding channels list. This is no longer a valid channel state since any decoding channels that fail to get a tuner source will not be displayed. --- src/module/decode/state/ChannelList.java | 14 -------------- src/module/decode/state/ChannelState.java | 5 ----- 2 files changed, 19 deletions(-) diff --git a/src/module/decode/state/ChannelList.java b/src/module/decode/state/ChannelList.java index 2b90f510..96b07d96 100644 --- a/src/module/decode/state/ChannelList.java +++ b/src/module/decode/state/ChannelList.java @@ -253,20 +253,6 @@ public class ChannelList extends JPanel implements ChannelEventListener idleMenu.add( new ColorSettingResetMenuItem( mSettingsManager, ColorSettingName.CHANNEL_STATE_GRADIENT_TOP_IDLE ) ); - JMenu noTunerMenu = new JMenu( "No Tuner" ); - channelsMenu.add( noTunerMenu ); - - noTunerMenu.add( new ColorSettingMenuItem( mSettingsManager, - ColorSettingName.CHANNEL_STATE_GRADIENT_MIDDLE_NO_TUNER ) ); - noTunerMenu.add( new ColorSettingResetMenuItem( mSettingsManager, - ColorSettingName.CHANNEL_STATE_GRADIENT_MIDDLE_NO_TUNER ) ); - noTunerMenu.add( new JSeparator() ); - - noTunerMenu.add( new ColorSettingMenuItem( mSettingsManager, - ColorSettingName.CHANNEL_STATE_GRADIENT_TOP_NO_TUNER ) ); - noTunerMenu.add( new ColorSettingResetMenuItem( mSettingsManager, - ColorSettingName.CHANNEL_STATE_GRADIENT_TOP_NO_TUNER ) ); - JMenu labelMenu = new JMenu( "Labels" ); colorMenu.add( labelMenu ); diff --git a/src/module/decode/state/ChannelState.java b/src/module/decode/state/ChannelState.java index e15bf96c..d75c904e 100644 --- a/src/module/decode/state/ChannelState.java +++ b/src/module/decode/state/ChannelState.java @@ -144,11 +144,6 @@ public class ChannelState extends Module implements ICallEventProvider, mMonitoring.set( false ); } } - else - { - throw new RuntimeException( "Channel state monitor's scheduled " - + "future pointer was not null" ); - } } }