tn5250j/src/org/tn5250j/keyboard DefaultKeyboardHandler.java,1.9,1.10 KeyboardHandler.java,1.6,1.7
"Kenneth J. Pouncey" <[email protected]> Thu, 22 Jul 2004 05:00:40 +0000
| Newsgroups | gmane.comp.java.tn5250j.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/tn5250j/tn5250j/src/org/tn5250j/keyboard
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5152/src/org/tn5250j/keyboard
Modified Files:
DefaultKeyboardHandler.java KeyboardHandler.java
Log Message:
Updates for headless
Index: KeyboardHandler.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/keyboard/KeyboardHandler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** KeyboardHandler.java 30 Jun 2004 06:18:58 -0000 1.6
--- KeyboardHandler.java 22 Jul 2004 05:00:37 -0000 1.7
***************
*** 28,37 ****
import java.awt.event.*;
! import org.tn5250j.Session;
import org.tn5250j.Screen5250;
import org.tn5250j.event.KeyChangeListener;
import org.tn5250j.tnvt;
import org.tn5250j.tools.system.OperatingSystem;
- import javax.swing.*;
/**
--- 28,39 ----
import java.awt.event.*;
! import javax.swing.*;
!
! import org.tn5250j.SessionGUI;
! import org.tn5250j.Session5250;
import org.tn5250j.Screen5250;
import org.tn5250j.event.KeyChangeListener;
import org.tn5250j.tnvt;
import org.tn5250j.tools.system.OperatingSystem;
/**
***************
*** 41,45 ****
org.tn5250j.TN5250jConstants,
KeyChangeListener {
! protected Session session;
protected Screen5250 screen;
protected boolean isLinux;
--- 43,48 ----
org.tn5250j.TN5250jConstants,
KeyChangeListener {
! protected Session5250 session;
! protected SessionGUI sessionGui;
protected Screen5250 screen;
protected boolean isLinux;
***************
*** 55,62 ****
* @param session The session that will be sent the keys
*/
! public KeyboardHandler(Session session) {
this.session = session;
this.screen = session.getScreen();
// String os = System.getProperty("os.name");
--- 58,66 ----
* @param session The session that will be sent the keys
*/
! public KeyboardHandler(Session5250 session) {
this.session = session;
this.screen = session.getScreen();
+ sessionGui = session.getGUI();
// String os = System.getProperty("os.name");
***************
*** 79,83 ****
}
! public static KeyboardHandler getKeyboardHandlerInstance (Session session) {
return new DefaultKeyboardHandler(session);
--- 83,87 ----
}
! public static KeyboardHandler getKeyboardHandlerInstance (Session5250 session) {
return new DefaultKeyboardHandler(session);
***************
*** 88,97 ****
protected InputMap getInputMap() {
! return session.getInputMap();
}
protected ActionMap getActionMap() {
! return session.getActionMap();
}
--- 92,101 ----
protected InputMap getInputMap() {
! return sessionGui.getInputMap();
}
protected ActionMap getActionMap() {
! return sessionGui.getActionMap();
}
***************
*** 129,136 ****
}
- protected tnvt getVT() {
- return session.getVT();
- }
-
/**
* Remove the references to all listeners before closing
--- 133,136 ----
***************
*** 138,142 ****
* Added by Luc to fix a memory leak.
*/
! public void sessionClosed(Session session) {
keyMap.removeKeyChangeListener(this);
}
--- 138,142 ----
* Added by Luc to fix a memory leak.
*/
! public void sessionClosed(SessionGUI session) {
keyMap.removeKeyChangeListener(this);
}
***************
*** 144,151 ****
protected boolean emulatorAction(KeyStroke ks, KeyEvent e){
InputMap map = getInputMap();
ActionMap am = getActionMap();
! if(map != null && am != null && session.isEnabled()) {
Object binding = map.get(ks);
Action action = (binding == null) ? null : am.get(binding);
--- 144,154 ----
protected boolean emulatorAction(KeyStroke ks, KeyEvent e){
+ if (sessionGui == null)
+ return false;
+
InputMap map = getInputMap();
ActionMap am = getActionMap();
! if(map != null && am != null && sessionGui.isEnabled()) {
Object binding = map.get(ks);
Action action = (binding == null) ? null : am.get(binding);
Index: DefaultKeyboardHandler.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/keyboard/DefaultKeyboardHandler.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DefaultKeyboardHandler.java 18 Jul 2004 13:31:21 -0000 1.9
--- DefaultKeyboardHandler.java 22 Jul 2004 05:00:37 -0000 1.10
***************
*** 30,34 ****
import java.awt.event.*;
! import org.tn5250j.Session;
import org.tn5250j.keyboard.actions.*;
--- 30,35 ----
import java.awt.event.*;
! import org.tn5250j.SessionGUI;
! import org.tn5250j.Session5250;
import org.tn5250j.keyboard.actions.*;
***************
*** 42,46 ****
* @param Session The session to which the keys should be sent
*/
! public DefaultKeyboardHandler(Session session) {
super(session);
}
--- 43,47 ----
* @param Session The session to which the keys should be sent
*/
! public DefaultKeyboardHandler(Session5250 session) {
super(session);
}
***************
*** 132,157 ****
void initKeyBindings() {
KeyStroke ks;
! new NewSessionAction(session,keyMap);
! new ToggleConnectionAction(session,keyMap);
! new JumpNextAction(session,keyMap);
! new JumpPrevAction(session,keyMap);
! new HotspotsAction(session,keyMap);
! new GuiAction(session,keyMap);
! new DispMsgsAction(session,keyMap);
! new AttributesAction(session,keyMap);
! new PrintAction(session,keyMap);
! new RulerAction(session,keyMap);
! new CloseAction(session,keyMap);
! new TransferAction(session,keyMap);
! new EmailAction(session,keyMap);
! new RunScriptAction(session,keyMap);
! new DebugAction(session,keyMap);
! new CopyAction(session,keyMap);
! new PasteAction(session,keyMap);
! new SpoolWorkAction(session,keyMap);
! new QuickEmailAction(session,keyMap);
! new OpenSameAction(session,keyMap);
}
--- 133,163 ----
void initKeyBindings() {
+ if (session.getGUI() == null)
+ return;
+
+ SessionGUI sessionGui = session.getGUI();
+
KeyStroke ks;
! new NewSessionAction(sessionGui,keyMap);
! new ToggleConnectionAction(sessionGui,keyMap);
! new JumpNextAction(sessionGui,keyMap);
! new JumpPrevAction(sessionGui,keyMap);
! new HotspotsAction(sessionGui,keyMap);
! new GuiAction(sessionGui,keyMap);
! new DispMsgsAction(sessionGui,keyMap);
! new AttributesAction(sessionGui,keyMap);
! new PrintAction(sessionGui,keyMap);
! new RulerAction(sessionGui,keyMap);
! new CloseAction(sessionGui,keyMap);
! new TransferAction(sessionGui,keyMap);
! new EmailAction(sessionGui,keyMap);
! new RunScriptAction(sessionGui,keyMap);
! new DebugAction(sessionGui,keyMap);
! new CopyAction(sessionGui,keyMap);
! new PasteAction(sessionGui,keyMap);
! new SpoolWorkAction(sessionGui,keyMap);
! new QuickEmailAction(sessionGui,keyMap);
! new OpenSameAction(sessionGui,keyMap);
}
***************
*** 236,240 ****
}
else {
! session.executeMeMacro(lastKeyStroke);
}
if (lastKeyStroke.startsWith("[mark")) {
--- 242,246 ----
}
else {
! session.getGUI().executeMacro(lastKeyStroke);
}
if (lastKeyStroke.startsWith("[mark")) {
***************
*** 243,247 ****
lastKeyStroke.equals("[markup]") ||
lastKeyStroke.equals("[markdown]")) {
! session.doKeyBoundArea(e,lastKeyStroke);
}
}
--- 249,253 ----
lastKeyStroke.equals("[markup]") ||
lastKeyStroke.equals("[markdown]")) {
! session.getGUI().doKeyBoundArea(e,lastKeyStroke);
}
}
***************
*** 293,297 ****
// else
s += kc;
! if (!session.getVT().isConnected() )
return;
screen.sendKeys(s);
--- 299,303 ----
// else
s += kc;
! if (!session.isConnected())
return;
screen.sendKeys(s);
***************
*** 325,329 ****
}
else
! session.executeMeMacro(s);
}
--- 331,335 ----
}
else
! session.getGUI().executeMacro(s);
}
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click