[Jrisk-cvs] SF.net SVN: domination-code:[2582] Domination
Brought to you by:
yuranet
Menu
▾
▴
[Jrisk-cvs] SF.net SVN: domination-code:[2582] Domination
|
From: <yu...@us...> - 2024-11-21 18:52:09
|
Revision: 2582
http://sourceforge.net/p/domination/code/2582
Author: yuranet
Date: 2024-11-21 18:52:07 +0000 (Thu, 21 Nov 2024)
Log Message:
-----------
show invalid maps so they can be deleted
Modified Paths:
--------------
Domination/sharedUI/src_mapstore_lobby/net/yura/domination/mapstore/MapChooser.java
Domination/sharedUI/src_mapstore_lobby/net/yura/domination/mapstore/MapUpdateService.java
Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/DominationMain.java
Domination/src/net/yura/domination/engine/RiskUtil.java
Modified: Domination/sharedUI/src_mapstore_lobby/net/yura/domination/mapstore/MapChooser.java
===================================================================
--- Domination/sharedUI/src_mapstore_lobby/net/yura/domination/mapstore/MapChooser.java 2024-11-21 15:41:15 UTC (rev 2581)
+++ Domination/sharedUI/src_mapstore_lobby/net/yura/domination/mapstore/MapChooser.java 2024-11-21 18:52:07 UTC (rev 2582)
@@ -164,7 +164,7 @@
public void run() {
java.util.List riskmaps = new java.util.Vector(localMaps.size());
for (int c = 0; c < localMaps.size(); c++) {
- String file = (String) localMaps.get(c);
+ final String file = localMaps.get(c);
// if one map is corrupted, we dont want to block all map loading
try {
@@ -174,6 +174,22 @@
}
catch (Exception ex) {
Logger.warn("error creating map: " + file, ex);
+
+ // create placeholder so map can be deleted
+ Map map = new Map();
+ map.setMapUrl(file);
+ map.setName(file);
+ riskmaps.add(map);
+/*
+ // we are not in UI thread here, in Desktop mode we may not have a UI at all yet
+ OptionPane.showConfirmDialog(new ActionListener() {
+ public void actionPerformed(String actionCommand) {
+ if ("ok".equals(actionCommand)) {
+ RiskUtil.streamOpener.deleteMapFile(file);
+ }
+ }
+ }, "Error with: " + file + ". Delete?", "Map Error", OptionPane.OK_CANCEL_OPTION);
+ */
}
}
@@ -313,19 +329,25 @@
client.makeRequestMap(MapServerClient.MAP_PAGE, mapUID, new Observer() {
public void update(Observable o, Object map) {
if (map != null) {
- java.util.Map mapinfo = RiskUtil.loadInfo(mapUID, false);
- String cardsFile = (String) mapinfo.get("crd");
- String prvFile = (String) mapinfo.get("prv");
- String picFile = (String) mapinfo.get("pic");
- String mapFile = (String) mapinfo.get("map");
- RiskUtil.streamOpener.deleteMapFile(mapFile);
- RiskUtil.streamOpener.deleteMapFile(picFile);
- if (prvFile != null) {
- RiskUtil.streamOpener.deleteMapFile(MapPreview.PREVIEW_FILE_PREFIX + prvFile);
+ try {
+ java.util.Map mapinfo = RiskUtil.loadInfo(mapUID, false);
+ String cardsFile = (String) mapinfo.get("crd");
+ String prvFile = (String) mapinfo.get("prv");
+ String picFile = (String) mapinfo.get("pic");
+ String mapFile = (String) mapinfo.get("map");
+ RiskUtil.streamOpener.deleteMapFile(mapFile);
+ RiskUtil.streamOpener.deleteMapFile(picFile);
+ if (prvFile != null) {
+ RiskUtil.streamOpener.deleteMapFile(MapPreview.PREVIEW_FILE_PREFIX + prvFile);
+ }
+ if (!"risk.cards".equals(cardsFile) && !"nomission.cards".equals(cardsFile)) {
+ RiskUtil.streamOpener.deleteMapFile(cardsFile);
+ }
}
- if (!"risk.cards".equals(cardsFile) && !"nomission.cards".equals(cardsFile)) {
- RiskUtil.streamOpener.deleteMapFile(cardsFile);
+ catch (Exception ex) {
+ Logger.warn("unable to delete supplementary map files for: " + mapUID, ex);
}
+
if (RiskUtil.streamOpener.deleteMapFile(mapUID)) {
localMaps.remove(mapUID);
Modified: Domination/sharedUI/src_mapstore_lobby/net/yura/domination/mapstore/MapUpdateService.java
===================================================================
--- Domination/sharedUI/src_mapstore_lobby/net/yura/domination/mapstore/MapUpdateService.java 2024-11-21 15:41:15 UTC (rev 2581)
+++ Domination/sharedUI/src_mapstore_lobby/net/yura/domination/mapstore/MapUpdateService.java 2024-11-21 18:52:07 UTC (rev 2582)
@@ -75,7 +75,7 @@
needsUpdate = remoteMap.needsUpdate(MapPreview.createMap(uid).getVersion());
}
catch (Exception ex) {
- logger.log(Level.WARNING, "error loading version info from local map: " + uid, ex);
+ logger.log(Level.WARNING, "error loading version info from local map: " + uid + " of " + mapsUIDs.size(), ex);
needsUpdate = true;
}
Modified: Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/DominationMain.java
===================================================================
--- Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/DominationMain.java 2024-11-21 15:41:15 UTC (rev 2581)
+++ Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/DominationMain.java 2024-11-21 18:52:07 UTC (rev 2582)
@@ -141,7 +141,7 @@
return true;
}
// if we have already quit the game, any events arriving after may cause errors
- if (net.yura.mobile.gui.DesktopPane.getDesktopPane() == null) {
+ if (risk != null && DesktopPane.getDesktopPane() == null) {
return true;
}
String loggerName = record.getLoggerName();
@@ -444,7 +444,7 @@
public static void quit() {
// HACK: if the user hits quit 2 times in a row,
// the 2nd event may throw a nullpointer as desktopPane is set to null after the 1st
- if (net.yura.mobile.gui.DesktopPane.getDesktopPane() != null) {
+ if (DesktopPane.getDesktopPane() != null) {
logger.info("UI QUIT");
Modified: Domination/src/net/yura/domination/engine/RiskUtil.java
===================================================================
--- Domination/src/net/yura/domination/engine/RiskUtil.java 2024-11-21 15:41:15 UTC (rev 2581)
+++ Domination/src/net/yura/domination/engine/RiskUtil.java 2024-11-21 18:52:07 UTC (rev 2582)
@@ -287,9 +287,8 @@
break;
}
- catch(IOException ex) {
- System.err.println("Error trying to load: "+fileName);
- RiskUtil.printStackTrace(ex);
+ catch (IOException ex) {
+ RiskUtil.printStackTrace("Error trying to load: " + fileName, ex);
if (c < 5) { // retry
try { Thread.sleep(1000); } catch(Exception ex2) { }
}
|
