commit f3bb6380a7a3d8509d9eefe7f8f5a0ffacf61874
author ArtHell <temka19977@mail.ru> Sun Apr 10 21:37:38 2016 +0300
committer ArtHell <temka19977@mail.ru> Sun Apr 10 21:37:38 2016 +0300
tree 6860cae823d21ce975448dd2056315b10dee8d55
parent 35e929ee3160dd10d1ceaad43bfd8a0562bb40cd

lab 3

src/sample/ArtRico.java

diff --git a/src/sample/ArtRico.java b/src/sample/ArtRico.java
index e436f3f..1312d42 100644
--- a/src/sample/ArtRico.java
+++ b/src/sample/ArtRico.java
@@ -42,7 +42,6 @@
   int replayIterator;
 
 
-
   @Override
   public void start(Stage primaryStage) {
     primaryStage.setTitle("ArtRik");
@@ -59,19 +58,19 @@
       @Override
       public void handle(long now) {
         if (ball.isGameWon()) {
-          if(replayNow){
+          if (replayNow) {
             gameRoot.getChildren().clear();
             timer.stop();
             showMenu(primaryStage);
-          } else{
+          } else {
             replay = mode + replay;
-            Serializer.saveReplay(REPLAY_FILE,replay);
+            Serializer.saveReplay(REPLAY_FILE, replay);
             replay = "";
             showMessage("You won! Your score is: ");
           }
         }
         if (ball.isGameOver()) {
-          if(replayNow){
+          if (replayNow) {
             gameRoot.getChildren().clear();
             timer.stop();
             showMenu(primaryStage);
@@ -130,7 +129,7 @@
     scoreLabel.setFont(javafx.scene.text.Font.font(20));
 
     switch (mode) {
-      case 'e': {
+      case EASY_MODE: {
         player = new Player(SCENE_WIDTH / 2 - PLAYER_WIDTH_EASY / 2,
             PLAYER_POS_Y, PLAYER_WIDTH_EASY, PLAYER_HEIGHT,
             STROKE_WIDTH, Color.ORANGE, Color.BEIGE,
@@ -141,7 +140,7 @@
             TOP_HEIGHT, SCENE_HEIGHT, BALL_SPEED_EASY);
         break;
       }
-      case 'm': {
+      case MEDIUM_MODE: {
         player = new Player(SCENE_WIDTH / 2 - PLAYER_WIDTH_MEDIUM / 2,
             PLAYER_POS_Y, PLAYER_WIDTH_MEDIUM,
             PLAYER_HEIGHT, STROKE_WIDTH, Color.ORANGE, Color.BEIGE,
@@ -152,7 +151,7 @@
             TOP_HEIGHT, SCENE_HEIGHT, BALL_SPEED_MEDIUM);
         break;
       }
-      case 'h': {
+      case HARD_MODE: {
         player = new Player(SCENE_WIDTH / 2 - PLAYER_WIDTH_HARD / 2,
             PLAYER_POS_Y, PLAYER_WIDTH_HARD, PLAYER_HEIGHT,
             STROKE_WIDTH, Color.ORANGE, Color.BEIGE,
@@ -206,11 +205,16 @@
 
   private void update() {
     char direction;
-    if(replayNow) {
-      switch(replay.toCharArray()[replayIterator]) {
-        case MOVED_LEFT: player.moveLeft(); break;
-        case MOVED_RIGHT: player.moveRight(); break;
-        default: break;
+    if (replayNow) {
+      switch (replay.toCharArray()[replayIterator]) {
+        case MOVED_LEFT:
+          player.moveLeft();
+          break;
+        case MOVED_RIGHT:
+          player.moveRight();
+          break;
+        default:
+          break;
       }
       replayIterator++;
     } else {
@@ -324,7 +328,7 @@
 
     mainMenuButtons[3].setOnAction(event -> {
       replay = Serializer.loadReplay(REPLAY_FILE);
-      if(!replay.isEmpty()) {
+      if (!replay.isEmpty()) {
         replayNow = true;
         replayMode = replay.toCharArray()[0];
         replayIterator = 1;

src/sample/Bot.java

diff --git a/src/sample/Bot.java b/src/sample/Bot.java
index e6a4dec..159b471 100644
--- a/src/sample/Bot.java
+++ b/src/sample/Bot.java
@@ -24,15 +24,15 @@
         direction = player.moveLeft();
       }
     } else {
-        if (player.getTranslateX() + player.getWidth() / 2
-            < ball.getTranslateX()) {
-          direction = player.moveRight();
-        } else {
-          direction = player.moveLeft();
-        }
-        if (time == timeOfMoving * 2) {
-          time = 0;
-        }
+      if (player.getTranslateX() + player.getWidth() / 2
+          < ball.getTranslateX()) {
+        direction = player.moveRight();
+      } else {
+        direction = player.moveLeft();
+      }
+      if (time == timeOfMoving * 2) {
+        time = 0;
+      }
     }
     time++;
     return direction;

src/sample/Serializer.java

diff --git a/src/sample/Serializer.java b/src/sample/Serializer.java
index 3689051..1643844 100644
--- a/src/sample/Serializer.java
+++ b/src/sample/Serializer.java
@@ -6,11 +6,10 @@
 
   public static void saveReplay(String fileName, String string) {
     File file = new File(fileName);
-    try(FileWriter writer = new FileWriter(file, false)) {
+    try (FileWriter writer = new FileWriter(file, false)) {
       writer.write(string);
       writer.flush();
-    }
-    catch(IOException ex) {
+    } catch (IOException ex) {
       System.out.println(ex.getMessage());
     }
   }
@@ -18,16 +17,13 @@
   public static String loadReplay(String fileName) {
     File file = new File(fileName);
     String replay = "";
-    try(FileReader reader = new FileReader(file))
-    {
-      char[] buffer = new char[(int)file.length()];
+    try (FileReader reader = new FileReader(file)) {
+      char[] buffer = new char[(int) file.length()];
       reader.read(buffer);
       replay = new String(buffer);
-    }
-    catch(IOException ex){
+    } catch (IOException ex) {
       System.out.println(ex.getMessage());
-    }
-    finally {
+    } finally {
       return replay;
     }
   }