SVN checkout revision 431, release 0.6.12

silfumus · Aug 29, 2014 · c84b233 · c84b233
1 parent 4dd2c8b
commit c84b233
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/main/logbook/constants/AppConstants.java b/main/logbook/constants/AppConstants.java
@@ -13,7 +13,7 @@
 public class AppConstants {
 
     /** バージョン */
-    public static final String VERSION = "0.6.11";
+    public static final String VERSION = "0.6.12";
 
     /** ホームページ */
     public static final URI HOME_PAGE_URI = URI.create("http://kancolle.sanaechan.net/");

diff --git a/main/logbook/data/context/GlobalContext.java b/main/logbook/data/context/GlobalContext.java
@@ -654,8 +654,8 @@ private static void doPort(Data data) {
                     default:
                         break;
                     }
+                    addConsole("Combined fleet updated");
                 }
-                addConsole("Combined fleet updated");
             }
         } catch (Exception e) {
             LOG.warn("Failed to update homeport", e);

diff --git a/main/logbook/dto/ShipDto.java b/main/logbook/dto/ShipDto.java
@@ -199,7 +199,11 @@ public ShipDto(JsonObject object) {
         this.lucky = ((JsonNumber) object.getJsonArray("api_lucky").get(0)).longValue();
         this.luckyMax = ((JsonNumber) object.getJsonArray("api_lucky").get(1)).longValue();
         this.lockedEquip = object.getJsonNumber("api_locked_equip").intValue();
-        this.sallyArea = object.getJsonNumber("api_sally_area").intValue();
+        if (object.containsKey("api_sally_area")) {
+            this.sallyArea = object.getJsonNumber("api_sally_area").intValue();
+        } else {
+            this.sallyArea = 0;
+        }
         // 疲労が抜ける時間を計算する
         if (this.cond < 49) {
             this.time.add(Calendar.MINUTE, Math.max(49 - (int) this.cond, 3));

diff --git a/main/logbook/gui/logic/CreateReportLogic.java b/main/logbook/gui/logic/CreateReportLogic.java
@@ -41,7 +41,6 @@
 import logbook.dto.ShipDto;
 import logbook.dto.ShipFilterDto;
 import logbook.dto.ShipInfoDto;
-import logbook.internal.SallyArea;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
@@ -363,7 +362,7 @@ public int compare(Entry<ItemDto, Integer> o1, Entry<ItemDto, Integer> o2) {
      * @return ヘッダー
      */
     public static String[] getShipListHeader() {
-        return new String[] { "", "ID", "Fleet", "Name", "Type", "Morale", "Recovery", "Lv", "Next", "Exp", "Currently on", "Air Superiority", "Equipment 1", "Equipment 2",
+        return new String[] { "", "ID", "Fleet", "Name", "Type", "Morale", "Recovery", "Lv", "Next", "Exp", "Air Superiority", "Equipment 1", "Equipment 2",
                 "Equipment 3", "Equipment 4", "HP", "Firepower", "Torpedo", "AA", "Armor", "Evasion", "ASW", "LOS", "Luck" };
     }
 
@@ -400,7 +399,6 @@ public static List<String[]> getShipListBody(boolean specdiff, ShipFilterDto fil
                         ship.getLv(),
                         ship.getNext(),
                         ship.getExp(),
-                        SallyArea.valueOf(ship.getSallyArea()).getName(),
                         ship.getSeiku(),
                         ship.getSlot().get(0),
                         ship.getSlot().get(1),
@@ -457,7 +455,6 @@ public static List<String[]> getShipListBody(boolean specdiff, ShipFilterDto fil
                         ship.getLv(),
                         ship.getNext(),
                         ship.getExp(),
-                        SallyArea.valueOf(ship.getSallyArea()).getName(),
                         ship.getSeiku(),
                         ship.getSlot().get(0),
                         ship.getSlot().get(1),