final

[des2015.git] / mart / ev3 / ex2 / nl / ru / des / bluetooth / ColorMemory.java

diff --git a/mart/ev3/ex2/nl/ru/des/bluetooth/ColorMemory.java b/mart/ev3/ex2/nl/ru/des/bluetooth/ColorMemory.java
index ec9c575..5448e7b 100644 (file)
--- a/mart/ev3/ex2/nl/ru/des/bluetooth/ColorMemory.java
+++ b/mart/ev3/ex2/nl/ru/des/bluetooth/ColorMemory.java
@@ -5,6 +5,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import lejos.hardware.Sound;
 import lejos.robotics.Color;
 import nl.ru.des.LCDPrinter;
 
@@ -18,9 +19,12 @@ public class ColorMemory implements MessageHandler {
 
        @Override
        public void handleMessage(String message) {
-               colors.add(Integer.valueOf(message));
-               LCDPrinter.print(message + " received");
-               LCDPrinter.print(colors.toString());
+               int color = Integer.valueOf(message);
+               if(!colors.contains(color)){
+                       colors.add(Integer.valueOf(message));
+                       Sound.beep();
+                       LCDPrinter.print(colors.toString());
+               }
        }
 
        public boolean finished() {
@@ -28,9 +32,11 @@ public class ColorMemory implements MessageHandler {
        }
 
        public void addColor(int current) {
-               BTController.sendMessage(Integer.toString(current));
-               colors.add(current);
-               LCDPrinter.print(current + " found");
-               LCDPrinter.print(colors.toString());
+               if(!colors.contains(current)){
+                       colors.add(current);
+                       Sound.buzz();
+                       LCDPrinter.print(colors.toString());
+                       BTController.sendMessage(Integer.toString(current));
+               }
        }
 }