tn5250j/src/org/tn5250j/tools Macronizer.java,1.12,1.13 LoadMacroMenu.java,1.15,1.16 XTFRFile.java,1.17,1.18 SendScreenImageToFile.java,1.4,1.5
"Kenneth J. Pouncey" <[email protected]> Thu, 22 Jul 2004 04:57:52 +0000
| Newsgroups | gmane.comp.java.tn5250j.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/tn5250j/tn5250j/src/org/tn5250j/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4740/src/org/tn5250j/tools
Modified Files:
Macronizer.java LoadMacroMenu.java XTFRFile.java
SendScreenImageToFile.java
Log Message:
Updates for headless
Index: SendScreenImageToFile.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/tools/SendScreenImageToFile.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SendScreenImageToFile.java 30 Jun 2004 06:18:58 -0000 1.4
--- SendScreenImageToFile.java 22 Jul 2004 04:57:50 -0000 1.5
***************
*** 32,36 ****
import org.tn5250j.tools.logging.*;
! import org.tn5250j.Session;
import org.tn5250j.tools.encoder.EncodeComponent;
import org.tn5250j.tools.filters.XTFRFileFilter;
--- 32,36 ----
import org.tn5250j.tools.logging.*;
! import org.tn5250j.SessionGUI;
import org.tn5250j.tools.encoder.EncodeComponent;
import org.tn5250j.tools.filters.XTFRFileFilter;
***************
*** 39,48 ****
public class SendScreenImageToFile {
! Session session;
// Change sent by Luc - LDC to pass a parent frame like the other dialogs
Frame parent;
private TN5250jLogger log = TN5250jLogFactory.getLogger (this.getClass());
! public SendScreenImageToFile(Frame parent, Session ses) {
session = ses;
--- 39,48 ----
public class SendScreenImageToFile {
! SessionGUI session;
// Change sent by Luc - LDC to pass a parent frame like the other dialogs
Frame parent;
private TN5250jLogger log = TN5250jLogFactory.getLogger (this.getClass());
! public SendScreenImageToFile(Frame parent, SessionGUI ses) {
session = ses;
Index: XTFRFile.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/tools/XTFRFile.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** XTFRFile.java 30 Jun 2004 06:18:58 -0000 1.17
--- XTFRFile.java 22 Jul 2004 04:57:50 -0000 1.18
***************
*** 45,49 ****
import org.tn5250j.tools.filters.*;
import org.tn5250j.mailtools.SendEMailDialog;
! import org.tn5250j.Session;
import org.tn5250j.SessionConfig;
import org.tn5250j.gui.TN5250jFrame;
--- 45,49 ----
import org.tn5250j.tools.filters.*;
import org.tn5250j.mailtools.SendEMailDialog;
! import org.tn5250j.SessionGUI;
import org.tn5250j.SessionConfig;
import org.tn5250j.gui.TN5250jFrame;
***************
*** 105,113 ****
JDialog dialog;
XTFRFileFilter filter;
! Session session;
static String messageProgress;
! public XTFRFile(Frame parent, tnvt pvt, Session session) {
this(parent, pvt, session, null);
--- 105,113 ----
JDialog dialog;
XTFRFileFilter filter;
! SessionGUI session;
static String messageProgress;
! public XTFRFile(Frame parent, tnvt pvt, SessionGUI session) {
this(parent, pvt, session, null);
***************
*** 136,140 ****
}
! public XTFRFile(Frame parent, tnvt pvt, Session session, Properties XTFRProps) {
setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
--- 136,140 ----
}
! public XTFRFile(Frame parent, tnvt pvt, SessionGUI session, Properties XTFRProps) {
setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
***************
*** 860,864 ****
if (props == null) {
! SessionConfig config = session.getConfiguration();
props = config.getProperties();
}
--- 860,864 ----
if (props == null) {
! SessionConfig config = session.getSession().getConfiguration();
props = config.getProperties();
}
***************
*** 909,913 ****
private void saveXTFRFields() {
! SessionConfig config = session.getConfiguration();
Properties props = config.getProperties();
--- 909,913 ----
private void saveXTFRFields() {
! SessionConfig config = session.getSession().getConfiguration();
Properties props = config.getProperties();
Index: LoadMacroMenu.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/tools/LoadMacroMenu.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** LoadMacroMenu.java 2 Jul 2004 06:48:52 -0000 1.15
--- LoadMacroMenu.java 22 Jul 2004 04:57:50 -0000 1.16
***************
*** 48,54 ****
}
! public static void loadMacros(Session session, Macronizer macros, JMenu menu) {
! final Session ses = session;
Vector mv = new Vector();
Action action;
--- 48,54 ----
}
! public static void loadMacros(SessionGUI session, Macronizer macros, JMenu menu) {
! final SessionGUI ses = session;
Vector mv = new Vector();
Action action;
***************
*** 70,74 ****
action = new AbstractAction((String)mv.get(x)) {
public void actionPerformed(ActionEvent e) {
! ses.executeMeMacro(e);
}
};
--- 70,74 ----
action = new AbstractAction((String)mv.get(x)) {
public void actionPerformed(ActionEvent e) {
! ses.executeMacro(e);
}
};
***************
*** 121,125 ****
}
! private static void doOptionsPopup(MouseEvent e, Session session) {
Action action;
--- 121,125 ----
}
! private static void doOptionsPopup(MouseEvent e, SessionGUI session) {
Action action;
***************
*** 137,141 ****
j.add(action);
! final Session ses = session;
action = new AbstractAction(LangTool.getString("popup.execute")
+ " " + ((JMenuItem)e.getSource()).getText()) {
--- 137,141 ----
j.add(action);
! final SessionGUI ses = session;
action = new AbstractAction(LangTool.getString("popup.execute")
+ " " + ((JMenuItem)e.getSource()).getText()) {
***************
*** 153,157 ****
}
! public static void scriptDir(String pathName, JMenu menu,Session session) {
File root = new File(pathName);
--- 153,157 ----
}
! public static void scriptDir(String pathName, JMenu menu,SessionGUI session) {
File root = new File(pathName);
***************
*** 182,186 ****
*/
private static void loadScripts(Vector vector, String path, File directory,
! Session session) {
ExecuteScriptAction action;
--- 182,186 ----
*/
private static void loadScripts(Vector vector, String path, File directory,
! SessionGUI session) {
ExecuteScriptAction action;
Index: Macronizer.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/tools/Macronizer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Macronizer.java 26 Jun 2004 08:42:24 -0000 1.12
--- Macronizer.java 22 Jul 2004 04:57:50 -0000 1.13
***************
*** 33,37 ****
import javax.swing.*;
! import org.tn5250j.Session;
import org.tn5250j.scripting.InterpreterDriverManager;
import org.tn5250j.interfaces.ConfigureFactory;
--- 33,37 ----
import javax.swing.*;
! import org.tn5250j.SessionGUI;
import org.tn5250j.scripting.InterpreterDriverManager;
import org.tn5250j.interfaces.ConfigureFactory;
***************
*** 148,152 ****
}
! public static void showRunScriptDialog(Session session) {
JPanel rsp = new JPanel();
--- 148,152 ----
}
! public static void showRunScriptDialog(SessionGUI session) {
JPanel rsp = new JPanel();
***************
*** 205,209 ****
}
! public final static void invoke (String macro, Session session) {
String keys = getMacroByName(macro);
--- 205,209 ----
}
! public final static void invoke (String macro, SessionGUI session) {
String keys = getMacroByName(macro);
***************
*** 214,218 ****
if (!macro.endsWith(".py"))
macro = macro + ".py";
! InterpreterDriverManager.executeScriptFile((Session)session,"scripts" +
File.separatorChar + macro);
}
--- 214,218 ----
if (!macro.endsWith(".py"))
macro = macro + ".py";
! InterpreterDriverManager.executeScriptFile((SessionGUI)session,"scripts" +
File.separatorChar + macro);
}
-------------------------------------------------------
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