tn5250j/src/org/tn5250j SessionPopup.java,1.11,1.12 SessionScroller14.java,1.1,1.2 Sessions.java,1.9,1.10 SessionScroller.java,1.3,1.4

"Kenneth J. Pouncey" <[email protected]> Thu, 22 Jul 2004 04:54:45 +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-serv4416/src/org/tn5250j

Modified Files:
	SessionPopup.java SessionScroller14.java Sessions.java 
	SessionScroller.java 
Log Message:
Updates for headless

Index: SessionPopup.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/SessionPopup.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** SessionPopup.java	18 Jul 2004 13:38:53 -0000	1.11
--- SessionPopup.java	22 Jul 2004 04:54:42 -0000	1.12
***************
*** 44,53 ****
  
     Screen5250 screen;
!    Session session;
     tnvt vt;
     Macronizer macros;
     String newMacName;
  
! 	public SessionPopup(Session ses, MouseEvent me) {
  
        JMenuItem menuItem;
--- 44,53 ----
  
     Screen5250 screen;
!    SessionGUI session;
     tnvt vt;
     Macronizer macros;
     String newMacName;
  
! 	public SessionPopup(SessionGUI ses, MouseEvent me) {
  
        JMenuItem menuItem;
***************
*** 55,59 ****
        JPopupMenu popup = new JPopupMenu();
        session = ses;
!       vt = session.getVT();
  //      final Gui5250 g = session;
        screen = session.getScreen();
--- 55,59 ----
        JPopupMenu popup = new JPopupMenu();
        session = ses;
!       vt = session.getSession().getVT();
  //      final Gui5250 g = session;
        screen = session.getScreen();
***************
*** 95,99 ****
           action = new AbstractAction(LangTool.getString("popup.copy")) {
                 public void actionPerformed(ActionEvent e) {
!                   session.copyMe();
                    session.getFocusForMe();
                 }
--- 95,99 ----
           action = new AbstractAction(LangTool.getString("popup.copy")) {
                 public void actionPerformed(ActionEvent e) {
!                   session.actionCopy();
                    session.getFocusForMe();
                 }
***************
*** 259,263 ****
              action = new AbstractAction(LangTool.getString("popup.settings")) {
                    public void actionPerformed(ActionEvent e) {
!                      session.doAttributes();
                      session.getFocusForMe();
                    }
--- 259,263 ----
              action = new AbstractAction(LangTool.getString("popup.settings")) {
                    public void actionPerformed(ActionEvent e) {
!                      session.actionAttributes();
                      session.getFocusForMe();
                    }

Index: SessionScroller14.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/SessionScroller14.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SessionScroller14.java	31 Mar 2004 12:30:20 -0000	1.1
--- SessionScroller14.java	22 Jul 2004 04:54:42 -0000	1.2
***************
*** 39,48 ****
     Screen5250 screen;
  
! 	public SessionScroller14(Session ses) {
  
        screen = ses.getScreen();
  	}
  
!    public void addMouseWheelListener(Session ses) {
  
        ses.addMouseWheelListener(this);
--- 39,48 ----
     Screen5250 screen;
  
! 	public SessionScroller14(SessionGUI ses) {
  
        screen = ses.getScreen();
  	}
  
!    public void addMouseWheelListener(SessionGUI ses) {
  
        ses.addMouseWheelListener(this);
***************
*** 50,54 ****
     }
  
!    public void removeMouseWheelListener(Session ses) {
  
        ses.removeMouseWheelListener(this);
--- 50,54 ----
     }
  
!    public void removeMouseWheelListener(SessionGUI ses) {
  
        ses.removeMouseWheelListener(this);

Index: SessionScroller.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/SessionScroller.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SessionScroller.java	4 Jul 2004 08:19:33 -0000	1.3
--- SessionScroller.java	22 Jul 2004 04:54:42 -0000	1.4
***************
*** 38,42 ****
  
     Screen5250 screen;
!    Session session;
     static boolean useJava14;
  
--- 38,42 ----
  
     Screen5250 screen;
!    SessionGUI session;
     static boolean useJava14;
  
***************
*** 59,63 ****
  
  
!    protected SessionScrollerInterface getScrollerInstance(Session ses) {
  
        if (_instance != null)
--- 59,63 ----
  
  
!    protected SessionScrollerInterface getScrollerInstance(SessionGUI ses) {
  
        if (_instance != null)
***************
*** 85,89 ****
           scroller_class       = loader.loadClass(SCROLLER_NAME14);
  
!          constructor1 = scroller_class.getConstructor(new Class[] {Session.class});
  
           try {
--- 85,89 ----
           scroller_class       = loader.loadClass(SCROLLER_NAME14);
  
!          constructor1 = scroller_class.getConstructor(new Class[] {SessionGUI.class});
  
           try {
***************
*** 109,118 ****
     }
  
!    public void addMouseWheelListener(Session ses) {
  
  
     }
  
!    public void removeMouseWheelListener(Session ses) {
  
  
--- 109,118 ----
     }
  
!    public void addMouseWheelListener(SessionGUI ses) {
  
  
     }
  
!    public void removeMouseWheelListener(SessionGUI ses) {
  
  

Index: Sessions.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/Sessions.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Sessions.java	30 Jun 2004 06:18:56 -0000	1.9
--- Sessions.java	22 Jul 2004 04:54:42 -0000	1.10
***************
*** 37,43 ****
     private int count = 0;
     private Timer heartBeater;
!    
     private TN5250jLogger  log = TN5250jLogFactory.getLogger (this.getClass());
!    
     public Sessions() {
  
--- 37,43 ----
     private int count = 0;
     private Timer heartBeater;
! 
     private TN5250jLogger  log = TN5250jLogFactory.getLogger (this.getClass());
! 
     public Sessions() {
  
***************
*** 47,54 ****
     public void actionPerformed(ActionEvent e) {
  
!       Session ses;
        for (int x = 0; x < sessions.size(); x++) {
           try {
!             ses = (Session)sessions.get(x);
              if (ses.isConnected() && ses.isSendKeepAlive()) {
                 ses.getVT().sendHeartBeat();
--- 47,54 ----
     public void actionPerformed(ActionEvent e) {
  
!       Session5250 ses;
        for (int x = 0; x < sessions.size(); x++) {
           try {
!             ses = (Session5250)sessions.get(x);
              if (ses.isConnected() && ses.isSendKeepAlive()) {
                 ses.getVT().sendHeartBeat();
***************
*** 63,67 ****
     }
  
!    protected void addSession(Session newSession) {
        sessions.add(newSession);
        log.debug("adding Session: "+newSession.getSessionName());
--- 63,67 ----
     }
  
!    protected void addSession(Session5250 newSession) {
        sessions.add(newSession);
        log.debug("adding Session: "+newSession.getSessionName());
***************
*** 75,79 ****
     }
  
!    protected void removeSession(Session session) {
        log.debug("Removing session: "+session.getSessionName());
        if (session != null) {
--- 75,79 ----
     }
  
!    protected void removeSession(Session5250 session) {
        log.debug("Removing session: "+session.getSessionName());
        if (session != null) {
***************
*** 87,91 ****
     protected void removeSession(String sessionName) {
        log.debug("Remove session by name: "+sessionName);
!       removeSession((Session)item(sessionName));
  
     }
--- 87,91 ----
     protected void removeSession(String sessionName) {
        log.debug("Remove session by name: "+sessionName);
!       removeSession((Session5250)item(sessionName));
  
     }
***************
*** 93,97 ****
     protected void removeSession(int index) {
     	  log.debug("Remove session by index: "+index);
!       removeSession((Session)item(index));
     }
  
--- 93,98 ----
     protected void removeSession(int index) {
     	  log.debug("Remove session by index: "+index);
! //      removeSession((SessionGUI)(((Session5250)item(index)).getGUI()));
!       removeSession(item(index));
     }
  
***************
*** 101,118 ****
     }
  
!    public Session item (int index) {
  
!       return (Session)sessions.get(index);
  
     }
  
!    public Session item (String sessionName) {
  
!       Session s = null;
        int x = 0;
  
        while (x < sessions.size()) {
  
!          s = (Session)sessions.get(x);
  
           if (s.getSessionName().equals(sessionName))
--- 102,119 ----
     }
  
!    public Session5250 item (int index) {
  
!       return (Session5250)sessions.get(index);
  
     }
  
!    public Session5250 item (String sessionName) {
  
!       Session5250 s = null;
        int x = 0;
  
        while (x < sessions.size()) {
  
!          s = (Session5250)sessions.get(x);
  
           if (s.getSessionName().equals(sessionName))
***************
*** 126,137 ****
     }
  
!    public Session item (Session sessionObject) {
  
!       Session s = null;
        int x = 0;
  
        while (x < sessions.size()) {
  
!          s = (Session)sessions.get(x);
  
           if (s.equals(sessionObject))
--- 127,138 ----
     }
  
!    public Session5250 item (Session5250 sessionObject) {
  
!       Session5250 s = null;
        int x = 0;
  
        while (x < sessions.size()) {
  
!          s = (Session5250)sessions.get(x);
  
           if (s.equals(sessionObject))



-------------------------------------------------------
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