diff --git a/gui/menu/help/FileTab.java b/gui/menu/help/FileTab.java index 5fa61b5b96f7c84de1e7ca010119f847406662eb..286a747a8779940c81288ea7cc8ab38fdc826d24 100644 --- a/gui/menu/help/FileTab.java +++ b/gui/menu/help/FileTab.java @@ -6,8 +6,8 @@ public class FileTab extends TabPanel { "Save", "Load"}; private static final String[] helpTexts = new String[] { - "Save", - "Load"}; + "SaveText", + "LoadText"}; public FileTab() { super(listOptions, helpTexts); diff --git a/gui/menu/help/HelpTextArea.java b/gui/menu/help/HelpTextArea.java new file mode 100644 index 0000000000000000000000000000000000000000..8354adbcdc77d1ef851b2e8782318a2838454b90 --- /dev/null +++ b/gui/menu/help/HelpTextArea.java @@ -0,0 +1,18 @@ +package gui.menu.help; + +import javax.swing.JTextArea; +import javax.swing.BorderFactory; +import javax.swing.border.BevelBorder; +import java.awt.Dimension; + +public class HelpTextArea extends JTextArea { + + public HelpTextArea(String text) { + super(text); + setEditable(false); + setLineWrap(true); + setWrapStyleWord(true); + setBorder(BorderFactory.createBevelBorder(BevelBorder.LOWERED)); + setPreferredSize(new Dimension(380, 400)); + } +} diff --git a/gui/menu/help/HelpTextField.java b/gui/menu/help/HelpTextField.java deleted file mode 100644 index 778f6ecd8164bead0be583897fb555910fab89a7..0000000000000000000000000000000000000000 --- a/gui/menu/help/HelpTextField.java +++ /dev/null @@ -1,14 +0,0 @@ -package gui.menu.help; - -import javax.swing.JTextField; -import javax.swing.BorderFactory; -import javax.swing.border.BevelBorder; - -public class HelpTextField extends JTextField { - - public HelpTextField(String text) { - super(text); - setEditable(false); - setBorder(BorderFactory.createBevelBorder(BevelBorder.LOWERED)); - } -} diff --git a/gui/menu/help/ScheduleTab.java b/gui/menu/help/ScheduleTab.java index 74e39f50cd0686569afd33779c8778f6d21a4ade..a3430b746668bdbd204d23ec6163549cba57d88e 100644 --- a/gui/menu/help/ScheduleTab.java +++ b/gui/menu/help/ScheduleTab.java @@ -11,11 +11,11 @@ public class ScheduleTab extends TabPanel { private static final String[] helpTexts = new String[] { - "Schedule", - "Solution", - "Check Solution", - "Clear Cells", - "Clear Strategy"}; + "ScheduleText", + "SolutionText", + "Check SolutionText", + "Clear CellsText", + "Clear StrategyText"}; public ScheduleTab() { super(listOptions, helpTexts); diff --git a/gui/menu/help/StrategyTab.java b/gui/menu/help/StrategyTab.java index 04c6ec79d17f6e89ab8b20fe826881faff8a86b6..f3d3b2f5e0d0c58440d84c85154cd1b59b7f7278 100644 --- a/gui/menu/help/StrategyTab.java +++ b/gui/menu/help/StrategyTab.java @@ -6,8 +6,8 @@ public class StrategyTab extends TabPanel { "EDF", "RMS"}; private static final String[] helpTexts = new String[] { - "EDF", - "RMS"}; + "EDFText", + "RMSText"}; public StrategyTab() { super(listOptions, helpTexts); diff --git a/gui/menu/help/TabPanel.java b/gui/menu/help/TabPanel.java index 30d1aaa2d8b7946c090e6049097dc50d03c54592..337ca3f47365b158157ff547c7e34e5d3dcda511 100644 --- a/gui/menu/help/TabPanel.java +++ b/gui/menu/help/TabPanel.java @@ -1,7 +1,7 @@ package gui.menu.help; import javax.swing.JPanel; -import javax.swing.JTextField; +import javax.swing.JTextArea; import java.awt.BorderLayout; import java.awt.Dimension; import java.util.Map; @@ -11,7 +11,7 @@ public abstract class TabPanel extends JPanel implements EventListener { private final String[] listOptions; private OptionList list; - private Map<String, JTextField> helpTexts = new HashMap<>(); + private Map<String, JTextArea> helpTexts = new HashMap<>(); public TabPanel(String[] listOptions, String[] fieldTexts) { super(new BorderLayout()); @@ -22,12 +22,12 @@ public abstract class TabPanel extends JPanel implements EventListener { list.setPreferredSize(new Dimension(120, 400)); for (int i = 0; i < listOptions.length; i++) { - JTextField htf = new HelpTextField(fieldTexts[i]); + JTextArea htf = new HelpTextArea(fieldTexts[i]); helpTexts.put(listOptions[i], htf); } add(BorderLayout.WEST, list); - add(BorderLayout.CENTER, new HelpTextField("")); + add(BorderLayout.CENTER, new HelpTextArea("")); } public void update(String tab) { diff --git a/gui/menu/help/TasksetTab.java b/gui/menu/help/TasksetTab.java index 3e1a140b296ccff5e77ae91a50185a1fd83f59e9..16f075d950cc142915aa4040c3d005bdf3264321 100644 --- a/gui/menu/help/TasksetTab.java +++ b/gui/menu/help/TasksetTab.java @@ -12,13 +12,13 @@ public class TasksetTab extends TabPanel { "Save Taskset"}; private static final String[] fieldTexts = new String[] { - "Add Tasks", - "Remove Tasks", - "Change Tasks", - "Clear Taskset", - "Priorities", - "Load Taskset", - "Save Taskset"}; + "To add a task to the taskset, press the \"Add Task\" button, located in the panel titled \"Taskset\". Once this button is pressed, a dialog window will open to let you specify the attributes of the task to add. \nThis application will only allow for integer attributes to be specified. Other input (such as special characters or letters) will result in the task not being added to the taskset. \nAlthough it is possible to add a task with a deadline greater than the period, the scheduling algorithm will consider this an unschedulable task. Make sure to check this if the solution does not show. For information regarding priorities: Read the \"Priorities\" help-tab", + "Remove TasksText", + "Change TasksText", + "Clear TasksetText", + "PrioritiesText", + "Load TasksetText", + "Save TasksetText"}; public TasksetTab() { super(listOptions, fieldTexts);