[Jmri-commits] CVS: jmri/jmrit/simpleturnoutctrl SimpleTurnoutCtrlFrame.java,1.1,1.2

[Bob J. <jac...@us...>]

Update of /cvsroot/jmri/jmri/jmrit/simpleturnoutctrl
In directory usw-pr-cvs1:/tmp/cvs-serv5134/simpleturnoutctrl

Modified Files:
	SimpleTurnoutCtrlFrame.java 
Log Message:
minor formatting cleanup

Index: SimpleTurnoutCtrlFrame.java
===================================================================
RCS file: /cvsroot/jmri/jmri/jmrit/simpleturnoutctrl/SimpleTurnoutCtrlFrame.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** SimpleTurnoutCtrlFrame.java	28 Feb 2002 21:47:12 -0000	1.1
--- SimpleTurnoutCtrlFrame.java	31 Mar 2002 19:03:34 -0000	1.2
***************
*** 1,8 ****
! /** 
   * SimpleTurnoutCtrlFrame.java
   *
   * Description:		Frame controlling a single turnout
   * @author			Bob Jacobsen   Copyright (C) 2001
!  * @version			
   */
  
--- 1,8 ----
! /**
   * SimpleTurnoutCtrlFrame.java
   *
   * Description:		Frame controlling a single turnout
   * @author			Bob Jacobsen   Copyright (C) 2001
!  * @version
   */
  
***************
*** 21,28 ****
  	javax.swing.JLabel textAdrLabel = new javax.swing.JLabel();
  	javax.swing.JTextField adrTextField = new javax.swing.JTextField(3);
! 		
  	javax.swing.JButton throwButton = new javax.swing.JButton();
  	javax.swing.JButton closeButton = new javax.swing.JButton();
! 	
  	javax.swing.JLabel textStateLabel = new javax.swing.JLabel();
  	javax.swing.JLabel nowStateLabel = new javax.swing.JLabel();
--- 21,28 ----
  	javax.swing.JLabel textAdrLabel = new javax.swing.JLabel();
  	javax.swing.JTextField adrTextField = new javax.swing.JTextField(3);
! 
  	javax.swing.JButton throwButton = new javax.swing.JButton();
  	javax.swing.JButton closeButton = new javax.swing.JButton();
! 
  	javax.swing.JLabel textStateLabel = new javax.swing.JLabel();
  	javax.swing.JLabel nowStateLabel = new javax.swing.JLabel();
***************
*** 72,91 ****
  		getContentPane().add(textStateLabel);
  		getContentPane().add(nowStateLabel);
! 		
  		getContentPane().add(throwButton);
  		getContentPane().add(closeButton);
  
  		pack();
! 		
  	}
!   
    	private boolean mShown = false;
!   	
  	public void addNotify() {
  		super.addNotify();
! 		
  		if (mShown)
  			return;
! 			
  		// resize frame to account for menubar
  		JMenuBar jMenuBar = getJMenuBar();
--- 72,91 ----
  		getContentPane().add(textStateLabel);
  		getContentPane().add(nowStateLabel);
! 
  		getContentPane().add(throwButton);
  		getContentPane().add(closeButton);
  
  		pack();
! 
  	}
! 
    	private boolean mShown = false;
! 
  	public void addNotify() {
  		super.addNotify();
! 
  		if (mShown)
  			return;
! 
  		// resize frame to account for menubar
  		JMenuBar jMenuBar = getJMenuBar();
***************
*** 104,108 ****
  		dispose();
  	}
! 	
  
  	public void closeButtonActionPerformed(java.awt.event.ActionEvent e) {
--- 104,108 ----
  		dispose();
  	}
! 
  
  	public void closeButtonActionPerformed(java.awt.event.ActionEvent e) {
***************
*** 148,158 ****
  			int now = ((Integer) e.getNewValue()).intValue();
  			switch (now) {
! 				case Turnout.UNKNOWN: 
  					nowStateLabel.setText("<unknown>");
  					return;
! 				case Turnout.CLOSED: 
  					nowStateLabel.setText("Closed");
  					return;
! 				case Turnout.THROWN: 
  					nowStateLabel.setText("Thrown");
  					return;
--- 148,158 ----
  			int now = ((Integer) e.getNewValue()).intValue();
  			switch (now) {
! 				case Turnout.UNKNOWN:
  					nowStateLabel.setText("<unknown>");
  					return;
! 				case Turnout.CLOSED:
  					nowStateLabel.setText("Closed");
  					return;
! 				case Turnout.THROWN:
  					nowStateLabel.setText("Thrown");
  					return;
***************
*** 165,171 ****
  
  	Turnout turnout = null;
! 	
  	static org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(SimpleTurnoutCtrlFrame.class.getName());
  
! String newState = "";
  }
--- 165,171 ----
  
  	Turnout turnout = null;
! 
  	static org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(SimpleTurnoutCtrlFrame.class.getName());
  
!     String newState = "";
  }