removed jtextarea horizontal scroll bar

erujs · Oct 3, 2018 · 21416e8 · 21416e8
1 parent 3f8b3f6
commit 21416e8
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 38 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/out/production/Haley/Main/Algo.class b/out/production/Haley/Main/Algo.class
diff --git a/out/production/Haley/Main/Interface$1.class b/out/production/Haley/Main/Interface$1.class
diff --git a/out/production/Haley/Main/Interface$2.class b/out/production/Haley/Main/Interface$2.class
diff --git a/out/production/Haley/Main/Interface.class b/out/production/Haley/Main/Interface.class
diff --git a/src/Main/Algo.java b/src/Main/Algo.java
@@ -8,12 +8,13 @@ public class Algo extends Interface {
     public int img;
 //  brute force algorithm
     public String reply(String statement) {
+        String h = "Haley: ";
         String haley = statement;
         haley = haley.toLowerCase();
         String str = new String();
 
         if (haley.contains("what is lifehack") || haley.contains("definition") || haley.contains("what is life hack") || haley.contains("meaning of life hack") || haley.contains("meaning of lifehack")) {
-            str = "Haley: Lifehacks are strategy or techniques adopted in order to manage one's time and daily activities in a more efficient way. \n";
+            str = h + "Lifehacks are strategy or techniques adopted in order to manage one's time and daily activities in a more efficient way. \n";
             img = 1;
         } else {
             str = "Haley: ?\n";

diff --git a/src/Main/Interface.java b/src/Main/Interface.java
@@ -22,8 +22,6 @@ public class Interface {
     public JFrame frame;
 
     public void init() {
-        int horizontalPolicy = JScrollPane.HORIZONTAL_SCROLLBAR_NEVER;
-        int verticalPolicy = JScrollPane.VERTICAL_SCROLLBAR_NEVER;
 //        ui.setPreferredSize(new Dimension(WIDTH * SCALE, HEIGHT * SCALE));
 //        ui.setMaximumSize(new Dimension(WIDTH * SCALE, HEIGHT * SCALE));
 //        ui.setMinimumSize(new Dimension(WIDTH * SCALE, HEIGHT * SCALE));
@@ -58,17 +56,12 @@ public void keyPressed(KeyEvent arg0) {
         message.setColumns(10);
 
         //  Conversation History
-        convo = new TextArea();
-        JScrollPane scroll = new JScrollPane(convo);
-//        DefaultCaret caret = (DefaultCaret) convo.getCaretPosition();
-//        caret.setUpdatePolicy(DefaultCaret.NEVER_UPDATE);
+        convo = new TextArea(null, 4 , 99 , TextArea.SCROLLBARS_VERTICAL_ONLY);
+
         convo.setEditable(false);
         convo.setBounds(31, 376, 375, 126);
 //        convo.setEnabled(false);
-        scroll.setHorizontalScrollBarPolicy(horizontalPolicy);
-        scroll.setVerticalScrollBarPolicy(verticalPolicy);
-        frame.getContentPane().add(scroll);
-//        frame.getContentPane().add(convo);
+        frame.getContentPane().add(convo);
 
         //  Set Life Hack Picture
         pic = new JLabel();