mykola/mptv
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

fix out of bounds error when handling menu actions, turns out java's remainder operation can spill negative numbers

Browse source
This commit is contained in:
mykola2312 2024-04-19 12:45:04 +03:00
parent 0cd0ec4b03
commit bb7e686451
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/main/java/com/mykola2312/mptv/ui/MenuPanel.java
View file

@ -1,6 +1,9 @@
package com.mykola2312.mptv.ui;
import javax.swing.*;
import org.apache.log4j.Logger;
import java.awt.*;
import java.awt.event.ActionEvent;
@ -68,19 +71,23 @@ public class MenuPanel extends JPanel {
switch (action) {
case ACTION_UP -> {
switch (menuPosition) {
case MENU_CATEGORIES -> categoryIndex = (categoryIndex - 1) % categoryData.length;
case MENU_CHANNELS -> channelIndex = (channelIndex - 1) % channelData.length;
case MENU_CATEGORIES -> categoryIndex--;
case MENU_CHANNELS -> channelIndex--;
}
}
case ACTION_DOWN -> {
switch (menuPosition) {
case MENU_CATEGORIES -> categoryIndex = (categoryIndex + 1) % categoryData.length;
case MENU_CHANNELS -> channelIndex = (channelIndex + 1) % channelData.length;
case MENU_CATEGORIES -> categoryIndex++;
case MENU_CHANNELS -> channelIndex++;
}
}
case ACTION_LEFT -> menuPosition = MenuPosition.MENU_CATEGORIES;
case ACTION_RIGHT -> menuPosition = MenuPosition.MENU_CHANNELS;
}
if (categoryIndex < 0) categoryIndex = 0;
if (channelIndex < 0) channelIndex = 0;
categoryIndex = categoryIndex % categoryData.length;
channelIndex = channelIndex % channelData.length;
switch (menuPosition) {
case MENU_CATEGORIES -> {
@ -98,22 +105,27 @@ public class MenuPanel extends JPanel {
channelList.ensureIndexIsVisible(channelIndex);
}
}
// TODO: delete this
Logger.getLogger(MenuPanel.class).info(action);
}
public MenuPanel(Font font) {
super(new BorderLayout());
setFont(font);
final JPanel statusPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
//final JPanel statusPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
final LogPanel logPanel = new LogPanel(Logger.getRootLogger());
final JPanel categoryPanel = new JPanel(new BorderLayout());
final JPanel channelPanel = new JPanel(new BorderLayout());
final JSplitPane hsp = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, categoryPanel, channelPanel);
hsp.setDividerLocation(0.35);
final JSplitPane vsp = new JSplitPane(JSplitPane.VERTICAL_SPLIT, statusPanel, hsp);
final JSplitPane vsp = new JSplitPane(JSplitPane.VERTICAL_SPLIT, logPanel, hsp);
vsp.setDividerSize(2);
vsp.setContinuousLayout(true);
vsp.setDividerLocation(0.10);
add(vsp);
String[] items = new String[128];
@ -128,8 +140,6 @@ public class MenuPanel extends JPanel {
categoryListScroll.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
categoryPanel.add(categoryListScroll, BorderLayout.CENTER);
statusPanel.add(new JButton("status"));
setChannels(items);
final JScrollPane channelListScroll = new JScrollPane(channelList);