michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 06:18:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

merged Dev in

Browse Source 
Fixed concurrency exception

#story[1276] #pair[zyt10, ajm412]
This commit is contained in:
Zhi You Tan
2017-09-28 16:40:50 +13:00
parent 6fafb02a8f
commit f7fd5494ef
2 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/visualiser/controllers/RaceViewController.java
+6 -12
View File
@@ -7,39 +7,33 @@ import java.util.ArrayList;
import java.util.Map; import java.util.Map;
import java.util.Timer; import java.util.Timer;
import java.util.TimerTask; import java.util.TimerTask;
import java.util.concurrent.TimeUnit;
import javafx.animation.Timeline;
import javafx.animation.RotateTransition;
import javafx.application.Platform; import javafx.application.Platform;
import javafx.beans.property.ReadOnlyBooleanProperty; import javafx.beans.property.ReadOnlyBooleanProperty;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.fxml.FXMLLoader; import javafx.fxml.FXMLLoader;
import javafx.scene.SubScene; import javafx.scene.SubScene;
import javafx.scene.control.Button;
import javafx.scene.control.ComboBox;
import javafx.scene.control.Label; import javafx.scene.control.Label;
import javafx.scene.control.Slider;
import javafx.scene.control.TextField; import javafx.scene.control.TextField;
import javafx.scene.image.Image; import javafx.scene.image.Image;
import javafx.scene.image.ImageView; import javafx.scene.image.ImageView;
import javafx.scene.layout.AnchorPane; import javafx.scene.layout.AnchorPane;
import javafx.scene.layout.Pane; import javafx.scene.layout.Pane;
import javafx.scene.layout.StackPane; import javafx.scene.layout.StackPane;
import javafx.scene.layout.VBox;
import javafx.scene.paint.Paint; import javafx.scene.paint.Paint;
import javafx.scene.shape.Line;
import javafx.scene.shape.Polyline;
import javafx.scene.text.Text; import javafx.scene.text.Text;
import javafx.stage.Stage;
import javafx.stage.StageStyle;
import javafx.util.Duration;
import seng302.model.ClientYacht; import seng302.model.ClientYacht;
import seng302.model.RaceState; import seng302.model.RaceState;
import seng302.model.mark.CompoundMark;
import seng302.model.stream.xml.parser.RaceXMLData; import seng302.model.stream.xml.parser.RaceXMLData;
import seng302.model.token.TokenType; import seng302.model.token.TokenType;
import seng302.utilities.Sounds; import seng302.utilities.Sounds;
import seng302.visualiser.GameView3D; import seng302.visualiser.GameView3D;
import seng302.visualiser.controllers.annotations.ImportantAnnotationController;
import seng302.visualiser.controllers.annotations.ImportantAnnotationDelegate;
import seng302.visualiser.controllers.annotations.ImportantAnnotationsState;
import seng302.visualiser.controllers.cells.WindCell;
import seng302.visualiser.MiniMap; import seng302.visualiser.MiniMap;
import seng302.visualiser.controllers.cells.WindCell;
import seng302.visualiser.controllers.dialogs.FinishDialogController; import seng302.visualiser.controllers.dialogs.FinishDialogController;
import seng302.visualiser.fxObjects.ChatHistory; import seng302.visualiser.fxObjects.ChatHistory;
src/main/java/seng302/visualiser/controllers/cells/WindCell.java
+10 -12
View File
@@ -1,7 +1,7 @@
package seng302.visualiser.controllers.cells; package seng302.visualiser.controllers.cells;
import java.util.Arrays; import java.util.Arrays;
import java.util.ConcurrentModificationException; import javafx.application.Platform;
import javafx.beans.property.DoubleProperty; import javafx.beans.property.DoubleProperty;
import javafx.beans.property.ReadOnlyDoubleWrapper; import javafx.beans.property.ReadOnlyDoubleWrapper;
import javafx.fxml.FXML; import javafx.fxml.FXML;
@@ -60,9 +60,9 @@ public class WindCell {
for (DoubleProperty o : Arrays.asList(playerYacht.getHeadingProperty(), windDirection)) { for (DoubleProperty o : Arrays.asList(playerYacht.getHeadingProperty(), windDirection)) {
o.addListener((obs, oldValue, newValue) -> { o.addListener((obs, oldValue, newValue) -> {
if (isChaseCam) { Platform.runLater(() -> {
camera.getTransforms().clear(); if (isChaseCam) {
try { camera.getTransforms().clear();
for (Transform t : chaseCam.getTransforms()) { for (Transform t : chaseCam.getTransforms()) {
if (t instanceof Rotate) { if (t instanceof Rotate) {
camera.getTransforms().add(t); camera.getTransforms().add(t);
@@ -71,16 +71,14 @@ public class WindCell {
this.camera.getTransforms().addAll( this.camera.getTransforms().addAll(
new Translate(-55, -60, 0) new Translate(-55, -60, 0)
); );
} catch (ConcurrentModificationException cme) {
} }
}
windArrowModel.getAssets().getTransforms().clear(); windArrowModel.getAssets().getTransforms().clear();
windArrowModel.getAssets().getTransforms().addAll( windArrowModel.getAssets().getTransforms().addAll(
new Rotate(windDirection.getValue(), new Rotate(windDirection.getValue(),
new Point3D(0, 0, 1)) new Point3D(0, 0, 1))
); );
});
}); });
} }
} }