[Arianne-commits] stendhal/src/games/stendhal/client/gui/login CharacterDialog.java, 1.15, 1.16 CreateAccountDialog.java, 1.14, 1.15

[Kimmo R. <ki...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/login
In directory vz-cvs-4.sog:/tmp/cvs-serv16301/src/games/stendhal/client/gui/login

Modified Files:
	CharacterDialog.java CreateAccountDialog.java 
Log Message:
Use getOwner() instead of adding another field for parent frame


Index: CreateAccountDialog.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/login/CreateAccountDialog.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** CreateAccountDialog.java	29 Aug 2011 18:30:09 -0000	1.14
--- CreateAccountDialog.java	30 Jun 2012 18:56:14 -0000	1.15
***************
*** 24,27 ****
--- 24,28 ----
  import java.awt.GridLayout;
  import java.awt.Toolkit;
+ import java.awt.Window;
  import java.awt.event.ActionEvent;
  import java.awt.event.ActionListener;
***************
*** 77,81 ****
  	// End of variables declaration
  	private StendhalClient client;
- 	private Frame owner;
  	private String badEmailTitle, badEmailReason, badPasswordReason;
  
--- 78,81 ----
***************
*** 83,88 ****
  		super(owner, true);
  		this.client = client;
! 		this.owner = owner;
! 		initializeComponent();
  
  		WindowUtils.closeOnEscape(this);
--- 83,87 ----
  		super(owner, true);
  		this.client = client;
! 		initializeComponent(owner);
  
  		WindowUtils.closeOnEscape(this);
***************
*** 92,99 ****
  	CreateAccountDialog() {
  		super();
! 		initializeComponent();
  	}
  
! 	private void initializeComponent() {
  		this.addWindowListener(new WindowAdapter() {
  			@Override
--- 91,98 ----
  	CreateAccountDialog() {
  		super();
! 		initializeComponent(null);
  	}
  
! 	private void initializeComponent(final Frame owner) {
  		this.addWindowListener(new WindowAdapter() {
  			@Override
***************
*** 233,237 ****
  			port = Integer.parseInt(serverPortField.getText());
  		} catch (final Exception ex) {
! 			JOptionPane.showMessageDialog(owner,
  					"That is not a valid port number. Please try again.",
  					"Invalid Port", JOptionPane.WARNING_MESSAGE);
--- 232,236 ----
  			port = Integer.parseInt(serverPortField.getText());
  		} catch (final Exception ex) {
! 			JOptionPane.showMessageDialog(getOwner(),
  					"That is not a valid port number. Please try again.",
  					"Invalid Port", JOptionPane.WARNING_MESSAGE);
***************
*** 261,265 ****
  					setEnabled(true);
  					JOptionPane.showMessageDialog(
! 							owner,
  							"Unable to connect to server to create your account. The server may be down or, if you are using a custom server, " +
  							"you may have entered its name and port number incorrectly.");
--- 260,264 ----
  					setEnabled(true);
  					JOptionPane.showMessageDialog(
! 							getOwner(),
  							"Unable to connect to server to create your account. The server may be down or, if you are using a custom server, " +
  							"you may have entered its name and port number incorrectly.");
***************
*** 269,273 ****
  					return;
  				}
! 
  				try {
  					final AccountResult result = client.createAccount(
--- 268,272 ----
  					return;
  				}
! 				final Window owner = getOwner();
  				try {
  					final AccountResult result = client.createAccount(
***************
*** 355,358 ****
--- 354,358 ----
  		final String passwordretype = new String(
  				passwordretypeField.getPassword());
+ 		final Window owner = getOwner();
  		if (!password.equals(passwordretype)) {
  			JOptionPane.showMessageDialog(owner,
***************
*** 514,518 ****
  			final String text = "The password you provided is too short. It must be at least 6 characters long.";
  			if (isVisible()) {
! 				JOptionPane.showMessageDialog(owner, text);
  			} else {
  				logger.warn(text);
--- 514,518 ----
  			final String text = "The password you provided is too short. It must be at least 6 characters long.";
  			if (isVisible()) {
! 				JOptionPane.showMessageDialog(getOwner(), text);
  			} else {
  				logger.warn(text);

Index: CharacterDialog.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/login/CharacterDialog.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** CharacterDialog.java	7 Apr 2012 06:58:28 -0000	1.15
--- CharacterDialog.java	30 Jun 2012 18:56:14 -0000	1.16
***************
*** 85,90 ****
  	private final JComponent characterPanel;
  	
- 	private JFrame owner;
- 	
  	/**
  	 * Create a new <code>CharacterDialog</code>.
--- 85,88 ----
***************
*** 96,100 ****
  	public CharacterDialog(final Map<String, RPObject> characters, JFrame owner) {
  		super(owner);
- 		this.owner = owner;
  		setTitle("Choose character");
  		
--- 94,97 ----
***************
*** 268,275 ****
  	 */
  	private void onClose() {
! 		if (owner == null) {
  			System.exit(0);
  		}
! 		owner.setEnabled(true);
  		this.setVisible(false);
  		dispose();
--- 265,272 ----
  	 */
  	private void onClose() {
! 		if (getOwner() == null) {
  			System.exit(0);
  		}
! 		getOwner().setEnabled(true);
  		this.setVisible(false);
  		dispose();
***************
*** 285,290 ****
  			StendhalClient.get().chooseCharacter(character);
  			setVisible(false);
! 			if (owner != null) {
! 				owner.dispose();
  			}
  			stendhal.setDoLogin();
--- 282,287 ----
  			StendhalClient.get().chooseCharacter(character);
  			setVisible(false);
! 			if (getOwner() != null) {
! 				getOwner().dispose();
  			}
  			stendhal.setDoLogin();
***************
*** 314,320 ****
  				this, errorMessage, errorTitle, JOptionPane.ERROR_MESSAGE);
  
! 		if (owner != null) {
  			setVisible(false);
! 			owner.setEnabled(true);
  			dispose();
  		} else {
--- 311,317 ----
  				this, errorMessage, errorTitle, JOptionPane.ERROR_MESSAGE);
  
! 		if (getOwner() != null) {
  			setVisible(false);
! 			getOwner().setEnabled(true);
  			dispose();
  		} else {