--- a/src/org/tn5250j/framework/tn5250/ScreenOIA.java	Wed Jun 18 13:00:19 2014 -0700
+++ b/src/org/tn5250j/framework/tn5250/ScreenOIA.java	Wed Jun 18 13:03:01 2014 -0700
@@ -35,260 +35,248 @@
  *
  *
  */
-public class ScreenOIA
-  {
-   // OIA_LEVEL
-   public static final int OIA_LEVEL_INPUT_INHIBITED   =  1;
-   public static final int OIA_LEVEL_NOT_INHIBITED   =  2;
-   public static final int OIA_LEVEL_MESSAGE_LIGHT_ON  =  3;
-   public static final int OIA_LEVEL_MESSAGE_LIGHT_OFF  =  4;
-   public static final int OIA_LEVEL_AUDIBLE_BELL  =  5;
-   public static final int OIA_LEVEL_INSERT_MODE  =  6;
-   public static final int OIA_LEVEL_KEYBOARD  =  7;
-   public static final int OIA_LEVEL_CLEAR_SCREEN  =  8;
-   public static final int OIA_LEVEL_SCREEN_SIZE  =  9;
-   public static final int OIA_LEVEL_INPUT_ERROR   =  10;
-   public static final int OIA_LEVEL_KEYS_BUFFERED   =  11;
-   public static final int OIA_LEVEL_SCRIPT   =  12;
+public class ScreenOIA {
+    // OIA_LEVEL
+    public static final int OIA_LEVEL_INPUT_INHIBITED   =  1;
+    public static final int OIA_LEVEL_NOT_INHIBITED   =  2;
+    public static final int OIA_LEVEL_MESSAGE_LIGHT_ON  =  3;
+    public static final int OIA_LEVEL_MESSAGE_LIGHT_OFF  =  4;
+    public static final int OIA_LEVEL_AUDIBLE_BELL  =  5;
+    public static final int OIA_LEVEL_INSERT_MODE  =  6;
+    public static final int OIA_LEVEL_KEYBOARD  =  7;
+    public static final int OIA_LEVEL_CLEAR_SCREEN  =  8;
+    public static final int OIA_LEVEL_SCREEN_SIZE  =  9;
+    public static final int OIA_LEVEL_INPUT_ERROR   =  10;
+    public static final int OIA_LEVEL_KEYS_BUFFERED   =  11;
+    public static final int OIA_LEVEL_SCRIPT   =  12;
 
-   // INPUTINHIBITED
-   public static final int INPUTINHIBITED_NOTINHIBITED   =  0;
-   public static final int INPUTINHIBITED_SYSTEM_WAIT   =  1;
-   public static final int INPUTINHIBITED_COMMCHECK   =  2;
-   public static final int INPUTINHIBITED_PROGCHECK   =  3;
-   public static final int INPUTINHIBITED_MACHINECHECK   =  4;
-   public static final int INPUTINHIBITED_OTHER   =  5;
-
-   public ScreenOIA (Screen5250 screen) {
+    // INPUTINHIBITED
+    public static final int INPUTINHIBITED_NOTINHIBITED   =  0;
+    public static final int INPUTINHIBITED_SYSTEM_WAIT   =  1;
+    public static final int INPUTINHIBITED_COMMCHECK   =  2;
+    public static final int INPUTINHIBITED_PROGCHECK   =  3;
+    public static final int INPUTINHIBITED_MACHINECHECK   =  4;
+    public static final int INPUTINHIBITED_OTHER   =  5;
 
-      source = screen;
-
-   }
+    public ScreenOIA(Screen5250 screen) {
+        source = screen;
+    }
 
-   public boolean isInsertMode() {
+    public boolean isInsertMode() {
+        return insertMode;
+    }
 
-      return insertMode;
-   }
-
-   protected void setInsertMode(boolean mode) {
+    protected void setInsertMode(boolean mode) {
+        level = OIA_LEVEL_INSERT_MODE;
+        insertMode = mode;
+        fireOIAChanged(ScreenOIAListener.OIA_CHANGED_INSERT_MODE);
+    }
 
-      level = OIA_LEVEL_INSERT_MODE;
-      insertMode = mode;
-      fireOIAChanged(ScreenOIAListener.OIA_CHANGED_INSERT_MODE);
-   }
+    public int getCommCheckCode() {
+        return commCheck;
+    }
 
-   public int getCommCheckCode() {
-
-      return commCheck;
-   }
+    public int getInputInhibited() {
+        return inputInhibited;
+    }
 
-   public int getInputInhibited() {
-
-      return inputInhibited;
-   }
+    public int getMachineCheckCode() {
+        return machineCheck;
+    }
 
-   public int getMachineCheckCode() {
+    public int getOwner() {
+        return owner;
+    }
 
-      return machineCheck;
-   }
+    public int getProgCheckCode() {
+        return 0;
+    }
 
-   public int getOwner() {
-      return owner;
-   }
-
-   public int getProgCheckCode() {
-      return 0;
-   }
+    /**
+     * Is the keyboard locked or not
+     *
+     * @return locked or not
+     */
+    public boolean isKeyBoardLocked() {
+        return locked;
+    }
 
-	/**
-	 * Is the keyboard locked or not
-	 *
-	 * @return locked or not
-	 */
-   public boolean isKeyBoardLocked() {
-      return locked;
-   }
+    public boolean isKeysBuffered() {
+        return keysBuffered;
+    }
 
-   public boolean isKeysBuffered() {
-      return keysBuffered;
-   }
+    public void setKeysBuffered(boolean kb) {
+        level = OIA_LEVEL_KEYS_BUFFERED;
+        boolean oldKB = keysBuffered;
+        keysBuffered = kb;
+
+        if (keysBuffered != oldKB)
+            fireOIAChanged(ScreenOIAListener.OIA_CHANGED_KEYS_BUFFERED);
+    }
 
-   public void setKeysBuffered(boolean kb) {
-      level = OIA_LEVEL_KEYS_BUFFERED;
-      boolean oldKB = keysBuffered;
-      keysBuffered = kb;
-      if (keysBuffered != oldKB)
-         fireOIAChanged(ScreenOIAListener.OIA_CHANGED_KEYS_BUFFERED);
-   }
+    protected void setKeyBoardLocked(boolean lockIt) {
+        level = OIA_LEVEL_KEYBOARD;
+        boolean oldLocked = locked;
+        locked = lockIt;
 
-   protected void setKeyBoardLocked(boolean lockIt) {
-      level = OIA_LEVEL_KEYBOARD;
-      boolean oldLocked = locked;
-      locked = lockIt;
-		if (!lockIt) {
+        if (!lockIt) {
+            if (isKeysBuffered()) {
+                source.sendKeys("");
+            }
+        }
 
-			if (isKeysBuffered()) {
-				source.sendKeys("");
-			}
-		}
+        if (locked != oldLocked)
+            fireOIAChanged(ScreenOIAListener.OIA_CHANGED_KEYBOARD_LOCKED);
+    }
+
+    public boolean isMessageWait() {
+        return messageWait;
+    }
 
-      if (locked != oldLocked)
-         fireOIAChanged(ScreenOIAListener.OIA_CHANGED_KEYBOARD_LOCKED);
-   }
-
-   public boolean isMessageWait() {
-      return messageWait;
-   }
+    protected void setMessageLightOn() {
+        level = OIA_LEVEL_MESSAGE_LIGHT_ON;
+        messageWait = true;
+        fireOIAChanged(ScreenOIAListener.OIA_CHANGED_MESSAGELIGHT);
+    }
 
-   protected void setMessageLightOn() {
-      level = OIA_LEVEL_MESSAGE_LIGHT_ON;
-      messageWait = true;
-      fireOIAChanged(ScreenOIAListener.OIA_CHANGED_MESSAGELIGHT);
-   }
+    protected void setMessageLightOff() {
+        level = OIA_LEVEL_MESSAGE_LIGHT_OFF;
+        messageWait = false;
+        fireOIAChanged(ScreenOIAListener.OIA_CHANGED_MESSAGELIGHT);
+    }
 
-   protected void setMessageLightOff() {
-      level = OIA_LEVEL_MESSAGE_LIGHT_OFF;
-      messageWait = false;
-      fireOIAChanged(ScreenOIAListener.OIA_CHANGED_MESSAGELIGHT);
-   }
+    public void setScriptActive(boolean running) {
+        level = OIA_LEVEL_SCRIPT;
+        scriptRunning = running;
+        fireOIAChanged(ScreenOIAListener.OIA_CHANGED_SCRIPT);
+    }
 
-   public void setScriptActive(boolean running) {
-      level = OIA_LEVEL_SCRIPT;
-      scriptRunning = running;
-      fireOIAChanged(ScreenOIAListener.OIA_CHANGED_SCRIPT);
-   }
+    public boolean isScriptActive() {
+        return scriptRunning;
+    }
 
-   public boolean isScriptActive() {
-      return scriptRunning;
-   }
+    public void setAudibleBell() {
+        level = OIA_LEVEL_AUDIBLE_BELL;
+        fireOIAChanged(ScreenOIAListener.OIA_CHANGED_BELL);
+    }
 
-   public void setAudibleBell() {
-      level = OIA_LEVEL_AUDIBLE_BELL;
-      fireOIAChanged(ScreenOIAListener.OIA_CHANGED_BELL);
-   }
+    protected void clearScreen() {
+        level = OIA_LEVEL_CLEAR_SCREEN;
+        fireOIAChanged(ScreenOIAListener.OIA_CHANGED_CLEAR_SCREEN);
+    }
 
-   protected void clearScreen() {
-      level = OIA_LEVEL_CLEAR_SCREEN;
-      fireOIAChanged(ScreenOIAListener.OIA_CHANGED_CLEAR_SCREEN);
-   }
-
-   /**
-    * Add a ScreenOIAListener to the listener list.
-    *
-    * @param listener  The ScreenOIAListener to be added
-    */
-   public void addOIAListener(ScreenOIAListener listener) {
+    /**
+     * Add a ScreenOIAListener to the listener list.
+     *
+     * @param listener  The ScreenOIAListener to be added
+     */
+    public void addOIAListener(ScreenOIAListener listener) {
+        if (listeners == null) {
+            listeners = new java.util.Vector<ScreenOIAListener>(3);
+        }
 
-      if (listeners == null) {
-          listeners = new java.util.Vector<ScreenOIAListener>(3);
-      }
-      listeners.addElement(listener);
-
-   }
+        listeners.addElement(listener);
+    }
 
-   /**
-    * Remove a iOhioSessionListener from the listener list.
-    *
-    * @param listener  The iOhioSessionListener to be removed
-    */
-   public void removeOIAListener(ScreenOIAListener listener) {
+    /**
+     * Remove a iOhioSessionListener from the listener list.
+     *
+     * @param listener  The iOhioSessionListener to be removed
+     */
+    public void removeOIAListener(ScreenOIAListener listener) {
+        if (listeners == null) {
+            return;
+        }
 
-      if (listeners == null) {
-          return;
-      }
-      listeners.removeElement(listener);
-   }
+        listeners.removeElement(listener);
+    }
 
-   // object methods
-   public Screen5250 getSource() {
-
-      return source;
-   }
+    // object methods
+    public Screen5250 getSource() {
+        return source;
+    }
 
 
-   public void setSource(Screen5250 screen) {
-
-      source = screen;
-
-   }
+    public void setSource(Screen5250 screen) {
+        source = screen;
+    }
 
-   public void setOwner(int newOwner) {
-
-      owner = newOwner;
+    public void setOwner(int newOwner) {
+        owner = newOwner;
+    }
 
-   }
-
-   public int getLevel() {
+    public int getLevel() {
+        return level;
+    }
 
-      return level;
-   }
-
-   public String getInhibitedText() {
-      return inhibitedText;
-   }
+    public String getInhibitedText() {
+        return inhibitedText;
+    }
 
-   public void setInputInhibited(int inhibit , int whatCode) {
-      setInputInhibited(inhibit, whatCode, null);
-   }
+    public void setInputInhibited(int inhibit , int whatCode) {
+        setInputInhibited(inhibit, whatCode, null);
+    }
 
-   public void setInputInhibited(int inhibit , int whatCode, String message) {
-
-      inputInhibited = inhibit;
-      level = OIA_LEVEL_INPUT_INHIBITED;
-      inhibitedText = message;
+    public void setInputInhibited(int inhibit , int whatCode, String message) {
+        inputInhibited = inhibit;
+        level = OIA_LEVEL_INPUT_INHIBITED;
+        inhibitedText = message;
 
 //      if (saveInhibit != inhibit || saveInhibitLevel != whatCode) {
-         switch(inhibit) {
-
+        switch (inhibit) {
             case INPUTINHIBITED_COMMCHECK :
-               commCheck = whatCode;
-               break;
+                commCheck = whatCode;
+                break;
+
             case INPUTINHIBITED_PROGCHECK :
 //               progCheck = whatCode; // never used
-               break;
+                break;
+
             case INPUTINHIBITED_MACHINECHECK :
-               machineCheck = whatCode;
-               break;
+                machineCheck = whatCode;
+                break;
+
             case INPUTINHIBITED_SYSTEM_WAIT :
-               level = whatCode;
-               break;
+                level = whatCode;
+                break;
+
             case INPUTINHIBITED_NOTINHIBITED :
-               level = whatCode;
-               break;
-         }
+                level = whatCode;
+                break;
+        }
 
-         fireOIAChanged(ScreenOIAListener.OIA_CHANGED_INPUTINHIBITED);
+        fireOIAChanged(ScreenOIAListener.OIA_CHANGED_INPUTINHIBITED);
 //      }
-   }
-
-   /**
-    * Notify all registered listeners of the onOIAChanged event.
-    *
-    */
-   private void fireOIAChanged(int change) {
+    }
 
-      if (listeners != null) {
-         int size = listeners.size();
-         for (int i = 0; i < size; i++) {
-            ScreenOIAListener target =
-                    listeners.elementAt(i);
-            target.onOIAChanged(this, change);
-         }
-      }
-   }
+    /**
+     * Notify all registered listeners of the onOIAChanged event.
+     *
+     */
+    private void fireOIAChanged(int change) {
+        if (listeners != null) {
+            int size = listeners.size();
 
-   private Vector<ScreenOIAListener> listeners = null;
-   private boolean insertMode;
-   private boolean locked;
-   private boolean keysBuffered;
-   private int owner = 0;
-   private int level = 0;
-   private Screen5250 source = null;
-   private int commCheck = 0;
-   private int machineCheck = 0;
-   private boolean messageWait;
-   private boolean scriptRunning;
-   private int inputInhibited = INPUTINHIBITED_NOTINHIBITED;
-   private String inhibitedText;
+            for (int i = 0; i < size; i++) {
+                ScreenOIAListener target =
+                    listeners.elementAt(i);
+                target.onOIAChanged(this, change);
+            }
+        }
+    }
+
+    private Vector<ScreenOIAListener> listeners = null;
+    private boolean insertMode;
+    private boolean locked;
+    private boolean keysBuffered;
+    private int owner = 0;
+    private int level = 0;
+    private Screen5250 source = null;
+    private int commCheck = 0;
+    private int machineCheck = 0;
+    private boolean messageWait;
+    private boolean scriptRunning;
+    private int inputInhibited = INPUTINHIBITED_NOTINHIBITED;
+    private String inhibitedText;
 
 }