[Crossfire-cvs] CVS commit: CFJavaEditor/src/cfeditor

[<cro...@li...>]

Module Name:	CFJavaEditor
Committed By:	avogl
Date:		Thu Nov 18 15:35:38 UTC 2004

Modified Files:
	CFJavaEditor/src/cfeditor: CDialogBase.java CFJavaEditor.java
	    CMapPropertiesDialog.java CNewMapDialog.java COptionDialog.java
	    CStartupScreen.java JFontChooser.java

Log Message:
Overlooked a serious compatibility problem with the overloading
of the deprecated method 'show' in two classes.
Fixed that.
--AndreasV



Start of context diffs


Index: CFJavaEditor/src/cfeditor/CDialogBase.java
diff -c CFJavaEditor/src/cfeditor/CDialogBase.java:1.4 CFJavaEditor/src/cfeditor/CDialogBase.java:1.5
*** CFJavaEditor/src/cfeditor/CDialogBase.java:1.4	Wed Nov 17 20:51:16 2004
--- CFJavaEditor/src/cfeditor/CDialogBase.java	Thu Nov 18 07:35:38 2004
***************
*** 36,61 ****
   */

  public class CDialogBase extends JDialog {

  

!     public CDialogBase(Frame parentFrame, String title ) {

          super( parentFrame, title );

      }

  

      /**

       * Centers this dialog when showing.

       */

!     public void show() {

!         Window owner = getOwner();

!         Rectangle ownerBounds;

!         if (owner != null)

!             ownerBounds = owner.getBounds();

! 	else

! 	    ownerBounds = new Rectangle(Toolkit.getDefaultToolkit().getScreenSize());

!         Dimension ownSize = getSize();

!         Rectangle ownBounds = new Rectangle(ownSize);

!         ownBounds.x = ownerBounds.x + (ownerBounds.width - ownSize.width)/2;

!         ownBounds.y = ownerBounds.y + (ownerBounds.height - ownSize.height)/2;

!         setBounds(ownBounds);

!         super.setVisible(true);

      }

  

  }

--- 36,65 ----
   */

  public class CDialogBase extends JDialog {

  

!     public CDialogBase(Frame parentFrame, String title) {

          super( parentFrame, title );

      }

  

      /**

       * Centers this dialog when showing.

       */

!     public void setVisible(boolean visible) {

!         if (visible) {

!             Window owner = getOwner();

!             Rectangle ownerBounds;

!             if (owner != null)

!                 ownerBounds = owner.getBounds();

!             else

!                 ownerBounds = new Rectangle(Toolkit.getDefaultToolkit().getScreenSize());

!             Dimension ownSize = getSize();

!             Rectangle ownBounds = new Rectangle(ownSize);

!             ownBounds.x = ownerBounds.x + (ownerBounds.width - ownSize.width)/2;

!             ownBounds.y = ownerBounds.y + (ownerBounds.height - ownSize.height)/2;

!             setBounds(ownBounds);

!             super.setVisible(true);

!         }

!         else

!             super.setVisible(false);

      }

  

  }


Index: CFJavaEditor/src/cfeditor/CFJavaEditor.java
diff -c CFJavaEditor/src/cfeditor/CFJavaEditor.java:1.17 CFJavaEditor/src/cfeditor/CFJavaEditor.java:1.18
*** CFJavaEditor/src/cfeditor/CFJavaEditor.java:1.17	Wed Nov 17 20:51:16 2004
--- CFJavaEditor/src/cfeditor/CFJavaEditor.java	Thu Nov 18 07:35:38 2004
***************
*** 31,37 ****
   * The launcher that launches the whole level editor application.

   *

   * @author <a href="mailto:mic...@no...">Michael Toennies</a>

!  * @version $Revision: 1.17 $

   */

  public class CFJavaEditor {

      /**

--- 31,37 ----
   * The launcher that launches the whole level editor application.

   *

   * @author <a href="mailto:mic...@no...">Michael Toennies</a>

!  * @version $Revision: 1.18 $

   */

  public class CFJavaEditor {

      /**


Index: CFJavaEditor/src/cfeditor/CMapPropertiesDialog.java
diff -c CFJavaEditor/src/cfeditor/CMapPropertiesDialog.java:1.9 CFJavaEditor/src/cfeditor/CMapPropertiesDialog.java:1.10
*** CFJavaEditor/src/cfeditor/CMapPropertiesDialog.java:1.9	Wed Nov 17 20:51:17 2004
--- CFJavaEditor/src/cfeditor/CMapPropertiesDialog.java	Thu Nov 18 07:35:38 2004
***************
*** 334,340 ****
                    m_control.getMainView().getY()+(m_control.getMainView().getHeight()-480)/2,

                    545, 480);

          pack();

!         show();

      }

  

      /**

--- 334,340 ----
                    m_control.getMainView().getY()+(m_control.getMainView().getHeight()-480)/2,

                    545, 480);

          pack();

!         setVisible(true);

      }

  

      /**




Index: CFJavaEditor/src/cfeditor/CStartupScreen.java
diff -c CFJavaEditor/src/cfeditor/CStartupScreen.java:1.3 CFJavaEditor/src/cfeditor/CStartupScreen.java:1.4
*** CFJavaEditor/src/cfeditor/CStartupScreen.java:1.3	Wed Nov 17 20:51:17 2004
--- CFJavaEditor/src/cfeditor/CStartupScreen.java	Thu Nov 18 07:35:38 2004
***************
*** 94,100 ****
  

          m_image = null;

  

!         setVisible( false );

          dispose();

      }

  

--- 94,100 ----
  

          m_image = null;

  

!         setVisible(false);

          dispose();

      }

  

***************
*** 111,125 ****
       * Overridden to startup a timer that then closes this window after

       * a few seconds.

       */

!     public void show() {

!         super.setVisible(true);

!         m_autoCloseTimer = new Timer( 3000, new ActionListener() {

                  public void actionPerformed( ActionEvent event ) {

                      close();

                  }

!             } );

!         m_autoCloseTimer.setInitialDelay( 3000 );

!         m_autoCloseTimer.setRepeats( false );

!         m_autoCloseTimer.start();

      }

  }

--- 111,129 ----
       * Overridden to startup a timer that then closes this window after

       * a few seconds.

       */

!     public void setVisible(boolean visible) {

!         if (visible) {

!             super.setVisible(true);

!             m_autoCloseTimer = new Timer( 3000, new ActionListener() {

                  public void actionPerformed( ActionEvent event ) {

                      close();

                  }

!             });

!             m_autoCloseTimer.setInitialDelay( 3000 );

!             m_autoCloseTimer.setRepeats( false );

!             m_autoCloseTimer.start();

!         }

!         else

!             super.setVisible(false);

      }

  }


Index: CFJavaEditor/src/cfeditor/JFontChooser.java
diff -c CFJavaEditor/src/cfeditor/JFontChooser.java:1.13 CFJavaEditor/src/cfeditor/JFontChooser.java:1.14
*** CFJavaEditor/src/cfeditor/JFontChooser.java:1.13	Wed Nov 17 20:51:17 2004
--- CFJavaEditor/src/cfeditor/JFontChooser.java	Thu Nov 18 07:35:38 2004
***************
*** 10,16 ****
   *

   * Valentin Tablan 06/04/2001

   *

!  * $Id: JFontChooser.java,v 1.13 2004/11/18 04:51:17 avogl Exp $

   *

   */

  package cfeditor;

--- 10,16 ----
   *

   * Valentin Tablan 06/04/2001

   *

!  * $Id: JFontChooser.java,v 1.14 2004/11/18 15:35:38 avogl Exp $

   *

   */

  package cfeditor;