[Jrisk-cvs] SF.net SVN: domination-code:[2584] Domination/sharedUI

[<yu...@us...>]

Revision: 2584
          http://sourceforge.net/p/domination/code/2584
Author:   yuranet
Date:     2024-11-23 22:43:26 +0000 (Sat, 23 Nov 2024)
Log Message:
-----------
show loading screen when downloading maps

Modified Paths:
--------------
    Domination/sharedUI/src_mapstore_lobby/net/yura/domination/lobby/mini/MiniLobbyRisk.java
    Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/GameWindow.java

Added Paths:
-----------
    Domination/sharedUI/src_mapstore_lobby/net/yura/domination/LoadingManager.java

Added: Domination/sharedUI/src_mapstore_lobby/net/yura/domination/LoadingManager.java
===================================================================
--- Domination/sharedUI/src_mapstore_lobby/net/yura/domination/LoadingManager.java	                        (rev 0)
+++ Domination/sharedUI/src_mapstore_lobby/net/yura/domination/LoadingManager.java	2024-11-23 22:43:26 UTC (rev 2584)
@@ -0,0 +1,16 @@
+package net.yura.domination;
+
+import net.yura.domination.engine.translation.TranslationBundle;
+import net.yura.swingme.core.LoadingScreen;
+
+public class LoadingManager {
+
+    public static void showLoadingScreen(boolean show) {
+        if (show) {
+            LoadingScreen.show(TranslationBundle.getBundle().getString("mainmenu.loading"));
+        }
+        else {
+            LoadingScreen.hide();
+        }
+    }
+}

Modified: Domination/sharedUI/src_mapstore_lobby/net/yura/domination/lobby/mini/MiniLobbyRisk.java
===================================================================
--- Domination/sharedUI/src_mapstore_lobby/net/yura/domination/lobby/mini/MiniLobbyRisk.java	2024-11-23 20:53:57 UTC (rev 2583)
+++ Domination/sharedUI/src_mapstore_lobby/net/yura/domination/lobby/mini/MiniLobbyRisk.java	2024-11-23 22:43:26 UTC (rev 2584)
@@ -4,6 +4,7 @@
 import java.util.Observer;
 import java.util.WeakHashMap;
 import java.util.logging.Logger;
+import net.yura.domination.LoadingManager;
 import net.yura.domination.audio.GameSound;
 import net.yura.domination.engine.OnlineRisk;
 import net.yura.domination.engine.OnlineUtil;
@@ -59,6 +60,8 @@
 
     @Override
     public void prepareAndOpenGame(final Game game) {
+        LoadingManager.showLoadingScreen(true);
+
         final String mapUID = OnlineUtil.getMapNameFromLobbyStartGameOption(game.getOptions());
 
         // TODO check if we are already in the process of downloading this map
@@ -75,6 +78,7 @@
                         lobby.mycom.playGame(game.getId());
                     }
                     else {
+                        LoadingManager.showLoadingScreen(false);
                         lobby.error("map download failed for: " + mapUID);
                     }
                 }

Modified: Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/GameWindow.java
===================================================================
--- Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/GameWindow.java	2024-11-23 20:53:57 UTC (rev 2583)
+++ Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/GameWindow.java	2024-11-23 22:43:26 UTC (rev 2584)
@@ -15,6 +15,7 @@
 import javax.microedition.lcdui.Display;
 import javax.microedition.lcdui.Graphics;
 import javax.microedition.lcdui.Image;
+import net.yura.domination.LoadingManager;
 import net.yura.domination.audio.GameSound;
 import net.yura.domination.engine.ColorUtil;
 import net.yura.domination.engine.JavaCompatUtil;
@@ -364,7 +365,7 @@
         boolean retry=false;
         boolean error = pp != scroll.getView();
 
-        if (!error) showloadingScreen(true);
+        if (!error) LoadingManager.showLoadingScreen(true);
 
         try {
             pp.load();
@@ -426,7 +427,7 @@
             logger.log( (retry || ex instanceof OutOfMemoryError) ?Level.INFO:Level.WARNING , text, ex);
         }
         finally {
-            if (!retry) showloadingScreen(false);
+            if (!retry) LoadingManager.showLoadingScreen(false);
         }
 
         note.setText( resb.getString("game.pleasewait") );
@@ -444,15 +445,6 @@
         setVisible(true);
     }
 
-    private void showloadingScreen(boolean show) {
-        if (show) {
-            LoadingScreen.show(resb.getProperty("mainmenu.loading"));
-        }
-        else {
-            LoadingScreen.hide();
-        }
-    }
-
     @Override
     public void setVisible(boolean b) {
     	super.setVisible(b);