Mercurial > 510Connectbot

changeset 125:6eab98e58bed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add more 5250 config items
author Carl Byington <carl@five-ten-sg.com>
date Thu, 19 Jun 2014 08:37:44 -0700
parents c29fd84dff5f
children f7e3abdbc8a5
files src/com/five_ten_sg/connectbot/util/HostDatabase.java src/de/mud/terminal/VDUBuffer.java src/org/tn5250j/framework/tn5250/tnvt.java
diffstat 3 files changed, 6 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/com/five_ten_sg/connectbot/util/HostDatabase.java	Thu Jun 19 08:32:44 2014 -0700
+++ b/src/com/five_ten_sg/connectbot/util/HostDatabase.java	Thu Jun 19 08:37:44 2014 -0700
@@ -431,9 +431,9 @@
                   COL_X11PORT = c.getColumnIndexOrThrow(FIELD_HOST_X11PORT),
                   COL_MONITOR = c.getColumnIndexOrThrow(FIELD_HOST_MONITOR),
                   COL_EMULATION = c.getColumnIndexOrThrow(FIELD_HOST_EMULATION),
-                  COL_ENCRYPTION5250 = c.getColumnIndexOrThrow(FIELD_HOST_ENCRYPTION5250);
-                  COL_LIBRARY5250 = c.getColumnIndexOrThrow(FIELD_HOST_LIBRARY5250);
-                  COL_MENU5250 = c.getColumnIndexOrThrow(FIELD_HOST_MENU5250);
+                  COL_ENCRYPTION5250 = c.getColumnIndexOrThrow(FIELD_HOST_ENCRYPTION5250),
+                  COL_LIBRARY5250 = c.getColumnIndexOrThrow(FIELD_HOST_LIBRARY5250),
+                  COL_MENU5250 = c.getColumnIndexOrThrow(FIELD_HOST_MENU5250),
                   COL_PROGRAM5250 = c.getColumnIndexOrThrow(FIELD_HOST_PROGRAM5250);
 
         while (c.moveToNext()) {
--- a/src/de/mud/terminal/VDUBuffer.java	Thu Jun 19 08:32:44 2014 -0700
+++ b/src/de/mud/terminal/VDUBuffer.java	Thu Jun 19 08:37:44 2014 -0700
@@ -588,8 +588,8 @@
      * @param l line
      */
     public void setCursorPosition(int c, int l) {
-        cursorX = min(width-1, c);
-        cursorY = min(height-1, l);
+        cursorX = (c > width-1) ? width-1 : c;
+        cursorY = (l > height-1) ? height-1 : l;
     }
 
     /**
--- a/src/org/tn5250j/framework/tn5250/tnvt.java	Thu Jun 19 08:32:44 2014 -0700
+++ b/src/org/tn5250j/framework/tn5250/tnvt.java	Thu Jun 19 08:37:44 2014 -0700
@@ -157,7 +157,7 @@
     private boolean strpccmd; // = false;
     private String encryption;
     private String user;
-    private String password;
+    private String password = null;
     private String library;
     private String initialMenu;
     private String program;
@@ -253,7 +253,6 @@
             this.buffer      = buffer;
             this.encryption  = fixer(host.getEncryption5250(), "NONE");
             this.user        = host.getUsername();
-            this.password    = host.getPassword();
             this.library     = host.getLibrary();
             this.initialMenu = host.getInitialMenu();
             this.program     = host.getProgram();