From a1e9c5cbd03d17f7e270329dd2983720988eb7f1 Mon Sep 17 00:00:00 2001
From: Nils Vreman <nils.vreman@gmail.com>
Date: Mon, 27 Aug 2018 12:58:34 +0200
Subject: [PATCH] Started working on text fields
---
gui/menu/help/FileTab.java | 4 ++--
gui/menu/help/HelpTextArea.java | 18 ++++++++++++++++++
gui/menu/help/HelpTextField.java | 14 --------------
gui/menu/help/ScheduleTab.java | 10 +++++-----
gui/menu/help/StrategyTab.java | 4 ++--
gui/menu/help/TabPanel.java | 8 ++++----
gui/menu/help/TasksetTab.java | 14 +++++++-------
7 files changed, 38 insertions(+), 34 deletions(-)
create mode 100644 gui/menu/help/HelpTextArea.java
delete mode 100644 gui/menu/help/HelpTextField.java
diff --git a/gui/menu/help/FileTab.java b/gui/menu/help/FileTab.java
index 5fa61b5..286a747 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 0000000..8354adb
--- /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 778f6ec..0000000
--- 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 74e39f5..a3430b7 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 04c6ec7..f3d3b2f 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 30d1aaa..337ca3f 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 3e1a140..16f075d 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);
--
GitLab