diff --git a/Klausuren/Sd1/2020winter/First/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/ignore_me/ObjectWrapper.java b/Klausuren/Sd1/2020winter/First/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/ignore_me/ObjectWrapper.java index 3ea40e6af61c89a681068a861403ec965fb7f0bc..2e67853e3d51ca2ac9e53cebb673020f3ac91456 100644 --- a/Klausuren/Sd1/2020winter/First/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/ignore_me/ObjectWrapper.java +++ b/Klausuren/Sd1/2020winter/First/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/ignore_me/ObjectWrapper.java @@ -136,9 +136,16 @@ public class ObjectWrapper<T> { for (int i = 0; i < formalArgumentTypes.length; i++) { final Class parametersClass = parameter[i].getClass(); - if (!formalArgumentTypes[i].equals(parametersClass) && - !formalArgumentTypes[i].equals(getPrimitiveType(parametersClass))) { - return false; + final Class<?> formalArgumentType = formalArgumentTypes[i]; + + if (formalArgumentType.isPrimitive()) { + if (!formalArgumentType.equals(getPrimitiveType(parametersClass))) { + return false; + } + } else { + if (!formalArgumentType.isAssignableFrom(parametersClass)) { + return false; + } } } } diff --git a/Klausuren/Sd1/2020winter/First/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/ignore_me/ObjectWrapper.java b/Klausuren/Sd1/2020winter/First/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/ignore_me/ObjectWrapper.java index 3ea40e6af61c89a681068a861403ec965fb7f0bc..2e67853e3d51ca2ac9e53cebb673020f3ac91456 100644 --- a/Klausuren/Sd1/2020winter/First/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/ignore_me/ObjectWrapper.java +++ b/Klausuren/Sd1/2020winter/First/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/ignore_me/ObjectWrapper.java @@ -136,9 +136,16 @@ public class ObjectWrapper<T> { for (int i = 0; i < formalArgumentTypes.length; i++) { final Class parametersClass = parameter[i].getClass(); - if (!formalArgumentTypes[i].equals(parametersClass) && - !formalArgumentTypes[i].equals(getPrimitiveType(parametersClass))) { - return false; + final Class<?> formalArgumentType = formalArgumentTypes[i]; + + if (formalArgumentType.isPrimitive()) { + if (!formalArgumentType.equals(getPrimitiveType(parametersClass))) { + return false; + } + } else { + if (!formalArgumentType.isAssignableFrom(parametersClass)) { + return false; + } } } } diff --git a/Klausuren/Sd1/2020winter/Second/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/ignore_me/ObjectWrapper.java b/Klausuren/Sd1/2020winter/Second/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/ignore_me/ObjectWrapper.java index 3ea40e6af61c89a681068a861403ec965fb7f0bc..2e67853e3d51ca2ac9e53cebb673020f3ac91456 100644 --- a/Klausuren/Sd1/2020winter/Second/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/ignore_me/ObjectWrapper.java +++ b/Klausuren/Sd1/2020winter/Second/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/ignore_me/ObjectWrapper.java @@ -136,9 +136,16 @@ public class ObjectWrapper<T> { for (int i = 0; i < formalArgumentTypes.length; i++) { final Class parametersClass = parameter[i].getClass(); - if (!formalArgumentTypes[i].equals(parametersClass) && - !formalArgumentTypes[i].equals(getPrimitiveType(parametersClass))) { - return false; + final Class<?> formalArgumentType = formalArgumentTypes[i]; + + if (formalArgumentType.isPrimitive()) { + if (!formalArgumentType.equals(getPrimitiveType(parametersClass))) { + return false; + } + } else { + if (!formalArgumentType.isAssignableFrom(parametersClass)) { + return false; + } } } } diff --git a/Klausuren/Sd1/2020winter/Second/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/ignore_me/ObjectWrapper.java b/Klausuren/Sd1/2020winter/Second/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/ignore_me/ObjectWrapper.java index 3ea40e6af61c89a681068a861403ec965fb7f0bc..2e67853e3d51ca2ac9e53cebb673020f3ac91456 100644 --- a/Klausuren/Sd1/2020winter/Second/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/ignore_me/ObjectWrapper.java +++ b/Klausuren/Sd1/2020winter/Second/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/ignore_me/ObjectWrapper.java @@ -136,9 +136,16 @@ public class ObjectWrapper<T> { for (int i = 0; i < formalArgumentTypes.length; i++) { final Class parametersClass = parameter[i].getClass(); - if (!formalArgumentTypes[i].equals(parametersClass) && - !formalArgumentTypes[i].equals(getPrimitiveType(parametersClass))) { - return false; + final Class<?> formalArgumentType = formalArgumentTypes[i]; + + if (formalArgumentType.isPrimitive()) { + if (!formalArgumentType.equals(getPrimitiveType(parametersClass))) { + return false; + } + } else { + if (!formalArgumentType.isAssignableFrom(parametersClass)) { + return false; + } } } } diff --git a/Klausuren/Sd1/2021summer/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/ignore_me/ObjectWrapper.java b/Klausuren/Sd1/2021summer/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/ignore_me/ObjectWrapper.java index 9ffd35e499e713a28c6dd83b77d41b085b70f342..2b8ef988af49ec571255250942eb2165d0f10fcc 100644 --- a/Klausuren/Sd1/2021summer/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/ignore_me/ObjectWrapper.java +++ b/Klausuren/Sd1/2021summer/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/test/ignore_me/ObjectWrapper.java @@ -137,9 +137,16 @@ public class ObjectWrapper<T> { for (int i = 0; i < formalArgumentTypes.length; i++) { final Class parametersClass = parameter[i].getClass(); - if (!formalArgumentTypes[i].equals(parametersClass) && - !formalArgumentTypes[i].equals(getPrimitiveType(parametersClass))) { - return false; + final Class<?> formalArgumentType = formalArgumentTypes[i]; + + if (formalArgumentType.isPrimitive()) { + if (!formalArgumentType.equals(getPrimitiveType(parametersClass))) { + return false; + } + } else { + if (!formalArgumentType.isAssignableFrom(parametersClass)) { + return false; + } } } } diff --git a/Klausuren/Sd1/2021summer/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/ignore_me/ObjectWrapper.java b/Klausuren/Sd1/2021summer/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/ignore_me/ObjectWrapper.java index 9ffd35e499e713a28c6dd83b77d41b085b70f342..2b8ef988af49ec571255250942eb2165d0f10fcc 100644 --- a/Klausuren/Sd1/2021summer/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/ignore_me/ObjectWrapper.java +++ b/Klausuren/Sd1/2021summer/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/test/ignore_me/ObjectWrapper.java @@ -137,9 +137,16 @@ public class ObjectWrapper<T> { for (int i = 0; i < formalArgumentTypes.length; i++) { final Class parametersClass = parameter[i].getClass(); - if (!formalArgumentTypes[i].equals(parametersClass) && - !formalArgumentTypes[i].equals(getPrimitiveType(parametersClass))) { - return false; + final Class<?> formalArgumentType = formalArgumentTypes[i]; + + if (formalArgumentType.isPrimitive()) { + if (!formalArgumentType.equals(getPrimitiveType(parametersClass))) { + return false; + } + } else { + if (!formalArgumentType.isAssignableFrom(parametersClass)) { + return false; + } } } }