X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2FTField.java;h=07a457bcf7eb7beb4e05af9e71f8f782a6cc2227;hb=7c870d89433346ccb5505f8f9ba62d3fc18fe996;hp=083efdda3853ad6898e9b31c010ae01c703ce503;hpb=8caf0d51b8930199bd593aced424d9e4a8c4c092;p=fanfix.git

diff --git a/src/jexer/TField.java b/src/jexer/TField.java
index 083efdd..07a457b 100644
--- a/src/jexer/TField.java
+++ b/src/jexer/TField.java
@@ -141,7 +141,7 @@ public class TField extends TWidget {
         // Set parent and window
         super(parent, x, y, width, 1);
 
-        setHasCursor(true);
+        setCursorVisible(true);
         this.fixed = fixed;
         this.text = text;
         this.enterAction = enterAction;
@@ -190,7 +190,7 @@ public class TField extends TWidget {
     public void draw() {
         CellAttributes fieldColor;
 
-        if (getAbsoluteActive()) {
+        if (isAbsoluteActive()) {
             fieldColor = getTheme().getColor("tfield.active");
         } else {
             fieldColor = getTheme().getColor("tfield.inactive");
@@ -230,7 +230,7 @@ public class TField extends TWidget {
     public void onMouseDown(final TMouseEvent mouse) {
         this.mouse = mouse;
 
-        if ((mouseOnField()) && (mouse.getMouse1())) {
+        if ((mouseOnField()) && (mouse.isMouse1())) {
             // Move cursor
             int deltaX = mouse.getX() - getCursorX();
             position += deltaX;
@@ -333,16 +333,16 @@ public class TField extends TWidget {
             return;
         }
 
-        if (!keypress.getKey().getIsKey()
-            && !keypress.getKey().getAlt()
-            && !keypress.getKey().getCtrl()
+        if (!keypress.getKey().isFnKey()
+            && !keypress.getKey().isAlt()
+            && !keypress.getKey().isCtrl()
         ) {
             // Plain old keystroke, process it
             if ((position == text.length())
                 && (text.length() < getWidth())) {
 
                 // Append case
-                appendChar(keypress.getKey().getCh());
+                appendChar(keypress.getKey().getChar());
             } else if ((position < text.length())
                 && (text.length() < getWidth())) {
 
@@ -350,12 +350,12 @@ public class TField extends TWidget {
                 if (insertMode == false) {
                     // Replace character
                     text = text.substring(0, position)
-                            + keypress.getKey().getCh()
+                            + keypress.getKey().getChar()
                             + text.substring(position + 1);
                     position++;
                 } else {
                     // Insert character
-                    insertChar(keypress.getKey().getCh());
+                    insertChar(keypress.getKey().getChar());
                 }
             } else if ((position < text.length())
                 && (text.length() >= getWidth())) {
@@ -366,7 +366,7 @@ public class TField extends TWidget {
                 } else if ((fixed == true) && (insertMode == false)) {
                     // Overwrite the last character, maybe move position
                     text = text.substring(0, position)
-                            + keypress.getKey().getCh()
+                            + keypress.getKey().getChar()
                             + text.substring(position + 1);
                     if (position < getWidth() - 1) {
                         position++;
@@ -374,23 +374,23 @@ public class TField extends TWidget {
                 } else if ((fixed == false) && (insertMode == false)) {
                     // Overwrite the last character, definitely move position
                     text = text.substring(0, position)
-                            + keypress.getKey().getCh()
+                            + keypress.getKey().getChar()
                             + text.substring(position + 1);
                     position++;
                 } else {
                     if (position == text.length()) {
                         // Append this character
-                        appendChar(keypress.getKey().getCh());
+                        appendChar(keypress.getKey().getChar());
                     } else {
                         // Insert this character
-                        insertChar(keypress.getKey().getCh());
+                        insertChar(keypress.getKey().getChar());
                     }
                 }
             } else {
                 assert (!fixed);
 
                 // Append this character
-                appendChar(keypress.getKey().getCh());
+                appendChar(keypress.getKey().getChar());
             }
             dispatch(false);
             return;