[Gridarta-commit] SF.net SVN: gridarta:[8008] trunk

[<aki...@us...>]

Revision: 8008
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8008&view=rev
Author:   akirschbaum
Date:     2010-05-26 20:19:58 +0000 (Wed, 26 May 2010)

Log Message:
-----------
Make sure the updater dialogs are displayed in front of the main window.

Modified Paths:
--------------
    trunk/atrinik/ChangeLog
    trunk/crossfire/ChangeLog
    trunk/daimonin/ChangeLog
    trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java

Modified: trunk/atrinik/ChangeLog
===================================================================
--- trunk/atrinik/ChangeLog	2010-05-26 20:15:56 UTC (rev 8007)
+++ trunk/atrinik/ChangeLog	2010-05-26 20:19:58 UTC (rev 8008)
@@ -1,5 +1,8 @@
 2010-05-26  Andreas Kirschbaum
 
+	* Make sure the updater dialogs are displayed in front of the main
+	window.
+
 	* Implement #2093373 (Ability to import more than one type). Now
 	types.xml is "<!ELEMENT type (import_type*..." rather than
 	"...import_type?...".

Modified: trunk/crossfire/ChangeLog
===================================================================
--- trunk/crossfire/ChangeLog	2010-05-26 20:15:56 UTC (rev 8007)
+++ trunk/crossfire/ChangeLog	2010-05-26 20:19:58 UTC (rev 8008)
@@ -1,5 +1,8 @@
 2010-05-26  Andreas Kirschbaum
 
+	* Make sure the updater dialogs are displayed in front of the main
+	window.
+
 	* Implement #2093373 (Ability to import more than one type). Now
 	types.xml is "<!ELEMENT type (import_type*..." rather than
 	"...import_type?...".

Modified: trunk/daimonin/ChangeLog
===================================================================
--- trunk/daimonin/ChangeLog	2010-05-26 20:15:56 UTC (rev 8007)
+++ trunk/daimonin/ChangeLog	2010-05-26 20:19:58 UTC (rev 8008)
@@ -1,5 +1,8 @@
 2010-05-26  Andreas Kirschbaum
 
+	* Make sure the updater dialogs are displayed in front of the main
+	window.
+
 	* Implement #2093373 (Ability to import more than one type). Now
 	types.xml is "<!ELEMENT type (import_type*..." rather than
 	"...import_type?...".

Modified: trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java	2010-05-26 20:15:56 UTC (rev 8007)
+++ trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java	2010-05-26 20:19:58 UTC (rev 8008)
@@ -339,6 +339,12 @@
     private final ShortcutsManager shortcutsManager;
 
     /**
+     * The {@link UpdaterManager} instance.
+     */
+    @NotNull
+    private final UpdaterManager updaterManager;
+
+    /**
      * Creates a new instance.
      * @param createDirectionPane whether the direction panel should be created
      * @param mapManager the map manager
@@ -459,8 +465,7 @@
         final ToolPalette<G, A, R> toolPalette = new ToolPalette<G, A, R>(mapViewSettings, selectedSquareView, selectedSquareModel, objectChooser, pickmapChooserControl, floorMatcher, wallMatcher, monsterMatcher, insertionModeSet);
         new FindArchetypesDialogManager<G, A, R>(mainViewFrame, archetypeChooserControl, objectChooser, archetypeTypeSet);
         new UndoControl<G, A, R>(mapManager, gameObjectFactory, gameObjectMatchers);
-        final UpdaterManager updaterManager = new UpdaterManager(exiter, mapManager, mainViewFrame, gridartaJarFilename);
-        updaterManager.startup();
+        updaterManager = new UpdaterManager(exiter, mapManager, mainViewFrame, gridartaJarFilename);
 
         final GameObjectAttributesTab<G, A, R> textEditorTab = new TextEditorTab<G, A, R>(gameObjectAttributesModel, archetypeTypeSet);
         final GameObjectTab<G, A, R> gameObjectTab = new GameObjectTab<G, A, R>("gameObject", gameObjectAttributesControl, Location.BOTTOM, 0, true);
@@ -812,6 +817,7 @@
     public void run(@NotNull final Iterable<String> args) {
         mainViewFrame.setVisible(true);
         TipOfTheDayManager.showAtStartup(mainViewFrame);
+        updaterManager.startup();
         openFiles(args);
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.