[Rails-commits] 18xx/rails/ui/swing ORWindow.java, 1.16, 1.17 ORUIManager.java, 1.17, 1.18 GameUIMa

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/rails/18xx/rails/ui/swing
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv5012/rails/ui/swing

Modified Files:
	ORWindow.java ORUIManager.java GameUIManager.java 
	ReportWindow.java 
Log Message:
ReportWindow changes (Jonathan)

Index: ReportWindow.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ReportWindow.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ReportWindow.java	18 Nov 2008 22:12:50 -0000	1.6
--- ReportWindow.java	21 Nov 2008 20:41:47 -0000	1.7
***************
*** 16,36 ****
  
      private static final long serialVersionUID = 1L;
!     private JLabel message;
      private JScrollPane messageScroller;
      private JScrollBar vbar;
      private JPanel messagePanel;
!     private static ReportWindow messageWindow;
      private GameManager gameManager;
  
-     private static StringBuffer buffer = new StringBuffer("<html></html>");
- 
      public ReportWindow(GameManager gameManager) {
          messageWindow = this;
          this.gameManager = gameManager;
  
!         message = new JLabel("");
          message.setBackground(Color.WHITE);
          message.setOpaque(true);
-         message.setVerticalAlignment(SwingConstants.TOP);
          message.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
  
--- 16,35 ----
  
      private static final long serialVersionUID = 1L;
!     private JTextArea message;
      private JScrollPane messageScroller;
      private JScrollBar vbar;
      private JPanel messagePanel;
!     private ReportWindow messageWindow;
      private GameManager gameManager;
  
      public ReportWindow(GameManager gameManager) {
          messageWindow = this;
          this.gameManager = gameManager;
  
!         message = new JTextArea();
!         message.setEditable(false);
!         message.setLineWrap(false);
          message.setBackground(Color.WHITE);
          message.setOpaque(true);
          message.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
  
***************
*** 38,42 ****
          messageScroller =
                  new JScrollPane(message,
!                         ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED,
                          ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
          vbar = messageScroller.getVerticalScrollBar();
--- 37,41 ----
          messageScroller =
                  new JScrollPane(message,
!                         ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS,
                          ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
          vbar = messageScroller.getVerticalScrollBar();
***************
*** 56,65 ****
      }
  
!     public static void addLog() {
          String newText = ReportBuffer.get();
          if (newText.length() > 0) {
!             buffer.insert(buffer.length() - 7, newText.replaceAll("\n", "<br>"));
! 
!             messageWindow.message.setText(buffer.toString());
              SwingUtilities.invokeLater(new Runnable() {
                  public void run() {
--- 55,62 ----
      }
  
!     public void addLog() {
          String newText = ReportBuffer.get();
          if (newText.length() > 0) {
!             message.append(newText);
              SwingUtilities.invokeLater(new Runnable() {
                  public void run() {

Index: ORUIManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORUIManager.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ORUIManager.java	20 Nov 2008 21:49:38 -0000	1.17
--- ORUIManager.java	21 Nov 2008 20:41:47 -0000	1.18
***************
*** 358,362 ****
          }
  
!         ReportWindow.addLog();
      }
  
--- 358,362 ----
          }
  
!         gameUIManager.reportWindow.addLog();
      }
  

Index: ORWindow.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORWindow.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** ORWindow.java	30 Jun 2008 20:35:29 -0000	1.16
--- ORWindow.java	21 Nov 2008 20:41:47 -0000	1.17
***************
*** 78,82 ****
          addWindowListener(this);
  
!         ReportWindow.addLog();
      }
  
--- 78,82 ----
          addWindowListener(this);
  
!         gameUIManager.reportWindow.addLog();
      }
  

Index: GameUIManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/GameUIManager.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** GameUIManager.java	30 Jun 2008 20:35:29 -0000	1.12
--- GameUIManager.java	21 Nov 2008 20:41:47 -0000	1.13
***************
*** 125,129 ****
          activeWindow.displayServerMessage();
  
!         ReportWindow.addLog();
  
          // End of game checks
--- 125,129 ----
          activeWindow.displayServerMessage();
  
!         reportWindow.addLog();
  
          // End of game checks

[Rails-commits] 18xx/rails/ui/swing ORWindow.java, 1.16, 1.17 ORUIManager.java, 1.17, 1.18 GameUIMa

[Rails-commits] 18xx/rails/ui/swing ORWindow.java, 1.16, 1.17 ORUIManager.java, 1.17, 1.18 GameUIManager.java, 1.12, 1.13 ReportWindow.java, 1.6, 1.7