Exception Handling

Roboter/tpe/exceptions/RobotException.java

@@ -1,20 +1,13 @@
 package tpe.exceptions;
-import java.util.*;
+
-import java.lang.Thread;
 @SuppressWarnings("serial")
-public class RobotException extends Exception {
+public class RobotException extends Exception{
 	 
-public class MagicValueException extends Throwable {
+    String robotName;
-	throw new Exception("Die Zahl 42 kann nicht verarbeitet werden");
+    String errorMessage;
-	}
-
-public RobotException(String string) {
-		// TODO Auto-generated constructor stub
-	}
-
-public RobotException MagicValueException() throws  {
  
+    RobotException(String errorMessage, String robotName){
+        super( "Robotname-"+robotName+": " + errorMessage );
         
-}
+    }
-	
 }

Roboter/tpe/exceptions/RobotIllegalStateException.java

@@ -1,13 +1,10 @@
 package tpe.exceptions;
 
-public class RobotIllegalStateException {
+public class RobotIllegalStateException extends RobotException{
-	public boolean illegalState(boolean powerSwitch) {
+	String robotName;
-		if(powerSwitch=false)
+	public RobotIllegalStateException(String errorMessage, String robotName) {
-		{
+		super(errorMessage, robotName);
-			return false;
+		this.robotName = robotName;
-		}
-		else
-			return true;
 	}
 
 }

Roboter/tpe/exceptions/RobotMagicValueException.java

@@ -0,0 +1,10 @@
+package tpe.exceptions;
+
+@SuppressWarnings("serial")
+public class RobotMagicValueException extends RobotException {
+	String robotName;
+	public RobotMagicValueException(String errorMessage, String robotName) {
+		super(errorMessage, robotName);
+		this.robotName = robotName;
+	}
+}

Roboter/tpe/exceptions/roboter/R2D2.java

@@ -3,9 +3,11 @@ package tpe.exceptions.roboter;
 import java.util.*;
 
 import tpe.exceptions.RobotException;
+import tpe.exceptions.RobotIllegalStateException;
+import tpe.exceptions.RobotMagicValueException;
 
 public class R2D2 implements Robot {
-	RobotException robotexception;
+	private RobotException lastException;
 	private String name;
 	private boolean powerSwitch;
 	private int id;
@@ -45,10 +47,13 @@ public class R2D2 implements Robot {
 		return powerSwitch;
 	}
 	
+	public void setLastException(RobotException lastException) {
+        this.lastException = lastException;
+    }
+	
 	@Override
 	public RobotException getLastException() {
-		// TODO Auto-generated method stub
+		return lastException;
-		return null;
 	}
 
 	@Override
@@ -65,12 +70,28 @@ public class R2D2 implements Robot {
 			return output;
 		
 	}
+	
+	public boolean checkRobotMagicValueException(int[] zahlen) {
+	boolean error=false;
+		for(int i = 0; i < zahlen.length; i++) {
+			if(zahlen[i]==42) {
+				error=true;
+			}
+		}
+		return error;
+	}
+	
 	@Override
 	public int[] think(int[] zahlen) throws RobotException {
-		for(int i = 0; i < zahlen.length; i++) {
+		if(!isPowerOn())
-			if(zahlen[i]==42)
+		{
-				throw new RobotException.MagicValueException();
+			throw new RobotIllegalStateException("Der Roboter ist ausgeschaltet!", this.getName());
 		}
+		else if(checkRobotMagicValueException(zahlen)==true)
+		{
+			throw new RobotMagicValueException("Zahl 42 kann nicht verarbeitet werden!",this.getName());
+		}
+		else {
 	    // Iterate through zahlen from left to right
 	    for (int i = 0; i < zahlen.length - 1; i++) {
 	      // Set the index of the current smallest element to i
@@ -87,6 +108,7 @@ public class R2D2 implements Robot {
 	      zahlen[minIndex] = temp;
 	    }
 	    return zahlen;
+		}
 		
 	}