tn5250j/src/org/tn5250j DataStreamProducer.java,1.10,1.11 GlobalConfigure.java,1.17,1.18 Gui5250.java,1.60,1.61 Gui5250Frame.java,1.20,1.21 Gui5250MDIFrame.java,1.17,1.18 Gui5250SplitFrame.java,1.3,1.4 GuiGraphicBuffer.java,1.16,1.17 KeyStrokenizer.java,1.5,1.6 My5250.java,1.33,1.34 My5250App.java,1.14,1.15 Screen5250.java,1.58,1.59 SessionManager.java,1.7,1.8 Sessions.java,1.8,1.9 tnvt.java,1.41,1.42
"Kenneth J. Pouncey" <[email protected]> Wed, 30 Jun 2004 06:18:59 +0000
| Newsgroups | gmane.comp.java.tn5250j.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/tn5250j/tn5250j/src/org/tn5250j
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12998
Modified Files:
DataStreamProducer.java GlobalConfigure.java Gui5250.java
Gui5250Frame.java Gui5250MDIFrame.java Gui5250SplitFrame.java
GuiGraphicBuffer.java KeyStrokenizer.java My5250.java
My5250App.java Screen5250.java SessionManager.java
Sessions.java tnvt.java
Log Message:
Changed to use new logging factory
Index: My5250App.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/My5250App.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** My5250App.java 14 Apr 2004 12:15:53 -0000 1.14
--- My5250App.java 30 Jun 2004 06:18:56 -0000 1.15
***************
*** 5,9 ****
import java.util.*;
! import org.apache.log4j.Logger;
import org.tn5250j.tools.LangTool;
--- 5,9 ----
import java.util.*;
! import org.tn5250j.tools.logging.*;
import org.tn5250j.tools.LangTool;
***************
*** 12,16 ****
private SessionManager manager;
! private Logger log = Logger.getLogger(this.getClass());
/**Get a parameter value*/
--- 12,16 ----
private SessionManager manager;
! private TN5250jLogger log = TN5250jLogFactory.getLogger (this.getClass());
/**Get a parameter value*/
Index: Sessions.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/Sessions.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Sessions.java 14 Apr 2004 12:15:53 -0000 1.8
--- Sessions.java 30 Jun 2004 06:18:56 -0000 1.9
***************
*** 21,25 ****
*
*/
! import org.apache.log4j.Logger;
import org.tn5250j.interfaces.SessionsInterface;
--- 21,25 ----
*
*/
! import org.tn5250j.tools.logging.*;
import org.tn5250j.interfaces.SessionsInterface;
***************
*** 38,42 ****
private Timer heartBeater;
! private Logger log = Logger.getLogger(this.getClass());
public Sessions() {
--- 38,42 ----
private Timer heartBeater;
! private TN5250jLogger log = TN5250jLogFactory.getLogger (this.getClass());
public Sessions() {
Index: SessionManager.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/SessionManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SessionManager.java 14 Apr 2004 12:15:53 -0000 1.7
--- SessionManager.java 30 Jun 2004 06:18:56 -0000 1.8
***************
*** 21,25 ****
*
*/
! import org.apache.log4j.Logger;
import org.tn5250j.interfaces.SessionManagerInterface;
--- 21,25 ----
*
*/
! import org.tn5250j.tools.logging.*;
import org.tn5250j.interfaces.SessionManagerInterface;
***************
*** 35,39 ****
static private Vector configs;
! private Logger log = Logger.getLogger(this.getClass());
/**
* A handle to the unique SessionManager class
--- 35,39 ----
static private Vector configs;
! private TN5250jLogger log = TN5250jLogFactory.getLogger (this.getClass());
/**
* A handle to the unique SessionManager class
Index: tnvt.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/tnvt.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** tnvt.java 26 Jun 2004 05:37:00 -0000 1.41
--- tnvt.java 30 Jun 2004 06:18:56 -0000 1.42
***************
*** 32,36 ****
import java.awt.event.*;
! import org.apache.log4j.Logger;
import org.tn5250j.encoding.CodePage;
import org.tn5250j.encoding.CharMappings;
--- 32,36 ----
import java.awt.event.*;
! import org.tn5250j.tools.logging.*;
import org.tn5250j.encoding.CodePage;
import org.tn5250j.encoding.CharMappings;
***************
*** 94,98 ****
WTDSFParser sfParser;
! private Logger log = Logger.getLogger(this.getClass());
tnvt (Screen5250 screen52) {
--- 94,98 ----
WTDSFParser sfParser;
! private TN5250jLogger log = TN5250jLogFactory.getLogger(this.getClass());
tnvt (Screen5250 screen52) {
Index: Gui5250MDIFrame.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/Gui5250MDIFrame.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Gui5250MDIFrame.java 14 Apr 2004 12:15:53 -0000 1.17
--- Gui5250MDIFrame.java 30 Jun 2004 06:18:56 -0000 1.18
***************
*** 31,35 ****
import java.util.*;
! import org.apache.log4j.Logger;
import org.tn5250j.event.SessionJumpListener;
import org.tn5250j.event.SessionJumpEvent;
--- 31,35 ----
import java.util.*;
! import org.tn5250j.tools.logging.*;
import org.tn5250j.event.SessionJumpListener;
import org.tn5250j.event.SessionJumpEvent;
***************
*** 57,61 ****
static int openFrameCount = 0;
private Vector myFrameList;
! private Logger log = Logger.getLogger(this.getClass());
//Construct the frame
--- 57,61 ----
static int openFrameCount = 0;
private Vector myFrameList;
! private TN5250jLogger log = TN5250jLogFactory.getLogger(this.getClass());
//Construct the frame
Index: My5250.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/My5250.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** My5250.java 26 Jun 2004 09:18:03 -0000 1.33
--- My5250.java 30 Jun 2004 06:18:56 -0000 1.34
***************
*** 34,38 ****
import java.net.*;
! import org.apache.log4j.Logger;
import org.tn5250j.tools.*;
import org.tn5250j.tools.system.OperatingSystem;
--- 34,38 ----
import java.net.*;
! import org.tn5250j.tools.logging.*;
import org.tn5250j.tools.*;
import org.tn5250j.tools.system.OperatingSystem;
***************
*** 55,59 ****
private int step;
private static String jarClassPaths;
! private Logger log = Logger.getLogger(this.getClass());
My5250 () {
--- 55,59 ----
private int step;
private static String jarClassPaths;
! private TN5250jLogger log = TN5250jLogFactory.getLogger(this.getClass());
My5250 () {
***************
*** 102,105 ****
--- 102,106 ----
try {
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+ UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
} catch (ClassNotFoundException e1) {
e1.printStackTrace();
Index: DataStreamProducer.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/DataStreamProducer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** DataStreamProducer.java 14 Jun 2004 09:44:53 -0000 1.10
--- DataStreamProducer.java 30 Jun 2004 06:18:56 -0000 1.11
***************
*** 4,8 ****
import java.net.*;
! import org.apache.log4j.Logger;
import org.tn5250j.encoding.CodePage;
--- 4,8 ----
import java.net.*;
! import org.tn5250j.tools.logging.*;
import org.tn5250j.encoding.CodePage;
***************
*** 21,25 ****
private CodePage codePage;
! private Logger log = Logger.getLogger(this.getClass());
public DataStreamProducer(tnvt vt, BufferedInputStream in, DataStreamQueue queue, byte[] init) {
--- 21,25 ----
private CodePage codePage;
! private TN5250jLogger log = TN5250jLogFactory.getLogger (this.getClass());
public DataStreamProducer(tnvt vt, BufferedInputStream in, DataStreamQueue queue, byte[] init) {
Index: Screen5250.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/Screen5250.java,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** Screen5250.java 27 Jun 2004 08:44:36 -0000 1.58
--- Screen5250.java 30 Jun 2004 06:18:56 -0000 1.59
***************
*** 34,38 ****
import java.beans.*;
! import org.apache.log4j.Logger;
import org.tn5250j.tools.*;
import org.tn5250j.tools.system.OperatingSystem;
--- 34,38 ----
import java.beans.*;
! import org.tn5250j.tools.logging.*;
import org.tn5250j.tools.*;
import org.tn5250j.tools.system.OperatingSystem;
***************
*** 167,171 ****
private javax.swing.Timer blinker;
! private Logger log = Logger.getLogger(this.getClass());
public Screen5250(Gui5250 gui, SessionConfig config) {
--- 167,171 ----
private javax.swing.Timer blinker;
! private TN5250jLogger log = TN5250jLogFactory.getLogger (this.getClass());
public Screen5250(Gui5250 gui, SessionConfig config) {
***************
*** 4685,4690 ****
--- 4685,4697 ----
* make of the screen are displayed correctly
*
+ * Changes made by Luc - LDC
+ * This routine was split into two separate functions. setBounds and
+ * repaintScreen. This allowed a public function called updateScreen
+ * to be introduced.
+ *
* @param width
* @param height
+ *
+ *
*/
***************
*** 4693,4715 ****
setCursorActive(false);
resizeScreenArea(width,height);
! dirty.setBounds(tArea.getBounds());
! if (gui.getGraphics() != null) {
// do not forget to null out gg2d before update or else there will
// be a very hard to trace screen resize problem
gg2d = null;
- // kjp make sure we redraw the screen;
- drawing = true;
updateDirty();
! }
! // restore statuses that were on the screen before resize
! if (isStatusErrorCode())
! setStatus(STATUS_ERROR_CODE,STATUS_VALUE_ON,statusString);
! if (isXSystem())
! setStatus(STATUS_SYSTEM,STATUS_VALUE_ON,statusString);
! if (isMessageWait())
! setMessageLightOn();
! setCursorActive(true);
! }
/**
--- 4700,4741 ----
setCursorActive(false);
resizeScreenArea(width,height);
! repaintScreen();
! setCursorActive(true);
! }
!
! /**
! * This method does a complete refresh of the screen.
! */
! public final void updateScreen()
! {
! repaintScreen();
! setCursorActive(false);
! setCursorActive(true);
! }
!
! /**
! * Utility method to share the repaint behaviour between setBounds() and
! * updateScreen.
! */
! private void repaintScreen()
! {
! drawing = true;
! dirty.setBounds(tArea.getBounds());
! if (gui.getGraphics() != null)
! {
// do not forget to null out gg2d before update or else there will
// be a very hard to trace screen resize problem
gg2d = null;
updateDirty();
! }
! // restore statuses that were on the screen before resize
! if (isStatusErrorCode())
! setStatus(STATUS_ERROR_CODE,STATUS_VALUE_ON,statusString);
! if (isXSystem())
! setStatus(STATUS_SYSTEM,STATUS_VALUE_ON,statusString);
! if (isMessageWait())
! setMessageLightOn();
! }
/**
Index: Gui5250Frame.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/Gui5250Frame.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Gui5250Frame.java 26 Jun 2004 09:10:25 -0000 1.20
--- Gui5250Frame.java 30 Jun 2004 06:18:56 -0000 1.21
***************
*** 33,37 ****
import javax.swing.event.ChangeEvent;
! import org.apache.log4j.Logger;
import org.tn5250j.event.SessionJumpListener;
import org.tn5250j.event.SessionJumpEvent;
--- 33,37 ----
import javax.swing.event.ChangeEvent;
! import org.tn5250j.tools.logging.*;
import org.tn5250j.event.SessionJumpListener;
import org.tn5250j.event.SessionJumpEvent;
***************
*** 53,57 ****
private boolean hideTabBar = false;
public static int count = 0;
! private Logger log = Logger.getLogger(this.getClass());
//Construct the frame
--- 53,57 ----
private boolean hideTabBar = false;
public static int count = 0;
! private TN5250jLogger log = TN5250jLogFactory.getLogger (this.getClass());
//Construct the frame
Index: GuiGraphicBuffer.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/GuiGraphicBuffer.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** GuiGraphicBuffer.java 14 Apr 2004 12:15:53 -0000 1.16
--- GuiGraphicBuffer.java 30 Jun 2004 06:18:56 -0000 1.17
***************
*** 35,39 ****
import java.awt.font.*;
! import org.apache.log4j.Logger;
public class GuiGraphicBuffer {
--- 35,39 ----
import java.awt.font.*;
! import org.tn5250j.tools.logging.*;
public class GuiGraphicBuffer {
***************
*** 68,72 ****
private boolean antialiased;
! private Logger log = Logger.getLogger("GFX");
public GuiGraphicBuffer () {
--- 68,72 ----
private boolean antialiased;
! private TN5250jLogger log = TN5250jLogFactory.getLogger ("GFX");
public GuiGraphicBuffer () {
Index: KeyStrokenizer.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/KeyStrokenizer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** KeyStrokenizer.java 14 Apr 2004 12:15:53 -0000 1.5
--- KeyStrokenizer.java 30 Jun 2004 06:18:56 -0000 1.6
***************
*** 1,5 ****
package org.tn5250j;
! import org.apache.log4j.Logger;
/*
--- 1,5 ----
package org.tn5250j;
! import org.tn5250j.tools.logging.*;
/*
***************
*** 26,30 ****
public class KeyStrokenizer {
! private Logger log = Logger.getLogger(this.getClass());
public KeyStrokenizer() {
--- 26,30 ----
public class KeyStrokenizer {
! private TN5250jLogger log = TN5250jLogFactory.getLogger(this.getClass());
public KeyStrokenizer() {
Index: Gui5250SplitFrame.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/Gui5250SplitFrame.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Gui5250SplitFrame.java 14 Apr 2004 12:15:53 -0000 1.3
--- Gui5250SplitFrame.java 30 Jun 2004 06:18:56 -0000 1.4
***************
*** 33,37 ****
import javax.swing.event.ListSelectionListener;
! import org.apache.log4j.Logger;
import org.tn5250j.interfaces.GUIViewInterface;
import org.tn5250j.event.SessionJumpListener;
--- 33,37 ----
import javax.swing.event.ListSelectionListener;
! import org.tn5250j.tools.logging.*;
import org.tn5250j.interfaces.GUIViewInterface;
import org.tn5250j.event.SessionJumpListener;
***************
*** 57,61 ****
private JPanel toolsPanel;
! private Logger log = Logger.getLogger(this.getClass());
//Construct the frame
--- 57,61 ----
private JPanel toolsPanel;
! private TN5250jLogger log = TN5250jLogFactory.getLogger(this.getClass());
//Construct the frame
Index: GlobalConfigure.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/GlobalConfigure.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** GlobalConfigure.java 26 Jun 2004 11:20:20 -0000 1.17
--- GlobalConfigure.java 30 Jun 2004 06:18:56 -0000 1.18
***************
*** 31,35 ****
import javax.swing.*;
! import org.apache.log4j.Logger;
import org.tn5250j.interfaces.ConfigureFactory;
--- 31,35 ----
import javax.swing.*;
! import org.tn5250j.tools.logging.*;
import org.tn5250j.interfaces.ConfigureFactory;
***************
*** 62,66 ****
static final private String settingsFile = "tn5250jstartup.cfg";
! private Logger log = Logger.getLogger(this.getClass());
/**
--- 62,66 ----
static final private String settingsFile = "tn5250jstartup.cfg";
! private TN5250jLogger log = TN5250jLogFactory.getLogger (this.getClass());
/**
Index: Gui5250.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/Gui5250.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** Gui5250.java 26 Jun 2004 05:44:03 -0000 1.60
--- Gui5250.java 30 Jun 2004 06:18:56 -0000 1.61
***************
*** 35,39 ****
! import org.apache.log4j.Logger;
import org.tn5250j.tools.*;
import org.tn5250j.mailtools.*;
--- 35,39 ----
! import org.tn5250j.tools.logging.*;
import org.tn5250j.tools.*;
import org.tn5250j.mailtools.*;
***************
*** 77,82 ****
protected SessionScrollerInterface scroller;
! private Logger log = Logger.getLogger(this.getClass());
! private Logger graphics = Logger.getLogger("GFX");
public Gui5250 () {
--- 77,82 ----
protected SessionScrollerInterface scroller;
! private TN5250jLogger log = TN5250jLogFactory.getLogger(this.getClass());
! private TN5250jLogger graphics = TN5250jLogFactory.getLogger("GFX");
public Gui5250 () {
-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 -
digital self defense, top technical experts, no vendor pitches,
unmatched networking opportunities. Visit www.blackhat.com