Mars Simulation Project / Code / Commit [r3864]

Commit [r3864] Maximize Restore History

2017-02-15 Fix issues with adding a new arriving settlement.

# FIXES

1. Fix NullPointerException when calling createNewImmigrants() in ArrivingSettlement for the arrival of new immigrants.
- Move calling unitManager.setupShift() to be ahead of unitManager.establishSettlementGovernance().

2. Resolve the issue with calling updateToolWindow() in DesktopPane
- Remove calling DesktopPane in SettlementMapPanel, SettlementTransparentPanel and SettlementWindow.

3. Add changeSBox() in MainScene. Called by unitManagerUpdate() in MainDesktopPane when a new settlement is added.

Authored by: mkung 2017-02-16

Browse code at this revision

Parent: [r3863]

Child: [r3865]

changed	/trunk/mars-sim/mars-sim-core/src/main/java/org/mars_sim/msp/core/interplanetary/transport/settlement/ArrivingSettlement.java
changed	/trunk/mars-sim/mars-sim-core/src/main/resources/messages.properties
changed	/trunk/mars-sim/mars-sim-ui/src/main/java/org/mars_sim/msp/ui/javafx/MainScene.java
changed	/trunk/mars-sim/mars-sim-ui/src/main/java/org/mars_sim/msp/ui/swing/DesktopPane.java
changed	/trunk/mars-sim/mars-sim-ui/src/main/java/org/mars_sim/msp/ui/swing/MainDesktopPane.java
changed	/trunk/mars-sim/mars-sim-ui/src/main/java/org/mars_sim/msp/ui/swing/tool/settlement/SettlementMapPanel.java
changed	/trunk/mars-sim/mars-sim-ui/src/main/java/org/mars_sim/msp/ui/swing/tool/settlement/SettlementTransparentPanel.java
changed	/trunk/mars-sim/mars-sim-ui/src/main/java/org/mars_sim/msp/ui/swing/tool/settlement/SettlementWindow.java
changed	/trunk/mars-sim/mars-sim-ui/src/main/java/org/mars_sim/msp/ui/swing/unit_window/person/TabPanelSponsorship.java

/trunk/mars-sim/mars-sim-core/src/main/java/org/mars_sim/msp/core/interplanetary/transport/settlement/ArrivingSettlement.java Diff Switch to side-by-side view

Mars Simulation Project Code

Commit [r3864] Maximize Restore History

/trunk/mars-sim/mars-sim-core/src/main/java/org/mars_sim/msp/core/interplanetary/transport/settlement/ArrivingSettlement.java Diff Switch to side-by-side view

/trunk/mars-sim/mars-sim-core/src/main/resources/messages.properties Diff Switch to side-by-side view

/trunk/mars-sim/mars-sim-ui/src/main/java/org/mars_sim/msp/ui/javafx/MainScene.java Diff Switch to side-by-side view

/trunk/mars-sim/mars-sim-ui/src/main/java/org/mars_sim/msp/ui/swing/DesktopPane.java Diff Switch to side-by-side view

/trunk/mars-sim/mars-sim-ui/src/main/java/org/mars_sim/msp/ui/swing/MainDesktopPane.java Diff Switch to side-by-side view

/trunk/mars-sim/mars-sim-ui/src/main/java/org/mars_sim/msp/ui/swing/tool/settlement/SettlementMapPanel.java Diff Switch to side-by-side view

/trunk/mars-sim/mars-sim-ui/src/main/java/org/mars_sim/msp/ui/swing/tool/settlement/SettlementTransparentPanel.java Diff Switch to side-by-side view

/trunk/mars-sim/mars-sim-ui/src/main/java/org/mars_sim/msp/ui/swing/tool/settlement/SettlementWindow.java Diff Switch to side-by-side view

/trunk/mars-sim/mars-sim-ui/src/main/java/org/mars_sim/msp/ui/swing/unit_window/person/TabPanelSponsorship.java Diff Switch to side-by-side view